diff options
Diffstat (limited to 'ksplashml')
-rw-r--r-- | ksplashml/wndmain.cpp | 3 | ||||
-rw-r--r-- | ksplashml/wndmain.h | 15 |
2 files changed, 16 insertions, 2 deletions
diff --git a/ksplashml/wndmain.cpp b/ksplashml/wndmain.cpp index f382ba7a6..c037438ab 100644 --- a/ksplashml/wndmain.cpp +++ b/ksplashml/wndmain.cpp @@ -311,6 +311,9 @@ void KSplash::startupComplete() void KSplash::close() { TQWidget::close(); +#ifdef USE_QT4 + exit(0); +#endif // USE_QT4 } void KSplash::hide() diff --git a/ksplashml/wndmain.h b/ksplashml/wndmain.h index c1fa4ae45..40457ad0d 100644 --- a/ksplashml/wndmain.h +++ b/ksplashml/wndmain.h @@ -39,6 +39,7 @@ class KConfig; class KSplash: public TQWidget, virtual public KSplashIface { Q_OBJECT + TQ_OBJECT public: KSplash(const char *name = "ksplash"); @@ -53,9 +54,19 @@ public: ASYNC setStartupItemCount( int count ); ASYNC programStarted( TQString programIcon, TQString programName, TQString description ); ASYNC startupComplete(); - ASYNC close(); - ASYNC hide(); ASYNC show(); + ASYNC hide(); + + // [FIXME] How can I more easily let Qt know about these slots? moc-tqt perhaps? + // More importantly, how was this code even running under Qt3? + // Was it somehow running the TQWidget::close() slot instead of the KSplash::close() non-slot method? + // Either way it looks like accidental/undefined behaviour to me... +#ifndef Q_MOC_RUN + ASYNC close(); +#else // Q_MOC_RUN +public slots: + void close(); +#endif // Q_MOC_RUN signals: void stepsChanged(int); |