Rename kiobuffer and KHTML

29 files changed, 129 insertions, 129 deletions

diff --git a/ChangeLog b/ChangeLog
index 531caf59..8b93946d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -334,7 +334,7 @@
 2004-10-23 Alexander Dymo <adymo@tdevelop.org>
     * KDevelop documentation viewer and KDevAssistant:
       - implemented font configuration options;
-      - disabled loading of KHTML plugins.
+      - disabled loading of TDEHTML plugins.
 
 2004-10-21 Alexander Dymo <adymo@tdevelop.org>
     * KDevelop Platform:
diff --git a/cmake b/cmake
-Subproject 9a217903f9fa35ca12213a6e9ee3d2cb87d1131
+Subproject 274366fb8b90704586d7beef216b765cc0688b0
diff --git a/doc/kde_app_devel/index.docbook b/doc/kde_app_devel/index.docbook
index 374e0e37..f5af2265 100644
--- a/doc/kde_app_devel/index.docbook
+++ b/doc/kde_app_devel/index.docbook
@@ -1087,7 +1087,7 @@ document's view widget.
 <listitem><para>
 to create a ScrollView yourself, inherit the View widget from  <classname>QWidget</classname> 
 and add vertical and horizontal  <classname>QScrollBars </classname>. 
-(This is done by KDE`s KHTMLView widget.)
+(This is done by KDE`s TDEHTMLView widget.)
 </para></listitem> 
 <listitem><para> 
 For text processing, use <classname>QTextEdit</classname>. This class provides a complete 
diff --git a/doc/kdearch/index.docbook b/doc/kdearch/index.docbook
index 6e4cc884..9c8872e8 100644
--- a/doc/kdearch/index.docbook
+++ b/doc/kdearch/index.docbook
@@ -89,7 +89,7 @@ The <literal>kjs</literal> library provides an implementation of JavaScript.
 <varlistentry>
 <term><ulink url="kdeapi:tdehtml/index.html">tdehtml</ulink></term>
 <listitem><para>
-The <literal>tdehtml</literal> library contains the KHTML part, a HTML browsing
+The <literal>tdehtml</literal> library contains the TDEHTML part, a HTML browsing
 widget, DOM API and parser, including interfaces to Java and JavaScript.
 </para></listitem>
 </varlistentry>
@@ -2462,7 +2462,7 @@ In the above example, an offer list of the applications supporting
 HTML editors like <application>Quanta Plus</application>. You can also replace
 the second argument <literal>"Application"</literal> by
 <literal>"KParts::ReadOnlyPart"</literal>. In that case, you get a list of
-embedable components for presenting HTML content, for example KHTML. 
+embedable components for presenting HTML content, for example TDEHTML. 
 </para>
 
 <para>
diff --git a/languages/cpp/app_templates/kpartplugin/kpartplugin.kdevtemplate b/languages/cpp/app_templates/kpartplugin/kpartplugin.kdevtemplate
index 7944a2f0..4705ee5a 100644
--- a/languages/cpp/app_templates/kpartplugin/kpartplugin.kdevtemplate
+++ b/languages/cpp/app_templates/kpartplugin/kpartplugin.kdevtemplate
@@ -1,63 +1,63 @@
 # TDE Config File
 [General]
-Name=KHTMLPart plugin
-Name[br]=Lugent KHTMLPart
-Name[ca]=Connector per a KHTMLPart
-Name[de]=KHTMLPart-Modul
-Name[el]=Πρόσθετο KHTMLPart
-Name[es]=Complemento para KHTMLPart
-Name[eu]=KHTMLPart plugina
-Name[fa]=وصلۀ KHTMLPart
-Name[fr]=Module externe pour le composant KHTML
-Name[ga]=Breiseán KHTMLPart
-Name[gl]=Extensión para KHTMLPart
-Name[hu]=KHTML-bővítőmodul
-Name[it]=Plugin KHTMLPart
-Name[ja]=KHTMLPart プラグイン
-Name[nds]=KHTMLPart-Moduul
-Name[ne]=KHTMLPart प्लगइन
-Name[nl]=KHTMLPart-plugin
-Name[pl]=Wtyczka do KHTMLPart
-Name[pt]='Plugin' do KHTMLPart
-Name[pt_BR]='Plugin' do KHTMLPart
-Name[ru]=Модуль KHTMLPart
-Name[sk]=KHTMLPart modul
-Name[sl]=Vstavek za KHTMLPart
-Name[sr]=Прикључак за део KHTML
-Name[sr@Latn]=Priključak za deo KHTML
-Name[sv]=Insticksprogram för KHTML-delprogram
-Name[tr]=KHTMLPart Eklentisi
-Name[zh_CN]=KHTMLPart 插件
-Name[zh_TW]=KHTMLPart 外掛程式
+Name=TDEHTMLPart plugin
+Name[br]=Lugent TDEHTMLPart
+Name[ca]=Connector per a TDEHTMLPart
+Name[de]=TDEHTMLPart-Modul
+Name[el]=Πρόσθετο TDEHTMLPart
+Name[es]=Complemento para TDEHTMLPart
+Name[eu]=TDEHTMLPart plugina
+Name[fa]=وصلۀ TDEHTMLPart
+Name[fr]=Module externe pour le composant TDEHTML
+Name[ga]=Breiseán TDEHTMLPart
+Name[gl]=Extensión para TDEHTMLPart
+Name[hu]=TDEHTML-bővítőmodul
+Name[it]=Plugin TDEHTMLPart
+Name[ja]=TDEHTMLPart プラグイン
+Name[nds]=TDEHTMLPart-Moduul
+Name[ne]=TDEHTMLPart प्लगइन
+Name[nl]=TDEHTMLPart-plugin
+Name[pl]=Wtyczka do TDEHTMLPart
+Name[pt]='Plugin' do TDEHTMLPart
+Name[pt_BR]='Plugin' do TDEHTMLPart
+Name[ru]=Модуль TDEHTMLPart
+Name[sk]=TDEHTMLPart modul
+Name[sl]=Vstavek za TDEHTMLPart
+Name[sr]=Прикључак за део TDEHTML
+Name[sr@Latn]=Priključak za deo TDEHTML
+Name[sv]=Insticksprogram för TDEHTML-delprogram
+Name[tr]=TDEHTMLPart Eklentisi
+Name[zh_CN]=TDEHTMLPart 插件
+Name[zh_TW]=TDEHTMLPart 外掛程式
 Icon=kpartplugin.png
 Category=C++/TDE
