summaryrefslogtreecommitdiffabout
path: root/microkde/kglobal.cpp
Unidiff
Diffstat (limited to 'microkde/kglobal.cpp') (more/less context) (show whitespace changes)
-rw-r--r--microkde/kglobal.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/microkde/kglobal.cpp b/microkde/kglobal.cpp
index 53edd08..9cc5835 100644
--- a/microkde/kglobal.cpp
+++ b/microkde/kglobal.cpp
@@ -1,40 +1,41 @@
1#include "kglobal.h" 1#include "kglobal.h"
2#include "kstandarddirs.h" 2#include "kstandarddirs.h"
3#include <qkeycode.h> 3#include <qnamespace.h>
4#include <qapplication.h> 4#include <qapplication.h>
5#include <QDesktopWidget>
5 6
6KLocale *KGlobal::mLocale = 0; 7KLocale *KGlobal::mLocale = 0;
7KConfig *KGlobal::mConfig = 0; 8KConfig *KGlobal::mConfig = 0;
8KIconLoader *KGlobal::mIconLoader = 0; 9KIconLoader *KGlobal::mIconLoader = 0;
9KStandardDirs *KGlobal::mDirs = 0; 10KStandardDirs *KGlobal::mDirs = 0;
10 11
11QString KGlobal::mAppName = "godot"; 12QString KGlobal::mAppName = "godot";
12 13
13KLocale *KGlobal::locale() 14KLocale *KGlobal::locale()
14{ 15{
15 if ( !mLocale ) { 16 if ( !mLocale ) {
16 ASSERT(mAppName); 17 Q_ASSERT(!mAppName.isEmpty());
17 18
18 mLocale = new KLocale();//mAppName); 19 mLocale = new KLocale();//mAppName);
19 } 20 }
20 21
21 return mLocale; 22 return mLocale;
22} 23}
23 24
24//US 25//US
25void KGlobal::setLocale(KLocale *kg) 26void KGlobal::setLocale(KLocale *kg)
26{ 27{
27 mLocale = kg; 28 mLocale = kg;
28} 29}
29 30
30KConfig *KGlobal::config() 31KConfig *KGlobal::config()
31{ 32{
32 //mConfig is set inside setAppName. Though it has to be the first function you call. 33 //mConfig is set inside setAppName. Though it has to be the first function you call.
33 return mConfig; 34 return mConfig;
34} 35}
35 36
36KGlobal::Size KGlobal::getDesktopSize() 37KGlobal::Size KGlobal::getDesktopSize()
37{ 38{
38#ifdef DESKTOP_VERSION 39#ifdef DESKTOP_VERSION
39 return KGlobal::Desktop; 40 return KGlobal::Desktop;
40#else 41#else