-rw-r--r-- | libkdepim/kpimglobalprefs.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libkdepim/kpimglobalprefs.cpp b/libkdepim/kpimglobalprefs.cpp index 0fdc3e4..e8fd2d1 100644 --- a/libkdepim/kpimglobalprefs.cpp +++ b/libkdepim/kpimglobalprefs.cpp | |||
@@ -31,16 +31,17 @@ $Id$ | |||
31 | #include <kglobal.h> | 31 | #include <kglobal.h> |
32 | #include <kconfig.h> | 32 | #include <kconfig.h> |
33 | #include <klocale.h> | 33 | #include <klocale.h> |
34 | #include <kdebug.h> | 34 | #include <kdebug.h> |
35 | #include <kstaticdeleter.h> | 35 | #include <kstaticdeleter.h> |
36 | 36 | ||
37 | #include <qregexp.h> | 37 | #include <qregexp.h> |
38 | #include <qfile.h> | 38 | #include <qfile.h> |
39 | #include <stdlib.h> | ||
39 | #include <qtextstream.h> | 40 | #include <qtextstream.h> |
40 | #include <qapplication.h> | 41 | #include <qapplication.h> |
41 | #include "kpimglobalprefs.h" | 42 | #include "kpimglobalprefs.h" |
42 | 43 | ||
43 | KPimGlobalPrefs *KPimGlobalPrefs::sInstance = 0; | 44 | KPimGlobalPrefs *KPimGlobalPrefs::sInstance = 0; |
44 | static KStaticDeleter<KPimGlobalPrefs> staticDeleterGP; | 45 | static KStaticDeleter<KPimGlobalPrefs> staticDeleterGP; |
45 | 46 | ||
46 | 47 | ||
@@ -106,19 +107,19 @@ KPimGlobalPrefs::KPimGlobalPrefs( const QString &name ) | |||
106 | } | 107 | } |
107 | 108 | ||
108 | void KPimGlobalPrefs::setGlobalConfig() | 109 | void KPimGlobalPrefs::setGlobalConfig() |
109 | { | 110 | { |
110 | if ( mLocaleDict == 0 ) { | 111 | if ( mLocaleDict == 0 ) { |
111 | QString fileName ; | 112 | QString fileName ; |
112 | QString name = KGlobal::getAppName() +"/"; | 113 | QString name = KGlobal::getAppName() +"/"; |
113 | #ifndef DESKTOP_VERSION | 114 | #ifndef DESKTOP_VERSION |
114 | fileName= QString(getenv("QPEDIR"))+"/pics/kdepim/"+name | 115 | fileName= QString(getenv("QPEDIR"))+"/pics/kdepim/"+name; |
115 | #else | 116 | #else |
116 | fileName = qApp->applicationDirPath () + "/kdepim/"+ name; | 117 | fileName = qApp->applicationDirPath () + "/kdepim/"+ name; |
117 | #endif | 118 | #endif |
118 | mLocaleDict = 0; | 119 | mLocaleDict = 0; |
119 | if ( mPreferredLanguage > 0 && mPreferredLanguage < 5 ) { | 120 | if ( mPreferredLanguage > 0 && mPreferredLanguage < 5 ) { |
120 | 121 | ||
121 | if ( mPreferredLanguage == 1 ) | 122 | if ( mPreferredLanguage == 1 ) |
122 | fileName = fileName+"germantranslation.txt"; | 123 | fileName = fileName+"germantranslation.txt"; |
123 | else if ( mPreferredLanguage == 4 ) | 124 | else if ( mPreferredLanguage == 4 ) |
124 | fileName = fileName+"usertranslation.txt"; | 125 | fileName = fileName+"usertranslation.txt"; |