1 files changed, 9 insertions, 35 deletions

diff --git a/ksmserver/shutdowndlg.h b/ksmserver/shutdowndlg.h
index 25ee60f77..5a9d652f2 100644
--- a/ksmserver/shutdowndlg.h
+++ b/ksmserver/shutdowndlg.h
@@ -18,7 +18,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
 #include <kguiitem.h>
 #include <tqtoolbutton.h>
 #include <krootpixmap.h>
-#include <ntqprogressbar.h>
+#include <tqprogressbar.h>
 
 class TQPushButton;
 class TQVButtonGroup;
@@ -34,31 +34,10 @@ class TDEAction;
 
 #include <config.h>
 
-#ifdef COMPILE_HALBACKEND
-	#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
-
-	#include <hal/libhal.h>
-#endif // COMPILE_HALBACKEND
-
-namespace SuspendType {
-enum SuspendType {
-	NotSpecified = 0,
-	Freeze,
-	Standby,
-	Suspend,
-	Hibernate,
-	HybridSuspend
-};
-};
-
 // The (singleton) widget that makes/fades the desktop gray.
 class KSMShutdownFeedback : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	static void start() { s_pSelf = new KSMShutdownFeedback(); }
@@ -92,7 +71,7 @@ private:
 // The (singleton) widget that shows either pretty pictures or a black screen during logout
 class KSMShutdownIPFeedback : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	static void start() { s_pSelf = new KSMShutdownIPFeedback(); }
@@ -135,7 +114,7 @@ private:
 // The confirmation dialog
 class KSMShutdownDlg : public TQDialog
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	static bool confirmShutdown( bool maysd, bool mayrb, TDEApplication::ShutdownType& sdtype, TQString& bopt, int* selection=0 );
@@ -159,18 +138,13 @@ private:
 	TQString m_bootOption;
 	TQPopupMenu *targets;
 	TQStringList rebootOptions;
-#ifdef COMPILE_HALBACKEND
-	LibHalContext* m_halCtx;
-	DBusConnection *m_dbusConn;
-#endif
-	bool m_lockOnResume;
 	int* m_selection;
 };
 
 // The shutdown-in-progress dialog
 class KSMShutdownIPDlg : public KSMModalDialog
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	static TQWidget* showShutdownIP();
@@ -196,7 +170,7 @@ private:
 
 class KSMDelayedPushButton : public KPushButton
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -215,7 +189,7 @@ private:
 
 class KSMPushButton : public KPushButton
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -235,7 +209,7 @@ private:
 
 class FlatButton : public TQToolButton
 {
-  Q_OBJECT
+  TQ_OBJECT
 
  public:
 
@@ -264,7 +238,7 @@ class TQLabel;
 
 class  KSMDelayedMessageBox : public TimedLogoutDlg
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	KSMDelayedMessageBox( TDEApplication::ShutdownType sdtype, const TQString &bootOption, int confirmDelay );