Replace KDE_[NO_]EXPORT with TDE_[NO_]EXPORT

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit bba3128085abe1a32cca43d9fb8ac02c2a29bf6b)

33 files changed, 78 insertions, 78 deletions

diff --git a/tdehtml/CMakeLists.txt b/tdehtml/CMakeLists.txt
index 624612d55..70fea75bd 100644
--- a/tdehtml/CMakeLists.txt
+++ b/tdehtml/CMakeLists.txt
@@ -108,8 +108,8 @@ set( ${target}_SRCS
 
 file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp
 "#include <tdelibs_export.h>
-extern \"C\" KDE_EXPORT void* init_libtdehtml();
-extern \"C\" KDE_EXPORT void* init_libtdehtmlpart() { return init_libtdehtml(); }
+extern \"C\" TDE_EXPORT void* init_libtdehtml();
+extern \"C\" TDE_EXPORT void* init_libtdehtmlpart() { return init_libtdehtml(); }
 " )
 
 tde_add_kpart( ${target}
@@ -130,8 +130,8 @@ set( ${target}_SRCS
 file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/imgdummy.cpp
 "
 #include <tdelibs_export.h>
-extern \"C\"  KDE_EXPORT void* init_tdehtmlimagefactory();
-extern \"C\"  KDE_EXPORT void* init_tdehtmlimagepart() { return init_tdehtmlimagefactory(); }
+extern \"C\"  TDE_EXPORT void* init_tdehtmlimagefactory();
+extern \"C\"  TDE_EXPORT void* init_tdehtmlimagepart() { return init_tdehtmlimagefactory(); }
 " )
 
 tde_add_kpart( ${target}
diff --git a/tdehtml/Makefile.am b/tdehtml/Makefile.am
index 79ecf8a89..307389105 100644
--- a/tdehtml/Makefile.am
+++ b/tdehtml/Makefile.am
@@ -62,8 +62,8 @@ libtdehtml_la_LIBADD = ./xml/libtdehtmlxml.la ./html/libtdehtmlhtml.la \
 # init_libtdehtml is in libtdehtml.so; init_libtdehtmlpart needs to be in the part
 dummy.cpp: $(srcdir)/Makefile.am
 	echo '#include <tdelibs_export.h>' > $@
-	echo 'extern "C" KDE_EXPORT void* init_libtdehtml();' >> $@
-	echo 'extern "C" KDE_EXPORT void* init_libtdehtmlpart() { return init_libtdehtml(); } ' >> $@
+	echo 'extern "C" TDE_EXPORT void* init_libtdehtml();' >> $@
+	echo 'extern "C" TDE_EXPORT void* init_libtdehtmlpart() { return init_libtdehtml(); } ' >> $@
 
 libtdehtmlpart_la_SOURCES = dummy.cpp
 libtdehtmlpart_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
@@ -72,8 +72,8 @@ libtdehtmlpart_la_LIBADD = libtdehtml.la $(LIB_TQT)
 # init_tdehtmlimagefactory is in libtdehtml.so; init_tdehtmlimagepart needs to be in the part
 imgdummy.cpp: $(srcdir)/Makefile.am
 	echo '#include <tdelibs_export.h>' > $@
-	echo 'extern "C"  KDE_EXPORT void* init_tdehtmlimagefactory();' >> $@
-	echo 'extern "C"  KDE_EXPORT void* init_tdehtmlimagepart() { return init_tdehtmlimagefactory(); } ' >> $@
+	echo 'extern "C"  TDE_EXPORT void* init_tdehtmlimagefactory();' >> $@
+	echo 'extern "C"  TDE_EXPORT void* init_tdehtmlimagepart() { return init_tdehtmlimagefactory(); } ' >> $@
 
 tdehtmlimagepart_la_SOURCES = imgdummy.cpp
 tdehtmlimagepart_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
diff --git a/tdehtml/css/css_base.h b/tdehtml/css/css_base.h
index d2ab4f63f..db0700a35 100644
--- a/tdehtml/css/css_base.h
+++ b/tdehtml/css/css_base.h
@@ -264,7 +264,7 @@ namespace DOM {
 	TQPtrList<StyleBaseImpl> *m_lstChildren;
     };
 
-    KDE_NO_EXPORT int getPropertyID(const char *tagStr, int len);
+    TDE_NO_EXPORT int getPropertyID(const char *tagStr, int len);
 
 }
 
diff --git a/tdehtml/css/cssproperties.h b/tdehtml/css/cssproperties.h
index c06431c62..bcdcee6e3 100644
--- a/tdehtml/css/cssproperties.h
+++ b/tdehtml/css/cssproperties.h
@@ -4,7 +4,7 @@
 #ifndef CSSPROPERTIES_H
 #define CSSPROPERTIES_H
 
-DOM::DOMString getPropertyName(unsigned short id) KDE_NO_EXPORT;
+DOM::DOMString getPropertyName(unsigned short id) TDE_NO_EXPORT;
 
 #define CSS_PROP_INVALID 0
 #define CSS_PROP_MIN 1
diff --git a/tdehtml/css/cssstyleselector.h b/tdehtml/css/cssstyleselector.h
index f826c0323..bc7c5c7ad 100644
--- a/tdehtml/css/cssstyleselector.h
+++ b/tdehtml/css/cssstyleselector.h
@@ -124,7 +124,7 @@ namespace tdehtml
 	~CSSStyleSelector();
 
 	void addSheet( DOM::CSSStyleSheetImpl *sheet );
-        KDE_EXPORT static void clear();
+        TDE_EXPORT static void clear();
         static void reparseConfiguration();
 
 	static void loadDefaultStyle(const TDEHTMLSettings *s, DOM::DocumentImpl *doc);
diff --git a/tdehtml/css/cssvalues.h b/tdehtml/css/cssvalues.h
index 12d606acc..0869f392f 100644
--- a/tdehtml/css/cssvalues.h
+++ b/tdehtml/css/cssvalues.h
@@ -5,7 +5,7 @@
 #ifndef CSSVALUES_H
 #define CSSVALUES_H
 
-DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT;
+DOM::DOMString getValueName(unsigned short id) TDE_NO_EXPORT;
 
 #define CSS_VAL_INVALID 0
 #define CSS_VAL_MIN 1
diff --git a/tdehtml/css/makeprop b/tdehtml/css/makeprop
index b01ed7319..5a806d6f7 100644
--- a/tdehtml/css/makeprop
+++ b/tdehtml/css/makeprop
@@ -26,7 +26,7 @@ grep "^[^\#]" cssproperties.in > cssproperties.strip
 echo -e '%{\n/* This file is automatically generated from cssproperties.in by makeprop, do not edit */\n/* Copyright 1999 W. Bastian */\n#include "cssproperties.h"\n%}\nstruct props {\n    const char *name;\n    int id;\n};\n\nstatic const struct props * findProp (const char *str, unsigned int len);\n\n%%' > cssproperties.gperf
 cat cssproperties.strip | awk '{ do { prop = $0; gsub("-", "_"); print prop ", CSS_PROP_" toupper($0) } while (getline) }' >> cssproperties.gperf
 echo '%%' >> cssproperties.gperf
-echo -e '/* This file is automatically generated from cssproperties.in by makeprop, do not edit */\n/* Copyright 1998 W. Bastian */\n\n#ifndef CSSPROPERTIES_H\n#define CSSPROPERTIES_H\n\nDOM::DOMString getPropertyName(unsigned short id) KDE_NO_EXPORT;\n' > cssproperties.h
+echo -e '/* This file is automatically generated from cssproperties.in by makeprop, do not edit */\n/* Copyright 1998 W. Bastian */\n\n#ifndef CSSPROPERTIES_H\n#define CSSPROPERTIES_H\n\nDOM::DOMString getPropertyName(unsigned short id) TDE_NO_EXPORT;\n' > cssproperties.h
 cat cssproperties.strip | awk '{ \
 i=1; \
 print "#define CSS_PROP_INVALID 0"; \
diff --git a/tdehtml/css/makevalues b/tdehtml/css/makevalues
index 3ca0a82ea..957d9b70c 100755
--- a/tdehtml/css/makevalues
+++ b/tdehtml/css/makevalues
@@ -28,7 +28,7 @@ echo -e '%{\n/* This file is automatically generated from cssvalues.in by makeva
 cat cssvalues.strip | awk '{ do { prop = $0; gsub("-", "_"); print prop ", CSS_VAL_" toupper($0) } while (getline) }' >> cssvalues.gperf
 echo '%%' >> cssvalues.gperf
 echo -e '/* This file is automatically generated from cssvalues.in by
-#makevalues, do not edit */\n/* Copyright 1998 W. Bastian */\n\n#ifndef CSSVALUES_H\n#define CSSVALUES_H\n\nDOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT;\n' > cssvalues.h
+#makevalues, do not edit */\n/* Copyright 1998 W. Bastian */\n\n#ifndef CSSVALUES_H\n#define CSSVALUES_H\n\nDOM::DOMString getValueName(unsigned short id) TDE_NO_EXPORT;\n' > cssvalues.h
 cat cssvalues.strip | awk '{ \
 i=1; \
 print "#define CSS_VAL_INVALID 0"; \
diff --git a/tdehtml/ecma/kjs_binding.cpp b/tdehtml/ecma/kjs_binding.cpp
index 0a0a2da47..c3dd39255 100644
--- a/tdehtml/ecma/kjs_binding.cpp
+++ b/tdehtml/ecma/kjs_binding.cpp
@@ -395,18 +395,18 @@ Value KJS::getLiveConnectValue(KParts::LiveConnectExtension *lc, const TQString
   }
 }
 
-/* only with gcc > 3.4 KDE_NO_EXPORT */
+/* only with gcc > 3.4 TDE_NO_EXPORT */
 EmbedLiveConnect::EmbedLiveConnect(KParts::LiveConnectExtension *lc, UString n, KParts::LiveConnectExtension::Type t, int id)
   : m_liveconnect (lc), name(n), objtype(t), objid(id)
 {}
 
-/* only with gcc > 3.4 KDE_NO_EXPORT */
+/* only with gcc > 3.4 TDE_NO_EXPORT */
 EmbedLiveConnect::~EmbedLiveConnect() {
   if (m_liveconnect)
     m_liveconnect->unregister(objid);
 }
 
-KDE_NO_EXPORT
+TDE_NO_EXPORT
 Value EmbedLiveConnect::get(ExecState *, const Identifier & prop) const
 {
   if (m_liveconnect) {
@@ -419,19 +419,19 @@ Value EmbedLiveConnect::get(ExecState *, const Identifier & prop) const
   return Undefined();
 }
 
-KDE_NO_EXPORT
+TDE_NO_EXPORT
 void EmbedLiveConnect::put(ExecState * exec, const Identifier &prop, const Value & value, int)
 {
   if (m_liveconnect)
     m_liveconnect->put(objid, prop.qstring(), value.toString(exec).qstring());
 }
 
-KDE_NO_EXPORT
+TDE_NO_EXPORT
 bool EmbedLiveConnect::implementsCall() const {
   return objtype == KParts::LiveConnectExtension::TypeFunction;
 }
 
-KDE_NO_EXPORT
+TDE_NO_EXPORT
 Value EmbedLiveConnect::call(ExecState *exec, Object&, const List &args)
 {
   if (m_liveconnect) {
@@ -447,17 +447,17 @@ Value EmbedLiveConnect::call(ExecState *exec, Object&, const List &args)
   return Undefined();
 }
 
-KDE_NO_EXPORT
+TDE_NO_EXPORT
 bool EmbedLiveConnect::toBoolean(ExecState *) const {
   return true;
 }
 
-KDE_NO_EXPORT
+TDE_NO_EXPORT
 Value EmbedLiveConnect::toPrimitive(ExecState *exec, Type) const {
   return String(toString(exec));
 }
 
-KDE_NO_EXPORT
+TDE_NO_EXPORT
 UString EmbedLiveConnect::toString(ExecState *) const {
   TQString str;
   const char *type = objtype == KParts::LiveConnectExtension::TypeFunction ? "Function" : "Object";
diff --git a/tdehtml/ecma/kjs_binding.h b/tdehtml/ecma/kjs_binding.h
index b6d60348e..f8276bcb8 100644
--- a/tdehtml/ecma/kjs_binding.h
+++ b/tdehtml/ecma/kjs_binding.h
@@ -89,7 +89,7 @@ namespace KJS {
    * that the interpreter runs for.
    * The interpreter also stores the DOM object - >KJS::DOMObject cache.
    */
-  class KDE_EXPORT ScriptInterpreter : public Interpreter
+  class TDE_EXPORT ScriptInterpreter : public Interpreter
   {
   public:
     ScriptInterpreter( const Object &global, tdehtml::ChildFrame* frame );
diff --git a/tdehtml/ecma/kjs_dom.h b/tdehtml/ecma/kjs_dom.h
index e812745ea..57f8678f9 100644
--- a/tdehtml/ecma/kjs_dom.h
+++ b/tdehtml/ecma/kjs_dom.h
@@ -246,7 +246,7 @@ namespace KJS {
   };
 
   bool checkNodeSecurity(ExecState *exec, const DOM::Node& n);
-  KDE_EXPORT Value getDOMNode(ExecState *exec, const DOM::Node& n);
+  TDE_EXPORT Value getDOMNode(ExecState *exec, const DOM::Node& n);
   Value getDOMNamedNodeMap(ExecState *exec, const DOM::NamedNodeMap& m);
   Value getDOMNodeList(ExecState *exec, const DOM::NodeList& l);
   Value getDOMDOMImplementation(ExecState *exec, const DOM::DOMImplementation& i);
diff --git a/tdehtml/ecma/kjs_window.h b/tdehtml/ecma/kjs_window.h
index 539131fd5..7badb3947 100644
--- a/tdehtml/ecma/kjs_window.h
+++ b/tdehtml/ecma/kjs_window.h
@@ -68,7 +68,7 @@ namespace KJS {
     static const ClassInfo info;
   };
 
-  class KDE_EXPORT Window : public ObjectImp {
+  class TDE_EXPORT Window : public ObjectImp {
     friend TQGuardedPtr<TDEHTMLPart> getInstance();
     friend class Location;
     friend class WindowFunc;
@@ -245,7 +245,7 @@ namespace KJS {
     int timerId;
   };
 
-  class KDE_EXPORT WindowQObject : public TQObject {
+  class TDE_EXPORT WindowQObject : public TQObject {
     TQ_OBJECT
   public:
     WindowQObject(Window *w);
diff --git a/tdehtml/html/dtd.cpp b/tdehtml/html/dtd.cpp
index d3ea86d51..c2285e112 100644
--- a/tdehtml/html/dtd.cpp
+++ b/tdehtml/html/dtd.cpp
@@ -45,7 +45,7 @@ using namespace DOM;
 // 9 body frameset
 // 10 html
 
-const unsigned short KDE_NO_EXPORT DOM::tagPriority[] = {
+const unsigned short TDE_NO_EXPORT DOM::tagPriority[] = {
     0, // 0
     1, // ID_A == 1
     1, // ID_ABBR
diff --git a/tdehtml/misc/htmlattrs.c b/tdehtml/misc/htmlattrs.c
index e37f4c5c9..1c11494ec 100644
--- a/tdehtml/misc/htmlattrs.c
+++ b/tdehtml/misc/htmlattrs.c
@@ -1013,7 +1013,7 @@ static const unsigned short attrList[] = {
     65535
 };
 
-const char* KDE_NO_EXPORT getAttrName(unsigned short id)
+const char* TDE_NO_EXPORT getAttrName(unsigned short id)
 {
     if (!id || id > TOTAL_KEYWORDS) return "";
     return spool_attr + wordlist_attr[attrList[id]].name;
diff --git a/tdehtml/misc/htmlattrs.h b/tdehtml/misc/htmlattrs.h
index d9aaff067..7f28a5081 100644
--- a/tdehtml/misc/htmlattrs.h
+++ b/tdehtml/misc/htmlattrs.h
@@ -163,6 +163,6 @@ using namespace DOM;
 #define ATTR_VALUE 152
 #define ATTR_LAST_ATTR 152
 #define ATTR_LAST_CI_ATTR 103
-const char* getAttrName(unsigned short id) KDE_NO_EXPORT;
+const char* getAttrName(unsigned short id) TDE_NO_EXPORT;
 
 #endif
diff --git a/tdehtml/misc/htmltags.c b/tdehtml/misc/htmltags.c
index fa701fe69..0ccdfbb01 100644
--- a/tdehtml/misc/htmltags.c
+++ b/tdehtml/misc/htmltags.c
@@ -680,7 +680,7 @@ static const unsigned short tagSList[] = {
    630, 635, 640, 646,    0
 };
 
-const char* KDE_NO_EXPORT getTagName(unsigned short id)
+const char* TDE_NO_EXPORT getTagName(unsigned short id)
 {
     if(id > ID_CLOSE_TAG*2) id = ID_CLOSE_TAG+1;
     return &tagStable[tagSList[id]];
diff --git a/tdehtml/misc/htmltags.h b/tdehtml/misc/htmltags.h
index bf9a8ded8..ae4f7eba9 100644
--- a/tdehtml/misc/htmltags.h
+++ b/tdehtml/misc/htmltags.h
@@ -7,7 +7,7 @@
 #include "dom/dom_string.h"
 #include <tdeglobal.h>
 
-KDE_NO_EXPORT const char* getTagName(unsigned short id);
+TDE_NO_EXPORT const char* getTagName(unsigned short id);
 
 #define ID_A 1
 #define ID_ABBR 2
diff --git a/tdehtml/misc/loader.h b/tdehtml/misc/loader.h
index e340b3023..826759098 100644
--- a/tdehtml/misc/loader.h
+++ b/tdehtml/misc/loader.h
@@ -457,7 +457,7 @@ namespace tdehtml
 	 * init the cache in case it's not already. This needs to get called once
 	 * before using it.
 	 */
-	KDE_EXPORT static void init();
+	TDE_EXPORT static void init();
 
 	/**
 	 * Ask the cache for some url. Will return a cachedObject, and
@@ -481,14 +481,14 @@ namespace tdehtml
 	static void setSize( int bytes );
 	static int size() { return maxSize; };
 	static void statistics();
-	KDE_EXPORT static void flush(bool force=false);
+	TDE_EXPORT static void flush(bool force=false);
 
 	/**
 	 * clears the cache
 	 * Warning: call this only at the end of your program, to clean
 	 * up memory (useful for finding memory holes)
 	 */
-	KDE_EXPORT static void clear();
+	TDE_EXPORT static void clear();
 
 	static Loader *loader() { return m_loader; }
 
diff --git a/tdehtml/misc/loader_jpeg.cpp b/tdehtml/misc/loader_jpeg.cpp
index 9ee5378f9..61f091105 100644
--- a/tdehtml/misc/loader_jpeg.cpp
+++ b/tdehtml/misc/loader_jpeg.cpp
@@ -90,7 +90,7 @@ struct tdehtml_jpeg_source_mgr : public jpeg_source_mgr {
     bool do_progressive;
 
 public:
-    tdehtml_jpeg_source_mgr() KDE_NO_EXPORT;
+    tdehtml_jpeg_source_mgr() TDE_NO_EXPORT;
 };
 
 
diff --git a/tdehtml/misc/makeattrs b/tdehtml/misc/makeattrs
index 935f350bd..1ed890c2c 100644
--- a/tdehtml/misc/makeattrs
+++ b/tdehtml/misc/makeattrs
@@ -67,7 +67,7 @@ print header "#define ATTR_LAST_CI_ATTR $last_ci_attr\n";
 print out "%%\n";
 close out;
 
-print header "const char* getAttrName(unsigned short id) KDE_NO_EXPORT;\n";
+print header "const char* getAttrName(unsigned short id) TDE_NO_EXPORT;\n";
 
 print header "\n#endif\n";
 close header;
@@ -103,7 +103,7 @@ while(defined ($line = shift @a))
     print OUT "    " .$hmap{$amap{$l}}.",\n";
 }
 print OUT "    65535\n};\n\n";
-print OUT "const char* KDE_NO_EXPORT getAttrName(unsigned short id)\n{\n";
+print OUT "const char* TDE_NO_EXPORT getAttrName(unsigned short id)\n{\n";
 print OUT "    if (!id || id > TOTAL_KEYWORDS) return \"\";\n";
 print OUT "    return spool_attr + wordlist_attr[attrList[id]].name;\n";
 print OUT "}\n";
diff --git a/tdehtml/misc/maketags b/tdehtml/misc/maketags
index 8a6abf0ed..0b6dabefd 100644
--- a/tdehtml/misc/maketags
+++ b/tdehtml/misc/maketags
@@ -43,7 +43,7 @@ print header <<EOF;
 #include "dom/dom_string.h"
 #include <tdeglobal.h>
 
-KDE_NO_EXPORT const char* getTagName(unsigned short id);
+TDE_NO_EXPORT const char* getTagName(unsigned short id);
 
 EOF
 
@@ -118,7 +118,7 @@ foreach my $line (@tags)
     ++$c;
 }
 print OUT "    0\n};\n\n";
-print OUT "const char* KDE_NO_EXPORT getTagName(unsigned short id)\n{\n";
+print OUT "const char* TDE_NO_EXPORT getTagName(unsigned short id)\n{\n";
 print OUT "    if(id > ID_CLOSE_TAG*2) id = ID_CLOSE_TAG+1;\n";
 print OUT "    return &tagStable[tagSList[id]];\n}\n";
 
diff --git a/tdehtml/rendering/render_layer.h b/tdehtml/rendering/render_layer.h
index 9c73eb0bb..2854f2c87 100644
--- a/tdehtml/rendering/render_layer.h
+++ b/tdehtml/rendering/render_layer.h
@@ -241,7 +241,7 @@ public:
     // paints the layers that intersect the damage rect from back to
     // front.  The nodeAtPoint method looks for mouse events by walking
     // layers that intersect the point from front to back.
-    KDE_EXPORT void paint(TQPainter *p, const TQRect& damageRect, bool selectionOnly=false);
+    TDE_EXPORT void paint(TQPainter *p, const TQRect& damageRect, bool selectionOnly=false);
     bool nodeAtPoint(RenderObject::NodeInfo& info, int x, int y);
 
     // This method figures out our layerBounds in coordinates relative to
@@ -260,7 +260,7 @@ public:
     void detach(RenderArena* renderArena);
 
 #ifdef ENABLE_DUMP
-    KDE_EXPORT void dump(TQTextStream &stream, const TQString &ind = TQString::null);
+    TDE_EXPORT void dump(TQTextStream &stream, const TQString &ind = TQString::null);
 #endif
 
      // Overloaded new operator.  Derived classes must override operator new
@@ -283,7 +283,7 @@ private:
 
     void collectLayers(TQPtrVector<RenderLayer>*&, TQPtrVector<RenderLayer>*&);
 
-    KDE_EXPORT void paintLayer(RenderLayer* rootLayer, TQPainter *p, const TQRect& paintDirtyRect, bool selectionOnly=false);
+    TDE_EXPORT void paintLayer(RenderLayer* rootLayer, TQPainter *p, const TQRect& paintDirtyRect, bool selectionOnly=false);
     RenderLayer* nodeAtPointForLayer(RenderLayer* rootLayer, RenderObject::NodeInfo& info,
                                      int x, int y, const TQRect& hitTestRect);
     bool shouldBeOverflowOnly() const;
diff --git a/tdehtml/rendering/render_replaced.h b/tdehtml/rendering/render_replaced.h
index 7a5ec5353..24617e0ca 100644
--- a/tdehtml/rendering/render_replaced.h
+++ b/tdehtml/rendering/render_replaced.h
@@ -115,7 +115,7 @@ public:
 #endif
 
     // for ECMA to flush all pending resizes
-    KDE_EXPORT static void flushWidgetResizes();
+    TDE_EXPORT static void flushWidgetResizes();
 
 public slots:
     void slotWidgetDestructed();
diff --git a/tdehtml/rendering/render_style.h b/tdehtml/rendering/render_style.h
index 90aef33df..fbf62a161 100644
--- a/tdehtml/rendering/render_style.h
+++ b/tdehtml/rendering/render_style.h
@@ -843,7 +843,7 @@ class RenderStyle : public Shared<RenderStyle>
 {
     friend class CSSStyleSelector;
 public:
-    KDE_EXPORT static void cleanup();
+    TDE_EXPORT static void cleanup();
 
     // pseudo elements
     enum PseudoId {
diff --git a/tdehtml/tdehtml_caret.cpp b/tdehtml/tdehtml_caret.cpp
index 71d30629b..8bc787c1f 100644
--- a/tdehtml/tdehtml_caret.cpp
+++ b/tdehtml/tdehtml_caret.cpp
@@ -408,7 +408,7 @@ static NodeImpl *prevLeafNode(NodeImpl *r, NodeImpl *baseElem)
  *	\c r, or false for the inside.
  * @param outsideEnd return true when the caret position is at the outside end.
  */
-void /*KDE_NO_EXPORT*/ mapDOMPosToRenderPos(NodeImpl *node, long offset,
+void /*TDE_NO_EXPORT*/ mapDOMPosToRenderPos(NodeImpl *node, long offset,
 		RenderObject *&r, long &r_ofs, bool &outside, bool &outsideEnd)
 {
   if (node->nodeType() == Node::TEXT_NODE) {
@@ -480,7 +480,7 @@ void /*KDE_NO_EXPORT*/ mapDOMPosToRenderPos(NodeImpl *node, long offset,
  * @param node returns DOM node
  * @param offset returns zero-based offset within node
  */
-void /*KDE_NO_EXPORT*/ mapRenderPosToDOMPos(RenderObject *r, long r_ofs,
+void /*TDE_NO_EXPORT*/ mapRenderPosToDOMPos(RenderObject *r, long r_ofs,
 		bool outside, bool outsideEnd, NodeImpl *&node, long &offset)
 {
   node = r->element();
@@ -661,7 +661,7 @@ void CaretBox::dump(TQTextStream &ts, const TQString &ind) const
 #else
 #  define DEBUG_ACIB DEBUG_CARETMODE
 #endif
-void CaretBoxLine::addConvertedInlineBox(InlineBox *box, SeekBoxParams &sbp) /*KDE_NO_EXPORT*/
+void CaretBoxLine::addConvertedInlineBox(InlineBox *box, SeekBoxParams &sbp) /*TDE_NO_EXPORT*/
 {
   // Generate only one outside caret box between two elements. If
   // coalesceOutsideBoxes is true, generating left outside boxes is inhibited.
@@ -768,7 +768,7 @@ kdDebug(6200) << "some replaced or what " << box << endl;
 }
 #undef DEBUG_ACIB
 
-void CaretBoxLine::addCreatedFlowBoxInside(InlineFlowBox *flowBox, const TQFontMetrics &fm) /*KDE_NO_EXPORT*/
+void CaretBoxLine::addCreatedFlowBoxInside(InlineFlowBox *flowBox, const TQFontMetrics &fm) /*TDE_NO_EXPORT*/
 {
 
   CaretBox *caretBox = new CaretBox(flowBox, false, false);
@@ -782,7 +782,7 @@ void CaretBoxLine::addCreatedFlowBoxInside(InlineFlowBox *flowBox, const TQFontM
   caretBox->_h = fm.height();
 }
 
-void CaretBoxLine::addCreatedFlowBoxEdge(InlineFlowBox *flowBox, const TQFontMetrics &fm, bool left, bool rtl) /*KDE_NO_EXPORT*/
+void CaretBoxLine::addCreatedFlowBoxEdge(InlineFlowBox *flowBox, const TQFontMetrics &fm, bool left, bool rtl) /*TDE_NO_EXPORT*/
 {
   CaretBox *caretBox = new CaretBox(flowBox, true, !left);
   caret_boxes.append(caretBox);
@@ -795,7 +795,7 @@ void CaretBoxLine::addCreatedFlowBoxEdge(InlineFlowBox *flowBox, const TQFontMet
   caretBox->_w = 1;
 }
 
-void CaretBoxLine::addCreatedInlineBoxEdge(InlineBox *box, const TQFontMetrics &fm, bool left, bool rtl) /*KDE_NO_EXPORT*/
+void CaretBoxLine::addCreatedInlineBoxEdge(InlineBox *box, const TQFontMetrics &fm, bool left, bool rtl) /*TDE_NO_EXPORT*/
 {
   CaretBox *caretBox = new CaretBox(box, true, !left);
   caret_boxes.append(caretBox);
@@ -811,7 +811,7 @@ void CaretBoxLine::addCreatedInlineBoxEdge(InlineBox *box, const TQFontMetrics &
 CaretBoxLine *CaretBoxLine::constructCaretBoxLine(CaretBoxLineDeleter *deleter,
 	InlineFlowBox *basicFlowBox, InlineBox *seekBox, bool seekOutside,
         bool seekOutsideEnd, CaretBoxIterator &iter, RenderObject *seekObject)
-// 	KDE_NO_EXPORT
+// 	TDE_NO_EXPORT
 {
   // Iterate all inline boxes within this inline flow box.
   // Caret boxes will be created for each
@@ -837,7 +837,7 @@ CaretBoxLine *CaretBoxLine::constructCaretBoxLine(CaretBoxLineDeleter *deleter,
 }
 
 CaretBoxLine *CaretBoxLine::constructCaretBoxLine(CaretBoxLineDeleter *deleter,
-	RenderBox *cb, bool outside, bool outsideEnd, CaretBoxIterator &iter) /*KDE_NO_EXPORT*/
+	RenderBox *cb, bool outside, bool outsideEnd, CaretBoxIterator &iter) /*TDE_NO_EXPORT*/
 {
   int _x = cb->xPos();
   int _y = cb->yPos();
@@ -1314,8 +1314,8 @@ void LinearDocument::initEndIterator()
 
 // == class LineIterator implementation
 
-CaretBoxIterator LineIterator::currentBox /*KDE_NO_EXPORT*/;
-long LineIterator::currentOffset /*KDE_NO_EXPORT*/;
+CaretBoxIterator LineIterator::currentBox /*TDE_NO_EXPORT*/;
+long LineIterator::currentOffset /*TDE_NO_EXPORT*/;
 
 LineIterator::LineIterator(LinearDocument *l, DOM::NodeImpl *node, long offset)
 		: lines(l)
diff --git a/tdehtml/tdehtml_caret_p.h b/tdehtml/tdehtml_caret_p.h
index 6d85a76b2..7a2d5e06b 100644
--- a/tdehtml/tdehtml_caret_p.h
+++ b/tdehtml/tdehtml_caret_p.h
@@ -384,7 +384,7 @@ public:
   static CaretBoxLine *constructCaretBoxLine(MassDeleter<CaretBoxLine> *deleter,
   	InlineFlowBox *baseFlowBox, InlineBox *seekBox, bool seekOutside,
         bool seekOutsideEnd, CaretBoxIterator &iter,
-	RenderObject *seekObject = 0) /*KDE_NO_EXPORT*/;
+	RenderObject *seekObject = 0) /*TDE_NO_EXPORT*/;
 
   /** constructs a new caret box line for the given render block.
    * @param deleter deleter which handles alloc+dealloc of the object
@@ -395,7 +395,7 @@ public:
    *	position for \c cb
    */
   static CaretBoxLine *constructCaretBoxLine(MassDeleter<CaretBoxLine> *deleter,
-  	RenderBox *cb, bool outside, bool outsideEnd, CaretBoxIterator &iter) /*KDE_NO_EXPORT*/;
+  	RenderBox *cb, bool outside, bool outsideEnd, CaretBoxIterator &iter) /*TDE_NO_EXPORT*/;
 
 #if DEBUG_CARETMODE > 0
   void dump(TQTextStream &ts, const TQString &ind) const;
@@ -456,7 +456,7 @@ protected:
    *
    * It will additionally look for the caret box specified in SeekBoxParams.
    */
-  void addConvertedInlineBox(InlineBox *, SeekBoxParams &) /*KDE_NO_EXPORT*/;
+  void addConvertedInlineBox(InlineBox *, SeekBoxParams &) /*TDE_NO_EXPORT*/;
 
   /** creates and adds the edge of a generic inline box
    * @param box inline box
@@ -465,7 +465,7 @@ protected:
    * @param rtl true if direction is rtl
    */
   void addCreatedInlineBoxEdge(InlineBox *box, const TQFontMetrics &fm,
-  	bool left, bool rtl) /*KDE_NO_EXPORT*/;
+  	bool left, bool rtl) /*TDE_NO_EXPORT*/;
   /** creates and adds the edge of an inline flow box
    * @param flowBox inline flow box
    * @param fm font metrics of inline flow box
@@ -473,12 +473,12 @@ protected:
    * @param rtl true if direction is rtl
    */
   void addCreatedFlowBoxEdge(InlineFlowBox *flowBox, const TQFontMetrics &fm,
-  	bool left, bool rtl) /*KDE_NO_EXPORT*/;
+  	bool left, bool rtl) /*TDE_NO_EXPORT*/;
   /** creates and adds the inside of an inline flow box
    * @param flowBox inline flow box
    * @param fm font metrics of inline flow box
    */
-  void addCreatedFlowBoxInside(InlineFlowBox *flowBox, const TQFontMetrics &fm) /*KDE_NO_EXPORT*/;
+  void addCreatedFlowBoxInside(InlineFlowBox *flowBox, const TQFontMetrics &fm) /*TDE_NO_EXPORT*/;
 
   friend class CaretBoxIterator;
 };
diff --git a/tdehtml/tdehtml_ext.cpp b/tdehtml/tdehtml_ext.cpp
index 6e2b6fa17..16f60d277 100644
--- a/tdehtml/tdehtml_ext.cpp
+++ b/tdehtml/tdehtml_ext.cpp
@@ -956,8 +956,8 @@ void TDEHTMLPartBrowserHostExtension::virtual_hook( int id, void *data )
 
 
 // defined in tdehtml_part.cpp
-extern const int KDE_NO_EXPORT fastZoomSizes[];
-extern const int KDE_NO_EXPORT fastZoomSizeCount;
+extern const int TDE_NO_EXPORT fastZoomSizes[];
+extern const int TDE_NO_EXPORT fastZoomSizeCount;
 
 // BCI: remove in KDE 4
 TDEHTMLZoomFactorAction::TDEHTMLZoomFactorAction( TDEHTMLPart *part, bool direction, const TQString &text, const TQString &icon, const TQObject *receiver, const char *slot, TQObject *parent, const char *name )
diff --git a/tdehtml/tdehtml_factory.cpp b/tdehtml/tdehtml_factory.cpp
index 4094030c6..7aaf16b5a 100644
--- a/tdehtml/tdehtml_factory.cpp
+++ b/tdehtml/tdehtml_factory.cpp
@@ -39,7 +39,7 @@
 
 template class TQPtrList<TDEHTMLPart>;
 
-extern "C" KDE_EXPORT void *init_libtdehtml()
+extern "C" TDE_EXPORT void *init_libtdehtml()
 {
     // We can't use a plain self() here, because that would
     // return the global factory, which might already exist
diff --git a/tdehtml/tdehtml_factory.h b/tdehtml/tdehtml_factory.h
index 5d424282c..3fd53b163 100644
--- a/tdehtml/tdehtml_factory.h
+++ b/tdehtml/tdehtml_factory.h
@@ -36,7 +36,7 @@ namespace DOM
   class DocumentImpl;
 }
 
-class KDE_EXPORT TDEHTMLFactory : public KParts::Factory
+class TDE_EXPORT TDEHTMLFactory : public KParts::Factory
 {
   TQ_OBJECT
   friend class DOM::DocumentImpl;
diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp
index 81c228e90..712bbe764 100644
--- a/tdehtml/tdehtml_part.cpp
+++ b/tdehtml/tdehtml_part.cpp
@@ -5673,8 +5673,8 @@ static const int minZoom = 20;
 static const int maxZoom = 300;
 
 // My idea of useful stepping ;-) (LS)
-extern const int KDE_NO_EXPORT fastZoomSizes[] = { 20, 50, 75, 90, 100, 120, 150, 200, 300 };
-extern const int KDE_NO_EXPORT fastZoomSizeCount = sizeof fastZoomSizes / sizeof fastZoomSizes[0];
+extern const int TDE_NO_EXPORT fastZoomSizes[] = { 20, 50, 75, 90, 100, 120, 150, 200, 300 };
+extern const int TDE_NO_EXPORT fastZoomSizeCount = sizeof fastZoomSizes / sizeof fastZoomSizes[0];
 
 void TDEHTMLPart::slotIncZoom()
 {
diff --git a/tdehtml/tdehtmlpart_p.h b/tdehtml/tdehtmlpart_p.h
index 132624fdd..53d0fd4b6 100644
--- a/tdehtml/tdehtmlpart_p.h
+++ b/tdehtml/tdehtmlpart_p.h
@@ -72,7 +72,7 @@ namespace KParts
 
 namespace tdehtml
 {
-  class KDE_EXPORT ChildFrame : public TQObject
+  class TDE_EXPORT ChildFrame : public TQObject
   {
       TQ_OBJECT
   public:
@@ -118,7 +118,7 @@ namespace tdehtml
 
 struct TDEHTMLFrameList : public TQValueList<tdehtml::ChildFrame*>
 {
-    Iterator find( const TQString &name ) KDE_NO_EXPORT;
+    Iterator find( const TQString &name ) TDE_NO_EXPORT;
 };
 
 typedef TDEHTMLFrameList::ConstIterator ConstFrameIt;
diff --git a/tdehtml/test_regression_fontoverload.cpp b/tdehtml/test_regression_fontoverload.cpp
index 0faf49fcc..6cb06f824 100644
--- a/tdehtml/test_regression_fontoverload.cpp
+++ b/tdehtml/test_regression_fontoverload.cpp
@@ -206,7 +206,7 @@ static TQString helv_pickxlfd( int pixelsize, bool italic, bool bold )
 
 }
 
-KDE_EXPORT QFontEngine *
+TDE_EXPORT QFontEngine *
 TQFontDatabase::findFont( TQFont::Script script, const QFontPrivate *fp,
 			 const QFontDef &request, int )
 {
@@ -253,13 +253,13 @@ TQFontDatabase::findFont( TQFont::Script script, const QFontPrivate *fp,
     return fe;
 }
 
-KDE_EXPORT bool TQFontDatabase::isBitmapScalable( const TQString &,
+TDE_EXPORT bool TQFontDatabase::isBitmapScalable( const TQString &,
 				      const TQString &) const
 {
     return true;
 }
 
-KDE_EXPORT bool  TQFontDatabase::isSmoothlyScalable( const TQString &,
+TDE_EXPORT bool  TQFontDatabase::isSmoothlyScalable( const TQString &,
                                          const TQString &) const
 {
     return true;
@@ -280,22 +280,22 @@ bool TDEHTMLSettings::unfinishedImageFrame() const
   return false;
 }
 
-KDE_EXPORT int TQPaintDevice::x11AppDpiY( int )
+TDE_EXPORT int TQPaintDevice::x11AppDpiY( int )
 {
     return 100;
 }
 
-KDE_EXPORT int TQPaintDevice::x11AppDpiX( int )
+TDE_EXPORT int TQPaintDevice::x11AppDpiX( int )
 {
     return 100;
 }
 
-KDE_EXPORT void TQFont::insertSubstitution(const TQString &,
+TDE_EXPORT void TQFont::insertSubstitution(const TQString &,
                                const TQString &)
 {
 }
 
-KDE_EXPORT void TQFont::insertSubstitutions(const TQString &,
+TDE_EXPORT void TQFont::insertSubstitutions(const TQString &,
                                 const TQStringList &)
 {
 }
@@ -339,7 +339,7 @@ void DCOPClient::processSocketData( int )
 #include <tqapplication.h>
 #include <tqpalette.h>
 
-KDE_EXPORT void TQApplication::setPalette( const TQPalette &, bool ,
+TDE_EXPORT void TQApplication::setPalette( const TQPalette &, bool ,
                                const char*  )
 {
     static bool done = false;
diff --git a/tdehtml/xml/dom_nodeimpl.cpp b/tdehtml/xml/dom_nodeimpl.cpp
index 22b71051f..c8525fbcc 100644
--- a/tdehtml/xml/dom_nodeimpl.cpp
+++ b/tdehtml/xml/dom_nodeimpl.cpp
@@ -47,7 +47,7 @@
 
 // from tdehtml_caret_p.h
 namespace tdehtml {
-void /*KDE_NO_EXPORT*/ mapDOMPosToRenderPos(DOM::NodeImpl *node, long offset,
+void /*TDE_NO_EXPORT*/ mapDOMPosToRenderPos(DOM::NodeImpl *node, long offset,
 		tdehtml::RenderObject *&r, long &r_ofs, bool &outside, bool &outsideEnd);
 }