Opie/X11:

	Minor updates to build a recent Opie version for usage with
	the X Window System

3 files changed, 26 insertions, 11 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
@@ -412,13 +412,13 @@ void QPEApplication::applyStyle() {
     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;
@@ -446,29 +446,34 @@ 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;
     }
 }
@@ -754,12 +759,13 @@ int QPEApplication::x11ClientMessage(QWidget* w, XEvent* event, bool 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.
 
@@ -772,25 +778,29 @@ 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
diff --git a/x11/libqpe-x11/qpe/qpeapplication.h b/x11/libqpe-x11/qpe/qpeapplication.h
index b1fc074..5521998 100644
--- a/x11/libqpe-x11/qpe/qpeapplication.h
+++ b/x11/libqpe-x11/qpe/qpeapplication.h
@@ -4,14 +4,15 @@
 /**
  * LGPLed
  */
 
 #include <qapplication.h>
 #include <qevent.h>
-
-#include <qpe/timestring.h>
+#include <qtopia/timestring.h>
+#include <unistd.h>
+#include <stdlib.h>
 
 class QCopChannel;
 class QPEApplication : public QApplication {
     Q_OBJECT
 public:
     QPEApplication(int& argc,  char** argv, Type=GuiClient );
@@ -43,13 +44,14 @@ public:
     static InputMethodHint inputMethodHint( QWidget* );
 
     void showMainWidget( QWidget*, bool nomax = FALSE );
     void showMainDocumentWidget( QWidget*, bool nomax = FALSE );
 
     static void showDialog( QDialog*, bool nomax = FALSE );
-    static int execDialog( QDialog*, bool nomax = FALSE );
+    static int execDialog ( QDialog*, bool nomax = FALSE );
+    static void showWidget( QWidget*, bool nomax = FALSE );
 
     static void setKeepRunning();
     bool keepRunning()const;
 
     bool keyboardGrabbed()const;
     int exec();
diff --git a/x11/libqpe-x11/qt/qwindowsystem_qws.h b/x11/libqpe-x11/qt/qwindowsystem_qws.h
index 88902c8..42470cd 100644
--- a/x11/libqpe-x11/qt/qwindowsystem_qws.h
+++ b/x11/libqpe-x11/qt/qwindowsystem_qws.h
@@ -7,12 +7,15 @@ class QWSScreenSaver;
 class QWSServer {
 public:
 QWSServer(){}
 ~QWSServer(){}
     static void sendKeyEvent(int, int, int, bool, bool ) { }
    struct KeyboardFilter {
+       bool filter(int,int,int,bool,bool) {
+           return false;
+       }
    };
     static void setKeyboardFilter( KeyboardFilter* ) {
 
     }
     static void setScreenSaver( QWSScreenSaver* ) {