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

List:       rockbox-cvs
Subject:    bluebrother: r29933 - in trunk/rbutil/rbutilqt: . base
From:       mailer () svn ! rockbox ! org
Date:       2011-05-29 19:46:20
Message-ID: 201105291946.p4TJkKsZ003583 () giant ! haxx ! se
[Download RAW message or body]

Date: 2011-05-29 21:46:20 +0200 (Sun, 29 May 2011)
New Revision: 29933

Log Message:
Fix some gcc 4.6 warnings.

Modified:
   trunk/rbutil/rbutilqt/base/system.cpp
   trunk/rbutil/rbutilqt/rbutilqt.cpp

Modified: trunk/rbutil/rbutilqt/base/system.cpp
===================================================================
--- trunk/rbutil/rbutilqt/base/system.cpp	2011-05-29 19:33:17 UTC (rev 29932)
+++ trunk/rbutil/rbutilqt/base/system.cpp	2011-05-29 19:46:20 UTC (rev 29933)
@@ -190,9 +190,14 @@
 #else
     long cores = sysconf(_SC_NPROCESSORS_ONLN);
 #endif
-    result = QString("CPU: %1, %2 processor(s)").arg(u.machine).arg(cores);
-    result += QString("<br/>System: %2<br/>Release: %3<br/>Version: %4")
-        .arg(u.sysname).arg(u.release).arg(u.version);
+    if(ret != -1) {
+        result = QString("CPU: %1, %2 processor(s)").arg(u.machine).arg(cores);
+        result += QString("<br/>System: %2<br/>Release: %3<br/>Version: %4")
+            .arg(u.sysname).arg(u.release).arg(u.version);
+    }
+    else {
+        result = QString("(Error when retrieving system information)");
+    }
 #if defined(Q_OS_MACX)
     SInt32 major;
     SInt32 minor;

Modified: trunk/rbutil/rbutilqt/rbutilqt.cpp
===================================================================
--- trunk/rbutil/rbutilqt/rbutilqt.cpp	2011-05-29 19:33:17 UTC (rev 29932)
+++ trunk/rbutil/rbutilqt/rbutilqt.cpp	2011-05-29 19:46:20 UTC (rev 29933)
@@ -1065,8 +1065,7 @@
     connect(bl, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int)));
     connect(bl, SIGNAL(logProgress(int, int)), logger, SLOT(setProgress(int, int)));
 
-    int result;
-    result = bl->uninstall();
+    bl->uninstall();
 
     logger->setFinished();
 

_______________________________________________
rockbox-cvs mailing list
rockbox-cvs@cool.haxx.se
http://cool.haxx.se/cgi-bin/mailman/listinfo/rockbox-cvs
[prev in list] [next in list] [prev in thread] [next in thread]