summaryrefslogtreecommitdiff
path: root/libopie2
authormickeyl <mickeyl>2003-12-02 16:00:17 (UTC)
committer mickeyl <mickeyl>2003-12-02 16:00:17 (UTC)
commit7b74f202db22d458c43b2063ae128bf79b0e9777 (patch) (unidiff)
treef974e1a4a4b71c3e5a9d09620f07f4993f16011d /libopie2
parente215d4b2bc542b557913ba3dcd57fd20a5a2a0fe (diff)
downloadopie-7b74f202db22d458c43b2063ae128bf79b0e9777.zip
opie-7b74f202db22d458c43b2063ae128bf79b0e9777.tar.gz
opie-7b74f202db22d458c43b2063ae128bf79b0e9777.tar.bz2
warning: file restrucuration on server ahead
be sure to do a complete checkout of libopie2 again tomorrow
Diffstat (limited to 'libopie2') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/oapplication.cpp7
-rw-r--r--libopie2/opiecore/oapplication.h3
-rw-r--r--libopie2/opiecore/oglobal.cpp6
3 files changed, 8 insertions, 8 deletions
diff --git a/libopie2/opiecore/oapplication.cpp b/libopie2/opiecore/oapplication.cpp
index c3cacce..1b85057 100644
--- a/libopie2/opiecore/oapplication.cpp
+++ b/libopie2/opiecore/oapplication.cpp
@@ -1,7 +1,6 @@
1/* 1/*
2                 This file is part of the Opie Project 2                 This file is part of the Opie Project
3 3              Copyright (C) 2003 Michael 'Mickey' Lauer <mickey@Vanille.de>
4              Copyright (C) 2003 Michael Lauer <mickey@tm.informatik.uni-frankfurt.de>
5 =. 4 =.
6 .=l. 5 .=l.
7           .>+-= 6           .>+-=
@@ -101,7 +100,9 @@ void OApplication::init()
101 } 100 }
102 else 101 else
103 { 102 {
104 qFatal( "OApplication: Can't create more than one OApplication object. Aborting." ); 103 ofatal << "OApplication: Can't create more than one OApplication object. Aborting." << oendl;
104 //FIXME exit gracefully ?
105 ::exit( -1 );
105 } 106 }
106} 107}
107 108
diff --git a/libopie2/opiecore/oapplication.h b/libopie2/opiecore/oapplication.h
index 72a659e..cc506a2 100644
--- a/libopie2/opiecore/oapplication.h
+++ b/libopie2/opiecore/oapplication.h
@@ -1,7 +1,6 @@
1/* 1/*
2                 This file is part of the Opie Project 2                 This file is part of the Opie Project
3 3              Copyright (C) 2003 Michael 'Mickey' Lauer <mickey@Vanille.de>
4              Copyright (C) 2003 Michael Lauer <mickey@tm.informatik.uni-frankfurt.de>
5 =. 4 =.
6 .=l. 5 .=l.
7           .>+-= 6           .>+-=
diff --git a/libopie2/opiecore/oglobal.cpp b/libopie2/opiecore/oglobal.cpp
index ae2fcb6..3390ec0 100644
--- a/libopie2/opiecore/oglobal.cpp
+++ b/libopie2/opiecore/oglobal.cpp
@@ -1,7 +1,6 @@
1/* 1/*
2                 This file is part of the Opie Project 2                 This file is part of the Opie Project
3 3              Copyright (C) 2003 Michael 'Mickey' Lauer <mickey@Vanille.de>
4              Copyright (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
5 =. 4 =.
6 .=l. 5 .=l.
7           .>+-= 6           .>+-=
@@ -26,7 +25,7 @@
26 If not, write to the Free Software Foundation, 25 If not, write to the Free Software Foundation,
27 Inc., 59 Temple Place - Suite 330, 26 Inc., 59 Temple Place - Suite 330,
28 Boston, MA 02111-1307, USA. 27 Boston, MA 02111-1307, USA.
29 */ 28*/
30 29
31#include <opie2/oglobal.h> 30#include <opie2/oglobal.h>
32 31
@@ -36,6 +35,7 @@ OConfig* OGlobal::config()
36{ 35{
37 if ( !OGlobal::_config ) 36 if ( !OGlobal::_config )
38 { 37 {
38 // odebug classes are reading config, so can't use them here!
39 qDebug( "OGlobal::creating global configuration instance." ); 39 qDebug( "OGlobal::creating global configuration instance." );
40 OGlobal::_config = new OConfig( "global" ); 40 OGlobal::_config = new OConfig( "global" );
41 } 41 }