author | zecke <zecke> | 2004-10-16 22:50:23 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-10-16 22:50:23 (UTC) |
commit | 5fb6ed213aa8b4b1101082671f57db45d7b10d01 (patch) (unidiff) | |
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 | |||
@@ -160,7 +160,7 @@ void BlueBase::writeToHciConfig() | |||
160 | owarn << "writeToHciConfig" << oendl; | 160 | owarn << "writeToHciConfig" << oendl; |
161 | HciConfWrapper hciconf ( "/etc/bluetooth/hcid.conf" ); | 161 | HciConfWrapper hciconf ( "/etc/bluetooth/hcid.conf" ); |
162 | hciconf.load(); | 162 | hciconf.load(); |
163 | hciconf.setPinHelper( "/opt/QtPalmtop/bin/bluepin" ); | 163 | hciconf.setPinHelper( QPEApplication::qpeDir() + "bin/bluepin" ); |
164 | hciconf.setName( m_deviceName ); | 164 | hciconf.setName( m_deviceName ); |
165 | hciconf.setEncrypt( m_useEncryption ); | 165 | hciconf.setEncrypt( m_useEncryption ); |
166 | hciconf.setAuth( m_enableAuthentification ); | 166 | hciconf.setAuth( m_enableAuthentification ); |
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 | |||
@@ -265,11 +265,11 @@ bool UserDialog::addUser(int uid, int gid) | |||
265 | if(!(adduserDialog->userImage.isNull())) | 265 | if(!(adduserDialog->userImage.isNull())) |
266 | { | 266 | { |
267 | QDir d; | 267 | QDir d; |
268 | if(!(d.exists("/opt/QtPalmtop/pics/users"))) | 268 | if(!(d.exists(QPEApplication::qpeDir() + "pics/users"))) |
269 | { | 269 | { |
270 | d.mkdir("/opt/QtPalmtop/pics/users"); | 270 | d.mkdir(QPEApplication::qpeDir() + "pics/users"); |
271 | } | 271 | } |
272 | QString filename="/opt/QtPalmtop/pics/users/"+accounts->pw_name+".png"; | 272 | QString filename= QPEApplication::qpeDir()+"pics/users/"+accounts->pw_name+".png"; |
273 | // adduserDialog->userImage=adduserDialog->userImage.smoothScale(48,48); | 273 | // adduserDialog->userImage=adduserDialog->userImage.smoothScale(48,48); |
274 | adduserDialog->userImage.save(filename,"PNG"); | 274 | adduserDialog->userImage.save(filename,"PNG"); |
275 | } | 275 | } |
@@ -436,11 +436,11 @@ bool UserDialog::editUser(const char *username) | |||
436 | if(!(edituserDialog->userImage.isNull())) | 436 | if(!(edituserDialog->userImage.isNull())) |
437 | { | 437 | { |
438 | QDir d; | 438 | QDir d; |
439 | if(!(d.exists("/opt/QtPalmtop/pics/users"))) | 439 | if(!(d.exists(QPEApplication::qpeDir()+"pics/users"))) |
440 | { | 440 | { |
441 | d.mkdir("/opt/QtPalmtop/pics/users"); | 441 | d.mkdir(QPEApplication::qpeDir()+"pics/users"); |
442 | } | 442 | } |
443 | QString filename="/opt/QtPalmtop/pics/users/"+accounts->pw_name+".png"; | 443 | QString filename=QPEApplication::qpeDir()+"pics/users/"+accounts->pw_name+".png"; |
444 | // edituserDialog->userImage=edituserDialog->userImage.smoothScale(48,48); | 444 | // edituserDialog->userImage=edituserDialog->userImage.smoothScale(48,48); |
445 | edituserDialog->userImage.save(filename,"PNG"); | 445 | edituserDialog->userImage.save(filename,"PNG"); |
446 | } | 446 | } |