libs: remove unused token argument of TaskManager::setTrackGeometry()

if UUID tokens were actually used for something the getter
(TaskManager::trackGeometry()) would also take token argument, token was
always the same string too - {00000000-0000-0000-0000-000000000000}

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/libs/taskmanager/groupmanager.cpp b/libs/taskmanager/groupmanager.cpp
index a23c5f4..7eacbab 100644 (file)
--- a/libs/taskmanager/groupmanager.cpp
+++ b/libs/taskmanager/groupmanager.cpp
@@ -27,7 +27,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <QList>
 #include <QStack>
 #include <QTimer>
-#include <QUuid>
 #include <QFile>
 #include <QImageWriter>
 
@@ -128,7 +127,6 @@ public:
     QTimer checkIfFullTimer;
     QSet<Task *> geometryTasks;
     int groupIsFullLimit;
-    QUuid configToken;
 
     QHash<int, TaskGroup*> rootGroups; //container for groups
     QList<LauncherItem *> launchers;
@@ -175,7 +173,7 @@ GroupManager::GroupManager(QObject *parent)
 
 GroupManager::~GroupManager()
 {
-    TaskManager::self()->setTrackGeometry(false, d->configToken);
+    TaskManager::self()->setTrackGeometry(false);
     delete d->abstractSortingStrategy;
     delete d->abstractGroupingStrategy;
     delete d;
@@ -591,7 +589,7 @@ void GroupManager::reconnect()
                 this, SLOT(taskChanged(::TaskManager::Task *, ::TaskManager::TaskChanges)));
     }
 
-    TaskManager::self()->setTrackGeometry(d->showOnlyCurrentScreen, d->configToken);
+    TaskManager::self()->setTrackGeometry(d->showOnlyCurrentScreen);
 
     if (!d->showOnlyCurrentScreen) {
         d->geometryTasks.clear();

diff --git a/libs/taskmanager/taskmanager.cpp b/libs/taskmanager/taskmanager.cpp
index feff6da..831d511 100644 (file)
--- a/libs/taskmanager/taskmanager.cpp
+++ b/libs/taskmanager/taskmanager.cpp
@@ -28,7 +28,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <QApplication>
 #include <QDesktopWidget>
 #include <QTimer>
-#include <QUuid>
 
 // KDE
 #include <KConfig>
@@ -93,7 +92,7 @@ public:
     QHash<WId, Task *> tasksByWId;
     QList<Startup *> startups;
     WindowList skiptaskbarWindows;
-    QSet<QUuid> trackGeometryTokens;
+    bool trackGeometry;
 };
 
 TaskManager::TaskManager()
@@ -511,20 +510,14 @@ bool TaskManager::isOnTop(const Task *task) const
     return false;
 }
 
-void TaskManager::setTrackGeometry(bool track, const QUuid &token)
+void TaskManager::setTrackGeometry(bool track)
 {
-    if (track) {
-        if (!d->trackGeometryTokens.contains(token)) {
-            d->trackGeometryTokens.insert(token);
-        }
-    } else {
-        d->trackGeometryTokens.remove(token);
-    }
+    d->trackGeometry = track;
 }
 
 bool TaskManager::trackGeometry() const
 {
-    return !d->trackGeometryTokens.isEmpty();
+    return d->trackGeometry;
 }
 
 bool TaskManager::isOnScreen(int screen, const WId wid)

diff --git a/libs/taskmanager/taskmanager.h b/libs/taskmanager/taskmanager.h
index 45b10ee..f09f31c 100644 (file)
--- a/libs/taskmanager/taskmanager.h
+++ b/libs/taskmanager/taskmanager.h
@@ -32,8 +32,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <KSharedPtr>
 #include <KWindowSystem>
 
-#include <QUuid>
-
 namespace TaskManager
 {
 typedef QSet<WId> WindowList;
@@ -131,7 +129,7 @@ public:
      * updates. This generates a lot of activity so should only be used
      * when necessary.
      */
-    void setTrackGeometry(bool track, const QUuid &token);
+    void setTrackGeometry(bool track);
 
     /**
      * @return true if geometry tracking is on