-Remove hardcoding of "/opt/QtPalmtop/" and use QPEApplication::qpeDir instead

In future we need a OpieStandardDir with locateFile, locateUserSetting
and such

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,30 +1,32 @@
 #include "QtDasherPlugin.h"
 
 #include <qpe/global.h>
+#include <qpe/qpeapplication.h>
  
 #include <qpainter.h>
 #include <qlist.h>
 #include <qbitmap.h>
 #include <qlayout.h>
 #include <qvbox.h>
 #include <qdialog.h>
+#include <qfile.h>
 #include <qscrollview.h>
 #include <qpopupmenu.h>
 #include <qhbuttongroup.h>
 #include <qpushbutton.h>
 #include <qmessagebox.h>
 #include <qwindowsystem_qws.h>
 
 QtDasherPlugin::QtDasherPlugin(QWidget* parent, const char* name, WFlags f) : QFrame(parent,name,f)
 {
   (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);
   interface->ChangeMaxBitRate(2.5);
   d->show();
   utf8_codec = new QUtf8Codec;
 }
 
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.