Mac OS X compile fixes:

	-disable the "fuege alle libs auf verdacht hinzu" hack and hope we will
         identify the root cause.
	-do not redefine cxa_... on Mac. At least the the Apple Linker is not happy
         with having that symbol defined twice.
        -well DYLD_BOOL could not be casted to bool. changing it to bool works
	-opiecore.pro use the same test as in include.pro to see if we build on linux

4 files changed, 11 insertions, 10 deletions

diff --git a/include.pro b/include.pro
index f32786a..dd388f2 100644
--- a/include.pro
+++ b/include.pro
@@ -1,136 +1,136 @@
 include( $(OPIEDIR)/gen.pro )
 
 # base opie install path
 # prefix = /opt/QtPalmtop ??? Why here (eilers) ???
 prefix = $(OPIEDIR)
 
 contains( CONFIG, quick-app-lib ) {
     TEMPLATE = lib
     CONFIG += plugin  # "plugin" will be removed automatically later if not MacOSX ! (eilers)
     DESTDIR  = $(OPIEDIR)/plugins/application
     DEFINES += OPIE_APP_INTERFACE
     DEFINES += QUICKAPP_NAME="\"$${TARGET}\""
     
     !contains( TARGET, launcher ) {
         message( Linking $$TARGET to quicklauncher )
 	system( rm -f $$(OPIEDIR)/bin/$$TARGET )
         system( ln -sf $$QUICKLAUNCH_PATH $$(OPIEDIR)/bin/$$TARGET )
     }
 }
 
 contains ( CONFIG, quick-app-bin ) {
     TEMPLATE = app
     DESTDIR  = $(OPIEDIR)/bin
     DEFINES -= OPIE_APP_INTERFACE
     DEFINES += QUICKAPP_NAME="\"$${TARGET}\""
     message( Touching plugins/application/lib$${TARGET}.so.0 )
     system( touch $$(OPIEDIR)/plugins/application/lib$${TARGET}.so.0 )
 }
 
 
 contains( TEMPLATE, lib ) {
   target.path = $$prefix/lib
 }
 !contains( TEMPLATE, lib ) {
   target.path = $$prefix/bin
 }
 INSTALLS += target
 
 # ipkg control files
 control.path = /CONTROL
 control.files = control postinst prerm postrm preinst conffiles
 INSTALLS += control
 
 # images, default is $$prefix/pics/$$TARGET
 pics.path = $$prefix/pics/$$TARGET
 pics.files = pics/*
 INSTALLS += pics
 
 # sounds, default path is $$prefix/sounds/$$TARGET
 sounds.path = $$prefix/sounds/$$TARGET
 sounds.files = sounds/*
 INSTALLS += sounds
 
 # init scripts, default path is /etc/init.d
 init.path = /etc/init.d
 init.files = init.d/*
 INSTALLS += init
 
 # data, default path is /usr/share/$$TARGET
 data.path = /usr/share/$$TARGET
 data.files = share/*
 INSTALLS += data
 
 etc.path = $$prefix/etc/
 etc.files = etc/*
 INSTALLS += etc
 
 apps.path = $$prefix/apps/
 apps.files = apps/*
 INSTALLS += apps
 
 # sounds, default path is $$prefix/sounds/$$TARGET
 sounds.path = $$prefix/sounds/$$TARGET
 sounds.files = sounds/*
 INSTALLS += sounds
 
 # anything in nonstandard paths
 root.path = /
 root.files = root/*
 INSTALLS += root
 
 # new targets
 opie-lupdate.target = opie-lupdate
 opie-lupdate.commands = opie-lupdate  $(PRO)
 
 opie-lrelease.target = opie-lrelease
 opie-lrelease.commands = opie-lrelease $(PRO)
 
 lupdate.target = lupdate
 lupdate.commands = lupdate -noobsolete $(PRO)
 
 lrelease.target = lrelease
 lrelease.commands = lrelease $(PRO)
 
 # new message target to get all strings from the apps with and without tr
 messages.target = messages
 messages.commands = xgettext -C -n -ktr -kQT_TRANSLATE_NOOP $$HEADERS $$SOURCES -o '$(OPIEDIR)/messages-$(QMAKE_TARGET)-tr.po' && xgettext -C -n -a $$HEADERS $$SOURCES -o '$(OPIEDIR)/messages-$(QMAKE_TARGET)-allstrings.po'
 
 ipk.target = ipk
 ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; )
 
 QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease messages
 
 CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX )
 contains( CONFTEST, y ){
   QMAKE_LFLAGS += -Wl
   LIBS -= -ldl
   LIBS -= -lcrypt 
   LIBS -= -lm
 
   # Manual including indirect referenced libraries which are not loaded
   # by the mac-linker automatically
   # IF YOU COMPILE FOR THE FIRST TIME, COMMENT OUT ONE OF THE FOLLOWING
   # (regarding whether you activate SQL) and the last one (-lopiecore2)
-  CONFTEST = $$system( echo $CONFIG_SQL_PIM_BACKEND )
-  contains( CONFTEST, y ){
-    LIBS += -lopiedb2 -lqpe
-  } else {
-    LIBS += -lqpe
-  }
-  LIBS += -lopiecore2
+  #CONFTEST = $$system( echo $CONFIG_SQL_PIM_BACKEND )
+  #contains( CONFTEST, y ){
+  #  LIBS += -lopiedb2 -lqpe
+  #} else {
+  #  LIBS += -lqpe
+  #}
+  #LIBS += -lopiecore2
 }
 else {
 
 QMAKE_LFLAGS += -Wl,-rpath-link,$$prefix/lib
 # I am not sure whether it is a good idea to change the way plugins is build
 # on linux. Therefore I remove the "plugin" term, which is needed by MacOS-X
 CONFIG -= plugin
 }
 LIBS += -L$(OPIEDIR)/lib
 
 MOC_DIR=.moc/$(PLATFORM)
 OBJECTS_DIR=.obj/$(PLATFORM)
 
 #was here now at thetop
 #include( $(OPIEDIR)/gen.pro )
diff --git a/libopie2/opiecore/opiecore.pro b/libopie2/opiecore/opiecore.pro
index cbb7e04..3406b8f 100644
--- a/libopie2/opiecore/opiecore.pro
+++ b/libopie2/opiecore/opiecore.pro
@@ -1,59 +1,60 @@
 TEMPLATE    = lib
 CONFIG      += qt warn_on
 DESTDIR     = $(OPIEDIR)/lib
 HEADERS     = oapplication.h            \
               oconfig.h                 \
               odebug.h                  \
               oglobal.h                 \
               oglobalsettings.h         \
               okeyconfigmanager.h       \
               okeyfilter.h              \
               opluginloader.h           \
               oprocess.h                \
               oprocctrl.h               \
               oresource.h               \
               osharedpointer.h          \
               osmartpointer.h           \
               ostorageinfo.h            \
               xmltree.h
 
 SOURCES     = oapplication.cpp          \
               oconfig.cpp               \
               odebug.cpp                \
               oglobal.cpp               \
               oglobalsettings.cpp       \
               okeyconfigmanager.cpp     \
               okeyfilter.cpp            \
               opluginloader.cpp         \
               oprocess.cpp              \
               oprocctrl.cpp             \
               oresource.cpp             \
               osmartpointer.cpp         \
               ostorageinfo.cpp          \
               xmltree.cpp
 
 
 # Disable Linux-only subsystems for MAC build
-!contains( CONFIG_TARGET_MACOSX, y ) {
+CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX )
+!contains( CONFTEST, y ) {
 include ( linux/linux.pro )
 } else {
     message( "disabling linux-only subsystems for MAC build" )
 }
 
 include( device/device.pro )
 
 INTERFACES  =
 TARGET      = opiecore2
 VERSION     = 1.9.4
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 
 !contains( platform, x11 ) {
   LIBS        = -lqpe
   include( $(OPIEDIR)/include.pro )
 }
 
 contains( platform, x11 ) {
   LIBS        = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
 }
 
diff --git a/library/qlibrary_unix.cpp b/library/qlibrary_unix.cpp
index 2181153..fee73c2 100644
--- a/library/qlibrary_unix.cpp
+++ b/library/qlibrary_unix.cpp
@@ -1,243 +1,243 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "qlibrary_p.h"
 
 #ifndef QT_NO_COMPONENT
 
 /*
   The platform dependent implementations of
   - loadLibrary
   - freeLibrary
   - resolveSymbol
 
   It's not too hard to guess what the functions do.
 */
 #if defined(Q_OS_HPUX)
 // for HP-UX < 11.x and 32 bit
 #include <dl.h>
 
 bool QLibraryPrivate::loadLibrary()
 {
     if ( pHnd )
 	return TRUE;
 
     QString filename = library->library();
 
     pHnd = (void*)shl_load( filename.latin1(), BIND_DEFERRED | BIND_NONFATAL | DYNAMIC_PATH, 0 );
 #if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT)
     if ( !pHnd )
 	qDebug( "Failed to load library %s!", filename.latin1() );
 #endif
     return pHnd != 0;
 }
 
 bool QLibraryPrivate::freeLibrary()
 {
     if ( !pHnd )
 	return TRUE;
 
     if ( !shl_unload( (shl_t)pHnd ) ) {
 	pHnd = 0;
 	return TRUE;
     }
     return FALSE;
 }
 
 void* QLibraryPrivate::resolveSymbol( const char* symbol )
 {
     if ( !pHnd )
 	return 0;
 
     void* address = 0;
     if ( shl_findsym( (shl_t*)&pHnd, symbol, TYPE_UNDEFINED, address ) < 0 ) {
 #if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT)
 	qDebug( "Couldn't resolve symbol \"%s\"", symbol );
 #endif
 	return 0;
     }
     return address;
 }
 
 #elif defined(_NULL_LIB_)
 
 bool QLibraryPrivate::loadLibrary()
 {
 	//qDebug("QLibraryPrivate::loadLibrary\n");
 	return FALSE;
 }
 bool QLibraryPrivate::freeLibrary()
 {
 	//qDebug("QLibraryPrivate::freeLibrary\n");
 	return FALSE;
 }
 void* QLibraryPrivate::resolveSymbol( const char* symbol )
 {
 	//qDebug("QLibraryPrivate::resolveSymbol\n");
 	return FALSE;
 }
 
 #elif defined(Q_OS_MACX)
 
 #define ENUM_DYLD_BOOL
 enum DYLD_BOOL {
 	DYLD_FALSE,
 	DYLD_TRUE
 };
 #include <mach-o/dyld.h>
 typedef struct {
 	NSObjectFileImage img;
 	NSModule mod;
 } DyldLibDesc;
 
 bool QLibraryPrivate::loadLibrary()
 {
 	// qDebug("QLibraryPrivate::loadLibrary\n");
 	// return FALSE;
     if ( pHnd )
 	return TRUE;
 
     QString filename = library->library();
 
     NSObjectFileImage img = 0;
     NSModule mod = 0;
     NSObjectFileImageReturnCode ret = NSCreateObjectFileImageFromFile( filename.latin1() , &img );
     if ( ret != NSObjectFileImageSuccess ) {
 		qWarning( "Error in NSCreateObjectFileImageFromFile(): %d; Filename: %s", ret, filename.latin1() );
 		if (ret == NSObjectFileImageAccess) {
 			qWarning ("(NSObjectFileImageAccess)" );
 		}
 	} else {
 		mod = NSLinkModule(img, filename.latin1(), NSLINKMODULE_OPTION_BINDNOW |
 				                                    NSLINKMODULE_OPTION_PRIVATE |
 													NSLINKMODULE_OPTION_RETURN_ON_ERROR);
 		if (mod == 0) {
 			qWarning( "Error in NSLinkModule()" );
 			NSDestroyObjectFileImage(img);
 		}
 	}
 	DyldLibDesc* desc = 0;
 	if (img != 0 && mod != 0) {
 		desc = new DyldLibDesc;
 		desc->img = img;
 		desc->mod = mod;
 	}
 	pHnd = desc;
     return pHnd != 0;
 }
 
 bool QLibraryPrivate::freeLibrary()
 {
 	//qDebug("QLibraryPrivate::freeLibrary\n");
 	//return FALSE;
     if ( !pHnd )
 	return TRUE;
 
 	DyldLibDesc* desc = (DyldLibDesc*) pHnd;
 	NSModule mod = desc->mod;
 	NSObjectFileImage img = desc->img;
-	DYLD_BOOL success = NSUnLinkModule(mod, NSUNLINKMODULE_OPTION_NONE);
+	bool success = NSUnLinkModule(mod, NSUNLINKMODULE_OPTION_NONE);
 	if ( success ) {
 	NSDestroyObjectFileImage(img);
 	delete desc;
 	pHnd = 0;
 	}
 #if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT)
     else {
 	    qWarning( "Error in NSUnLinkModule()" );
     }
 #endif
     return pHnd == 0;
 }
 
 void* QLibraryPrivate::resolveSymbol( const char* symbol )
 {
 	//qDebug("QLibraryPrivate::resolveSymbol\n");
 	//return FALSE;
     if ( !pHnd )
 	return 0;
 
 	DyldLibDesc* desc = (DyldLibDesc*) pHnd;
 	NSSymbol sym = NSLookupSymbolInModule(desc->mod, symbol);
 	void* address = 0;
 	if (sym != 0) {
 		address = NSAddressOfSymbol(sym);
 	}
 #if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT)
     if ( address == 0 )
 	qWarning( "Cannot find symbol: %s", symbol );
 #endif
     return address;
 }
 
 #else
 // Something else, assuming POSIX
 #include <dlfcn.h>
 
 bool QLibraryPrivate::loadLibrary()
 {
     if ( pHnd )
 	return TRUE;
 
     QString filename = library->library();
 
     pHnd = dlopen( filename.latin1() , RTLD_LAZY );
 // #if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT)
     if ( !pHnd )
 	qWarning( "%s", dlerror() );
 // #endif
     return pHnd != 0;
 }
 
 bool QLibraryPrivate::freeLibrary()
 {
     if ( !pHnd )
 	return TRUE;
 
     int ec = dlclose( pHnd );
     if ( !ec )
 	pHnd = 0;
 #if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT)
     else {
 	const char* error = dlerror();
 	if ( error )
 	    qWarning( "%s", error );
     }
 #endif
     return pHnd == 0;
 }
 
 void* QLibraryPrivate::resolveSymbol( const char* f )
 {
     if ( !pHnd )
 	return 0;
 
     void* address = dlsym( pHnd, f );
 #if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT)
     const char* error = dlerror();
     if ( error )
 	qWarning( "%s", error );
 #endif
     return address;
 }
 
 #endif // POSIX
 
 #endif // QT_NO_COMPONENT
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 19e99f2..dcc1001 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -1442,849 +1442,849 @@ void QPEApplication::systemMessage( const QCString& msg, const QByteArray& data
         setCurrentMode( x, y, depth );
             }
      }
     else if ( msg == "reset()" ) {
             if ( type() != GuiServer )
                 reset();
     }
     else if ( msg == "setCurrentRotation(int)" ) {
         int r;
         stream >> r;
         setCurrentRotation( r );
      }
     else if ( msg == "shutdown()" ) {
         if ( type() == GuiServer )
             shutdown();
     }
     else if ( msg == "quit()" ) {
         if ( type() != GuiServer )
             tryQuit();
     }
     else if ( msg == "forceQuit()" ) {
         if ( type() != GuiServer )
             quit();
     }
     else if ( msg == "restart()" ) {
         if ( type() == GuiServer )
             restart();
     }
     else if ( msg == "language(QString)" ) {
         if ( type() == GuiServer ) {
             QString l;
             stream >> l;
             QString cl = getenv( "LANG" );
             if ( cl != l ) {
                 if ( l.isNull() )
                     unsetenv( "LANG" );
                 else
                     setenv( "LANG", l.latin1(), 1 );
                 restart();
             }
         }
     }
     else if ( msg == "timeChange(QString)" ) {
         QString t;
         stream >> t;
         if ( t.isNull() )
             unsetenv( "TZ" );
         else
             setenv( "TZ", t.latin1(), 1 );
         // emit the signal so everyone else knows...
         emit timeChanged();
     }
     else if ( msg == "addAlarm(QDateTime,QCString,QCString,int)" ) {
         if ( type() == GuiServer ) {
             QDateTime when;
             QCString channel, message;
             int data;
             stream >> when >> channel >> message >> data;
             AlarmServer::addAlarm( when, channel, message, data );
         }
     }
     else if ( msg == "deleteAlarm(QDateTime,QCString,QCString,int)" ) {
         if ( type() == GuiServer ) {
             QDateTime when;
             QCString channel, message;
             int data;
             stream >> when >> channel >> message >> data;
             AlarmServer::deleteAlarm( when, channel, message, data );
         }
     }
     else if ( msg == "clockChange(bool)" ) {
         int tmp;
         stream >> tmp;
         emit clockChanged( tmp );
     }
     else if ( msg == "weekChange(bool)" ) {
         int tmp;
         stream >> tmp;
         emit weekChanged( tmp );
     }
     else if ( msg == "setDateFormat(DateFormat)" ) {
         DateFormat tmp;
         stream >> tmp;
         emit dateFormatChanged( tmp );
     }
     else if ( msg == "setVolume(int,int)" ) {
         int t, v;
         stream >> t >> v;
         setVolume( t, v );
         emit volumeChanged( muted );
     }
     else if ( msg == "volumeChange(bool)" ) {
         stream >> muted;
         setVolume();
         emit volumeChanged( muted );
     }
     else if ( msg == "setMic(int,int)" ) { // Added: 2002-02-08 by Jeremy Cowgar <jc@cowgar.com>
         int t, v;
         stream >> t >> v;
         setMic( t, v );
         emit micChanged( micMuted );
     }
     else if ( msg == "micChange(bool)" ) { // Added: 2002-02-08 by Jeremy Cowgar <jc@cowgar.com>
         stream >> micMuted;
         setMic();
         emit micChanged( micMuted );
     }
     else if ( msg == "setBass(int,int)" ) { // Added: 2002-12-13 by Maximilian Reiss <harlekin@handhelds.org>
         int t, v;
         stream >> t >> v;
         setBass( t, v );
     }
     else if ( msg == "bassChange(bool)" ) { // Added: 2002-12-13 by Maximilian Reiss <harlekin@handhelds.org>
             setBass();
     }
         else if ( msg == "setTreble(int,int)" ) { // Added: 2002-12-13 by Maximilian Reiss <harlekin@handhelds.org>
         int t, v;
         stream >> t >> v;
         setTreble( t, v );
     }
     else if ( msg == "trebleChange(bool)" ) { // Added: 2002-12-13 by Maximilian Reiss <harlekin@handhelds.org>
             setTreble();
     } else if ( msg == "getMarkedText()" ) {
     if ( type() == GuiServer ) {
         const ushort unicode = 'C'-'@';
         const int scan = Key_C;
         qwsServer->processKeyEvent( unicode, scan, ControlButton, TRUE, FALSE );
         qwsServer->processKeyEvent( unicode, scan, ControlButton, FALSE, FALSE );
     }
     } else if ( msg == "newChannel(QString)") {
     QString myChannel = "QPE/Application/" + d->appName;
     QString channel;
     stream >> channel;
     if (channel == myChannel) {
         processQCopFile();
         d->sendQCopQ();
     }
     }
 
 
 #endif
 }
 
 
 
 
 
 /*!
   \internal
 */
 bool QPEApplication::raiseAppropriateWindow()
 {
     bool r=FALSE;
 
     // 1. Raise the main widget
     QWidget *top = d->qpe_main_widget;
     if ( !top ) top = mainWidget();
 
     if ( top && d->keep_running ) {
     if ( top->isVisible() )
         r = TRUE;
     else if (d->preloaded) {
         // We are preloaded and not visible.. pretend we just started..
 #ifndef QT_NO_COP
         QCopEnvelope e("QPE/System", "fastAppShowing(QString)");
         e << d->appName;
 #endif
     }
 
     d->show_mx(top,d->nomaximize, d->appName);
     top->raise();
     }
 
     QWidget *topm = activeModalWidget();
 
     // 2. Raise any parentless widgets (except top and topm, as they
     //     are raised before and after this loop).  Order from most
     //     recently raised as deepest to least recently as top, so
     //     that repeated calls cycle through widgets.
     QWidgetList *list = topLevelWidgets();
     if ( list ) {
     bool foundlast = FALSE;
     QWidget* topsub = 0;
     if ( d->lastraised ) {
         for (QWidget* w = list->first(); w; w = list->next()) {
         if ( !w->parentWidget() && w != topm && w->isVisible() && !w->isDesktop() ) {
             if ( w == d->lastraised )
             foundlast = TRUE;
             if ( foundlast ) {
             w->raise();
             topsub = w;
             }
         }
         }
     }
     for (QWidget* w = list->first(); w; w = list->next()) {
         if ( !w->parentWidget() && w != topm && w->isVisible() && !w->isDesktop() ) {
         if ( w == d->lastraised )
             break;
         w->raise();
         topsub = w;
         }
     }
     d->lastraised = topsub;
     delete list;
     }
 
     // 3. Raise the active modal widget.
     if ( topm ) {
     topm->show();
     topm->raise();
     // If we haven't already handled the fastAppShowing message
     if (!top && d->preloaded) {
 #ifndef QT_NO_COP
         QCopEnvelope e("QPE/System", "fastAppShowing(QString)");
         e << d->appName;
 #endif
     }
     r = FALSE;
     }
 
     return r;
 }
 
 
 void QPEApplication::pidMessage( const QCString& msg, const QByteArray& data)
 {
 #ifdef Q_WS_QWS
 
     if ( msg == "quit()" ) {
         tryQuit();
     }
     else if ( msg == "quitIfInvisible()" ) {
         if ( d->qpe_main_widget && !d->qpe_main_widget->isVisible() )
             quit();
     }
     else if ( msg == "close()" ) {
         hideOrQuit();
     }
     else if ( msg == "disablePreload()" ) {
         d->preloaded = FALSE;
         d->keep_running = TRUE;
         /* so that quit will quit */
     }
     else if ( msg == "enablePreload()" ) {
         if (d->qpe_main_widget)
             d->preloaded = TRUE;
         d->keep_running = TRUE;
         /* so next quit won't quit */
     }
     else if ( msg == "raise()" ) {
         d->keep_running = TRUE;
         d->notbusysent = FALSE;
         raiseAppropriateWindow();
         // Tell the system we're still chugging along...
         QCopEnvelope e("QPE/System", "appRaised(QString)");
         e << d->appName;
     }
     else if ( msg == "flush()" ) {
         emit flush();
         // we need to tell the desktop
         QCopEnvelope e( "QPE/Desktop", "flushDone(QString)" );
         e << d->appName;
     }
     else if ( msg == "reload()" ) {
         emit reload();
     }
     else if ( msg == "setDocument(QString)" ) {
         d->keep_running = TRUE;
         QDataStream stream( data, IO_ReadOnly );
         QString doc;
         stream >> doc;
         QWidget *mw = mainWidget();
         if ( !mw )
             mw = d->qpe_main_widget;
         if ( mw )
             Global::setDocument( mw, doc );
 
     } else if ( msg == "QPEProcessQCop()" ) {
             processQCopFile();
             d->sendQCopQ();
         }else
         {
             bool p = d->keep_running;
             d->keep_running = FALSE;
             emit appMessage( msg, data);
             if ( d->keep_running ) {
                 d->notbusysent = FALSE;
                 raiseAppropriateWindow();
                 if ( !p ) {
                     // Tell the system we're still chugging along...
 #ifndef QT_NO_COP
                     QCopEnvelope e("QPE/System", "appRaised(QString)");
                     e << d->appName;
 #endif
                 }
             }
             if ( p )
                 d->keep_running = p;
     }
 #endif
 }
 
 
 /*!
   Sets widget \a mw as the mainWidget() and shows it. For small windows,
   consider passing TRUE for \a nomaximize rather than the default FALSE.
 
   \sa showMainDocumentWidget()
 */
 void QPEApplication::showMainWidget( QWidget* mw, bool nomaximize )
 {
 //        setMainWidget(mw); this breaks FastLoading because lastWindowClose() would quit
             d->show(mw, nomaximize );
 }
 
 /*!
   Sets widget \a mw as the mainWidget() and shows it. For small windows,
   consider passing TRUE for \a nomaximize rather than the default FALSE.
 
   This calls designates the application as
   a \link docwidget.html document-oriented\endlink application.
 
   The \a mw widget \e must have this slot: setDocument(const QString&).
 
   \sa showMainWidget()
 */
 void QPEApplication::showMainDocumentWidget( QWidget* mw, bool nomaximize )
 {
     if ( mw && argc() == 2 )
         Global::setDocument( mw, QString::fromUtf8(argv()[1]) );
 
 
 //    setMainWidget(mw); see above
     d->show(mw, nomaximize );
 }
 
 
 /*!
   If an application is started via a \link qcop.html QCop\endlink
   message, the application will process the \link qcop.html
   QCop\endlink message and then quit. If the application calls this
   function while processing a \link qcop.html QCop\endlink message,
   after processing its outstanding \link qcop.html QCop\endlink
   messages the application will start 'properly' and show itself.
 
   \sa keepRunning()
 */
 void QPEApplication::setKeepRunning()
 {
     if ( qApp && qApp->inherits( "QPEApplication" ) ) {
         QPEApplication * qpeApp = ( QPEApplication* ) qApp;
         qpeApp->d->keep_running = TRUE;
     }
 }
 
 /*!
   Returns TRUE if the application will quit after processing the
   current list of qcop messages; otherwise returns FALSE.
 
   \sa setKeepRunning()
 */
 bool QPEApplication::keepRunning() const
 {
     return d->keep_running;
 }
 
 /*!
   \internal
 */
 void QPEApplication::internalSetStyle( const QString &style )
 {
 #if QT_VERSION >= 0x030000
     if ( style == "QPE" ) {
         setStyle( new QPEStyle );
     }
     else {
         QStyle *s = QStyleFactory::create( style );
         if ( s )
             setStyle( s );
     }
 #else
     if ( style == "Windows" ) {
         setStyle( new QWindowsStyle );
     }
     else if ( style == "QPE" ) {
         setStyle( new QPEStyle );
     }
     else if ( style == "Light" ) {
         setStyle( new LightStyle );
     }
 #ifndef QT_NO_STYLE_PLATINUM
     else if ( style == "Platinum" ) {
         setStyle( new QPlatinumStyle );
     }
 #endif
 #ifndef QT_NO_STYLE_MOTIF
     else if ( style == "Motif" ) {
         setStyle( new QMotifStyle );
     }
 #endif
 #ifndef QT_NO_STYLE_MOTIFPLUS
     else if ( style == "MotifPlus" ) {
         setStyle( new QMotifPlusStyle );
     }
 #endif
 
     else {
         QStyle *sty = 0;
         QString path = QPEApplication::qpeDir ( ) + "plugins/styles/";
 
 #ifdef Q_OS_MACX
         if ( style. find ( ".dylib" ) > 0 )
             path += style;
         else
             path = path + "lib" + style. lower ( ) + ".dylib"; // compatibility
 #else
         if ( style. find ( ".so" ) > 0 )
             path += style;
         else
             path = path + "lib" + style. lower ( ) + ".so"; // compatibility
 #endif
         static QLibrary *lastlib = 0;
         static StyleInterface *lastiface = 0;
 
         QLibrary *lib = new QLibrary ( path );
         StyleInterface *iface = 0;
 
         if (( lib-> queryInterface ( IID_Style, ( QUnknownInterface ** ) &iface ) == QS_OK ) && iface )
             sty = iface-> style ( );
 
         if ( sty ) {
             setStyle ( sty );
 
             if ( lastiface )
                 lastiface-> release ( );
             lastiface = iface;
 
             if ( lastlib ) {
                 lastlib-> unload ( );
                 delete lastlib;
             }
             lastlib = lib;
         }
         else {
             if ( iface )
                 iface-> release ( );
             delete lib;
 
             setStyle ( new LightStyle ( ));
         }
     }
 #endif
 }
 
 /*!
   \internal
 */
 void QPEApplication::prepareForTermination( bool willrestart )
 {
     if ( willrestart ) {
         QLabel *lblWait = new QLabel( tr( "Please wait..." ), 0, "wait hack", QWidget::WStyle_Customize |
                                       QWidget::WStyle_NoBorder | QWidget::WStyle_Tool );
         lblWait->setAlignment( QWidget::AlignCenter );
         lblWait->show();
         lblWait->showMaximized();
     }
     { QCopEnvelope envelope( "QPE/System", "forceQuit()" );
     }
     processEvents(); // ensure the message goes out.
 }
 
 /*!
   \internal
 */
 void QPEApplication::shutdown()
 {
     // Implement in server's QPEApplication subclass
 }
 
 /*!
   \internal
 */
 void QPEApplication::restart()
 {
     // Implement in server's QPEApplication subclass
 }
 
 static QPtrDict<void>* stylusDict = 0;
 static void createDict()
 {
     if ( !stylusDict )
         stylusDict = new QPtrDict<void>;
 }
 
 /*!
   Returns the current StylusMode for widget \a w.
 
   \sa setStylusOperation() StylusMode
 */
 QPEApplication::StylusMode QPEApplication::stylusOperation( QWidget* w )
 {
     if ( stylusDict )
         return ( StylusMode ) ( int ) stylusDict->find( w );
     return LeftOnly;
 }
 
 /*!
     \enum QPEApplication::StylusMode
 
     \value LeftOnly the stylus only generates LeftButton
                        events (the default).
     \value RightOnHold the stylus generates RightButton events
                        if the user uses the press-and-hold gesture.
 
     \sa setStylusOperation() stylusOperation()
 */
 
 /*!
   Causes widget \a w to receive mouse events according to the stylus
   \a mode.
 
   \sa stylusOperation() StylusMode
 */
 void QPEApplication::setStylusOperation( QWidget * w, StylusMode mode )
 {
     createDict();
     if ( mode == LeftOnly ) {
         stylusDict->remove
         ( w );
         w->removeEventFilter( qApp );
     }
     else {
         stylusDict->insert( w, ( void* ) mode );
         connect( w, SIGNAL( destroyed() ), qApp, SLOT( removeSenderFromStylusDict() ) );
         w->installEventFilter( qApp );
     }
 }
 
 
 /*!
   \reimp
 */
 bool QPEApplication::eventFilter( QObject *o, QEvent *e )
 {
         if ( !o->isWidgetType() )
             return FALSE;
 
     if ( stylusDict && e->type() >= QEvent::MouseButtonPress && e->type() <= QEvent::MouseMove ) {
         QMouseEvent * me = ( QMouseEvent* ) e;
         StylusMode mode = (StylusMode)(int)stylusDict->find(o);
         switch (mode) {
             case RightOnHold:
                 switch ( me->type() ) {
                     case QEvent::MouseButtonPress:
                         if ( me->button() == LeftButton ) {
                             static long Pref = 500; // #### pref.
                             d->presswidget = (QWidget*)o;
                             d->presspos = me->pos();
                             d->rightpressed = FALSE;
 #ifdef OPIE_WITHROHFEEDBACK
                             if( ! d->RoH )
                               d->RoH = new Opie::Internal::RoHFeedback;
 
                             d->RoH->init( me->globalPos(), d->presswidget );
                             Pref = d->RoH->delay();
 
 #endif
                             if (!d->presstimer )
                                 d->presstimer = startTimer( Pref ); // #### pref.
 
                         }
                         break;
                     case QEvent::MouseMove:
                         if (d->presstimer && (me->pos() - d->presspos).manhattanLength() > 8) {
                             killTimer(d->presstimer);
 #ifdef OPIE_WITHROHFEEDBACK
                             d->RoH->stop();
 #endif
                             d->presstimer = 0;
                         }
                         break;
                     case QEvent::MouseButtonRelease:
                         if ( me->button() == LeftButton ) {
                             if ( d->presstimer ) {
                                 killTimer(d->presstimer);
 #ifdef OPIE_WITHROHFEEDBACK
                                 d->RoH->stop( );
 #endif
                                 d->presstimer = 0;
                             }
                             if ( d->rightpressed && d->presswidget ) {
                               printf( "Send ButtonRelease\n" );
                                 // Right released
                                 postEvent( d->presswidget,
                                            new QMouseEvent( QEvent::MouseButtonRelease, me->pos(),
                                                             RightButton, LeftButton + RightButton ) );
                                 // Left released, off-widget
                                 postEvent( d->presswidget,
                                            new QMouseEvent( QEvent::MouseMove, QPoint( -1, -1),
                                                             LeftButton, LeftButton ) );
                                 postEvent( d->presswidget,
                                            new QMouseEvent( QEvent::MouseButtonRelease, QPoint( -1, -1),
                                                             LeftButton, LeftButton ) );
                                 d->rightpressed = FALSE;
                                 return TRUE; // don't send the real Left release
                             }
                         }
                         break;
                     default:
                         break;
                 }
                 break;
             default:
                 ;
         }
     }
     else if ( e->type() == QEvent::KeyPress || e->type() == QEvent::KeyRelease ) {
         QKeyEvent *ke = (QKeyEvent *)e;
         if ( ke->key() == Key_Enter ) {
             if ( o->isA( "QRadioButton" ) || o->isA( "QCheckBox" ) ) {
                 postEvent( o, new QKeyEvent( e->type(), Key_Space, ' ',
                                              ke->state(), " ", ke->isAutoRepeat(), ke->count() ) );
                 return TRUE;
             }
         }
     }
     return FALSE;
 }
 
 /*!
   \reimp
 */
 void QPEApplication::timerEvent( QTimerEvent *e )
 {
     if ( e->timerId() == d->presstimer && d->presswidget ) {
 
           // Right pressed
           postEvent( d->presswidget,
                      new QMouseEvent( QEvent::MouseButtonPress, d->presspos,
                                       RightButton, LeftButton ) );
           killTimer( d->presstimer );
           d->presstimer = 0;
           d->rightpressed = TRUE;
 #ifdef OPIE_WITHROHFEEDBACK
           d->RoH->stop();
 #endif
     }
 }
 
 void QPEApplication::removeSenderFromStylusDict()
 {
     stylusDict->remove
     ( ( void* ) sender() );
     if ( d->presswidget == sender() )
         d->presswidget = 0;
 }
 
 /*!
   \internal
 */
 bool QPEApplication::keyboardGrabbed() const
 {
     return d->kbgrabbed;
 }
 
 
 /*!
   Reverses the effect of grabKeyboard(). This is called automatically
   on program exit.
 */
 void QPEApplication::ungrabKeyboard()
 {
     ((QPEApplication *) qApp )-> d-> kbgrabbed = false;
 }
 
 /*!
   Grabs the physical keyboard keys, e.g. the application's launching
   keys. Instead of launching applications when these keys are pressed
   the signals emitted are sent to this application instead. Some games
   programs take over the launch keys in this way to make interaction
   easier.
 
   \sa ungrabKeyboard()
 */
 void QPEApplication::grabKeyboard()
 {
     ((QPEApplication *) qApp )-> d-> kbgrabbed = true;
 }
 
 /*!
   \reimp
 */
 int QPEApplication::exec()
 {
         d->qcopQok = true;
 #ifndef QT_NO_COP
     d->sendQCopQ();
         if ( !d->keep_running )
             processEvents(); // we may have received QCop messages in the meantime.
 #endif
 
     if ( d->keep_running )
         //|| d->qpe_main_widget && d->qpe_main_widget->isVisible() )
         return QApplication::exec();
 
 #ifndef QT_NO_COP
 
     {
         QCopEnvelope e( "QPE/System", "closing(QString)" );
         e << d->appName;
     }
 #endif
     processEvents();
     return 0;
 }
 
 /*!
   \internal
   External request for application to quit.  Quits if possible without
   loosing state.
 */
 void QPEApplication::tryQuit()
 {
     if ( activeModalWidget() )
         return ; // Inside modal loop or konsole. Too hard to save state.
 #ifndef QT_NO_COP
 
     {
         QCopEnvelope e( "QPE/System", "closing(QString)" );
         e << d->appName;
     }
 #endif
     if ( d->keep_running )
     d->store_widget_rect(d->qpe_main_widget, d->appName);
     processEvents();
 
     quit();
 }
 
 
 /*!
   \internal
   User initiated quit.  Makes the window 'Go Away'.  If preloaded this means
   hiding the window.  If not it means quitting the application.
   As this is user initiated we don't need to check state.
 */
 void QPEApplication::hideOrQuit()
 {
     if ( d->keep_running )
     d->store_widget_rect(d->qpe_main_widget, d->appName);
     processEvents();
 
     // If we are a preloaded application we don't actually quit, so emit
     // a System message indicating we're quasi-closing.
     if ( d->preloaded && d->qpe_main_widget )
 #ifndef QT_NO_COP
 
     {
         QCopEnvelope e("QPE/System", "fastAppHiding(QString)" );
         e << d->appName;
         d->qpe_main_widget->hide();
     }
 #endif
     else
         quit();
 }
 
