From 19a3f177cdf334259438a0f2266255886f3063bb Mon Sep 17 00:00:00 2001 From: alwin Date: Tue, 06 Apr 2004 12:34:17 +0000 Subject: 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. --- 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 @@ -293,3 +293,41 @@ int main( int argc, char **argv ) { \ return -1; \ } #endif + +#ifdef OPIE_APP_INTERFACE +#define OPIE_EXPORT_APP_V2( factory,name ) Q_EXPORT_INTERFACE() { Q_CREATE_INSTANCE( factory ) } +#else + +#include + +#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 + -- cgit v0.9.0.2