Rename many classes and header files to avoid conflicts with KDE4

9 files changed, 10 insertions, 10 deletions

diff --git a/kcontrol/keys/CMakeLists.txt b/kcontrol/keys/CMakeLists.txt
index 739cd47f2..3e58f720d 100644
--- a/kcontrol/keys/CMakeLists.txt
+++ b/kcontrol/keys/CMakeLists.txt
@@ -23,7 +23,7 @@ link_directories(
 ##### other data ################################
 
 install( FILES keys.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-install( FILES kaccel.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
+install( FILES tdeaccel.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
 install( PROGRAMS convertShortcuts.pl DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
 
 install( FILES
diff --git a/kcontrol/keys/Makefile.am b/kcontrol/keys/Makefile.am
index a41bbaa71..2a6fc4ab1 100644
--- a/kcontrol/keys/Makefile.am
+++ b/kcontrol/keys/Makefile.am
@@ -12,7 +12,7 @@ messages:
 	customkeys=`grep "^.include .\.\." keyconfig.cpp | sed -e "s#.*\"\(.*\)\"#\1#"` ;\
 	$(XGETTEXT) $(kcm_keys_la_SOURCES) $$customkeys -o $(podir)/kcmkeys.pot
 
-update_DATA = kaccel.upd
+update_DATA = tdeaccel.upd
 update_SCRIPTS = convertShortcuts.pl
 updatedir = $(kde_datadir)/tdeconf_update
 
diff --git a/kcontrol/keys/commandShortcuts.h b/kcontrol/keys/commandShortcuts.h
index 2e0f0a76e..54be5345b 100644
--- a/kcontrol/keys/commandShortcuts.h
+++ b/kcontrol/keys/commandShortcuts.h
@@ -22,7 +22,7 @@
 #define __COMMAND_SHORTCUTS_MODULE_H
 
 #include <tqtabwidget.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <tqptrlist.h>
 
 class AppTreeView;
diff --git a/kcontrol/keys/keyconfig.h b/kcontrol/keys/keyconfig.h
index fb9136184..f442a2c31 100644
--- a/kcontrol/keys/keyconfig.h
+++ b/kcontrol/keys/keyconfig.h
@@ -11,7 +11,7 @@
 #include <tqpushbutton.h>
 #include <tqlistbox.h>
 
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <kkeydialog.h>
 //#include <tdecmodule.h>
 #include <tqdict.h>
diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp
index c014a8b54..c9a956298 100644
--- a/kcontrol/keys/modifiers.cpp
+++ b/kcontrol/keys/modifiers.cpp
@@ -11,7 +11,7 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kkeynative.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 
diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp
index e45953056..d28a4ed08 100644
--- a/kcontrol/keys/shortcuts.cpp
+++ b/kcontrol/keys/shortcuts.cpp
@@ -38,7 +38,7 @@
 #include <kinputdialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kshortcutlist.h>
+#include <tdeshortcutlist.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 
diff --git a/kcontrol/keys/shortcuts.h b/kcontrol/keys/shortcuts.h
index 76c3890c6..c1f1b2822 100644
--- a/kcontrol/keys/shortcuts.h
+++ b/kcontrol/keys/shortcuts.h
@@ -29,7 +29,7 @@
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
 #include <tqtabwidget.h>
-#include "kaccelaction.h"
+#include "tdeaccelaction.h"
 #include <kcombobox.h>
 #include <kkeydialog.h>
 
diff --git a/kcontrol/keys/tdeaccelaction.h b/kcontrol/keys/tdeaccelaction.h
index 248ff2278..5cc6ca02a 100644
--- a/kcontrol/keys/tdeaccelaction.h
+++ b/kcontrol/keys/tdeaccelaction.h
@@ -1,4 +1,4 @@
-// THIS FILE IS A COPY OF tdelibs/tdecore/kaccelaction.h AND MUST BE KEPT
+// THIS FILE IS A COPY OF tdelibs/tdecore/tdeaccelaction.h AND MUST BE KEPT
 //  IN SYNC WITH THAT FILE.
 
 /* This file is part of the KDE libraries
@@ -28,7 +28,7 @@
 #include <tqstring.h>
 #include <tqvaluevector.h>
 
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 class TDEAccelBase;
 
diff --git a/kcontrol/keys/treeview.h b/kcontrol/keys/treeview.h
index 36d8b91ca..4da6d2351 100644
--- a/kcontrol/keys/treeview.h
+++ b/kcontrol/keys/treeview.h
@@ -22,7 +22,7 @@
 #define __treeview_h__
 
 #include <tqstring.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 class TQPopupMenu;
 class TDEActionCollection;