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

List:       kde-commits
Subject:    KDE/kdebase/workspace/libs/taskmanager
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2011-01-15 23:15:52
Message-ID: 20110115231552.63F1F3E1F1 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1214698 by aseigo:

move updateLauncher into the private API


 M  +26 -23    groupmanager.cpp  
 M  +0 -4      groupmanager.h  


--- trunk/KDE/kdebase/workspace/libs/taskmanager/groupmanager.cpp #1214697:1214698
@@ -85,6 +85,7 @@
     void removeTask(TaskPtr);
     void addStartup(StartupPtr);
     void removeStartup(StartupPtr);
+    void updateLauncher(AbstractGroupableItem *item);
 
     TaskGroup *currentRootGroup();
 
@@ -311,7 +312,7 @@
     }
 
     geometryTasks.insert(task.data());
-    q->updateLauncher(item);
+    updateLauncher(item);
 	
     return true;
 }
@@ -334,7 +335,7 @@
         item->parentGroup()->remove(item);
     }
 
-    q->updateLauncher(item);
+    updateLauncher(item);
 
     //the item must exist as long as the TaskPtr does because of activate calls so \
don't delete the item here, it will delete itself.  }
@@ -586,7 +587,7 @@
             launcher->setGenericName(genericName);
         }
 
-        updateLauncher(launcher);
+        d->updateLauncher(launcher);
         emit launcherAdded(launcher);
     }
 
@@ -606,26 +607,26 @@
     emit launcherRemoved(launcher);
 }
 
-void GroupManager::updateLauncher(AbstractGroupableItem* item)
+void GroupManagerPrivate::updateLauncher(AbstractGroupableItem* item)
 {
     if (item->itemType() == LauncherItemType) {
         LauncherItem *launcher = static_cast<LauncherItem *>(item);
         QString name = launcher->name().toLower();
-        if (d->launcherAssociations.contains(name)) {
-            if (d->currentRootGroup()->members().contains(launcher) &&
-                d->launcherAssociations.values(name).length() > 1) {
+        if (launcherAssociations.contains(name)) {
+            if (currentRootGroup()->members().contains(launcher) &&
+                launcherAssociations.values(name).length() > 1) {
                 // Launcher is shown but the task is running
                 typedef QHash<int, TaskGroup *> Metagroup;
-                foreach (Metagroup metagroup, d->rootGroups) {
+                foreach (Metagroup metagroup, rootGroups) {
                     foreach (TaskGroup *rootGroup, metagroup) {
                         rootGroup->remove(launcher);
                     }
                 }
-            } else if (!d->currentRootGroup()->members().contains(launcher) &&
-                       d->launcherAssociations.values(name).length() == 1) {
+            } else if (!currentRootGroup()->members().contains(launcher) &&
+                       launcherAssociations.values(name).length() == 1) {
                 // Launcher isn't shown but the task isn't running
                 typedef QHash<int, TaskGroup *> Metagroup;
-                foreach (Metagroup metagroup, d->rootGroups) {
+                foreach (Metagroup metagroup, rootGroups) {
                     foreach (TaskGroup *rootGroup, metagroup) {
                         rootGroup->add(launcher);
                     }
@@ -633,22 +634,23 @@
             }
         } else {
             //launcher was just created
-            d->launcherAssociations.insert(name, launcher);
+            launcherAssociations.insert(name, launcher);
             QString memberName;
             //check every item if it's matching to the launcher and add association \
                for the fitting items
-            foreach (AbstractGroupableItem *member, \
d->currentRootGroup()->members()) { +            foreach (AbstractGroupableItem \
                *member, currentRootGroup()->members()) {
                 if (member->itemType() == TaskItemType && !member->isStartupItem()) \
                {
                     memberName = qobject_cast< TaskItem* \
>(member)->task()->classClass();  } else {
                     memberName = member->name();
                 }
+
                 if (memberName.compare(name, Qt::CaseInsensitive) == 0) {
-                    d->launcherAssociations.insertMulti(name, member);
+                    launcherAssociations.insertMulti(name, member);
                 }
             }
-            if (d->launcherAssociations.values(name).length() == 1) { // No matching \
window was found +            if (launcherAssociations.values(name).length() == 1) { \
// No matching window was found  typedef QHash<int,TaskGroup*> Metagroup;
-                foreach (Metagroup metagroup, d->rootGroups) {
+                foreach (Metagroup metagroup, rootGroups) {
                     foreach (TaskGroup *rootGroup, metagroup) {
                         rootGroup->add(launcher);
                     }
@@ -663,20 +665,21 @@
             name = item->name().toLower();
         }
 
-        if (d->currentRootGroup()->hasMember(item) && \
d->launcherAssociations.contains(name) && \
!d->launcherAssociations.values(name).contains(item) ) { +        if \
(currentRootGroup()->hasMember(item) && launcherAssociations.contains(name) && \
!launcherAssociations.values(name).contains(item) ) {  //Item was just created and \
                has set a launcher
-            d->launcherAssociations.insertMulti(name, item);
-        } else if (!d->currentRootGroup()->hasMember(item) && \
!d->launcherAssociations.key(item).isEmpty()) { +            \
launcherAssociations.insertMulti(name, item); +        } else if \
(!currentRootGroup()->hasMember(item) && !launcherAssociations.key(item).isEmpty()) { \
//Item was just removed and has set a launcher  if (name.isEmpty()) {
                 // Happens if the window has already been removed
-                name = d->launcherAssociations.key(item);
+                name = launcherAssociations.key(item);
             }
-            d->launcherAssociations.remove(name, item);
+
+            launcherAssociations.remove(name, item);
         }
 
-        if (d->launcherAssociations.contains(name)) {
-            updateLauncher(d->launcherAssociations.values(name).last());
+        if (launcherAssociations.contains(name)) {
+            updateLauncher(launcherAssociations.values(name).last());
         }
     }
 }
--- trunk/KDE/kdebase/workspace/libs/taskmanager/groupmanager.h #1214697:1214698
@@ -143,10 +143,6 @@
     /** Signal that a Launcher has been removed*/
     void launcherRemoved(LauncherItem*);
 
-public Q_SLOTS:
-    /** updates the Launcher; if the item's not a launcher it will update the \
                matching launcher if existing*/
-    void updateLauncher(AbstractGroupableItem *item);
-
 private:
     Q_PRIVATE_SLOT(d, void currentDesktopChanged(int))
     Q_PRIVATE_SLOT(d, void currentActivityChanged(QString))


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