author | mickeyl <mickeyl> | 2003-12-02 16:00:17 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-12-02 16:00:17 (UTC) |
commit | 7b74f202db22d458c43b2063ae128bf79b0e9777 (patch) (unidiff) | |
tree | f974e1a4a4b71c3e5a9d09620f07f4993f16011d /libopie2/opiecore | |
parent | e215d4b2bc542b557913ba3dcd57fd20a5a2a0fe (diff) | |
download | opie-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
-rw-r--r-- | libopie2/opiecore/oapplication.cpp | 7 | ||||
-rw-r--r-- | libopie2/opiecore/oapplication.h | 3 | ||||
-rw-r--r-- | libopie2/opiecore/oglobal.cpp | 6 |
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,16 +1,15 @@ | |||
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 |
11 | .="- .-=="i, .._ License as published by the Free Software | 10 | .="- .-=="i, .._ License as published by the Free Software |
12 | - . .-<_> .<> Foundation; either version 2 of the License, | 11 | - . .-<_> .<> Foundation; either version 2 of the License, |
13 | ._= =} : or (at your option) any later version. | 12 | ._= =} : or (at your option) any later version. |
14 | .%`+i> _;_. | 13 | .%`+i> _;_. |
15 | .i_,=:_. -<s. This program is distributed in the hope that | 14 | .i_,=:_. -<s. This program is distributed in the hope that |
16 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
@@ -92,25 +91,27 @@ void OApplication::init() | |||
92 | 91 | ||
93 | /* register SIGSEGV handler to give programs an option | 92 | /* register SIGSEGV handler to give programs an option |
94 | * to exit gracefully, e.g. save or close devices or files. | 93 | * to exit gracefully, e.g. save or close devices or files. |
95 | struct sigaction sa; | 94 | struct sigaction sa; |
96 | sa.sa_handler = ( void (*)(int) ) &segv_handler; | 95 | sa.sa_handler = ( void (*)(int) ) &segv_handler; |
97 | sa.sa_flags = SA_SIGINFO | SA_RESTART; | 96 | sa.sa_flags = SA_SIGINFO | SA_RESTART; |
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 | { |
111 | QPEApplication::showMainWidget( widget, nomax ); | 112 | QPEApplication::showMainWidget( widget, nomax ); |
112 | widget->setCaption( _appname ); | 113 | widget->setCaption( _appname ); |
113 | } | 114 | } |
114 | 115 | ||
115 | 116 | ||
116 | void OApplication::setTitle( const QString& title ) const | 117 | void OApplication::setTitle( const QString& title ) const |
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,16 +1,15 @@ | |||
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 |
11 | .="- .-=="i, .._ License as published by the Free Software | 10 | .="- .-=="i, .._ License as published by the Free Software |
12 | - . .-<_> .<> Foundation; either version 2 of the License, | 11 | - . .-<_> .<> Foundation; either version 2 of the License, |
13 | ._= =} : or (at your option) any later version. | 12 | ._= =} : or (at your option) any later version. |
14 | .%`+i> _;_. | 13 | .%`+i> _;_. |
15 | .i_,=:_. -<s. This program is distributed in the hope that | 14 | .i_,=:_. -<s. This program is distributed in the hope that |
16 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
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,43 +1,43 @@ | |||
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 |
11 | .="- .-=="i, .._ License as published by the Free Software | 10 | .="- .-=="i, .._ License as published by the Free Software |
12 | - . .-<_> .<> Foundation; either version 2 of the License, | 11 | - . .-<_> .<> Foundation; either version 2 of the License, |
13 | ._= =} : or (at your option) any later version. | 12 | ._= =} : or (at your option) any later version. |
14 | .%`+i> _;_. | 13 | .%`+i> _;_. |
15 | .i_,=:_. -<s. This program is distributed in the hope that | 14 | .i_,=:_. -<s. This program is distributed in the hope that |
16 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
17 | : .. .:, . . . without even the implied warranty of | 16 | : .. .:, . . . without even the implied warranty of |
18 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
19 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
20 | ..}^=.= = ; Library General Public License for more | 19 | ..}^=.= = ; Library General Public License for more |
21 | ++= -. .` .: details. | 20 | ++= -. .` .: details. |
22 | : = ...= . :.=- | 21 | : = ...= . :.=- |
23 | -. .:....=;==+<; You should have received a copy of the GNU | 22 | -. .:....=;==+<; You should have received a copy of the GNU |
24 | -_. . . )=. = Library General Public License along with | 23 | -_. . . )=. = Library General Public License along with |
25 | -- :-=` this library; see the file COPYING.LIB. | 24 | -- :-=` this library; see the file COPYING.LIB. |
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 | ||
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 | } |