summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-06-22 10:36:46 (UTC)
committer mickeyl <mickeyl>2004-06-22 10:36:46 (UTC)
commit9c471976e750812f0af3b443964954d4b5a5ed20 (patch) (unidiff)
treec049d0b1b419a4b76aaea02d063484b4e3f1fc4e
parent9cff98cb70d8e3a69cefe718bf02720134c10bca (diff)
downloadopie-9c471976e750812f0af3b443964954d4b5a5ed20.zip
opie-9c471976e750812f0af3b443964954d4b5a5ed20.tar.gz
opie-9c471976e750812f0af3b443964954d4b5a5ed20.tar.bz2
use stderr as default odebug output destination as pointed out by Brad
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
@@ -25,24 +25,25 @@
25 -.   .:....=;==+<; You should have received a copy of the GNU 25 -.   .:....=;==+<; You should have received a copy of the GNU
26  -_. . .   )=.  = Library General Public License along with 26  -_. . .   )=.  = Library General Public License along with
27    --        :-=` this library; see the file COPYING.LIB. 27    --        :-=` this library; see the file COPYING.LIB.
28 If not, write to the Free Software Foundation, 28 If not, write to the Free Software Foundation,
29 Inc., 59 Temple Place - Suite 330, 29 Inc., 59 Temple Place - Suite 330,
30 Boston, MA 02111-1307, USA. 30 Boston, MA 02111-1307, USA.
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
43/* UNIX */ 44/* UNIX */
44 45
45#include <stdlib.h> 46#include <stdlib.h>
46 47
47 48
48using namespace Opie::Core; 49using namespace Opie::Core;
@@ -52,25 +53,25 @@ QString* OGlobalSettings::s_autostartPath = 0;
52QString* OGlobalSettings::s_trashPath = 0; 53QString* OGlobalSettings::s_trashPath = 0;
53QString* OGlobalSettings::s_documentPath = 0; 54QString* OGlobalSettings::s_documentPath = 0;
54QFont *OGlobalSettings::_generalFont = 0; 55QFont *OGlobalSettings::_generalFont = 0;
55QFont *OGlobalSettings::_fixedFont = 0; 56QFont *OGlobalSettings::_fixedFont = 0;
56QFont *OGlobalSettings::_toolBarFont = 0; 57QFont *OGlobalSettings::_toolBarFont = 0;
57QFont *OGlobalSettings::_menuFont = 0; 58QFont *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{
71 OConfig *c = OGlobal::config(); 72 OConfig *c = OGlobal::config();
72 OConfigGroupSaver cgs( c, "General" ); 73 OConfigGroupSaver cgs( c, "General" );
73 return c->readNumEntry("DndDelay", 2); 74 return c->readNumEntry("DndDelay", 2);
74} 75}
75 76
76bool OGlobalSettings::singleClick() 77bool OGlobalSettings::singleClick()
@@ -150,25 +151,25 @@ int OGlobalSettings::contextMenuKey ()
150 151
151 //OShortcut cut (cgs.config()->readEntry ("PopupMenuContext", "Menu")); 152 //OShortcut cut (cgs.config()->readEntry ("PopupMenuContext", "Menu"));
152 //return cut.keyCodeQt(); 153 //return cut.keyCodeQt();
153 154
154 return 0; // FIXME 155 return 0; // FIXME
155} 156}
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}
169 170
170 171
171QString OGlobalSettings::debugOutput() 172QString OGlobalSettings::debugOutput()
172{ 173{
173 OConfig *c = OGlobal::config(); 174 OConfig *c = OGlobal::config();
174 OConfigGroupSaver cgs( c, "General" ); 175 OConfigGroupSaver cgs( c, "General" );