Rename KHTML and kiobuffer

4 files changed, 14 insertions, 14 deletions

diff --git a/konqueror/sidebar/web_module/Makefile.am b/konqueror/sidebar/web_module/Makefile.am
index 64675d351..a55213aab 100644
--- a/konqueror/sidebar/web_module/Makefile.am
+++ b/konqueror/sidebar/web_module/Makefile.am
@@ -6,7 +6,7 @@ METASOURCES = AUTO
 
 konqsidebar_web_la_SOURCES = web_module.cpp
 konqsidebar_web_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-konqsidebar_web_la_LIBADD = $(LIB_KPARTS) $(LIB_KHTML) ../libkonqsidebarplugin.la ../../../libkonq/libkonq.la
+konqsidebar_web_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEHTML) ../libkonqsidebarplugin.la ../../../libkonq/libkonq.la
 
 #plugindir=$(kde_datadir)/konqsidebartng/entries
 #plugin_DATA=websidebar.desktop
diff --git a/konqueror/sidebar/web_module/TODO b/konqueror/sidebar/web_module/TODO
index abf3260f9..6f268cbed 100644
--- a/konqueror/sidebar/web_module/TODO
+++ b/konqueror/sidebar/web_module/TODO
@@ -1,6 +1,6 @@
 - Apparently _content works everywhere in Mozilla.  Maybe this should go into
-KHTMLPart afterall.  That would solve the form post problem too.
+TDEHTMLPart afterall.  That would solve the form post problem too.
 - Forms don't work.  I don't know if they will for a long time since we can't
-  really filter them with KHTML.
+  really filter them with TDEHTML.
 - Allow setting the useragent (only do this in a clean fashion!!)
-- Double check the KHTML extensions for security implications.
+- Double check the TDEHTML extensions for security implications.
diff --git a/konqueror/sidebar/web_module/web_module.cpp b/konqueror/sidebar/web_module/web_module.cpp
index 1386ee0a7..f0705ae3a 100644
--- a/konqueror/sidebar/web_module/web_module.cpp
+++ b/konqueror/sidebar/web_module/web_module.cpp
@@ -35,7 +35,7 @@
 KonqSideBarWebModule::KonqSideBarWebModule(TDEInstance *instance, TQObject *parent, TQWidget *widgetParent, TQString &desktopName, const char* name)
 	: KonqSidebarPlugin(instance, parent, widgetParent, desktopName, name)
 {
-	_htmlPart = new KHTMLSideBar(universalMode());
+	_htmlPart = new TDEHTMLSideBar(universalMode());
 	connect(_htmlPart, TQT_SIGNAL(reload()), this, TQT_SLOT(reload()));
 	connect(_htmlPart, TQT_SIGNAL(completed()), this, TQT_SLOT(pageLoaded()));
 	connect(_htmlPart,
diff --git a/konqueror/sidebar/web_module/web_module.h b/konqueror/sidebar/web_module/web_module.h
index b7538bff3..3a43a54d0 100644
--- a/konqueror/sidebar/web_module/web_module.h
+++ b/konqueror/sidebar/web_module/web_module.h
@@ -28,18 +28,18 @@
 #include <tqobject.h>
 
 
-// A wrapper for KHTMLPart to make it behave the way we want it to.
-class KHTMLSideBar : public KHTMLPart
+// A wrapper for TDEHTMLPart to make it behave the way we want it to.
+class TDEHTMLSideBar : public TDEHTMLPart
 {
 	Q_OBJECT
 	public:
-		KHTMLSideBar(bool universal) : KHTMLPart() {
+		TDEHTMLSideBar(bool universal) : TDEHTMLPart() {
 			setStatusMessagesEnabled(false);
 			setMetaRefreshEnabled(true);
 			setJavaEnabled(false);
 			setPluginsEnabled(false);
 
-			setFormNotification(KHTMLPart::Only);
+			setFormNotification(TDEHTMLPart::Only);
 			connect(this,
 				TQT_SIGNAL(formSubmitNotification(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)),
 				this,
@@ -69,7 +69,7 @@ class KHTMLSideBar : public KHTMLPart
 				TQT_SLOT(showMenu(const TQString&, const TQPoint&)));
 
 		}
-		virtual ~KHTMLSideBar() {}
+		virtual ~TDEHTMLSideBar() {}
 
 	signals:
 		void submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&);
@@ -102,7 +102,7 @@ class KHTMLSideBar : public KHTMLPart
 				openURL(completeURL(url));
 				return;
 			}
-			KHTMLPart::urlSelected(url,button,state,_target,args);
+			TDEHTMLPart::urlSelected(url,button,state,_target,args);
 		}
 
 	protected slots:
@@ -149,10 +149,10 @@ class KHTMLSideBar : public KHTMLPart
 				emit submitFormRequest(action, u, formData,
 						target, contentType, boundary);
 			} else if (t.isEmpty() || t == "_self") {
-				setFormNotification(KHTMLPart::NoNotification);
+				setFormNotification(TDEHTMLPart::NoNotification);
 				submitFormProxy(action, u, formData, target,
 						contentType, boundary);
-				setFormNotification(KHTMLPart::Only);
+				setFormNotification(TDEHTMLPart::Only);
 			}
 		}
 	private:
@@ -192,7 +192,7 @@ class KonqSideBarWebModule : public KonqSidebarPlugin
 		void reload();
 
 	private:
-		KHTMLSideBar *_htmlPart;
+		TDEHTMLSideBar *_htmlPart;
 		KURL _url;
 		int reloadTimeout;
 		TQString _desktopName;