Rename a number of libraries and executables to avoid conflicts with KDE4

5 files changed, 9 insertions, 9 deletions

diff --git a/konq-plugins/domtreeviewer/Makefile.am b/konq-plugins/domtreeviewer/Makefile.am
index 3dcfcc9..cfb3bb9 100644
--- a/konq-plugins/domtreeviewer/Makefile.am
+++ b/konq-plugins/domtreeviewer/Makefile.am
@@ -23,7 +23,7 @@ libdomtreeviewerplugin_la_SOURCES = 	plugin_domtreeviewer.cpp \
 libdomtreeviewerplugin_la_LIBADD  = $(LIB_KPARTS) $(LIB_KHTML)
 libdomtreeviewerplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 
-pluginsdir   = $(kde_datadir)/khtml/kpartplugins
+pluginsdir   = $(kde_datadir)/tdehtml/kpartplugins
 plugins_DATA = plugin_domtreeviewer.rc plugin_domtreeviewer.desktop
 
 appsdir = $(kde_appsdir)/.hidden
diff --git a/konq-plugins/domtreeviewer/domtreeview.cpp b/konq-plugins/domtreeviewer/domtreeview.cpp
index 15c7d6a..5b24e9d 100644
--- a/konq-plugins/domtreeviewer/domtreeview.cpp
+++ b/konq-plugins/domtreeviewer/domtreeview.cpp
@@ -52,7 +52,7 @@
 #include <keditcl.h>
 #include <kfiledialog.h>
 #include <kglobalsettings.h>
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 #include <klineedit.h>
 #include <klistview.h>
 #include <klocale.h>
@@ -339,7 +339,7 @@ void DOMTreeView::addElement ( const DOM::Node &node,  DOMListViewItem *cur_item
 
 void DOMTreeView::highlightHTML(DOMListViewItem *cur_item, const TQString &nodeName)
 {
-  /* This is slow. I could make it O(1) be using the tokenizer of khtml but I don't
+  /* This is slow. I could make it O(1) be using the tokenizer of tdehtml but I don't
    * think it's worth it.
    */
 
@@ -581,7 +581,7 @@ void DOMTreeView::saveRecursive(const DOM::Node &pNode, int indent)
 
   if ( !element.isNull() ) {
     if (nodeName.at(0)=='-') {
-      /* Don't save khtml internal tags '-konq..'
+      /* Don't save tdehtml internal tags '-konq..'
        * Approximating it with <DIV>
        */
       text += "<DIV> <!-- -KONG_BLOCK -->";
diff --git a/konq-plugins/domtreeviewer/domtreewindow.cpp b/konq-plugins/domtreeviewer/domtreewindow.cpp
index 52b7ba0..d9886df 100644
--- a/konq-plugins/domtreeviewer/domtreewindow.cpp
+++ b/konq-plugins/domtreeviewer/domtreewindow.cpp
@@ -30,7 +30,7 @@
 #include <kconfig.h>
 #include <tdeversion.h>
 #include <kglobal.h>
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmenubar.h>
@@ -41,8 +41,8 @@
 #include <kurldrag.h>
 #include <kurlrequesterdlg.h>
 
-#include <kparts/partmanager.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/partmanager.h>
+#include <tdeparts/browserextension.h>
 
 #include <kedittoolbar.h>
 
diff --git a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp
index bf3afa7..b58a733 100644
--- a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp
+++ b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp
@@ -10,7 +10,7 @@
 #include <klocale.h>
 #include <kgenericfactory.h>
 
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 
 typedef KGenericFactory<PluginDomtreeviewer> DomtreeviewerFactory;
 K_EXPORT_COMPONENT_FACTORY( libdomtreeviewerplugin, DomtreeviewerFactory( "domtreeviewer" ) )
diff --git a/konq-plugins/domtreeviewer/plugin_domtreeviewer.h b/konq-plugins/domtreeviewer/plugin_domtreeviewer.h
index b528f6e..7056f4d 100644
--- a/konq-plugins/domtreeviewer/plugin_domtreeviewer.h
+++ b/konq-plugins/domtreeviewer/plugin_domtreeviewer.h
@@ -3,7 +3,7 @@
 #ifndef __plugin_domtreeviewer_h
 #define __plugin_domtreeviewer_h
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 // #include <klibloader.h>
 
 class DOMTreeWindow;