[kdebase-workspace] one more gcc47-ism

[Rex Dieter]

commit 895ff4a906abc01f1fb1fd52d511e330af7b9859
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Jan 3 15:35:57 2012 -0600

    one more gcc47-ism

 kde-workspace-4.7.95-gcc47.patch |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)
---
diff --git a/kde-workspace-4.7.95-gcc47.patch b/kde-workspace-4.7.95-gcc47.patch
index 7be5dd4..59ecd47 100644
--- a/kde-workspace-4.7.95-gcc47.patch
+++ b/kde-workspace-4.7.95-gcc47.patch
@@ -9,3 +9,30 @@ diff -up kde-workspace-4.7.95/ksplash/ksplashqml/main.cpp.gcc47 kde-workspace-4.
  #include <X11/Xlib.h>
  
  int main(int argc, char **argv)
+diff -up kde-workspace-4.7.95/libs/ksysguard/processui/ProcessModel.cpp.gcc47 kde-workspace-4.7.95/libs/ksysguard/processui/ProcessModel.cpp
+--- kde-workspace-4.7.95/libs/ksysguard/processui/ProcessModel.cpp.gcc47	2011-12-20 18:40:37.000000000 -0600
++++ kde-workspace-4.7.95/libs/ksysguard/processui/ProcessModel.cpp	2012-01-03 15:32:37.991061709 -0600
+@@ -421,11 +421,11 @@ void ProcessModelPrivate::queryForAndUpd
+         return;
+     for (uint i=0; i < count; ++i) {
+         WId wid = children[i];
+-        QMap<qlonglong, XID>::iterator i = mXResClientResources.lowerBound(-(qlonglong)(wid));
+-        if(i == mXResClientResources.end())
++        QMap<qlonglong, XID>::iterator j = mXResClientResources.lowerBound(-(qlonglong)(wid));
++        if(j == mXResClientResources.end())
+             continue; //We couldn't find it this time :-/
+ 
+-        if(-i.key() != (qlonglong)(wid & ~i.value()))
++        if(-j.key() != (qlonglong)(wid & ~j.value()))
+             continue; //Already added this window
+ 
+         //Get the PID for this window if we do not know it
+@@ -438,7 +438,7 @@ void ProcessModelPrivate::queryForAndUpd
+         if(!pid)
+             continue;
+         //We found a window with this client
+-        mXResClientResources.erase(i);
++        mXResClientResources.erase(j);
+         KSysGuard::Process *process = mProcesses->getProcess(pid);
+         if(!process) return; //shouldn't really happen.. maybe race condition etc
+         unsigned long previousPixmapBytes = process->pixmapBytes;