Rename KHTML and kiobuffer

18 files changed, 127 insertions, 127 deletions

diff --git a/tdehtml/html/html_baseimpl.cpp b/tdehtml/html/html_baseimpl.cpp
index 7ac3d93c9..16ca7a23b 100644
--- a/tdehtml/html/html_baseimpl.cpp
+++ b/tdehtml/html/html_baseimpl.cpp
@@ -85,7 +85,7 @@ void HTMLBodyElementImpl::parseAttribute(AttributeImpl *attr)
         break;
     }
     case ATTR_MARGINWIDTH: {
-	KHTMLView* w = getDocument()->view();
+	TDEHTMLView* w = getDocument()->view();
 	if (w)
 	    w->setMarginWidth( -1 ); // unset this, so it doesn't override the setting here
         addCSSLength(CSS_PROP_MARGIN_RIGHT, attr->value() );
@@ -95,7 +95,7 @@ void HTMLBodyElementImpl::parseAttribute(AttributeImpl *attr)
         addCSSLength(CSS_PROP_MARGIN_LEFT, attr->value() );
         break;
     case ATTR_MARGINHEIGHT: {
-	KHTMLView* w = getDocument()->view();
+	TDEHTMLView* w = getDocument()->view();
 	if (w)
 	    w->setMarginHeight( -1 ); // unset this, so it doesn't override the setting here
         addCSSLength(CSS_PROP_MARGIN_BOTTOM, attr->value());
@@ -185,7 +185,7 @@ void HTMLBodyElementImpl::insertedIntoDocument()
 {
     HTMLElementImpl::insertedIntoDocument();
 
-    KHTMLView* w = getDocument()->view();
+    TDEHTMLView* w = getDocument()->view();
     if(w && w->marginWidth() != -1) {
         TQString s;
         s.sprintf( "%d", w->marginWidth() );
@@ -351,7 +351,7 @@ void HTMLFrameElementImpl::attach()
     if (!m_render)
         return;
 
-    KHTMLView* w = getDocument()->view();
+    TDEHTMLView* w = getDocument()->view();
     if (w) {
 	// we need a unique name for every frame in the frameset. Hope that's unique enough.
 	if(name.isEmpty() || w->part()->frameExists( name.string() ) )
@@ -380,9 +380,9 @@ void HTMLFrameElementImpl::setLocation( const DOMString& str )
         return;
 
     // load the frame contents
-    KHTMLView *w = getDocument()->view();
+    TDEHTMLView *w = getDocument()->view();
     if (w) {
-	KHTMLPart *part = w->part()->findFrame(  name.string() );
+	TDEHTMLPart *part = w->part()->findFrame(  name.string() );
 	if ( part ) {
 	    part->openURL( KURL( getDocument()->completeURL( url.string() ) ) );
 	} else {
@@ -414,20 +414,20 @@ DocumentImpl* HTMLFrameElementImpl::contentDocument() const
 
     RenderPart* render = static_cast<RenderPart*>( m_render );
 
-    if(render->widget() && ::tqqt_cast<KHTMLView*>( render->widget()) )
-        return static_cast<KHTMLView*>( render->widget() )->part()->xmlDocImpl();
+    if(render->widget() && ::tqqt_cast<TDEHTMLView*>( render->widget()) )
+        return static_cast<TDEHTMLView*>( render->widget() )->part()->xmlDocImpl();
 
     return 0;
 }
 
-KHTMLPart*   HTMLFrameElementImpl::contentPart() const
+TDEHTMLPart*   HTMLFrameElementImpl::contentPart() const
 {
     if ( !m_render ) return 0;
 
     RenderPart* render = static_cast<RenderPart*>( m_render );
 
-    if(render->widget() && ::tqqt_cast<KHTMLView*>( render->widget()) )
-        return static_cast<KHTMLView*>( render->widget() )->part();
+    if(render->widget() && ::tqqt_cast<TDEHTMLView*>( render->widget()) )
+        return static_cast<TDEHTMLView*>( render->widget() )->part();
 
     return 0;
 }
@@ -688,7 +688,7 @@ void HTMLIFrameElementImpl::attach()
 
     if (m_render) {
         // we need a unique name for every frame in the frameset. Hope that's unique enough.
-        KHTMLView* w = getDocument()->view();
+        TDEHTMLView* w = getDocument()->view();
         if(w && (name.isEmpty() || w->part()->frameExists( name.string() )))
             name = DOMString(w->part()->requestFrameName());
 
diff --git a/tdehtml/html/html_baseimpl.h b/tdehtml/html/html_baseimpl.h
index 0aff3e8e1..8d7205732 100644
--- a/tdehtml/html/html_baseimpl.h
+++ b/tdehtml/html/html_baseimpl.h
@@ -33,8 +33,8 @@
 
 #include <tqscrollview.h>
 
-class KHTMLView;
-class KHTMLPart;
+class TDEHTMLView;
+class TDEHTMLPart;
 
 namespace tdehtml {
     class RenderFrameSet;
@@ -96,7 +96,7 @@ public:
     virtual void setFocus(bool);
 
     DocumentImpl* contentDocument() const;
-    KHTMLPart*    contentPart() const;
+    TDEHTMLPart*    contentPart() const;
 
     DOMString url;
     DOMString name;
diff --git a/tdehtml/html/html_blockimpl.cpp b/tdehtml/html/html_blockimpl.cpp
index 3e4585c41..47ceaa9fa 100644
--- a/tdehtml/html/html_blockimpl.cpp
+++ b/tdehtml/html/html_blockimpl.cpp
@@ -45,11 +45,11 @@ void HTMLDivElementImpl::parseAttribute(AttributeImpl *attr)
     {
         DOMString v = attr->value().lower();
         if ( strcmp( v, "middle" ) == 0 || strcmp( v, "center" ) == 0 )
-            addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_CENTER);
+            addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__TDEHTML_CENTER);
         else if (strcmp(v, "left") == 0)
-            addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_LEFT);
+            addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__TDEHTML_LEFT);
         else if (strcmp(v, "right") == 0)
-            addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_RIGHT);
+            addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__TDEHTML_RIGHT);
         else
             addCSSProperty(CSS_PROP_TEXT_ALIGN, v);
         break;
@@ -214,37 +214,37 @@ void HTMLMarqueeElementImpl::parseAttribute(AttributeImpl *attr)
             break;
         case ATTR_SCROLLAMOUNT:
             if (!attr->value().isEmpty())
-                addCSSLength(CSS_PROP__KHTML_MARQUEE_INCREMENT, attr->value());
+                addCSSLength(CSS_PROP__TDEHTML_MARQUEE_INCREMENT, attr->value());
             else
-                removeCSSProperty(CSS_PROP__KHTML_MARQUEE_INCREMENT);
+                removeCSSProperty(CSS_PROP__TDEHTML_MARQUEE_INCREMENT);
             break;
         case ATTR_SCROLLDELAY:
             if (!attr->value().isEmpty())
-                addCSSLength(CSS_PROP__KHTML_MARQUEE_SPEED, attr->value(), true);
+                addCSSLength(CSS_PROP__TDEHTML_MARQUEE_SPEED, attr->value(), true);
             else
-                removeCSSProperty(CSS_PROP__KHTML_MARQUEE_SPEED);
+                removeCSSProperty(CSS_PROP__TDEHTML_MARQUEE_SPEED);
             break;
         case ATTR_LOOP:
             if (!attr->value().isEmpty()) {
                 if (attr->value() == "-1" || strcasecmp(attr->value(), "infinite") == 0)
-                    addCSSProperty(CSS_PROP__KHTML_MARQUEE_REPETITION, CSS_VAL_INFINITE);
+                    addCSSProperty(CSS_PROP__TDEHTML_MARQUEE_REPETITION, CSS_VAL_INFINITE);
                 else
-                    addCSSLength(CSS_PROP__KHTML_MARQUEE_REPETITION, attr->value().lower(), true);
+                    addCSSLength(CSS_PROP__TDEHTML_MARQUEE_REPETITION, attr->value().lower(), true);
             }
             else
-                removeCSSProperty(CSS_PROP__KHTML_MARQUEE_REPETITION);
+                removeCSSProperty(CSS_PROP__TDEHTML_MARQUEE_REPETITION);
             break;
         case ATTR_BEHAVIOR:
             if (!attr->value().isEmpty())
-                addCSSProperty(CSS_PROP__KHTML_MARQUEE_STYLE, attr->value().lower());
+                addCSSProperty(CSS_PROP__TDEHTML_MARQUEE_STYLE, attr->value().lower());
             else
-                removeCSSProperty(CSS_PROP__KHTML_MARQUEE_STYLE);
+                removeCSSProperty(CSS_PROP__TDEHTML_MARQUEE_STYLE);
             break;
         case ATTR_DIRECTION:
             if (!attr->value().isEmpty())
-                addCSSProperty(CSS_PROP__KHTML_MARQUEE_DIRECTION, attr->value().lower());
+                addCSSProperty(CSS_PROP__TDEHTML_MARQUEE_DIRECTION, attr->value().lower());
             else
-                removeCSSProperty(CSS_PROP__KHTML_MARQUEE_DIRECTION);
+                removeCSSProperty(CSS_PROP__TDEHTML_MARQUEE_DIRECTION);
             break;
         case ATTR_TRUESPEED:
             m_minimumDelay = attr->val() ? 0 : defaultMinimumDelay;
diff --git a/tdehtml/html/html_documentimpl.cpp b/tdehtml/html/html_documentimpl.cpp
index 3aa70c196..21c3e12c5 100644
--- a/tdehtml/html/html_documentimpl.cpp
+++ b/tdehtml/html/html_documentimpl.cpp
@@ -69,7 +69,7 @@ using namespace DOM;
 using namespace tdehtml;
 
 
-HTMLDocumentImpl::HTMLDocumentImpl(DOMImplementationImpl *_implementation, KHTMLView *v)
+HTMLDocumentImpl::HTMLDocumentImpl(DOMImplementationImpl *_implementation, TDEHTMLView *v)
   : DocumentImpl(_implementation, v)
 {
 //    kdDebug( 6090 ) << "HTMLDocumentImpl constructor this = " << this << endl;
@@ -78,12 +78,12 @@ HTMLDocumentImpl::HTMLDocumentImpl(DOMImplementationImpl *_implementation, KHTML
     m_doAutoFill = false;
 
 /* dynamic history stuff to be fixed later (pfeiffer)
-    connect( KHTMLFactory::vLinks(), TQT_SIGNAL( removed( const TQString& )),
+    connect( TDEHTMLFactory::vLinks(), TQT_SIGNAL( removed( const TQString& )),
              TQT_SLOT( slotHistoryChanged() ));
 */
-    connect( KHTMLFactory::vLinks(), TQT_SIGNAL( inserted( const TQString& ) ),
+    connect( TDEHTMLFactory::vLinks(), TQT_SIGNAL( inserted( const TQString& ) ),
              TQT_SLOT( slotHistoryChanged() ));
-    connect( KHTMLFactory::vLinks(), TQT_SIGNAL( cleared()),
+    connect( TDEHTMLFactory::vLinks(), TQT_SIGNAL( cleared()),
              TQT_SLOT( slotHistoryChanged() ));
 }
 
@@ -108,7 +108,7 @@ DOMString HTMLDocumentImpl::lastModified() const
 DOMString HTMLDocumentImpl::cookie() const
 {
     long windowId = 0;
-    KHTMLView *v = view ();
+    TDEHTMLView *v = view ();
 
     if ( v && v->topLevelWidget() )
       windowId = v->topLevelWidget()->winId();
@@ -140,7 +140,7 @@ DOMString HTMLDocumentImpl::cookie() const
 void HTMLDocumentImpl::setCookie( const DOMString & value )
 {
     long windowId = 0;
-    KHTMLView *v = view ();
+    TDEHTMLView *v = view ();
 
     if ( v && v->topLevelWidget() )
       windowId = v->topLevelWidget()->winId();
diff --git a/tdehtml/html/html_documentimpl.h b/tdehtml/html/html_documentimpl.h
index 0aea47b8b..92f163076 100644
--- a/tdehtml/html/html_documentimpl.h
+++ b/tdehtml/html/html_documentimpl.h
@@ -29,7 +29,7 @@
 
 #include <tqmap.h>
 
-class KHTMLView;
+class TDEHTMLView;
 class TQString;
 
 namespace DOM {
@@ -45,7 +45,7 @@ class HTMLDocumentImpl : public DOM::DocumentImpl
 {
     Q_OBJECT
 public:
-    HTMLDocumentImpl(DOMImplementationImpl *_implementation, KHTMLView *v = 0);
+    HTMLDocumentImpl(DOMImplementationImpl *_implementation, TDEHTMLView *v = 0);
     ~HTMLDocumentImpl();
 
     virtual bool isHTMLDocument() const { return true; }
diff --git a/tdehtml/html/html_elementimpl.cpp b/tdehtml/html/html_elementimpl.cpp
index c18f19ea0..1d7995501 100644
--- a/tdehtml/html/html_elementimpl.cpp
+++ b/tdehtml/html/html_elementimpl.cpp
@@ -212,11 +212,11 @@ void HTMLElementImpl::parseAttribute(AttributeImpl *attr)
         break;
 // standard events
     case ATTR_ONCLICK:
-	setHTMLEventListener(EventImpl::KHTML_ECMA_CLICK_EVENT,
+	setHTMLEventListener(EventImpl::TDEHTML_ECMA_CLICK_EVENT,
 	    getDocument()->createHTMLEventListener(attr->value().string(), "onclick", this));
         break;
     case ATTR_ONDBLCLICK:
-	setHTMLEventListener(EventImpl::KHTML_ECMA_DBLCLICK_EVENT,
+	setHTMLEventListener(EventImpl::TDEHTML_ECMA_DBLCLICK_EVENT,
 	    getDocument()->createHTMLEventListener(attr->value().string(), "ondblclick", this));
         break;
     case ATTR_ONMOUSEDOWN:
@@ -640,7 +640,7 @@ void HTMLElementImpl::addHTMLAlignment( DOMString alignment )
     } else if ( strcasecmp( alignment, "top" ) == 0 ) {
 	propvalign = CSS_VAL_TOP;
     } else if ( strcasecmp( alignment, "middle" ) == 0 ) {
-	propvalign = CSS_VAL__KHTML_BASELINE_MIDDLE;
+	propvalign = CSS_VAL__TDEHTML_BASELINE_MIDDLE;
     } else if ( strcasecmp( alignment, "center" ) == 0 ) {
 	propvalign = CSS_VAL_MIDDLE;
     } else if ( strcasecmp( alignment, "bottom" ) == 0 ) {
diff --git a/tdehtml/html/html_formimpl.cpp b/tdehtml/html/html_formimpl.cpp
index 7e2776ad5..3f8384a97 100644
--- a/tdehtml/html/html_formimpl.cpp
+++ b/tdehtml/html/html_formimpl.cpp
@@ -53,7 +53,7 @@
 #include <kmessagebox.h>
 #include <kapplication.h>
 #include <klocale.h>
-#ifndef KHTML_NO_WALLET
+#ifndef TDEHTML_NO_WALLET
 #include <tdewallet.h>
 #endif
 #include <netaccess.h>
@@ -223,7 +223,7 @@ TQByteArray HTMLFormElementImpl::formData(bool& ok)
     for(unsigned int i=0; i < strLength; ++i) if(str[i].latin1() == ',') str[i] = space;
     const TQStringList charsets = TQStringList::split(' ', str);
     TQTextCodec* codec = 0;
-    KHTMLView *view = getDocument()->view();
+    TDEHTMLView *view = getDocument()->view();
     {
         TQStringList::ConstIterator it = charsets.begin();
         const TQStringList::ConstIterator itEnd = charsets.end();
@@ -425,7 +425,7 @@ static TQString calculateAutoFillKey(const HTMLFormElementImpl& e)
 
 void HTMLFormElementImpl::doAutoFill()
 {
-#ifndef KHTML_NO_WALLET
+#ifndef TDEHTML_NO_WALLET
     const TQString key = calculateAutoFillKey(*this);
 
     if (KWallet::Wallet::keyDoesNotExist(KWallet::Wallet::NetworkWallet(),
@@ -435,12 +435,12 @@ void HTMLFormElementImpl::doAutoFill()
 
     // assert(view())
     getDocument()->view()->part()->openWallet(this);
-#endif // KHTML_NO_WALLET
+#endif // TDEHTML_NO_WALLET
 }
 
 
 void HTMLFormElementImpl::walletOpened(KWallet::Wallet *w) {
-#ifndef KHTML_NO_WALLET
+#ifndef TDEHTML_NO_WALLET
     assert(w);
     const TQString key = calculateAutoFillKey(*this);
     if (!w->hasFolder(KWallet::Wallet::FormDataFolder())) {
@@ -463,7 +463,7 @@ void HTMLFormElementImpl::walletOpened(KWallet::Wallet *w) {
             }
         }
     }
-#endif // KHTML_NO_WALLET
+#endif // TDEHTML_NO_WALLET
 }
 
 void HTMLFormElementImpl::submitFromKeyboard()
@@ -505,8 +505,8 @@ void HTMLFormElementImpl::submitFromKeyboard()
 
 void HTMLFormElementImpl::gatherWalletData()
 {
-#ifndef KHTML_NO_WALLET
-    KHTMLView* const view = getDocument()->view();
+#ifndef TDEHTML_NO_WALLET
+    TDEHTMLView* const view = getDocument()->view();
     // check if we have any password input's
     m_walletMap.clear();
     m_havePassword = false;
@@ -529,13 +529,13 @@ void HTMLFormElementImpl::gatherWalletData()
                 m_haveTextarea = true;
         }
     }
-#endif // KHTML_NO_WALLET
+#endif // TDEHTML_NO_WALLET
 }
 
 
 bool HTMLFormElementImpl::prepareSubmit()
 {
-    KHTMLView* const view = getDocument()->view();
+    TDEHTMLView* const view = getDocument()->view();
     if(m_insubmit || !view || !view->part() || view->part()->onlyLocalReferences())
         return m_insubmit;
 
@@ -569,7 +569,7 @@ void HTMLFormElementImpl::submit(  )
 #endif
 
     bool ok;
-    KHTMLView* const view = getDocument()->view();
+    TDEHTMLView* const view = getDocument()->view();
     const TQByteArray form_data = formData(ok);
     const KURL formUrl(getDocument()->URL());
 
@@ -577,7 +577,7 @@ void HTMLFormElementImpl::submit(  )
         if (m_walletMap.isEmpty()) {
             gatherWalletData();
         }
-#ifndef KHTML_NO_WALLET
+#ifndef TDEHTML_NO_WALLET
         if (m_havePassword && !m_haveTextarea && KWallet::Wallet::isEnabled()) {
             const TQString key = calculateAutoFillKey(*this);
             const bool doesnotexist = KWallet::Wallet::keyDoesNotExist(KWallet::Wallet::NetworkWallet(), KWallet::Wallet::FormDataFolder(), key);
@@ -630,7 +630,7 @@ void HTMLFormElementImpl::submit(  )
                 }
             }
         }
-#endif // KHTML_NO_WALLET
+#endif // TDEHTML_NO_WALLET
 
         const DOMString url(tdehtml::parseURL(getAttribute(ATTR_ACTION)));
         if(m_post) {
@@ -652,7 +652,7 @@ void HTMLFormElementImpl::submit(  )
 
 void HTMLFormElementImpl::reset(  )
 {
-    KHTMLView* const view = getDocument()->view();
+    TDEHTMLView* const view = getDocument()->view();
     if(m_inreset || !view || !view->part()) return;
 
     m_inreset = true;
@@ -991,9 +991,9 @@ void HTMLGenericFormElementImpl::defaultEventHandler(EventImpl *evt)
     if (evt->target()==this && !m_disabled)
     {
         // Report focus in/out changes to the browser extension (editable widgets only)
-        KHTMLView* const view = getDocument()->view();
+        TDEHTMLView* const view = getDocument()->view();
         if (view && evt->id() == EventImpl::DOMFOCUSIN_EVENT && isEditable() && m_render && m_render->isWidget()) {
-            KHTMLPartBrowserExtension *ext = static_cast<KHTMLPartBrowserExtension *>(view->part()->browserExtension());
+            TDEHTMLPartBrowserExtension *ext = static_cast<TDEHTMLPartBrowserExtension *>(view->part()->browserExtension());
             TQWidget* const widget = static_cast<RenderWidget*>(m_render)->widget();
             if (ext)
                 ext->editableWidgetFocused(widget);
@@ -1038,7 +1038,7 @@ void HTMLGenericFormElementImpl::defaultEventHandler(EventImpl *evt)
 
 
 	if (view && evt->id() == EventImpl::DOMFOCUSOUT_EVENT && isEditable() && m_render && m_render->isWidget()) {
-	    KHTMLPartBrowserExtension* const ext = static_cast<KHTMLPartBrowserExtension *>(view->part()->browserExtension());
+	    TDEHTMLPartBrowserExtension* const ext = static_cast<TDEHTMLPartBrowserExtension *>(view->part()->browserExtension());
 	    TQWidget* const widget = static_cast<RenderWidget*>(m_render)->widget();
 	    if (ext)
 		ext->editableWidgetBlurred(widget);
@@ -1772,7 +1772,7 @@ void HTMLInputElementImpl::defaultEventHandler(EventImpl *evt)
 		m_render->absolutePosition(offsetX,offsetY);
 		xPos = me->clientX()-offsetX;
 		yPos = me->clientY()-offsetY;
-                KHTMLView* v = getDocument()->view();
+                TDEHTMLView* v = getDocument()->view();
                 if ( v ) {
                     xPos += v->contentsX();
                     yPos += v->contentsY();
diff --git a/tdehtml/html/html_formimpl.h b/tdehtml/html/html_formimpl.h
index 6a909368a..8fe0ef1dd 100644
--- a/tdehtml/html/html_formimpl.h
+++ b/tdehtml/html/html_formimpl.h
@@ -34,7 +34,7 @@
 #include <tqcstring.h>
 #include <tqmemarray.h>
 
-class KHTMLView;
+class TDEHTMLView;
 class TQTextCodec;
 
 namespace tdehtml
diff --git a/tdehtml/html/html_headimpl.cpp b/tdehtml/html/html_headimpl.cpp
index 2bc0ae99f..347f8c262 100644
--- a/tdehtml/html/html_headimpl.cpp
+++ b/tdehtml/html/html_headimpl.cpp
@@ -175,7 +175,7 @@ void HTMLLinkElementImpl::process()
     TQString type = getAttribute(ATTR_TYPE).string().lower();
     TQString rel = getAttribute(ATTR_REL).string().lower();
 
-    KHTMLPart* part = getDocument()->view() ? getDocument()->view()->part() : 0;
+    TDEHTMLPart* part = getDocument()->view() ? getDocument()->view()->part() : 0;
 
     // IE extension: location of small icon for locationbar / bookmarks
     // Uses both "shortcut icon" and "icon"
@@ -408,7 +408,7 @@ void HTMLScriptElementImpl::evaluateScript(const TQString &URL, const DOMString
     if (m_evaluated)
         return;
 
-    KHTMLPart *part = getDocument()->part();
+    TDEHTMLPart *part = getDocument()->part();
     if (part) {
         KJSProxy *proxy = KJSProxy::proxy(part);
         if (proxy) {
diff --git a/tdehtml/html/html_headimpl.h b/tdehtml/html/html_headimpl.h
index ee9c2ad8b..8563de6a8 100644
--- a/tdehtml/html/html_headimpl.h
+++ b/tdehtml/html/html_headimpl.h
@@ -28,7 +28,7 @@
 #include "misc/loader_client.h"
 #include "css/css_stylesheetimpl.h"
 
-class KHTMLView;
+class TDEHTMLView;
 
 namespace tdehtml {
     class CachedCSSStyleSheet;
diff --git a/tdehtml/html/html_inlineimpl.cpp b/tdehtml/html/html_inlineimpl.cpp
index 829b10f7b..f403a2385 100644
--- a/tdehtml/html/html_inlineimpl.cpp
+++ b/tdehtml/html/html_inlineimpl.cpp
@@ -98,7 +98,7 @@ void HTMLAnchorElementImpl::defaultEventHandler(EventImpl *evt)
                 tdehtml::RenderImage *r = static_cast<tdehtml::RenderImage *>(img->renderer());
                 if(r && e)
                 {
-                    KHTMLView* v = getDocument()->view();
+                    TDEHTMLView* v = getDocument()->view();
                     int x = e->clientX();
                     int y = e->clientY();
                     int absx = 0;
@@ -276,7 +276,7 @@ void HTMLFontElementImpl::parseAttribute(AttributeImpl *attr)
             case  6: size = CSS_VAL_XX_LARGE; break;
             default:
                 if (num > 6)
-                    size = CSS_VAL__KHTML_XXX_LARGE;
+                    size = CSS_VAL__TDEHTML_XXX_LARGE;
                 else
                     size = CSS_VAL_XX_SMALL;
             }
diff --git a/tdehtml/html/html_objectimpl.cpp b/tdehtml/html/html_objectimpl.cpp
index b224ad687..f2cf8c1db 100644
--- a/tdehtml/html/html_objectimpl.cpp
+++ b/tdehtml/html/html_objectimpl.cpp
@@ -265,7 +265,7 @@ void HTMLAppletElementImpl::parseAttribute(AttributeImpl *attr)
 
 void HTMLAppletElementImpl::attach()
 {
-    KHTMLView* w = getDocument()->view();
+    TDEHTMLView* w = getDocument()->view();
 
 #ifndef Q_WS_QWS // FIXME?
     DOMString codeBase = getAttribute( ATTR_CODEBASE );
@@ -346,7 +346,7 @@ void HTMLEmbedElementImpl::parseAttribute(AttributeImpl *attr)
 
 void HTMLEmbedElementImpl::attach()
 {
-    KHTMLView* w = getDocument()->view();
+    TDEHTMLView* w = getDocument()->view();
 
     if (!w || !w->part()->pluginsEnabled())
         m_renderAlternative = true;
@@ -422,14 +422,14 @@ DocumentImpl* HTMLObjectElementImpl::contentDocument() const
     if ( !m_render ) return 0;
     if ( !m_render->isWidget() ) return 0;
     TQWidget* widget = static_cast<RenderWidget*>( m_render )->widget();
-    if( widget && ::tqqt_cast<KHTMLView*>( widget ) )
-        return static_cast<KHTMLView*>( widget )->part()->xmlDocImpl();
+    if( widget && ::tqqt_cast<TDEHTMLView*>( widget ) )
+        return static_cast<TDEHTMLView*>( widget )->part()->xmlDocImpl();
     return 0;
 }
 
 void HTMLObjectElementImpl::attach()
 {
-    KHTMLView* w = getDocument()->view();
+    TDEHTMLView* w = getDocument()->view();
 
     if (!w || !w->part()->pluginsEnabled())
         m_renderAlternative = true;
diff --git a/tdehtml/html/html_objectimpl.h b/tdehtml/html/html_objectimpl.h
index cc91935ca..d10e66356 100644
--- a/tdehtml/html/html_objectimpl.h
+++ b/tdehtml/html/html_objectimpl.h
@@ -28,7 +28,7 @@
 #include <tqobject.h>
 #include <tqstringlist.h>
 
-class KHTMLView;
+class TDEHTMLView;
 
 // -------------------------------------------------------------------------
 namespace DOM {
diff --git a/tdehtml/html/html_tableimpl.cpp b/tdehtml/html/html_tableimpl.cpp
index 3fc4ba757..71fe14773 100644
--- a/tdehtml/html/html_tableimpl.cpp
+++ b/tdehtml/html/html_tableimpl.cpp
@@ -63,7 +63,7 @@ HTMLTableElementImpl::HTMLTableElementImpl(DocumentImpl *doc)
     // only difference to 100% correct is that in strict mode <font> elements are propagated into tables.
     if ( getDocument()->parseMode() < DocumentImpl::Transitional ) {
         addCSSProperty( CSS_PROP_FONT_SIZE, CSS_VAL_MEDIUM );
-        addCSSProperty( CSS_PROP_COLOR, CSS_VAL__KHTML_TEXT );
+        addCSSProperty( CSS_PROP_COLOR, CSS_VAL__TDEHTML_TEXT );
     }
 }
 
@@ -627,13 +627,13 @@ void HTMLTablePartElementImpl::parseAttribute(AttributeImpl *attr)
     {
         DOMString v = attr->value();
         if ( strcasecmp( attr->value(), "middle" ) == 0 || strcasecmp( attr->value(), "center" ) == 0 )
-            addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_CENTER);
+            addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__TDEHTML_CENTER);
         else if (strcasecmp(attr->value(), "absmiddle") == 0)
             addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL_CENTER);
         else if (strcasecmp(attr->value(), "left") == 0)
-            addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_LEFT);
+            addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__TDEHTML_LEFT);
         else if (strcasecmp(attr->value(), "right") == 0)
-            addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_RIGHT);
+            addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__TDEHTML_RIGHT);
         else
             addCSSProperty(CSS_PROP_TEXT_ALIGN, v);
         break;
@@ -881,7 +881,7 @@ void HTMLTableCellElementImpl::parseAttribute(AttributeImpl *attr)
         break;
     case ATTR_NOWRAP:
         if (attr->val() != 0)
-	    addCSSProperty(CSS_PROP_WHITE_SPACE, CSS_VAL__KHTML_NOWRAP);
+	    addCSSProperty(CSS_PROP_WHITE_SPACE, CSS_VAL__TDEHTML_NOWRAP);
         else
 	    removeCSSProperty(CSS_PROP_WHITE_SPACE);
         break;
diff --git a/tdehtml/html/htmlparser.cpp b/tdehtml/html/htmlparser.cpp
index 144a9addd..f7cc1daaf 100644
--- a/tdehtml/html/htmlparser.cpp
+++ b/tdehtml/html/htmlparser.cpp
@@ -125,7 +125,7 @@ public:
  *
  */
 
-KHTMLParser::KHTMLParser( KHTMLView *_parent, DocumentImpl *doc)
+TDEHTMLParser::TDEHTMLParser( TDEHTMLView *_parent, DocumentImpl *doc)
 {
     //kdDebug( 6035 ) << "parser constructor" << endl;
 #if SPEED_DEBUG > 0
@@ -144,7 +144,7 @@ KHTMLParser::KHTMLParser( KHTMLView *_parent, DocumentImpl *doc)
     reset();
 }
 
-KHTMLParser::KHTMLParser( DOM::DocumentFragmentImpl *i, DocumentImpl *doc )
+TDEHTMLParser::TDEHTMLParser( DOM::DocumentFragmentImpl *i, DocumentImpl *doc )
 {
     HTMLWidget = 0;
     document = doc;
@@ -161,7 +161,7 @@ KHTMLParser::KHTMLParser( DOM::DocumentFragmentImpl *i, DocumentImpl *doc )
     inBody = true;
 }
 
-KHTMLParser::~KHTMLParser()
+TDEHTMLParser::~TDEHTMLParser()
 {
 #if SPEED_DEBUG > 0
     kdDebug( ) << "TIME: parsing time was = " << qt.elapsed() << endl;
@@ -175,7 +175,7 @@ KHTMLParser::~KHTMLParser()
     delete isindex;
 }
 
-void KHTMLParser::reset()
+void TDEHTMLParser::reset()
 {
     setCurrent ( document );
 
@@ -201,7 +201,7 @@ void KHTMLParser::reset()
     discard_until = 0;
 }
 
-void KHTMLParser::parseToken(Token *t)
+void TDEHTMLParser::parseToken(Token *t)
 {
     if (t->tid > 2*ID_CLOSE_TAG)
     {
@@ -310,7 +310,7 @@ static bool isTableRelatedTag(int id)
             id == ID_TH);
 }
 
-bool KHTMLParser::insertNode(NodeImpl *n, bool flat)
+bool TDEHTMLParser::insertNode(NodeImpl *n, bool flat)
 {
     int id = n->id();
 
@@ -821,7 +821,7 @@ bool KHTMLParser::insertNode(NodeImpl *n, bool flat)
 }
 
 
-NodeImpl *KHTMLParser::getElement(Token* t)
+NodeImpl *TDEHTMLParser::getElement(Token* t)
 {
     NodeImpl *n = 0;
 
@@ -911,11 +911,11 @@ NodeImpl *KHTMLParser::getElement(Token* t)
         break;
     case ID_INPUT:
         if ( t->attrs &&
-             KHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled() &&
-             KHTMLFactory::defaultHTMLSettings()->isHideAdsEnabled() &&
+             TDEHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled() &&
+             TDEHTMLFactory::defaultHTMLSettings()->isHideAdsEnabled() &&
              !strcasecmp( t->attrs->getValue( ATTR_TYPE ), "image" ) )
         {
-            if (KHTMLFactory::defaultHTMLSettings()->isAdFiltered( doc()->completeURL( tdehtml::parseURL(t->attrs->getValue(ATTR_SRC)).string() ) ))
+            if (TDEHTMLFactory::defaultHTMLSettings()->isAdFiltered( doc()->completeURL( tdehtml::parseURL(t->attrs->getValue(ATTR_SRC)).string() ) ))
                 return 0;
         }
         n = new HTMLInputElementImpl(document, form);
@@ -1038,11 +1038,11 @@ NodeImpl *KHTMLParser::getElement(Token* t)
 // images
     case ID_IMG:
         if (t->attrs&&
-            KHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled()&&
-            KHTMLFactory::defaultHTMLSettings()->isHideAdsEnabled())
+            TDEHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled()&&
+            TDEHTMLFactory::defaultHTMLSettings()->isHideAdsEnabled())
         {
             TQString url = doc()->completeURL( tdehtml::parseURL(t->attrs->getValue(ATTR_SRC)).string() );
-            if (KHTMLFactory::defaultHTMLSettings()->isAdFiltered(url))
+            if (TDEHTMLFactory::defaultHTMLSettings()->isAdFiltered(url))
                 return 0;
         }
         n = new HTMLImageElementImpl(document, form);
@@ -1200,7 +1200,7 @@ NodeImpl *KHTMLParser::getElement(Token* t)
     return n;
 }
 
-void KHTMLParser::processCloseTag(Token *t)
+void TDEHTMLParser::processCloseTag(Token *t)
 {
     // support for really broken html. Can't believe I'm supporting such crap (lars)
     switch(t->tid)
@@ -1244,7 +1244,7 @@ void KHTMLParser::processCloseTag(Token *t)
 #endif
 }
 
-bool KHTMLParser::isResidualStyleTag(int _id)
+bool TDEHTMLParser::isResidualStyleTag(int _id)
 {
     switch (_id) {
         case ID_A:
@@ -1274,7 +1274,7 @@ bool KHTMLParser::isResidualStyleTag(int _id)
     }
 }
 
-bool KHTMLParser::isAffectedByResidualStyle(int _id)
+bool TDEHTMLParser::isAffectedByResidualStyle(int _id)
 {
     if (isResidualStyleTag(_id))
         return true;
@@ -1304,7 +1304,7 @@ bool KHTMLParser::isAffectedByResidualStyle(int _id)
     }
 }
 
-void KHTMLParser::handleResidualStyleCloseTagAcrossBlocks(HTMLStackElem* elem)
+void TDEHTMLParser::handleResidualStyleCloseTagAcrossBlocks(HTMLStackElem* elem)
 {
     // Find the element that crosses over to a higher level.
     // ### For now, if there is more than one, we will only make sure we close the residual style.
@@ -1487,7 +1487,7 @@ void KHTMLParser::handleResidualStyleCloseTagAcrossBlocks(HTMLStackElem* elem)
                                                     // if it becomes necessary to do so.
 }
 
-void KHTMLParser::reopenResidualStyleTags(HTMLStackElem* elem, DOM::NodeImpl* malformedTableParent)
+void TDEHTMLParser::reopenResidualStyleTags(HTMLStackElem* elem, DOM::NodeImpl* malformedTableParent)
 {
     // Loop for each tag that needs to be reopened.
     while (elem) {
@@ -1525,7 +1525,7 @@ void KHTMLParser::reopenResidualStyleTags(HTMLStackElem* elem, DOM::NodeImpl* ma
     }
 }
 
-void KHTMLParser::pushBlock(int _id, int _level)
+void TDEHTMLParser::pushBlock(int _id, int _level)
 {
     HTMLStackElem *Elem = new HTMLStackElem(_id, _level, current, m_inline, blockStack);
 
@@ -1533,7 +1533,7 @@ void KHTMLParser::pushBlock(int _id, int _level)
     addForbidden(_id, forbiddenTag);
 }
 
-void KHTMLParser::popBlock( int _id )
+void TDEHTMLParser::popBlock( int _id )
 {
     HTMLStackElem *Elem = blockStack;
     int maxLevel = 0;
@@ -1619,7 +1619,7 @@ void KHTMLParser::popBlock( int _id )
     reopenResidualStyleTags(residualStyleStack, malformedTableParent);
 }
 
-void KHTMLParser::popOneBlock(bool delBlock)
+void TDEHTMLParser::popOneBlock(bool delBlock)
 {
     HTMLStackElem *Elem = blockStack;
 
@@ -1661,20 +1661,20 @@ void KHTMLParser::popOneBlock(bool delBlock)
         delete Elem;
 }
 
-void KHTMLParser::popInlineBlocks()
+void TDEHTMLParser::popInlineBlocks()
 {
     while(blockStack && current->isInline() && current->id() != ID_FONT)
         popOneBlock();
 }
 
-void KHTMLParser::freeBlock()
+void TDEHTMLParser::freeBlock()
 {
     while (blockStack)
         popOneBlock();
     blockStack = 0;
 }
 
-void KHTMLParser::createHead()
+void TDEHTMLParser::createHead()
 {
     if(head || !doc()->firstChild())
         return;
@@ -1692,7 +1692,7 @@ void KHTMLParser::createHead()
     }
 }
 
-NodeImpl *KHTMLParser::handleIsindex( Token *t )
+NodeImpl *TDEHTMLParser::handleIsindex( Token *t )
 {
     NodeImpl *n;
     HTMLFormElementImpl *myform = form;
@@ -1718,7 +1718,7 @@ NodeImpl *KHTMLParser::handleIsindex( Token *t )
     return n;
 }
 
-void KHTMLParser::startBody()
+void TDEHTMLParser::startBody()
 {
     if(inBody) return;
 
diff --git a/tdehtml/html/htmlparser.h b/tdehtml/html/htmlparser.h
index 660ced9e9..79f2b14c7 100644
--- a/tdehtml/html/htmlparser.h
+++ b/tdehtml/html/htmlparser.h
@@ -44,7 +44,7 @@
 #include "html/html_documentimpl.h"
 #include "html/RefPtr.h"
 
-class KHTMLView;
+class TDEHTMLView;
 class HTMLStackElem;
 
 namespace DOM {
@@ -66,12 +66,12 @@ class Token;
  * The parser for html. It receives a stream of tokens from the HTMLTokenizer, and
  * builds up the Document structure form it.
  */
-class KHTMLParser
+class TDEHTMLParser
 {
 public:
-    KHTMLParser( KHTMLView *w, DOM::DocumentImpl *i );
-    KHTMLParser( DOM::DocumentFragmentImpl *frag, DOM::DocumentImpl *doc );
-    virtual ~KHTMLParser();
+    TDEHTMLParser( TDEHTMLView *w, DOM::DocumentImpl *i );
+    TDEHTMLParser( DOM::DocumentFragmentImpl *frag, DOM::DocumentImpl *doc );
+    virtual ~TDEHTMLParser();
 
     /**
      * parses one token delivered by the tokenizer
@@ -92,7 +92,7 @@ public:
 
 protected:
 
-    KHTMLView *HTMLWidget;
+    TDEHTMLView *HTMLWidget;
     DOM::DocumentImpl *document;
 
     /*
diff --git a/tdehtml/html/htmltokenizer.cpp b/tdehtml/html/htmltokenizer.cpp
index 83bfd4bd5..62d3ffab6 100644
--- a/tdehtml/html/htmltokenizer.cpp
+++ b/tdehtml/html/htmltokenizer.cpp
@@ -69,9 +69,9 @@ static const char styleEnd [] =  "</style";
 static const char textareaEnd [] = "</textarea";
 static const char titleEnd [] = "</title";
 
-#define KHTML_ALLOC_QCHAR_VEC( N ) (TQChar*) malloc( sizeof(TQChar)*( N ) )
-#define KHTML_REALLOC_QCHAR_VEC(P, N ) (TQChar*) realloc(P, sizeof(TQChar)*( N ))
-#define KHTML_DELETE_QCHAR_VEC( P ) free((char*)( P ))
+#define TDEHTML_ALLOC_QCHAR_VEC( N ) (TQChar*) malloc( sizeof(TQChar)*( N ) )
+#define TDEHTML_REALLOC_QCHAR_VEC(P, N ) (TQChar*) realloc(P, sizeof(TQChar)*( N ))
+#define TDEHTML_DELETE_QCHAR_VEC( P ) free((char*)( P ))
 
 // Full support for MS Windows extensions to Latin-1.
 // Technically these extensions should only be activated for pages
@@ -123,14 +123,14 @@ static const char titleEnd [] = "</title";
 #endif
 // ----------------------------------------------------------------------------
 
-HTMLTokenizer::HTMLTokenizer(DOM::DocumentImpl *_doc, KHTMLView *_view)
+HTMLTokenizer::HTMLTokenizer(DOM::DocumentImpl *_doc, TDEHTMLView *_view)
 {
     view = _view;
     buffer = 0;
     scriptCode = 0;
     scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0;
     charsets = TDEGlobal::charsets();
-    parser = new KHTMLParser(_view, _doc);
+    parser = new TDEHTMLParser(_view, _doc);
     m_executingScript = 0;
     m_autoCloseTimer = 0;
     onHold = false;
@@ -145,7 +145,7 @@ HTMLTokenizer::HTMLTokenizer(DOM::DocumentImpl *_doc, DOM::DocumentFragmentImpl
     scriptCode = 0;
     scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0;
     charsets = TDEGlobal::charsets();
-    parser = new KHTMLParser( i, _doc );
+    parser = new TDEHTMLParser( i, _doc );
     m_executingScript = 0;
     m_autoCloseTimer = 0;
     onHold = false;
@@ -163,12 +163,12 @@ void HTMLTokenizer::reset()
         cachedScript.dequeue()->deref(this);
 
     if ( buffer )
-        KHTML_DELETE_QCHAR_VEC(buffer);
+        TDEHTML_DELETE_QCHAR_VEC(buffer);
     buffer = dest = 0;
     size = 0;
 
     if ( scriptCode )
-        KHTML_DELETE_QCHAR_VEC(scriptCode);
+        TDEHTML_DELETE_QCHAR_VEC(scriptCode);
     scriptCode = 0;
     scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0;
 
@@ -186,7 +186,7 @@ void HTMLTokenizer::begin()
     onHold = false;
     reset();
     size = 254;
-    buffer = KHTML_ALLOC_QCHAR_VEC( 255 );
+    buffer = TDEHTML_ALLOC_QCHAR_VEC( 255 );
     dest = buffer;
     tag = NoTag;
     pending = NonePending;
@@ -1578,10 +1578,10 @@ void HTMLTokenizer::end()
         processToken();
 
     if(buffer)
-        KHTML_DELETE_QCHAR_VEC(buffer);
+        TDEHTML_DELETE_QCHAR_VEC(buffer);
 
     if(scriptCode)
-        KHTML_DELETE_QCHAR_VEC(scriptCode);
+        TDEHTML_DELETE_QCHAR_VEC(scriptCode);
 
     scriptCode = 0;
     scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0;
@@ -1621,7 +1621,7 @@ void HTMLTokenizer::finish()
             pos = TQConstString(scriptCode, scriptCodeSize).string().find('>');
             food.setUnicode(scriptCode+pos+1, scriptCodeSize-pos-1); // deep copy
         }
-        KHTML_DELETE_QCHAR_VEC(scriptCode);
+        TDEHTML_DELETE_QCHAR_VEC(scriptCode);
         scriptCode = 0;
         scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0;
         if (script)
@@ -1720,7 +1720,7 @@ void HTMLTokenizer::enlargeBuffer(int len)
     int newsize = kMax(size*2, size+len);
     int oldoffs = (dest - buffer);
 
-    buffer = KHTML_REALLOC_QCHAR_VEC(buffer, newsize);
+    buffer = TDEHTML_REALLOC_QCHAR_VEC(buffer, newsize);
     dest = buffer + oldoffs;
     size = newsize;
 }
@@ -1728,7 +1728,7 @@ void HTMLTokenizer::enlargeBuffer(int len)
 void HTMLTokenizer::enlargeScriptBuffer(int len)
 {
     int newsize = kMax(scriptCodeMaxSize*2, scriptCodeMaxSize+len);
-    scriptCode = KHTML_REALLOC_QCHAR_VEC(scriptCode, newsize);
+    scriptCode = TDEHTML_REALLOC_QCHAR_VEC(scriptCode, newsize);
     scriptCodeMaxSize = newsize;
 }
 
diff --git a/tdehtml/html/htmltokenizer.h b/tdehtml/html/htmltokenizer.h
index 5222647d4..a79f65edf 100644
--- a/tdehtml/html/htmltokenizer.h
+++ b/tdehtml/html/htmltokenizer.h
@@ -41,7 +41,7 @@
 #include "xml/dom_docimpl.h"
 
 class KCharsets;
-class KHTMLView;
+class TDEHTMLView;
 
 namespace DOM {
     class DocumentImpl;
@@ -50,7 +50,7 @@ namespace DOM {
 
 namespace tdehtml {
     class CachedScript;
-    class KHTMLParser;
+    class TDEHTMLParser;
 
     /**
      * @internal
@@ -120,9 +120,9 @@ namespace tdehtml {
 
 class HTMLTokenizer : public Tokenizer, public CachedObjectClient
 {
-    friend class KHTMLParser;
+    friend class TDEHTMLParser;
 public:
-    HTMLTokenizer(DOM::DocumentImpl *, KHTMLView * = 0);
+    HTMLTokenizer(DOM::DocumentImpl *, TDEHTMLView * = 0);
     HTMLTokenizer(DOM::DocumentImpl *, DOM::DocumentFragmentImpl *frag);
     virtual ~HTMLTokenizer();
 
@@ -347,9 +347,9 @@ protected:
     tdehtml::TokenizerString src;
 
     KCharsets *charsets;
-    KHTMLParser *parser;
+    TDEHTMLParser *parser;
 
-    KHTMLView *view;
+    TDEHTMLView *view;
 };
 
 } // namespace