From fc5b303c5f6d97990a87b4c81d26d847211f1a9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Mon, 14 Sep 2015 14:49:18 +0200 Subject: [PATCH] Workspace::raiseClientWithinApplication opertes on AbstractClient --- layers.cpp | 6 +++--- workspace.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/layers.cpp b/layers.cpp index ca244c089d..7b8517b592 100644 --- a/layers.cpp +++ b/layers.cpp @@ -387,7 +387,7 @@ void Workspace::raiseClient(AbstractClient* c, bool nogroup) } } -void Workspace::raiseClientWithinApplication(Client* c) +void Workspace::raiseClientWithinApplication(AbstractClient* c) { if (!c) return; @@ -399,13 +399,13 @@ void Workspace::raiseClientWithinApplication(Client* c) // first try to put it above the top-most window of the application for (int i = unconstrained_stacking_order.size() - 1; i > -1 ; --i) { - Client *other = qobject_cast(unconstrained_stacking_order.at(i)); + AbstractClient *other = qobject_cast(unconstrained_stacking_order.at(i)); if (!other) { continue; } if (other == c) // don't lower it just because it asked to be raised return; - if (Client::belongToSameApplication(other, c)) { + if (AbstractClient::belongToSameApplication(other, c)) { unconstrained_stacking_order.removeAll(c); unconstrained_stacking_order.insert(unconstrained_stacking_order.indexOf(other) + 1, c); // insert after the found one break; diff --git a/workspace.h b/workspace.h index 2cd76a12ca..b5df7a4cfe 100644 --- a/workspace.h +++ b/workspace.h @@ -483,7 +483,7 @@ private: void propagateClients(bool propagate_new_clients); // Called only from updateStackingOrder ToplevelList constrainedStackingOrder(); - void raiseClientWithinApplication(Client* c); + void raiseClientWithinApplication(AbstractClient* c); void lowerClientWithinApplication(AbstractClient* c); bool allowFullClientRaising(const AbstractClient* c, xcb_timestamp_t timestamp); bool keepTransientAbove(const AbstractClient* mainwindow, const AbstractClient* transient);