Rename many classes and header files to avoid conflicts with KDE4

12 files changed, 15 insertions, 15 deletions

diff --git a/kttsd/app-plugins/kate/katekttsd.cpp b/kttsd/app-plugins/kate/katekttsd.cpp
index 21f2ee6..7459a6f 100644
--- a/kttsd/app-plugins/kate/katekttsd.cpp
+++ b/kttsd/app-plugins/kate/katekttsd.cpp
@@ -26,7 +26,7 @@
 #include <tdetexteditor/editinterface.h>
 #include <tdetexteditor/selectioninterface.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kapplication.h>
diff --git a/kttsd/filters/sbd/sbdconf.cpp b/kttsd/filters/sbd/sbdconf.cpp
index 3b32764..b6c4f8e 100644
--- a/kttsd/filters/sbd/sbdconf.cpp
+++ b/kttsd/filters/sbd/sbdconf.cpp
@@ -34,7 +34,7 @@
 // KDE includes.
 #include <kglobal.h>
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klineedit.h>
 #include <kdialog.h>
 #include <kdialogbase.h>
diff --git a/kttsd/filters/stringreplacer/stringreplacerconf.cpp b/kttsd/filters/stringreplacer/stringreplacerconf.cpp
index b27fdb0..ba71c70 100644
--- a/kttsd/filters/stringreplacer/stringreplacerconf.cpp
+++ b/kttsd/filters/stringreplacer/stringreplacerconf.cpp
@@ -35,7 +35,7 @@
 // KDE includes.
 #include <kglobal.h>
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klineedit.h>
 #include <kdialog.h>
 #include <kdialogbase.h>
diff --git a/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui b/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui
index 305cd6e..df1d519 100644
--- a/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui
+++ b/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui
@@ -466,7 +466,7 @@
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
index 8b84a12..dabeb63 100644
--- a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
+++ b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
@@ -37,7 +37,7 @@
 
 // KDE includes.
 #include <dcopclient.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tdeparts/componentfactory.h>
 #include <klineedit.h>
 #include <kurlrequester.h>
diff --git a/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui b/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui
index f183ed8..ffde8a9 100644
--- a/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui
+++ b/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui
@@ -1897,18 +1897,18 @@
 <layoutdefaults spacing="6" margin="6"/>
 <includehints>
     <includehint>tdecmodule.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kttsd/kcmkttsmgr/selectevent.cpp b/kttsd/kcmkttsmgr/selectevent.cpp
index 89341de..1e8f15c 100644
--- a/kttsd/kcmkttsmgr/selectevent.cpp
+++ b/kttsd/kcmkttsmgr/selectevent.cpp
@@ -29,7 +29,7 @@
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kiconloader.h>
 
 // KTTS includes
diff --git a/kttsd/kcmkttsmgr/selecteventwidget.ui b/kttsd/kcmkttsmgr/selecteventwidget.ui
index 01dffeb..3d4281f 100644
--- a/kttsd/kcmkttsmgr/selecteventwidget.ui
+++ b/kttsd/kcmkttsmgr/selecteventwidget.ui
@@ -57,6 +57,6 @@
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/kttsd/kttsjobmgr/kttsjobmgr.cpp b/kttsd/kttsjobmgr/kttsjobmgr.cpp
index 9c8cf76..a8002ce 100644
--- a/kttsd/kttsjobmgr/kttsjobmgr.cpp
+++ b/kttsd/kttsjobmgr/kttsjobmgr.cpp
@@ -31,7 +31,7 @@
 #include <kinstance.h>
 #include <klocale.h>
 #include <kaboutdata.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <kencodingfiledialog.h>
diff --git a/kttsd/kttsmgr/kttsmgr.cpp b/kttsd/kttsmgr/kttsmgr.cpp
index 257c8ee..92805dd 100644
--- a/kttsd/kttsmgr/kttsmgr.cpp
+++ b/kttsd/kttsmgr/kttsmgr.cpp
@@ -34,7 +34,7 @@
 #include <kdebug.h>
 #include <ksystemtray.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kaboutapplication.h>
 #include <dcopclient.h>
 #include <tdeversion.h>
diff --git a/kttsd/libkttsd/selecttalkerdlg.cpp b/kttsd/libkttsd/selecttalkerdlg.cpp
index af6da4c..8809331 100644
--- a/kttsd/libkttsd/selecttalkerdlg.cpp
+++ b/kttsd/libkttsd/selecttalkerdlg.cpp
@@ -34,7 +34,7 @@
 #include <kcombobox.h>
 #include <ktrader.h>
 #include <kpushbutton.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klineedit.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/kttsd/libkttsd/selecttalkerwidget.ui b/kttsd/libkttsd/selecttalkerwidget.ui
index 9b76283..f2b8f00 100644
--- a/kttsd/libkttsd/selecttalkerwidget.ui
+++ b/kttsd/libkttsd/selecttalkerwidget.ui
@@ -567,6 +567,6 @@
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>