author | zecke <zecke> | 2005-04-16 22:00:51 (UTC) |
---|---|---|
committer | zecke <zecke> | 2005-04-16 22:00:51 (UTC) |
commit | 632d3e87a7e2cf6efecb676987d622e937ecafb8 (patch) (side-by-side diff) | |
tree | 6689c8549e494841108217daa21913ec27565720 /x11/libqpe-x11/qpe/qpeapplication.cpp | |
parent | 790b371e6c7ed9da76eafb8a5b2e5d5458b320d8 (diff) | |
download | opie-632d3e87a7e2cf6efecb676987d622e937ecafb8.zip opie-632d3e87a7e2cf6efecb676987d622e937ecafb8.tar.gz opie-632d3e87a7e2cf6efecb676987d622e937ecafb8.tar.bz2 |
Opie/X11:
Minor updates to build a recent Opie version for usage with
the X Window System
Diffstat (limited to 'x11/libqpe-x11/qpe/qpeapplication.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | x11/libqpe-x11/qpe/qpeapplication.cpp | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/x11/libqpe-x11/qpe/qpeapplication.cpp b/x11/libqpe-x11/qpe/qpeapplication.cpp index 73e7ce4..c49f3ad 100644 --- a/x11/libqpe-x11/qpe/qpeapplication.cpp +++ b/x11/libqpe-x11/qpe/qpeapplication.cpp @@ -416,5 +416,5 @@ int QPEApplication::defaultRotation() { return 0; } -void QPEApplication::setDefaultRotation(int r ) { +void QPEApplication::setDefaultRotation(int) { } @@ -450,4 +450,12 @@ void QPEApplication::showMainDocumentWidget( QWidget* mw, bool m) { } void QPEApplication::showDialog( QDialog* d, bool nomax ) { + showWidget( d, nomax ); +} +int QPEApplication::execDialog( QDialog* d, bool nomax) { + showDialog(d,nomax); + return d->exec(); +} + +void QPEApplication::showWidget( QWidget* d, bool nomax ) { QSize sh = d->sizeHint(); int w = QMAX(sh.width(),d->width()); @@ -457,14 +465,11 @@ void QPEApplication::showDialog( QDialog* d, bool nomax ) { || h > qApp->desktop()->height()*3/4 ) ) { - d->showMaximized(); + d->showMaximized(); } else { - d->resize(w,h); - d->show(); + d->resize(w,h); + d->show(); } } -int QPEApplication::execDialog( QDialog* d, bool nomax) { - showDialog(d,nomax); - return d->exec(); -} + void QPEApplication::setKeepRunning() { if ( qApp && qApp->inherits( "QPEApplication" ) ) { @@ -758,4 +763,5 @@ int QPEApplication::x11ClientMessage(QWidget* w, XEvent* event, bool b ) { #if defined(OPIE_NEW_MALLOC) +#define likely(x) x // The libraries with the skiff package (and possibly others) have @@ -776,4 +782,5 @@ void* operator new( size_t size ) void operator delete[]( void* p ) { + if ( likely(p) ) free( p ); } @@ -781,4 +788,5 @@ void operator delete[]( void* p ) void operator delete[]( void* p, size_t /*size*/ ) { + if ( likely(p) ) free( p ); } @@ -786,4 +794,5 @@ void operator delete[]( void* p, size_t /*size*/ ) void operator delete( void* p ) { + if ( likely(p) ) free( p ); } @@ -791,4 +800,5 @@ void operator delete( void* p ) void operator delete( void* p, size_t /*size*/ ) { + if ( likely(p) ) free( p ); } |