-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 ) { \ | |||
270 | \ | 270 | \ |
271 | /* method from TT */ \ | 271 | /* method from TT */ \ |
272 | QString executableName = QString::fromLatin1( argv[0] ); \ | 272 | QString executableName = QString::fromLatin1( argv[0] ); \ |
273 | executableName = executableName.right(executableName.length() \ | 273 | executableName = executableName.right(executableName.length() \ |
274 | - executableName.findRev('/') - 1); \ | 274 | - executableName.findRev('/') - 1); \ |
275 | \ | 275 | \ |
276 | Factory f; \ | 276 | Factory f; \ |
277 | QStringList list = f.applications(); \ | 277 | QStringList list = f.applications(); \ |
278 | if (list.contains(executableName) ) \ | 278 | if (list.contains(executableName) ) \ |
279 | mw = f.createMainWindow(executableName, 0, 0, 0 ); \ | 279 | mw = f.createMainWindow(executableName, 0, 0, 0 ); \ |
280 | else \ | 280 | else \ |
281 | mw = f.createMainWindow( list[0], 0, 0, 0 ); \ | 281 | mw = f.createMainWindow( list[0], 0, 0, 0 ); \ |
282 | \ | 282 | \ |
283 | if( mw ) { \ | 283 | if( mw ) { \ |
284 | if ( mw->metaObject()->slotNames().contains("setDocument(const QString&)" ) ) \ | 284 | if ( mw->metaObject()->slotNames().contains("setDocument(const QString&)" ) ) \ |
285 | a.showMainDocumentWidget( mw ); \ | 285 | a.showMainDocumentWidget( mw ); \ |
286 | else \ | 286 | else \ |
287 | a.showMainWidget( mw ); \ | 287 | a.showMainWidget( mw ); \ |
288 | \ | 288 | \ |
289 | int rv = a.exec(); \ | 289 | int rv = a.exec(); \ |
290 | delete mw; \ | 290 | delete mw; \ |
291 | return rv; \ | 291 | return rv; \ |
292 | }else \ | 292 | }else \ |
293 | return -1; \ | 293 | return -1; \ |
294 | } | 294 | } |
295 | #endif | 295 | #endif |
296 | 296 | ||
297 | #ifdef OPIE_APP_INTERFACE | 297 | #ifdef OPIE_APP_INTERFACE |
298 | #define OPIE_EXPORT_APP_V2( factory,name ) Q_EXPORT_INTERFACE() { Q_CREATE_INSTANCE( factory ) } | 298 | #define OPIE_EXPORT_APP_V2( factory,name ) Q_EXPORT_INTERFACE() { Q_CREATE_INSTANCE( factory ) } |
299 | #else | 299 | #else |
300 | 300 | ||
301 | #include <opie2/oapplication.h> | 301 | #include <opie2/oapplication.h> |
302 | 302 | ||
303 | #define OPIE_EXPORT_APP_V2( Factory,name ) \ | 303 | #define OPIE_EXPORT_APP_V2( Factory,name ) \ |
304 | int main( int argc, char **argv ) { \ | 304 | int main( int argc, char **argv ) { \ |
305 | Opie::Core::OApplication a(argc, argv, name ); \ | 305 | Opie::Core::OApplication a(argc, argv, name ); \ |
306 | QWidget *mw = 0;\ | 306 | QWidget *mw = 0;\ |
307 | \ | 307 | \ |
308 | /* method from TT */ \ | 308 | /* method from TT */ \ |
309 | QString executableName = QString::fromLatin1( argv[0] ); \ | 309 | QString executableName = QString::fromLatin1( argv[0] ); \ |
310 | executableName = executableName.right(executableName.length() \ | 310 | executableName = executableName.right(executableName.length() \ |
311 | - executableName.findRev('/') - 1); \ | 311 | - executableName.findRev('/') - 1); \ |
312 | \ | 312 | \ |
313 | Factory f; \ | 313 | Factory f; \ |
314 | QStringList list = f.applications(); \ | 314 | QStringList list = f.applications(); \ |
315 | if (list.contains(executableName) ) \ | 315 | if (list.contains(executableName) ) \ |
316 | mw = f.createMainWindow(executableName, 0, 0, 0 ); \ | 316 | mw = f.createMainWindow(executableName, 0, 0, 0 ); \ |
317 | else \ | 317 | else \ |
318 | mw = f.createMainWindow( list[0], 0, 0, 0 ); \ | 318 | mw = f.createMainWindow( list[0], 0, 0, 0 ); \ |
319 | \ | 319 | \ |
320 | if( mw ) { \ | 320 | if( mw ) { \ |
321 | if ( mw->metaObject()->slotNames().contains("setDocument(const QString&)" ) ) \ | 321 | if ( mw->metaObject()->slotNames().contains("setDocument(const QString&)" ) ) \ |
322 | a.showMainDocumentWidget( mw ); \ | 322 | a.showMainDocumentWidget( mw ); \ |
323 | else \ | 323 | else \ |
324 | a.showMainWidget( mw ); \ | 324 | a.showMainWidget( mw ); \ |
325 | \ | 325 | \ |
326 | int rv = a.exec(); \ | 326 | int rv = a.exec(); \ |
327 | delete mw; \ | 327 | delete mw; \ |
328 | return rv; \ | 328 | return rv; \ |
329 | }else \ | 329 | }else \ |
330 | return -1; \ | 330 | return -1; \ |
331 | } | 331 | } |
332 | #endif | 332 | #endif |
333 | 333 | ||
334 | |||
335 | #define OPIE_EXPORT_APPNAME static QString appName() { return QString::fromLatin1( QUICKAPP_NAME ); } | ||