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
@@ -394,99 +394,104 @@ void QPEApplication::applyStyle() {
     color = config.readEntry( "HighlightedText", "#FFFFFF" );
     pal.setColor( QColorGroup::HighlightedText, QColor( color ) );
     color = config.readEntry( "Text", "#000000" );
     pal.setColor( QColorGroup::Text, QColor( color ) );
     color = config.readEntry( "ButtonText", "#000000" );
     pal.setColor( QPalette::Active, QColorGroup::ButtonText, QColor( color ) );
     color = config.readEntry( "Base", "#FFFFFF" );
     pal.setColor( QColorGroup::Base, QColor( color ) );
 
     pal.setColor( QPalette::Disabled, QColorGroup::Text,
                   pal.color( QPalette::Active, QColorGroup::Background ).dark() );
 
     setPalette( pal, TRUE );
 
 
 
     // Font
     QString ff = config.readEntry( "FontFamily", font().family() );
     int fs = config.readNumEntry( "FontSize", font().pointSize() );
     setFont( QFont(ff, fs) );
 }
 int QPEApplication::defaultRotation() {
     return 0;
 }
-void QPEApplication::setDefaultRotation(int r ) {
+void QPEApplication::setDefaultRotation(int) {
 
 }
 void QPEApplication::grabKeyboard() {
     QPEApplication::Private * d = ( ( QPEApplication* ) qApp ) ->d;
     if ( qApp->type() == QApplication::GuiServer )
         d->kbgrabber = 0;
     else {
         QCopEnvelope e( "QPE/System", "grabKeyboard(QString)" );
         e << d->appName;
 
         d->kbgrabber = 2; // me
     }
 }
 void QPEApplication::ungrabKeyboard() {
     QPEApplication::Private * d = ( ( QPEApplication* ) qApp ) ->d;
     if ( d->kbgrabber == 2 ) {
         QCopEnvelope e( "QPE/System", "grabKeyboard(QString)" );
         e << QString::null;
 
         d->kbregrab = FALSE;
         d->kbgrabber = 0;
     }
 }
 void QPEApplication::showMainWidget( QWidget* wid, bool b) {
     d->show(wid, b );
 }
 void QPEApplication::showMainDocumentWidget( QWidget* mw, bool m) {
     if ( mw && argc() == 2 )
         Global::setDocument( mw, QString::fromUtf8(argv()[1] ) );
 
     d->show(mw, 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());
     int h = QMAX(sh.height(),d->height());
     if ( !nomax
          && ( w > qApp->desktop()->width()*3/4
               || 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" ) ) {
         QPEApplication * qpeApp = ( QPEApplication* ) qApp;
         qpeApp->d->keep_running = TRUE;
     }
 }
 bool QPEApplication::keepRunning()const {
     return d->keep_running;
 }
 bool QPEApplication::keyboardGrabbed()const {
     return d->kbgrabber;
 }
 int QPEApplication::exec() {
     /* now send the QCOP stuff gotten from the file */
     d->sendQCopQ();
 
     if ( d->keep_running ) {
         qWarning("going to exec");
         int a = QApplication::exec();
         qWarning("left");
         return a;
     }
 
     {
@@ -736,61 +741,66 @@ int QPEApplication::x11ClientMessage(QWidget* w, XEvent* event, bool b ) {
             /*
              * I'm not sure if we should use activeWidget
              * or activeModalWidget
              * a QDialog could be not modal too
              */
             if ( w->inherits("QDialog" ) ) {
                 qWarning("inherits QDialog!!!");
                 QDialog* dia = (QDialog*)w;
                 /*
                  * call it directly or via QTimer::singleShot?
                  */
                 QTimer::singleShot(0, dia, SLOT(accept() ) );
                  return 0;
             }
 
         }
     }
     return QApplication::x11ClientMessage(w, event, b );
 }
 
 #define KeyPress XKeyPress
 #define KeyRelease XKeyRelease
 
 #if defined(OPIE_NEW_MALLOC)
+#define likely(x) x
 
 // The libraries with the skiff package (and possibly others) have
 // completely useless implementations of builtin new and delete that
 // use about 50% of your CPU. Here we revert to the simple libc
 // functions.
 
 void* operator new[]( size_t size )
 {
 	return malloc( size );
 }
 
 void* operator new( size_t size )
 {
 	return malloc( size );
 }
 
 void operator delete[]( void* p )
 {
+    if ( likely(p) )
 	free( p );
 }
 
 void operator delete[]( void* p, size_t /*size*/ )
 {
+    if ( likely(p) )
 	free( p );
 }
 
 void operator delete( void* p )
 {
+    if ( likely(p) )
 	free( p );
 }
 
 void operator delete( void* p, size_t /*size*/ )
 {
+    if ( likely(p) )
 	free( p );
 }
 
 #endif