-Comment=Generates a plugin for the KHTML part.
-Comment[ca]=Genera un connector per a la part KHTML.
-Comment[da]=Genererer et plugin for KHTML parten.
-Comment[de]=Erstellt ein Modul für die Komponente KHTML
-Comment[el]=Δημιουργεί ένα πρόσθετο για το τμήμα KHTML.
-Comment[es]=Genera un complemento para KHTMLPart.
-Comment[et]=KHTML-komponendi plugina loomine.
-Comment[eu]=KHTML zatirako plugin bat sortzen du.
-Comment[fa]=یک وصله برای جزء KHTML تولید می‌کند
-Comment[fr]=Génère un module externe pour le composant KHTML.
-Comment[gl]=Xera unha extensión para o 'part' KHTML.
-Comment[hu]=Létrehoz egy KHTML-bővítőmodult.
-Comment[it]=Genera un plugin per la part KHTML.
-Comment[ja]=KHTML パートのためのプラグインを作成します
-Comment[nds]=Stellt en Moduul för de Komponent KHTML op.
-Comment[ne]=KHTML भागका लागि प्लगइन उत्पन्न गर्दछ ।
-Comment[nl]=Genereert een plugin voor de KHTML-part.
-Comment[pl]=Generuje wtyczkę do KHTML part.
-Comment[pt]=Gera um 'plugin' para a componente KHTML.
-Comment[pt_BR]=Gera um 'plugin' para a componente KHTML.
-Comment[ru]=Создание модуля для компонента KHTML.
-Comment[sk]=Vygeneruje modul pre KHTML part.
-Comment[sr]=Прави прикључак за део KHTML.
-Comment[sr@Latn]=Pravi priključak za deo KHTML.
-Comment[sv]=Skapar ett insticksprogram för KHTML-delprogrammet
-Comment[zh_CN]=生成 KHTML 部件的插件。
-Comment[zh_TW]=產生一個 KHTML part 的外掛程式
+Comment=Generates a plugin for the TDEHTML part.
+Comment[ca]=Genera un connector per a la part TDEHTML.
+Comment[da]=Genererer et plugin for TDEHTML parten.
+Comment[de]=Erstellt ein Modul für die Komponente TDEHTML
+Comment[el]=Δημιουργεί ένα πρόσθετο για το τμήμα TDEHTML.
+Comment[es]=Genera un complemento para TDEHTMLPart.
+Comment[et]=TDEHTML-komponendi plugina loomine.
+Comment[eu]=TDEHTML zatirako plugin bat sortzen du.
+Comment[fa]=یک وصله برای جزء TDEHTML تولید می‌کند
+Comment[fr]=Génère un module externe pour le composant TDEHTML.
+Comment[gl]=Xera unha extensión para o 'part' TDEHTML.
+Comment[hu]=Létrehoz egy TDEHTML-bővítőmodult.
+Comment[it]=Genera un plugin per la part TDEHTML.
+Comment[ja]=TDEHTML パートのためのプラグインを作成します
+Comment[nds]=Stellt en Moduul för de Komponent TDEHTML op.
+Comment[ne]=TDEHTML भागका लागि प्लगइन उत्पन्न गर्दछ ।
+Comment[nl]=Genereert een plugin voor de TDEHTML-part.
+Comment[pl]=Generuje wtyczkę do TDEHTML part.
+Comment[pt]=Gera um 'plugin' para a componente TDEHTML.
+Comment[pt_BR]=Gera um 'plugin' para a componente TDEHTML.
+Comment[ru]=Создание модуля для компонента TDEHTML.
+Comment[sk]=Vygeneruje modul pre TDEHTML part.
+Comment[sr]=Прави прикључак за део TDEHTML.
+Comment[sr@Latn]=Pravi priključak za deo TDEHTML.
+Comment[sv]=Skapar ett insticksprogram för TDEHTML-delprogrammet
+Comment[zh_CN]=生成 TDEHTML 部件的插件。
+Comment[zh_TW]=產生一個 TDEHTML part 的外掛程式
 FileTemplates=h,CStyle,cpp,CStyle
 ShowFilesAfterGeneration=%{dest}/src/plugin_%{APPNAMELC}.cpp
 Archive=kpartplugin.tar.gz
