7 files changed, 5 insertions, 12 deletions
diff --git a/khotkeys/shared/khlistview.h b/khotkeys/shared/khlistview.h
index 7f89cd62b..01fbf9e28 100644
--- a/khotkeys/shared/khlistview.h
+++ b/khotkeys/shared/khlistview.h
@@ -14,7 +14,7 @@
 #include <tqtimer.h>
 
 #include <tdelistview.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KHotKeys
 {
diff --git a/khotkeys/shared/settings.cpp b/khotkeys/shared/settings.cpp
index becacd5d1..c4068564e 100644
--- a/khotkeys/shared/settings.cpp
+++ b/khotkeys/shared/settings.cpp
@@ -103,8 +103,6 @@ bool Settings::read_settings( TDEConfig& cfg_P, bool include_disabled_P, ImportT
         }
     if( import_P != ImportNone )
         return true; // don't read global settings
-    cfg_P.setGroup( "Main" ); // main group
-    daemon_disabled = cfg_P.readBoolEntry( "Disabled", false );
     cfg_P.setGroup( "Gestures" );
     gestures_disabled_globally = cfg_P.readBoolEntry( "Disabled", true );
     gesture_mouse_button = cfg_P.readNumEntry( "MouseButton", 2 );
@@ -132,9 +130,6 @@ void Settings::write_settings()
     cfg.writeEntry( "AlreadyImported", already_imported );
     cfg.setGroup( "Data" );
     int cnt = write_actions_recursively_v2( cfg, actions, true );
-    cfg.setGroup( "Main" );
-    cfg.writeEntry( "Autostart", cnt != 0 && !daemon_disabled );
-    cfg.writeEntry( "Disabled", daemon_disabled );
     cfg.setGroup( "Gestures" );
     cfg.writeEntry( "Disabled", gestures_disabled_globally );
     cfg.writeEntry( "MouseButton", gesture_mouse_button );
@@ -155,7 +150,6 @@ void Settings::write_settings()
 
 
 // return value means the number of enabled actions written in the cfg file
-// i.e. 'Autostart' for value > 0 should be on
 int Settings::write_actions_recursively_v2( TDEConfig& cfg_P, Action_data_group* parent_P, bool enabled_P )
     {
     int enabled_cnt = 0;
diff --git a/khotkeys/shared/settings.h b/khotkeys/shared/settings.h
index 753d056c3..da4a291c1 100644
--- a/khotkeys/shared/settings.h
+++ b/khotkeys/shared/settings.h
@@ -37,7 +37,6 @@ class TDE_EXPORT Settings
         bool gestures_disabled_globally;
         int gesture_mouse_button;
         int gesture_timeout;
-        bool daemon_disabled;
         Windowdef_list* gestures_exclude;
 		TDEShortcut voice_shortcut;
     protected:
diff --git a/khotkeys/shared/sound.h b/khotkeys/shared/sound.h
index 28dfeb0b6..f62eb2855 100644
--- a/khotkeys/shared/sound.h
+++ b/khotkeys/shared/sound.h
@@ -22,7 +22,7 @@
 
 #include <tqmemarray.h>
 #include <tqstring.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 /**
 @author Olivier Goffart
diff --git a/khotkeys/shared/soundrecorder.h b/khotkeys/shared/soundrecorder.h
index 54324f27f..5f0ffe9fe 100644
--- a/khotkeys/shared/soundrecorder.h
+++ b/khotkeys/shared/soundrecorder.h
@@ -22,7 +22,7 @@
 
 #include <tqobject.h>
 #include "sound.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class KLibrary;
 
diff --git a/khotkeys/shared/triggers.h b/khotkeys/shared/triggers.h
index ddc757e30..681f784b7 100644
--- a/khotkeys/shared/triggers.h
+++ b/khotkeys/shared/triggers.h
@@ -14,7 +14,7 @@
 #include <tqptrlist.h>
 #include <tqtimer.h>
 #include <tqmap.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include "khotkeysglobal.h"
 #include "voicesignature.h"
diff --git a/khotkeys/shared/voicesignature.h b/khotkeys/shared/voicesignature.h
index 7b29802a2..e0f31bb31 100644
--- a/khotkeys/shared/voicesignature.h
+++ b/khotkeys/shared/voicesignature.h
@@ -23,7 +23,7 @@
 
 #include <tqmemarray.h>
 #include <tqmap.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class Sound;
 class TDEConfigBase;