diff -up kde-workspace-4.7.95/ksplash/ksplashqml/main.cpp.gcc47 kde-workspace-4.7.95/ksplash/ksplashqml/main.cpp
--- kde-workspace-4.7.95/ksplash/ksplashqml/main.cpp.gcc47 2011-12-20 18:40:36.000000000 -0600
+++ kde-workspace-4.7.95/ksplash/ksplashqml/main.cpp 2012-01-03 15:09:37.254323288 -0600
@@ -20,6 +20,7 @@
#include "SplashApp.h"
#include <iostream>
+#include <unistd.h>
#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;