summaryrefslogtreecommitdiffstats
path: root/rbutil/rbutilqt/rbutilqt.cpp
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2010-04-02 21:24:19 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2010-04-02 21:24:19 +0000
commit9fedc8187f746960ea4608f7bb9e5e9b2667fd39 (patch)
treeb4290364c67a0a8b9b201472a3e9d5790b73b0ba /rbutil/rbutilqt/rbutilqt.cpp
parentc5d9516a68923fa863ea7984a985fce23e263ada (diff)
downloadrockbox-9fedc8187f746960ea4608f7bb9e5e9b2667fd39.tar.gz
rockbox-9fedc8187f746960ea4608f7bb9e5e9b2667fd39.tar.bz2
rockbox-9fedc8187f746960ea4608f7bb9e5e9b2667fd39.zip
Move utils.cpp functions into separate class and split it up.
Move class-less functions in utils.cpp into a new Utils class and make the old functions static. This prevents clashes with system C functions. Rename some functions to avoid macro problems (check() is a macro on OS X). Split out the RockboxInfo class into a separate file. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25441 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/rbutilqt/rbutilqt.cpp')
-rw-r--r--rbutil/rbutilqt/rbutilqt.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp
index 575b381e3b..56d66115c1 100644
--- a/rbutil/rbutilqt/rbutilqt.cpp
+++ b/rbutil/rbutilqt/rbutilqt.cpp
@@ -31,6 +31,7 @@
#include "themesinstallwindow.h"
#include "uninstallwindow.h"
#include "utils.h"
+#include "rockboxinfo.h"
#include "rbzip.h"
#include "sysinfo.h"
#include "system.h"
@@ -556,7 +557,7 @@ bool RbUtilQt::installAuto()
file.replace("%RELVERSION%", ServerInfo::value(ServerInfo::CurReleaseVersion).toString());
// check installed Version and Target
- QString warning = check(false);
+ QString warning = Utils::checkEnvironment(false);
if(!warning.isEmpty())
{
if(QMessageBox::warning(this, tr("Really continue?"), warning,