diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2011-05-29 19:46:20 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2011-05-29 19:46:20 +0000 |
commit | b5feacfaac4dc82888a6a2facd2866e7e560fa4b (patch) | |
tree | 00bed2eea431181a4cea7fdb9f342f7c5fd83a04 | |
parent | 2ce1dfedaa9fe42d93b2be5b4322494a2eec6350 (diff) | |
download | rockbox-b5feacfaac4dc82888a6a2facd2866e7e560fa4b.tar.gz rockbox-b5feacfaac4dc82888a6a2facd2866e7e560fa4b.zip |
Fix some gcc 4.6 warnings.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29933 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | rbutil/rbutilqt/base/system.cpp | 11 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 3 |
2 files changed, 9 insertions, 5 deletions
diff --git a/rbutil/rbutilqt/base/system.cpp b/rbutil/rbutilqt/base/system.cpp index 4b97dea0f0..c7c28b3503 100644 --- a/rbutil/rbutilqt/base/system.cpp +++ b/rbutil/rbutilqt/base/system.cpp | |||
@@ -190,9 +190,14 @@ QString System::osVersionString(void) | |||
190 | #else | 190 | #else |
191 | long cores = sysconf(_SC_NPROCESSORS_ONLN); | 191 | long cores = sysconf(_SC_NPROCESSORS_ONLN); |
192 | #endif | 192 | #endif |
193 | result = QString("CPU: %1, %2 processor(s)").arg(u.machine).arg(cores); | 193 | if(ret != -1) { |
194 | result += QString("<br/>System: %2<br/>Release: %3<br/>Version: %4") | 194 | result = QString("CPU: %1, %2 processor(s)").arg(u.machine).arg(cores); |
195 | .arg(u.sysname).arg(u.release).arg(u.version); | 195 | result += QString("<br/>System: %2<br/>Release: %3<br/>Version: %4") |
196 | .arg(u.sysname).arg(u.release).arg(u.version); | ||
197 | } | ||
198 | else { | ||
199 | result = QString("(Error when retrieving system information)"); | ||
200 | } | ||
196 | #if defined(Q_OS_MACX) | 201 | #if defined(Q_OS_MACX) |
197 | SInt32 major; | 202 | SInt32 major; |
198 | SInt32 minor; | 203 | SInt32 minor; |
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index 611e848873..5841431f8a 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp | |||
@@ -1065,8 +1065,7 @@ void RbUtilQt::uninstallBootloader(void) | |||
1065 | connect(bl, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int))); | 1065 | connect(bl, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int))); |
1066 | connect(bl, SIGNAL(logProgress(int, int)), logger, SLOT(setProgress(int, int))); | 1066 | connect(bl, SIGNAL(logProgress(int, int)), logger, SLOT(setProgress(int, int))); |
1067 | 1067 | ||
1068 | int result; | 1068 | bl->uninstall(); |
1069 | result = bl->uninstall(); | ||
1070 | 1069 | ||
1071 | logger->setFinished(); | 1070 | logger->setFinished(); |
1072 | 1071 | ||