Rename KHTML and kiobuffer

29 files changed, 140 insertions, 140 deletions

diff --git a/tdehtml/dom/css_rule.h b/tdehtml/dom/css_rule.h
index 5f27e8f8a..9059eecd7 100644
--- a/tdehtml/dom/css_rule.h
+++ b/tdehtml/dom/css_rule.h
@@ -49,7 +49,7 @@ class CSSRuleImpl;
  * interface.
  *
  */
-class KHTML_EXPORT CSSRule
+class TDEHTML_EXPORT CSSRule
 {
 public:
     CSSRule();
@@ -72,7 +72,7 @@ public:
         MEDIA_RULE = 4,
         FONT_FACE_RULE = 5,
         PAGE_RULE = 6,
-	QUIRKS_RULE = 100 // KHTML CSS Extension
+	QUIRKS_RULE = 100 // TDEHTML CSS Extension
     };
 
     /**
@@ -146,7 +146,7 @@ class CSSCharsetRuleImpl;
  * be used to define the encoding of the style sheet.
  *
  */
-class KHTML_EXPORT CSSCharsetRule : public CSSRule
+class TDEHTML_EXPORT CSSCharsetRule : public CSSRule
 {
 public:
     CSSCharsetRule();
@@ -190,7 +190,7 @@ class CSSFontFaceRuleImpl;
  * rule is used to hold a set of font descriptions.
  *
  */
-class KHTML_EXPORT CSSFontFaceRule : public CSSRule
+class TDEHTML_EXPORT CSSFontFaceRule : public CSSRule
 {
 public:
     CSSFontFaceRule();
@@ -220,7 +220,7 @@ class CSSImportRuleImpl;
  * rule is used to import style rules from other style sheets.
  *
  */
-class KHTML_EXPORT CSSImportRule : public CSSRule
+class TDEHTML_EXPORT CSSImportRule : public CSSRule
 {
 public:
     CSSImportRule();
@@ -267,7 +267,7 @@ class CSSMediaRuleImpl;
  * can be used to delimit style rules for specific media types.
  *
  */
-class KHTML_EXPORT CSSMediaRule : public CSSRule
+class TDEHTML_EXPORT CSSMediaRule : public CSSRule
 {
 public:
     CSSMediaRule();
@@ -359,7 +359,7 @@ class CSSPageRuleImpl;
  * page box for paged media.
  *
  */
-class KHTML_EXPORT CSSPageRule : public CSSRule
+class TDEHTML_EXPORT CSSPageRule : public CSSRule
 {
 public:
     CSSPageRule();
@@ -408,7 +408,7 @@ class CSSStyleRuleImpl;
  * in a CSS style sheet.
  *
  */
-class KHTML_EXPORT CSSStyleRule : public CSSRule
+class TDEHTML_EXPORT CSSStyleRule : public CSSRule
 {
 public:
     CSSStyleRule();
@@ -458,7 +458,7 @@ class CSSUnknownRuleImpl;
  * not supported by this user agent.
  *
  */
-class KHTML_EXPORT CSSUnknownRule : public CSSRule
+class TDEHTML_EXPORT CSSUnknownRule : public CSSRule
 {
 public:
     CSSUnknownRule();
@@ -481,7 +481,7 @@ class StyleListImpl;
  * of an ordered collection of CSS rules.
  *
  */
-class KHTML_EXPORT CSSRuleList
+class TDEHTML_EXPORT CSSRuleList
 {
 public:
     CSSRuleList();
diff --git a/tdehtml/dom/css_stylesheet.h b/tdehtml/dom/css_stylesheet.h
index d220ffa76..884c6bec5 100644
--- a/tdehtml/dom/css_stylesheet.h
+++ b/tdehtml/dom/css_stylesheet.h
@@ -55,7 +55,7 @@ class DocumentImpl;
  * instruction </a> .
  *
  */
-class KHTML_EXPORT StyleSheet
+class TDEHTML_EXPORT StyleSheet
 {
 public:
     StyleSheet();
@@ -170,7 +170,7 @@ protected:
  * This exception is raised when a specific CSS operation is impossible
  * to perform.
  */
-class KHTML_EXPORT CSSException
+class TDEHTML_EXPORT CSSException
 {
 public:
     CSSException(unsigned short _code) { code = _code; }
@@ -204,7 +204,7 @@ class CSSRuleList;
  * content type is "text/css".
  *
  */
-class KHTML_EXPORT CSSStyleSheet : public StyleSheet
+class TDEHTML_EXPORT CSSStyleSheet : public StyleSheet
 {
 public:
     CSSStyleSheet();
@@ -306,7 +306,7 @@ class StyleSheet;
  * abstraction of an ordered collection of style sheets.
  *
  */
-class KHTML_EXPORT StyleSheetList
+class TDEHTML_EXPORT StyleSheetList
 {
 public:
     StyleSheetList();
@@ -360,7 +360,7 @@ class CSSStyleSheet;
  * strings.
  *
  */
-class KHTML_EXPORT MediaList
+class TDEHTML_EXPORT MediaList
 {
 public:
     MediaList();
@@ -444,7 +444,7 @@ protected:
 
 class LinkStyleImpl;
 
-class KHTML_EXPORT LinkStyle
+class TDEHTML_EXPORT LinkStyle
 {
 public:
     LinkStyle();
@@ -466,7 +466,7 @@ protected:
 
 class DocumentStyleImpl;
 
-class KHTML_EXPORT DocumentStyle
+class TDEHTML_EXPORT DocumentStyle
 {
 public:
     DocumentStyle();
diff --git a/tdehtml/dom/css_value.h b/tdehtml/dom/css_value.h
index 5d4a043c7..e2028feac 100644
--- a/tdehtml/dom/css_value.h
+++ b/tdehtml/dom/css_value.h
@@ -57,7 +57,7 @@ class CSSValue;
  * interface.
  *
  */
-class KHTML_EXPORT CSSStyleDeclaration
+class TDEHTML_EXPORT CSSStyleDeclaration
 {
 public:
     CSSStyleDeclaration();
@@ -240,7 +240,7 @@ class CSSValueImpl;
  * complexe value.
  *
  */
-class KHTML_EXPORT CSSValue
+class TDEHTML_EXPORT CSSValue
 {
 public:
     CSSValue();
@@ -313,7 +313,7 @@ class CSSValue;
  * of an ordered collection of CSS values.
  *
  */
-class KHTML_EXPORT CSSValueList : public CSSValue
+class TDEHTML_EXPORT CSSValueList : public CSSValue
 {
 public:
     CSSValueList();
@@ -370,7 +370,7 @@ class Rect;
  * \c CSSStyleDeclaration interface.
  *
  */
-class KHTML_EXPORT CSSPrimitiveValue : public CSSValue
+class TDEHTML_EXPORT CSSPrimitiveValue : public CSSValue
 {
 public:
     CSSPrimitiveValue();
@@ -588,7 +588,7 @@ public:
  * interface modify the style property.
  *
  */
-class KHTML_EXPORT RGBColor
+class TDEHTML_EXPORT RGBColor
 {
 public:
     RGBColor();
@@ -639,7 +639,7 @@ class RectImpl;
  * interface modify the style property.
  *
  */
-class KHTML_EXPORT Rect
+class TDEHTML_EXPORT Rect
 {
     friend class CSSPrimitiveValue;
 public:
@@ -696,7 +696,7 @@ class CounterImpl;
  * made through this interface modify the style property.
  *
  */
-class KHTML_EXPORT Counter
+class TDEHTML_EXPORT Counter
 {
     friend class CSSPrimitiveValue;
 public:
diff --git a/tdehtml/dom/dom2_events.h b/tdehtml/dom/dom2_events.h
index 285a0c10e..3b68eafaa 100644
--- a/tdehtml/dom/dom2_events.h
+++ b/tdehtml/dom/dom2_events.h
@@ -61,7 +61,7 @@ class MutationEventImpl;
  * add them manually.
  *
  */
-class KHTML_EXPORT EventListener : public DomShared {
+class TDEHTML_EXPORT EventListener : public DomShared {
 public:
     EventListener();
     virtual ~EventListener();
@@ -108,7 +108,7 @@ protected:
  * implemented by the object passed to the event listener.
  *
  */
-class KHTML_EXPORT Event {
+class TDEHTML_EXPORT Event {
     friend class Document;
     friend class NodeImpl;
     friend class DocumentImpl;
@@ -259,7 +259,7 @@ protected:
  * descriptions.
  *
  */
-class KHTML_EXPORT EventException
+class TDEHTML_EXPORT EventException
 {
 public:
     EventException(unsigned short _code);
@@ -291,7 +291,7 @@ public:
  * with User Interface events.
  *
  */
-class KHTML_EXPORT UIEvent : public Event {
+class TDEHTML_EXPORT UIEvent : public Event {
 public:
     UIEvent();
     UIEvent(const UIEvent &other);
@@ -396,7 +396,7 @@ protected:
  * obtain notification of mouse events which occur within its descendent elements.
  *
  */
-class KHTML_EXPORT MouseEvent : public UIEvent {
+class TDEHTML_EXPORT MouseEvent : public UIEvent {
 public:
     MouseEvent();
     MouseEvent(const MouseEvent &other);
@@ -552,7 +552,7 @@ protected:
  * as specified in current DOM3 Events revision. This is doing heavy emulation
  * at the moment
  */
-class KHTML_EXPORT TextEvent : public UIEvent {
+class TDEHTML_EXPORT TextEvent : public UIEvent {
 public:
     TextEvent();
     TextEvent(const TextEvent &other);
@@ -735,7 +735,7 @@ protected:
  * associated with Mutation events.
  *
  */
-class KHTML_EXPORT MutationEvent : public Event {
+class TDEHTML_EXPORT MutationEvent : public Event {
 public:
     MutationEvent();
     MutationEvent(const MutationEvent &other);
diff --git a/tdehtml/dom/dom2_range.h b/tdehtml/dom/dom2_range.h
index 290f4f48c..1f69b4a99 100644
--- a/tdehtml/dom/dom2_range.h
+++ b/tdehtml/dom/dom2_range.h
@@ -44,7 +44,7 @@ class RangeImpl;
 class DOMException;
 
 // Introduced in DOM Level 2:
-class KHTML_EXPORT RangeException {
+class TDEHTML_EXPORT RangeException {
 public:
     RangeException(unsigned short _code) { code = _code; }
     RangeException(const RangeException &other) { code = other.code; }
@@ -67,7 +67,7 @@ public:
 };
 
 
-class KHTML_EXPORT Range
+class TDEHTML_EXPORT Range
 {
     friend class DocumentImpl;
     friend class Document;
diff --git a/tdehtml/dom/dom2_traversal.h b/tdehtml/dom/dom2_traversal.h
index ea3d3521b..a1fc86bb3 100644
--- a/tdehtml/dom/dom2_traversal.h
+++ b/tdehtml/dom/dom2_traversal.h
@@ -57,7 +57,7 @@ class CustomNodeFilterImpl;
  * interface.
  *
  */
-class KHTML_EXPORT NodeIterator
+class TDEHTML_EXPORT NodeIterator
 {
     friend class NodeIteratorImpl;
     friend class Document;
@@ -181,7 +181,7 @@ protected:
  * an instance of it to the NodeFilter. For more details see the
  * CustomNodeFilter class
  */
-class KHTML_EXPORT NodeFilter
+class TDEHTML_EXPORT NodeFilter
 {
     friend class NodeIterator;
     friend class NodeIteratorImpl;
@@ -292,7 +292,7 @@ protected:
  *
  */
 
-class KHTML_EXPORT CustomNodeFilter : public DomShared {
+class TDEHTML_EXPORT CustomNodeFilter : public DomShared {
 public:
     CustomNodeFilter();
     virtual ~CustomNodeFilter();
@@ -336,7 +336,7 @@ protected:
  * how deeply nested the structure of the original document.
  *
  */
-class KHTML_EXPORT TreeWalker
+class TDEHTML_EXPORT TreeWalker
 {
     friend class Document;
     friend class TreeWalkerImpl;
diff --git a/tdehtml/dom/dom2_views.h b/tdehtml/dom/dom2_views.h
index 6f326aaa3..dcba1cb40 100644
--- a/tdehtml/dom/dom2_views.h
+++ b/tdehtml/dom/dom2_views.h
@@ -38,7 +38,7 @@ class DOMString;
  * A base interface that all views shall derive from.
  *
  */
-class KHTML_EXPORT AbstractView {
+class TDEHTML_EXPORT AbstractView {
     friend class Event;
     friend class UIEvent;
     friend class MouseEvent;
diff --git a/tdehtml/dom/dom_doc.cpp b/tdehtml/dom/dom_doc.cpp
index 0ff123444..b38a01401 100644
--- a/tdehtml/dom/dom_doc.cpp
+++ b/tdehtml/dom/dom_doc.cpp
@@ -438,7 +438,7 @@ void Document::setSelectedStylesheetSet(const DOMString& s)
 }
 
 
-KHTMLView *Document::view() const
+TDEHTMLView *Document::view() const
 {
     if (!impl) return 0;
 
diff --git a/tdehtml/dom/dom_doc.h b/tdehtml/dom/dom_doc.h
index 9a5331295..cef6692c5 100644
--- a/tdehtml/dom/dom_doc.h
+++ b/tdehtml/dom/dom_doc.h
@@ -32,8 +32,8 @@
 #include <dom/dom_node.h>
 #include <dom/css_stylesheet.h>
 
-class KHTMLView;
-class KHTMLPart;
+class TDEHTMLView;
+class TDEHTMLPart;
 
 namespace DOM {
 
@@ -74,7 +74,7 @@ class HTMLDocument;
  * DOM Level 2 and newer provide means for creating documents directly,
  * which was not possible with DOM Level 1.
  */
-class KHTML_EXPORT DOMImplementation
+class TDEHTML_EXPORT DOMImplementation
 {
    friend class Document;
 public:
@@ -242,10 +242,10 @@ protected:
  * context they were created.
  *
  */
-class KHTML_EXPORT Document : public Node
+class TDEHTML_EXPORT Document : public Node
 {
-    friend class ::KHTMLView;
-    friend class ::KHTMLPart;
+    friend class ::TDEHTMLView;
+    friend class ::TDEHTMLPart;
     friend class AbstractView;
     friend class DOMImplementation;
     friend class HTMLFrameElement;
@@ -786,9 +786,9 @@ public:
     void removeStyleSheet(const StyleSheet &sheet);
     
     /**
-     * @return The KHTML view widget of this document.
+     * @return The TDEHTML view widget of this document.
      */
-    KHTMLView *view() const;
+    TDEHTMLView *view() const;
 
     /**
      * Introduced in DOM Level 2
@@ -988,7 +988,7 @@ class DocumentFragmentImpl;
  * \c insertBefore() and \c appendChild() .
  *
  */
-class KHTML_EXPORT DocumentFragment : public Node
+class TDEHTML_EXPORT DocumentFragment : public Node
 {
     friend class Document;
     friend class HTMLElementImpl;
@@ -1025,7 +1025,7 @@ class DOMString;
  * nodes.
  *
  */
-class KHTML_EXPORT DocumentType : public Node
+class TDEHTML_EXPORT DocumentType : public Node
 {
     friend class Document;
     friend class DOMImplementation;
diff --git a/tdehtml/dom/dom_element.h b/tdehtml/dom/dom_element.h
index d3313628e..8df181c17 100644
--- a/tdehtml/dom/dom_element.h
+++ b/tdehtml/dom/dom_element.h
@@ -86,7 +86,7 @@ class DocumentImpl;
  * unknown, there are no tokenized attribute values.
  *
  */
-class KHTML_EXPORT Attr : public Node
+class TDEHTML_EXPORT Attr : public Node
 {
     friend class Element;
     friend class Document;
@@ -207,7 +207,7 @@ class DOMString;
  * access an attribute value can safely be used as a convenience.
  *
  */
-class KHTML_EXPORT Element : public Node
+class TDEHTML_EXPORT Element : public Node
 {
     friend class Document;
     friend class HTMLDocument;
@@ -579,7 +579,7 @@ public:
     bool isHTMLElement() const;
 
     /**
-     * KHTML extension to DOM
+     * TDEHTML extension to DOM
      * This method returns the associated form element.
      * returns null if this element is not a form-like element
      * or if this elment is not in the scope of a form element.
diff --git a/tdehtml/dom/dom_exception.h b/tdehtml/dom/dom_exception.h
index cef032206..f4c4b4e75 100644
--- a/tdehtml/dom/dom_exception.h
+++ b/tdehtml/dom/dom_exception.h
@@ -54,7 +54,7 @@ namespace DOM {
  * the corresponding method descriptions.
  *
  */
-class KHTML_EXPORT DOMException
+class TDEHTML_EXPORT DOMException
 {
 public:
     DOMException(unsigned short _code) { code = _code; }
diff --git a/tdehtml/dom/dom_misc.h b/tdehtml/dom/dom_misc.h
index 4cded0f00..494ab2704 100644
--- a/tdehtml/dom/dom_misc.h
+++ b/tdehtml/dom/dom_misc.h
@@ -33,7 +33,7 @@ namespace DOM {
  * Other objects should overload deleteMe() to fit their needs. The default
  * implementation deletes the object if the ref count drops to 0.
  */
-class KHTML_EXPORT DomShared
+class TDEHTML_EXPORT DomShared
 {
 public:
   DomShared() : _ref( 0 ) {}
diff --git a/tdehtml/dom/dom_node.h b/tdehtml/dom/dom_node.h
index 594aa5e3e..b87997547 100644
--- a/tdehtml/dom/dom_node.h
+++ b/tdehtml/dom/dom_node.h
@@ -63,7 +63,7 @@ class Event;
  * imply that the DOM specifies an order to these Nodes.
  *
  */
-class KHTML_EXPORT NamedNodeMap
+class TDEHTML_EXPORT NamedNodeMap
 {
 public:
     NamedNodeMap();
@@ -271,7 +271,7 @@ class NodeImpl;
  * mechanisms to get and set the relevant information.
  *
  */
-class KHTML_EXPORT Node
+class TDEHTML_EXPORT Node
 {
     friend class NamedNodeMap;
     friend class NodeList;
@@ -775,7 +775,7 @@ public:
      *
      * @exception DOMException
      * NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
-     * Note: KHTML will also raise this if setContent is called on things
+     * Note: TDEHTML will also raise this if setContent is called on things
      * that do not have child nodes.
      *
      * @since 3.5.7
@@ -928,7 +928,7 @@ class NodeListImpl;
  * integral index, starting from 0.
  *
  */
-class KHTML_EXPORT NodeList
+class TDEHTML_EXPORT NodeList
 {
     friend class Element;
     friend class Node;
diff --git a/tdehtml/dom/dom_string.h b/tdehtml/dom/dom_string.h
index 3d4706b5a..a82d1018b 100644
--- a/tdehtml/dom/dom_string.h
+++ b/tdehtml/dom/dom_string.h
@@ -40,10 +40,10 @@ class DOMStringImpl;
  * that modifications to one instance will also modify all others. If you
  * wish to get a DOMString that is independent, use copy().
  */
-class KHTML_EXPORT DOMString
+class TDEHTML_EXPORT DOMString
 {
     friend class CharacterDataImpl;
-    friend KHTML_EXPORT bool operator==( const DOMString &a, const char *b );
+    friend TDEHTML_EXPORT bool operator==( const DOMString &a, const char *b );
 public:
     /**
      * default constructor. Gives an empty DOMString
@@ -128,17 +128,17 @@ inline kndbgstream &operator<<(kndbgstream &stream, const DOMString &) {
 }
 #endif
 
-KHTML_EXPORT bool operator==( const DOMString &a, const DOMString &b );
-KHTML_EXPORT bool operator==( const DOMString &a, const TQString &b );
-KHTML_EXPORT bool operator==( const DOMString &a, const char *b );
+TDEHTML_EXPORT bool operator==( const DOMString &a, const DOMString &b );
+TDEHTML_EXPORT bool operator==( const DOMString &a, const TQString &b );
+TDEHTML_EXPORT bool operator==( const DOMString &a, const char *b );
 inline bool operator!=( const DOMString &a, const DOMString &b ) { return !(a==b); }
 inline bool operator!=( const DOMString &a, const TQString &b ) { return !(a==b); }
 inline bool operator!=( const DOMString &a, const char *b )  { return !(a==b); }
 inline bool strcmp( const DOMString &a, const DOMString &b ) { return a != b; }
 
 // returns false when equal, true otherwise (ignoring case)
-KHTML_EXPORT bool strcasecmp( const DOMString &a, const DOMString &b );
-KHTML_EXPORT bool strcasecmp( const DOMString& a, const char* b );
+TDEHTML_EXPORT bool strcasecmp( const DOMString &a, const DOMString &b );
+TDEHTML_EXPORT bool strcasecmp( const DOMString& a, const char* b );
 
 }
 #endif
diff --git a/tdehtml/dom/dom_text.h b/tdehtml/dom/dom_text.h
index c6f92fb1d..bc84f5902 100644
--- a/tdehtml/dom/dom_text.h
+++ b/tdehtml/dom/dom_text.h
@@ -46,7 +46,7 @@ class CharacterDataImpl;
  * <code>offset</code>s in this interface start from 0.
  *
  */
-class KHTML_EXPORT CharacterData : public Node
+class TDEHTML_EXPORT CharacterData : public Node
 {
     friend class CharacterDataImpl;
 
@@ -220,7 +220,7 @@ class CommentImpl;
  * the full SGML comment structure.
  *
  */
-class KHTML_EXPORT Comment : public CharacterData
+class TDEHTML_EXPORT Comment : public CharacterData
 {
     friend class Document;
     friend class TextImpl;
@@ -266,7 +266,7 @@ class TextImpl;
  * \c XPointers.
  *
  */
-class KHTML_EXPORT Text : public CharacterData
+class TDEHTML_EXPORT Text : public CharacterData
 {
     friend class Document;
     friend class TextImpl;
diff --git a/tdehtml/dom/dom_xml.h b/tdehtml/dom/dom_xml.h
index 12e70d9e5..b2ef9f8e6 100644
--- a/tdehtml/dom/dom_xml.h
+++ b/tdehtml/dom/dom_xml.h
@@ -63,7 +63,7 @@ class ProcessingInstructionImpl;
  * merged by use of the Element.normalize() method.
  *
  */
-class KHTML_EXPORT CDATASection : public Text
+class TDEHTML_EXPORT CDATASection : public Text
 {
     friend class Document;
 public:
@@ -121,7 +121,7 @@ class DOMString;
  *  An \c Entity node does not have any parent.
  *
  */
-class KHTML_EXPORT Entity : public Node
+class TDEHTML_EXPORT Entity : public Node
 {
 public:
     Entity();
@@ -185,7 +185,7 @@ protected:
  * evaluation.
  *
  */
-class KHTML_EXPORT EntityReference : public Node
+class TDEHTML_EXPORT EntityReference : public Node
 {
     friend class Document;
 public:
@@ -219,7 +219,7 @@ class DOMString;
  *  A \c Notation node does not have any parent.
  *
  */
-class KHTML_EXPORT Notation : public Node
+class TDEHTML_EXPORT Notation : public Node
 {
 public:
     Notation();
@@ -256,7 +256,7 @@ protected:
  * processor-specific information in the text of the document.
  *
  */
-class KHTML_EXPORT ProcessingInstruction : public Node
+class TDEHTML_EXPORT ProcessingInstruction : public Node
 {
     friend class Document;
 public:
diff --git a/tdehtml/dom/html_base.h b/tdehtml/dom/html_base.h
index c7ed878ce..1ff3fb825 100644
--- a/tdehtml/dom/html_base.h
+++ b/tdehtml/dom/html_base.h
@@ -47,7 +47,7 @@ class DOMString;
  * BODY element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLBodyElement : public HTMLElement
+class TDEHTML_EXPORT HTMLBodyElement : public HTMLElement
 {
 public:
     HTMLBodyElement();
@@ -160,7 +160,7 @@ class DOMString;
  * FRAME element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLFrameElement : public HTMLElement
+class TDEHTML_EXPORT HTMLFrameElement : public HTMLElement
 {
 public:
     HTMLFrameElement();
@@ -306,7 +306,7 @@ class DOMString;
  * FRAMESET element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLFrameSetElement : public HTMLElement
+class TDEHTML_EXPORT HTMLFrameSetElement : public HTMLElement
 {
 public:
     HTMLFrameSetElement();
@@ -359,7 +359,7 @@ class HTMLIFrameElementImpl;
  * IFRAME element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLIFrameElement : public HTMLElement
+class TDEHTML_EXPORT HTMLIFrameElement : public HTMLElement
 {
 public:
     HTMLIFrameElement();
@@ -533,7 +533,7 @@ class DOMString;
  * HEAD element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLHeadElement : public HTMLElement
+class TDEHTML_EXPORT HTMLHeadElement : public HTMLElement
 {
 public:
     HTMLHeadElement();
@@ -574,7 +574,7 @@ class DOMString;
  * HTML element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLHtmlElement : public HTMLElement
+class TDEHTML_EXPORT HTMLHtmlElement : public HTMLElement
 {
 public:
     HTMLHtmlElement();
diff --git a/tdehtml/dom/html_block.h b/tdehtml/dom/html_block.h
index 4283bafa2..fc3963716 100644
--- a/tdehtml/dom/html_block.h
+++ b/tdehtml/dom/html_block.h
@@ -47,7 +47,7 @@ class DOMString;
  * BLOCKQUOTE element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLBlockquoteElement : public HTMLElement
+class TDEHTML_EXPORT HTMLBlockquoteElement : public HTMLElement
 {
 public:
     HTMLBlockquoteElement();
@@ -88,7 +88,7 @@ class DOMString;
  * DIV element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLDivElement : public HTMLElement
+class TDEHTML_EXPORT HTMLDivElement : public HTMLElement
 {
 public:
     HTMLDivElement();
@@ -130,7 +130,7 @@ class DOMString;
  * HR element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLHRElement : public HTMLElement
+class TDEHTML_EXPORT HTMLHRElement : public HTMLElement
 {
 public:
     HTMLHRElement();
@@ -214,7 +214,7 @@ class DOMString;
  * H1 element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLHeadingElement : public HTMLElement
+class TDEHTML_EXPORT HTMLHeadingElement : public HTMLElement
 {
 public:
     HTMLHeadingElement();
@@ -255,7 +255,7 @@ class DOMString;
  * element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLParagraphElement : public HTMLElement
+class TDEHTML_EXPORT HTMLParagraphElement : public HTMLElement
 {
 public:
     HTMLParagraphElement();
@@ -296,7 +296,7 @@ class HTMLPreElementImpl;
  * PRE element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLPreElement : public HTMLElement
+class TDEHTML_EXPORT HTMLPreElement : public HTMLElement
 {
 public:
     HTMLPreElement();
@@ -334,7 +334,7 @@ class HTMLLayerElementImpl;
  * Behaves mostly like absolute positioned DIV-blocks.
  *
  */
-class KHTML_EXPORT HTMLLayerElement : public HTMLElement
+class TDEHTML_EXPORT HTMLLayerElement : public HTMLElement
 {
 public:
     HTMLLayerElement();
diff --git a/tdehtml/dom/html_document.cpp b/tdehtml/dom/html_document.cpp
index c24bf65f7..0d0af0ab9 100644
--- a/tdehtml/dom/html_document.cpp
+++ b/tdehtml/dom/html_document.cpp
@@ -39,7 +39,7 @@ HTMLDocument::HTMLDocument() : Document(false) // create the impl here
 
 }
 
-HTMLDocument::HTMLDocument(KHTMLView *parent)
+HTMLDocument::HTMLDocument(TDEHTMLView *parent)
     : Document(false) // create the impl here
 {
     impl = DOMImplementationImpl::instance()->createHTMLDocument(parent);
diff --git a/tdehtml/dom/html_document.h b/tdehtml/dom/html_document.h
index aa53de96c..98a027297 100644
--- a/tdehtml/dom/html_document.h
+++ b/tdehtml/dom/html_document.h
@@ -35,8 +35,8 @@
 
 #include <tdelibs_export.h>
 
-class KHTMLView;
-class KHTMLPart;
+class TDEHTMLView;
+class TDEHTMLPart;
 
 namespace DOM {
 
@@ -70,10 +70,10 @@ class HTMLElement;
  *
  *
  */
-class KHTML_EXPORT HTMLDocument : public Document
+class TDEHTML_EXPORT HTMLDocument : public Document
 {
-    friend class ::KHTMLView;
-    friend class ::KHTMLPart;
+    friend class ::TDEHTMLView;
+    friend class ::TDEHTMLPart;
     friend class DOMImplementation;
 public:
     HTMLDocument();
@@ -82,7 +82,7 @@ public:
      * Rendering information (like sizes, etc...) is only created if
      * parent != 0
      */
-    HTMLDocument(KHTMLView *parent);
+    HTMLDocument(TDEHTMLView *parent);
     HTMLDocument(const HTMLDocument &other);
     HTMLDocument(const Node &other) : Document(false)
          {(*this)=other;}
diff --git a/tdehtml/dom/html_element.h b/tdehtml/dom/html_element.h
index 1329793b2..719223777 100644
--- a/tdehtml/dom/html_element.h
+++ b/tdehtml/dom/html_element.h
@@ -32,7 +32,7 @@
 #include <dom/dom_element.h>
 #include <tdelibs_export.h>
 
-class KHTMLView;
+class TDEHTMLView;
 
 namespace DOM {
 
@@ -66,10 +66,10 @@ class HTMLCollection;
  * interface is reserved for future usage.
  *
  */
-class KHTML_EXPORT HTMLElement : public Element
+class TDEHTML_EXPORT HTMLElement : public Element
 {
     friend class HTMLDocument;
-    friend class ::KHTMLView;
+    friend class ::TDEHTMLView;
     friend class HTMLTableElement;
     friend class HTMLTableRowElement;
     friend class HTMLTableSectionElement;
diff --git a/tdehtml/dom/html_form.h b/tdehtml/dom/html_form.h
index 0623e421b..d0e20da73 100644
--- a/tdehtml/dom/html_form.h
+++ b/tdehtml/dom/html_form.h
@@ -47,7 +47,7 @@ class DOMString;
  * BUTTON element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLButtonElement : public HTMLElement
+class TDEHTML_EXPORT HTMLButtonElement : public HTMLElement
 {
 public:
     HTMLButtonElement();
@@ -169,7 +169,7 @@ class HTMLFieldSetElementImpl;
  * FIELDSET element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLFieldSetElement : public HTMLElement
+class TDEHTML_EXPORT HTMLFieldSetElement : public HTMLElement
 {
 public:
     HTMLFieldSetElement();
@@ -203,7 +203,7 @@ class HTMLFormElementImpl;
  * FORM element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLFormElement : public HTMLElement
+class TDEHTML_EXPORT HTMLFormElement : public HTMLElement
 {
     friend class HTMLButtonElement;
     friend class HTMLFieldSetElement;
@@ -346,7 +346,7 @@ class HTMLInputElementImpl;
  * INPUT element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLInputElement : public HTMLElement
+class TDEHTML_EXPORT HTMLInputElement : public HTMLElement
 {
 public:
     HTMLInputElement();
@@ -707,7 +707,7 @@ class HTMLLabelElementImpl;
  * LABEL element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLLabelElement : public HTMLElement
+class TDEHTML_EXPORT HTMLLabelElement : public HTMLElement
 {
 public:
     HTMLLabelElement();
@@ -762,7 +762,7 @@ class HTMLLegendElementImpl;
  * LEGEND element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLLegendElement : public HTMLElement
+class TDEHTML_EXPORT HTMLLegendElement : public HTMLElement
 {
 public:
     HTMLLegendElement();
@@ -821,7 +821,7 @@ class HTMLOptGroupElementImpl;
  * OPTGROUP element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLOptGroupElement : public HTMLElement
+class TDEHTML_EXPORT HTMLOptGroupElement : public HTMLElement
 {
 public:
     HTMLOptGroupElement();
@@ -875,7 +875,7 @@ class HTMLSelectElementImpl;
  * SELECT element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLSelectElement : public HTMLElement
+class TDEHTML_EXPORT HTMLSelectElement : public HTMLElement
 {
 public:
     HTMLSelectElement();
@@ -1051,7 +1051,7 @@ class HTMLTextAreaElementImpl;
  * TEXTAREA element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLTextAreaElement : public HTMLElement
+class TDEHTML_EXPORT HTMLTextAreaElement : public HTMLElement
 {
 public:
     HTMLTextAreaElement();
@@ -1266,7 +1266,7 @@ class HTMLOptionElementImpl;
  * OPTION element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLOptionElement : public HTMLElement
+class TDEHTML_EXPORT HTMLOptionElement : public HTMLElement
 {
 public:
     HTMLOptionElement();
@@ -1386,7 +1386,7 @@ class HTMLFormElement;
  * deprecated in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLIsIndexElement : public HTMLElement
+class TDEHTML_EXPORT HTMLIsIndexElement : public HTMLElement
 {
 public:
     HTMLIsIndexElement();
diff --git a/tdehtml/dom/html_head.h b/tdehtml/dom/html_head.h
index e8dc52d21..08bd1bc1c 100644
--- a/tdehtml/dom/html_head.h
+++ b/tdehtml/dom/html_head.h
@@ -43,7 +43,7 @@ class DOMString;
  * BASE element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLBaseElement : public HTMLElement
+class TDEHTML_EXPORT HTMLBaseElement : public HTMLElement
 {
 public:
     HTMLBaseElement();
@@ -98,7 +98,7 @@ class HTMLLinkElementImpl;
  * LINK element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLLinkElement : public HTMLElement
+class TDEHTML_EXPORT HTMLLinkElement : public HTMLElement
 {
 public:
     HTMLLinkElement();
@@ -253,7 +253,7 @@ class HTMLMetaElementImpl;
  * META element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLMetaElement : public HTMLElement
+class TDEHTML_EXPORT HTMLMetaElement : public HTMLElement
 {
 public:
     HTMLMetaElement();
@@ -332,7 +332,7 @@ class HTMLScriptElementImpl;
  * SCRIPT element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLScriptElement : public HTMLElement
+class TDEHTML_EXPORT HTMLScriptElement : public HTMLElement
 {
 public:
     HTMLScriptElement();
@@ -446,7 +446,7 @@ class HTMLStyleElementImpl;
  * STYLE element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLStyleElement : public HTMLElement
+class TDEHTML_EXPORT HTMLStyleElement : public HTMLElement
 {
 public:
     HTMLStyleElement();
@@ -519,7 +519,7 @@ class HTMLTitleElementImpl;
  * TITLE element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLTitleElement : public HTMLElement
+class TDEHTML_EXPORT HTMLTitleElement : public HTMLElement
 {
 public:
     HTMLTitleElement();
diff --git a/tdehtml/dom/html_image.h b/tdehtml/dom/html_image.h
index 9f30aaa14..8258d7a63 100644
--- a/tdehtml/dom/html_image.h
+++ b/tdehtml/dom/html_image.h
@@ -44,7 +44,7 @@ class DOMString;
  * AREA element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLAreaElement : public HTMLElement
+class TDEHTML_EXPORT HTMLAreaElement : public HTMLElement
 {
 public:
     HTMLAreaElement();
@@ -182,7 +182,7 @@ class HTMLImageElementImpl;
  * IMG element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLImageElement : public HTMLElement
+class TDEHTML_EXPORT HTMLImageElement : public HTMLElement
 {
 public:
     HTMLImageElement();
@@ -390,7 +390,7 @@ class DOMString;
  * MAP element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLMapElement : public HTMLElement
+class TDEHTML_EXPORT HTMLMapElement : public HTMLElement
 {
 public:
     HTMLMapElement();
diff --git a/tdehtml/dom/html_inline.h b/tdehtml/dom/html_inline.h
index f92ed6917..322282d1f 100644
--- a/tdehtml/dom/html_inline.h
+++ b/tdehtml/dom/html_inline.h
@@ -44,7 +44,7 @@ class DOMString;
  * element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLAnchorElement : public HTMLElement
+class TDEHTML_EXPORT HTMLAnchorElement : public HTMLElement
 {
 public:
     HTMLAnchorElement();
@@ -256,7 +256,7 @@ class HTMLBRElementImpl;
  * element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLBRElement : public HTMLElement
+class TDEHTML_EXPORT HTMLBRElement : public HTMLElement
 {
 public:
     HTMLBRElement();
@@ -299,7 +299,7 @@ class DOMString;
  * deprecated in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLFontElement : public HTMLElement
+class TDEHTML_EXPORT HTMLFontElement : public HTMLElement
 {
 public:
     HTMLFontElement();
@@ -369,7 +369,7 @@ class DOMString;
  * DEL </a> element definitions in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLModElement : public HTMLElement
+class TDEHTML_EXPORT HTMLModElement : public HTMLElement
 {
 public:
     HTMLModElement();
@@ -427,7 +427,7 @@ class HTMLQuoteElementImpl;
  * element. To resolve ambiquities, we use this one for the \c Q
  * element only.
  */
-class KHTML_EXPORT HTMLQuoteElement : public HTMLElement
+class TDEHTML_EXPORT HTMLQuoteElement : public HTMLElement
 {
 public:
     HTMLQuoteElement();
diff --git a/tdehtml/dom/html_list.h b/tdehtml/dom/html_list.h
index 34c081cb5..59328ec26 100644
--- a/tdehtml/dom/html_list.h
+++ b/tdehtml/dom/html_list.h
@@ -49,7 +49,7 @@ class DOMString;
  * DL element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLDListElement : public HTMLElement
+class TDEHTML_EXPORT HTMLDListElement : public HTMLElement
 {
 public:
     HTMLDListElement();
@@ -89,7 +89,7 @@ public:
  * in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLDirectoryElement : public HTMLElement
+class TDEHTML_EXPORT HTMLDirectoryElement : public HTMLElement
 {
 public:
     HTMLDirectoryElement();
@@ -128,7 +128,7 @@ public:
  * LI element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLLIElement : public HTMLElement
+class TDEHTML_EXPORT HTMLLIElement : public HTMLElement
 {
 public:
     HTMLLIElement();
@@ -183,7 +183,7 @@ public:
  * deprecated in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLMenuElement : public HTMLElement
+class TDEHTML_EXPORT HTMLMenuElement : public HTMLElement
 {
 public:
     HTMLMenuElement();
@@ -223,7 +223,7 @@ public:
  * OL element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLOListElement : public HTMLElement
+class TDEHTML_EXPORT HTMLOListElement : public HTMLElement
 {
 public:
     HTMLOListElement();
@@ -291,7 +291,7 @@ public:
  * UL element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLUListElement : public HTMLElement
+class TDEHTML_EXPORT HTMLUListElement : public HTMLElement
 {
 public:
     HTMLUListElement();
diff --git a/tdehtml/dom/html_misc.h b/tdehtml/dom/html_misc.h
index 643e5caf6..9cb6dc976 100644
--- a/tdehtml/dom/html_misc.h
+++ b/tdehtml/dom/html_misc.h
@@ -45,7 +45,7 @@ class HTMLCollectionImpl;
  * deprecated in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLBaseFontElement : public HTMLElement
+class TDEHTML_EXPORT HTMLBaseFontElement : public HTMLElement
 {
 public:
     HTMLBaseFontElement();
@@ -123,7 +123,7 @@ public:
  * automatically updated when the underlying document is changed.
  *
  */
-class KHTML_EXPORT HTMLCollection
+class TDEHTML_EXPORT HTMLCollection
 {
     friend class HTMLDocument;
     friend class HTMLSelectElement;
@@ -201,7 +201,7 @@ protected:
     HTMLCollectionImpl *impl;
 };
 
-class KHTML_EXPORT HTMLFormCollection : public HTMLCollection
+class TDEHTML_EXPORT HTMLFormCollection : public HTMLCollection
 {
     friend class HTMLFormElement;
 protected:
@@ -211,7 +211,7 @@ protected:
 /**
   @internal. Not part of the public API
 */
-class KHTML_EXPORT HTMLMappedNameCollection : public HTMLCollection
+class TDEHTML_EXPORT HTMLMappedNameCollection : public HTMLCollection
 {
 public:
     HTMLMappedNameCollection(NodeImpl *base, int type, const DOMString &name );
diff --git a/tdehtml/dom/html_object.h b/tdehtml/dom/html_object.h
index 9195a40f7..56c592fa3 100644
--- a/tdehtml/dom/html_object.h
+++ b/tdehtml/dom/html_object.h
@@ -47,7 +47,7 @@ class HTMLAppletElementImpl;
  * deprecated in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLAppletElement : public HTMLElement
+class TDEHTML_EXPORT HTMLAppletElement : public HTMLElement
 {
 public:
     HTMLAppletElement();
@@ -255,7 +255,7 @@ class HTMLObjectElementImpl;
  * OBJECT element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLObjectElement : public HTMLElement
+class TDEHTML_EXPORT HTMLObjectElement : public HTMLElement
 {
 public:
     HTMLObjectElement();
@@ -554,7 +554,7 @@ class HTMLParamElementImpl;
  * PARAM element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLParamElement : public HTMLElement
+class TDEHTML_EXPORT HTMLParamElement : public HTMLElement
 {
 public:
     HTMLParamElement();
diff --git a/tdehtml/dom/html_table.h b/tdehtml/dom/html_table.h
index 6b9a2d99d..fdc1119cb 100644
--- a/tdehtml/dom/html_table.h
+++ b/tdehtml/dom/html_table.h
@@ -44,7 +44,7 @@ class DOMString;
  * CAPTION element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLTableCaptionElement : public HTMLElement
+class TDEHTML_EXPORT HTMLTableCaptionElement : public HTMLElement
 {
     friend class HTMLTableElement;
 
@@ -88,7 +88,7 @@ class HTMLTableCellElementImpl;
  * TD element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLTableCellElement : public HTMLElement
+class TDEHTML_EXPORT HTMLTableCellElement : public HTMLElement
 {
     friend class HTMLTableElement;
 
@@ -319,7 +319,7 @@ class HTMLTableColElementImpl;
  * COL element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLTableColElement : public HTMLElement
+class TDEHTML_EXPORT HTMLTableColElement : public HTMLElement
 {
     friend class HTMLTableElement;
 
@@ -438,7 +438,7 @@ class DOMString;
  * TABLE element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLTableElement : public HTMLElement
+class TDEHTML_EXPORT HTMLTableElement : public HTMLElement
 {
 public:
     HTMLTableElement();
@@ -722,7 +722,7 @@ class DOMString;
  * TR element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLTableRowElement : public HTMLElement
+class TDEHTML_EXPORT HTMLTableRowElement : public HTMLElement
 {
     friend class HTMLTableElement;
 
@@ -892,7 +892,7 @@ class DOMString;
  * elements.
  *
  */
-class KHTML_EXPORT HTMLTableSectionElement : public HTMLElement
+class TDEHTML_EXPORT HTMLTableSectionElement : public HTMLElement
 {
     friend class HTMLTableElement;