#define QTOPIA_INTERNAL_INITAPP must happen before #include "dropins.h" or

this won't compile

2 files changed, 11 insertions, 8 deletions

diff --git a/core/tools/quicklauncher/dropins.h b/core/tools/quicklauncher/dropins.h
index 7acace9..a9664f8 100644
--- a/core/tools/quicklauncher/dropins.h
+++ b/core/tools/quicklauncher/dropins.h
@@ -1,68 +1,71 @@
+/* OPIE */
+#include <opie2/owait.h>
+using namespace Opie::Ui;
 
-#include <qstring.h>
 #include <qtopia/qcom.h>
 #include <qtopia/qlibrary.h>
+#include <qtopia/qpeapplication.h>
 #include <qtopia/applicationinterface.h>
 #include <qtopia/resource.h>
 
-#include <opie2/owait.h>
-
+/* QT */
 #include <qmetaobject.h>
 #include <qmap.h>
+#include <qstring.h>
 
 namespace QuickPrivate {
 
     struct PluginLoader {
         PluginLoader( const char* ) {
         }
 
         QRESULT queryInterface( const QString& app, const QUuid&, QUnknownInterface** );
         void releaseInterface( QUnknownInterface* );
         QMap<QUnknownInterface*, QLibrary*> libs;
     };
 
     /*
      * We can skip installing a Translator here because Opies QPEApplication
      * will do that in initApp for us as well
      */
     QRESULT PluginLoader::queryInterface( const QString& libFile, const QUuid& uuid, QUnknownInterface** iface ) {
         QRESULT res = QS_FALSE;
         *iface = 0;
 
 	// This code is very platform specific.. We should find better
 	// solutions to handle names.. Maybe one central function would be
 	// better than checking this ".so" stuff all around in the sources.. 
 	// (eilers)
 
         // Below lines from TT then mine again
         QString name = libFile;
         if ( libFile.findRev(".so") == (int)libFile.length()-3 ) {
             name = libFile.left( libFile.length()-3 );
             if ( name.find( "lib" ) == 0 )
                 name = name.mid( 3 );
         }
 #ifdef Q_OS_MACX
         QString path = QPEApplication::qpeDir() + "/plugins/application/lib"+name+".dylib";
 #else
         QString path = QPEApplication::qpeDir() + "/plugins/application/lib"+name+".so";
 #endif
 
         QLibrary *lib = new QLibrary( path );
         if ( lib->queryInterface( uuid, iface ) == QS_OK && iface ) {
             libs.insert( *iface, lib );
             res = QS_OK;
         }
 
         return res;
     }
 
     void PluginLoader::releaseInterface( QUnknownInterface* iface ) {
         if ( libs.contains( iface ) ) {
             iface->release();
             delete libs[iface];
             libs.remove( iface ); // we only handle pointers so even if the object is not valid the address-space is
         }
     }
 
 }
 
diff --git a/core/tools/quicklauncher/main.cpp b/core/tools/quicklauncher/main.cpp
index c2467fb..b1befce 100644
--- a/core/tools/quicklauncher/main.cpp
+++ b/core/tools/quicklauncher/main.cpp
@@ -1,275 +1,275 @@
 /**********************************************************************
 ** Copyright (C) 2000-2003 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.
 **
 **********************************************************************/
 
+#define QTOPIA_INTERNAL_INITAPP
 #include "dropins.h"
 
 /* OPIE */
 #include <opie2/odebug.h>
+using namespace Opie::Core;
 
 /* QT */
 #include <qpainter.h>
 #include <qstrlist.h>
 #include <qtimer.h>
 #include <qguardedptr.h>
 #include <qcopchannel_qws.h>
-#define QTOPIA_INTERNAL_INITAPP
 
 #ifdef private
 #       undef  private
 #endif
 #define private public
 #include <qtopia/qpeapplication.h>
 #undef private
 
 /* STD */
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
 
 using QuickPrivate::PluginLoader;
 
 static QPEApplication *app = 0;
 static PluginLoader *loader = 0;
 static ApplicationInterface *appIface = 0;
 static QGuardedPtr<QWidget> mainWindow;
 
 #ifdef _OS_LINUX_
 static char **argv0 = 0;
 static int argv_lth;
 extern char **environ;
 #ifndef SPT_BUFSIZE
 #define SPT_BUFSIZE     2048
 #endif
 #include <stdarg.h>
