author | zecke <zecke> | 2005-04-16 22:00:51 (UTC) |
---|---|---|
committer | zecke <zecke> | 2005-04-16 22:00:51 (UTC) |
commit | 632d3e87a7e2cf6efecb676987d622e937ecafb8 (patch) (unidiff) | |
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 | |||
@@ -415,7 +415,7 @@ void QPEApplication::applyStyle() { | |||
415 | int QPEApplication::defaultRotation() { | 415 | int QPEApplication::defaultRotation() { |
416 | return 0; | 416 | return 0; |
417 | } | 417 | } |
418 | void QPEApplication::setDefaultRotation(int r ) { | 418 | void QPEApplication::setDefaultRotation(int) { |
419 | 419 | ||
420 | } | 420 | } |
421 | void QPEApplication::grabKeyboard() { | 421 | void QPEApplication::grabKeyboard() { |
@@ -449,6 +449,14 @@ void QPEApplication::showMainDocumentWidget( QWidget* mw, bool m) { | |||
449 | d->show(mw, m ); | 449 | d->show(mw, m ); |
450 | } | 450 | } |
451 | void QPEApplication::showDialog( QDialog* d, bool nomax ) { | 451 | void QPEApplication::showDialog( QDialog* d, bool nomax ) { |
452 | showWidget( d, nomax ); | ||
453 | } | ||
454 | int QPEApplication::execDialog( QDialog* d, bool nomax) { | ||
455 | showDialog(d,nomax); | ||
456 | return d->exec(); | ||
457 | } | ||
458 | |||
459 | void QPEApplication::showWidget( QWidget* d, bool nomax ) { | ||
452 | QSize sh = d->sizeHint(); | 460 | QSize sh = d->sizeHint(); |
453 | int w = QMAX(sh.width(),d->width()); | 461 | int w = QMAX(sh.width(),d->width()); |
454 | int h = QMAX(sh.height(),d->height()); | 462 | int h = QMAX(sh.height(),d->height()); |
@@ -456,16 +464,13 @@ void QPEApplication::showDialog( QDialog* d, bool nomax ) { | |||
456 | && ( w > qApp->desktop()->width()*3/4 | 464 | && ( w > qApp->desktop()->width()*3/4 |
457 | || h > qApp->desktop()->height()*3/4 ) ) | 465 | || h > qApp->desktop()->height()*3/4 ) ) |
458 | { | 466 | { |
459 | d->showMaximized(); | 467 | d->showMaximized(); |
460 | } else { | 468 | } else { |
461 | d->resize(w,h); | 469 | d->resize(w,h); |
462 | d->show(); | 470 | d->show(); |
463 | } | 471 | } |
464 | } | 472 | } |
465 | int QPEApplication::execDialog( QDialog* d, bool nomax) { | 473 | |
466 | showDialog(d,nomax); | ||
467 | return d->exec(); | ||
468 | } | ||
469 | void QPEApplication::setKeepRunning() { | 474 | void QPEApplication::setKeepRunning() { |
470 | if ( qApp && qApp->inherits( "QPEApplication" ) ) { | 475 | if ( qApp && qApp->inherits( "QPEApplication" ) ) { |
471 | QPEApplication * qpeApp = ( QPEApplication* ) qApp; | 476 | QPEApplication * qpeApp = ( QPEApplication* ) qApp; |
@@ -757,6 +762,7 @@ int QPEApplication::x11ClientMessage(QWidget* w, XEvent* event, bool b ) { | |||
757 | #define KeyRelease XKeyRelease | 762 | #define KeyRelease XKeyRelease |
758 | 763 | ||
759 | #if defined(OPIE_NEW_MALLOC) | 764 | #if defined(OPIE_NEW_MALLOC) |
765 | #define likely(x) x | ||
760 | 766 | ||
761 | // The libraries with the skiff package (and possibly others) have | 767 | // The libraries with the skiff package (and possibly others) have |
762 | // completely useless implementations of builtin new and delete that | 768 | // completely useless implementations of builtin new and delete that |
@@ -775,21 +781,25 @@ void* operator new( size_t size ) | |||
775 | 781 | ||
776 | void operator delete[]( void* p ) | 782 | void operator delete[]( void* p ) |
777 | { | 783 | { |
784 | if ( likely(p) ) | ||
778 | free( p ); | 785 | free( p ); |
779 | } | 786 | } |
780 | 787 | ||
781 | void operator delete[]( void* p, size_t /*size*/ ) | 788 | void operator delete[]( void* p, size_t /*size*/ ) |
782 | { | 789 | { |
790 | if ( likely(p) ) | ||
783 | free( p ); | 791 | free( p ); |
784 | } | 792 | } |
785 | 793 | ||
786 | void operator delete( void* p ) | 794 | void operator delete( void* p ) |
787 | { | 795 | { |
796 | if ( likely(p) ) | ||
788 | free( p ); | 797 | free( p ); |
789 | } | 798 | } |
790 | 799 | ||
791 | void operator delete( void* p, size_t /*size*/ ) | 800 | void operator delete( void* p, size_t /*size*/ ) |
792 | { | 801 | { |
802 | if ( likely(p) ) | ||
793 | free( p ); | 803 | free( p ); |
794 | } | 804 | } |
795 | 805 | ||