Rename many classes and header files to avoid conflicts with KDE4

6 files changed, 11 insertions, 11 deletions

diff --git a/konq-plugins/domtreeviewer/Makefile.am b/konq-plugins/domtreeviewer/Makefile.am
index e6d19e3..2d5c781 100644
--- a/konq-plugins/domtreeviewer/Makefile.am
+++ b/konq-plugins/domtreeviewer/Makefile.am
@@ -18,7 +18,7 @@ libdomtreeviewerplugin_la_SOURCES = 	plugin_domtreeviewer.cpp \
 					elementeditdialog.ui \
 					texteditdialog.ui \
 					messagedialog.ui
-#					klistview.cpp \
+#					tdelistview.cpp \
 #
 libdomtreeviewerplugin_la_LIBADD  = $(LIB_KPARTS) $(LIB_TDEHTML)
 libdomtreeviewerplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
diff --git a/konq-plugins/domtreeviewer/domtreeview.cpp b/konq-plugins/domtreeviewer/domtreeview.cpp
index 32681ba..c474414 100644
--- a/konq-plugins/domtreeviewer/domtreeview.cpp
+++ b/konq-plugins/domtreeviewer/domtreeview.cpp
@@ -45,7 +45,7 @@
 #include <dom/dom_core.h>
 #include <dom/html_base.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kcombobox.h>
 #include <kdialog.h>
@@ -54,11 +54,11 @@
 #include <kglobalsettings.h>
 #include <tdehtml_part.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kpushbutton.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <kstdguiitem.h>
 #include <ktextedit.h>
 
diff --git a/konq-plugins/domtreeviewer/domtreeviewbase.ui b/konq-plugins/domtreeviewer/domtreeviewbase.ui
index fb0a39e..09225c7 100644
--- a/konq-plugins/domtreeviewer/domtreeviewbase.ui
+++ b/konq-plugins/domtreeviewer/domtreeviewbase.ui
@@ -514,12 +514,12 @@
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>ktextedit.h</includehint>
 </includehints>
 </UI>
diff --git a/konq-plugins/domtreeviewer/domtreewindow.cpp b/konq-plugins/domtreeviewer/domtreewindow.cpp
index 4eb5dce..c0ec594 100644
--- a/konq-plugins/domtreeviewer/domtreewindow.cpp
+++ b/konq-plugins/domtreeviewer/domtreewindow.cpp
@@ -24,7 +24,7 @@
 #include "messagedialog.h"
 #include "plugin_domtreeviewer.h"
 
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <kapplication.h>
 #include <kcommand.h>
 #include <tdeconfig.h>
@@ -46,8 +46,8 @@
 
 #include <kedittoolbar.h>
 
-#include <kstdaccel.h>
-#include <kaction.h>
+#include <tdestdaccel.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 
 #include <tqdatetime.h>
diff --git a/konq-plugins/domtreeviewer/domtreewindow.h b/konq-plugins/domtreeviewer/domtreewindow.h
index b2b0042..d5ef8f3 100644
--- a/konq-plugins/domtreeviewer/domtreewindow.h
+++ b/konq-plugins/domtreeviewer/domtreewindow.h
@@ -25,7 +25,7 @@
 #include <config.h>
 #endif
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include <tqguardedptr.h>
 
diff --git a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp
index a83bd1d..0a38c77 100644
--- a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp
+++ b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp
@@ -2,7 +2,7 @@
 #include "domtreewindow.h"
 #include "domtreeview.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kinstance.h>
 #include <klibloader.h>