Rename kiobuffer and KHTML

15 files changed, 17 insertions, 17 deletions

diff --git a/konq-plugins/sidebar/metabar/src/Makefile.am b/konq-plugins/sidebar/metabar/src/Makefile.am
index cd18deb..78fd97b 100644
--- a/konq-plugins/sidebar/metabar/src/Makefile.am
+++ b/konq-plugins/sidebar/metabar/src/Makefile.am
@@ -9,7 +9,7 @@ konqsidebar_metabar_la_SOURCES = metabar.cpp metabarwidget.cpp configdialog.cpp
 		serviceloader.cpp defaultplugin.cpp protocolplugin.cpp settingsplugin.cpp \
 		remoteplugin.cpp httpplugin.cpp metabarfunctions.cpp
 konqsidebar_metabar_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkonqsidebarplugin
-konqsidebar_metabar_la_LIBADD = $(LIB_KIO) $(LIB_KHTML) $(LIB_KPARTS)
+konqsidebar_metabar_la_LIBADD = $(LIB_KIO) $(LIB_TDEHTML) $(LIB_KPARTS)
 
 metabar_entrydir = $(kde_datadir)/konqsidebartng/entries
 metabar_entry_DATA = metabar.desktop
diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
index 0edf060..f2cbb52 100644
--- a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
@@ -53,7 +53,7 @@
 #define EVENT_TYPE DOM::DOMString("click")
 #define MODIFICATION 1
 
