diff options
| author | Timothy Pearson <[email protected]> | 2012-02-15 00:05:42 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2012-02-15 00:05:42 -0600 |
| commit | 0a95f048637129360015e2f4300204ef4a858bff (patch) | |
| tree | ea539a123deb9d6d268c16a69b8352a9196e1119 /ksmserver/startupdlg.h | |
| parent | 989d6a19014011bd6981abb3decb91a7b3af0971 (diff) | |
| parent | 525c0e8bac637315df3f89ae84a9118ba27f0c0e (diff) | |
| download | tdebase-0a95f048637129360015e2f4300204ef4a858bff.tar.gz tdebase-0a95f048637129360015e2f4300204ef4a858bff.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'ksmserver/startupdlg.h')
| -rw-r--r-- | ksmserver/startupdlg.h | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/ksmserver/startupdlg.h b/ksmserver/startupdlg.h index 3b1fe7925..b0e7840fa 100644 --- a/ksmserver/startupdlg.h +++ b/ksmserver/startupdlg.h @@ -30,31 +30,20 @@ class KAction; #include <kapplication.h> #include <kpixmapio.h> -#include <config.h> - -#ifndef NO_QT3_DBUS_SUPPORT -/* We acknowledge the the dbus API is unstable */ -#define DBUS_API_SUBJECT_TO_CHANGE -#include <dbus/connection.h> -#endif // NO_QT3_DBUS_SUPPORT - -#ifdef COMPILE_HALBACKEND -#include <hal/libhal.h> -#endif // The startup-in-progress dialog class KSMStartupIPDlg : public KSMModalDialog { - Q_OBJECT + Q_OBJECT public: - static TQWidget* showStartupIP(); + static TQWidget* showStartupIP(); protected: - ~KSMStartupIPDlg(); + ~KSMStartupIPDlg(); private: - KSMStartupIPDlg( TQWidget* parent ); + KSMStartupIPDlg( TQWidget* parent ); }; #endif |