-using namespace Opie::Ui;
 void setproctitle (const char *fmt,...) {
     int        i;
     char       buf[SPT_BUFSIZE];
     va_list    ap;
 
     if (!argv0)
     return;
 
     va_start(ap, fmt);
     (void) vsnprintf(buf, SPT_BUFSIZE, fmt, ap);
     va_end(ap);
 
     i = strlen (buf);
     if (i > argv_lth - 2) {
     i = argv_lth - 2;
     buf[i] = '\0';
     }
     memset(argv0[0], '\0', argv_lth);       /* clear the memory area */
     (void) strcpy (argv0[0], buf);
 
     argv0[1] = NULL;
 }
 #endif
 
 
 class QuickLauncher : public QObject
 {
     Q_OBJECT
 public:
     QuickLauncher() : QObject()
     {
     QCString ch("QPE/QuickLauncher-");
     ch += QString::number(getpid());
     qlChannel = new QCopChannel( ch, this);
     connect( qlChannel, SIGNAL(received(const QCString&,const QByteArray&)),
          this, SLOT(message(const QCString&,const QByteArray&)) );
     }
 
     static void exec( int /*argc*/, char **argv )
     {
     QString appName = argv[0];
     int sep = appName.findRev( '/' );
     if ( sep > 0 )
         appName = appName.mid( sep+1 );
 
     appIface = 0;
     if ( loader->queryInterface(appName, IID_QtopiaApplication, (QUnknownInterface**)&appIface) == QS_OK ) {
         mainWindow = appIface->createMainWindow( appName );
     }
     if ( mainWindow ) {
         if ( mainWindow->metaObject()->slotNames().contains("setDocument(const QString&)") ) {
         app->showMainDocumentWidget( mainWindow );
         } else {
         app->showMainWidget( mainWindow );
         }
     } else {
         owarn << "Could not create application main window" << oendl;
         exit(-1);
     }
     }
 
 private slots:
     void message(const QCString &msg, const QByteArray & data)
     {
     QStrList argList;
 
     if ( msg == "execute(QStrList)" ) {
         delete qlChannel;
         QDataStream stream( data, IO_ReadOnly );
         QStrList argList;
         stream >> argList;
-        odebug << "QuickLauncher execute: " << argList.at(0) << "" << oendl;
+        odebug << "QuickLauncher execute: " << argList.at(0) << oendl;
         doQuickLaunch( argList );
         delete this;
     } else if ( msg == "execute(QString)" ) {
         delete qlChannel;
         QDataStream stream( data, IO_ReadOnly );
         QString arg;
         stream >> arg;
-        odebug << "QuickLauncher execute: " << arg << "" << oendl;
+        odebug << "QuickLauncher execute: " << arg << oendl;
         QStrList argList;
         argList.append( arg.utf8() );
         doQuickLaunch( argList );
         delete this;
     }
     }
 
 private:
     void doQuickLaunch( QStrList &argList )
     {
     static int myargc = argList.count();
     static char **myargv = new char *[myargc + 1];
     for ( int j = 0; j < myargc; j++ ) {
         myargv[j] = new char [strlen(argList.at(j))+1];
         strcpy( myargv[j], argList.at(j) );
     }
     myargv[myargc] = NULL;
 #ifdef _OS_LINUX_
     // Change name of process
     setproctitle(myargv[0]);
 #endif
 
     connect(app, SIGNAL(lastWindowClosed()), app, SLOT(hideOrQuit()));
     app->exit_loop();
     app->initApp( myargc, myargv );
     exec( myargc, myargv );
     }
 
 private:
     QCopChannel *qlChannel;
 };
 
 int main( int argc, char** argv )
 {
     app = new QPEApplication( argc, argv );
 
     loader = new PluginLoader( "application" );
 
     unsetenv( "LD_BIND_NOW" );
 
     QCString arg0 = argv[0];
     int sep = arg0.findRev( '/' );
     if ( sep > 0 )
     arg0 = arg0.mid( sep+1 );
     if ( arg0 != "quicklauncher" ) {
-    odebug << "QuickLauncher invoked as: " << arg0.data() << "" << oendl;
+    odebug << "QuickLauncher invoked as: " << arg0.data() << oendl;
     QuickLauncher::exec( argc, argv );
     } else {
 #ifdef _OS_LINUX_
     // Setup to change proc title
     int i;
     char **envp = environ;
     /* Move the environment so we can reuse the memory.
      * (Code borrowed from sendmail.) */
     for (i = 0; envp[i] != NULL; i++)
         continue;
     environ = (char **) malloc(sizeof(char *) * (i + 1));
     if (environ == NULL)
         return -1;
     for (i = 0; envp[i] != NULL; i++)
         if ((environ[i] = strdup(envp[i])) == NULL)
         return -1;
     environ[i] = NULL;
 
     argv0 = argv;
     if (i > 0)
         argv_lth = envp[i-1] + strlen(envp[i-1]) - argv0[0];
     else
         argv_lth = argv0[argc-1] + strlen(argv0[argc-1]) - argv0[0];
 #endif
     (void)new QuickLauncher();
     odebug << "QuickLauncher running" << oendl;
     // Pre-load default fonts
     QFontMetrics fm( QApplication::font() );
     fm.ascent(); // causes font load.
     QFont f( QApplication::font() );
     f.setWeight( QFont::Bold );
     QFontMetrics fmb( f );
     fmb.ascent(); // causes font load.
 
     // Each of the following force internal structures/internal
     // initialization to be performed.  This may mean allocating
     // memory that is not needed by all applications.
 #if 0
     TimeZone::current().isValid(); // popuplate timezone cache
     TimeString::currentDateFormat(); // create internal structures
     TimeString::currentAMPM();
 #endif
     Resource::loadIconSet("new"); // do internal init
 
         /* make sure libopie gets lined in */
         {
             Opie::Ui::OWait item;
         }
 
     // Create a widget to force initialization of title bar images, etc.
     QObject::disconnect(app, SIGNAL(lastWindowClosed()), app, SLOT(hideOrQuit()));
     QWidget *w = new QWidget(0,0,Qt::WDestructiveClose|Qt::WStyle_ContextHelp|Qt::WStyle_Tool);
     w->setGeometry( -100, -100, 10, 10 );
     w->show();
     QTimer::singleShot( 0, w, SLOT(close()) );
 
     app->enter_loop();
     }
 
     int rv = app->exec();
 
     if ( mainWindow )
     delete (QWidget*)mainWindow;
 
     delete app;
     if ( appIface )
     loader->releaseInterface( appIface );
     delete loader;
     // Neither QLibrary nor my Dropin is a QObject and they don't depend
     // on a qApp so we destroy QWidget::destroyMapper() without
     // crashing the app
     //
     // The problem is there are some 'static' resources not freed
     // in the apps and on destructing these objects are not available
     // anymore. In future fix up the apps but for now
     // we just skip deletion and hope things go well -zecke
 //    delete app;
     // hack instead -zecke
 //    delete app->pidChannel;
 //    app->pidChannel = 0;
 
     return rv;
 }
 
 #include "main.moc"