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 | |||
@@ -50,49 +50,49 @@ class OApplicationPrivate | |||
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 ); |