@@ -173,32 +173,32 @@ Process=false
 
 [MSG]
 Type=message
-Comment=A KHTMLPart plugin was created in %{dest}
-Comment[ca]=Un connector per a KHTMLPart ha estat creat en %{dest}
-Comment[da]=Et KHTMLPart plugin blev oprettet i %{dest}
-Comment[de]=Ein Modul für die Komponente KHTML wurde in %{dest} erstellt.
-Comment[el]=Ένα πρόσθετο τμήμα KHTML δημιουργήθηκε στο %{dest}
-Comment[es]=Un complemento para KHTMLPart ha sido creado en %{dest}
-Comment[et]=KHTMLPart plugin loodi asukohta %{dest}
-Comment[eu]=KHTMLPart plugin bat sortu da hemen: %{dest}
-Comment[fa]=یک وصلۀ جزء KHTML در %{dest} ایجاد شد
-Comment[fr]=Un module externe pour KHTMLPart a été créé dans %{dest}
-Comment[ga]=Cruthaíodh breiseán KHTMLPart i %{dest}
-Comment[gl]=Creouse unha extensión para KHTMLPart en %{dest}
-Comment[hu]=Létrejött egy KHTML-bővítőmodul itt: %{dest}
-Comment[it]=È stato creato un plugin KHTMLPart in %{dest}
-Comment[ja]=KHTMLPart プラグインを %{dest} に作成しました
-Comment[nds]=In %{dest} wöör en KHTMLPart-Moduul opstellt
-Comment[ne]=KHTMLPart प्लगइन %{dest} मा सिर्जना गरियो
-Comment[nl]=Een KHTMLPart-plugin is aangemaakt in %{dest}
-Comment[pl]=Wtyczka do KHTMLPart została utworzona w %{dest}
-Comment[pt]=Foi criado um 'plugin' KHTMLPart em %{dest}
-Comment[pt_BR]=Foi criado um 'plugin' KHTMLPart em %{dest}
-Comment[ru]=Модуль для компонента KHTML создан в %{dest}
-Comment[sk]=KHTML modul bol vytvorený v %{dest}
-Comment[sr]=Прикључак за део KHTML направљен је у %{dest}
-Comment[sr@Latn]=Priključak za deo KHTML napravljen je u %{dest}
-Comment[sv]=Ett insticksprogram för KHTML-delprogrammet skapades i %{dest}
-Comment[tr]=Bir KHTMLPart eklentisi %{dest} içinde yaratıldı.
-Comment[zh_CN]=在 %{dest} 中创建了一个 KHTMLPart 插件
-Comment[zh_TW]=一個 KHTML 外掛程式已建立於 %{dest}
+Comment=A TDEHTMLPart plugin was created in %{dest}
+Comment[ca]=Un connector per a TDEHTMLPart ha estat creat en %{dest}
+Comment[da]=Et TDEHTMLPart plugin blev oprettet i %{dest}
+Comment[de]=Ein Modul für die Komponente TDEHTML wurde in %{dest} erstellt.
+Comment[el]=Ένα πρόσθετο τμήμα TDEHTML δημιουργήθηκε στο %{dest}
+Comment[es]=Un complemento para TDEHTMLPart ha sido creado en %{dest}
+Comment[et]=TDEHTMLPart plugin loodi asukohta %{dest}
+Comment[eu]=TDEHTMLPart plugin bat sortu da hemen: %{dest}
+Comment[fa]=یک وصلۀ جزء TDEHTML در %{dest} ایجاد شد
+Comment[fr]=Un module externe pour TDEHTMLPart a été créé dans %{dest}
+Comment[ga]=Cruthaíodh breiseán TDEHTMLPart i %{dest}
+Comment[gl]=Creouse unha extensión para TDEHTMLPart en %{dest}
+Comment[hu]=Létrejött egy TDEHTML-bővítőmodul itt: %{dest}
+Comment[it]=È stato creato un plugin TDEHTMLPart in %{dest}
+Comment[ja]=TDEHTMLPart プラグインを %{dest} に作成しました
+Comment[nds]=In %{dest} wöör en TDEHTMLPart-Moduul opstellt
+Comment[ne]=TDEHTMLPart प्लगइन %{dest} मा सिर्जना गरियो
+Comment[nl]=Een TDEHTMLPart-plugin is aangemaakt in %{dest}
+Comment[pl]=Wtyczka do TDEHTMLPart została utworzona w %{dest}
+Comment[pt]=Foi criado um 'plugin' TDEHTMLPart em %{dest}
+Comment[pt_BR]=Foi criado um 'plugin' TDEHTMLPart em %{dest}
+Comment[ru]=Модуль для компонента TDEHTML создан в %{dest}
+Comment[sk]=TDEHTML modul bol vytvorený v %{dest}
+Comment[sr]=Прикључак за део TDEHTML направљен је у %{dest}
+Comment[sr@Latn]=Priključak za deo TDEHTML napravljen je u %{dest}
+Comment[sv]=Ett insticksprogram för TDEHTML-delprogrammet skapades i %{dest}
+Comment[tr]=Bir TDEHTMLPart eklentisi %{dest} içinde yaratıldı.
+Comment[zh_CN]=在 %{dest} 中创建了一个 TDEHTMLPart 插件
+Comment[zh_TW]=一個 TDEHTML 外掛程式已建立於 %{dest}
diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp
index c9717c29..b6297139 100644
--- a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp
+++ b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp
@@ -24,10 +24,10 @@ Plugin%{APPNAME}::~Plugin%{APPNAME}()
 
 void Plugin%{APPNAME}::slotAction()
 {
-    // This plugin assumes KHTMLPart.  If your plugin can handle more
+    // This plugin assumes TDEHTMLPart.  If your plugin can handle more
     // than this or a different Part than this, simply delete or
     // change the following block.
-    if ( !parent()->inherits("KHTMLPart") )
+    if ( !parent()->inherits("TDEHTMLPart") )
     {
         TQString title( i18n( "Cannot Translate Source" ) );
         TQString text( i18n( "You cannot translate anything except web pages "
@@ -39,7 +39,7 @@ void Plugin%{APPNAME}::slotAction()
 
     // Get a handle on our parent so we may get the necessary data for
     // processing
-    KHTMLPart *part = dynamic_cast<KHTMLPart *>(parent());
+    TDEHTMLPart *part = dynamic_cast<TDEHTMLPart *>(parent());
 
     // This plugin only uses the URL.  You may use whatever data you
     // need.
diff --git a/languages/cpp/app_templates/kpartplugin/src-Makefile.am b/languages/cpp/app_templates/kpartplugin/src-Makefile.am
index a0da7254..6043b380 100644
--- a/languages/cpp/app_templates/kpartplugin/src-Makefile.am
+++ b/languages/cpp/app_templates/kpartplugin/src-Makefile.am
@@ -6,14 +6,14 @@ KDE_ICON = AUTO
 # Install this plugin in the TDE modules directory
 kde_module_LTLIBRARIES = lib%{APPNAMELC}plugin.la
 
-# This is all standard.  Remove the LIB_KHTML reference if you are not
-# using the KHTML Part
+# This is all standard.  Remove the LIB_TDEHTML reference if you are not
+# using the TDEHTML Part
 lib%{APPNAMELC}plugin_la_SOURCES = plugin_%{APPNAMELC}.cpp
-lib%{APPNAMELC}plugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KHTML)
+lib%{APPNAMELC}plugin_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEHTML)
 lib%{APPNAMELC}plugin_la_LDFLAGS = -module -avoid-version -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS)
 
 # Install the .rc file in the Part's directory (in this case, the part
-# is KHTMLPart)
+# is TDEHTMLPart)
 pluginsdir = $(kde_datadir)/tdehtml/kpartplugins
 plugins_DATA = plugin_%{APPNAMELC}.rc
 
diff --git a/languages/cpp/compiler/gccoptions/Makefile.am b/languages/cpp/compiler/gccoptions/Makefile.am
index 26e3b518..e90edb63 100644
--- a/languages/cpp/compiler/gccoptions/Makefile.am
+++ b/languages/cpp/compiler/gccoptions/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extras
 kde_module_LTLIBRARIES = libkdevgccoptions.la
 libkdevgccoptions_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
 libkdevgccoptions_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
-	$(top_builddir)/lib/widgets/libkdevwidgets.la $(top_builddir)/lib/interfaces/extras/libkdevextras.la $(LIB_KHTML)
+	$(top_builddir)/lib/widgets/libkdevwidgets.la $(top_builddir)/lib/interfaces/extras/libkdevextras.la $(LIB_TDEHTML)
 
 libkdevgccoptions_la_SOURCES = gccoptionsplugin.cpp
 
diff --git a/languages/cpp/debugger/Makefile.am b/languages/cpp/debugger/Makefile.am
index 454cf345..09c147ad 100644
--- a/languages/cpp/debugger/Makefile.am
+++ b/languages/cpp/debugger/Makefile.am
@@ -9,7 +9,7 @@ INCLUDES = -I$(top_srcdir)/languages/lib/debugger \
 
 kde_module_LTLIBRARIES = libkdevdebugger.la
 libkdevdebugger_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevdebugger_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_KHTML) \
