summaryrefslogtreecommitdiff
authorzecke <zecke>2004-02-21 23:07:32 (UTC)
committer zecke <zecke>2004-02-21 23:07:32 (UTC)
commit57598b2a111ea924c5ad632cefb4ad7697c35759 (patch) (side-by-side diff)
tree4f52a1dfad6ca25b6b52317c79b72753c8fe2264
parent4cfad0d1331a5e3adc8bc2599783750875e6fd2b (diff)
downloadopie-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..
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/qpeapplication.cpp15
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
@@ -431,17 +431,17 @@ static void setTreble( int t = 0, int percent = -1 )
#endif
}
break;
}
}
/**
- \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
application becomes a Qtopia application. It automatically follows
style changes, quits and raises, and in the
case of \link docwidget.html document-oriented\endlink applications,
changes the currently displayed document in response to the environment.
@@ -730,17 +730,16 @@ QPEApplication::QPEApplication( int & argc, char **argv, Type t )
QToolTip::setEnabled( FALSE );
#endif
}
#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;
QCString channel = QCString(argv[0]);
channel.replace(QRegExp(".*/"),"");
@@ -750,20 +749,20 @@ void QPEApplication::initApp( int argc, char **argv )
qt_fbdpy->setIdentity( channel ); // In Qt/E 2.3.6
#endif
channel = "QPE/Application/" + channel;
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];
a++;
d->preloaded = TRUE;
argc-=1;
} else if ( qstrcmp(argv[a],"-preload-show")==0 ) {
@@ -1566,17 +1565,17 @@ void QPEApplication::pidMessage( const QCString& msg, const QByteArray& data)
/*!
Sets widget \a mw as the mainWidget() and shows it. For small windows,
consider passing TRUE for \a nomaximize rather than the default FALSE.
\sa showMainDocumentWidget()
*/
void QPEApplication::showMainWidget( QWidget* mw, bool nomaximize )
{
- setMainWidget(mw);
+// setMainWidget(mw); this breaks FastLoading because lastWindowClose() would quit
d->show(mw, nomaximize );
}
/*!
Sets widget \a mw as the mainWidget() and shows it. For small windows,
consider passing TRUE for \a nomaximize rather than the default FALSE.
This calls designates the application as
@@ -1587,17 +1586,17 @@ void QPEApplication::showMainWidget( QWidget* mw, bool nomaximize )
\sa showMainWidget()
*/
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 );
}
/*!
If an application is started via a \link qcop.html QCop\endlink
message, the application will process the \link qcop.html
QCop\endlink message and then quit. If the application calls this