author | mickeyl <mickeyl> | 2003-03-30 02:14:23 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-03-30 02:14:23 (UTC) |
commit | 4ace7ac9fff84df80d3066236ff970b9b393cf48 (patch) (unidiff) | |
tree | 3f179de721ab6d18f0c63e7b1a06363d7b33a065 | |
parent | 21a9eae2190754c6a807ae47f6aad80aa4f53728 (diff) | |
download | opie-4ace7ac9fff84df80d3066236ff970b9b393cf48.zip opie-4ace7ac9fff84df80d3066236ff970b9b393cf48.tar.gz opie-4ace7ac9fff84df80d3066236ff970b9b393cf48.tar.bz2 |
gcc2.9x fix
-rw-r--r-- | libopie2/opiecore/oapplication.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libopie2/opiecore/oapplication.cpp b/libopie2/opiecore/oapplication.cpp index 12418d5..d3e04ba 100644 --- a/libopie2/opiecore/oapplication.cpp +++ b/libopie2/opiecore/oapplication.cpp | |||
@@ -1,124 +1,124 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the Opie Project | 2 | This file is part of the Opie Project |
3 | 3 | ||
4 | Copyright (C) 2003 Michael Lauer <mickey@tm.informatik.uni-frankfurt.de> | 4 | Copyright (C) 2003 Michael Lauer <mickey@tm.informatik.uni-frankfurt.de> |
5 | =. | 5 | =. |
6 | .=l. | 6 | .=l. |
7 | .>+-= | 7 | .>+-= |
8 | _;:, .> :=|. This program is free software; you can | 8 | _;:, .> :=|. This program is free software; you can |
9 | .> <`_, > . <= redistribute it and/or modify it under | 9 | .> <`_, > . <= redistribute it and/or modify it under |
10 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 10 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
11 | .="- .-=="i, .._ License as published by the Free Software | 11 | .="- .-=="i, .._ License as published by the Free Software |
12 | - . .-<_> .<> Foundation; either version 2 of the License, | 12 | - . .-<_> .<> Foundation; either version 2 of the License, |
13 | ._= =} : or (at your option) any later version. | 13 | ._= =} : or (at your option) any later version. |
14 | .%`+i> _;_. | 14 | .%`+i> _;_. |
15 | .i_,=:_. -<s. This program is distributed in the hope that | 15 | .i_,=:_. -<s. This program is distributed in the hope that |
16 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 16 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
17 | : .. .:, . . . without even the implied warranty of | 17 | : .. .:, . . . without even the implied warranty of |
18 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 18 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
19 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 19 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
20 | ..}^=.= = ; Library General Public License for more | 20 | ..}^=.= = ; Library General Public License for more |
21 | ++= -. .` .: details. | 21 | ++= -. .` .: details. |
22 | : = ...= . :.=- | 22 | : = ...= . :.=- |
23 | -. .:....=;==+<; You should have received a copy of the GNU | 23 | -. .:....=;==+<; You should have received a copy of the GNU |
24 | -_. . . )=. = Library General Public License along with | 24 | -_. . . )=. = Library General Public License along with |
25 | -- :-=` this library; see the file COPYING.LIB. | 25 | -- :-=` this library; see the file COPYING.LIB. |
26 | If not, write to the Free Software Foundation, | 26 | If not, write to the Free Software Foundation, |
27 | Inc., 59 Temple Place - Suite 330, | 27 | Inc., 59 Temple Place - Suite 330, |
28 | Boston, MA 02111-1307, USA. | 28 | Boston, MA 02111-1307, USA. |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include <opie2/oapplication.h> | 31 | #include <opie2/oapplication.h> |
32 | #include <opie2/oconfig.h> | 32 | #include <opie2/oconfig.h> |
33 | 33 | ||
34 | OApplication* OApplication::_instance = 0; | 34 | OApplication* OApplication::_instance = 0; |
35 | 35 | ||
36 | /**************************************************************************************************/ | 36 | /**************************************************************************************************/ |
37 | /* OApplicationPrivate | 37 | /* OApplicationPrivate |
38 | /**************************************************************************************************/ | 38 | /**************************************************************************************************/ |
39 | 39 | ||
40 | class OApplicationPrivate | 40 | class OApplicationPrivate |
41 | { | 41 | { |
42 | public: | 42 | public: |
43 | OApplicationPrivate() {}; | 43 | OApplicationPrivate() {}; |
44 | ~OApplicationPrivate() {}; | 44 | ~OApplicationPrivate() {}; |
45 | }; | 45 | }; |
46 | 46 | ||
47 | /**************************************************************************************************/ | 47 | /**************************************************************************************************/ |
48 | /* OApplication | 48 | /* OApplication |
49 | /**************************************************************************************************/ | 49 | /**************************************************************************************************/ |
50 | 50 | ||
51 | 51 | ||
52 | OApplication::OApplication( int& argc, char** argv, const QCString& rAppName ) | 52 | OApplication::OApplication( int& argc, char** argv, const QCString& rAppName ) |
53 | :OApplicationBaseClass( argc, argv ), | 53 | :OApplicationBaseClass( argc, argv ), |
54 | _appname( rAppName ), | 54 | _appname( rAppName ), |
55 | _config( 0 ) | 55 | _config( 0 ) |
56 | { | 56 | { |
57 | init(); | 57 | init(); |
58 | } | 58 | } |
59 | 59 | ||
60 | 60 | ||
61 | OApplication::~OApplication() | 61 | OApplication::~OApplication() |
62 | { | 62 | { |
63 | delete d; | 63 | delete d; |
64 | if ( _config ) | 64 | if ( _config ) |
65 | delete _config; | 65 | delete _config; |
66 | OApplication::_instance = 0; | 66 | OApplication::_instance = 0; |
67 | // after deconstruction of the one-and-only application object, | 67 | // after deconstruction of the one-and-only application object, |
68 | // the construction of another object is allowed | 68 | // the construction of another object is allowed |
69 | } | 69 | } |
70 | 70 | ||
71 | 71 | ||
72 | OConfig* OApplication::config() | 72 | OConfig* OApplication::config() |
73 | { | 73 | { |
74 | if ( not _config ) | 74 | if ( !_config ) |
75 | { | 75 | { |
76 | _config = new OConfig( _appname ); | 76 | _config = new OConfig( _appname ); |
77 | } | 77 | } |
78 | return _config; | 78 | return _config; |
79 | } | 79 | } |
80 | 80 | ||
81 | 81 | ||
82 | void OApplication::init() | 82 | void OApplication::init() |
83 | { | 83 | { |
84 | d = new OApplicationPrivate(); | 84 | d = new OApplicationPrivate(); |
85 | if ( !OApplication::_instance ) | 85 | if ( !OApplication::_instance ) |
86 | { | 86 | { |
87 | OApplication::_instance = this; | 87 | OApplication::_instance = this; |
88 | } | 88 | } |
89 | else | 89 | else |
90 | { | 90 | { |
91 | qFatal( "OApplication: Can't create more than one OApplication object. Aborting." ); | 91 | qFatal( "OApplication: Can't create more than one OApplication object. Aborting." ); |
92 | } | 92 | } |
93 | } | 93 | } |
94 | 94 | ||
95 | 95 | ||
96 | void OApplication::setMainWidget( QWidget* widget ) | 96 | void OApplication::setMainWidget( QWidget* widget ) |
97 | { | 97 | { |
98 | showMainWidget( widget ); | 98 | showMainWidget( widget ); |
99 | } | 99 | } |
100 | 100 | ||
101 | 101 | ||
102 | void OApplication::showMainWidget( QWidget* widget, bool nomax ) | 102 | void OApplication::showMainWidget( QWidget* widget, bool nomax ) |
103 | { | 103 | { |
104 | #ifdef Q_WS_QWS | 104 | #ifdef Q_WS_QWS |
105 | QPEApplication::showMainWidget( widget, nomax ); | 105 | QPEApplication::showMainWidget( widget, nomax ); |
106 | #else | 106 | #else |
107 | QApplication::setMainWidget( widget ); | 107 | QApplication::setMainWidget( widget ); |
108 | widget->show(); | 108 | widget->show(); |
109 | #endif | 109 | #endif |
110 | widget->setCaption( _appname ); | 110 | widget->setCaption( _appname ); |
111 | } | 111 | } |
112 | 112 | ||
113 | 113 | ||
114 | void OApplication::setTitle( QString title ) const | 114 | void OApplication::setTitle( QString title ) const |
115 | { | 115 | { |
116 | if ( mainWidget() ) | 116 | if ( mainWidget() ) |
117 | { | 117 | { |
118 | if ( !title.isNull() ) | 118 | if ( !title.isNull() ) |
119 | mainWidget()->setCaption( QString(_appname) + QString( " - " ) + title ); | 119 | mainWidget()->setCaption( QString(_appname) + QString( " - " ) + title ); |
120 | else | 120 | else |
121 | mainWidget()->setCaption( _appname ); | 121 | mainWidget()->setCaption( _appname ); |
122 | } | 122 | } |
123 | } | 123 | } |
124 | 124 | ||