author | zecke <zecke> | 2004-02-21 23:07:32 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-02-21 23:07:32 (UTC) |
commit | 57598b2a111ea924c5ad632cefb4ad7697c35759 (patch) (unidiff) | |
tree | 4f52a1dfad6ca25b6b52317c79b72753c8fe2264 | |
parent | 4cfad0d1331a5e3adc8bc2599783750875e6fd2b (diff) | |
download | opie-57598b2a111ea924c5ad632cefb4ad7697c35759.zip opie-57598b2a111ea924c5ad632cefb4ad7697c35759.tar.gz opie-57598b2a111ea924c5ad632cefb4ad7697c35759.tar.bz2 |
Unbreak fastloading. So the API Documentation is a lie..
showMainWidget may not setMainWidget because this would
break Fastloading..
-rw-r--r-- | library/qpeapplication.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index 6f2e43b..c7ef2b7 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -436,7 +436,7 @@ static void setTreble( int t = 0, int percent = -1 ) | |||
436 | 436 | ||
437 | 437 | ||
438 | /** | 438 | /** |
439 | \class QPEApplication | 439 | \class QPEApplication |
440 | \brief The QPEApplication class implements various system services | 440 | \brief The QPEApplication class implements various system services |
441 | that are available to all Qtopia applications. | 441 | that are available to all Qtopia applications. |
442 | 442 | ||
@@ -735,7 +735,6 @@ QPEApplication::QPEApplication( int & argc, char **argv, Type t ) | |||
735 | #ifdef QTOPIA_INTERNAL_INITAPP | 735 | #ifdef QTOPIA_INTERNAL_INITAPP |
736 | void QPEApplication::initApp( int argc, char **argv ) | 736 | void QPEApplication::initApp( int argc, char **argv ) |
737 | { | 737 | { |
738 | bool initial = pidChannel; // was set to 0 in the initializer | ||
739 | delete pidChannel; | 738 | delete pidChannel; |
740 | d->keep_running = TRUE; | 739 | d->keep_running = TRUE; |
741 | d->preloaded = FALSE; | 740 | d->preloaded = FALSE; |
@@ -755,10 +754,10 @@ void QPEApplication::initApp( int argc, char **argv ) | |||
755 | connect( pidChannel, SIGNAL(received(const QCString &, const QByteArray &)), | 754 | connect( pidChannel, SIGNAL(received(const QCString &, const QByteArray &)), |
756 | this, SLOT(pidMessage(const QCString &, const QByteArray &))); | 755 | this, SLOT(pidMessage(const QCString &, const QByteArray &))); |
757 | 756 | ||
758 | if (!initial) { | 757 | |
759 | processQCopFile(); | 758 | |
760 | d->keep_running = d->qcopq.isEmpty(); | 759 | processQCopFile(); |
761 | } | 760 | d->keep_running = d->qcopq.isEmpty(); |
762 | 761 | ||
763 | for (int a=0; a<argc; a++) { | 762 | for (int a=0; a<argc; a++) { |
764 | if ( qstrcmp(argv[a],"-preload")==0 ) { | 763 | if ( qstrcmp(argv[a],"-preload")==0 ) { |
@@ -1571,7 +1570,7 @@ void QPEApplication::pidMessage( const QCString& msg, const QByteArray& data) | |||
1571 | */ | 1570 | */ |
1572 | void QPEApplication::showMainWidget( QWidget* mw, bool nomaximize ) | 1571 | void QPEApplication::showMainWidget( QWidget* mw, bool nomaximize ) |
1573 | { | 1572 | { |
1574 | setMainWidget(mw); | 1573 | // setMainWidget(mw); this breaks FastLoading because lastWindowClose() would quit |
1575 | d->show(mw, nomaximize ); | 1574 | d->show(mw, nomaximize ); |
1576 | } | 1575 | } |
1577 | 1576 | ||
@@ -1592,7 +1591,7 @@ void QPEApplication::showMainDocumentWidget( QWidget* mw, bool nomaximize ) | |||
1592 | Global::setDocument( mw, QString::fromUtf8(argv()[1]) ); | 1591 | Global::setDocument( mw, QString::fromUtf8(argv()[1]) ); |
1593 | 1592 | ||
1594 | 1593 | ||
1595 | setMainWidget(mw); | 1594 | //setMainWidget(mw); see above |
1596 | d->show(mw, nomaximize ); | 1595 | d->show(mw, nomaximize ); |
1597 | } | 1596 | } |
1598 | 1597 | ||