| author | ulf69 <ulf69> | 2004-07-02 15:35:34 (UTC) |
|---|---|---|
| committer | ulf69 <ulf69> | 2004-07-02 15:35:34 (UTC) |
| commit | b21b6754c93e5aaa53638a060e26f4efea755d37 (patch) (side-by-side diff) | |
| tree | 2a78ca54cda74c2bff11c1244741d1bc48994ad6 | |
| parent | bb7ad945c1541684a02e853fdaabd0e3ba74f8df (diff) | |
| download | kdepimpi-b21b6754c93e5aaa53638a060e26f4efea755d37.zip kdepimpi-b21b6754c93e5aaa53638a060e26f4efea755d37.tar.gz kdepimpi-b21b6754c93e5aaa53638a060e26f4efea755d37.tar.bz2 | |
removed references to Global::applicationFileName because this call creates the appdir
in ~/Applications/ which is not correct for MicroKDE
| -rw-r--r-- | kabc/stdaddressbook.cpp | 17 | ||||
| -rw-r--r-- | kaddressbook/mainembedded.cpp | 4 | ||||
| -rw-r--r-- | korganizer/main.cpp | 4 |
3 files changed, 9 insertions, 16 deletions
diff --git a/kabc/stdaddressbook.cpp b/kabc/stdaddressbook.cpp index 144a9dc..075f12f 100644 --- a/kabc/stdaddressbook.cpp +++ b/kabc/stdaddressbook.cpp @@ -26,18 +26,5 @@ $Id$ */ -/*US -#include <stdlib.h> - -#include <kapplication.h> -#include <kcrash.h> -#include <ksimpleconfig.h> -*/ - -#ifndef DESKTOP_VERSION -#include <qpe/global.h> -#else #include <qdir.h> -#endif - #include "resource.h" #include <kresources/manager.h> @@ -102,5 +89,7 @@ QString StdAddressBook::setTempAppDir() KStandardDirs::setAppDir( QDir::convertSeparators( appdir )); #else - KStandardDirs::setAppDir( Global::applicationFileName( "kaddressbook", "" ) ); + QString appdir = QDir::homeDirPath() + "/kdepim/apps/kaddressbook"; + + KStandardDirs::setAppDir( appdir ); #endif diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp index 3f6f69d..47b5484 100644 --- a/kaddressbook/mainembedded.cpp +++ b/kaddressbook/mainembedded.cpp @@ -41,5 +41,7 @@ int main( int argc, char **argv ) KGlobal::setAppName( "kaddressbook" ); #ifndef DESKTOP_VERSION - KStandardDirs::setAppDir( Global::applicationFileName( "kaddressbook", "" ) ); + QString appdir = QDir::homeDirPath() + "/kdepim/apps/" + KGlobal::getAppName(); + + KStandardDirs::setAppDir( appdir ); KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons16/"); #else diff --git a/korganizer/main.cpp b/korganizer/main.cpp index 6843595..a357988 100644 --- a/korganizer/main.cpp +++ b/korganizer/main.cpp @@ -58,5 +58,7 @@ int main( int argc, char **argv ) QString fileName ; #ifndef DESKTOP_VERSION - KStandardDirs::setAppDir( Global::applicationFileName( "korganizer", "" ) ); + QString appdir = QDir::homeDirPath() + "/kdepim/apps/" + KGlobal::getAppName(); + KStandardDirs::setAppDir( appdir ); + fileName = getenv("QPEDIR"); KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/korganizer/"); |