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, 6 insertions, 6 deletions

diff --git a/ksysguard/ksysguardd/Linux/acpi.c b/ksysguard/ksysguardd/Linux/acpi.c
index b3100c363..6e9470b59 100644
--- a/ksysguard/ksysguardd/Linux/acpi.c
+++ b/ksysguard/ksysguardd/Linux/acpi.c
@@ -130,7 +130,7 @@ int updateAcpiBattery( void )
     p = AcpiBatInfoBuf;
     while ( ( p!= NULL ) && ( sscanf( p, "last full capacity: %d ",
                               &AcpiBatCapacity ) != 1 ) ) {
-      p = strchr( p, '\n' );
+      p = (char*)strchr( p, '\n' );
       if ( p )
         p++;
     }
@@ -152,7 +152,7 @@ int updateAcpiBattery( void )
     p = AcpiBatStateBuf;
     while ( ( p!= NULL ) && ( sscanf( p, "remaining capacity: %d ",
                               &AcpiBatRemainingCapacity ) != 1 ) ) {
-      p = strchr( p, '\n' );
+      p = (char*)strchr( p, '\n' );
       if ( p )
         p++;
     }
@@ -161,7 +161,7 @@ int updateAcpiBattery( void )
     p = AcpiBatStateBuf;
     while ( ( p!= NULL ) && ( sscanf( p, "present rate: %d ",
                               &AcpiBatteryUsage[i] ) != 1 ) ) {
-      p = strchr( p, '\n' );
+      p = (char*)strchr( p, '\n' );
       if ( p )
         p++;
     } 
@@ -229,12 +229,12 @@ void printAcpiBatUsageInfo( const char* cmd)
 static int extract_zone_name(char **startidx, const char *cmd)
 {
 	char *idx = NULL;
-	idx = strchr(cmd, '/');
+	idx = (char*)strchr(cmd, '/');
 	if (idx == NULL) return 0;
-	idx = strchr(idx+1, '/');
+	idx = (char*)strchr(idx+1, '/');
 	if (idx == NULL) return 0;
 	*startidx = idx+1;
-	idx = strchr(*startidx, '/');
+	idx = (char*)strchr(*startidx, '/');
 	if (idx == NULL) return 0;
 	return idx - *startidx;
 }