summaryrefslogtreecommitdiff
authorzecke <zecke>2004-10-16 22:50:23 (UTC)
committer zecke <zecke>2004-10-16 22:50:23 (UTC)
commit5fb6ed213aa8b4b1101082671f57db45d7b10d01 (patch) (unidiff)
treea38ed0cd40d0e3960226e724c52864b64f44d000
parent79c4778d1dc6050975fceeee7aab0ac0c28462ca (diff)
downloadopie-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
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--inputmethods/dasher/QtDasherPlugin.cc4
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp2
-rw-r--r--noncore/settings/usermanager/userdialog.cpp12
3 files changed, 10 insertions, 8 deletions
diff --git a/inputmethods/dasher/QtDasherPlugin.cc b/inputmethods/dasher/QtDasherPlugin.cc
index 50d4539..91167c2 100644
--- a/inputmethods/dasher/QtDasherPlugin.cc
+++ b/inputmethods/dasher/QtDasherPlugin.cc
@@ -1,6 +1,7 @@
1#include "QtDasherPlugin.h" 1#include "QtDasherPlugin.h"
2 2
3#include <qpe/global.h> 3#include <qpe/global.h>
4#include <qpe/qpeapplication.h>
4 5
5#include <qpainter.h> 6#include <qpainter.h>
6#include <qlist.h> 7#include <qlist.h>
@@ -8,6 +9,7 @@
8#include <qlayout.h> 9#include <qlayout.h>
9#include <qvbox.h> 10#include <qvbox.h>
10#include <qdialog.h> 11#include <qdialog.h>
12#include <qfile.h>
11#include <qscrollview.h> 13#include <qscrollview.h>
12#include <qpopupmenu.h> 14#include <qpopupmenu.h>
13#include <qhbuttongroup.h> 15#include <qhbuttongroup.h>
@@ -19,7 +21,7 @@ QtDasherPlugin::QtDasherPlugin(QWidget* parent, const char* name, WFlags f) : QF
19{ 21{
20 (new QHBoxLayout(this))->setAutoAdd(TRUE); 22 (new QHBoxLayout(this))->setAutoAdd(TRUE);
21 interface = new CDasherInterface; 23 interface = new CDasherInterface;
22 interface->SetSystemLocation("/opt/QtPalmtop/share/dasher/"); 24 interface->SetSystemLocation( QFile::encodeName(QPEApplication::qpeDir()+"share/dasher/").data() );
23 interface->Unpause(0); 25 interface->Unpause(0);
24 interface->Start(); 26 interface->Start();
25 d = new QtDasherScreen(240,100,interface,this,this); 27 d = new QtDasherScreen(240,100,interface,this,this);
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 }