summaryrefslogtreecommitdiff
Side-by-side diff
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 @@
#include "QtDasherPlugin.h"
#include <qpe/global.h>
+#include <qpe/qpeapplication.h>
#include <qpainter.h>
#include <qlist.h>
@@ -8,6 +9,7 @@
#include <qlayout.h>
#include <qvbox.h>
#include <qdialog.h>
+#include <qfile.h>
#include <qscrollview.h>
#include <qpopupmenu.h>
#include <qhbuttongroup.h>
@@ -19,7 +21,7 @@ QtDasherPlugin::QtDasherPlugin(QWidget* parent, const char* name, WFlags f) : QF
{
(new QHBoxLayout(this))->setAutoAdd(TRUE);
interface = new CDasherInterface;
- interface->SetSystemLocation("/opt/QtPalmtop/share/dasher/");
+ interface->SetSystemLocation( QFile::encodeName(QPEApplication::qpeDir()+"share/dasher/").data() );
interface->Unpause(0);
interface->Start();
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()
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 );
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)
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");
}
@@ -436,11 +436,11 @@ bool UserDialog::editUser(const char *username)
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");
}