Rename kiobuffer and KHTML

42 files changed, 50 insertions, 50 deletions

diff --git a/akregator/ChangeLog b/akregator/ChangeLog
index 9da56ce7..217f7c03 100644
--- a/akregator/ChangeLog
+++ b/akregator/ChangeLog
@@ -418,7 +418,7 @@ Changes from 0.9 to 1.0b1:
 #000002 FIX [x] update ArticleList when selecting another feed
 #000026 CHG [x] unless someone offers me some icons, Fetch and Fetch all will be 'down' and 'bottom' respectively
 #000023 FIX [x] implement fetch all
-#000024 CHG [x] replace generic HTML part with strictly KHTMLPart (saves some static_cast<>s)
+#000024 CHG [x] replace generic HTML part with strictly TDEHTMLPart (saves some static_cast<>s)
 #000018 ADD [x] provide .desktop file
 #000017 ADD [x] provide .lsm file
 #000016 ADD [x] provide standard AUTHORS, ChangeLog, README, and TODO files
diff --git a/akregator/src/Makefile.am b/akregator/src/Makefile.am
index e212b260..f88d0eab 100644
--- a/akregator/src/Makefile.am
+++ b/akregator/src/Makefile.am
@@ -78,7 +78,7 @@ libakregatorprivate_la_SOURCES = akregatorconfig.kcfgc \
 				
 libakregatorprivate_la_LDFLAGS = $(all_libraries) -avoid-version -no-undefined 
 libakregatorprivate_la_LIBADD =	$(top_builddir)/libtdepim/libtdepim.la \
-	$(top_builddir)/akregator/src/librss/librsslocal.la $(LIB_KHTML)
+	$(top_builddir)/akregator/src/librss/librsslocal.la $(LIB_TDEHTML)
 
 #########################################################################
 # KPART SECTION
@@ -146,7 +146,7 @@ libakregatorpart_la_SOURCES = \
 	kspeech.stub
 
 libakregatorpart_la_LDFLAGS = $(KDE_RPATH) $(KDE_PLUGIN) $(LIB_KUTILS) -avoid-version -no-undefined $(all_libraries)
-libakregatorpart_la_LIBADD = libakregatorprivate.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KHTML) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -L$(top_builddir)/libtdepim -ltdepim
+libakregatorpart_la_LIBADD = libakregatorprivate.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEHTML) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -L$(top_builddir)/libtdepim -ltdepim
 
 # this is where the desktop file will go
 partdesktopdir = $(kde_servicesdir)
diff --git a/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp
index 293d60ad..065d0248 100644
--- a/akregator/src/mainwindow.cpp
+++ b/akregator/src/mainwindow.cpp
@@ -237,7 +237,7 @@ bool MainWindow::queryExit()
     kdDebug() << "MainWindow::queryExit()" << endl;
     if ( !kapp->sessionSaving() )
     {
-        delete m_part; // delete that here instead of dtor to ensure nested tdehtmlparts are deleted before singleton objects like KHTMLPageCache
+        delete m_part; // delete that here instead of dtor to ensure nested tdehtmlparts are deleted before singleton objects like TDEHTMLPageCache
         m_part = 0;
     }
     else
diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp
index 19523722..63d944c6 100644
--- a/akregator/src/pageviewer.cpp
+++ b/akregator/src/pageviewer.cpp
@@ -100,7 +100,7 @@ PageViewer::PageViewer(TQWidget *parent, const char *name)
 {
     // this hack is necessary since the part looks for []HTML Settings] in
     // TDEGlobal::config() by default, which is wrong when running in Kontact
-    KHTMLSettings* s = const_cast<KHTMLSettings*> (settings());
+    TDEHTMLSettings* s = const_cast<TDEHTMLSettings*> (settings());
     s->init(Settings::self()->config());
     
     setXMLFile(locate("data", "akregator/pageviewer.rc"), true);
@@ -251,7 +251,7 @@ bool PageViewer::openURL(const KURL& url)
     updateHistoryEntry(); // update old history entry before switching to the new one
     emit started(0);
 
-    bool val = KHTMLPart::openURL(url);
+    bool val = TDEHTMLPart::openURL(url);
     
     addHistoryEntry(url); // add new URL to history
     
@@ -358,7 +358,7 @@ void PageViewer::urlSelected(const TQString &url, int button, int state, const T
 {
     if (url.startsWith(TQString::fromLatin1( "javascript:" ), /*case-sensitive=*/false) )
     {
-        KHTMLPart::urlSelected(url,button,state,_target,args);
+        TDEHTMLPart::urlSelected(url,button,state,_target,args);
     }
     else
     {
@@ -400,7 +400,7 @@ void PageViewer::slotPaletteOrFontChanged()
     // this hack is necessary since the part looks for []HTML Settings] in
     // TDEGlobal::config() by default, which is wrong when running in Kontact
     // NOTE: when running in Kontact, immediate updating doesn't work
-    KHTMLSettings* s = const_cast<KHTMLSettings*> (settings());
+    TDEHTMLSettings* s = const_cast<TDEHTMLSettings*> (settings());
     s->init(Settings::self()->config());
 }
 
diff --git a/akregator/src/tabwidget.cpp b/akregator/src/tabwidget.cpp
index 6e7527d2..492e440a 100644
--- a/akregator/src/tabwidget.cpp
+++ b/akregator/src/tabwidget.cpp
@@ -262,7 +262,7 @@ void TabWidget::slotDetachTab()
         return;
 
     KURL url;
-    KHTMLView* view = dynamic_cast<KHTMLView*>(d->currentItem);
+    TDEHTMLView* view = dynamic_cast<TDEHTMLView*>(d->currentItem);
     
     if (!view)
         return;
@@ -281,7 +281,7 @@ void TabWidget::slotCopyLinkAddress()
         return;
 
     KURL url;
-    KHTMLView* view = dynamic_cast<KHTMLView*>(d->currentItem);
+    TDEHTMLView* view = dynamic_cast<TDEHTMLView*>(d->currentItem);
     
     if (!view)
         return;
diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp
index 74f2ca2a..20cf5924 100644
--- a/akregator/src/viewer.cpp
+++ b/akregator/src/viewer.cpp
@@ -48,7 +48,7 @@
 namespace Akregator {
 
 Viewer::Viewer(TQWidget *parent, const char *name)
-    : KHTMLPart(parent, name), m_url(0)
+    : TDEHTMLPart(parent, name), m_url(0)
 {
     setZoomFactor(100);
     setMetaRefreshEnabled(true);
@@ -89,7 +89,7 @@ bool Viewer::closeURL()
 {
     emit browserExtension()->loadingProgress(-1);
     emit canceled(TQString());
-    return KHTMLPart::closeURL();
+    return TDEHTMLPart::closeURL();
 }
 
 int Viewer::pointsToPixel(int pointSize) const
@@ -162,7 +162,7 @@ void Viewer::urlSelected(const TQString &url, int button, int state, const TQStr
         }
         return;
     }
-    KHTMLPart::urlSelected(url,button,state,_target,args);
+    TDEHTMLPart::urlSelected(url,button,state,_target,args);
 }
 
 void Viewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kurl, const KParts::URLArgs&, KParts::BrowserExtension::PopupFlags kpf, mode_t)
diff --git a/akregator/src/viewer.h b/akregator/src/viewer.h
index d1d407f9..af89fee2 100644
--- a/akregator/src/viewer.h
+++ b/akregator/src/viewer.h
@@ -36,7 +36,7 @@ namespace TDEIO
 
 namespace Akregator
 {
-    class Viewer : public KHTMLPart
+    class Viewer : public TDEHTMLPart
     {
         Q_OBJECT
   
diff --git a/cmake b/cmake
-Subproject 9a217903f9fa35ca12213a6e9ee3d2cb87d1131
+Subproject 274366fb8b90704586d7beef216b765cc0688b0
diff --git a/kaddressbook/Makefile.am b/kaddressbook/Makefile.am
index 4b2d1bef..b411e618 100644
--- a/kaddressbook/Makefile.am
+++ b/kaddressbook/Makefile.am
@@ -45,7 +45,7 @@ libkaddressbook_la_LIBADD = $(top_builddir)/kaddressbook/printing/libprinter.la
                             $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \
                             $(top_builddir)/libtdepim/libtdepim.la \
                             $(top_builddir)/libkcal/libkcal.la \
-                            -lkabc_file $(LIB_KABC) $(LIB_KHTML) \
+                            -lkabc_file $(LIB_KABC) $(LIB_TDEHTML) \
                             $(top_builddir)/kaddressbook/common/libkabcommon.la \
                             $(top_builddir)/kaddressbook/editors/libkabim.la \
                             -ltdeprint
diff --git a/kitchensync/src/Makefile.am b/kitchensync/src/Makefile.am
index 779aec82..e04755d4 100644
--- a/kitchensync/src/Makefile.am
+++ b/kitchensync/src/Makefile.am
@@ -32,7 +32,7 @@ libkitchensync_la_SOURCES = aboutpage.cpp mainwidget.cpp groupconfigdialog.cpp \
                             configguijescs.cpp configguievo2.cpp configguimoto.cpp configguisynce.cpp \
                             configguisunbird.cpp
 libkitchensync_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
-libkitchensync_la_LIBADD = $(LIB_KIO) $(LIB_KHTML) $(top_builddir)/kitchensync/libqopensync/libqopensync.la \
+libkitchensync_la_LIBADD = $(LIB_KIO) $(LIB_TDEHTML) $(top_builddir)/kitchensync/libqopensync/libqopensync.la \
                            $(LIB_KABC) $(top_builddir)/libtdepim/libtdepim.la $(top_builddir)/libkcal/libkcal.la \
                            $(LIB_QT)
 
@@ -41,7 +41,7 @@ kde_module_LTLIBRARIES = libkitchensyncpart.la
 
 libkitchensyncpart_la_SOURCES = part.cpp
 libkitchensyncpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkitchensyncpart_la_LIBADD = $(LIB_KPARTS) libkitchensync.la $(LIB_QT) $(LIB_KIO) $(LIB_KHTML) $(LIB_KABC) $(LIB_TDECORE) $(LIB_TDEUI)
+libkitchensyncpart_la_LIBADD = $(LIB_KPARTS) libkitchensync.la $(LIB_QT) $(LIB_KIO) $(LIB_TDEHTML) $(LIB_KABC) $(LIB_TDECORE) $(LIB_TDEUI)
 
 # Resources
 kitchensyncdatadir = $(kde_datadir)/kitchensync
diff --git a/kitchensync/src/aboutpage.cpp b/kitchensync/src/aboutpage.cpp
index 50f4d1de..b337fbba 100644
--- a/kitchensync/src/aboutpage.cpp
+++ b/kitchensync/src/aboutpage.cpp
@@ -61,7 +61,7 @@ AboutPage::AboutPage( TQWidget *parent )
   else
     content = content.arg( "" );
 
-  KHTMLPart *part = new KHTMLPart( this );
+  TDEHTMLPart *part = new TDEHTMLPart( this );
   layout->addWidget( part->view() );
 
   part->begin( KURL( location ) );
diff --git a/kmail/Mainpage.dox b/kmail/Mainpage.dox
index 42201dad..3121e2d9 100644
--- a/kmail/Mainpage.dox
+++ b/kmail/Mainpage.dox
@@ -776,7 +776,7 @@ What happens when a message is to displayed in the reader window?
   new way - by using AttachmentStrategy::Hidden). The HTML generation
   is delegated to BodyPartFormatters, while the HTML is written to
   HTMLWriters, which abstract away HTML sinks. One of those is
-  KHTMLPartHTMLWriter, which writes to the KHTMLPart in the
+  TDEHTMLPartHTMLWriter, which writes to the TDEHTMLPart in the
   readerwindow. This is the current state of the code. The goal of the
   ongoing refactoring is to make the HTML generation blissfully
   ignorant of the readerwindow and to allow display plugins that can
diff --git a/kmail/Makefile.am b/kmail/Makefile.am
index 5f8cc6e4..1f398140 100644
--- a/kmail/Makefile.am
+++ b/kmail/Makefile.am
@@ -32,7 +32,7 @@ libkmailprivate_la_LIBADD = \
         ../libksieve/libksieve.la ../libemailfunctions/libemailfunctions.la \
         ../certmanager/lib/libkleopatra.la $(INDEXLIB) \
         ../libkcal/libkcal.la \
-        $(LIB_KHTML) $(LIB_KSPELL) $(LIB_KABC)
+        $(LIB_TDEHTML) $(LIB_KSPELL) $(LIB_KABC)
 
 kde_module_LTLIBRARIES = kcm_kmail.la libkmailpart.la libkmail_bodypartformatter_application_octetstream.la
 libkmailpart_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined
diff --git a/kmail/interfaces/htmlwriter.h b/kmail/interfaces/htmlwriter.h
index 93235016..179841c1 100644
--- a/kmail/interfaces/htmlwriter.h
+++ b/kmail/interfaces/htmlwriter.h
@@ -64,7 +64,7 @@ namespace KMail {
    * @deprecated KMail should be ported to Interface::HtmlWriter. This
    * interface exposes internal working models. The queueing
    * vs. writing() issues exposed here should be hidden by using two
-   * different implementations of KHTMLPartHtmlWriter: one for
+   * different implementations of TDEHTMLPartHtmlWriter: one for
    * queueing, and one for writing. This should be fixed before the
    * release, so we an keep the plugin interface stable.
    *
diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp
index 5b4f8cf9..da63f203 100644
--- a/kmail/kmmessage.cpp
+++ b/kmail/kmmessage.cpp
@@ -800,7 +800,7 @@ TQString KMMessage::asPlainTextFromObjectTree( partNode *root, bool aStripSignat
 
   // html -> plaintext conversion, if necessary:
   if ( isHTML && mDecodeHTML ) {
-    KHTMLPart htmlPart;
+    TDEHTMLPart htmlPart;
     htmlPart.setOnlyLocalReferences( true );
     htmlPart.setMetaRefreshEnabled( false );
     htmlPart.setPluginsEnabled( false );
diff --git a/kmail/kmmessage.h b/kmail/kmmessage.h
index 5045b0e6..a1600657 100644
--- a/kmail/kmmessage.h
+++ b/kmail/kmmessage.h
@@ -678,7 +678,7 @@ public:
   static TQString generateMessageId( const TQString& addr );
 
   /** Convert '<' into "&lt;" resp. '>' into "&gt;" in order to
-    * prevent their interpretation by KHTML.
+    * prevent their interpretation by TDEHTML.
     * Does *not* use the TQt replace function but runs a very fast C code
     * the same way as lf2crlf() does.
    */
diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp
index 2405a3e5..d1c6c0a1 100644
--- a/kmail/kmreaderwin.cpp
+++ b/kmail/kmreaderwin.cpp
@@ -393,7 +393,7 @@ void KMReaderWin::createWidgets() {
   setStyleDependantFrameWidth();
   mBox->setFrameStyle( mMimePartTree->frameStyle() );
   mColorBar = new HtmlStatusBar( mBox, "mColorBar" );
-  mViewer = new KHTMLPart( mBox, "mViewer" );
+  mViewer = new TDEHTMLPart( mBox, "mViewer" );
   mSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
   mSplitter->setResizeMode( mMimePartTree, TQSplitter::KeepSize );
 }
@@ -1033,7 +1033,7 @@ void KMReaderWin::contactStatusChanged( const TQString &uid)
     kdDebug( 5006 ) << "name is " << n.nodeName().string() << endl;
     kdDebug( 5006 ) << "value of content was " << n.firstChild().nodeValue().string() << endl;
     TQString newPresence = kmkernel->imProxy()->presenceString( uid );
-    if ( newPresence.isNull() ) // KHTML crashes if you setNodeValue( TQString() )
+    if ( newPresence.isNull() ) // TDEHTML crashes if you setNodeValue( TQString() )
       newPresence = TQString::fromLatin1( "ENOIMRUNNING" );
     n.firstChild().setNodeValue( newPresence );
 //    kdDebug( 5006 ) << "value of content is now " << n.firstChild().nodeValue().string() << endl;
@@ -2685,7 +2685,7 @@ bool KMReaderWin::eventFilter( TQObject *, TQEvent *e )
   if ( e->type() == TQEvent::MouseMove ) {
     TQMouseEvent* me = TQT_TQMOUSEEVENT( e );
 
-    // Handle this ourselves instead of connecting to mViewer::onURL(), since KHTML misses some
+    // Handle this ourselves instead of connecting to mViewer::onURL(), since TDEHTML misses some
     // notifications in case we started a drag ourselves
     slotUrlOn( linkForNode( mViewer->nodeUnderMouse() ) );
 
@@ -2695,7 +2695,7 @@ bool KMReaderWin::eventFilter( TQObject *, TQEvent *e )
           mCanStartDrag = false;
           slotUrlOn( TQString() );
 
-          // HACK: Send a mouse release event to the KHTMLView, as otherwise that will be missed in
+          // HACK: Send a mouse release event to the TDEHTMLView, as otherwise that will be missed in
           //       case we started a drag. If the event is missed, the HTML view gets into a wrong
           //       state, in which funny things like unsolicited drags start to happen.
           TQMouseEvent mouseEvent( TQEvent::MouseButtonRelease, me->pos(), Qt::NoButton, Qt::NoButton );
diff --git a/kmail/kmreaderwin.h b/kmail/kmreaderwin.h
index b8dd3f9f..96199452 100644
--- a/kmail/kmreaderwin.h
+++ b/kmail/kmreaderwin.h
@@ -35,7 +35,7 @@ class KSelectAction;
 class KRadioAction;
 class KToggleAction;
 class TDEConfigBase;
-class KHTMLPart;
+class TDEHTMLPart;
 class KURL;
 
 class KMFolder;
@@ -239,7 +239,7 @@ public:
   bool isFixedFont() { return mUseFixedFont; }
   void setUseFixedFont( bool useFixedFont ) { mUseFixedFont = useFixedFont; }
 
-  /** Return the HtmlWriter connected to the KHTMLPart we use */
+  /** Return the HtmlWriter connected to the TDEHTMLPart we use */
   KMail::HtmlWriter * htmlWriter() { return mHtmlWriter; }
 
   // Action to reply to a message
@@ -279,9 +279,9 @@ public:
 
   void setUpdateAttachment( bool update = true ) { mAtmUpdate = update; }
 
-  /** Access to the KHTMLPart used for the viewer. Use with
+  /** Access to the TDEHTMLPart used for the viewer. Use with
       care! */
-  KHTMLPart * htmlPart() const { return mViewer; }
+  TDEHTMLPart * htmlPart() const { return mViewer; }
 
   /** Returns the current message or 0 if none. */
   KMMessage* message(KMFolder** folder=0) const;
@@ -554,7 +554,7 @@ private:
   TQHBox *mBox;
   KMail::HtmlStatusBar *mColorBar;
   KMMimePartTree* mMimePartTree;
-  KHTMLPart *mViewer;
+  TDEHTMLPart *mViewer;
 
   const KMail::AttachmentStrategy * mAttachmentStrategy;
   const KMail::HeaderStrategy * mHeaderStrategy;
diff --git a/kmail/tdehtmlparthtmlwriter.cpp b/kmail/tdehtmlparthtmlwriter.cpp
index 7321e128..5450509e 100644
--- a/kmail/tdehtmlparthtmlwriter.cpp
+++ b/kmail/tdehtmlparthtmlwriter.cpp
@@ -46,7 +46,7 @@
 
 namespace KMail {
 
-  KHtmlPartHtmlWriter::KHtmlPartHtmlWriter( KHTMLPart * part,
+  KHtmlPartHtmlWriter::KHtmlPartHtmlWriter( TDEHTMLPart * part,
 					    TQObject * parent, const char * name )
     : TQObject( parent, name ), HtmlWriter(),
       mHtmlPart( part ), mHtmlTimer( 0, "mHtmlTimer" ), mState( Ended )
diff --git a/kmail/tdehtmlparthtmlwriter.h b/kmail/tdehtmlparthtmlwriter.h
index 52f16fd4..5d9af2e1 100644
--- a/kmail/tdehtmlparthtmlwriter.h
+++ b/kmail/tdehtmlparthtmlwriter.h
@@ -29,8 +29,8 @@
     your version.
 */
 
-#ifndef __KMAIL_KHTMLPARTHTMLWRITER_H__
-#define __KMAIL_KHTMLPARTHTMLWRITER_H__
+#ifndef __KMAIL_TDEHTMLPARTHTMLWRITER_H__
+#define __KMAIL_TDEHTMLPARTHTMLWRITER_H__
 
 #include "interfaces/htmlwriter.h"
 #include <tqobject.h>
@@ -39,7 +39,7 @@
 #include <tqtimer.h>
 
 class TQString;
-class KHTMLPart;
+class TDEHTMLPart;
 
 namespace KMail {
 
@@ -49,7 +49,7 @@ namespace KMail {
   public:
     // Key is Content-Id, value is URL
     typedef TQMap<TQString, TQString> EmbeddedPartMap;
-    KHtmlPartHtmlWriter( KHTMLPart * part,
+    KHtmlPartHtmlWriter( TDEHTMLPart * part,
 			 TQObject * parent=0, const char * name = 0 );
     virtual ~KHtmlPartHtmlWriter();
 
@@ -68,7 +68,7 @@ namespace KMail {
     void resolveCidUrls();
 
   private:
-    KHTMLPart * mHtmlPart;
+    TDEHTMLPart * mHtmlPart;
     TQStringList mHtmlQueue;
     TQTimer mHtmlTimer;
     enum State {
@@ -81,4 +81,4 @@ namespace KMail {
 
 } // namespace KMail
 
-#endif // __KMAIL_KHTMLPARTHTMLWRITER_H__
+#endif // __KMAIL_TDEHTMLPARTHTMLWRITER_H__
diff --git a/kmobile/tdeioslave/kio_mobile.cpp b/kmobile/tdeioslave/tdeio_mobile.cpp
index bb70b264..bb70b264 100644
--- a/kmobile/tdeioslave/kio_mobile.cpp
+++ b/kmobile/tdeioslave/tdeio_mobile.cpp
diff --git a/kmobile/tdeioslave/kio_mobile.h b/kmobile/tdeioslave/tdeio_mobile.h
index 05a30a22..05a30a22 100644
--- a/kmobile/tdeioslave/kio_mobile.h
+++ b/kmobile/tdeioslave/tdeio_mobile.h
diff --git a/knode/Makefile.am b/knode/Makefile.am
index 7d043e7b..74981dfb 100644
--- a/knode/Makefile.am
+++ b/knode/Makefile.am
@@ -26,7 +26,7 @@ kcm_knode_la_LIBADD = libknodecommon.la $(LIB_TDECORE)
 knconfigpages.lo: smtpaccountwidget_base.h
 
 libknodecommon_la_LDFLAGS = -version-info 3:0:0 -no-undefined $(all_libraries)
-libknodecommon_la_LIBADD = $(top_builddir)/libkmime/libkmime.la $(top_builddir)/libkpgp/libkpgp.la $(top_builddir)/libtdepim/libtdepim.la $(LIB_KSPELL) $(LIB_KABC) $(LIB_KFILE) $(LIB_KUTILS) $(LIBRESOLV) $(LIB_KHTML)
+libknodecommon_la_LIBADD = $(top_builddir)/libkmime/libkmime.la $(top_builddir)/libkpgp/libkpgp.la $(top_builddir)/libtdepim/libtdepim.la $(LIB_KSPELL) $(LIB_KABC) $(LIB_KFILE) $(LIB_KUTILS) $(LIBRESOLV) $(LIB_TDEHTML)
 libknodecommon_la_SOURCES =   knconfigmanager.cpp \
                   knconfig.cpp \
                   knconfigwidgets.cpp \
diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp
index ae4ab2cb..91ba87ac 100644
--- a/knode/articlewidget.cpp
+++ b/knode/articlewidget.cpp
@@ -96,7 +96,7 @@ ArticleWidget::ArticleWidget( TQWidget *parent,
   mInstances.append( this );
 
   TQHBoxLayout *box = new TQHBoxLayout( this );
-  mViewer = new KHTMLPart( this, "mViewer" );
+  mViewer = new TDEHTMLPart( this, "mViewer" );
   box->addWidget( mViewer->widget() );
   mViewer->widget()->setFocusPolicy( TQ_WheelFocus );
   mViewer->setPluginsEnabled( false );
@@ -1105,7 +1105,7 @@ void ArticleWidget::cleanup()
 
 bool ArticleWidget::atBottom() const
 {
-  const KHTMLView *view = mViewer->view();
+  const TDEHTMLView *view = mViewer->view();
   return view->contentsY() + view->visibleHeight() >= view->contentsHeight();
 }
 
diff --git a/knode/articlewidget.h b/knode/articlewidget.h
index da2968e8..2a508ee7 100644
--- a/knode/articlewidget.h
+++ b/knode/articlewidget.h
@@ -30,7 +30,7 @@ class TQTimer;
 class KAction;
 class KActionCollection;
 class KActionMenu;
-class KHTMLPart;
+class TDEHTMLPart;
 class KURL;
 class KSelectAction;
 class KToggleAction;
@@ -221,7 +221,7 @@ class ArticleWidget : public TQWidget, public KNJobConsumer {
     /// mapping of temporary file names to part numbers
     TQMap<TQString, int> mAttachementMap;
 
-    KHTMLPart *mViewer;
+    TDEHTMLPart *mViewer;
     CSSHelper *mCSSHelper;
 
     TQStringList mTempDirs, mTempFiles;
diff --git a/kontact/src/Makefile.am b/kontact/src/Makefile.am
index daec1fa3..96513a5a 100644
--- a/kontact/src/Makefile.am
+++ b/kontact/src/Makefile.am
@@ -13,7 +13,7 @@ kontact_METASOURCES = AUTO
 kontact_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kontact_LDADD = $(top_builddir)/libtdepim/libtdepim.la \
   $(top_builddir)/kontact/interfaces/libkpinterfaces.la libkontact.la \
-  $(LIB_KPARTS) $(LIB_KUTILS) $(LIB_KHTML)
+  $(LIB_KPARTS) $(LIB_KUTILS) $(LIB_TDEHTML)
 kontact_SOURCES = main.cpp mainwindow.cpp sidepanebase.cpp \
   iconsidepane.cpp aboutdialog.cpp profilemanager.cpp profiledialog.cpp \
   kontactiface.skel
diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index e914fe07..ec1e6b0b 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -312,7 +312,7 @@ void MainWindow::initAboutScreen()
   TQHBox *introbox = new TQHBox( mPartsStack );
   mPartsStack->addWidget( introbox );
   mPartsStack->raiseWidget( introbox );
-  mIntroPart = new KHTMLPart( introbox );
+  mIntroPart = new TDEHTMLPart( introbox );
   mIntroPart->widget()->setFocusPolicy( TQ_WheelFocus );
   // Let's better be paranoid and disable plugins (it defaults to enabled):
   mIntroPart->setPluginsEnabled( false );
diff --git a/kontact/src/mainwindow.h b/kontact/src/mainwindow.h
index de23b19a..e9ddc121 100644
--- a/kontact/src/mainwindow.h
+++ b/kontact/src/mainwindow.h
@@ -46,7 +46,7 @@ class KAction;
 class TDEConfig;
 class KPluginInfo;
 class KRSqueezedTextLabel;
-class KHTMLPart;
+class TDEHTMLPart;
 class KeyPressEater;
 
 namespace KPIM
@@ -156,7 +156,7 @@ class MainWindow : public Kontact::Core, public KDCOPServiceStarter, public Kont
     PluginList mDelayedPreload;
     ActionPluginList mActionPlugins;
     TQValueList<KPluginInfo*> mPluginInfos;
-    KHTMLPart *mIntroPart;
+    TDEHTMLPart *mIntroPart;
 
     KRSqueezedTextLabel* mStatusMsgLabel;
     KPIM::StatusbarProgressWidget *mLittleProgress;
diff --git a/korganizer/Makefile.am b/korganizer/Makefile.am
index 59daa828..fed0db81 100644
--- a/korganizer/Makefile.am
+++ b/korganizer/Makefile.am
@@ -29,7 +29,7 @@ kcm_korganizer_la_LIBADD = libkorganizer.la $(top_builddir)/libtdepim/libtdepim.
 kcm_korganizer_la_COMPILE_FIRST = koprefs_base.h 	kogroupwareprefspage.h
 
 libkorganizerpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-libkorganizerpart_la_LIBADD  = libkorganizer.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KPARTS) $(LIB_KIO) $(LIB_KHTML) $(LIB_TDEUI) -L$(top_builddir)/libtdepim/ -ltdepim -L$(top_builddir)/libkcal/ -lkcal -lkorganizer_calendar
+libkorganizerpart_la_LIBADD  = libkorganizer.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KPARTS) $(LIB_KIO) $(LIB_TDEHTML) $(LIB_TDEUI) -L$(top_builddir)/libtdepim/ -ltdepim -L$(top_builddir)/libkcal/ -lkcal -lkorganizer_calendar
 libkorganizerpart_la_SOURCES = korganizer_part.cpp
 libkorganizerpart_la_COMPILE_FIRST = publishdialog_base.h koprefs_base.h
 
diff --git a/korn/kio_count.cpp b/korn/tdeio_count.cpp
index 1531a9b9..1531a9b9 100644
--- a/korn/kio_count.cpp
+++ b/korn/tdeio_count.cpp
diff --git a/korn/kio_count.h b/korn/tdeio_count.h
index e575864e..e575864e 100644
--- a/korn/kio_count.h
+++ b/korn/tdeio_count.h
diff --git a/korn/kio_delete.cpp b/korn/tdeio_delete.cpp
index a73b0dd4..a73b0dd4 100644
--- a/korn/kio_delete.cpp
+++ b/korn/tdeio_delete.cpp
diff --git a/korn/kio_delete.h b/korn/tdeio_delete.h
index c084a58d..c084a58d 100644
--- a/korn/kio_delete.h
+++ b/korn/tdeio_delete.h
diff --git a/korn/kio_proto.cpp b/korn/tdeio_proto.cpp
index e63a7166..e63a7166 100644
--- a/korn/kio_proto.cpp
+++ b/korn/tdeio_proto.cpp
diff --git a/korn/kio_proto.h b/korn/tdeio_proto.h
index 510e97d3..510e97d3 100644
--- a/korn/kio_proto.h
+++ b/korn/tdeio_proto.h
diff --git a/korn/kio_read.cpp b/korn/tdeio_read.cpp
index f98669d8..f98669d8 100644
--- a/korn/kio_read.cpp
+++ b/korn/tdeio_read.cpp
diff --git a/korn/kio_read.h b/korn/tdeio_read.h
index 3b1ddec8..3b1ddec8 100644
--- a/korn/kio_read.h
+++ b/korn/tdeio_read.h
diff --git a/korn/kio_single_subject.cpp b/korn/tdeio_single_subject.cpp
index 0c20b1ab..0c20b1ab 100644
--- a/korn/kio_single_subject.cpp
+++ b/korn/tdeio_single_subject.cpp
diff --git a/korn/kio_single_subject.h b/korn/tdeio_single_subject.h
index 9aac8baa..9aac8baa 100644
--- a/korn/kio_single_subject.h
+++ b/korn/tdeio_single_subject.h
diff --git a/korn/kio_subjects.cpp b/korn/tdeio_subjects.cpp
index f40a86f6..f40a86f6 100644
--- a/korn/kio_subjects.cpp
+++ b/korn/tdeio_subjects.cpp
diff --git a/korn/kio_subjects.h b/korn/tdeio_subjects.h
index 018369de..018369de 100644
--- a/korn/kio_subjects.h
+++ b/korn/tdeio_subjects.h
diff --git a/libtdepim/csshelper.cpp b/libtdepim/csshelper.cpp
index d2180e1a..d3c64809 100644
--- a/libtdepim/csshelper.cpp
+++ b/libtdepim/csshelper.cpp
@@ -509,7 +509,7 @@ namespace KPIM {
                "  padding: 0px ! important;\n"
                "  font-size:0.8em ! important;\n"
                "  border:1px solid %6 ! important;\n"
-               // FIXME: InfoBackground crashes KHTML
+               // FIXME: InfoBackground crashes TDEHTML
                //"  background-color:InfoBackground ! important;\n"
                "  background-color:%5 ! important;\n"
                "}\n\n"