devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

small simplification.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14260 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling 2007-08-09 18:40:32 +00:00
parent 36b150e5dc
commit edf54496ad
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rbutil/rbutilqt/main.cpp
View file

@ -25,12 +25,12 @@
int main( int argc, char ** argv ) { int main( int argc, char ** argv ) {
QApplication app( argc, argv ); QApplication app( argc, argv );
QString absolutePath = QFileInfo(qApp->arguments().at(0)).absolutePath() + "/"; QString absolutePath = qApp->applicationDirPath();
// portable installation: // portable installation:
// check for a configuration file in the program folder. // check for a configuration file in the program folder.
QSettings *user; QSettings *user;
if(QFileInfo(absolutePath + "RockboxUtility.ini").isFile()) if(QFileInfo(absolutePath + "/RockboxUtility.ini").isFile())
user = new QSettings(absolutePath + "RockboxUtility.ini", QSettings::IniFormat, 0); user = new QSettings(absolutePath + "/RockboxUtility.ini", QSettings::IniFormat, 0);
else user = new QSettings(QSettings::IniFormat, QSettings::UserScope, "rockbox.org", "RockboxUtility"); else user = new QSettings(QSettings::IniFormat, QSettings::UserScope, "rockbox.org", "RockboxUtility");
QTranslator translator; QTranslator translator;

9
rbutil/rbutilqt/rbutilqt.cpp
View file

@ -36,10 +36,9 @@
RbUtilQt::RbUtilQt(QWidget *parent) : QMainWindow(parent) RbUtilQt::RbUtilQt(QWidget *parent) : QMainWindow(parent)
{ {
QString programPath = qApp->arguments().at(0); absolutePath = qApp->applicationDirPath();
absolutePath = QFileInfo(programPath).absolutePath() + "/";
// use built-in rbutil.ini if no external file in binary folder // 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()) { if(QFileInfo(iniFile).isFile()) {
qDebug() << "using external rbutil.ini"; qDebug() << "using external rbutil.ini";
devices = new QSettings(iniFile, QSettings::IniFormat, 0); devices = new QSettings(iniFile, QSettings::IniFormat, 0);
@ -54,9 +53,9 @@ RbUtilQt::RbUtilQt(QWidget *parent) : QMainWindow(parent)
// portable installation: // portable installation:
// check for a configuration file in the program folder. // check for a configuration file in the program folder.
QFileInfo config; QFileInfo config;
config.setFile(absolutePath + "RockboxUtility.ini"); config.setFile(absolutePath + "/RockboxUtility.ini");
if(config.isFile()) { if(config.isFile()) {
userSettings = new QSettings(absolutePath + "RockboxUtility.ini", userSettings = new QSettings(absolutePath + "/RockboxUtility.ini",
QSettings::IniFormat, 0); QSettings::IniFormat, 0);
qDebug() << "config: portable"; qDebug() << "config: portable";
} }