-DefaultPlugin::DefaultPlugin(KHTMLPart* html, MetabarFunctions *functions, const char *name) : ProtocolPlugin (html, functions, name)
+DefaultPlugin::DefaultPlugin(TDEHTMLPart* html, MetabarFunctions *functions, const char *name) : ProtocolPlugin (html, functions, name)
 {
   services = new ServiceLoader(m_html->view(), "serviceloader");
   
diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.h b/konq-plugins/sidebar/metabar/src/defaultplugin.h
index a9feb56..282b0c9 100644
--- a/konq-plugins/sidebar/metabar/src/defaultplugin.h
+++ b/konq-plugins/sidebar/metabar/src/defaultplugin.h
@@ -35,7 +35,7 @@ class DefaultPlugin : public ProtocolPlugin
   
 
   public:
-    DefaultPlugin(KHTMLPart* html, MetabarFunctions *functions, const char *name = 0);
+    DefaultPlugin(TDEHTMLPart* html, MetabarFunctions *functions, const char *name = 0);
     ~DefaultPlugin();
     
     void deactivate();
diff --git a/konq-plugins/sidebar/metabar/src/httpplugin.cpp b/konq-plugins/sidebar/metabar/src/httpplugin.cpp
index f994eb5..cdb1f79 100644
--- a/konq-plugins/sidebar/metabar/src/httpplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/httpplugin.cpp
@@ -38,7 +38,7 @@
 #include <dom_node.h>
 #include <html_inline.h>
 
-HTTPPlugin::HTTPPlugin(KHTMLPart* html, MetabarFunctions *functions, const char *name) : ProtocolPlugin (html, functions, name)
+HTTPPlugin::HTTPPlugin(TDEHTMLPart* html, MetabarFunctions *functions, const char *name) : ProtocolPlugin (html, functions, name)
 {
 }
 
diff --git a/konq-plugins/sidebar/metabar/src/httpplugin.h b/konq-plugins/sidebar/metabar/src/httpplugin.h
index 3311bd6..b3ee302 100644
--- a/konq-plugins/sidebar/metabar/src/httpplugin.h
+++ b/konq-plugins/sidebar/metabar/src/httpplugin.h
@@ -34,7 +34,7 @@ class HTTPPlugin : public ProtocolPlugin
   
 
   public:
-    HTTPPlugin(KHTMLPart* html, MetabarFunctions *functions, const char *name = 0);
+    HTTPPlugin(TDEHTMLPart* html, MetabarFunctions *functions, const char *name = 0);
     ~HTTPPlugin();
     
     bool handleRequest(const KURL &url);
diff --git a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
index aefa5fd..4f9cfd1 100644
--- a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
@@ -32,7 +32,7 @@
 #define RESIZE_SPEED 5
 #define RESIZE_STEP 2
 
-MetabarFunctions::MetabarFunctions(KHTMLPart *html, TQObject *parent, const char* name) : TQObject(parent, name), m_html(html)
+MetabarFunctions::MetabarFunctions(TDEHTMLPart *html, TQObject *parent, const char* name) : TQObject(parent, name), m_html(html)
 {
   timer = new TQTimer(this);
   connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(animate()));
diff --git a/konq-plugins/sidebar/metabar/src/metabarfunctions.h b/konq-plugins/sidebar/metabar/src/metabarfunctions.h
index 800bb55..b88d1cc 100644
--- a/konq-plugins/sidebar/metabar/src/metabarfunctions.h
+++ b/konq-plugins/sidebar/metabar/src/metabarfunctions.h
@@ -35,7 +35,7 @@ class MetabarFunctions : public TQObject
   
   
   public:
-    MetabarFunctions(KHTMLPart *html, TQObject *parent = 0, const char* name=0);
+    MetabarFunctions(TDEHTMLPart *html, TQObject *parent = 0, const char* name=0);
     ~MetabarFunctions();
     
     void toggle(DOM::DOMString item);
@@ -45,7 +45,7 @@ class MetabarFunctions : public TQObject
     void handleRequest(const KURL &url);
     
   protected:
-    KHTMLPart *m_html;
+    TDEHTMLPart *m_html;
     
   private:
     TQTimer *timer;
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
index af44158..af141cc 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
@@ -88,7 +88,7 @@ MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(pare
   connect(dir_watch, TQT_SIGNAL(created(const TQString&)), this, TQT_SLOT(slotUpdateCurrentInfo(const TQString&)));
   connect(dir_watch, TQT_SIGNAL(deleted(const TQString&)), this, TQT_SLOT(slotDeleteCurrentInfo(const TQString&)));
 
-  html = new KHTMLPart(this, "metabarhtmlpart");
+  html = new TDEHTMLPart(this, "metabarhtmlpart");
   html->setJScriptEnabled(true);
   html->setPluginsEnabled(true);
   html->setCaretVisible(false);
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.h b/konq-plugins/sidebar/metabar/src/metabarwidget.h
index aad695b..667b461 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.h
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.h
@@ -53,7 +53,7 @@ class MetabarWidget : public TQWidget
     KFileItemList *currentItems;
     TDEConfig *config;
 
-    KHTMLPart *html;
+    TDEHTMLPart *html;
     
     ProtocolPlugin *currentPlugin;
     ProtocolPlugin *defaultPlugin;
diff --git a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
index 75e62c3..ce3844a 100644
--- a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
@@ -32,7 +32,7 @@
 
 ProtocolPlugin* ProtocolPlugin::activePlugin = 0;
 
-ProtocolPlugin::ProtocolPlugin(KHTMLPart *html, MetabarFunctions *functions, const char* name) : TQObject(html, name), m_html(html), m_functions(functions)
+ProtocolPlugin::ProtocolPlugin(TDEHTMLPart *html, MetabarFunctions *functions, const char* name) : TQObject(html, name), m_html(html), m_functions(functions)
 {
 }
 
diff --git a/konq-plugins/sidebar/metabar/src/protocolplugin.h b/konq-plugins/sidebar/metabar/src/protocolplugin.h
index 2ffd207..b0c87ab 100644
--- a/konq-plugins/sidebar/metabar/src/protocolplugin.h
+++ b/konq-plugins/sidebar/metabar/src/protocolplugin.h
@@ -35,7 +35,7 @@ class ProtocolPlugin : public TQObject{
   public:
     static ProtocolPlugin* activePlugin;
   
-    ProtocolPlugin(KHTMLPart *html, MetabarFunctions *functions, const char* name = 0);
+    ProtocolPlugin(TDEHTMLPart *html, MetabarFunctions *functions, const char* name = 0);
     ~ProtocolPlugin();
     
     void setFileItems(const KFileItemList &items);
@@ -54,7 +54,7 @@ class ProtocolPlugin : public TQObject{
     virtual void loadBookmarks(DOM::HTMLElement node) = 0;
   
     KFileItemList m_items;
-    KHTMLPart *m_html;
+    TDEHTMLPart *m_html;
     MetabarFunctions *m_functions;
 };
 
diff --git a/konq-plugins/sidebar/metabar/src/remoteplugin.cpp b/konq-plugins/sidebar/metabar/src/remoteplugin.cpp
index df5bf75..395c2cb 100644
--- a/konq-plugins/sidebar/metabar/src/remoteplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/remoteplugin.cpp
@@ -24,7 +24,7 @@
 #include <klocale.h>
 #include <kstandarddirs.h>
 
-RemotePlugin::RemotePlugin(KHTMLPart* html, MetabarFunctions *functions, const char *name) : DefaultPlugin (html, functions, name)
+RemotePlugin::RemotePlugin(TDEHTMLPart* html, MetabarFunctions *functions, const char *name) : DefaultPlugin (html, functions, name)
 {
 }
 
diff --git a/konq-plugins/sidebar/metabar/src/remoteplugin.h b/konq-plugins/sidebar/metabar/src/remoteplugin.h
index 530aed3..a3e6889 100644
--- a/konq-plugins/sidebar/metabar/src/remoteplugin.h
+++ b/konq-plugins/sidebar/metabar/src/remoteplugin.h
@@ -29,7 +29,7 @@ class RemotePlugin : public DefaultPlugin
   
 
   public:
-    RemotePlugin(KHTMLPart* html, MetabarFunctions *functions, const char *name = 0);
+    RemotePlugin(TDEHTMLPart* html, MetabarFunctions *functions, const char *name = 0);
     ~RemotePlugin();
     
     void loadActions(DOM::HTMLElement node);
diff --git a/konq-plugins/sidebar/metabar/src/settingsplugin.cpp b/konq-plugins/sidebar/metabar/src/settingsplugin.cpp
index b5186e7..4a053dd 100644
--- a/konq-plugins/sidebar/metabar/src/settingsplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/settingsplugin.cpp
@@ -29,7 +29,7 @@
 #include <html_element.h>
 #include <dom_string.h>
 
-SettingsPlugin::SettingsPlugin(KHTMLPart* html, MetabarFunctions *functions, const char *name) : ProtocolPlugin (html, functions, name)
+SettingsPlugin::SettingsPlugin(TDEHTMLPart* html, MetabarFunctions *functions, const char *name) : ProtocolPlugin (html, functions, name)
 {
   list_job = 0;
 }
diff --git a/konq-plugins/sidebar/metabar/src/settingsplugin.h b/konq-plugins/sidebar/metabar/src/settingsplugin.h
index 75f61d3..0f15043 100644
--- a/konq-plugins/sidebar/metabar/src/settingsplugin.h
+++ b/konq-plugins/sidebar/metabar/src/settingsplugin.h
@@ -32,7 +32,7 @@ class SettingsPlugin : public ProtocolPlugin
   
 
   public:
-    SettingsPlugin(KHTMLPart* html, MetabarFunctions *functions, const char *name = 0);
+    SettingsPlugin(TDEHTMLPart* html, MetabarFunctions *functions, const char *name = 0);
     ~SettingsPlugin();
     
     void deactivate();