-rw-r--r-- | inputmethods/dasher/QtDasherPlugin.cc | 4 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 2 | ||||
-rw-r--r-- | noncore/settings/usermanager/userdialog.cpp | 12 |
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 @@ | |||
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> |
7 | #include <qbitmap.h> | 8 | #include <qbitmap.h> |
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> |
14 | #include <qpushbutton.h> | 16 | #include <qpushbutton.h> |
15 | #include <qmessagebox.h> | 17 | #include <qmessagebox.h> |
16 | #include <qwindowsystem_qws.h> | 18 | #include <qwindowsystem_qws.h> |
17 | 19 | ||
18 | QtDasherPlugin::QtDasherPlugin(QWidget* parent, const char* name, WFlags f) : QFrame(parent,name,f) | 20 | QtDasherPlugin::QtDasherPlugin(QWidget* parent, const char* name, WFlags f) : QFrame(parent,name,f) |
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); |
26 | interface->ChangeMaxBitRate(2.5); | 28 | interface->ChangeMaxBitRate(2.5); |
27 | d->show(); | 29 | d->show(); |
28 | utf8_codec = new QUtf8Codec; | 30 | utf8_codec = new QUtf8Codec; |
29 | } | 31 | } |
30 | 32 | ||
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() | |||
155 | /** | 155 | /** |
156 | * Modify the hcid.conf file to our needs | 156 | * Modify the hcid.conf file to our needs |
157 | */ | 157 | */ |
158 | void BlueBase::writeToHciConfig() | 158 | void BlueBase::writeToHciConfig() |
159 | { | 159 | { |
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 ); |
167 | hciconf.setPscan( m_enablePagescan ); | 167 | hciconf.setPscan( m_enablePagescan ); |
168 | hciconf.setIscan( m_enableInquiryscan ); | 168 | hciconf.setIscan( m_enableInquiryscan ); |
169 | hciconf.save(); | 169 | hciconf.save(); |
170 | } | 170 | } |
171 | 171 | ||
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) | |||
260 | temp=(QCheckListItem*)it.current(); | 260 | temp=(QCheckListItem*)it.current(); |
261 | if (temp->isOn() ) | 261 | if (temp->isOn() ) |
262 | accounts->addGroupMember(it.current()->text(0),adduserDialog->loginLineEdit->text()); | 262 | accounts->addGroupMember(it.current()->text(0),adduserDialog->loginLineEdit->text()); |
263 | } | 263 | } |
264 | // Copy image to pics/users/ | 264 | // Copy image to pics/users/ |
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 | } |
276 | 276 | ||
277 | // Should we copy the skeleton homedirectory /etc/skel to the user's homedirectory? | 277 | // Should we copy the skeleton homedirectory /etc/skel to the user's homedirectory? |
278 | accounts->findUser(adduserDialog->loginLineEdit->text()); | 278 | accounts->findUser(adduserDialog->loginLineEdit->text()); |
279 | if(adduserDialog->skelCheckBox->isChecked()) | 279 | if(adduserDialog->skelCheckBox->isChecked()) |
280 | { | 280 | { |
@@ -431,21 +431,21 @@ bool UserDialog::editUser(const char *username) | |||
431 | if ( temp->isOn() ) | 431 | if ( temp->isOn() ) |
432 | accounts->addGroupMember(it.current()->text(0),edituserDialog->loginLineEdit->text()); | 432 | accounts->addGroupMember(it.current()->text(0),edituserDialog->loginLineEdit->text()); |
433 | } | 433 | } |
434 | 434 | ||
435 | // Copy image to pics/users/ | 435 | // Copy image to pics/users/ |
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 | } |
447 | return true; | 447 | return true; |
448 | } | 448 | } |
449 | 449 | ||
450 | /** | 450 | /** |
451 | * "OK" has been clicked. Verify some information before closing the dialog. | 451 | * "OK" has been clicked. Verify some information before closing the dialog. |