+libkdevdebugger_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_TDEHTML) \
 	$(top_builddir)/languages/lib/debugger/liblang_debugger.la \
 	$(top_builddir)/languages/cpp/debugger/mi/libgdbmi_parser.la
 
diff --git a/languages/cpp/doc/kde2book.toc b/languages/cpp/doc/kde2book.toc
index ec22d851..e0d2c61a 100644
--- a/languages/cpp/doc/kde2book.toc
+++ b/languages/cpp/doc/kde2book.toc
@@ -1439,7 +1439,7 @@
 <entry name="KHelpers widget, khelpers.cpp class definition" url="ch05lev1sec2.html"/>
 <entry name="KHelpers widget, khelpers.h class declaration" url="ch05lev1sec2.html"/>
 <entry name="KHelpers widget, main() function" url="ch05lev1sec2.html"/>
-<entry name="KHTMLWidget" url="ch10.html"/>
+<entry name="TDEHTMLWidget" url="ch10.html"/>
 <entry name="kimageview.cpp class declaration (KImageView widget)" url="ch10lev1sec2.html"/>
 <entry name="kimageview.h class definition (KImageView widget)" url="ch10lev1sec2.html"/>
 <entry name="KImageView widget (image viewer/converter), kimageview.cpp class declaration" url="ch10lev1sec2.html"/>
