| author | zecke <zecke> | 2004-12-20 22:04:43 (UTC) |
|---|---|---|
| committer | zecke <zecke> | 2004-12-20 22:04:43 (UTC) |
| commit | e561899f6cf0c98b428f70df06eaee2ce1912291 (patch) (side-by-side diff) | |
| tree | deb204bd5f6026c9b48a82089739a29dd564be07 | |
| parent | 4a9d317adb576fed2164638a1d4d15c75eebfd6b (diff) | |
| download | opie-e561899f6cf0c98b428f70df06eaee2ce1912291.zip opie-e561899f6cf0c98b428f70df06eaee2ce1912291.tar.gz opie-e561899f6cf0c98b428f70df06eaee2ce1912291.tar.bz2 | |
A define to avoid writing static QString fromLatin1() {...}
| -rw-r--r-- | libopie2/opiecore/oapplicationfactory.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libopie2/opiecore/oapplicationfactory.h b/libopie2/opiecore/oapplicationfactory.h index 6247776..cabaf79 100644 --- a/libopie2/opiecore/oapplicationfactory.h +++ b/libopie2/opiecore/oapplicationfactory.h @@ -270,64 +270,66 @@ int main( int argc, char **argv ) { \ \ /* 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 + +#define OPIE_EXPORT_APPNAME static QString appName() { return QString::fromLatin1( QUICKAPP_NAME ); } |