added OPIE_EXPORT_APP_V2( Factory,name ) macro.

Factory is the same as in OPIE_EXPORT_APP, name is the display name
(third parameter of OApplication). In non-quicklaunch mode it will generate
a Opie::Core::OApplication object instead of a QPEApplication object.

1 files changed, 38 insertions, 0 deletions

diff --git a/libopie2/opiecore/oapplicationfactory.h b/libopie2/opiecore/oapplicationfactory.h
index 4518174..6247776 100644
--- a/libopie2/opiecore/oapplicationfactory.h
+++ b/libopie2/opiecore/oapplicationfactory.h
@@ -248,48 +248,86 @@ struct OApplicationFactory< Opie::Core::Typelist<Product, ProductListTail > >
     QStringList applications()const {
         QStringList _list;
         return OPrivate< Opie::Core::Typelist<Product, ProductListTail> >::multiString( _list );
     }
 
     Q_REFCOUNT
 };
 
 }
 }
 
 /* If the library version should be build */
 #ifdef OPIE_APP_INTERFACE
 #define OPIE_EXPORT_APP( factory ) Q_EXPORT_INTERFACE() { Q_CREATE_INSTANCE( factory ) }
 #else
 
 #include <qpe/qpeapplication.h>
 
 #define OPIE_EXPORT_APP( Factory )                                      \
 int main( int argc,  char **argv ) {                                    \
     QPEApplication a(argc, argv );               \
     QWidget *mw = 0;\
 \
     /* method from TT */ \
     QString executableName = QString::fromLatin1( argv[0] ); \
     executableName =  executableName.right(executableName.length() \
 	    - executableName.findRev('/') - 1); \
  \
     Factory f; \
     QStringList list = f.applications(); \
     if (list.contains(executableName) ) \
         mw = f.createMainWindow(executableName, 0, 0, 0 ); \
     else \
         mw = f.createMainWindow( list[0], 0, 0, 0 ); \
 \
     if( mw ) { \
         if ( mw->metaObject()->slotNames().contains("setDocument(const QString&)" ) ) \
             a.showMainDocumentWidget( mw ); \
         else \
             a.showMainWidget( mw ); \
 \
         int rv = a.exec(); \
         delete mw; \
         return rv; \
     }else \
         return -1; \
 }
 #endif
+
+#ifdef OPIE_APP_INTERFACE
+#define OPIE_EXPORT_APP_V2( factory,name ) Q_EXPORT_INTERFACE() { Q_CREATE_INSTANCE( factory ) }
+#else
+
+#include <opie2/oapplication.h>
+
+#define OPIE_EXPORT_APP_V2( Factory,name )                                      \
+int main( int argc,  char **argv ) {                                    \
+    Opie::Core::OApplication a(argc, argv, name );               \
+    QWidget *mw = 0;\
+\
+    /* method from TT */ \
+    QString executableName = QString::fromLatin1( argv[0] ); \
+    executableName =  executableName.right(executableName.length() \
+	    - executableName.findRev('/') - 1); \
+ \
+    Factory f; \
+    QStringList list = f.applications(); \
+    if (list.contains(executableName) ) \
+        mw = f.createMainWindow(executableName, 0, 0, 0 ); \
+    else \
+        mw = f.createMainWindow( list[0], 0, 0, 0 ); \
+\
+    if( mw ) { \
+        if ( mw->metaObject()->slotNames().contains("setDocument(const QString&)" ) ) \
+            a.showMainDocumentWidget( mw ); \
+        else \
+            a.showMainWidget( mw ); \
+\
+        int rv = a.exec(); \
+        delete mw; \
+        return rv; \
+    }else \
+        return -1; \
+}
+#endif
+