summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-03-30 02:14:23 (UTC)
committer mickeyl <mickeyl>2003-03-30 02:14:23 (UTC)
commit4ace7ac9fff84df80d3066236ff970b9b393cf48 (patch) (side-by-side diff)
tree3f179de721ab6d18f0c63e7b1a06363d7b33a065
parent21a9eae2190754c6a807ae47f6aad80aa4f53728 (diff)
downloadopie-4ace7ac9fff84df80d3066236ff970b9b393cf48.zip
opie-4ace7ac9fff84df80d3066236ff970b9b393cf48.tar.gz
opie-4ace7ac9fff84df80d3066236ff970b9b393cf48.tar.bz2
gcc2.9x fix
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/oapplication.cpp2
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
@@ -26,97 +26,97 @@
If not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#include <opie2/oapplication.h>
#include <opie2/oconfig.h>
OApplication* OApplication::_instance = 0;
/**************************************************************************************************/
/* OApplicationPrivate
/**************************************************************************************************/
class OApplicationPrivate
{
public:
OApplicationPrivate() {};
~OApplicationPrivate() {};
};
/**************************************************************************************************/
/* OApplication
/**************************************************************************************************/
OApplication::OApplication( int& argc, char** argv, const QCString& rAppName )
:OApplicationBaseClass( argc, argv ),
_appname( rAppName ),
_config( 0 )
{
init();
}
OApplication::~OApplication()
{
delete d;
if ( _config )
delete _config;
OApplication::_instance = 0;
// after deconstruction of the one-and-only application object,
// the construction of another object is allowed
}
OConfig* OApplication::config()
{
- if ( not _config )
+ if ( !_config )
{
_config = new OConfig( _appname );
}
return _config;
}
void OApplication::init()
{
d = new OApplicationPrivate();
if ( !OApplication::_instance )
{
OApplication::_instance = this;
}
else
{
qFatal( "OApplication: Can't create more than one OApplication object. Aborting." );
}
}
void OApplication::setMainWidget( QWidget* widget )
{
showMainWidget( widget );
}
void OApplication::showMainWidget( QWidget* widget, bool nomax )
{
#ifdef Q_WS_QWS
QPEApplication::showMainWidget( widget, nomax );
#else
QApplication::setMainWidget( widget );
widget->show();
#endif
widget->setCaption( _appname );
}
void OApplication::setTitle( QString title ) const
{
if ( mainWidget() )
{
if ( !title.isNull() )
mainWidget()->setCaption( QString(_appname) + QString( " - " ) + title );
else
mainWidget()->setCaption( _appname );
}