[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kwin] /: Fix compile warnings after removing ObscurringWindows
From:       Martin_Flöser <null () kde ! org>
Date:       2017-10-01 7:55:22
Message-ID: E1dyZ5u-0004YP-9V () code ! kde ! org
[Download RAW message or body]

Git commit 793eecc826d6b594edc42cc3ed6998ffde9f3509 by Martin Flöser.
Committed on 01/10/2017 at 07:51.
Pushed by graesslin into branch 'master'.

Fix compile warnings after removing ObscurringWindows

M  +2    -4    workspace.cpp
M  +1    -1    workspace.h

https://commits.kde.org/kwin/793eecc826d6b594edc42cc3ed6998ffde9f3509

diff --git a/workspace.cpp b/workspace.cpp
index 924500852..5818d6b86 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -873,7 +873,7 @@ void Workspace::slotCurrentDesktopChanged(uint oldDesktop, uint newDesktop)
     closeActivePopup();
     ++block_focus;
     StackingUpdatesBlocker blocker(this);
-    updateClientVisibilityOnDesktopChange(oldDesktop, newDesktop);
+    updateClientVisibilityOnDesktopChange(newDesktop);
     // Restore the focus on this desktop
     --block_focus;
 
@@ -881,7 +881,7 @@ void Workspace::slotCurrentDesktopChanged(uint oldDesktop, uint newDesktop)
     emit currentDesktopChanged(oldDesktop, movingClient);
 }
 
-void Workspace::updateClientVisibilityOnDesktopChange(uint oldDesktop, uint newDesktop)
+void Workspace::updateClientVisibilityOnDesktopChange(uint newDesktop)
 {
     for (ToplevelList::ConstIterator it = stacking_order.constBegin();
             it != stacking_order.constEnd();
@@ -994,8 +994,6 @@ void Workspace::updateCurrentActivity(const QString &new_activity)
     // mapping done from front to back => less exposure events
     //Notify::raise((Notify::Event) (Notify::DesktopChange+new_desktop));
 
-    const QString &old_activity = Activities::self()->previous();
-
     for (ToplevelList::ConstIterator it = stacking_order.constBegin();
             it != stacking_order.constEnd();
             ++it) {
diff --git a/workspace.h b/workspace.h
index 012210d95..7e23807fa 100644
--- a/workspace.h
+++ b/workspace.h
@@ -527,7 +527,7 @@ private:
     void closeActivePopup();
     void updateClientArea(bool force);
     void resetClientAreas(uint desktopCount);
-    void updateClientVisibilityOnDesktopChange(uint oldDesktop, uint newDesktop);
+    void updateClientVisibilityOnDesktopChange(uint newDesktop);
     void activateClientOnNewDesktop(uint desktop);
     AbstractClient *findClientToActivateOnDesktop(uint desktop);
 

[prev in list] [next in list] [prev in thread] [next in thread]