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

List:       kde-commits
Subject:    KDE/kdebase/workspace/libs/taskmanager
From:       Matthieu Gallien <matthieu_gallien () yahoo ! fr>
Date:       2010-04-30 23:21:45
Message-ID: 20100430232145.15A80AC8AA () svn ! kde ! org
[Download RAW message or body]

SVN commit 1121254 by mgallien:

correct the type of the signal and of the data, the new signal used from \
KWindowSystem is using const unsigned long instead of unsigned int

I apologize for the previous bad commit.
Now it is working correctly again.
Lesson learned: always test before commiting.


 M  +2 -2      task.h  
 M  +3 -3      taskmanager.cpp  
 M  +1 -1      taskmanager.h  


--- trunk/KDE/kdebase/workspace/libs/taskmanager/task.h #1121253:1121254
@@ -78,11 +78,11 @@
         /**
          * This is corresponding to NET::Property enum reported properties.
          */
-        unsigned int netWindowInfoProperties;
+        unsigned long netWindowInfoProperties;
         /**
          * This is corresponding to NET::Property2 enum reported properties.
          */
-        unsigned int netWindowInfoProperties2;
+        unsigned long netWindowInfoProperties2;
 
         WindowProperties(unsigned int netWinInfoProperties, unsigned int \
netWinInfoProperties2);  };
--- trunk/KDE/kdebase/workspace/libs/taskmanager/taskmanager.cpp #1121253:1121254
@@ -116,8 +116,8 @@
             this,       SLOT(activeWindowChanged(WId)));
     connect(KWindowSystem::self(), SIGNAL(currentDesktopChanged(int)),
             this,       SLOT(currentDesktopChanged(int)));
-    connect(KWindowSystem::self(), SIGNAL(windowChanged(WId,unsigned int*)),
-            this,       SLOT(windowChanged(WId,unsigned int*)));
+    connect(KWindowSystem::self(), SIGNAL(windowChanged(WId,const unsigned long*)),
+            this,       SLOT(windowChanged(WId,const unsigned long*)));
     if (QCoreApplication::instance()) {
         connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), this, \
SLOT(onAppExitCleanup()));  }
@@ -323,7 +323,7 @@
     }
 }
 
-void TaskManager::windowChanged(WId w, unsigned int *dirty)
+void TaskManager::windowChanged(WId w, const unsigned long *dirty)
 {
 #ifdef Q_WS_X11
     if (dirty[NETWinInfo::PROTOCOLS] & NET::WMState) {
--- trunk/KDE/kdebase/workspace/libs/taskmanager/taskmanager.h #1121253:1121254
@@ -186,7 +186,7 @@
     //* @internal
     void windowRemoved(WId);
     //* @internal
-    void windowChanged(WId, unsigned int*);
+    void windowChanged(WId, const unsigned long*);
 
     //* @internal
     void activeWindowChanged(WId);


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