@@ -2821,7 +2821,7 @@
 <entry name="widgets, event handlers, showEvent()" url="ch04.html"/>
 <entry name="widgets, event handlers" url="ch04.html"/>
 <entry name="widgets, event handlers, wheelEvent()" url="ch04.html"/>
-<entry name="widgets, KHTMLWidget" url="ch10.html"/>
+<entry name="widgets, TDEHTMLWidget" url="ch10.html"/>
 <entry name="widgets, KSpell (spell-checking), configuring" url="ch10lev1sec3.html"/>
 <entry name="widgets, KSpell (spell-checking), methods" url="ch10lev1sec3.html"/>
 <entry name="widgets, KSpell (spell-checking), modal spell-checking" url="ch10lev1sec3.html"/>
diff --git a/languages/pascal/compiler/dccoptions/Makefile.am b/languages/pascal/compiler/dccoptions/Makefile.am
index 7665da4d..734e63c5 100644
--- a/languages/pascal/compiler/dccoptions/Makefile.am
+++ b/languages/pascal/compiler/dccoptions/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extras
 kde_module_LTLIBRARIES = libkdevdccoptions.la
 libkdevdccoptions_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
 libkdevdccoptions_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
-	$(top_builddir)/lib/widgets/libkdevwidgets.la $(top_builddir)/lib/interfaces/extras/libkdevextras.la $(LIB_KHTML)
+	$(top_builddir)/lib/widgets/libkdevwidgets.la $(top_builddir)/lib/interfaces/extras/libkdevextras.la $(LIB_TDEHTML)
 
 libkdevdccoptions_la_SOURCES = dccoptionsplugin.cpp optiontabs.cpp
 
diff --git a/languages/pascal/compiler/fpcoptions/Makefile.am b/languages/pascal/compiler/fpcoptions/Makefile.am
index 3837ab58..70579448 100644
--- a/languages/pascal/compiler/fpcoptions/Makefile.am
+++ b/languages/pascal/compiler/fpcoptions/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extras
 kde_module_LTLIBRARIES = libkdevfpcoptions.la
 libkdevfpcoptions_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
 libkdevfpcoptions_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
-	$(top_builddir)/lib/widgets/libkdevwidgets.la $(top_builddir)/lib/interfaces/extras/libkdevextras.la $(LIB_KHTML)
+	$(top_builddir)/lib/widgets/libkdevwidgets.la $(top_builddir)/lib/interfaces/extras/libkdevextras.la $(LIB_TDEHTML)
 
 libkdevfpcoptions_la_SOURCES = fpcoptionsplugin.cpp optiontabs.cpp
 
diff --git a/languages/php/Makefile.am b/languages/php/Makefile.am
index 2938d11d..a10604e5 100644
--- a/languages/php/Makefile.am
+++ b/languages/php/Makefile.am
@@ -8,7 +8,7 @@ SUBDIRS = data app_templates file_templates doc
 
 kde_module_LTLIBRARIES = libkdevphpsupport.la
 libkdevphpsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevphpsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_KHTML)
+libkdevphpsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_TDEHTML)
 
 libkdevphpsupport_la_SOURCES = phpsupportpart.cpp phpconfigwidgetbase.ui phpconfigwidget.cpp phpinfodlg.ui phphtmlview.cpp phperrorview.cpp phpconfigdata.cpp phpcodecompletion.cpp phpparser.cpp phpnewclassdlgbase.ui phpnewclassdlg.cpp phpfile.cpp
 
diff --git a/languages/php/phpsupportpart.cpp b/languages/php/phpsupportpart.cpp
index f7bde3d0..5d42b59e 100644
--- a/languages/php/phpsupportpart.cpp
+++ b/languages/php/phpsupportpart.cpp
@@ -260,7 +260,7 @@ void PHPSupportPart::executeOnWebserver() {
    TQString weburl = configData->getWebURL();
    TQString file = getExecuteFile();
 
-   // Force KHTMLPart to reload the page
+   // Force TDEHTMLPart to reload the page
    KParts::BrowserExtension* be = m_htmlView->browserExtension();
    if (be) {
       KParts::URLArgs urlArgs( be->urlArgs() );
diff --git a/languages/ruby/debugger/Makefile.am b/languages/ruby/debugger/Makefile.am
index aefb6217..88e03f03 100644
--- a/languages/ruby/debugger/Makefile.am
+++ b/languages/ruby/debugger/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES = -I$(top_srcdir)/languages/lib/debugger \
 
 kde_module_LTLIBRARIES = libkdevrbdebugger.la
 libkdevrbdebugger_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevrbdebugger_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_KHTML) \
+libkdevrbdebugger_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_TDEHTML) \
 	$(top_builddir)/languages/lib/debugger/liblang_debugger.la
 
 libkdevrbdebugger_la_SOURCES = debuggerpart.cpp dbgcontroller.cpp rdbcontroller.cpp dbgcommand.cpp rdbcommand.cpp rdbparser.cpp stty.cpp breakpoint.cpp variablewidget.cpp rdbbreakpointwidget.cpp framestackwidget.cpp dbgpsdlg.cpp dbgtoolbar.cpp rdboutputwidget.cpp rdbtable.cpp
