-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 | |||
@@ -20,30 +20,17 @@ | |||
20 | 20 | ||
21 | /* | 21 | /* |
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> |
48 | 35 | ||
49 | #include "stdaddressbook.h" | 36 | #include "stdaddressbook.h" |
@@ -96,17 +83,19 @@ QString StdAddressBook::setTempAppDir() | |||
96 | #ifdef DESKTOP_VERSION | 83 | #ifdef DESKTOP_VERSION |
97 | QString appdir = QDir::homeDirPath(); | 84 | QString appdir = QDir::homeDirPath(); |
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 | { |
111 | 100 | ||
112 | if ( !mSelf ) | 101 | if ( !mSelf ) |