Rename many classes and header files to avoid conflicts with KDE4

12 files changed, 18 insertions, 18 deletions

diff --git a/konq-plugins/sidebar/delicious/bookmarkListItem.h b/konq-plugins/sidebar/delicious/bookmarkListItem.h
index 40316c1..efc1095 100644
--- a/konq-plugins/sidebar/delicious/bookmarkListItem.h
+++ b/konq-plugins/sidebar/delicious/bookmarkListItem.h
@@ -24,7 +24,7 @@
 
 #include <tqdatetime.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kurl.h>
 
 #include <time.h>
diff --git a/konq-plugins/sidebar/delicious/mainWidget.cpp b/konq-plugins/sidebar/delicious/mainWidget.cpp
index 919c498..f1cb737 100644
--- a/konq-plugins/sidebar/delicious/mainWidget.cpp
+++ b/konq-plugins/sidebar/delicious/mainWidget.cpp
@@ -34,7 +34,7 @@
 #include <kdebug.h>
 #include <tdeio/job.h>
 #include <krfcdate.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kiconloader.h>
diff --git a/konq-plugins/sidebar/delicious/widget.ui b/konq-plugins/sidebar/delicious/widget.ui
index 7bf7c0b..24befb8 100644
--- a/konq-plugins/sidebar/delicious/widget.ui
+++ b/konq-plugins/sidebar/delicious/widget.ui
@@ -160,6 +160,6 @@
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/konq-plugins/sidebar/mediaplayer/controls.h b/konq-plugins/sidebar/mediaplayer/controls.h
index 0c19d23..6dd17a0 100644
--- a/konq-plugins/sidebar/mediaplayer/controls.h
+++ b/konq-plugins/sidebar/mediaplayer/controls.h
@@ -26,8 +26,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <tqguardedptr.h>
 
-#include <kaction.h>
-#include <ktoolbar.h>
+#include <tdeaction.h>
+#include <tdetoolbar.h>
 #include <tqslider.h>
 #include <tqstringlist.h>
 
diff --git a/konq-plugins/sidebar/metabar/src/configdialog.h b/konq-plugins/sidebar/metabar/src/configdialog.h
index b37469a..85d6fae 100644
--- a/konq-plugins/sidebar/metabar/src/configdialog.h
+++ b/konq-plugins/sidebar/metabar/src/configdialog.h
@@ -22,12 +22,12 @@
 
 #include <tqdialog.h>
 #include <kpushbutton.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <knuminput.h>
 #include <tdeconfig.h>
 #include <tqptrdict.h>
 #include <tqlistbox.h>
-#include <kactionselector.h>
+#include <tdeactionselector.h>
 #include <tqcheckbox.h>
 #include <kcombobox.h>
 
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
index 2548c3f..fc35e54 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
@@ -48,9 +48,9 @@
 #include <krun.h>
 #include <kdesktopfile.h>
 #include <kpropertiesdialog.h>
-#include <kaction.h>
-#include <kactioncollection.h>
-#include <kshortcut.h>
+#include <tdeaction.h>
+#include <tdeactioncollection.h>
+#include <tdeshortcut.h>
 #include <kmimetype.h>
 #include <tdecmoduleinfo.h>
 #include <kmdcodec.h>
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.h b/konq-plugins/sidebar/metabar/src/metabarwidget.h
index b832bc5..72aff09 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.h
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.h
@@ -27,7 +27,7 @@
 #include <tdefileitem.h>
 #include <kurl.h>
 #include <kservice.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdirwatch.h>
 
 #include <tqmap.h>
diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.cpp b/konq-plugins/sidebar/metabar/src/serviceloader.cpp
index bbffb01..344c814 100644
--- a/konq-plugins/sidebar/metabar/src/serviceloader.cpp
+++ b/konq-plugins/sidebar/metabar/src/serviceloader.cpp
@@ -28,10 +28,10 @@
 
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <kiconloader.h>
-#include <kaction.h>
-#include <kshortcut.h>
+#include <tdeaction.h>
+#include <tdeshortcut.h>
 #include <ksimpleconfig.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.h b/konq-plugins/sidebar/metabar/src/serviceloader.h
index 42268de..e5b0d17 100644
--- a/konq-plugins/sidebar/metabar/src/serviceloader.h
+++ b/konq-plugins/sidebar/metabar/src/serviceloader.h
@@ -26,7 +26,7 @@
 #include <tqmap.h>
 #include <tqwidget.h>
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdefileitem.h>
 #include <kmimetype.h>
 #include <kurl.h>
diff --git a/konq-plugins/sidebar/newsticker/nspanel.cpp b/konq-plugins/sidebar/newsticker/nspanel.cpp
index 22bb3a7..f3a704a 100644
--- a/konq-plugins/sidebar/newsticker/nspanel.cpp
+++ b/konq-plugins/sidebar/newsticker/nspanel.cpp
@@ -26,7 +26,7 @@
 #include <tqfontmetrics.h>
 #include <tqtimer.h>
 #include <kdebug.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include "nspanel.h"
 
 
diff --git a/konq-plugins/sidebar/newsticker/nspanel.h b/konq-plugins/sidebar/newsticker/nspanel.h
index 36b503e..7da5818 100644
--- a/konq-plugins/sidebar/newsticker/nspanel.h
+++ b/konq-plugins/sidebar/newsticker/nspanel.h
@@ -31,7 +31,7 @@
 #include <dcopref.h>
 #include <dcopobject.h>
 #include <tdeio/job.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 
 
 class TQBuffer;
diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
index 12be5c7..f06c876 100644
--- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
+++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
@@ -36,7 +36,7 @@
 #include <kdebug.h>
 #include <kaboutdata.h>
 #include <kaboutapplication.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <kstringhandler.h>
 #include <kapplication.h>