summaryrefslogtreecommitdiffabout
path: root/libkdepim
authorzautrix <zautrix>2004-10-23 15:37:38 (UTC)
committer zautrix <zautrix>2004-10-23 15:37:38 (UTC)
commit5415db4a06862b57539de051e2e82c8d8f3a5b48 (patch) (unidiff)
treea0a5719246aba7d2a5e36b8d8601193ba9e907b3 /libkdepim
parent54c77b2331f9afe90643c6d1343a7f5543577b71 (diff)
downloadkdepimpi-5415db4a06862b57539de051e2e82c8d8f3a5b48.zip
kdepimpi-5415db4a06862b57539de051e2e82c8d8f3a5b48.tar.gz
kdepimpi-5415db4a06862b57539de051e2e82c8d8f3a5b48.tar.bz2
compile fixes
Diffstat (limited to 'libkdepim') (more/less context) (ignore whitespace changes)
-rw-r--r--libkdepim/kpimglobalprefs.cpp5
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
43KPimGlobalPrefs *KPimGlobalPrefs::sInstance = 0; 44KPimGlobalPrefs *KPimGlobalPrefs::sInstance = 0;
44static KStaticDeleter<KPimGlobalPrefs> staticDeleterGP; 45static KStaticDeleter<KPimGlobalPrefs> staticDeleterGP;
45 46
46 47
@@ -106,19 +107,19 @@ KPimGlobalPrefs::KPimGlobalPrefs( const QString &name )
106} 107}
107 108
108void KPimGlobalPrefs::setGlobalConfig() 109void 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";