-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 | |||
@@ -433,13 +433,13 @@ static void setTreble( int t = 0, int percent = -1 ) | |||
433 | break; | 433 | break; |
434 | } | 434 | } |
435 | } | 435 | } |
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 | ||
443 | Simply by using QPEApplication instead of QApplication, a standard Qt | 443 | Simply by using QPEApplication instead of QApplication, a standard Qt |
444 | application becomes a Qtopia application. It automatically follows | 444 | application becomes a Qtopia application. It automatically follows |
445 | style changes, quits and raises, and in the | 445 | style changes, quits and raises, and in the |
@@ -732,13 +732,12 @@ QPEApplication::QPEApplication( int & argc, char **argv, Type t ) | |||
732 | } | 732 | } |
733 | 733 | ||
734 | 734 | ||
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; |
742 | d->forceshow = FALSE; | 741 | d->forceshow = FALSE; |
743 | 742 | ||
744 | QCString channel = QCString(argv[0]); | 743 | QCString channel = QCString(argv[0]); |
@@ -752,16 +751,16 @@ void QPEApplication::initApp( int argc, char **argv ) | |||
752 | 751 | ||
753 | channel = "QPE/Application/" + channel; | 752 | channel = "QPE/Application/" + channel; |
754 | pidChannel = new QCopChannel( channel, this); | 753 | pidChannel = new QCopChannel( channel, this); |
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 ) { |
765 | argv[a] = argv[a+1]; | 764 | argv[a] = argv[a+1]; |
766 | a++; | 765 | a++; |
767 | d->preloaded = TRUE; | 766 | d->preloaded = TRUE; |
@@ -1568,13 +1567,13 @@ void QPEApplication::pidMessage( const QCString& msg, const QByteArray& data) | |||
1568 | consider passing TRUE for \a nomaximize rather than the default FALSE. | 1567 | consider passing TRUE for \a nomaximize rather than the default FALSE. |
1569 | 1568 | ||
1570 | \sa showMainDocumentWidget() | 1569 | \sa showMainDocumentWidget() |
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 | ||
1578 | /*! | 1577 | /*! |
1579 | Sets widget \a mw as the mainWidget() and shows it. For small windows, | 1578 | Sets widget \a mw as the mainWidget() and shows it. For small windows, |
1580 | consider passing TRUE for \a nomaximize rather than the default FALSE. | 1579 | consider passing TRUE for \a nomaximize rather than the default FALSE. |
@@ -1589,13 +1588,13 @@ void QPEApplication::showMainWidget( QWidget* mw, bool nomaximize ) | |||
1589 | void QPEApplication::showMainDocumentWidget( QWidget* mw, bool nomaximize ) | 1588 | void QPEApplication::showMainDocumentWidget( QWidget* mw, bool nomaximize ) |
1590 | { | 1589 | { |
1591 | if ( mw && argc() == 2 ) | 1590 | if ( mw && argc() == 2 ) |
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 | ||
1599 | 1598 | ||
1600 | /*! | 1599 | /*! |
1601 | If an application is started via a \link qcop.html QCop\endlink | 1600 | If an application is started via a \link qcop.html QCop\endlink |