20 files changed, 76 insertions, 76 deletions
diff --git a/quanta/ChangeLog b/quanta/ChangeLog
index daad1d2a..9d1dc833 100644
--- a/quanta/ChangeLog
+++ b/quanta/ChangeLog
@@ -544,7 +544,7 @@ bugfixes might not be listed here.
 	  ShowToolTips entry; inline editing of descriptions; save and reload the tree state; improved D&D)
 	- support for tgz site templates. Site templates are tgz files that can be extracted
 	  to an user defined directory.
-	- added possibility to configure the preview part (has effect on the whole KHTML, including
+	- added possibility to configure the preview part (has effect on the whole TDEHTML, including
 	  Konqueror!)
 
 
diff --git a/quanta/DESIGN b/quanta/DESIGN
index c2b6e68b..892c2c8b 100644
--- a/quanta/DESIGN
+++ b/quanta/DESIGN
@@ -260,7 +260,7 @@ SpellChecker: Quanta specific spellchecker. Not a real QuantaPlugin and most pro
 ------------------
 - KParts used inside Quanta.
 
-WHTMLPart: simple KHTML based class which can display HTML pages. Used in preview
+WHTMLPart: simple TDEHTML based class which can display HTML pages. Used in preview
                     and documentation.
 
 kafka directory: VPL related classes
diff --git a/quanta/Quanta-3.3-plan.kno b/quanta/Quanta-3.3-plan.kno
index fc22ca65..05416463 100644
--- a/quanta/Quanta-3.3-plan.kno
+++ b/quanta/Quanta-3.3-plan.kno
@@ -15,7 +15,7 @@
 <p>More things should be exported to DCOP<br />* CSS selectors<br />* DTEP Groups?</p>
 </body></html>
 
-\NewEntry 1 KHTML
+\NewEntry 1 TDEHTML
 <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:sans-serif">
 <p>Use XSLT file indicated in (enhanced) project file to preview XML</p>
 </body></html>
diff --git a/quanta/components/csseditor/csseditor.cpp b/quanta/components/csseditor/csseditor.cpp
index a157adae..b684030d 100644
--- a/quanta/components/csseditor/csseditor.cpp
+++ b/quanta/components/csseditor/csseditor.cpp
@@ -193,7 +193,7 @@ void CSSEditor::initialize(){
   m_myhi = new TQMyHighlighter(display);
 
   TQBoxLayout *fPreviewLayout = new TQBoxLayout(fPreview,TQBoxLayout::LeftToRight);
-  m_previewer=new KHTMLPart(fPreview);
+  m_previewer=new TDEHTMLPart(fPreview);
 
   fPreviewLayout->addWidget(m_previewer->view());
 
diff --git a/quanta/components/csseditor/csseditor.h b/quanta/components/csseditor/csseditor.h
index fa9e3339..0df95553 100644
--- a/quanta/components/csseditor/csseditor.h
+++ b/quanta/components/csseditor/csseditor.h
@@ -27,7 +27,7 @@
 
 class propertySetter;
 class TDEConfig;
-class KHTMLPart;
+class TDEHTMLPart;
 class TQListViewItem;
 class TQDomNodeList;
 class TQVariant;
@@ -61,7 +61,7 @@ class CSSEditor : public CSSEditorS
     TQMyHighlighter *m_myhi;
     propertySetter *m_ps;
     myCheckListItem *m_currentProp;
-    KHTMLPart *m_previewer;
+    TDEHTMLPart *m_previewer;
     TQDomDocument m_doc;
     TQMap<TQString,TQString> m_properties;
     TQString m_selectorName,
diff --git a/quanta/components/framewizard/selectablearea.cpp b/quanta/components/framewizard/selectablearea.cpp
index c168e323..1139d658 100644
--- a/quanta/components/framewizard/selectablearea.cpp
+++ b/quanta/components/framewizard/selectablearea.cpp
@@ -20,7 +20,7 @@
 //#include <kdebug.h>
 #include "fwglobal.h"
 
-SelectableArea::SelectableArea(TQWidget *parent, const char *name ) : KHTMLPart(parent,name) {
+SelectableArea::SelectableArea(TQWidget *parent, const char *name ) : TDEHTMLPart(parent,name) {
   view()->setFrameShape(TQFrame::NoFrame);
   view()->setMinimumSize(TQSize(1,1));
   view()->installEventFilter(this);
@@ -50,7 +50,7 @@ bool SelectableArea::eventFilter(TQObject *o, TQEvent *event){
                                           return true;
                                          }
                                          break;
-      default: return KHTMLPart::eventFilter( o, event );
+      default: return TDEHTMLPart::eventFilter( o, event );
   }
 }
 
diff --git a/quanta/components/framewizard/selectablearea.h b/quanta/components/framewizard/selectablearea.h
index 3eacaf4f..0efccc72 100644
--- a/quanta/components/framewizard/selectablearea.h
+++ b/quanta/components/framewizard/selectablearea.h
@@ -27,7 +27,7 @@
   */
 
 
-class SelectableArea : public KHTMLPart  {
+class SelectableArea : public TDEHTMLPart  {
    Q_OBJECT
   
 
diff --git a/quanta/data/config/quanta_preview_config.desktop b/quanta/data/config/quanta_preview_config.desktop
index a3f2e7d7..5184c3bd 100644
--- a/quanta/data/config/quanta_preview_config.desktop
+++ b/quanta/data/config/quanta_preview_config.desktop
@@ -3,42 +3,42 @@ Type=Service
 Exec=tdecmshell --caption %c %i tdehtml_behavior tdehtml_java_js tdehtml_fonts cookies cache proxy kcmcss crypto useragent tdehtml_plugins
 Icon=konqueror
 DocPath=konqueror/index.html
-Name=Configure KHTML Browser Part
-Name[ca]=Configura la part del fullejador KHTML
-Name[cs]=Nastavení KHTML Part
-Name[da]=Indstil KHTML browser-part
-Name[de]=Einrichten der KHTML-Browserkomponente
-Name[el]=Ρύθμιση του KHTML περιηγητή
-Name[es]=Configurara la parte del navegador KHTML
-Name[et]=KHTML brauseri komponendi seadistamine
-Name[eu]=Konfiguratu KHTML arakatzailearen partea
-Name[fa]=پیکربندی جزء مرورگر KHTML
-Name[fi]=KHTML selaimen komponentti
-Name[fr]=Configurer le composant de navigation KHTML
-Name[gl]=Configurar a parte do navegador KHTML
-Name[hu]=A KHTML böngészőobjektum beállításai
-Name[is]=Stilla KHTML vafrahluti
-Name[it]=Parte browser configura KHTML
-Name[ja]=KHTML ブラウザ部を設定
-Name[ka]=KHTML ბროუზერის ნაწილის კონფიგურაცია
-Name[lt]=Konfigūruoti KHTML naršyklės dalį
-Name[ms]=Selaraskan Bahagian Pelayar KHTML
-Name[nds]=KHTML-Browserkomponent inrichten
+Name=Configure TDEHTML Browser Part
+Name[ca]=Configura la part del fullejador TDEHTML
+Name[cs]=Nastavení TDEHTML Part
+Name[da]=Indstil TDEHTML browser-part
+Name[de]=Einrichten der TDEHTML-Browserkomponente
+Name[el]=Ρύθμιση του TDEHTML περιηγητή
+Name[es]=Configurara la parte del navegador TDEHTML
+Name[et]=TDEHTML brauseri komponendi seadistamine
+Name[eu]=Konfiguratu TDEHTML arakatzailearen partea
+Name[fa]=پیکربندی جزء مرورگر TDEHTML
+Name[fi]=TDEHTML selaimen komponentti
+Name[fr]=Configurer le composant de navigation TDEHTML
+Name[gl]=Configurar a parte do navegador TDEHTML
+Name[hu]=A TDEHTML böngészőobjektum beállításai
+Name[is]=Stilla TDEHTML vafrahluti
+Name[it]=Parte browser configura TDEHTML
+Name[ja]=TDEHTML ブラウザ部を設定
+Name[ka]=TDEHTML ბროუზერის ნაწილის კონფიგურაცია
+Name[lt]=Konfigūruoti TDEHTML naršyklės dalį
+Name[ms]=Selaraskan Bahagian Pelayar TDEHTML
+Name[nds]=TDEHTML-Browserkomponent inrichten
 Name[ne]=केडीई एचटीएमएल ब्राउजर भाग कन्फिगर गर्नुहोस्
-Name[nl]=KHTML Browser Part configuratie
-Name[pl]=Konfiguracja osadzalnej części przeglądarki KHTML
+Name[nl]=TDEHTML Browser Part configuratie
+Name[pl]=Konfiguracja osadzalnej części przeglądarki TDEHTML
 Name[pt]=Configurar a Parte de Navegação HTML
-Name[pt_BR]=Configurar o Componente KHTML do Navegador
-Name[ru]=Настроить компонент просмтра KHTML
-Name[sk]=Nastaviť KHTML prehliadač Part
-Name[sl]=Nastavite del brskalnika KHTML
-Name[sr]=Део за подешавање KHTML прегледача
-Name[sr@Latn]=Deo za podešavanje KHTML pregledača
-Name[sv]=Anpassa delprogrammet för webbläsning KHTML
-Name[ta]=KHTML உலாவி பகுதி உள்ளமை
-Name[tg]=Танзими қисми браузери KHTML
-Name[tr]=KHTML Tarayıcısı Parçasını Yapılandır
-Name[uk]=Налаштувати компонент перегляду KHTML
-Name[zh_CN]=配置 KHTML 浏览器部件
-Name[zh_HK]=設定 KHTML 瀏覽器元件
-Name[zh_TW]=設定 KHTML 瀏覽器 Part
+Name[pt_BR]=Configurar o Componente TDEHTML do Navegador
+Name[ru]=Настроить компонент просмтра TDEHTML
+Name[sk]=Nastaviť TDEHTML prehliadač Part
+Name[sl]=Nastavite del brskalnika TDEHTML
+Name[sr]=Део за подешавање TDEHTML прегледача
+Name[sr@Latn]=Deo za podešavanje TDEHTML pregledača
+Name[sv]=Anpassa delprogrammet för webbläsning TDEHTML
+Name[ta]=TDEHTML உலாவி பகுதி உள்ளமை
+Name[tg]=Танзими қисми браузери TDEHTML
+Name[tr]=TDEHTML Tarayıcısı Parçasını Yapılandır
+Name[uk]=Налаштувати компонент перегляду TDEHTML
+Name[zh_CN]=配置 TDEHTML 浏览器部件
+Name[zh_HK]=設定 TDEHTML 瀏覽器元件
+Name[zh_TW]=設定 TDEHTML 瀏覽器 Part
diff --git a/quanta/parts/kafka/DESIGN b/quanta/parts/kafka/DESIGN
index 2f9537a2..824ab4bb 100644
--- a/quanta/parts/kafka/DESIGN
+++ b/quanta/parts/kafka/DESIGN
@@ -5,7 +5,7 @@ This file is intented to provide some informations about the internal design of
 Summary:
 1- A bit of history.
 2- Some definitions.
-3- A quick overview of the Quanta/KHTML stuff interacting with VPL.
+3- A quick overview of the Quanta/TDEHTML stuff interacting with VPL.
 4- Basic design and interaction with Quanta.
 5- VPL Classes
 6- Synchronizations
@@ -45,7 +45,7 @@ HTML
 
 
 
-3) A quick overview of the Quanta/KHTML stuff interacting with VPL.
+3) A quick overview of the Quanta/TDEHTML stuff interacting with VPL.
 First, the most important thing: the parser. Defined in the quanta/parser/ directory, it is composed of the Node class, the Tag class, the Parser class and the QTag class. The parser reads and parses (Parser::parse) or rebuilds from an already parsed document (Parser::rebuild) a Node Tree, which is basically a DOM like representation of the document, but even closing Tags and empty text are represented (as well as server side scripting elements like PHP.) In fact, everything is put in the tree so that we can get back the original SGML/XML file from the tree. From now, I call it the Node tree. For example <html><body>text<img href="boo">  </body></html> has for Node tree:
 HTML
  *-- BODY
@@ -57,7 +57,7 @@ HTML
 The Node class handle the pointers to the parent, next, previous and first child Node. *Each* Node has a valid pointer to a Tag. The Tag takes care to remember all the information concerning the Tag itself, like the attributes, the type, etc...)
 One QTag per Element is created from the .tag files when Quanta is started. Each QTag contains all the DTD information about the Tag. E.g. the "IMG" Qtag says that it is a single Tag, and what are its attributes. You can get a QTag with QuantaCommon::tagFromDTD, but don't delete the QTag!
 
-Now to tdehtml. The class KHTMLPart is the HTML renderer widget of konqueror. It internally works with a Node Tree (another? Yep!) but these Nodes are real DOM::Nodes. (From now, I will call it the DOM::Node tree) Each of the DOM Nodes is tdehtml-internally linked to a rendering Node i.e. a change made to one DOM::Node will update the HTML rendering cf /path/to/kde/include/dom/*.h and also in the tdelibs cvs module, cf the nice tdelibs/tdehtml/DESIGN.html. WARNING about DOM::Nodes, they are just interfaces!!
+Now to tdehtml. The class TDEHTMLPart is the HTML renderer widget of konqueror. It internally works with a Node Tree (another? Yep!) but these Nodes are real DOM::Nodes. (From now, I will call it the DOM::Node tree) Each of the DOM Nodes is tdehtml-internally linked to a rendering Node i.e. a change made to one DOM::Node will update the HTML rendering cf /path/to/kde/include/dom/*.h and also in the tdelibs cvs module, cf the nice tdelibs/tdehtml/DESIGN.html. WARNING about DOM::Nodes, they are just interfaces!!
 
 
 
@@ -73,7 +73,7 @@ Then when a change is made to the source file, Parser::rebuild is called and syn
 5) VPL classes.
 VPL has several classes, but note sometimes it is not really object oriented, but I will clean up soon.
 
-* KafkaWidget(kafkahtmlpart.[h|cpp]): Derived from KHTMLPart, it uses the caret mode implemented by Leo Savernik in tdehtml (that means we don't have to care about cursor navigation). It handles every keypress in order to edit the widget (backspace/delete/return/<insertion of a letter>) and modify only the DOM::Node tree (not the Node tree).
+* KafkaWidget(kafkahtmlpart.[h|cpp]): Derived from TDEHTMLPart, it uses the caret mode implemented by Leo Savernik in tdehtml (that means we don't have to care about cursor navigation). It handles every keypress in order to edit the widget (backspace/delete/return/<insertion of a letter>) and modify only the DOM::Node tree (not the Node tree).
 
 * KafkaDocument(wkafkapart.[h|cpp]): It takes care to load the DOM::Node tree from the Node tree, and when a change is made to the DOM::Node tree, it apply it in the Node tree. It basically takes care of the synchronization of the trees.
 
@@ -83,7 +83,7 @@ VPL has several classes, but note sometimes it is not really object oriented, bu
 
 * kNodeAttrs(nodeproperties.[h|cpp]): We can easily put a link to a DOM::Node from a Node in the Node class, but the opposite is impossible (we can't derive them). So we have a link DOM::Node => kNodeAttrs => Node (thanks to a QPtrDict). And we also have some informations about the way to handle this node when editing VPL. (Be careful, one Node can be linked against several Nodes. See after.)
 
-* NodeEnhancer(nodeenhancer.[h|cpp]): It is an interface class. Its aim it to "transform" or "enhance" DOM::Nodes when DOM::Nodes are synchronized from Nodes. Sometimes it is to add some style (e.g. adding a red dotted border to FORM elements) but sometimes it is essential (e.g. KHTML won't accept a TABLE without a TBODY even if it is DTD valid, so we had to manually add a TBODY. It explain why some Nodes can point to more than 1 Nodes.)
+* NodeEnhancer(nodeenhancer.[h|cpp]): It is an interface class. Its aim it to "transform" or "enhance" DOM::Nodes when DOM::Nodes are synchronized from Nodes. Sometimes it is to add some style (e.g. adding a red dotted border to FORM elements) but sometimes it is essential (e.g. TDEHTML won't accept a TABLE without a TBODY even if it is DTD valid, so we had to manually add a TBODY. It explain why some Nodes can point to more than 1 Nodes.)
 
 * HTMLEnhancer(htmlenhancer.[h|cpp]): Derived from NodeEnhancer, it apply transformations for HTML files.
 
diff --git a/quanta/parts/kafka/Makefile.am b/quanta/parts/kafka/Makefile.am
index 3b300dcb..eaf454a7 100644
--- a/quanta/parts/kafka/Makefile.am
+++ b/quanta/parts/kafka/Makefile.am
@@ -10,7 +10,7 @@ libkafkalibrary_la_SOURCES = htmlenhancer.cpp domtreeview.cpp kafkacommon.cpp \
 
 libkafkalibrary_la_METASOURCES = AUTO
 libkafkalibrary_la_LDFLAGS = $(all_libraries)
-libkafkalibrary_la_LIBADD = $(LIB_KHTML)
+libkafkalibrary_la_LIBADD = $(LIB_TDEHTML)
 
 kafkapartdir = $(kde_datadir)/kafkapart
 kafkapart_DATA = entities
diff --git a/quanta/parts/kafka/domtreeview.cpp b/quanta/parts/kafka/domtreeview.cpp
index 0b1951f9..1ba6e467 100644
--- a/quanta/parts/kafka/domtreeview.cpp
+++ b/quanta/parts/kafka/domtreeview.cpp
@@ -27,7 +27,7 @@
 
 #include "domtreeview.moc"
 
-DOMTreeView::DOMTreeView(TQWidget *parent, KHTMLPart *currentpart, const char * name) : KListView(parent, name)
+DOMTreeView::DOMTreeView(TQWidget *parent, TDEHTMLPart *currentpart, const char * name) : KListView(parent, name)
 {
     setCaption(name);
     setRootIsDecorated(true);
@@ -137,7 +137,7 @@ void DOMTreeView::slotItemClicked(TQListViewItem *cur_item)
     }
 }
 
-KafkaDOMTreeDialog::KafkaDOMTreeDialog(TQWidget *parent, KHTMLPart *part, const char* name, bool modal, WFlags fl )
+KafkaDOMTreeDialog::KafkaDOMTreeDialog(TQWidget *parent, TDEHTMLPart *part, const char* name, bool modal, WFlags fl )
 	: TQDialog(parent, name, modal, fl)
 {
 	setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)1, 0, 0, sizePolicy().hasHeightForWidth() ) );
diff --git a/quanta/parts/kafka/domtreeview.h b/quanta/parts/kafka/domtreeview.h
index c6c22907..ba282d3b 100644
--- a/quanta/parts/kafka/domtreeview.h
+++ b/quanta/parts/kafka/domtreeview.h
@@ -40,7 +40,7 @@ class DOMTreeView : public KListView
     Q_OBJECT
   
     public:
-	DOMTreeView(TQWidget *parent, KHTMLPart *part, const char * name = 0);
+	DOMTreeView(TQWidget *parent, TDEHTMLPart *part, const char * name = 0);
 	~DOMTreeView();
         void setTitle(const TQString &str);
 	void recursive(const DOM::Node &pNode, const DOM::Node &node);
@@ -60,7 +60,7 @@ class DOMTreeView : public KListView
 	TQPtrDict<TQListViewItem> m_itemdict;
 	TQPtrDict<DOM::Node> m_nodedict;
 	DOM::Node document;
-	KHTMLPart *part;
+	TDEHTMLPart *part;
 
 };
 
@@ -69,7 +69,7 @@ class KafkaDOMTreeDialog : public TQDialog
 	Q_OBJECT
   
 public:
-	KafkaDOMTreeDialog(TQWidget *parent = 0, KHTMLPart *part = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+	KafkaDOMTreeDialog(TQWidget *parent = 0, TDEHTMLPart *part = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
 	~KafkaDOMTreeDialog();
 	DOMTreeView *domview;
 	TQGridLayout *DialogLayout;
diff --git a/quanta/parts/kafka/kafkahtmlpart.cpp b/quanta/parts/kafka/kafkahtmlpart.cpp
index ecdc1b8d..1b2ca3d2 100644
--- a/quanta/parts/kafka/kafkahtmlpart.cpp
+++ b/quanta/parts/kafka/kafkahtmlpart.cpp
@@ -85,7 +85,7 @@ public:
 
 KafkaWidget::KafkaWidget(TQWidget *parent, TQWidget *widgetParent, KafkaDocument *part,
                          const char *name)
-        : KHTMLPart(widgetParent, name, TQT_TQOBJECT(parent), name),
+        : TDEHTMLPart(widgetParent, name, TQT_TQOBJECT(parent), name),
         w(part)
 {
     m_contextPopupMenu = new TQPopupMenu();
@@ -104,7 +104,7 @@ KafkaWidget::KafkaWidget(TQWidget *parent, TQWidget *widgetParent, KafkaDocument
     setCaretMode(true);
     connect(this, TQT_SIGNAL(caretPositionChanged(const DOM::Node &, long)),
             this, TQT_SLOT(slotNewCursorPos(const DOM::Node &, long)));
-    setCaretDisplayPolicyNonFocused(KHTMLPart::CaretVisible);
+    setCaretDisplayPolicyNonFocused(TDEHTMLPart::CaretVisible);
     
     connect(this, TQT_SIGNAL(popupMenu(const TQString&, const TQPoint&)),
             this, TQT_SLOT(slotContextMenuRequested(const TQString&, const TQPoint&)));
@@ -2043,12 +2043,12 @@ void KafkaWidget::tdehtmlMouseMoveEvent(tdehtml::MouseMoveEvent *event)
     else
       view()->setCursor(TQt::arrowCursor);
 
-    KHTMLPart::tdehtmlMouseMoveEvent(event);
+    TDEHTMLPart::tdehtmlMouseMoveEvent(event);
 }
 
 void KafkaWidget::tdehtmlMouseReleaseEvent(tdehtml::MouseReleaseEvent *event)
 {
-    KHTMLPart::tdehtmlMouseReleaseEvent(event);
+    TDEHTMLPart::tdehtmlMouseReleaseEvent(event);
     if(m_currentNode.isNull() || m_currentNode.nodeName().string().lower() == "#document")
     {
         m_currentNode = w->body;
@@ -2061,7 +2061,7 @@ void KafkaWidget::tdehtmlMouseReleaseEvent(tdehtml::MouseReleaseEvent *event)
 
 void KafkaWidget::tdehtmlMousePressEvent(tdehtml::MousePressEvent *event)
 {
-    KHTMLPart::tdehtmlMousePressEvent(event);
+    TDEHTMLPart::tdehtmlMousePressEvent(event);
     if(d->m_cursorOffset == 0 && !m_currentNode.isNull() &&
             m_currentNode.nodeName().string().lower() == "body")
         putCursorAtFirstAvailableLocation();
@@ -2073,7 +2073,7 @@ void KafkaWidget::tdehtmlMousePressEvent(tdehtml::MousePressEvent *event)
 
 void KafkaWidget::tdehtmlDrawContentsEvent(tdehtml::DrawContentsEvent *event)
 {
-    KHTMLPart::tdehtmlDrawContentsEvent(event);
+    TDEHTMLPart::tdehtmlDrawContentsEvent(event);
 }
 
 void KafkaWidget::getCurrentNode(DOM::Node &_currentNode, long &offset)
diff --git a/quanta/parts/kafka/kafkahtmlpart.h b/quanta/parts/kafka/kafkahtmlpart.h
index ae7bf1e7..0fd36ff2 100644
--- a/quanta/parts/kafka/kafkahtmlpart.h
+++ b/quanta/parts/kafka/kafkahtmlpart.h
@@ -43,7 +43,7 @@ class TQPopupMenu;
  * such as typing text.
  */
 
-class KafkaWidget : public KHTMLPart
+class KafkaWidget : public TDEHTMLPart
 {
     Q_OBJECT
   
diff --git a/quanta/parts/kafka/wkafkapart.cpp b/quanta/parts/kafka/wkafkapart.cpp
index 7ef185f4..03a7a0f6 100644
--- a/quanta/parts/kafka/wkafkapart.cpp
+++ b/quanta/parts/kafka/wkafkapart.cpp
@@ -516,7 +516,7 @@ bool KafkaDocument::buildKafkaNodeFromNode(Node *node, bool insertNode)
 	Node *n, *parent;
 	int i;
 
-//     Don't create DOM::Nodes from Quanta empty nodes outside the body or inside other not allowed element, or KHTML
+//     Don't create DOM::Nodes from Quanta empty nodes outside the body or inside other not allowed element, or TDEHTML
 //     will give us problems.
     bool canInsertEmptyNode = false;
     if(node->tag->type == Tag::Empty)
diff --git a/quanta/parts/preview/whtmlpart.cpp b/quanta/parts/preview/whtmlpart.cpp
index bc39e1af..51b41628 100644
--- a/quanta/parts/preview/whtmlpart.cpp
+++ b/quanta/parts/preview/whtmlpart.cpp
@@ -35,7 +35,7 @@
 
 WHTMLPart::WHTMLPart(TQWidget *parentWidget, const char *widgetName, bool enableViewSource, 
             TQObject *parent, const char *name, GUIProfile prof)
-  : KHTMLPart(parentWidget, widgetName, parent, name, prof), m_contextMenu(0)
+  : TDEHTMLPart(parentWidget, widgetName, parent, name, prof), m_contextMenu(0)
 {
   //kdDebug(24000) << "WHTMLPart: " << parentWidget << " " << widgetName << " " << parent << " " << name << this << endl;
    hpos = 0;
@@ -44,9 +44,9 @@ WHTMLPart::WHTMLPart(TQWidget *parentWidget, const char *widgetName, bool enable
 
    konqConfig.setGroup("HTML Settings");
 
-   const KHTMLSettings * set = settings();
+   const TDEHTMLSettings * set = settings();
 
-   const_cast<KHTMLSettings*>(set)->init( &konqConfig, false );
+   const_cast<TDEHTMLSettings*>(set)->init( &konqConfig, false );
    view()->installEventFilter(this);
    
    m_enableViewSource = enableViewSource;
@@ -81,14 +81,14 @@ bool WHTMLPart::openURL(const KURL& url)
   {
     KURL previewURL = url;
     previewURL.setFileName("preview-" + url.fileName());
-    return KHTMLPart::openURL(previewURL);
+    return TDEHTMLPart::openURL(previewURL);
   } else
-    return KHTMLPart::openURL(url);
+    return TDEHTMLPart::openURL(url);
 }
 
 void  WHTMLPart::urlSelected ( const TQString &url, int button, int state, const TQString &target, KParts::URLArgs args)
 {
-  KHTMLPart::urlSelected (url, button, state, target, args);
+  TDEHTMLPart::urlSelected (url, button, state, target, args);
   KURL cURL = completeURL( url );
 //  alternative not tested but used in tdevelop !
 //  KURL cURL=KURL(baseURL(),url);
diff --git a/quanta/parts/preview/whtmlpart.h b/quanta/parts/preview/whtmlpart.h
index 2fbed22e..41212459 100644
--- a/quanta/parts/preview/whtmlpart.h
+++ b/quanta/parts/preview/whtmlpart.h
@@ -27,7 +27,7 @@ class KPopupMenu;
   *@author Dmitry Poplavsky & Alexander Yakovlev & Eric Laffoon
   */
 
-class WHTMLPart : public KHTMLPart  {
+class WHTMLPart : public TDEHTMLPart  {
    Q_OBJECT
   
 public:
diff --git a/quanta/src/Makefile.am b/quanta/src/Makefile.am
index 8227e35e..5a754911 100644
--- a/quanta/src/Makefile.am
+++ b/quanta/src/Makefile.am
@@ -30,7 +30,7 @@ quanta_LDADD = $(top_builddir)/quanta/project/libproject.la \
 	$(top_builddir)/quanta/utility/libutility.la \
 	$(top_builddir)/lib/libquantamodule.la \
 	-lkatepartinterfaces $(LIB_KNEWSTUFF) $(LIB_KAFKA) $(LIB_CVSSERVICE)  \
-	$(LIB_KMDI) $(LIBXML_LIBS) $(LIBXSLT_LIBS) $(LIB_KABC) $(LIB_KSPELL) $(LIB_KHTML) -lX11 -ltdefx
+	$(LIB_KMDI) $(LIBXML_LIBS) $(LIBXSLT_LIBS) $(LIB_KABC) $(LIB_KSPELL) $(LIB_TDEHTML) -lX11 -ltdefx
 #       $(top_builddir)/lib/compatibility/libcompat.la
 
 AM_CPPFLAGS = -I$(top_srcdir)/quanta/dialogs \
diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp
index d0e862ff..960f600a 100644
--- a/quanta/src/quanta.cpp
+++ b/quanta/src/quanta.cpp
@@ -726,7 +726,7 @@ void QuantaApp::slotRepaintPreview()
   m_previewedDocument = 0L;
   previewCopyMade = false;
 
-  KHTMLView *html = m_htmlPart->view();
+  TDEHTMLView *html = m_htmlPart->view();
   int xOffset = html->contentsX(), yOffset = html->contentsY();
 
   m_htmlPart->closeURL();
@@ -1149,7 +1149,7 @@ void QuantaApp::slotOptionsConfigureActions()
 
 void QuantaApp::slotPreviewOptions()
 {
-  KMessageBox::information(this, i18n("Changes made in the preview configuration dialog are global and have effect on every application using the KHTML part to display web pages, including Konqueror."), i18n("Warning"), "configure_preview_warning");
+  KMessageBox::information(this, i18n("Changes made in the preview configuration dialog are global and have effect on every application using the TDEHTML part to display web pages, including Konqueror."), i18n("Warning"), "configure_preview_warning");
   TDEApplication::startServiceByDesktopName("quanta_preview_config");
 }
 
diff --git a/quanta/src/quanta.h b/quanta/src/quanta.h
index abba6444..dd95cdfe 100644
--- a/quanta/src/quanta.h
+++ b/quanta/src/quanta.h
@@ -69,7 +69,7 @@ class TQListViewItem;
 class TQPopupMenu;
 
 class WHTMLPart;
-class KHTMLView;
+class TDEHTMLView;
 
 class KAction;
 class KToggleAction;