| -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 @@ -435,9 +435,9 @@ static void setTreble( int t = 0, int percent = -1 ) } /** - \class QPEApplication + \class QPEApplication \brief The QPEApplication class implements various system services that are available to all Qtopia applications. Simply by using QPEApplication instead of QApplication, a standard Qt @@ -734,9 +734,8 @@ QPEApplication::QPEApplication( int & argc, char **argv, Type t ) #ifdef QTOPIA_INTERNAL_INITAPP void QPEApplication::initApp( int argc, char **argv ) { - bool initial = pidChannel; // was set to 0 in the initializer delete pidChannel; d->keep_running = TRUE; d->preloaded = FALSE; d->forceshow = FALSE; @@ -754,12 +753,12 @@ void QPEApplication::initApp( int argc, char **argv ) pidChannel = new QCopChannel( channel, this); connect( pidChannel, SIGNAL(received(const QCString &, const QByteArray &)), this, SLOT(pidMessage(const QCString &, const QByteArray &))); - if (!initial) { - processQCopFile(); - d->keep_running = d->qcopq.isEmpty(); - } + + + processQCopFile(); + d->keep_running = d->qcopq.isEmpty(); for (int a=0; a<argc; a++) { if ( qstrcmp(argv[a],"-preload")==0 ) { argv[a] = argv[a+1]; @@ -1570,9 +1569,9 @@ void QPEApplication::pidMessage( const QCString& msg, const QByteArray& data) \sa showMainDocumentWidget() */ void QPEApplication::showMainWidget( QWidget* mw, bool nomaximize ) { - setMainWidget(mw); +// setMainWidget(mw); this breaks FastLoading because lastWindowClose() would quit d->show(mw, nomaximize ); } /*! @@ -1591,9 +1590,9 @@ void QPEApplication::showMainDocumentWidget( QWidget* mw, bool nomaximize ) if ( mw && argc() == 2 ) Global::setDocument( mw, QString::fromUtf8(argv()[1]) ); - setMainWidget(mw); +// setMainWidget(mw); see above d->show(mw, nomaximize ); } |