1 files changed, 12 insertions, 9 deletions
diff --git a/kcontrol/hwmanager/devicepropsdlg.h b/kcontrol/hwmanager/devicepropsdlg.h
index e958d39ba..e961e689f 100644
--- a/kcontrol/hwmanager/devicepropsdlg.h
+++ b/kcontrol/hwmanager/devicepropsdlg.h
@@ -20,13 +20,13 @@
 #define __devicepropsdlg_h__
 
 #include <tqprogressbar.h>
-
 #include <kdialogbase.h>
-
 #include <tdehardwaredevices.h>
 
 #include "devicepropsdlgbase.h"
 
+class PasswordDlg;
+
 /**
  *
  * Simple sensor name and text label value display widget
@@ -37,7 +37,7 @@
 
 class TDEUI_EXPORT SensorDisplayLabelsWidget : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	/**
 	* Create a simple sensor name and value display widget
@@ -65,7 +65,7 @@ private:
 
 class TDEUI_EXPORT SensorBar : public TQProgressBar
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	SensorBar(TQWidget* parent=0, const char* name=0, WFlags f=0) : TQProgressBar(parent, name, f) {}
 	SensorBar(int totalSteps, TQWidget* parent=0, const char* name=0, WFlags f=0): TQProgressBar(totalSteps, parent, name, f) {}
@@ -93,7 +93,7 @@ public:
 
 class TDEUI_EXPORT SensorDisplayWidget : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	/**
 	* Simple sensor information display widget
@@ -167,7 +167,7 @@ typedef TQMap<TDESystemHibernationMethod::TDESystemHibernationMethod, int> Hiber
 
 class TDEUI_EXPORT DevicePropertiesDialog : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	/**
 	* Create a dialog that allows a user to view and edit hardware device properties
@@ -190,6 +190,10 @@ private slots:
 
 	void mountDisk();
 	void unmountDisk();
+	void unlockDisk();
+	void lockDisk();
+	void ejectDisk();
+	void safeRemoveDisk();
 
 	void cryptLUKSAddKey();
 	void cryptLUKSDelKey();
@@ -202,12 +206,11 @@ private slots:
 	void processLockouts();
 
 private:
+	static bool isMonitoredDevice(TDEStorageDevice *sdevice);
+
 	TDEGenericDevice* m_device;
 	DevicePropertiesDialogBase* base;
 
-	class DevicePropertiesDialogPrivate;
-	DevicePropertiesDialogPrivate* d;
-
 	TQGridLayout* m_sensorDataGrid;
 	SensorDisplayWidgetList m_sensorDataGridWidgets;