From edf54496ad7a9a5730d99f0d6ce9edc8347e1763 Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Thu, 9 Aug 2007 18:40:32 +0000 Subject: small simplification. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14260 a1c6a512-1295-4272-9138-f99709370657 --- rbutil/rbutilqt/main.cpp | 6 +++--- rbutil/rbutilqt/rbutilqt.cpp | 9 ++++----- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'rbutil') diff --git a/rbutil/rbutilqt/main.cpp b/rbutil/rbutilqt/main.cpp index 39dd3d0735..d9c1b32e2e 100644 --- a/rbutil/rbutilqt/main.cpp +++ b/rbutil/rbutilqt/main.cpp @@ -25,12 +25,12 @@ int main( int argc, char ** argv ) { QApplication app( argc, argv ); - QString absolutePath = QFileInfo(qApp->arguments().at(0)).absolutePath() + "/"; + QString absolutePath = qApp->applicationDirPath(); // portable installation: // check for a configuration file in the program folder. QSettings *user; - if(QFileInfo(absolutePath + "RockboxUtility.ini").isFile()) - user = new QSettings(absolutePath + "RockboxUtility.ini", QSettings::IniFormat, 0); + if(QFileInfo(absolutePath + "/RockboxUtility.ini").isFile()) + user = new QSettings(absolutePath + "/RockboxUtility.ini", QSettings::IniFormat, 0); else user = new QSettings(QSettings::IniFormat, QSettings::UserScope, "rockbox.org", "RockboxUtility"); QTranslator translator; diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index def0e15e47..35b227f6e1 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp @@ -36,10 +36,9 @@ RbUtilQt::RbUtilQt(QWidget *parent) : QMainWindow(parent) { - QString programPath = qApp->arguments().at(0); - absolutePath = QFileInfo(programPath).absolutePath() + "/"; + absolutePath = qApp->applicationDirPath(); // use built-in rbutil.ini if no external file in binary folder - QString iniFile = absolutePath + "rbutil.ini"; + QString iniFile = absolutePath + "/rbutil.ini"; if(QFileInfo(iniFile).isFile()) { qDebug() << "using external rbutil.ini"; devices = new QSettings(iniFile, QSettings::IniFormat, 0); @@ -54,9 +53,9 @@ RbUtilQt::RbUtilQt(QWidget *parent) : QMainWindow(parent) // portable installation: // check for a configuration file in the program folder. QFileInfo config; - config.setFile(absolutePath + "RockboxUtility.ini"); + config.setFile(absolutePath + "/RockboxUtility.ini"); if(config.isFile()) { - userSettings = new QSettings(absolutePath + "RockboxUtility.ini", + userSettings = new QSettings(absolutePath + "/RockboxUtility.ini", QSettings::IniFormat, 0); qDebug() << "config: portable"; } -- cgit v1.2.3