author | ulf69 <ulf69> | 2004-07-02 15:35:34 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-07-02 15:35:34 (UTC) |
commit | b21b6754c93e5aaa53638a060e26f4efea755d37 (patch) (unidiff) | |
tree | 2a78ca54cda74c2bff11c1244741d1bc48994ad6 /kabc | |
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 |
1 files changed, 3 insertions, 14 deletions
diff --git a/kabc/stdaddressbook.cpp b/kabc/stdaddressbook.cpp index 144a9dc..075f12f 100644 --- a/kabc/stdaddressbook.cpp +++ b/kabc/stdaddressbook.cpp | |||
@@ -22,26 +22,13 @@ | |||
22 | Enhanced Version of the file for platform independent KDE tools. | 22 | Enhanced Version of the file for platform independent KDE tools. |
23 | Copyright (c) 2004 Ulf Schenk | 23 | Copyright (c) 2004 Ulf Schenk |
24 | 24 | ||
25 | $Id$ | 25 | $Id$ |
26 | */ | 26 | */ |
27 | 27 | ||
28 | /*US | ||
29 | #include <stdlib.h> | ||
30 | |||
31 | #include <kapplication.h> | ||
32 | #include <kcrash.h> | ||
33 | #include <ksimpleconfig.h> | ||
34 | */ | ||
35 | |||
36 | #ifndef DESKTOP_VERSION | ||
37 | #include <qpe/global.h> | ||
38 | #else | ||
39 | #include <qdir.h> | 28 | #include <qdir.h> |
40 | #endif | ||
41 | |||
42 | #include "resource.h" | 29 | #include "resource.h" |
43 | #include <kresources/manager.h> | 30 | #include <kresources/manager.h> |
44 | #include <kdebug.h> | 31 | #include <kdebug.h> |
45 | #include <klocale.h> | 32 | #include <klocale.h> |
46 | #include <kstaticdeleter.h> | 33 | #include <kstaticdeleter.h> |
47 | #include <kstandarddirs.h> | 34 | #include <kstandarddirs.h> |
@@ -98,13 +85,15 @@ QString StdAddressBook::setTempAppDir() | |||
98 | if ( appdir.right(1) == "\\" || appdir.right(1) == "/" ) | 85 | if ( appdir.right(1) == "\\" || appdir.right(1) == "/" ) |
99 | appdir += "kaddressbook/"; | 86 | appdir += "kaddressbook/"; |
100 | else | 87 | else |
101 | appdir += "/kaddressbook/"; | 88 | appdir += "/kaddressbook/"; |
102 | KStandardDirs::setAppDir( QDir::convertSeparators( appdir )); | 89 | KStandardDirs::setAppDir( QDir::convertSeparators( appdir )); |
103 | #else | 90 | #else |
104 | KStandardDirs::setAppDir( Global::applicationFileName( "kaddressbook", "" ) ); | 91 | QString appdir = QDir::homeDirPath() + "/kdepim/apps/kaddressbook"; |
92 | |||
93 | KStandardDirs::setAppDir( appdir ); | ||
105 | #endif | 94 | #endif |
106 | 95 | ||
107 | return appDIR; | 96 | return appDIR; |
108 | } | 97 | } |
109 | StdAddressBook *StdAddressBook::self( bool onlyFastResources ) | 98 | StdAddressBook *StdAddressBook::self( bool onlyFastResources ) |
110 | { | 99 | { |