author | zecke <zecke> | 2004-10-16 22:50:23 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-10-16 22:50:23 (UTC) |
commit | 5fb6ed213aa8b4b1101082671f57db45d7b10d01 (patch) (side-by-side diff) | |
tree | a38ed0cd40d0e3960226e724c52864b64f44d000 /noncore | |
parent | 79c4778d1dc6050975fceeee7aab0ac0c28462ca (diff) | |
download | opie-5fb6ed213aa8b4b1101082671f57db45d7b10d01.zip opie-5fb6ed213aa8b4b1101082671f57db45d7b10d01.tar.gz opie-5fb6ed213aa8b4b1101082671f57db45d7b10d01.tar.bz2 |
-Remove hardcoding of "/opt/QtPalmtop/" and use QPEApplication::qpeDir instead
In future we need a OpieStandardDir with locateFile, locateUserSetting
and such
-rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 2 | ||||
-rw-r--r-- | noncore/settings/usermanager/userdialog.cpp | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp index ee01b61..90e44cb 100644 --- a/noncore/net/opietooth/manager/bluebase.cpp +++ b/noncore/net/opietooth/manager/bluebase.cpp @@ -155,17 +155,17 @@ void BlueBase::writeConfig() /** * Modify the hcid.conf file to our needs */ void BlueBase::writeToHciConfig() { owarn << "writeToHciConfig" << oendl; HciConfWrapper hciconf ( "/etc/bluetooth/hcid.conf" ); hciconf.load(); - hciconf.setPinHelper( "/opt/QtPalmtop/bin/bluepin" ); + hciconf.setPinHelper( QPEApplication::qpeDir() + "bin/bluepin" ); hciconf.setName( m_deviceName ); hciconf.setEncrypt( m_useEncryption ); hciconf.setAuth( m_enableAuthentification ); hciconf.setPscan( m_enablePagescan ); hciconf.setIscan( m_enableInquiryscan ); hciconf.save(); } diff --git a/noncore/settings/usermanager/userdialog.cpp b/noncore/settings/usermanager/userdialog.cpp index 3616507..9dfb2af 100644 --- a/noncore/settings/usermanager/userdialog.cpp +++ b/noncore/settings/usermanager/userdialog.cpp @@ -260,21 +260,21 @@ bool UserDialog::addUser(int uid, int gid) temp=(QCheckListItem*)it.current(); if (temp->isOn() ) accounts->addGroupMember(it.current()->text(0),adduserDialog->loginLineEdit->text()); } // Copy image to pics/users/ if(!(adduserDialog->userImage.isNull())) { QDir d; - if(!(d.exists("/opt/QtPalmtop/pics/users"))) + if(!(d.exists(QPEApplication::qpeDir() + "pics/users"))) { - d.mkdir("/opt/QtPalmtop/pics/users"); + d.mkdir(QPEApplication::qpeDir() + "pics/users"); } - QString filename="/opt/QtPalmtop/pics/users/"+accounts->pw_name+".png"; + QString filename= QPEApplication::qpeDir()+"pics/users/"+accounts->pw_name+".png"; // adduserDialog->userImage=adduserDialog->userImage.smoothScale(48,48); adduserDialog->userImage.save(filename,"PNG"); } // Should we copy the skeleton homedirectory /etc/skel to the user's homedirectory? accounts->findUser(adduserDialog->loginLineEdit->text()); if(adduserDialog->skelCheckBox->isChecked()) { @@ -431,21 +431,21 @@ bool UserDialog::editUser(const char *username) if ( temp->isOn() ) accounts->addGroupMember(it.current()->text(0),edituserDialog->loginLineEdit->text()); } // Copy image to pics/users/ if(!(edituserDialog->userImage.isNull())) { QDir d; - if(!(d.exists("/opt/QtPalmtop/pics/users"))) + if(!(d.exists(QPEApplication::qpeDir()+"pics/users"))) { - d.mkdir("/opt/QtPalmtop/pics/users"); + d.mkdir(QPEApplication::qpeDir()+"pics/users"); } - QString filename="/opt/QtPalmtop/pics/users/"+accounts->pw_name+".png"; + QString filename=QPEApplication::qpeDir()+"pics/users/"+accounts->pw_name+".png"; // edituserDialog->userImage=edituserDialog->userImage.smoothScale(48,48); edituserDialog->userImage.save(filename,"PNG"); } return true; } /** * "OK" has been clicked. Verify some information before closing the dialog. |