summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/oglobalsettings.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/libopie2/opiecore/oglobalsettings.cpp b/libopie2/opiecore/oglobalsettings.cpp
index f34c531..89c77d7 100644
--- a/libopie2/opiecore/oglobalsettings.cpp
+++ b/libopie2/opiecore/oglobalsettings.cpp
@@ -31,12 +31,13 @@
31*/ 31*/
32 32
33/* OPIE */ 33/* OPIE */
34 34
35#include <opie2/oglobalsettings.h> 35#include <opie2/oglobalsettings.h>
36#include <opie2/oconfig.h> 36#include <opie2/oconfig.h>
37#include <opie2/odebug.h>
37#include <opie2/oglobal.h> 38#include <opie2/oglobal.h>
38 39
39/* QT */ 40/* QT */
40 41
41#include <qdir.h> 42#include <qdir.h>
42 43
@@ -58,13 +59,13 @@ QFont *OGlobalSettings::_menuFont = 0;
58QFont *OGlobalSettings::_windowTitleFont = 0; 59QFont *OGlobalSettings::_windowTitleFont = 0;
59QFont *OGlobalSettings::_taskbarFont = 0; 60QFont *OGlobalSettings::_taskbarFont = 0;
60 61
61QColor *OGlobalSettings::OpieGray = 0; 62QColor *OGlobalSettings::OpieGray = 0;
62QColor *OGlobalSettings::OpieHighlight = 0; 63QColor *OGlobalSettings::OpieHighlight = 0;
63QColor *OGlobalSettings::OpieAlternate = 0; 64QColor *OGlobalSettings::OpieAlternate = 0;
64 65
65OGlobalSettings::OMouseSettings *OGlobalSettings::s_mouseSettings = 0; 66OGlobalSettings::OMouseSettings *OGlobalSettings::s_mouseSettings = 0;
66 67
67//FIXME: Add manipulators to the accessors 68//FIXME: Add manipulators to the accessors
68 69
69int OGlobalSettings::dndEventDelay() 70int OGlobalSettings::dndEventDelay()
70{ 71{
@@ -156,13 +157,13 @@ int OGlobalSettings::contextMenuKey ()
156 157
157 158
158OGlobalSettings::Debug OGlobalSettings::debugMode() 159OGlobalSettings::Debug OGlobalSettings::debugMode()
159{ 160{
160 OConfig *c = OGlobal::config(); 161 OConfig *c = OGlobal::config();
161 OConfigGroupSaver cgs( c, "General" ); 162 OConfigGroupSaver cgs( c, "General" );
162 int debug = c->readNumEntry( "debugMode", -1 ); 163 int debug = c->readNumEntry( "debugMode", ODEBUG_STDERR );
163 if ( (debug < (int) DebugNone) || (debug > (int) DebugSocket) ) 164 if ( (debug < (int) DebugNone) || (debug > (int) DebugSocket) )
164 { 165 {
165 debug = (int) DebugStdErr; // Default 166 debug = (int) DebugStdErr; // Default
166 } 167 }
167 return (Debug) debug; 168 return (Debug) debug;
168} 169}