diff --git a/lib/interfaces/Makefile.am b/lib/interfaces/Makefile.am
index ba43ce86..75935ca1 100644
--- a/lib/interfaces/Makefile.am
+++ b/lib/interfaces/Makefile.am
@@ -14,7 +14,7 @@ libkdevinterfaces_la_SOURCES = kdevcore.cpp kdevproject.cpp \
 libkdevinterfaces_la_LDFLAGS = -no-undefined $(all_libraries)
 libkdevinterfaces_la_LIBADD = $(top_builddir)/lib/interfaces/external/libkinterfacedesigner.la \
 	$(top_builddir)/lib/util/libkdevutil.la \
-	$(LIB_TDEUI) $(LIB_KHTML) $(LIB_KPARTS) -ltdetexteditor -ltdescript -lDCOP
+	$(LIB_TDEUI) $(LIB_TDEHTML) $(LIB_KPARTS) -ltdetexteditor -ltdescript -lDCOP
 
 tdevelopincludedir = $(includedir)/tdevelop/interfaces
 tdevelopinclude_HEADERS = kdevlanguagesupport.h kdevmainwindow.h \
diff --git a/lib/widgets/kdevhtmlpart.cpp b/lib/widgets/kdevhtmlpart.cpp
index 49ac87d2..34d5a2c0 100644
--- a/lib/widgets/kdevhtmlpart.cpp
+++ b/lib/widgets/kdevhtmlpart.cpp
@@ -20,7 +20,7 @@
 #include "kdevhtmlpart.h"
 
 KDevHTMLPart::KDevHTMLPart()
