Initial import of Trinity 3.5.11 to kdebase

Extends krandrtray, adds iccconfig kcontrol module, adds run dialog autocomplete and lots of bugfixes
Will need to check for commit warnings and repair as encountered
Also needs full compile test

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1061475 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 3 insertions, 3 deletions

diff --git a/ksysguard/ksysguardd/Linux/stat.c b/ksysguard/ksysguardd/Linux/stat.c
index 0e03e4d53..9bc576deb 100644
--- a/ksysguard/ksysguardd/Linux/stat.c
+++ b/ksysguard/ksysguardd/Linux/stat.c
@@ -267,10 +267,10 @@ static int processDiskIO( const char* buf )
     }
     /* Move p after the sencond ')'. We can safely assume that
      * those two ')' exist. */
-    p = strchr( p, ')' ) + 1;
-    p = strchr( p, ')' ) + 1;
+    p = (char*)strchr( p, ')' ) + 1;
+    p = (char*)strchr( p, ')' ) + 1;
     if ( p && *p )
-      p = strchr( p, '(' );
+      p = (char*)strchr( p, '(' );
   }
 
   return 0;