Rename many classes and header files to avoid conflicts with KDE4

10 files changed, 22 insertions, 22 deletions

diff --git a/kdelirc/irkick/irkick.cpp b/kdelirc/irkick/irkick.cpp
index b90c74b..b595066 100644
--- a/kdelirc/irkick/irkick.cpp
+++ b/kdelirc/irkick/irkick.cpp
@@ -16,16 +16,16 @@
 
 #include <tdeversion.h>
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #if !(TDE_VERSION_MINOR<=1 && TDE_VERSION_RELEASE<=5)
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #endif
 #include <ksimpleconfig.h>
 #include <ksystemtray.h>
 #include <kiconloader.h>
 #include <kpassivepopup.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kaboutdialog.h>
diff --git a/kdelirc/irkick/klircclient.cpp b/kdelirc/irkick/klircclient.cpp
index 4d2089f..a9373f9 100644
--- a/kdelirc/irkick/klircclient.cpp
+++ b/kdelirc/irkick/klircclient.cpp
@@ -31,7 +31,7 @@
 #include <kiconloader.h>
 #include <kpassivepopup.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kaboutdialog.h>
diff --git a/kdelirc/kcmlirc/addaction.cpp b/kdelirc/kcmlirc/addaction.cpp
index 9e4f21d..5e7fd1c 100644
--- a/kdelirc/kcmlirc/addaction.cpp
+++ b/kdelirc/kcmlirc/addaction.cpp
@@ -17,7 +17,7 @@
 
 #include <kdebug.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kapplication.h>
 #include <kmessagebox.h>
 #include <knuminput.h>
diff --git a/kdelirc/kcmlirc/addactionbase.ui b/kdelirc/kcmlirc/addactionbase.ui
index 57f3c38..dfb6f12 100644
--- a/kdelirc/kcmlirc/addactionbase.ui
+++ b/kdelirc/kcmlirc/addactionbase.ui
@@ -1590,12 +1590,12 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
-    <includehint>klistview.h</includehint>
-    <includehint>klistview.h</includehint>
-    <includehint>klistview.h</includehint>
-    <includehint>klistview.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
@@ -1603,6 +1603,6 @@
     <includehint>knuminput.h</includehint>
     <includehint>keditlistbox.h</includehint>
     <includehint>klineedit.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/kdelirc/kcmlirc/editaction.cpp b/kdelirc/kcmlirc/editaction.cpp
index 3b38b0c..9b65e19 100644
--- a/kdelirc/kcmlirc/editaction.cpp
+++ b/kdelirc/kcmlirc/editaction.cpp
@@ -20,7 +20,7 @@
 
 #include <kdebug.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kapplication.h>
 #include <kmessagebox.h>
 #include <knuminput.h>
diff --git a/kdelirc/kcmlirc/kcmlirc.cpp b/kdelirc/kcmlirc/kcmlirc.cpp
index 49bc252..fc42db5 100644
--- a/kdelirc/kcmlirc/kcmlirc.cpp
+++ b/kdelirc/kcmlirc/kcmlirc.cpp
@@ -27,7 +27,7 @@
 #include <kdebug.h>
 #include <ksimpleconfig.h>
 #include <kgenericfactory.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kmessagebox.h>
 #include <kpushbutton.h>
 
diff --git a/kdelirc/kcmlirc/kcmlircbase.ui b/kdelirc/kcmlirc/kcmlircbase.ui
index 760f4e0..b5b21bf 100644
--- a/kdelirc/kcmlirc/kcmlircbase.ui
+++ b/kdelirc/kcmlirc/kcmlircbase.ui
@@ -492,15 +492,15 @@
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <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>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/kdelirc/kcmlirc/modeslist.h b/kdelirc/kcmlirc/modeslist.h
index d81b928..d6a4b25 100644
--- a/kdelirc/kcmlirc/modeslist.h
+++ b/kdelirc/kcmlirc/modeslist.h
@@ -13,9 +13,9 @@
 #ifndef MODESLIST_H
 #define MODESLIST_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 /**
 
diff --git a/kdelirc/kcmlirc/newmode.ui b/kdelirc/kcmlirc/newmode.ui
index 649cb88..811b493 100644
--- a/kdelirc/kcmlirc/newmode.ui
+++ b/kdelirc/kcmlirc/newmode.ui
@@ -151,7 +151,7 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
 </includehints>
diff --git a/kdelirc/kcmlirc/selectprofile.ui b/kdelirc/kcmlirc/selectprofile.ui
index a045921..911deb4 100644
--- a/kdelirc/kcmlirc/selectprofile.ui
+++ b/kdelirc/kcmlirc/selectprofile.ui
@@ -121,7 +121,7 @@
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
 </includehints>