-rw-r--r-- | libopie2/opiecore/oapplication.cpp | 7 | ||||
-rw-r--r-- | libopie2/opiecore/oapplication.h | 3 | ||||
-rw-r--r-- | libopie2/opiecore/oglobal.cpp | 4 |
3 files changed, 7 insertions, 7 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,10 +1,9 @@ | |||
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 | .>+-= |
8 | _;:, .> :=|. This program is free software; you can | 7 | _;:, .> :=|. This program is free software; you can |
9 | .> <`_, > . <= redistribute it and/or modify it under | 8 | .> <`_, > . <= redistribute it and/or modify it under |
10 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 9 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
@@ -98,13 +97,15 @@ void OApplication::init() | |||
98 | sigemptyset(&sa.sa_mask); | 97 | sigemptyset(&sa.sa_mask); |
99 | sigaction(SIGSEGV, &sa, NULL); | 98 | sigaction(SIGSEGV, &sa, NULL); |
100 | */ | 99 | */ |
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 | ||
108 | 109 | ||
109 | void OApplication::showMainWidget( QWidget* widget, bool nomax ) | 110 | void OApplication::showMainWidget( QWidget* widget, bool nomax ) |
110 | { | 111 | { |
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,10 +1,9 @@ | |||
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 | .>+-= |
8 | _;:, .> :=|. This program is free software; you can | 7 | _;:, .> :=|. This program is free software; you can |
9 | .> <`_, > . <= redistribute it and/or modify it under | 8 | .> <`_, > . <= redistribute it and/or modify it under |
10 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 9 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
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,10 +1,9 @@ | |||
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 | .>+-= |
8 | _;:, .> :=|. This program is free software; you can | 7 | _;:, .> :=|. This program is free software; you can |
9 | .> <`_, > . <= redistribute it and/or modify it under | 8 | .> <`_, > . <= redistribute it and/or modify it under |
10 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 9 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
@@ -33,11 +32,12 @@ | |||
33 | OConfig* OGlobal::_config = 0; | 32 | OConfig* OGlobal::_config = 0; |
34 | 33 | ||
35 | OConfig* OGlobal::config() | 34 | 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 | } |
42 | return OGlobal::_config; | 42 | return OGlobal::_config; |
43 | } | 43 | } |