1 files changed, 11 insertions, 23 deletions
diff --git a/kmilo/generic/generic_monitor.h b/kmilo/generic/generic_monitor.h
index 9305ac3..b986677 100644
--- a/kmilo/generic/generic_monitor.h
+++ b/kmilo/generic/generic_monitor.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: t; tab-width: 2; -*-
 /*
    This file is part of the KDE project
 
@@ -26,7 +25,7 @@
 #define _GENERICMONITOR_H_
 
 #include <tdemainwindow.h>
-#include <kglobalaccel.h>
+#include <tdeglobalaccel.h>
 #include <dcopref.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
@@ -36,18 +35,9 @@
 
 namespace KMilo {
 
-// now the key data (from kkeyserver_x11.h and $TQTDIR/include/tqnamespace.h)
-struct ShortcutInfo
-{
-	const char* name;
-	uint symbol;
-	const char *slot;
-};
-
-
 class GenericMonitor : public Monitor
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
@@ -64,9 +54,11 @@ public slots:
   void slowVolumeDown();
   void fastVolumeUp();
   void fastVolumeDown();
-  void mute();
+  void toggleMute();
   void brightnessUp();
   void brightnessDown();
+  void brightnessSlowUp();
+  void brightnessSlowDown();
   void launchMail();
   void launchBrowser();
   void launchSearch();
@@ -79,12 +71,13 @@ public slots:
   void lightBulb();
   void pmBattery();
 
+private slots:
+	void brightnessValueUpdate();
+
 private:
-	bool retrieveKmixDevices();
-	void volumeChange(int direction, int step);
-	bool retrieveMute();
-	bool retrieveVolume();
-	void displayVolume();
+	void volumeChange(int direction, int percentage);
+	bool retrieveMute(bool &muted);
+	bool retrieveVolume(int &volume);
 	void brightnessChange(int direction, int step);
 	void launch(TQString configKey, TQString defaultApplication);
 
@@ -94,14 +87,9 @@ private:
 	DCOPRef *kmixClient, *kmixWindow, *tdepowersave;
 
 	int m_progress;
-	long m_volume;
-	bool m_mute;
-
-	long m_maxVolume, m_minVolume;
 
 	// following properties are read from config file:
 	int m_volumeStepFast, m_volumeStepSlow;
-	int m_volumeDeviceIdx, m_muteDeviceIdx, m_extraDeviceIdx;
 	bool m_enabled;
 
 	Monitor::DisplayType m_displayType;