-#if (__GNUC__ > 2 )
+#if (__GNUC__ > 2 ) && !defined(_OS_MACX_)
 extern "C" void __cxa_pure_virtual();
 
 void __cxa_pure_virtual()
 {
     fprintf( stderr, "Pure virtual called\n");
     abort();
 
 }
 
 #endif
 
 
 #if defined(OPIE_NEW_MALLOC)
 
 // 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 ( p )
         free( p );
 }
 
 void operator delete[]( void* p, size_t /*size*/ )
 {
     if ( p )
         free( p );
 }
 
 
 void operator delete( void* p )
 {
     if ( p )
         free( p );
 }
 
 void operator delete( void* p, size_t /*size*/ )
 {
     if ( p )
         free( p );
 }
 
 #endif
 
 #if ( QT_VERSION <= 230 ) && !defined(SINGLE_APP)
 #include <qwidgetlist.h>
 #ifdef QWS
 #include <qgfx_qws.h>
 extern QRect qt_maxWindowRect;
 void qt_setMaxWindowRect(const QRect& r )
 {
     qt_maxWindowRect = qt_screen->mapFromDevice( r,
                        qt_screen->mapToDevice( QSize( qt_screen->width(), qt_screen->height() ) ) );
     // Re-resize any maximized windows
     QWidgetList* l = QApplication::topLevelWidgets();
     if ( l ) {
         QWidget * w = l->first();
         while ( w ) {
             if ( w->isVisible() && w->isMaximized() ) {
                 w->showMaximized();
             }
             w = l->next();
         }
         delete l;
     }
 }
 #endif
 #endif