-  : KHTMLPart(0L, 0L, 0L, "KDevHTMLPart", DefaultGUI )
+  : TDEHTMLPart(0L, 0L, 0L, "KDevHTMLPart", DefaultGUI )
 {
   setXMLFile(locate("data", "tdevelop/kdevhtml_partui.rc"), true);
   
@@ -79,7 +79,7 @@ KDevHTMLPart::KDevHTMLPart()
   
   //settings:
   TDEConfig *appConfig = TDEGlobal::config();
-  appConfig->setGroup("KHTMLPart");
+  appConfig->setGroup("TDEHTMLPart");
   setStandardFont(appConfig->readEntry("StandardFont",
       settings()->stdFontName()));
   setFixedFont(appConfig->readEntry("FixedFont",
@@ -323,7 +323,7 @@ bool KDevHTMLPart::openURL(const KURL &url)
   TQString path = resolveEnvVarsInURL(url.url());
   KURL newUrl(path);
   
-  bool retval = KHTMLPart::openURL(newUrl);
+  bool retval = TDEHTMLPart::openURL(newUrl);
   if ( retval )
   {
     emit fileNameChanged(this);
diff --git a/lib/widgets/kdevhtmlpart.h b/lib/widgets/kdevhtmlpart.h
index 13f155a5..3dbc728e 100644
--- a/lib/widgets/kdevhtmlpart.h
+++ b/lib/widgets/kdevhtmlpart.h
@@ -9,7 +9,7 @@
 
 /**
 @file kdevhtmlpart.h
-Customized KHTML part for KDevelop.
+Customized TDEHTML part for KDevelop.
 */
 
 class KAction;
@@ -27,10 +27,10 @@ struct DocumentationHistoryEntry {
 };
 
 /**
-Customized KHTML part for KDevelop.
+Customized TDEHTML part for KDevelop.
 Used as HTML documentation and file viewer. 
 
-Represents customized BrowserViewGUI mode of KHTMLPart. Provides also actions for:
+Represents customized BrowserViewGUI mode of TDEHTMLPart. Provides also actions for:
 - reload;
 - stop;
 - duplicate;
@@ -41,7 +41,7 @@ Represents customized BrowserViewGUI mode of KHTMLPart. Provides also actions fo
 .
 It has it's own popup menu and font/zoom settings.
 */
-class KDevHTMLPart : public KHTMLPart
+class KDevHTMLPart : public TDEHTMLPart
 {
     Q_OBJECT
   
diff --git a/parts/classview/Makefile.am b/parts/classview/Makefile.am
index a58ec684..3041259e 100644
--- a/parts/classview/Makefile.am
+++ b/parts/classview/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = -I$(top_srcdir)/lib/compat -I$(top_srcdir)/lib/interfaces -I$(top_src
 
 kde_module_LTLIBRARIES = libkdevclassview.la
 libkdevclassview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevclassview_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_KHTML) $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la
+libkdevclassview_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_TDEHTML) $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la
 
 libkdevclassview_la_SOURCES = classviewpart.cpp classviewwidget.cpp \
 	digraphview.cpp hierarchydlg.cpp navigator.cpp viewcombos.cpp
diff --git a/parts/documentation/Makefile.am b/parts/documentation/Makefile.am
index e6724ba1..13c4db3f 100644
--- a/parts/documentation/Makefile.am
+++ b/parts/documentation/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util \
 kde_module_LTLIBRARIES = libkdevdocumentation.la
 libkdevdocumentation_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 libkdevdocumentation_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
-	$(top_builddir)/parts/documentation/interfaces/libdocumentation_interfaces.la $(LIB_KHTML)
+	$(top_builddir)/parts/documentation/interfaces/libdocumentation_interfaces.la $(LIB_TDEHTML)
 
 libkdevdocumentation_la_SOURCES = documentation_part.cpp \
 			documentation_widget.cpp contentsview.cpp indexview.cpp docglobalconfigwidgetbase.ui \
diff --git a/parts/documentation/bookmarkview.cpp b/parts/documentation/bookmarkview.cpp
index 0ca74f43..4581361d 100644
--- a/parts/documentation/bookmarkview.cpp
+++ b/parts/documentation/bookmarkview.cpp
@@ -73,7 +73,7 @@ TQString DocBookmarkOwner::currentTitle() const
     KParts::ReadOnlyPart *activePart = dynamic_cast<KParts::ReadOnlyPart*>(m_part->partController()->activePart());
     if (activePart)
     {
-        KHTMLPart *htmlPart = dynamic_cast<KHTMLPart*>(activePart);
+        TDEHTMLPart *htmlPart = dynamic_cast<TDEHTMLPart*>(activePart);
         if (htmlPart)
             return htmlPart->htmlDocument().title().string();
         return activePart->url().prettyURL();
diff --git a/parts/documentation/docglobalconfigwidget.cpp b/parts/documentation/docglobalconfigwidget.cpp
index fa6bafd0..5cea1004 100644
--- a/parts/documentation/docglobalconfigwidget.cpp
+++ b/parts/documentation/docglobalconfigwidget.cpp
@@ -104,9 +104,9 @@ DocGlobalConfigWidget::DocGlobalConfigWidget(DocumentationPart *part,
         useAssistant_box->hide();
 
     //font sizes and zoom levels
-    KHTMLPart htmlpart;
+    TDEHTMLPart htmlpart;
     TDEConfig *appConfig = TDEGlobal::config();
-    appConfig->setGroup("KHTMLPart");
+    appConfig->setGroup("TDEHTMLPart");
     standardFont_combo->setCurrentText(appConfig->readEntry("StandardFont",
         htmlpart.settings()->stdFontName()));
     fixedFont_combo->setCurrentText(appConfig->readEntry("FixedFont",
@@ -215,7 +215,7 @@ void DocGlobalConfigWidget::accept()
 
     //font sizes and zoom levels
     TDEConfig *appConfig = TDEGlobal::config();
-    appConfig->setGroup("KHTMLPart");
+    appConfig->setGroup("TDEHTMLPart");
     appConfig->writeEntry("StandardFont", standardFont_combo->currentText());
     appConfig->writeEntry("FixedFont", fixedFont_combo->currentText());
     appConfig->writeEntry("Zoom", zoom_combo->currentText());
@@ -238,11 +238,11 @@ void DocGlobalConfigWidget::updateConfigForHTMLParts()
     KURL::List urls = m_part->partController()->openURLs();
     for (KURL::List::const_iterator it = urls.constBegin(); it != urls.constEnd(); ++it)
     {
-        KHTMLPart *htmlPart = dynamic_cast<KHTMLPart*>(m_part->partController()->partForURL(*it));
+        TDEHTMLPart *htmlPart = dynamic_cast<TDEHTMLPart*>(m_part->partController()->partForURL(*it));
         if (htmlPart)
         {
             TDEConfig *appConfig = TDEGlobal::config();
-            appConfig->setGroup("KHTMLPart");
+            appConfig->setGroup("TDEHTMLPart");
             htmlPart->setStandardFont(appConfig->readEntry("StandardFont"));
             htmlPart->setFixedFont(appConfig->readEntry("FixedFont"));
             //hack to force reloading the page
diff --git a/parts/grepview/Makefile.am b/parts/grepview/Makefile.am
index c282e75a..dc5f5fed 100644
--- a/parts/grepview/Makefile.am
+++ b/parts/grepview/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util \
 kde_module_LTLIBRARIES = libkdevgrepview.la
 libkdevgrepview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 libkdevgrepview_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
-	$(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_KHTML)
+	$(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_TDEHTML)
 
 libkdevgrepview_la_SOURCES = grepviewpart.cpp grepviewwidget.cpp grepdlg.cpp
 
diff --git a/parts/outputviews/Makefile.am b/parts/outputviews/Makefile.am
index 803d51c2..6a890586 100644
--- a/parts/outputviews/Makefile.am
+++ b/parts/outputviews/Makefile.am
@@ -22,7 +22,7 @@ noinst_HEADERS = filterdlg.h
 libkdevmakeview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 libkdevmakeview_la_LIBADD = $(top_builddir)/lib/widgets/libkdevwidgets.la \
 	$(top_builddir)/lib/interfaces/extensions/dcop/libkdevdcopextensions.la $(top_builddir)/lib/libtdevelop.la \
-	$(LIB_KHTML) $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la
+	$(LIB_TDEHTML) $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la
 libkdevmakeview_la_SOURCES = makeviewpart.cpp makewidget.cpp \
 	directorystatusmessagefilter.cpp outputfilter.cpp compileerrorfilter.cpp commandcontinuationfilter.cpp \
 	makeitem.cpp makeactionfilter.cpp otherfilter.cpp
@@ -30,6 +30,6 @@ libkdevmakeview_la_SOURCES = makeviewpart.cpp makewidget.cpp \
 libkdevappview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 libkdevappview_la_LIBADD = $(top_builddir)/lib/widgets/libkdevwidgets.la \
 	$(top_builddir)/lib/interfaces/extensions/dcop/libkdevdcopextensions.la $(top_builddir)/lib/libtdevelop.la \
-	$(LIB_KHTML) $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la
+	$(LIB_TDEHTML) $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la
 libkdevappview_la_SOURCES = appoutputviewpart.cpp appoutputwidget.cpp \
 	filterdlg.ui
diff --git a/parts/quickopen/Makefile.am b/parts/quickopen/Makefile.am
index 2b9fafe0..ca7ed3dd 100644
--- a/parts/quickopen/Makefile.am
+++ b/parts/quickopen/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extensi
 
 kde_module_LTLIBRARIES = libkdevquickopen.la
 libkdevquickopen_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevquickopen_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_KHTML)
+libkdevquickopen_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_TDEHTML)
 
 libkdevquickopen_la_SOURCES = quickopen_part.cpp quickopendialog.cpp quickopenclassdialog.cpp quickopenbase.ui quickopenfiledialog.cpp quickopenfunctiondialog.cpp quickopenfunctionchooseformbase.ui quickopenfunctionchooseform.cpp
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 41c483ca..60cf2f3b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,7 @@ libkdevshell_la_LDFLAGS = $(all_libraries) -ltdevelop -L../lib/.libs -L../lib/in
 libkdevshell_la_LIBADD = \
 	$(top_builddir)/src/profileengine/lib/libprofileengine.la $(top_builddir)/lib/libtdevelop.la \
 	$(top_builddir)/lib/widgets/libkdevwidgets.la $(top_builddir)/lib/interfaces/extras/libkdevextras.la \
-	$(top_builddir)/src/newui/libd.la $(LIB_KHTML) -ltdetexteditor -L../lib/interfaces/external/.libs -lkinterfacedesigner
+	$(top_builddir)/src/newui/libd.la $(LIB_TDEHTML) -ltdetexteditor -L../lib/interfaces/external/.libs -lkinterfacedesigner
 libkdevshell_la_SOURCES = api.cpp core.cpp documentationpart.cpp \
 	editorproxy.cpp generalinfowidget.cpp generalinfowidgetbase.ui languageselectwidget.cpp \
 	mainwindowshare.cpp mimewarningdialog.ui multibuffer.cpp partcontroller.cpp \
diff --git a/src/main.cpp b/src/main.cpp
index c25755a9..33c3b52c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -61,7 +61,7 @@ int main(int argc, char *argv[])
   aboutData.addCredit("Marek Janukowicz", I18N_NOOP("Ruby support"), "child@t17.ds.pwr.wroc.pl");
 
   aboutData.addCredit("The KWrite authors", I18N_NOOP("Kate editor component"), "kwrite-devel@kde.org");
-  aboutData.addCredit("The KHTML authors", I18N_NOOP("HTML documentation component"), "kwrite-devel@kde.org");
+  aboutData.addCredit("The TDEHTML authors", I18N_NOOP("HTML documentation component"), "kwrite-devel@kde.org");
   aboutData.addCredit("Robert Moniot", I18N_NOOP("Fortran documentation"), "moniot@fordham.edu");
   aboutData.addCredit("Ka-Ping Yee", I18N_NOOP("Python documentation utility"), "ping@lfw.org");
   aboutData.addCredit("Dimitri van Heesch", I18N_NOOP("Doxygen wizard"), "dimitri@stack.nl");
diff --git a/src/main_assistant.cpp b/src/main_assistant.cpp
index 1f3ecf9b..d12e7d24 100644
--- a/src/main_assistant.cpp
+++ b/src/main_assistant.cpp
@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
   aboutData.addCredit("Marek Janukowicz", I18N_NOOP("Ruby support"), "child@t17.ds.pwr.wroc.pl");
 
   aboutData.addCredit("The KWrite authors", I18N_NOOP("Kate editor component"), "kwrite-devel@kde.org");
-  aboutData.addCredit("The KHTML authors", I18N_NOOP("HTML documentation component"), "kfm-devel@kde.org");
+  aboutData.addCredit("The TDEHTML authors", I18N_NOOP("HTML documentation component"), "kfm-devel@kde.org");
   aboutData.addCredit("Robert Moniot", I18N_NOOP("Fortran documentation"), "moniot@fordham.edu");
   aboutData.addCredit("Ka-Ping Yee", I18N_NOOP("Python documentation utility"), "ping@lfw.org");
   aboutData.addCredit("Dimitri van Heesch", I18N_NOOP("Doxygen wizard"), "dimitri@stack.nl");
diff --git a/vcs/cvsservice/Makefile.am b/vcs/cvsservice/Makefile.am
index 24242263..63560056 100644
--- a/vcs/cvsservice/Makefile.am
+++ b/vcs/cvsservice/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \
 kde_module_LTLIBRARIES = libkdevcvsservice.la
 libkdevcvsservice_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 libkdevcvsservice_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
-	$(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_KHTML) -lcvsservice $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la
+	$(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_TDEHTML) -lcvsservice $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la
 
 libkdevcvsservice_la_SOURCES = cvspart.cpp cvspartimpl.cpp cvsformbase.ui \
 	cvsform.cpp commitdialogbase.ui commitdlg.cpp cvsoptionswidgetbase.ui \