Rename additional instances of KDE to TDE

129 files changed, 423 insertions, 423 deletions

diff --git a/tdecore/fakes.c b/tdecore/fakes.c
index 14f162eca..b64f55d25 100644
--- a/tdecore/fakes.c
+++ b/tdecore/fakes.c
@@ -42,7 +42,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-KDECORE_EXPORT int setenv(const char *name, const char *value, int overwrite) {
+TDECORE_EXPORT int setenv(const char *name, const char *value, int overwrite) {
     int i;
     char * a;
 
@@ -75,7 +75,7 @@ KDECORE_EXPORT int setenv(const char *name, const char *value, int overwrite) {
 extern char ** environ;
 #endif
 
-KDECORE_EXPORT void unsetenv (name)
+TDECORE_EXPORT void unsetenv (name)
      const char *name;
 {
   size_t len;
@@ -186,7 +186,7 @@ int seteuid(uid_t euid)
 
    Returns a file descriptor open on the file for reading and writing.  */
 
-KDECORE_EXPORT int mkstemps (char* _template, int suffix_len)
+TDECORE_EXPORT int mkstemps (char* _template, int suffix_len)
 {
   static const char letters[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
   char *XXXXXX;
@@ -238,7 +238,7 @@ KDECORE_EXPORT int mkstemps (char* _template, int suffix_len)
 #endif /* !HAVE_MKSTEMPS */
 
 #ifndef HAVE_MKSTEMP
-KDECORE_EXPORT int mkstemp (char* _template)
+TDECORE_EXPORT int mkstemp (char* _template)
 {
   return mkstemps( _template, 0 );
 }
@@ -265,7 +265,7 @@ KDECORE_EXPORT int mkstemp (char* _template)
 
    Returns a file descriptor open on the file for reading and writing.  */
 
-KDECORE_EXPORT char* mkdtemp (char* _template)
+TDECORE_EXPORT char* mkdtemp (char* _template)
 {
   static const char letters[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
   char *XXXXXX;
@@ -315,7 +315,7 @@ KDECORE_EXPORT char* mkdtemp (char* _template)
 #ifndef ENOTSUP
 #define ENOTSUP 134 /* Not supported */
 #endif
-KDECORE_EXPORT int revoke(const char *tty)
+TDECORE_EXPORT int revoke(const char *tty)
 {
         errno = ENOTSUP;
         return -1;
@@ -324,7 +324,7 @@ KDECORE_EXPORT int revoke(const char *tty)
 
 #ifndef HAVE_STRLCPY
 #include <string.h>
-KDECORE_EXPORT unsigned long strlcpy(char* d, const char* s, unsigned long bufsize)
+TDECORE_EXPORT unsigned long strlcpy(char* d, const char* s, unsigned long bufsize)
 {
     unsigned long len, ret = strlen(s);
 
@@ -343,7 +343,7 @@ KDECORE_EXPORT unsigned long strlcpy(char* d, const char* s, unsigned long bufsi
 
 #ifndef HAVE_STRLCAT
 #include <string.h>
-KDECORE_EXPORT unsigned long strlcat(char* d, const char* s, unsigned long bufsize)
+TDECORE_EXPORT unsigned long strlcat(char* d, const char* s, unsigned long bufsize)
 {
     char *cp;
     unsigned long ret, len1, len2 = strlen(s);
diff --git a/tdecore/kaboutdata.h b/tdecore/kaboutdata.h
index 3165c89d9..b9eceb678 100644
--- a/tdecore/kaboutdata.h
+++ b/tdecore/kaboutdata.h
@@ -51,7 +51,7 @@ class KAboutDataPrivate;
  *   KCmdLineArgs::init(argc, argv, &about);
  * \endcode
  */
-class KDECORE_EXPORT KAboutPerson
+class TDECORE_EXPORT KAboutPerson
 {
 public:
     /**
@@ -131,7 +131,7 @@ class KAboutTranslatorPrivate;
  * translator information is generated dynamically from the translation
  * of a dummy string.
 */
-class KDECORE_EXPORT KAboutTranslator
+class TDECORE_EXPORT KAboutTranslator
 {
 public:
     /**
@@ -179,7 +179,7 @@ private:
  * classes.
  * @author Espen Sand (espen@kde.org), David Faure (faure@kde.org)
  */
-class KDECORE_EXPORT KAboutData
+class TDECORE_EXPORT KAboutData
 {
   public:
   /**
diff --git a/tdecore/kaccel.h b/tdecore/kaccel.h
index 7bdf9e0e7..b223be9bb 100644
--- a/tdecore/kaccel.h
+++ b/tdecore/kaccel.h
@@ -90,7 +90,7 @@ class KAccelPrivate;
  * @see KKeyDialog
  */
 
-class KDECORE_EXPORT KAccel : public TQAccel
+class TDECORE_EXPORT KAccel : public TQAccel
 {
 	Q_OBJECT
  public:
diff --git a/tdecore/kaccelaction.h b/tdecore/kaccelaction.h
index d55e4517c..470c70559 100644
--- a/tdecore/kaccelaction.h
+++ b/tdecore/kaccelaction.h
@@ -69,7 +69,7 @@ class KConfigBase;
  * @see KKeyChooser
  * @see KKeyDialog
  */
-class KDECORE_EXPORT KAccelAction
+class TDECORE_EXPORT KAccelAction
 {
  public:
         /**
@@ -366,7 +366,7 @@ class KDECORE_EXPORT KAccelAction
  * @short A collection of accelerator actions
  * @see KAccelAction
  */
-class KDECORE_EXPORT KAccelActions
+class TDECORE_EXPORT KAccelActions
 {
  public:
        /**
diff --git a/tdecore/kaccelbase.h b/tdecore/kaccelbase.h
index 07e3f4833..082f09324 100644
--- a/tdecore/kaccelbase.h
+++ b/tdecore/kaccelbase.h
@@ -118,7 +118,7 @@ class TQWidget;
  * @short Configurable key binding support.
  */
 
-class KDECORE_EXPORT KAccelBase
+class TDECORE_EXPORT KAccelBase
 {
  public:
 	/** Initialization mode of the KAccelBase, used in constructor. */
diff --git a/tdecore/kaccelmanager.h b/tdecore/kaccelmanager.h
index 21655fd9c..69846dad2 100644
--- a/tdecore/kaccelmanager.h
+++ b/tdecore/kaccelmanager.h
@@ -37,7 +37,7 @@ class TQString;
  * @since 3.1
 */
 
-class KDECORE_EXPORT KAcceleratorManager
+class TDECORE_EXPORT KAcceleratorManager
 {
 public:
 
diff --git a/tdecore/kaccelprivate.h b/tdecore/kaccelprivate.h
index 0a6cdc19b..8d009b950 100644
--- a/tdecore/kaccelprivate.h
+++ b/tdecore/kaccelprivate.h
@@ -9,7 +9,7 @@ class KAccelAction;
 /**
  * @internal
  */
-class KDECORE_EXPORT KAccelPrivate : public TQObject, public KAccelBase
+class TDECORE_EXPORT KAccelPrivate : public TQObject, public KAccelBase
 {
 	Q_OBJECT
  public:
diff --git a/tdecore/kallocator.h b/tdecore/kallocator.h
index 2fed42c85..2d5d39f2a 100644
--- a/tdecore/kallocator.h
+++ b/tdecore/kallocator.h
@@ -43,7 +43,7 @@ class KZoneAllocatorPrivate;
  * memory though.
  * @author Waldo Bastian <bastian@kde.org>, Michael Matz <matz@kde.org>
  */
-class KDECORE_EXPORT KZoneAllocator
+class TDECORE_EXPORT KZoneAllocator
 {
 public:
     /**
diff --git a/tdecore/kappdcopiface.h b/tdecore/kappdcopiface.h
index 448f08d66..76e62ca64 100644
--- a/tdecore/kappdcopiface.h
+++ b/tdecore/kappdcopiface.h
@@ -34,7 +34,7 @@ dcop interface to all KDE applications that use it.
 @short DCOP interface to KApplication.
 @author Ian Reinhart Geiser <geiseri@yahoo.com>
 */
-class KDECORE_EXPORT KAppDCOPInterface : virtual public DCOPObject
+class TDECORE_EXPORT KAppDCOPInterface : virtual public DCOPObject
 {
 K_DCOP
 
diff --git a/tdecore/kapplication.cpp b/tdecore/kapplication.cpp
index 9fdcfbcb9..6fad03069 100644
--- a/tdecore/kapplication.cpp
+++ b/tdecore/kapplication.cpp
@@ -200,7 +200,7 @@ static int x11_error(Display *dpy, XErrorEvent *ev) {
 
 // duplicated from patched Qt, so that there won't be unresolved symbols if Qt gets
 // replaced by unpatched one
-KDECORE_EXPORT bool qt_qclipboard_bailout_hack = false;
+TDECORE_EXPORT bool qt_qclipboard_bailout_hack = false;
 
 template class TQPtrList<KSessionManaged>;
 
diff --git a/tdecore/kapplication.h b/tdecore/kapplication.h
index f1be3bfb8..bec523a0b 100644
--- a/tdecore/kapplication.h
+++ b/tdecore/kapplication.h
@@ -93,7 +93,7 @@ class KApplicationPrivate;
 * @short Controls and provides information to all KDE applications.
 * @author Matthias Kalle Dalheimer <kalle@kde.org>
 */
-class KDECORE_EXPORT KApplication : public TQApplication, public KInstance
+class TDECORE_EXPORT KApplication : public TQApplication, public KInstance
 {
 
   Q_OBJECT
@@ -1562,7 +1562,7 @@ private:
  * @param mode     The access mode, as in the access() system call.
  * @return Whether the access is allowed, true = Access allowed
  */
-KDECORE_EXPORT bool checkAccess(const TQString& pathname, int mode);
+TDECORE_EXPORT bool checkAccess(const TQString& pathname, int mode);
 
 class KSessionManagedPrivate;
 
@@ -1582,7 +1582,7 @@ class KSessionManagedPrivate;
   @short Highlevel access to session management.
   @author Matthias Ettrich <ettrich@kde.org>
  */
-class KDECORE_EXPORT KSessionManaged
+class TDECORE_EXPORT KSessionManaged
 {
 public:
   KSessionManaged();
diff --git a/tdecore/kasyncio.h b/tdecore/kasyncio.h
index ad2fe1e30..f72bbffd2 100644
--- a/tdecore/kasyncio.h
+++ b/tdecore/kasyncio.h
@@ -39,7 +39,7 @@ class KAsyncIOPrivate;
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  * @short Asynchronous I/O support
  */
-class KDECORE_EXPORT KAsyncIO:
+class TDECORE_EXPORT KAsyncIO:
 #ifdef USE_QT4
 #else // USE_QT4
 public TQObject,
diff --git a/tdecore/kaudioplayer.h b/tdecore/kaudioplayer.h
index 81ca2cdf7..f9a8c0ca8 100644
--- a/tdecore/kaudioplayer.h
+++ b/tdecore/kaudioplayer.h
@@ -53,7 +53,7 @@ class KAudioPlayerPrivate;
  *
  */
 //REVISED: hausmann
-class KDECORE_EXPORT KAudioPlayer : public TQObject {
+class TDECORE_EXPORT KAudioPlayer : public TQObject {
 Q_OBJECT
 public:
 	/**
diff --git a/tdecore/kbufferedio.h b/tdecore/kbufferedio.h
index abdb68f80..8c53d0676 100644
--- a/tdecore/kbufferedio.h
+++ b/tdecore/kbufferedio.h
@@ -53,7 +53,7 @@ class KBufferedIOPrivate;
  * @author Thiago Macieira <thiagom@mail.com>
  * @short Buffered I/O
  */
-class KDECORE_EXPORT KBufferedIO: public KAsyncIO
+class TDECORE_EXPORT KBufferedIO: public KAsyncIO
 {
   Q_OBJECT
   TQ_OBJECT
diff --git a/tdecore/kcalendarsystem.h b/tdecore/kcalendarsystem.h
index 826539a65..1fbfb017c 100644
--- a/tdecore/kcalendarsystem.h
+++ b/tdecore/kcalendarsystem.h
@@ -39,7 +39,7 @@ class KCalendarSystemPrivate;
  * @author Carlos Moro <cfmoro@correo.uniovi.es>
  * @since 3.2
  */
-class KDECORE_EXPORT KCalendarSystem
+class TDECORE_EXPORT KCalendarSystem
 {
 public:
   /**
diff --git a/tdecore/kcalendarsystemfactory.h b/tdecore/kcalendarsystemfactory.h
index 0ceae43b9..3517d4c86 100644
--- a/tdecore/kcalendarsystemfactory.h
+++ b/tdecore/kcalendarsystemfactory.h
@@ -33,7 +33,7 @@ class KLocale;
  * @author Carlos Moro <cfmoro@correo.uniovi.es>
  * @since 3.2
  */
-class KDECORE_EXPORT KCalendarSystemFactory
+class TDECORE_EXPORT KCalendarSystemFactory
 {
 public:
   KCalendarSystemFactory ();
diff --git a/tdecore/kcalendarsystemgregorian.h b/tdecore/kcalendarsystemgregorian.h
index b116c40f4..98fd10e90 100644
--- a/tdecore/kcalendarsystemgregorian.h
+++ b/tdecore/kcalendarsystemgregorian.h
@@ -40,7 +40,7 @@ class KCalendarSystemGregorianPrivate;
  * @author Carlos Moro <cfmoro@correo.uniovi.es>
  * @since 3.2
  */
-class KDECORE_EXPORT KCalendarSystemGregorian: public KCalendarSystem
+class TDECORE_EXPORT KCalendarSystemGregorian: public KCalendarSystem
 {
 public:
   /** Constructor. Just like KCalendarSystem::KCalendarSystem(). */
diff --git a/tdecore/kcalendarsystemhebrew.h b/tdecore/kcalendarsystemhebrew.h
index ec0d82ba2..728954c58 100644
--- a/tdecore/kcalendarsystemhebrew.h
+++ b/tdecore/kcalendarsystemhebrew.h
@@ -42,7 +42,7 @@ class KCalendarSystemHebrewPrivate;
  * @author Hans Petter Bieker <bieker@kde.org>
  * @since 3.2
  */
-class KDECORE_EXPORT KCalendarSystemHebrew : public KCalendarSystem
+class TDECORE_EXPORT KCalendarSystemHebrew : public KCalendarSystem
 {
 public:
   /** Constructor. Just like KCalendarSystem::KCalendarSystem(). */
diff --git a/tdecore/kcalendarsystemhijri.h b/tdecore/kcalendarsystemhijri.h
index 214b7a50a..444f938c7 100644
--- a/tdecore/kcalendarsystemhijri.h
+++ b/tdecore/kcalendarsystemhijri.h
@@ -40,7 +40,7 @@ class KCalendarSystemHijriPrivate;
  * @author Carlos Moro <cfmoro@correo.uniovi.es>
  * @since 3.2
  */
-class KDECORE_EXPORT KCalendarSystemHijri : public KCalendarSystem
+class TDECORE_EXPORT KCalendarSystemHijri : public KCalendarSystem
 {
 public:
   /** Constructor. Just like KCalendarSystem::KCalendarSystem(). */
diff --git a/tdecore/kcalendarsystemjalali.h b/tdecore/kcalendarsystemjalali.h
index e7ec99fe3..e5dd56681 100644
--- a/tdecore/kcalendarsystemjalali.h
+++ b/tdecore/kcalendarsystemjalali.h
@@ -33,7 +33,7 @@ class KCalendarSystemJalaliPrivate;
 /**
  Jalali calendar type implementation
 */
-class KDECORE_EXPORT KCalendarSystemJalali : public KCalendarSystem
+class TDECORE_EXPORT KCalendarSystemJalali : public KCalendarSystem
 {
 public:
   /** Constructor. Just like KCalendarSystem::KCalendarSystem(). */
diff --git a/tdecore/kcatalogue.h b/tdecore/kcatalogue.h
index 0658b9000..2cee80feb 100644
--- a/tdecore/kcatalogue.h
+++ b/tdecore/kcatalogue.h
@@ -34,7 +34,7 @@ class KCataloguePrivate;
  * @see KLocale
  */
 //REVISED: hausmann
-class KDECORE_EXPORT KCatalogue
+class TDECORE_EXPORT KCatalogue
 {
 public:
   /**
diff --git a/tdecore/kcharsets.h b/tdecore/kcharsets.h
index 32c91148a..d3b4eec41 100644
--- a/tdecore/kcharsets.h
+++ b/tdecore/kcharsets.h
@@ -40,7 +40,7 @@ class TQTextCodec;
  *
  * @author Lars Knoll <knoll@kde.org>
  */
-class KDECORE_EXPORT KCharsets
+class TDECORE_EXPORT KCharsets
 {
     friend class KGlobal;
 
diff --git a/tdecore/kcheckaccelerators.h b/tdecore/kcheckaccelerators.h
index 6a9439be6..7f25b4380 100644
--- a/tdecore/kcheckaccelerators.h
+++ b/tdecore/kcheckaccelerators.h
@@ -63,7 +63,7 @@ class TQTextView;
  there are shown all conflicts grouped by accelerator, and a list of all used
  accelerators.
 */
-class KDECORE_EXPORT KCheckAccelerators : public TQObject
+class TDECORE_EXPORT KCheckAccelerators : public TQObject
 {
     Q_OBJECT
 public:
diff --git a/tdecore/kclipboard.h b/tdecore/kclipboard.h
index 9432d70aa..bd6605b6b 100644
--- a/tdecore/kclipboard.h
+++ b/tdecore/kclipboard.h
@@ -33,7 +33,7 @@
  * @since 3.1
  * @internal
  */
-class KDECORE_EXPORT KClipboardSynchronizer : public TQObject
+class TDECORE_EXPORT KClipboardSynchronizer : public TQObject
 {
     Q_OBJECT
 
diff --git a/tdecore/kcmdlineargs.h b/tdecore/kcmdlineargs.h
index b4386c629..08a2a6614 100644
--- a/tdecore/kcmdlineargs.h
+++ b/tdecore/kcmdlineargs.h
@@ -37,7 +37,7 @@ typedef TQValueList<TQCString> QCStringList;
  *
  * @see KCmdLineArgs for additional usage information
  */
-struct KDECORE_EXPORT KCmdLineOptions
+struct TDECORE_EXPORT KCmdLineOptions
 {
    /**
     * The name of the argument as it should be called on the command line and
@@ -219,7 +219,7 @@ class KCmdLineArgsPrivate;
  *  @author Waldo Bastian
  *  @version 0.0.4
  */
-class KDECORE_EXPORT KCmdLineArgs
+class TDECORE_EXPORT KCmdLineArgs
 {
   friend class KApplication;
   friend class KUniqueApplication;
diff --git a/tdecore/kcompletion.h b/tdecore/kcompletion.h
index f6c8f0f82..e6ac36758 100644
--- a/tdecore/kcompletion.h
+++ b/tdecore/kcompletion.h
@@ -129,7 +129,7 @@ class TQPopupMenu;
  *
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  */
-class KDECORE_EXPORT KCompletion : public TQObject
+class TDECORE_EXPORT KCompletion : public TQObject
 {
     Q_ENUMS( CompOrder )
     Q_PROPERTY( CompOrder order READ order WRITE setOrder )
@@ -612,7 +612,7 @@ class KCompletionMatchesPrivate;
  *
  * @short List for keeping matches returned from KCompletion
  */
-class KDECORE_EXPORT KCompletionMatches : public KCompletionMatchesList
+class TDECORE_EXPORT KCompletionMatches : public KCompletionMatchesList
 {
 public:
     KCompletionMatches( bool sort );
@@ -660,7 +660,7 @@ private:
  * @short An abstract class for adding text completion support to widgets.
  * @author Dawit Alemayehu <adawit@kde.org>
  */
-class KDECORE_EXPORT KCompletionBase
+class TDECORE_EXPORT KCompletionBase
 {
 public:
     /**
diff --git a/tdecore/kcompletion_private.h b/tdecore/kcompletion_private.h
index 1ce613faa..fcfea7243 100644
--- a/tdecore/kcompletion_private.h
+++ b/tdecore/kcompletion_private.h
@@ -31,7 +31,7 @@ class KCompTreeNode;
 /**
  * @internal
  */
-class KDECORE_EXPORT KCompTreeNodeList
+class TDECORE_EXPORT KCompTreeNodeList
 {
 public:
     KCompTreeNodeList() : first(0), last(0), m_count(0) {}
@@ -81,7 +81,7 @@ typedef KCompTreeNodeList KCompTreeChildren;
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  * @internal
  */
-class KDECORE_EXPORT KCompTreeNode : public TQChar
+class TDECORE_EXPORT KCompTreeNode : public TQChar
 {
 public:
     KCompTreeNode() : TQChar(), myWeight(0) {}
@@ -146,7 +146,7 @@ typedef KSortableValueList<TQString> KCompletionMatchesList;
 /**
  * @internal
  */
-class KDECORE_EXPORT KCompletionMatchesWrapper
+class TDECORE_EXPORT KCompletionMatchesWrapper
 {
 public:
     KCompletionMatchesWrapper( bool sort = false )
diff --git a/tdecore/kconfig.h b/tdecore/kconfig.h
index 19ff09314..e3eb52f64 100644
--- a/tdecore/kconfig.h
+++ b/tdecore/kconfig.h
@@ -40,7 +40,7 @@ class KConfigPrivate;
 * @see KGlobal::config(), KConfigBase, KSimpleConfig
 * @short KDE Configuration Management class
 */
-class KDECORE_EXPORT KConfig : public KConfigBase
+class TDECORE_EXPORT KConfig : public KConfigBase
 {
   Q_OBJECT
 
@@ -270,7 +270,7 @@ private:
  * KSharedConfig provides a reference counted, shared memory variant
  * of KConfig.
  */
-class KDECORE_EXPORT KSharedConfig : public KConfig, public KShared
+class TDECORE_EXPORT KSharedConfig : public KConfig, public KShared
 {
   friend class TQValueList<KSharedConfig*>;
 public:
diff --git a/tdecore/kconfig_compiler/Makefile.am b/tdecore/kconfig_compiler/Makefile.am
index d7b1400a4..5a3b0f2e8 100644
--- a/tdecore/kconfig_compiler/Makefile.am
+++ b/tdecore/kconfig_compiler/Makefile.am
@@ -4,8 +4,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir) $(all_includes)
 
 bin_PROGRAMS = kconfig_compiler
 
-kconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-kconfig_compiler_LDADD = $(LIB_KDECORE)
+kconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kconfig_compiler_LDADD = $(LIB_TDECORE)
 kconfig_compiler_SOURCES = kconfig_compiler.cpp
 
 TESTFILES = test1.kcfg test2.kcfg test3.kcfg test4.kcfg test_dpointer.kcfg
diff --git a/tdecore/kconfig_compiler/example/Makefile.am b/tdecore/kconfig_compiler/example/Makefile.am
index 9c0454ad8..5009a3e6a 100644
--- a/tdecore/kconfig_compiler/example/Makefile.am
+++ b/tdecore/kconfig_compiler/example/Makefile.am
@@ -3,12 +3,12 @@ AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir) $(all_includes)
 check_PROGRAMS = example # autoexample
 EXTRA_PROGRAMS = autoexample
 
-example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-example_LDADD = $(LIB_KDECORE)
+example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+example_LDADD = $(LIB_TDECORE)
 example_SOURCES = example.cpp exampleprefs_base.cpp
 
-autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-autoexample_LDADD = $(LIB_KDECORE) $(LIB_KDEUI)
+autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+autoexample_LDADD = $(LIB_TDECORE) $(LIB_TDEUI)
 autoexample_SOURCES = exampleprefs_base.cpp general_base.ui myoptions_base.ui \
   autoexample.cpp  
 
diff --git a/tdecore/kconfig_compiler/tests/Makefile.am b/tdecore/kconfig_compiler/tests/Makefile.am
index 0b47449fa..9462c800b 100644
--- a/tdecore/kconfig_compiler/tests/Makefile.am
+++ b/tdecore/kconfig_compiler/tests/Makefile.am
@@ -14,44 +14,44 @@ CLEANFILES = test1.cpp test1.h \
 						 test_dpointer.cpp test_dpointer.h \
              md5sums
 
-test1_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-test1_LDADD = $(LIB_KDECORE)
+test1_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test1_LDADD = $(LIB_TDECORE)
 test1_SOURCES = test1main.cpp test1.cpp
 
-test2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-test2_LDADD = $(LIB_KDECORE)
+test2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test2_LDADD = $(LIB_TDECORE)
 test2_SOURCES = test2main.cpp test2.cpp
 
-test3_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-test3_LDADD = $(LIB_KDECORE)
+test3_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test3_LDADD = $(LIB_TDECORE)
 test3_SOURCES = test3main.cpp test3.cpp
 
-test4_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-test4_LDADD = $(LIB_KDECORE)
+test4_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test4_LDADD = $(LIB_TDECORE)
 test4_SOURCES = test4main.cpp test4.cpp
 
-test5_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-test5_LDADD = $(LIB_KDECORE)
+test5_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test5_LDADD = $(LIB_TDECORE)
 test5_SOURCES = test5main.cpp test5.cpp
 
-test6_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-test6_LDADD = $(LIB_KDECORE)
+test6_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test6_LDADD = $(LIB_TDECORE)
 test6_SOURCES = test6main.cpp test6.cpp
 
-test7_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-test7_LDADD = $(LIB_KDECORE)
+test7_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test7_LDADD = $(LIB_TDECORE)
 test7_SOURCES = test7main.cpp test7.cpp
 
-test8_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-test8_LDADD = $(LIB_KDECORE)
+test8_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test8_LDADD = $(LIB_TDECORE)
 test8_SOURCES = test8main.cpp test8a.cpp test8b.cpp
 
-test9_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-test9_LDADD = $(LIB_KDECORE)
+test9_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test9_LDADD = $(LIB_TDECORE)
 test9_SOURCES = test9main.cpp test9.cpp
 
-test_dpointer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-test_dpointer_LDADD = $(LIB_KDECORE)
+test_dpointer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test_dpointer_LDADD = $(LIB_TDECORE)
 test_dpointer_SOURCES = test_dpointer_main.cpp test_dpointer.cpp
 
 check_LTLIBRARIES = kunittest_kconfigcompiler_test.la
diff --git a/tdecore/kconfigbackend.h b/tdecore/kconfigbackend.h
index 3b2418330..cb0947203 100644
--- a/tdecore/kconfigbackend.h
+++ b/tdecore/kconfigbackend.h
@@ -45,7 +45,7 @@ class KConfigBackEndPrivate;
  *         Matthias Kalle Dalheimer <kalle@kde.org>
  * @short KDE Configuration file loading/saving abstract base class
  */
-class KDECORE_EXPORT KConfigBackEnd
+class TDECORE_EXPORT KConfigBackEnd
 {
   friend class KConfig;
   friend class KSharedConfig;
@@ -188,7 +188,7 @@ protected:
  * @author Preston Brown <pbrown@kde.org>,
  *         Matthias Kalle Dalheimer <kalle@kde.org>
  */
-class KDECORE_EXPORT KConfigINIBackEnd : public KConfigBackEnd
+class TDECORE_EXPORT KConfigINIBackEnd : public KConfigBackEnd
 {
 
 public:
diff --git a/tdecore/kconfigbase.h b/tdecore/kconfigbase.h
index 4f3dd545b..13d2a1761 100644
--- a/tdecore/kconfigbase.h
+++ b/tdecore/kconfigbase.h
@@ -67,7 +67,7 @@ class KConfigGroup;
  * @see KSimpleConfig
  * @see KSharedConfig
  */
-class KDECORE_EXPORT KConfigBase : public TQObject
+class TDECORE_EXPORT KConfigBase : public TQObject
 {
   Q_OBJECT
   TQ_OBJECT
@@ -2056,7 +2056,7 @@ class KConfigGroupSaverPrivate;
   * @short Helper class for easier use of KConfig/KSimpleConfig groups
   */
 
-class KDECORE_EXPORT KConfigGroupSaver // KDE4 remove
+class TDECORE_EXPORT KConfigGroupSaver // KDE4 remove
 {
 public:
   /**
@@ -2100,7 +2100,7 @@ class KConfigGroupPrivate;
 /**
  * A KConfigBase derived class for one specific group in a KConfig object.
  */
-class KDECORE_EXPORT KConfigGroup: public KConfigBase
+class TDECORE_EXPORT KConfigGroup: public KConfigBase
 {
 public:
    /**
diff --git a/tdecore/kconfigdata.h b/tdecore/kconfigdata.h
index e514b2781..940c54305 100644
--- a/tdecore/kconfigdata.h
+++ b/tdecore/kconfigdata.h
@@ -29,7 +29,7 @@
  * map/dict/list config node entry.
  * @internal
  */
-struct KDECORE_EXPORT KEntry
+struct TDECORE_EXPORT KEntry
 {
   KEntry()
     : mValue(0), bDirty(false), bNLS(false), 
@@ -66,7 +66,7 @@ struct KDECORE_EXPORT KEntry
  * to which it belongs.
  * @internal
  */
-struct KDECORE_EXPORT KEntryKey
+struct TDECORE_EXPORT KEntryKey
 {
   KEntryKey(const TQCString& _group = 0,
 	    const TQCString& _key = 0)
diff --git a/tdecore/kconfigdialogmanager.h b/tdecore/kconfigdialogmanager.h
index d0b385b60..3c268e487 100644
--- a/tdecore/kconfigdialogmanager.h
+++ b/tdecore/kconfigdialogmanager.h
@@ -75,7 +75,7 @@ class TQSqlPropertyMap;
  * @author Benjamin C Meyer <ben+kdelibs at meyerhome dot net>
  * @author Waldo Bastian <bastian@kde.org>
  */
-class KDECORE_EXPORT KConfigDialogManager : public TQObject {
+class TDECORE_EXPORT KConfigDialogManager : public TQObject {
 
 Q_OBJECT
 
diff --git a/tdecore/kconfigskeleton.h b/tdecore/kconfigskeleton.h
index c3e9f4a57..a43327da1 100644
--- a/tdecore/kconfigskeleton.h
+++ b/tdecore/kconfigskeleton.h
@@ -47,7 +47,7 @@
    * addItem() functions of KConfigSkeleton instead. If you subclass this class you will
    * have to register instances with the function KConfigSkeleton::addItem().
    */
-  class KDECORE_EXPORT KConfigSkeletonItem
+  class TDECORE_EXPORT KConfigSkeletonItem
   {
   public:
     typedef TQValueList < KConfigSkeletonItem * >List;
@@ -362,14 +362,14 @@ template < typename T > class KConfigSkeletonGenericItem:public KConfigSkeletonI
    * subclasses yourself, but you can use \ref kconfig_compiler to automatically
    * generate the C++ code from an XML description of the configuration options.
    */
-class KDECORE_EXPORT KConfigSkeleton
+class TDECORE_EXPORT KConfigSkeleton
 {
 public:
 
   /**
    * Class for handling a string preferences item.
    */
-  class KDECORE_EXPORT ItemString:public KConfigSkeletonGenericItem < TQString >
+  class TDECORE_EXPORT ItemString:public KConfigSkeletonGenericItem < TQString >
   {
   public:
     enum Type { Normal, Password, Path };
@@ -391,7 +391,7 @@ public:
   /**
    * Class for handling a password preferences item.
    */
-  class KDECORE_EXPORT ItemPassword:public ItemString
+  class TDECORE_EXPORT ItemPassword:public ItemString
   {
   public:
     ItemPassword(const TQString & group, const TQString & key,
@@ -402,7 +402,7 @@ public:
   /**
    * Class for handling a path preferences item.
    */
-  class KDECORE_EXPORT ItemPath:public ItemString
+  class TDECORE_EXPORT ItemPath:public ItemString
   {
   public:
     ItemPath(const TQString & group, const TQString & key,
@@ -414,7 +414,7 @@ public:
   /**
    * Class for handling a TQVariant preferences item.
    */
-  class KDECORE_EXPORT ItemProperty:public KConfigSkeletonGenericItem < TQVariant >
+  class TDECORE_EXPORT ItemProperty:public KConfigSkeletonGenericItem < TQVariant >
   {
   public:
     ItemProperty(const TQString & group, const TQString & key,
@@ -429,7 +429,7 @@ public:
   /**
    * Class for handling a bool preferences item.
    */
-  class KDECORE_EXPORT ItemBool:public KConfigSkeletonGenericItem < bool >
+  class TDECORE_EXPORT ItemBool:public KConfigSkeletonGenericItem < bool >
   {
   public:
     ItemBool(const TQString & group, const TQString & key, bool & reference,
@@ -444,7 +444,7 @@ public:
   /**
    * Class for handling an integer preferences item.
    */
-  class KDECORE_EXPORT ItemInt:public KConfigSkeletonGenericItem < int >
+  class TDECORE_EXPORT ItemInt:public KConfigSkeletonGenericItem < int >
   {
   public:
     ItemInt(const TQString & group, const TQString & key, int &reference,
@@ -469,7 +469,7 @@ public:
   /**
    * Class for handling an 64-bit integer preferences item.
    */
-  class KDECORE_EXPORT ItemInt64:public KConfigSkeletonGenericItem < TQ_INT64 >
+  class TDECORE_EXPORT ItemInt64:public KConfigSkeletonGenericItem < TQ_INT64 >
   {
   public:
     ItemInt64(const TQString & group, const TQString & key, TQ_INT64 &reference,
@@ -495,7 +495,7 @@ public:
   /**
    * Class for handling enums.
    */
-  class KDECORE_EXPORT ItemEnum:public ItemInt
+  class TDECORE_EXPORT ItemEnum:public ItemInt
   {
   public:
     struct Choice
@@ -521,7 +521,7 @@ public:
   /**
    * Class for handling an unsingend integer preferences item.
    */
-  class KDECORE_EXPORT ItemUInt:public KConfigSkeletonGenericItem < unsigned int >
+  class TDECORE_EXPORT ItemUInt:public KConfigSkeletonGenericItem < unsigned int >
   {
   public:
     ItemUInt(const TQString & group, const TQString & key,
@@ -547,7 +547,7 @@ public:
   /**
    * Class for hanlding a long integer preferences item.
    */
-  class KDECORE_EXPORT ItemLong:public KConfigSkeletonGenericItem < long >
+  class TDECORE_EXPORT ItemLong:public KConfigSkeletonGenericItem < long >
   {
   public:
     ItemLong(const TQString & group, const TQString & key, long &reference,
@@ -573,7 +573,7 @@ public:
   /**
    * Class for handling an unsigned long integer preferences item.
    */
-  class KDECORE_EXPORT ItemULong:public KConfigSkeletonGenericItem < unsigned long >
+  class TDECORE_EXPORT ItemULong:public KConfigSkeletonGenericItem < unsigned long >
   {
   public:
     ItemULong(const TQString & group, const TQString & key,
@@ -598,7 +598,7 @@ public:
   /**
    * Class for handling unsigned 64-bit integer preferences item.
    */
-  class KDECORE_EXPORT ItemUInt64:public KConfigSkeletonGenericItem < TQ_UINT64 >
+  class TDECORE_EXPORT ItemUInt64:public KConfigSkeletonGenericItem < TQ_UINT64 >
   {
   public:
     ItemUInt64(const TQString & group, const TQString & key, TQ_UINT64 &reference,
@@ -624,7 +624,7 @@ public:
   /**
    * Class for handling a floating point preference item.
    */
-  class KDECORE_EXPORT ItemDouble:public KConfigSkeletonGenericItem < double >
+  class TDECORE_EXPORT ItemDouble:public KConfigSkeletonGenericItem < double >
   {
   public:
     ItemDouble(const TQString & group, const TQString & key,
@@ -650,7 +650,7 @@ public:
   /**
    * Class for handling a color preferences item.
    */
-  class KDECORE_EXPORT ItemColor:public KConfigSkeletonGenericItem < TQColor >
+  class TDECORE_EXPORT ItemColor:public KConfigSkeletonGenericItem < TQColor >
   {
   public:
     ItemColor(const TQString & group, const TQString & key,
@@ -666,7 +666,7 @@ public:
   /**
    * Class for handling a font preferences item.
    */
-  class KDECORE_EXPORT ItemFont:public KConfigSkeletonGenericItem < TQFont >
+  class TDECORE_EXPORT ItemFont:public KConfigSkeletonGenericItem < TQFont >
   {
   public:
     ItemFont(const TQString & group, const TQString & key, TQFont & reference,
@@ -681,7 +681,7 @@ public:
   /**
    * Class for handling a TQRect preferences item.
    */
-  class KDECORE_EXPORT ItemRect:public KConfigSkeletonGenericItem < TQRect >
+  class TDECORE_EXPORT ItemRect:public KConfigSkeletonGenericItem < TQRect >
   {
   public:
     ItemRect(const TQString & group, const TQString & key, TQRect & reference,
@@ -696,7 +696,7 @@ public:
   /**
    * Class for handling a TQPoint preferences item.
    */
-  class KDECORE_EXPORT ItemPoint:public KConfigSkeletonGenericItem < TQPoint >
+  class TDECORE_EXPORT ItemPoint:public KConfigSkeletonGenericItem < TQPoint >
   {
   public:
     ItemPoint(const TQString & group, const TQString & key, TQPoint & reference,
@@ -711,7 +711,7 @@ public:
   /**
    * Class for handling a TQSize preferences item.
    */
-  class KDECORE_EXPORT ItemSize:public KConfigSkeletonGenericItem < TQSize >
+  class TDECORE_EXPORT ItemSize:public KConfigSkeletonGenericItem < TQSize >
   {
   public:
     ItemSize(const TQString & group, const TQString & key, TQSize & reference,
@@ -726,7 +726,7 @@ public:
   /**
    * Class for handling a TQDateTime preferences item.
    */
-  class KDECORE_EXPORT ItemDateTime:public KConfigSkeletonGenericItem < TQDateTime >
+  class TDECORE_EXPORT ItemDateTime:public KConfigSkeletonGenericItem < TQDateTime >
   {
   public:
     ItemDateTime(const TQString & group, const TQString & key,
@@ -742,7 +742,7 @@ public:
   /**
    * Class for handling a string list preferences item.
    */
-  class KDECORE_EXPORT ItemStringList:public KConfigSkeletonGenericItem < TQStringList >
+  class TDECORE_EXPORT ItemStringList:public KConfigSkeletonGenericItem < TQStringList >
   {
   public:
     ItemStringList(const TQString & group, const TQString & key,
@@ -758,7 +758,7 @@ public:
   /**
    * Class for handling a path list preferences item.
    */
-  class KDECORE_EXPORT ItemPathList:public ItemStringList
+  class TDECORE_EXPORT ItemPathList:public ItemStringList
   {
   public:
     ItemPathList(const TQString & group, const TQString & key,
@@ -773,7 +773,7 @@ public:
   /**
    * Class for handling an integer list preferences item.
    */
-  class KDECORE_EXPORT ItemIntList:public KConfigSkeletonGenericItem < TQValueList < int > >
+  class TDECORE_EXPORT ItemIntList:public KConfigSkeletonGenericItem < TQValueList < int > >
   {
   public:
     ItemIntList(const TQString & group, const TQString & key,
diff --git a/tdecore/kcrash.h b/tdecore/kcrash.h
index 31a802f3d..197f61f87 100644
--- a/tdecore/kcrash.h
+++ b/tdecore/kcrash.h
@@ -34,7 +34,7 @@
  * be called by the default crash handler, giving the application a chance
  * to save its data.
  */
-class KDECORE_EXPORT KCrash
+class TDECORE_EXPORT KCrash
 {
  private: // ;o)
   static const char *appName;
diff --git a/tdecore/kdcoppropertyproxy.h b/tdecore/kdcoppropertyproxy.h
index 9bc7736e3..a5b1e4b22 100644
--- a/tdecore/kdcoppropertyproxy.h
+++ b/tdecore/kdcoppropertyproxy.h
@@ -36,7 +36,7 @@ class KDCOPPropertyProxyPrivate;
  * "setFoo( TQString )" and "TQString foo()" automatically into the corresponding
  * setProperty/property calls.
  */
-class KDECORE_EXPORT KDCOPPropertyProxy
+class TDECORE_EXPORT KDCOPPropertyProxy
 {
 public:
   /**
diff --git a/tdecore/kdebug.h b/tdecore/kdebug.h
index 0a7d2546f..e9cf141f7 100644
--- a/tdecore/kdebug.h
+++ b/tdecore/kdebug.h
@@ -77,7 +77,7 @@ class kdbgstreamprivate;
  * \endcode
  * @see kndbgstream
  */
-class KDECORE_EXPORT kdbgstream {
+class TDECORE_EXPORT kdbgstream {
  public:
   /**
    * @internal
@@ -437,7 +437,7 @@ inline kdbgstream &endl( kdbgstream &s) { s << "\n"; return s; }
  */
 inline kdbgstream &flush( kdbgstream &s) { s.flush(); return s; }
 
-KDECORE_EXPORT kdbgstream &perror( kdbgstream &s);
+TDECORE_EXPORT kdbgstream &perror( kdbgstream &s);
 
 /**
  * \relates KGlobal
@@ -445,7 +445,7 @@ KDECORE_EXPORT kdbgstream &perror( kdbgstream &s);
  * nothing.
  * @see kndDebug()
  */
-class KDECORE_EXPORT kndbgstream {
+class TDECORE_EXPORT kndbgstream {
  public:
     /// Default constructor.
     kndbgstream() {}
@@ -596,14 +596,14 @@ inline kndbgstream &perror( kndbgstream & s) { return s; }
  * @param area an id to identify the output, 0 for default
  * @see kndDebug()
  */
-KDECORE_EXPORT kdbgstream kdDebug(int area = 0);
-KDECORE_EXPORT kdbgstream kdDebug(bool cond, int area = 0);
+TDECORE_EXPORT kdbgstream kdDebug(int area = 0);
+TDECORE_EXPORT kdbgstream kdDebug(bool cond, int area = 0);
 /**
  * \relates KGlobal
  * Returns a backtrace.
  * @return a backtrace
  */
-KDECORE_EXPORT TQString kdBacktrace();
+TDECORE_EXPORT TQString kdBacktrace();
 /**
  * \relates KGlobal
  * Returns a backtrace.
@@ -611,7 +611,7 @@ KDECORE_EXPORT TQString kdBacktrace();
  * @return a backtrace
  * @since 3.1
  */
-KDECORE_EXPORT TQString kdBacktrace(int levels);
+TDECORE_EXPORT TQString kdBacktrace(int levels);
 /**
  * Returns a dummy debug stream. The stream does not print anything.
  * @param area an id to identify the output, 0 for default
@@ -628,31 +628,31 @@ inline TQString kndBacktrace(int) { return TQString::null; }
  * information.
  * @param area an id to identify the output, 0 for default
  */
-KDECORE_EXPORT kdbgstream kdWarning(int area = 0);
-KDECORE_EXPORT kdbgstream kdWarning(bool cond, int area = 0);
+TDECORE_EXPORT kdbgstream kdWarning(int area = 0);
+TDECORE_EXPORT kdbgstream kdWarning(bool cond, int area = 0);
 /**
  * \relates KGlobal
  * Returns an error stream. You can use it to print error
  * information.
  * @param area an id to identify the output, 0 for default
  */
-KDECORE_EXPORT kdbgstream kdError(int area = 0);
-KDECORE_EXPORT kdbgstream kdError(bool cond, int area = 0);
+TDECORE_EXPORT kdbgstream kdError(int area = 0);
+TDECORE_EXPORT kdbgstream kdError(bool cond, int area = 0);
 /**
  * \relates KGlobal
  * Returns a fatal error stream. You can use it to print fatal error
  * information.
  * @param area an id to identify the output, 0 for default
  */
-KDECORE_EXPORT kdbgstream kdFatal(int area = 0);
-KDECORE_EXPORT kdbgstream kdFatal(bool cond, int area = 0);
+TDECORE_EXPORT kdbgstream kdFatal(int area = 0);
+TDECORE_EXPORT kdbgstream kdFatal(bool cond, int area = 0);
 
 /**
  * \relates KGlobal
  * Deletes the kdebugrc cache and therefore forces KDebug to reread the
  * config file
  */
-KDECORE_EXPORT void kdClearDebugConfig();
+TDECORE_EXPORT void kdClearDebugConfig();
 
 /** @} */
 
diff --git a/tdecore/kdebugdcopiface.h b/tdecore/kdebugdcopiface.h
index 44e4bcf71..c6100f58a 100644
--- a/tdecore/kdebugdcopiface.h
+++ b/tdecore/kdebugdcopiface.h
@@ -27,7 +27,7 @@
 /**
  * @short DCOP interface to KDebug.
  **/
-class KDECORE_EXPORT KDebugDCOPIface : virtual public DCOPObject
+class TDECORE_EXPORT KDebugDCOPIface : virtual public DCOPObject
 {
 	K_DCOP
 public:
diff --git a/tdecore/kdelibs_export.h b/tdecore/kdelibs_export.h
index 220657d0b..44ac7c2dd 100644
--- a/tdecore/kdelibs_export.h
+++ b/tdecore/kdelibs_export.h
@@ -32,17 +32,17 @@
 #else /* Q_OS_UNIX */
 
 /* export statements for unix */
-#define KDECORE_EXPORT KDE_EXPORT
-#define KDEUI_EXPORT KDE_EXPORT
-#define KDEFX_EXPORT KDE_EXPORT
-#define KDEPRINT_EXPORT KDE_EXPORT
+#define TDECORE_EXPORT KDE_EXPORT
+#define TDEUI_EXPORT KDE_EXPORT
+#define TDEFX_EXPORT KDE_EXPORT
+#define TDEPRINT_EXPORT KDE_EXPORT
 #define KDNSSD_EXPORT KDE_EXPORT
 #define KIO_EXPORT KDE_EXPORT
 #define DCOP_EXPORT KDE_EXPORT
 #define KPARTS_EXPORT KDE_EXPORT
 #define KTEXTEDITOR_EXPORT KDE_EXPORT
 #define KABC_EXPORT KDE_EXPORT
-#define KDESU_EXPORT KDE_EXPORT
+#define TDESU_EXPORT KDE_EXPORT
 #define KVCARD_EXPORT KDE_EXPORT
 #define KRESOURCES_EXPORT KDE_EXPORT
 #define KSTYLE_EXPORT KDE_EXPORT
@@ -70,14 +70,14 @@
 /* workaround for tdecore: stupid tqmoc's grammar doesn't accept two macros
    between 'class' keyword and <classname>: */
 #ifdef KDE_DEPRECATED
-# ifndef KDECORE_EXPORT_DEPRECATED
-#  define KDECORE_EXPORT_DEPRECATED KDE_DEPRECATED KDECORE_EXPORT
+# ifndef TDECORE_EXPORT_DEPRECATED
+#  define TDECORE_EXPORT_DEPRECATED KDE_DEPRECATED TDECORE_EXPORT
 # endif
 # ifndef KIO_EXPORT_DEPRECATED
 #  define KIO_EXPORT_DEPRECATED KDE_DEPRECATED KIO_EXPORT
 # endif
-# ifndef KDEUI_EXPORT_DEPRECATED
-#  define KDEUI_EXPORT_DEPRECATED KDE_DEPRECATED KDEUI_EXPORT
+# ifndef TDEUI_EXPORT_DEPRECATED
+#  define TDEUI_EXPORT_DEPRECATED KDE_DEPRECATED TDEUI_EXPORT
 # endif
 # ifndef KABC_EXPORT_DEPRECATED
 #  define KABC_EXPORT_DEPRECATED KDE_DEPRECATED KABC_EXPORT
diff --git a/tdecore/kdesktopfile.h b/tdecore/kdesktopfile.h
index bb705b696..2d6b251d8 100644
--- a/tdecore/kdesktopfile.h
+++ b/tdecore/kdesktopfile.h
@@ -31,7 +31,7 @@ class KDesktopFilePrivate;
  * @see  KConfigBase  KConfig
  * @short KDE Desktop File Management class
  */
-class KDECORE_EXPORT KDesktopFile : public KConfig
+class TDECORE_EXPORT KDesktopFile : public KConfig
 {
   Q_OBJECT
 
diff --git a/tdecore/kdeversion.h b/tdecore/kdeversion.h
index 5f8c3dc8c..22027fb4f 100644
--- a/tdecore/kdeversion.h
+++ b/tdecore/kdeversion.h
@@ -46,34 +46,34 @@ namespace KDE
      * @return the version number, encoded in a single uint
      * @since 3.2
      */
-    KDECORE_EXPORT unsigned int version();
+    TDECORE_EXPORT unsigned int version();
     /**
      * Returns the major number of KDE's version, e.g.
      * 3 for KDE 3.1.2. 
      * @return the major version number
      * @since 3.1
      */
-    KDECORE_EXPORT unsigned int versionMajor();
+    TDECORE_EXPORT unsigned int versionMajor();
     /**
      * Returns the minor number of KDE's version, e.g.
      * 1 for KDE 3.1.2. 
      * @return the minor version number
      * @since 3.1
      */
-    KDECORE_EXPORT unsigned int versionMinor();
+    TDECORE_EXPORT unsigned int versionMinor();
     /**
      * Returns the release of KDE's version, e.g.
      * 2 for KDE 3.1.2. 
      * @return the release number
      * @since 3.1
      */
-    KDECORE_EXPORT unsigned int versionRelease();
+    TDECORE_EXPORT unsigned int versionRelease();
     /**
      * Returns the KDE version as string, e.g. "3.1.2".
      * @return the KDE version. You can keep the string forever
      * @since 3.1
      */
-    KDECORE_EXPORT const char *versionString();
+    TDECORE_EXPORT const char *versionString();
 }
 
 #endif // _KDE_VERSION_H_
diff --git a/tdecore/kextsock.h b/tdecore/kextsock.h
index 24957dd47..3f6a46411 100644
--- a/tdecore/kextsock.h
+++ b/tdecore/kextsock.h
@@ -92,7 +92,7 @@ class KExtendedSocketPrivate;
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  * @short an extended socket
  */
-class KDECORE_EXPORT KExtendedSocket: public KBufferedIO // public TQObject, public QIODevice
+class TDECORE_EXPORT KExtendedSocket: public KBufferedIO // public TQObject, public QIODevice
 {
   Q_OBJECT
   TQ_OBJECT
@@ -1039,7 +1039,7 @@ private:
  * Contains information about an internet address. It wraps addrinfo,
  * see getaddrinfo(3) for more information.
  */
-class KDECORE_EXPORT KAddressInfo
+class TDECORE_EXPORT KAddressInfo
 {
 private:
   addrinfo *ai;
diff --git a/tdecore/kglobal.h b/tdecore/kglobal.h
index 08e12767e..e2f55b007 100644
--- a/tdecore/kglobal.h
+++ b/tdecore/kglobal.h
@@ -41,7 +41,7 @@ class TQString;
  * @see KStaticDeleterBase
  * @author Sirtaj Singh Kang (taj@kde.org)
  */
-class KDECORE_EXPORT KGlobal
+class TDECORE_EXPORT KGlobal
 {
 public:
 
@@ -216,7 +216,7 @@ inline const T& kClamp( const T& x, const T& low, const T& high )
  * qstricmp fails with e.g. the Turkish locale where 'I'.lower() != 'i'
  * @since 3.4
  */
-int KDECORE_EXPORT kasciistricmp( const char *str1, const char *str2 );
+int TDECORE_EXPORT kasciistricmp( const char *str1, const char *str2 );
  
 
 /**
diff --git a/tdecore/kglobalaccel.h b/tdecore/kglobalaccel.h
index 4eee753dc..7fb44a021 100644
--- a/tdecore/kglobalaccel.h
+++ b/tdecore/kglobalaccel.h
@@ -42,7 +42,7 @@ class KGlobalAccelPrivate;
 * @see KKeyDialog
 * @short Configurable global shortcut support
 */
-class KDECORE_EXPORT KGlobalAccel : public TQObject
+class TDECORE_EXPORT KGlobalAccel : public TQObject
 {
 	Q_OBJECT
  public:
diff --git a/tdecore/kglobalsettings.h b/tdecore/kglobalsettings.h
index 07a6f2ccb..b4c809f2e 100644
--- a/tdecore/kglobalsettings.h
+++ b/tdecore/kglobalsettings.h
@@ -45,7 +45,7 @@ class KURL;
  *
  * @author David Faure <faure@kde.org>
  */
-class KDECORE_EXPORT KGlobalSettings
+class TDECORE_EXPORT KGlobalSettings
 {
   public:
 
diff --git a/tdecore/kiconeffect.h b/tdecore/kiconeffect.h
index a8e7b685e..7aec46b7b 100644
--- a/tdecore/kiconeffect.h
+++ b/tdecore/kiconeffect.h
@@ -31,7 +31,7 @@ class KIconEffectPrivate;
  * in a toolbar gray.
  * @see KIcon
  */
-class KDECORE_EXPORT KIconEffect
+class TDECORE_EXPORT KIconEffect
 {
 public:
   /**
diff --git a/tdecore/kiconloader.h b/tdecore/kiconloader.h
index b7f1478f6..db5a8ff5a 100644
--- a/tdecore/kiconloader.h
+++ b/tdecore/kiconloader.h
@@ -74,7 +74,7 @@ class KIconEffect;
  * "User".
  *
  */
-class KDECORE_EXPORT KIconLoader
+class TDECORE_EXPORT KIconLoader
 {
 public:
 
@@ -445,7 +445,7 @@ public:
  * \relates KIconLoader
  * Load a desktop icon.
  */
-KDECORE_EXPORT TQPixmap DesktopIcon(const TQString& name, int size=0,
+TDECORE_EXPORT TQPixmap DesktopIcon(const TQString& name, int size=0,
 		    int state=KIcon::DefaultState,
 		    KInstance *instance=KGlobal::instance());
 
@@ -453,40 +453,40 @@ KDECORE_EXPORT TQPixmap DesktopIcon(const TQString& name, int size=0,
  * \relates KIconLoader
  * Load a desktop icon.
  */
-KDECORE_EXPORT TQPixmap DesktopIcon(const TQString& name, KInstance *instance);
+TDECORE_EXPORT TQPixmap DesktopIcon(const TQString& name, KInstance *instance);
 
 /**
  * \relates KIconLoader
  * Load a desktop icon, and apply the necessary effects to get an IconSet.
  */
-KDECORE_EXPORT TQIconSet DesktopIconSet(const TQString& name, int size=0,
+TDECORE_EXPORT TQIconSet DesktopIconSet(const TQString& name, int size=0,
 		    KInstance *instance=KGlobal::instance());
 
 /**
  * \relates KIconLoader
  * Load a toolbar icon.
  */
-KDECORE_EXPORT TQPixmap BarIcon(const TQString& name, int size=0, int state=KIcon::DefaultState,
+TDECORE_EXPORT TQPixmap BarIcon(const TQString& name, int size=0, int state=KIcon::DefaultState,
 	KInstance *instance=KGlobal::instance());
 
 /**
  * \relates KIconLoader
  * Load a toolbar icon.
  */
-KDECORE_EXPORT TQPixmap BarIcon(const TQString& name, KInstance *instance);
+TDECORE_EXPORT TQPixmap BarIcon(const TQString& name, KInstance *instance);
 
 /**
  * \relates KIconLoader
  * Load a toolbar icon, and apply the necessary effects to get an IconSet.
  */
-KDECORE_EXPORT TQIconSet BarIconSet(const TQString& name, int size=0,
+TDECORE_EXPORT TQIconSet BarIconSet(const TQString& name, int size=0,
 		    KInstance *instance=KGlobal::instance());
 
 /**
  * \relates KIconLoader
  * Load a small icon.
  */
-KDECORE_EXPORT TQPixmap SmallIcon(const TQString& name, int size=0,
+TDECORE_EXPORT TQPixmap SmallIcon(const TQString& name, int size=0,
 		  int state=KIcon::DefaultState,
 		  KInstance *instance=KGlobal::instance());
 
@@ -494,20 +494,20 @@ KDECORE_EXPORT TQPixmap SmallIcon(const TQString& name, int size=0,
  * \relates KIconLoader
  * Load a small icon.
  */
-KDECORE_EXPORT TQPixmap SmallIcon(const TQString& name, KInstance *instance);
+TDECORE_EXPORT TQPixmap SmallIcon(const TQString& name, KInstance *instance);
 
 /**
  * \relates KIconLoader
  * Load a small icon, and apply the necessary effects to get an IconSet.
  */
-KDECORE_EXPORT TQIconSet SmallIconSet(const TQString& name, int size=0,
+TDECORE_EXPORT TQIconSet SmallIconSet(const TQString& name, int size=0,
 		    KInstance *instance=KGlobal::instance());
 
 /**
  * \relates KIconLoader
  * Load a main toolbar icon.
  */
-KDECORE_EXPORT TQPixmap MainBarIcon(const TQString& name, int size=0,
+TDECORE_EXPORT TQPixmap MainBarIcon(const TQString& name, int size=0,
 		    int state=KIcon::DefaultState,
 		    KInstance *instance=KGlobal::instance());
 
@@ -515,39 +515,39 @@ KDECORE_EXPORT TQPixmap MainBarIcon(const TQString& name, int size=0,
  * \relates KIconLoader
  * Load a main toolbar icon.
  */
-KDECORE_EXPORT TQPixmap MainBarIcon(const TQString& name, KInstance *instance);
+TDECORE_EXPORT TQPixmap MainBarIcon(const TQString& name, KInstance *instance);
 
 /**
  * \relates KIconLoader
  * Load a main toolbar icon, and apply the effects to get an IconSet.
  */
-KDECORE_EXPORT TQIconSet MainBarIconSet(const TQString& name, int size=0,
+TDECORE_EXPORT TQIconSet MainBarIconSet(const TQString& name, int size=0,
 		    KInstance *instance=KGlobal::instance());
 
 /**
  * \relates KIconLoader
  * Load a user icon. User icons are searched in $appdir/pics.
  */
-KDECORE_EXPORT TQPixmap UserIcon(const TQString& name, int state=KIcon::DefaultState,
+TDECORE_EXPORT TQPixmap UserIcon(const TQString& name, int state=KIcon::DefaultState,
 	KInstance *instance=KGlobal::instance());
 
 /**
  * \relates KIconLoader
  * Load a user icon. User icons are searched in $appdir/pics.
  */
-KDECORE_EXPORT TQPixmap UserIcon(const TQString& name, KInstance *instance);
+TDECORE_EXPORT TQPixmap UserIcon(const TQString& name, KInstance *instance);
 
 /**
  * \relates KIconLoader
  * Load a user icon, and apply the effects to get an IconSet.
  */
-KDECORE_EXPORT TQIconSet UserIconSet(const TQString& name,
+TDECORE_EXPORT TQIconSet UserIconSet(const TQString& name,
 	KInstance *instance=KGlobal::instance());
 
 /**
  * \relates KIconLoader
  * Returns the current icon size for a specific group.
  */
-KDECORE_EXPORT int IconSize(KIcon::Group group, KInstance *instance=KGlobal::instance());
+TDECORE_EXPORT int IconSize(KIcon::Group group, KInstance *instance=KGlobal::instance());
 
 #endif // __KIconLoader_h_Included__
diff --git a/tdecore/kicontheme.h b/tdecore/kicontheme.h
index d8e29d339..5db2855f7 100644
--- a/tdecore/kicontheme.h
+++ b/tdecore/kicontheme.h
@@ -33,7 +33,7 @@ class KIconPrivate;
  * @see KIconTheme
  * @see KIconLoader
  */
-class KDECORE_EXPORT KIcon
+class TDECORE_EXPORT KIcon
 {
 public:
     KIcon() { size = 0; }
@@ -184,7 +184,7 @@ inline KIcon::Group operator++(KIcon::Group& group,int) { KIcon::Group ret = gro
  * iconloader but can be used by others too.
  * @see KIconLoader
  */
-class KDECORE_EXPORT KIconTheme
+class TDECORE_EXPORT KIconTheme
 {
 public:
     /**
diff --git a/tdecore/kidna.h b/tdecore/kidna.h
index 9feac63b5..8d2d7d937 100644
--- a/tdecore/kidna.h
+++ b/tdecore/kidna.h
@@ -31,7 +31,7 @@ namespace KIDNA {
      *
      * If conversion is not possible, an empty string is returned.
      */
-    KDECORE_EXPORT TQCString toAsciiCString(const TQString &idna);
+    TDECORE_EXPORT TQCString toAsciiCString(const TQString &idna);
 
     /**
      * Converts an International Domain Name @p idna to 
@@ -39,13 +39,13 @@ namespace KIDNA {
      *
      * If conversion is not possible, an empty string is returned.
      */
-    KDECORE_EXPORT TQString toAscii(const TQString &idna);
+    TDECORE_EXPORT TQString toAscii(const TQString &idna);
 
     /**
      * Converts an International Domain Name @p idna to 
      * its UNICODE representation
      */
-    KDECORE_EXPORT TQString toUnicode(const TQString &idna);
+    TDECORE_EXPORT TQString toUnicode(const TQString &idna);
 }
 
 #endif /* _KIDNA_H */
diff --git a/tdecore/kinstance.h b/tdecore/kinstance.h
index bb11183db..97434c385 100644
--- a/tdecore/kinstance.h
+++ b/tdecore/kinstance.h
@@ -40,7 +40,7 @@ class KSharedConfig;
  *
  * @author Torben Weis
  */
-class KDECORE_EXPORT KInstance
+class TDECORE_EXPORT KInstance
 {
     friend class KStandardDirs;
 
diff --git a/tdecore/kipc.h b/tdecore/kipc.h
index 384620cde..35ba3f18e 100644
--- a/tdecore/kipc.h
+++ b/tdecore/kipc.h
@@ -46,7 +46,7 @@
  * @see KApplication::kipcMessage()
  * @author Geert Jansen <jansen@kde.org>
  */
-class KDECORE_EXPORT KIPC
+class TDECORE_EXPORT KIPC
 {
 public:
     /**
diff --git a/tdecore/kkeynative.h b/tdecore/kkeynative.h
index 47b4ad677..cf29fcabc 100644
--- a/tdecore/kkeynative.h
+++ b/tdecore/kkeynative.h
@@ -34,7 +34,7 @@ class KKeyNativePrivate;
  * Representation of a key in the format native of the windowing system (eg. X11).
  * @see KKey
  */
-class KDECORE_EXPORT KKeyNative
+class TDECORE_EXPORT KKeyNative
 {
  public:
 	/**
diff --git a/tdecore/kkeyserver_x11.cpp b/tdecore/kkeyserver_x11.cpp
index de7157210..440fbb5e3 100644
--- a/tdecore/kkeyserver_x11.cpp
+++ b/tdecore/kkeyserver_x11.cpp
@@ -671,7 +671,7 @@ bool modXToModQt( uint modX, int& modQt )
 	return modToModQt( modX, modQt );
 }
 
-KDECORE_EXPORT int qtButtonStateToMod( TQt::ButtonState s )
+TDECORE_EXPORT int qtButtonStateToMod( TQt::ButtonState s )
 {
 	int modQt = 0;
 	if (s & Qt::ShiftButton) modQt |= KKey::SHIFT;
diff --git a/tdecore/kkeyserver_x11.h b/tdecore/kkeyserver_x11.h
index 7935c0ce4..ce3fa2fed 100644
--- a/tdecore/kkeyserver_x11.h
+++ b/tdecore/kkeyserver_x11.h
@@ -44,7 +44,7 @@ namespace KKeyServer
 	 * @see KKey
 	 * @see KKeyServer
 	 */
-	struct KDECORE_EXPORT Sym
+	struct TDECORE_EXPORT Sym
 	{
 	 public:
 		/// the actual value of the symbol
@@ -134,7 +134,7 @@ namespace KKeyServer
 	 * Represents a key press.
 	 * @see KKey
 	 */
-	struct KDECORE_EXPORT Key
+	struct TDECORE_EXPORT Key
 	{
 		/// Code for native Keys in Qt
 		enum { CODE_FOR_QT = 256 };
@@ -241,7 +241,7 @@ namespace KKeyServer
 	/**
 	 * TODO: please document this class
 	 */
-	struct KDECORE_EXPORT Variations
+	struct TDECORE_EXPORT Variations
 	{
 		enum { MAX_VARIATIONS = 4 };
 
@@ -257,14 +257,14 @@ namespace KKeyServer
 	};
 
 	/// TODO: please document
-	KDECORE_EXPORT bool initializeMods();
+	TDECORE_EXPORT bool initializeMods();
 
 	/**
 	 * Returns the equivalent X modifier mask of the given modifier flag.
 	 * @param modFlag the generic flags to check
 	 * @return the window system specific flags
 	 */
-	KDECORE_EXPORT uint modX( KKey::ModFlag modFlag );
+	TDECORE_EXPORT uint modX( KKey::ModFlag modFlag );
 
 	/**
 	 * Returns true if the current keyboard layout supports the Win key.
@@ -272,42 +272,42 @@ namespace KKeyServer
 	 * @return true if the keyboard has a Win key
 	 * @see modXWin()
 	 */
-	KDECORE_EXPORT bool keyboardHasWinKey();
+	TDECORE_EXPORT bool keyboardHasWinKey();
 
 	/**
 	 * Returns the X11 Shift modifier mask/flag.
 	 * @return the X11 Shift modifier mask/flag.
 	 * @see accelModMaskX()
 	 */
-	KDECORE_EXPORT uint modXShift();
+	TDECORE_EXPORT uint modXShift();
 
 	/**
 	 * Returns the X11 Lock modifier mask/flag.
 	 * @return the X11 Lock modifier mask/flag.
 	 * @see accelModMaskX()
 	 */
-	KDECORE_EXPORT uint modXLock();
+	TDECORE_EXPORT uint modXLock();
 
 	/**
 	 * Returns the X11 Ctrl modifier mask/flag.
 	 * @return the X11 Ctrl modifier mask/flag.
 	 * @see accelModMaskX()
 	 */
-	KDECORE_EXPORT uint modXCtrl();
+	TDECORE_EXPORT uint modXCtrl();
 
 	/**
 	 * Returns the X11 Alt (Mod1) modifier mask/flag.
 	 * @return the X11 Alt (Mod1) modifier mask/flag.
 	 * @see accelModMaskX()
 	 */
-	KDECORE_EXPORT uint modXAlt();
+	TDECORE_EXPORT uint modXAlt();
 
 	/**
 	 * Returns the X11 NumLock modifier mask/flag.
 	 * @return the X11 NumLock modifier mask/flag.
 	 * @see accelModMaskX()
 	 */
-	KDECORE_EXPORT uint modXNumLock();
+	TDECORE_EXPORT uint modXNumLock();
 
 	/**
 	 * Returns the X11 Win (Mod3) modifier mask/flag.
@@ -315,14 +315,14 @@ namespace KKeyServer
 	 * @see keyboardHasWinKey()
 	 * @see accelModMaskX()
 	 */
-	KDECORE_EXPORT uint modXWin();
+	TDECORE_EXPORT uint modXWin();
 
 	/**
 	 * Returns the X11 ScrollLock modifier mask/flag.
 	 * @return the X11 ScrollLock modifier mask/flag.
 	 * @see accelModMaskX()
 	 */
-	KDECORE_EXPORT uint modXScrollLock();
+	TDECORE_EXPORT uint modXScrollLock();
 
 	/**
 	 * Returns the X11 Mode_switch modifier mask/flag. 
@@ -330,7 +330,7 @@ namespace KKeyServer
 	 * @see accelModMaskX()
 	 * @since 3.5
 	 */
-	KDECORE_EXPORT uint modXModeSwitch();
+	TDECORE_EXPORT uint modXModeSwitch();
 
 	/**
 	 * Returns bitwise OR'ed mask containing Shift, Ctrl, Alt, and
@@ -343,7 +343,7 @@ namespace KKeyServer
 	 * @see modXWin()
 	 * @see modXScrollLock()
 	 */
-	KDECORE_EXPORT uint accelModMaskX();
+	TDECORE_EXPORT uint accelModMaskX();
 
 	/**
 	 * Extracts the symbol from the given Qt key and
@@ -354,7 +354,7 @@ namespace KKeyServer
 	 * @see Qt::Key
 	 * @see Sym
 	 */
-	KDECORE_EXPORT bool keyQtToSym( int keyQt, uint& sym );
+	TDECORE_EXPORT bool keyQtToSym( int keyQt, uint& sym );
 
 	/**
 	 * Extracts the modifiers from the given Qt key and
@@ -364,7 +364,7 @@ namespace KKeyServer
 	 * @return true if successful, false otherwise
 	 * @see Qt::Key
 	 */
-	KDECORE_EXPORT bool keyQtToMod( int keyQt, uint& mod );
+	TDECORE_EXPORT bool keyQtToMod( int keyQt, uint& mod );
 
 	/**
 	 * Converts the given symbol to a Qt key code.
@@ -374,7 +374,7 @@ namespace KKeyServer
 	 * @see Qt::Key
 	 * @see Sym
 	 */
-	KDECORE_EXPORT bool symToKeyQt( uint sym, int& keyQt );
+	TDECORE_EXPORT bool symToKeyQt( uint sym, int& keyQt );
 
 	/**
 	 * Converts the mask of ORed KKey::ModFlag modifiers to
@@ -386,7 +386,7 @@ namespace KKeyServer
 	 * @see Qt::Key
 	 * @see KKey
 	 */
-	KDECORE_EXPORT bool modToModQt( uint mod, int& modQt );
+	TDECORE_EXPORT bool modToModQt( uint mod, int& modQt );
 
 	/**
 	 * Converts the mask of ORed KKey::ModFlag modifiers to
@@ -397,7 +397,7 @@ namespace KKeyServer
 	 * @return true if successful, false otherwise
 	 * @see KKey
 	 */
-	KDECORE_EXPORT bool modToModX( uint mod, uint& modX );
+	TDECORE_EXPORT bool modToModX( uint mod, uint& modX );
 
 	/**
 	 * Converts the mask of ORed X11 modifiers to
@@ -409,12 +409,12 @@ namespace KKeyServer
 	 * @see Qt::Key
 	 */
 	//wrapped for win32
-	KDECORE_EXPORT bool modXToModQt( uint modX, int& modQt );
+	TDECORE_EXPORT bool modXToModQt( uint modX, int& modQt );
 
 	/**
 	 * Converts the Qt-compatible button state to x11 modifier. 
 	 */
-	KDECORE_EXPORT int qtButtonStateToMod( TQ_ButtonState s );
+	TDECORE_EXPORT int qtButtonStateToMod( TQ_ButtonState s );
 
 	/**
 	 * Converts the mask of ORed X11 modifiers to
@@ -425,7 +425,7 @@ namespace KKeyServer
 	 * @return true if successful, false otherwise
 	 * @see KKey
 	 */
-	KDECORE_EXPORT bool modXToMod( uint modX, uint& mod );
+	TDECORE_EXPORT bool modXToMod( uint modX, uint& mod );
 
 	/**
 	 * Converts a X11 key code and a mask of ORed X11 modifiers
@@ -438,12 +438,12 @@ namespace KKeyServer
 	 * @see Qt::Key
 	 * @see Sym
 	 */
-	KDECORE_EXPORT bool codeXToSym( uchar codeX, uint modX, uint& symX );
+	TDECORE_EXPORT bool codeXToSym( uchar codeX, uint modX, uint& symX );
 
 	/**
 	 * @internal
 	 */
-	KDECORE_EXPORT TQString modToStringInternal( uint mod );
+	TDECORE_EXPORT TQString modToStringInternal( uint mod );
 
 	/**
 	 * Converts the mask of ORed KKey::ModFlag modifiers to a
@@ -451,7 +451,7 @@ namespace KKeyServer
 	 * @param mod the mask of ORed KKey::ModFlag modifiers
 	 * @return the user-readable string
 	 */
-	KDECORE_EXPORT TQString modToStringUser( uint mod );
+	TDECORE_EXPORT TQString modToStringUser( uint mod );
 
 	/**
 	 * Converts the modifier given as user-readable string
@@ -459,19 +459,19 @@ namespace KKeyServer
          * @internal
          * @since 3.5
 	 */
-	KDECORE_EXPORT uint stringUserToMod( const TQString& mod );
+	TDECORE_EXPORT uint stringUserToMod( const TQString& mod );
 
 	/**
 	 * @internal
 	 * Unimplemented?
 	 */
-	KDECORE_EXPORT bool stringToSymMod( const TQString&, uint& sym, uint& mod );
+	TDECORE_EXPORT bool stringToSymMod( const TQString&, uint& sym, uint& mod );
 
 	/**
 	 * @internal
 	 * Unimplemented?
 	 */
-	KDECORE_EXPORT void keyQtToKeyX( uint keyCombQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
+	TDECORE_EXPORT void keyQtToKeyX( uint keyCombQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX );
 }
 
 #endif // !_KKEYSERVER_X11_H
diff --git a/tdecore/klibloader.h b/tdecore/klibloader.h
index 0d372237d..aa88db925 100644
--- a/tdecore/klibloader.h
+++ b/tdecore/klibloader.h
@@ -47,7 +47,7 @@ class KLibraryPrivate;
  * @see KLibLoader
  * @author Torben Weis <weis@kde.org>
  */
-class KDECORE_EXPORT KLibrary : public TQObject
+class TDECORE_EXPORT KLibrary : public TQObject
 {
     friend class KLibLoader;
     friend class TQAsciiDict<KLibrary>;
@@ -139,7 +139,7 @@ class KLibWrapPrivate;
  * @see KLibrary
  * @author Torben Weis <weis@kde.org>
  */
-class KDECORE_EXPORT KLibLoader : public TQObject
+class TDECORE_EXPORT KLibLoader : public TQObject
 {
     friend class KLibrary;
 
@@ -330,7 +330,7 @@ private:
  *
  * @author Torben Weis <weis@kde.org>
  */
-class KDECORE_EXPORT KLibFactory : public TQObject
+class TDECORE_EXPORT KLibFactory : public TQObject
 {
     Q_OBJECT
 public:
diff --git a/tdecore/klocale.h b/tdecore/klocale.h
index 9bca02077..e94143fb6 100644
--- a/tdecore/klocale.h
+++ b/tdecore/klocale.h
@@ -75,7 +75,7 @@ class KCalendarSystem;
  *  for e.g. German umlauts or French accents should be recoded to
  *  UTF-8)
  **/
-KDECORE_EXPORT TQString i18n(const char *text);
+TDECORE_EXPORT TQString i18n(const char *text);
 
 /**
  * \relates KLocale
@@ -84,7 +84,7 @@ KDECORE_EXPORT TQString i18n(const char *text);
  *  text.
  *  @see translate
  **/
-KDECORE_EXPORT TQString i18n(const char *comment, const char *text);
+TDECORE_EXPORT TQString i18n(const char *comment, const char *text);
 
 /**
  * \relates KLocale
@@ -97,7 +97,7 @@ KDECORE_EXPORT TQString i18n(const char *comment, const char *text);
  *          depending on n
  *  @see translate
  **/
-KDECORE_EXPORT TQString i18n(const char *singular, const char *plural, unsigned long n);
+TDECORE_EXPORT TQString i18n(const char *singular, const char *plural, unsigned long n);
 
 /**
  * \relates KLocale
@@ -121,7 +121,7 @@ inline TQString tr2i18n(const char* message, const char* =0) {
   * Hans Petter Bieker <bieker@kde.org>, Lukas Tinkl <lukas.tinkl@suse.cz>
   * @short class for supporting locale settings and national language
   */
-class KDECORE_EXPORT KLocale
+class TDECORE_EXPORT KLocale
 {
   friend class KGlobal; // for initInstance()
 public:
diff --git a/tdecore/klockfile.h b/tdecore/klockfile.h
index fac66831a..61968bf0f 100644
--- a/tdecore/klockfile.h
+++ b/tdecore/klockfile.h
@@ -30,7 +30,7 @@
  * @author Waldo Bastian <bastian@kde.org>
  * @since 3.3
  */
-class KDECORE_EXPORT KLockFile : public KShared
+class TDECORE_EXPORT KLockFile : public KShared
 {
 public:
    typedef KSharedPtr<KLockFile> Ptr;
diff --git a/tdecore/kmacroexpander.h b/tdecore/kmacroexpander.h
index 226264990..4244efb18 100644
--- a/tdecore/kmacroexpander.h
+++ b/tdecore/kmacroexpander.h
@@ -34,7 +34,7 @@
  * @since 3.1.3
  * @author Oswald Buddenhagen <ossi@kde.org>
  */
-class KDECORE_EXPORT KMacroExpanderBase {
+class TDECORE_EXPORT KMacroExpanderBase {
 
 public:
     /**
@@ -188,7 +188,7 @@ private:
  * @since 3.3
  * @author Oswald Buddenhagen <ossi@kde.org>
  */
-class KDECORE_EXPORT KWordMacroExpander : public KMacroExpanderBase {
+class TDECORE_EXPORT KWordMacroExpander : public KMacroExpanderBase {
 
 public:
     /**
@@ -221,7 +221,7 @@ protected:
  * @since 3.3
  * @author Oswald Buddenhagen <ossi@kde.org>
  */
-class KDECORE_EXPORT KCharMacroExpander : public KMacroExpanderBase {
+class TDECORE_EXPORT KCharMacroExpander : public KMacroExpanderBase {
 
 public:
     /**
@@ -270,7 +270,7 @@ namespace KMacroExpander {
      * // s is now "% Title: /tmp/myfile.txt:My File";
      * \endcode
      */
-    KDECORE_EXPORT TQString expandMacros( const TQString &str, const TQMap<TQChar,TQString> &map, TQChar c = '%' );
+    TDECORE_EXPORT TQString expandMacros( const TQString &str, const TQMap<TQChar,TQString> &map, TQChar c = '%' );
 
     /**
      * Perform safe macro expansion (substitution) on a string for use
@@ -295,7 +295,7 @@ namespace KMacroExpander {
      * system(TQFile::encodeName(s));
      * \endcode
      */
-    KDECORE_EXPORT TQString expandMacrosShellQuote( const TQString &str, const TQMap<TQChar,TQString> &map, TQChar c = '%' );
+    TDECORE_EXPORT TQString expandMacrosShellQuote( const TQString &str, const TQMap<TQChar,TQString> &map, TQChar c = '%' );
 
     /**
      * Perform safe macro expansion (substitution) on a string.
@@ -320,7 +320,7 @@ namespace KMacroExpander {
      * // s is now "Title: /tmp/myfile.txt-My File";
      * \endcode
      */
-    KDECORE_EXPORT TQString expandMacros( const TQString &str, const TQMap<TQString,TQString> &map, TQChar c = '%' );
+    TDECORE_EXPORT TQString expandMacros( const TQString &str, const TQMap<TQString,TQString> &map, TQChar c = '%' );
 
     /**
      * Perform safe macro expansion (substitution) on a string for use
@@ -348,18 +348,18 @@ namespace KMacroExpander {
      * system(TQFile::encodeName(s));
      * \endcode
      */
-    KDECORE_EXPORT TQString expandMacrosShellQuote( const TQString &str, const TQMap<TQString,TQString> &map, TQChar c = '%' );
+    TDECORE_EXPORT TQString expandMacrosShellQuote( const TQString &str, const TQMap<TQString,TQString> &map, TQChar c = '%' );
 
     /**
      * Same as above, except that the macros expand to string lists that
      * are simply join(" ")ed together.
      */
-    KDECORE_EXPORT TQString expandMacros( const TQString &str, const TQMap<TQChar,TQStringList> &map, TQChar c = '%' );
+    TDECORE_EXPORT TQString expandMacros( const TQString &str, const TQMap<TQChar,TQStringList> &map, TQChar c = '%' );
     /**
      * Same as above, except that the macros expand to string lists that
      * are simply join(" ")ed together.
      */
-    KDECORE_EXPORT TQString expandMacros( const TQString &str, const TQMap<TQString,TQStringList> &map, TQChar c = '%' );
+    TDECORE_EXPORT TQString expandMacros( const TQString &str, const TQMap<TQString,TQStringList> &map, TQChar c = '%' );
 
     /**
      * Same as above, except that the macros expand to string lists.
@@ -367,14 +367,14 @@ namespace KMacroExpander {
      * join(" ")ed together; otherwise every element expands to a separate
      * quoted string.
      */
-    KDECORE_EXPORT TQString expandMacrosShellQuote( const TQString &str, const TQMap<TQChar,TQStringList> &map, TQChar c = '%' );
+    TDECORE_EXPORT TQString expandMacrosShellQuote( const TQString &str, const TQMap<TQChar,TQStringList> &map, TQChar c = '%' );
     /**
      * Same as above, except that the macros expand to string lists.
      * If the macro appears inside a quoted string, the list is simply
      * join(" ")ed together; otherwise every element expands to a separate
      * quoted string.
      */
-    KDECORE_EXPORT TQString expandMacrosShellQuote( const TQString &str, const TQMap<TQString,TQStringList> &map, TQChar c = '%' );
+    TDECORE_EXPORT TQString expandMacrosShellQuote( const TQString &str, const TQMap<TQString,TQStringList> &map, TQChar c = '%' );
 }
 
 #endif /* _KMACROEXPANDER_H */
diff --git a/tdecore/kmanagerselection.h b/tdecore/kmanagerselection.h
index 384f5d23f..669451e68 100644
--- a/tdecore/kmanagerselection.h
+++ b/tdecore/kmanagerselection.h
@@ -47,7 +47,7 @@ class KSelectionOwnerPrivate;
  @since 3.2
  @short ICCCM manager selection owner
 */
-class KDECORE_EXPORT KSelectionOwner
+class TDECORE_EXPORT KSelectionOwner
     : public TQObject
     {
     Q_OBJECT
@@ -170,7 +170,7 @@ class KSelectionWatcherPrivate;
  @since 3.2
  @short ICCCM manager selection watching
 */
-class KDECORE_EXPORT KSelectionWatcher
+class TDECORE_EXPORT KSelectionWatcher
     : public TQObject
     {
     Q_OBJECT
diff --git a/tdecore/kmdcodec.h b/tdecore/kmdcodec.h
index d4bd8dfb0..a45cc3290 100644
--- a/tdecore/kmdcodec.h
+++ b/tdecore/kmdcodec.h
@@ -71,7 +71,7 @@
  * @author Dawit Alemayehu <adawit@kde.org>
  * @author Rik Hemsley <rik@kde.org>
  */
-class KDECORE_EXPORT KCodecs
+class TDECORE_EXPORT KCodecs
 {
 public:
 
@@ -399,7 +399,7 @@ class KMD5Private;
  * @author Dirk Mueller <mueller@kde.org>, Dawit Alemayehu <adawit@kde.org>
  */
 
-class KDECORE_EXPORT KMD5
+class TDECORE_EXPORT KMD5
 {
 public:
 
@@ -574,7 +574,7 @@ private:
  *
  * The class usage is the same as KMD5.
  */
-class KDECORE_EXPORT KMD4
+class TDECORE_EXPORT KMD4
 {
 public:
 
diff --git a/tdecore/kmimesourcefactory.h b/tdecore/kmimesourcefactory.h
index 536ead0b8..bf5b67d4c 100644
--- a/tdecore/kmimesourcefactory.h
+++ b/tdecore/kmimesourcefactory.h
@@ -37,7 +37,7 @@ class KInstance;
  *
  * @author Peter Putzer <putzer@kde.org>
  */
-class KDECORE_EXPORT KMimeSourceFactory : public TQMimeSourceFactory
+class TDECORE_EXPORT KMimeSourceFactory : public TQMimeSourceFactory
 {
 public:
 
diff --git a/tdecore/kmountpoint.h b/tdecore/kmountpoint.h
index fd4fe9c5d..e68fb23ab 100644
--- a/tdecore/kmountpoint.h
+++ b/tdecore/kmountpoint.h
@@ -32,7 +32,7 @@
  * @author Waldo Bastian <bastian@kde.org>
  * @since 3.2
  */
-class KDECORE_EXPORT KMountPoint : public KShared
+class TDECORE_EXPORT KMountPoint : public KShared
 {
    typedef signed long long int filesize_t;
 public:
diff --git a/tdecore/kmultipledrag.h b/tdecore/kmultipledrag.h
index 2490ec694..361bdcae7 100644
--- a/tdecore/kmultipledrag.h
+++ b/tdecore/kmultipledrag.h
@@ -51,7 +51,7 @@ class KMultipleDragPrivate;
  *
  * @author David Faure <faure@kde.org>
  */
-class KDECORE_EXPORT KMultipleDrag : public TQDragObject
+class TDECORE_EXPORT KMultipleDrag : public TQDragObject
 {
     Q_OBJECT
 
diff --git a/tdecore/knotifyclient.h b/tdecore/knotifyclient.h
index 2de3e297d..ae7acbb79 100644
--- a/tdecore/knotifyclient.h
+++ b/tdecore/knotifyclient.h
@@ -93,7 +93,7 @@ namespace KNotifyClient
      *
      * @short Enables KNotifyClient to use a different KInstance
      */
-    class KDECORE_EXPORT Instance
+    class TDECORE_EXPORT Instance
     {
     public:
         /**
@@ -175,7 +175,7 @@ namespace KNotifyClient
 	 * first triggered.
 	 * @return true if daemon is running (always true at the moment)
 	 **/
-	KDECORE_EXPORT bool startDaemon();
+	TDECORE_EXPORT bool startDaemon();
 
 //#ifndef KDE_NO_COMPAT
 	/**
@@ -185,7 +185,7 @@ namespace KNotifyClient
 	 *             the user connected the event to sound, only. Can be TQString::null.
 	 * @return a value > 0, unique for this event if successful, 0 otherwise
 	 */
-	KDECORE_EXPORT int event(const TQString &message, const TQString &text=TQString::null) KDE_DEPRECATED;
+	TDECORE_EXPORT int event(const TQString &message, const TQString &text=TQString::null) KDE_DEPRECATED;
 
 	/**
 	 * @deprecated
@@ -194,7 +194,7 @@ namespace KNotifyClient
 	 * @param text The text explaining the event you raise. Can be TQString::null.
 	 * @return a value > 0, unique for this event if successful, 0 otherwise
 	 */
-	KDECORE_EXPORT int event( StandardEvent event, const TQString& text=TQString::null ) KDE_DEPRECATED;
+	TDECORE_EXPORT int event( StandardEvent event, const TQString& text=TQString::null ) KDE_DEPRECATED;
 
 	/**
 	 * @deprecated
@@ -206,7 +206,7 @@ namespace KNotifyClient
 	 * @param file The log file to append the message to if selected with @p present
 	 * @return a value > 0, unique for this event if successful, 0 otherwise
 	 */
-	KDECORE_EXPORT int userEvent(const TQString &text=TQString::null, int present=Default, int level=Default,
+	TDECORE_EXPORT int userEvent(const TQString &text=TQString::null, int present=Default, int level=Default,
 	                             const TQString &sound=TQString::null, const TQString &file=TQString::null) KDE_DEPRECATED;
 	
 //#endif
@@ -227,7 +227,7 @@ namespace KNotifyClient
 	 * @since 3.1.1
 	 */
 	// KDE4: use WId instead of int
-	KDECORE_EXPORT int event( int winId, const TQString& message,
+	TDECORE_EXPORT int event( int winId, const TQString& message,
                               const TQString& text = TQString::null );
 
 	/**
@@ -242,7 +242,7 @@ namespace KNotifyClient
 	 * @since 3.1.1
 	 */
 	// KDE4: use WId instead of int
-	KDECORE_EXPORT int event( int winId, StandardEvent event,
+	TDECORE_EXPORT int event( int winId, StandardEvent event,
                               const TQString& text = TQString::null );
 
 	/**
@@ -260,7 +260,7 @@ namespace KNotifyClient
 	 * @since 3.1.1
 	 */
 	// KDE4: use WId instead of int
-	KDECORE_EXPORT int userEvent(int winId, const TQString &text=TQString::null, int present=Default, int level=Default,
+	TDECORE_EXPORT int userEvent(int winId, const TQString &text=TQString::null, int present=Default, int level=Default,
 	                      const TQString &sound=TQString::null, const TQString &file=TQString::null);
 	
 	/**
@@ -271,7 +271,7 @@ namespace KNotifyClient
 	 * \endcode
 	 * @param reason the reason, can be TQString::null.
 	 */
-	KDECORE_EXPORT void beep(const TQString& reason=TQString::null);
+	TDECORE_EXPORT void beep(const TQString& reason=TQString::null);
 
 	/**
 	 * Gets the presentation associated with a certain event name
@@ -282,7 +282,7 @@ namespace KNotifyClient
 	 * @param eventname the event name to check
 	 * @return the presentation methods
 	 */
-	KDECORE_EXPORT int getPresentation(const TQString &eventname);
+	TDECORE_EXPORT int getPresentation(const TQString &eventname);
 	
 	/**
 	 * Gets the default file associated with a certain event name
@@ -292,7 +292,7 @@ namespace KNotifyClient
 	 * @param present the presentation method
 	 * @return the associated file. Can be TQString::null if not found.
 	 */
-	KDECORE_EXPORT TQString getFile(const TQString &eventname, int present);
+	TDECORE_EXPORT TQString getFile(const TQString &eventname, int present);
 	
 	/**
 	 * Gets the default presentation for the event of this program.
@@ -302,7 +302,7 @@ namespace KNotifyClient
 	 * \endcode
 	 * @return the presentation methods
 	 */
-	KDECORE_EXPORT int getDefaultPresentation(const TQString &eventname);
+	TDECORE_EXPORT int getDefaultPresentation(const TQString &eventname);
 	
 	/**
 	 * Gets the default File for the event of this program.
@@ -313,13 +313,13 @@ namespace KNotifyClient
 	 * @param present the presentation method
 	 * @return the default file. Can be TQString::null if not found.
 	 */
-	KDECORE_EXPORT TQString getDefaultFile(const TQString &eventname, int present);
+	TDECORE_EXPORT TQString getDefaultFile(const TQString &eventname, int present);
 
 	/**
 	 * Shortcut to KNotifyClient::Instance::current() :)
 	 * @returns the current KInstance.
 	 */
-	KDECORE_EXPORT KInstance * instance();
+	TDECORE_EXPORT KInstance * instance();
 }
 
 #endif
diff --git a/tdecore/kpalette.h b/tdecore/kpalette.h
index 4f9c74029..332e34a6b 100644
--- a/tdecore/kpalette.h
+++ b/tdecore/kpalette.h
@@ -43,7 +43,7 @@ class KPalettePrivate;
  *
  * @author Waldo Bastian (bastian@kde.org)
  **/
-class KDECORE_EXPORT KPalette
+class TDECORE_EXPORT KPalette
 {
 public:
    /**
diff --git a/tdecore/kpixmapprovider.h b/tdecore/kpixmapprovider.h
index 8b3c653af..362bf32b2 100644
--- a/tdecore/kpixmapprovider.h
+++ b/tdecore/kpixmapprovider.h
@@ -35,7 +35,7 @@
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  * @short an abstract interface for looking up icons
  */
-class KDECORE_EXPORT KPixmapProvider
+class TDECORE_EXPORT KPixmapProvider
 {
 public:
     virtual ~KPixmapProvider();
diff --git a/tdecore/kprocctrl.h b/tdecore/kprocctrl.h
index 0e534f4ad..9a596334b 100644
--- a/tdecore/kprocctrl.h
+++ b/tdecore/kprocctrl.h
@@ -36,7 +36,7 @@ class TQSocketNotifier;
  *
  * This class takes care of the actual (UN*X) signal handling.
  */
-class KDECORE_EXPORT KProcessController : public TQObject
+class TDECORE_EXPORT KProcessController : public TQObject
 {
   Q_OBJECT
 
diff --git a/tdecore/kprocess.h b/tdecore/kprocess.h
index a07df060e..17551c873 100644
--- a/tdecore/kprocess.h
+++ b/tdecore/kprocess.h
@@ -127,7 +127,7 @@ class KPty;
  * @author Christian Czezatke e9025461@student.tuwien.ac.at
  *
  **/
-class KDECORE_EXPORT KProcess : public TQObject
+class TDECORE_EXPORT KProcess : public TQObject
 {
   Q_OBJECT
 
@@ -901,7 +901,7 @@ class KShellProcessPrivate;
 *   	processes through a shell.
 *   @author Christian Czezatke <e9025461@student.tuwien.ac.at>
 */
-class KDECORE_EXPORT KShellProcess: public KProcess
+class TDECORE_EXPORT KShellProcess: public KProcess
 {
   Q_OBJECT
 
diff --git a/tdecore/kprocio.h b/tdecore/kprocio.h
index 89c69008e..406a0f01b 100644
--- a/tdecore/kprocio.h
+++ b/tdecore/kprocio.h
@@ -47,7 +47,7 @@ class TQTextCodec;
  **/
 
 
-class KDECORE_EXPORT KProcIO : public KProcess
+class TDECORE_EXPORT KProcIO : public KProcess
 {
   Q_OBJECT
 
diff --git a/tdecore/kprotocolinfo_tdecore.cpp b/tdecore/kprotocolinfo_tdecore.cpp
index 66ce97760..93692c735 100644
--- a/tdecore/kprotocolinfo_tdecore.cpp
+++ b/tdecore/kprotocolinfo_tdecore.cpp
@@ -16,12 +16,12 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifdef MAKE_KDECORE_LIB //needed for proper linkage (win32)
+#ifdef MAKE_TDECORE_LIB //needed for proper linkage (win32)
 #undef KIO_EXPORT
 #define KIO_EXPORT KDE_EXPORT
 #endif
 
-#define KPROTOCOLINFO_KDECORE
+#define KPROTOCOLINFO_TDECORE
 #include "kprotocolinfo.h"
 #include "kprotocolinfofactory.h"
 
diff --git a/tdecore/kprotocolinfofactory.h b/tdecore/kprotocolinfofactory.h
index f710e8ecc..6a10ac1e3 100644
--- a/tdecore/kprotocolinfofactory.h
+++ b/tdecore/kprotocolinfofactory.h
@@ -37,7 +37,7 @@ class KProtocolInfoPrivate;
  *
  * @short Factory for KProtocolInfo
  */
-class KDECORE_EXPORT KProtocolInfoFactory : public KSycocaFactory
+class TDECORE_EXPORT KProtocolInfoFactory : public KSycocaFactory
 { 
   K_SYCOCAFACTORY( KST_KProtocolInfoFactory )
 public:
diff --git a/tdecore/kpty.h b/tdecore/kpty.h
index 5b9a94112..bb166f4a0 100644
--- a/tdecore/kpty.h
+++ b/tdecore/kpty.h
@@ -37,7 +37,7 @@ struct KPtyPrivate;
  *
  * @since 3.2
  **/
-class KDECORE_EXPORT KPty {
+class TDECORE_EXPORT KPty {
 
 public:
 
diff --git a/tdecore/krandomsequence.h b/tdecore/krandomsequence.h
index 383eee9ce..621cb0d68 100644
--- a/tdecore/krandomsequence.h
+++ b/tdecore/krandomsequence.h
@@ -36,7 +36,7 @@ class TQGList;
  *
  * @author Sean Harmer <sh@astro.keele.ac.uk>
  */
-class KDECORE_EXPORT KRandomSequence
+class TDECORE_EXPORT KRandomSequence
 {
 public: 
   /**
diff --git a/tdecore/kregexp.h b/tdecore/kregexp.h
index 88d16a3c7..50f755ed9 100644
--- a/tdecore/kregexp.h
+++ b/tdecore/kregexp.h
@@ -57,7 +57,7 @@ class KRegExpPrivate;
  *
  * @author Torben Weis <weis@kde.org>
  */
-class KDECORE_EXPORT KDE_DEPRECATED KRegExp
+class TDECORE_EXPORT KDE_DEPRECATED KRegExp
 {
 public:
 
diff --git a/tdecore/krfcdate.h b/tdecore/krfcdate.h
index ade819622..ca4f309c7 100644
--- a/tdecore/krfcdate.h
+++ b/tdecore/krfcdate.h
@@ -29,7 +29,7 @@
  *
  * @author Waldo Bastian <bastian@kde.org>
  */
-class KDECORE_EXPORT KRFCDate
+class TDECORE_EXPORT KRFCDate
 {
 public:
    /**
diff --git a/tdecore/krootprop.h b/tdecore/krootprop.h
index 6d6a43a24..b1f6497c9 100644
--- a/tdecore/krootprop.h
+++ b/tdecore/krootprop.h
@@ -43,7 +43,7 @@ class KRootPropPrivate;
 * @see  KConfig::KConfig
 * @author Mark Donohoe (donohe@kde.org)
 */
-class KDECORE_EXPORT KRootProp
+class TDECORE_EXPORT KRootProp
 {
 private:	
   Atom atom;
diff --git a/tdecore/ksavefile.h b/tdecore/ksavefile.h
index 448c9ca1a..7cf4bc7e9 100644
--- a/tdecore/ksavefile.h
+++ b/tdecore/ksavefile.h
@@ -38,7 +38,7 @@ class KSaveFilePrivate;
  *   Some error occurred, no changes have been written whatsoever and the
  *   old file is still in place.
  */
-class KDECORE_EXPORT KSaveFile
+class TDECORE_EXPORT KSaveFile
 {
 public:
    /**
diff --git a/tdecore/ksharedptr.h b/tdecore/ksharedptr.h
index ada08413b..8338145cc 100644
--- a/tdecore/ksharedptr.h
+++ b/tdecore/ksharedptr.h
@@ -37,7 +37,7 @@
  *
  * @author Waldo Bastian <bastian@kde.org>
  */
-class KDECORE_EXPORT KShared {
+class TDECORE_EXPORT KShared {
 public:
    /**
     * Standard constructor.  This will initialize the reference count
diff --git a/tdecore/kshell.h b/tdecore/kshell.h
index 2e9f3ad98..8f18603cd 100644
--- a/tdecore/kshell.h
+++ b/tdecore/kshell.h
@@ -90,7 +90,7 @@ namespace KShell {
      *  target, see Errors
      * @return a list of unquoted words or an empty list if an error occurred
      */
-    KDECORE_EXPORT TQStringList splitArgs( const TQString &cmd, int flags = 0, int *err = 0 );
+    TDECORE_EXPORT TQStringList splitArgs( const TQString &cmd, int flags = 0, int *err = 0 );
 
     /**
      * Quotes and joins @p args together according to POSIX shell rules.
@@ -98,7 +98,7 @@ namespace KShell {
      * @param args a list of strings to quote and join
      * @return a command suitable for shell execution
      */
-    KDECORE_EXPORT TQString joinArgs( const TQStringList &args );
+    TDECORE_EXPORT TQString joinArgs( const TQStringList &args );
 
     /**
      * Same as above, but $'' is used instead of '' for the quoting.
@@ -110,7 +110,7 @@ namespace KShell {
      * @param args a list of strings to quote and join
      * @return a command suitable for shell execution
      */
-    KDECORE_EXPORT TQString joinArgsDQ( const TQStringList &args );
+    TDECORE_EXPORT TQString joinArgsDQ( const TQStringList &args );
 
     /**
      * Quotes and joins @p argv together according to POSIX shell rules.
@@ -121,7 +121,7 @@ namespace KShell {
      *  @p argv must be null-terminated.
      * @return a command suitable for shell execution
      */
-    KDECORE_EXPORT TQString joinArgs( const char * const *argv, int argc = -1 );
+    TDECORE_EXPORT TQString joinArgs( const char * const *argv, int argc = -1 );
 
     /**
      * Performs tilde expansion on @p path. Interprets "~/path" and
@@ -130,7 +130,7 @@ namespace KShell {
      * @param path the path to tilde-expand
      * @return the expanded path
      */
-    KDECORE_EXPORT TQString tildeExpand( const TQString &path );
+    TDECORE_EXPORT TQString tildeExpand( const TQString &path );
 
     /**
      * Obtain a @p user's home directory.
@@ -139,7 +139,7 @@ namespace KShell {
      *  An empty string denotes the current user.
      * @return The user's home directory.
      */
-    KDECORE_EXPORT TQString homeDir( const TQString &user );
+    TDECORE_EXPORT TQString homeDir( const TQString &user );
 
 }
 
diff --git a/tdecore/kshortcut.h b/tdecore/kshortcut.h
index 7d62a0041..ee4a269f3 100644
--- a/tdecore/kshortcut.h
+++ b/tdecore/kshortcut.h
@@ -37,7 +37,7 @@ class KKeyNative;
 * @see KShortcut
 */
 
-class KDECORE_EXPORT KKey
+class TDECORE_EXPORT KKey
 {
  public:
         /**
@@ -285,7 +285,7 @@ class KDECORE_EXPORT KKey
 * @see KShortcut
 */
 
-class KDECORE_EXPORT KKeySequence
+class TDECORE_EXPORT KKeySequence
 {
  public:
         /// Defines the maximum length of the key sequence
@@ -540,7 +540,7 @@ class KDECORE_EXPORT KKeySequence
 * 
 */
 
-class KDECORE_EXPORT KShortcut
+class TDECORE_EXPORT KShortcut
 {
  public:
         /**
diff --git a/tdecore/kshortcutlist.h b/tdecore/kshortcutlist.h
index 4896bc30a..bd1482880 100644
--- a/tdecore/kshortcutlist.h
+++ b/tdecore/kshortcutlist.h
@@ -45,7 +45,7 @@ class KShortcut;
  *
  * @short Base class for accessing accelerator lists
  */
-class KDECORE_EXPORT KShortcutList
+class TDECORE_EXPORT KShortcutList
 {
  public:
         /**
@@ -195,7 +195,7 @@ class KGlobalAccel;
  * KShortcutList implementation to access KAccel and
  * KGlobalAccel lists.
  */
-class KDECORE_EXPORT KAccelShortcutList : public KShortcutList
+class TDECORE_EXPORT KAccelShortcutList : public KShortcutList
 {
  public:
         /**
@@ -260,7 +260,7 @@ namespace KStdAccel {
  * KShortcutList implementation that accesses KStdAccel
  * actions.
  */
-class KDECORE_EXPORT ShortcutList : public KShortcutList
+class TDECORE_EXPORT ShortcutList : public KShortcutList
 {
  public:
         /**
diff --git a/tdecore/kshortcutmenu.h b/tdecore/kshortcutmenu.h
index aa641e201..2c682342d 100644
--- a/tdecore/kshortcutmenu.h
+++ b/tdecore/kshortcutmenu.h
@@ -32,7 +32,7 @@ class KAccelActions;
 /**
  * @internal
  */
-class KDECORE_EXPORT KShortcutMenu : public TQPopupMenu
+class TDECORE_EXPORT KShortcutMenu : public TQPopupMenu
 {
 	Q_OBJECT
  public:
diff --git a/tdecore/ksimpleconfig.h b/tdecore/ksimpleconfig.h
index 89d380512..c7efeecfa 100644
--- a/tdecore/ksimpleconfig.h
+++ b/tdecore/ksimpleconfig.h
@@ -38,7 +38,7 @@ class KSimpleConfigPrivate;
  * @see KConfigBase KConfig
  * @short KDE Configuration Management class with deletion ability
  */
-class KDECORE_EXPORT KSimpleConfig : public KConfig
+class TDECORE_EXPORT KSimpleConfig : public KConfig
 {
   Q_OBJECT
 
diff --git a/tdecore/ksock.h b/tdecore/ksock.h
index 5c3eced8a..7f4f0b178 100644
--- a/tdecore/ksock.h
+++ b/tdecore/ksock.h
@@ -88,7 +88,7 @@ class KServerSocketPrivate;
  * @author Torben Weis <weis@uni-frankfurt.de>
  * @short A TCP/IP client socket.
  */
-class KDECORE_EXPORT KSocket : public TQObject
+class TDECORE_EXPORT KSocket : public TQObject
 {
     Q_OBJECT
 public:
@@ -251,7 +251,7 @@ private:
  *
  * @author Torben Weis <weis@stud.uni-frankfurt.de>
 */
-class KDECORE_EXPORT KServerSocket : public TQObject
+class TDECORE_EXPORT KServerSocket : public TQObject
 {
     Q_OBJECT
 public:
diff --git a/tdecore/ksockaddr.h b/tdecore/ksockaddr.h
index 04ae350aa..2510d1218 100644
--- a/tdecore/ksockaddr.h
+++ b/tdecore/ksockaddr.h
@@ -43,7 +43,7 @@ class KSocketAddressPrivate;
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  * @short a socket address.
  */
-class KDECORE_EXPORT KSocketAddress: public TQObject
+class TDECORE_EXPORT KSocketAddress: public TQObject
 {
   Q_OBJECT
 protected:
@@ -230,7 +230,7 @@ class KInetSocketAddressPrivate;
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  * @short an Internet socket address
  */
-class KDECORE_EXPORT KInetSocketAddress: public ::KSocketAddress
+class TDECORE_EXPORT KInetSocketAddress: public ::KSocketAddress
 {
   Q_OBJECT
 public:
@@ -581,7 +581,7 @@ class KUnixSocketAddressPrivate;
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  * @short a Unix socket address
  */
-class KDECORE_EXPORT KUnixSocketAddress: public ::KSocketAddress
+class TDECORE_EXPORT KUnixSocketAddress: public ::KSocketAddress
 {
   Q_OBJECT
 public:
diff --git a/tdecore/ksocks.h b/tdecore/ksocks.h
index a95de56d4..add847aba 100644
--- a/tdecore/ksocks.h
+++ b/tdecore/ksocks.h
@@ -45,7 +45,7 @@ typedef unsigned ksocklen_t;
  *
  * @short Access to a SOCKS Proxy.
  */
-class KDECORE_EXPORT KSocks {
+class TDECORE_EXPORT KSocks {
    friend class KStaticDeleter<KSocks>;
 
 public:
diff --git a/tdecore/kstandarddirs.h b/tdecore/kstandarddirs.h
index 3f1fd14c1..ed4cff3c0 100644
--- a/tdecore/kstandarddirs.h
+++ b/tdecore/kstandarddirs.h
@@ -122,7 +122,7 @@ class KStandardDirsPrivate;
  *
  * @see KGlobalSettings
  */
-class KDECORE_EXPORT KStandardDirs
+class TDECORE_EXPORT KStandardDirs
 {
 public:
         /**
@@ -700,7 +700,7 @@ public:
  * This function is just for convenience. It simply calls
  *instance->dirs()->\link KStandardDirs::findResource() findResource\endlink(type, filename).
  **/
-KDECORE_EXPORT TQString locate( const char *type, const TQString& filename, const KInstance* instance = KGlobal::instance() );
+TDECORE_EXPORT TQString locate( const char *type, const TQString& filename, const KInstance* instance = KGlobal::instance() );
 
 /*!
  * \relates KStandardDirs
@@ -711,7 +711,7 @@ KDECORE_EXPORT TQString locate( const char *type, const TQString& filename, cons
  * specific file, filename must have a trailing slash.
  *
  **/
-KDECORE_EXPORT TQString locateLocal( const char *type, const TQString& filename, const KInstance* instance = KGlobal::instance() );
+TDECORE_EXPORT TQString locateLocal( const char *type, const TQString& filename, const KInstance* instance = KGlobal::instance() );
 
 /*!
  * \relates KStandardDirs
@@ -722,7 +722,7 @@ KDECORE_EXPORT TQString locateLocal( const char *type, const TQString& filename,
  * filename must have a trailing slash.
  *
  **/
-KDECORE_EXPORT TQString locateLocal( const char *type, const TQString& filename, bool createDir, const KInstance* instance = KGlobal::instance() );
+TDECORE_EXPORT TQString locateLocal( const char *type, const TQString& filename, bool createDir, const KInstance* instance = KGlobal::instance() );
 
 /*! @} */
 
diff --git a/tdecore/kstartupinfo.h b/tdecore/kstartupinfo.h
index 807e484c5..d14213dc7 100644
--- a/tdecore/kstartupinfo.h
+++ b/tdecore/kstartupinfo.h
@@ -64,7 +64,7 @@ class KStartupInfoPrivate;
  *
  * @author Lubos Lunak <l.lunak@kde.org>
  */
-class KDECORE_EXPORT KStartupInfo
+class TDECORE_EXPORT KStartupInfo
     : public TQObject
     {
     Q_OBJECT
@@ -392,7 +392,7 @@ class KStartupInfoIdPrivate;
  *
  * @author Lubos Lunak <l.lunak@kde.org>
  */
-class KDECORE_EXPORT KStartupInfoId
+class TDECORE_EXPORT KStartupInfoId
     {
     public:
 	/**
@@ -465,7 +465,7 @@ class KStartupInfoDataPrivate;
  *
  * @author Lubos Lunak <l.lunak@kde.org>
  */
-class KDECORE_EXPORT KStartupInfoData
+class TDECORE_EXPORT KStartupInfoData
     {
     public:
 	/**
diff --git a/tdecore/kstaticdeleter.h b/tdecore/kstaticdeleter.h
index ee3e5755c..61b4a8e4a 100644
--- a/tdecore/kstaticdeleter.h
+++ b/tdecore/kstaticdeleter.h
@@ -36,7 +36,7 @@
  * @see KGlobal::unregisterStaticDeleter()
  * @see KGlobal::deleteStaticDeleters()
  */
-class KDECORE_EXPORT KStaticDeleterBase {
+class TDECORE_EXPORT KStaticDeleterBase {
 public:
     virtual ~KStaticDeleterBase() { }
     /**
diff --git a/tdecore/kstdaccel.cpp b/tdecore/kstdaccel.cpp
index 85f8dda20..cb2d9dbba 100644
--- a/tdecore/kstdaccel.cpp
+++ b/tdecore/kstdaccel.cpp
@@ -376,16 +376,16 @@ bool ShortcutList::save() const
 	return writeSettings( TQString::null, 0, false, true );
 }
 
-KDECORE_EXPORT TQString action(StdAccel id)
+TDECORE_EXPORT TQString action(StdAccel id)
 	{ return name(id); }
-KDECORE_EXPORT TQString description(StdAccel id)
+TDECORE_EXPORT TQString description(StdAccel id)
 	{ return label(id); }
-KDECORE_EXPORT int key(StdAccel id)
+TDECORE_EXPORT int key(StdAccel id)
 	{ return shortcut(id).keyCodeQt(); }
-KDECORE_EXPORT int defaultKey(StdAccel id)
+TDECORE_EXPORT int defaultKey(StdAccel id)
 	{ return shortcutDefault(id).keyCodeQt(); }
 
-KDECORE_EXPORT bool isEqual(const TQKeyEvent* ev, int keyQt)
+TDECORE_EXPORT bool isEqual(const TQKeyEvent* ev, int keyQt)
 {
 	KKey key1( ev ), key2( keyQt );
 	return key1 == key2;
diff --git a/tdecore/kstdaccel.h b/tdecore/kstdaccel.h
index 9f379b210..6707cc3d2 100644
--- a/tdecore/kstdaccel.h
+++ b/tdecore/kstdaccel.h
@@ -87,28 +87,28 @@ namespace KStdAccel
    * Returns the keybinding for @p accel.
    * @param id the id of the accelerator
    */
-  KDECORE_EXPORT const KShortcut& shortcut(StdAccel id);
+  TDECORE_EXPORT const KShortcut& shortcut(StdAccel id);
 
   /**
    * Returns a unique name for the given accel.
    * @param id the id of the accelerator
    * @return the unique name of the accelerator
    */
-  KDECORE_EXPORT TQString name(StdAccel id);
+  TDECORE_EXPORT TQString name(StdAccel id);
 
   /**
    * Returns a localized label for user-visible display.
    * @param id the id of the accelerator
    * @return a localized label for the accelerator
    */
-  KDECORE_EXPORT TQString label(StdAccel id);
+  TDECORE_EXPORT TQString label(StdAccel id);
 
   /**
    * Returns an extended WhatsThis description for the given accelerator.
    * @param id the id of the accelerator
    * @return a localized description of the accelerator
    */
-  KDECORE_EXPORT TQString whatsThis(StdAccel id);
+  TDECORE_EXPORT TQString whatsThis(StdAccel id);
 
   /**
    * Return the StdAccel id of the standard accel action which
@@ -118,7 +118,7 @@ namespace KStdAccel
    * @return the id of the standard accelerator, or AccelNone if there
    *          is none
    */
-  KDECORE_EXPORT StdAccel findStdAccel( const KKeySequence &keySeq );
+  TDECORE_EXPORT StdAccel findStdAccel( const KKeySequence &keySeq );
 
   /**
    * Returns the hardcoded default shortcut for @p id.
@@ -126,348 +126,348 @@ namespace KStdAccel
    * @param id the id of the accelerator
    * @return the default shortcut of the accelerator
    */
-  KDECORE_EXPORT KShortcut shortcutDefault(StdAccel id);
+  TDECORE_EXPORT KShortcut shortcutDefault(StdAccel id);
   /**
    * Returns the hardcoded default 3 modifier shortcut for @p id.
    * This does not take into account the user's configuration.
    * @param id the id of the accelerator
    * @return the default 3 modifier shortcut
    */
-  KDECORE_EXPORT KShortcut shortcutDefault3(StdAccel id);
+  TDECORE_EXPORT KShortcut shortcutDefault3(StdAccel id);
   /**
    * Returns the hardcoded default 4 modifier shortcut for @p id.
    * This does not take into account the user's configuration.
    * @param id the id of the accelerator
    * @return the default 4 modifier shortcut
    */
-  KDECORE_EXPORT KShortcut shortcutDefault4(StdAccel id);
+  TDECORE_EXPORT KShortcut shortcutDefault4(StdAccel id);
 
   /**
    * Open file. Default: Ctrl-o
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& open();
+  TDECORE_EXPORT const KShortcut& open();
 
   /**
    * Create a new document (or whatever). Default: Ctrl-n
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& openNew();
+  TDECORE_EXPORT const KShortcut& openNew();
 
   /**
    * Close current document. Default: Ctrl-w
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& close();
+  TDECORE_EXPORT const KShortcut& close();
 
   /**
    * Save current document. Default: Ctrl-s
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& save();
+  TDECORE_EXPORT const KShortcut& save();
 
   /**
    * Print current document. Default: Ctrl-p
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& print();
+  TDECORE_EXPORT const KShortcut& print();
 
   /**
    * Quit the program. Default: Ctrl-q
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& quit();
+  TDECORE_EXPORT const KShortcut& quit();
 
   /**
    * Undo last operation. Default: Ctrl-z
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& undo();
+  TDECORE_EXPORT const KShortcut& undo();
 
   /**
    * Redo. Default: Shift-Ctrl-z
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& redo();
+  TDECORE_EXPORT const KShortcut& redo();
 
   /**
    * Cut selected area and store it in the clipboard. Default: Ctrl-x
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& cut();
+  TDECORE_EXPORT const KShortcut& cut();
 
   /**
    * Copy selected area into the clipboard. Default: Ctrl-c
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& copy();
+  TDECORE_EXPORT const KShortcut& copy();
 
   /**
    * Paste contents of clipboard at mouse/cursor position. Default: Ctrl-v
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& paste();
+  TDECORE_EXPORT const KShortcut& paste();
 
   /**
    * Paste the selection at mouse/cursor position. Default: Ctrl-Shift-Insert
    * @return the shortcut of the standard accelerator
    * @since 3.4
    */
-  KDECORE_EXPORT const KShortcut& pasteSelection();
+  TDECORE_EXPORT const KShortcut& pasteSelection();
 
   /**
    * Reload. Default: Ctrl-A
    * @return the shortcut of the standard accelerator
    **/
-  KDECORE_EXPORT const KShortcut& selectAll();
+  TDECORE_EXPORT const KShortcut& selectAll();
 
   /**
    * Delete a word back from mouse/cursor position. Default: Ctrl-Backspace
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& deleteWordBack();
+  TDECORE_EXPORT const KShortcut& deleteWordBack();
 
   /**
    * Delete a word forward from mouse/cursor position. Default: Ctrl-Delete
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& deleteWordForward();
+  TDECORE_EXPORT const KShortcut& deleteWordForward();
 
   /**
    * Find, search. Default: Ctrl-f
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& find();
+  TDECORE_EXPORT const KShortcut& find();
 
   /**
    * Find/search next. Default: F3
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& findNext();
+  TDECORE_EXPORT const KShortcut& findNext();
 
   /**
    * Find/search previous. Default: Shift-F3
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& findPrev();
+  TDECORE_EXPORT const KShortcut& findPrev();
 
   /**
    * Find and replace matches. Default: Ctrl-r
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& replace();
+  TDECORE_EXPORT const KShortcut& replace();
 
   /**
    * Zoom in. Default: Ctrl-Plus
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& zoomIn();
+  TDECORE_EXPORT const KShortcut& zoomIn();
 
   /**
    * Zoom out. Default: Ctrl-Minus
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& zoomOut();
+  TDECORE_EXPORT const KShortcut& zoomOut();
 
   /**
    * Toggle insert/overwrite (with visual feedback, e.g. in the statusbar). Default: Insert
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& insert();
+  TDECORE_EXPORT const KShortcut& insert();
 
   /**
    * Goto beginning of the document. Default: Ctrl-Home
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& home();
+  TDECORE_EXPORT const KShortcut& home();
 
   /**
    * Goto end of the document. Default: Ctrl-End
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& end();
+  TDECORE_EXPORT const KShortcut& end();
 
   /**
    * Goto beginning of current line. Default: Home
    * @return the shortcut of the standard accelerator
    * @since 3.3
    */
-  KDECORE_EXPORT const KShortcut& beginningOfLine();
+  TDECORE_EXPORT const KShortcut& beginningOfLine();
 
   /**
    * Goto end of current line. Default: End
    * @return the shortcut of the standard accelerator
    * @since 3.3
    */
-  KDECORE_EXPORT const KShortcut& endOfLine();
+  TDECORE_EXPORT const KShortcut& endOfLine();
 
   /**
    * Scroll up one page. Default: Prior
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& prior();
+  TDECORE_EXPORT const KShortcut& prior();
 
   /**
    * Scroll down one page. Default: Next
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& next();
+  TDECORE_EXPORT const KShortcut& next();
 
   /**
    * Go to line. Default: Ctrl+G
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& gotoLine();
+  TDECORE_EXPORT const KShortcut& gotoLine();
 
   /**
    * Add current page to bookmarks. Default: Ctrl+B
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& addBookmark();
+  TDECORE_EXPORT const KShortcut& addBookmark();
 
   /**
    * Next Tab. Default: Ctrl-<
    * @return the shortcut of the standard accelerator
    * @since 3.2
    */
-  KDECORE_EXPORT const KShortcut& tabNext();
+  TDECORE_EXPORT const KShortcut& tabNext();
 
   /**
    * Previous Tab. Default: Ctrl->
    * @return the shortcut of the standard accelerator
    * @since 3.2
    */
-  KDECORE_EXPORT const KShortcut& tabPrev();
+  TDECORE_EXPORT const KShortcut& tabPrev();
 
   /**
    * Full Screen Mode. Default: Ctrl+Shift+F
    * @return the shortcut of the standard accelerator
    * @since 3.2
    */
-  KDECORE_EXPORT const KShortcut& fullScreen();
+  TDECORE_EXPORT const KShortcut& fullScreen();
 
   /**
    * Help the user in the current situation. Default: F1
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& help();
+  TDECORE_EXPORT const KShortcut& help();
 
   /**
    * Complete text in input widgets. Default Ctrl+E
    * @return the shortcut of the standard accelerator
    **/
-  KDECORE_EXPORT const KShortcut& completion();
+  TDECORE_EXPORT const KShortcut& completion();
 
   /**
    * Iterate through a list when completion returns
    * multiple items. Default: Ctrl+Up
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& prevCompletion();
+  TDECORE_EXPORT const KShortcut& prevCompletion();
 
   /**
    * Iterate through a list when completion returns
    * multiple items. Default: Ctrl+Down
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& nextCompletion();
+  TDECORE_EXPORT const KShortcut& nextCompletion();
 
   /**
    * Find a string within another string or list of strings.
    * Default: Ctrl-T
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& substringCompletion();
+  TDECORE_EXPORT const KShortcut& substringCompletion();
 
   /**
    * Help users iterate through a list of entries. Default: Up
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& rotateUp();
+  TDECORE_EXPORT const KShortcut& rotateUp();
 
   /**
    * Help users iterate through a list of entries. Default: Down
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& rotateDown();
+  TDECORE_EXPORT const KShortcut& rotateDown();
 
   /**
    * popup a context menu. Default: Menu
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& popupMenuContext();
+  TDECORE_EXPORT const KShortcut& popupMenuContext();
 
   /**
    * What's This button. Default: Shift+F1
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& whatsThis();
+  TDECORE_EXPORT const KShortcut& whatsThis();
 
   /**
    * Reload. Default: F5
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& reload();
+  TDECORE_EXPORT const KShortcut& reload();
 
   /**
    * Up. Default: Alt+Up
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& up();
+  TDECORE_EXPORT const KShortcut& up();
 
   /**
    * Back. Default: Alt+Left
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& back();
+  TDECORE_EXPORT const KShortcut& back();
 
   /**
    * Forward. Default: ALT+Right
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& forward();
+  TDECORE_EXPORT const KShortcut& forward();
 
   /**
    * BackwardWord. Default: Ctrl+Left
    * @return the shortcut of the standard accelerator
    * @since 3.3
    */
-  KDECORE_EXPORT const KShortcut& backwardWord();
+  TDECORE_EXPORT const KShortcut& backwardWord();
 
   /**
    * ForwardWord. Default: Ctrl+Right
    * @return the shortcut of the standard accelerator
    * @since 3.3
    */
-  KDECORE_EXPORT const KShortcut& forwardWord();
+  TDECORE_EXPORT const KShortcut& forwardWord();
 
   /**
    * Show Menu Bar.  Default: Ctrl-M
    * @return the shortcut of the standard accelerator
    */
-  KDECORE_EXPORT const KShortcut& showMenubar();
+  TDECORE_EXPORT const KShortcut& showMenubar();
 
 #if !defined(KDE_NO_COMPAT) && !defined(__KSTDACCEL_CPP_)
   /**
    * @deprecated
    * Obsolete.  Use name().  Returns a string representation for @p accel.
    */
-  KDECORE_EXPORT TQString action(StdAccel id) KDE_DEPRECATED;
+  TDECORE_EXPORT TQString action(StdAccel id) KDE_DEPRECATED;
   /**
    * @deprecated
    * Obsolete.  Use desc().  Returns a localized description of @p accel.
    */
-  KDECORE_EXPORT TQString description(StdAccel id) KDE_DEPRECATED;
+  TDECORE_EXPORT TQString description(StdAccel id) KDE_DEPRECATED;
   /**
    * @deprecated
    * Obsolete.  Use shortcut().  Returns the keybinding for @p accel.
    */
-  KDECORE_EXPORT int key(StdAccel) KDE_DEPRECATED;
+  TDECORE_EXPORT int key(StdAccel) KDE_DEPRECATED;
   /**
    * @deprecated
    * Obsolete.  Use shortcutDefault().
    */
-  KDECORE_EXPORT int defaultKey(StdAccel accel) KDE_DEPRECATED;
+  TDECORE_EXPORT int defaultKey(StdAccel accel) KDE_DEPRECATED;
 
   /**
    * @deprecated.  Use KKey(const TQKeyEvent*) == KKey(int).
@@ -484,7 +484,7 @@ namespace KStdAccel
    *
    * @return true if the int value matches the integer representation of the QKeyEvent
    */
-  KDECORE_EXPORT bool isEqual(const TQKeyEvent* pEvent, int keyQt) KDE_DEPRECATED;
+  TDECORE_EXPORT bool isEqual(const TQKeyEvent* pEvent, int keyQt) KDE_DEPRECATED;
 #endif // !KDE_NO_COMPAT
 
 }
diff --git a/tdecore/kstringhandler.h b/tdecore/kstringhandler.h
index 47075a066..23b765134 100644
--- a/tdecore/kstringhandler.h
+++ b/tdecore/kstringhandler.h
@@ -66,7 +66,7 @@
  * @author Ian Zepp <icszepp@islc.net>
  * @see KShell
  */
-class KDECORE_EXPORT KStringHandler
+class TDECORE_EXPORT KStringHandler
 {
 public:
     /** Returns the nth word in the string if found
diff --git a/tdecore/ksycoca.h b/tdecore/ksycoca.h
index 52e712989..1d3d32d88 100644
--- a/tdecore/ksycoca.h
+++ b/tdecore/ksycoca.h
@@ -41,7 +41,7 @@ class KSycocaFactoryList;
  * @internal
  * Read-only SYstem COnfiguration CAche
  */
-class KDECORE_EXPORT KSycoca : public TQObject, public DCOPObject
+class TDECORE_EXPORT KSycoca : public TQObject, public DCOPObject
 {
   Q_OBJECT
   K_DCOP
diff --git a/tdecore/ksycocadict.h b/tdecore/ksycocadict.h
index 0cf5eb257..592d6bfef 100644
--- a/tdecore/ksycocadict.h
+++ b/tdecore/ksycocadict.h
@@ -31,7 +31,7 @@ class KSycocaDictStringList;
  * @internal
  * Hash table implementation for the sycoca database file
  */
-class KDECORE_EXPORT KSycocaDict
+class TDECORE_EXPORT KSycocaDict
 {
 public:
    /**
diff --git a/tdecore/ksycocaentry.h b/tdecore/ksycocaentry.h
index 5e3fa2d37..a3cb9595f 100644
--- a/tdecore/ksycocaentry.h
+++ b/tdecore/ksycocaentry.h
@@ -34,7 +34,7 @@ class TQDataStream;
  * @internal
  * @see http://developer.kde.org/documentation/library/kdeqt/trinityarch/ksycoca.html 
  */
-class KDECORE_EXPORT KSycocaEntry : public KShared
+class TDECORE_EXPORT KSycocaEntry : public KShared
 {
  
 public:
diff --git a/tdecore/ksycocafactory.h b/tdecore/ksycocafactory.h
index 536da2864..100047834 100644
--- a/tdecore/ksycocafactory.h
+++ b/tdecore/ksycocafactory.h
@@ -36,7 +36,7 @@ typedef TQDict<KSycocaEntry::Ptr> KSycocaEntryDict;
  * @internal
  * Base class for sycoca factories
  */
-class KDECORE_EXPORT KSycocaFactory
+class TDECORE_EXPORT KSycocaFactory
 {
 public:
    virtual KSycocaFactoryId factoryId() const = 0;
@@ -134,7 +134,7 @@ protected:
 /** This, instead of a typedef, allows to declare "class ..." in header files
  * @internal
  */
-class KDECORE_EXPORT KSycocaFactoryList : public TQPtrList<KSycocaFactory>
+class TDECORE_EXPORT KSycocaFactoryList : public TQPtrList<KSycocaFactory>
 {
 public:
    KSycocaFactoryList() { }
diff --git a/tdecore/ktempdir.h b/tdecore/ktempdir.h
index 491a14c4c..92917e780 100644
--- a/tdecore/ktempdir.h
+++ b/tdecore/ktempdir.h
@@ -50,7 +50,7 @@ class KTempDirPrivate;
  * @since 3.2
  * @author Joseph Wenninger <jowenn@kde.org>
  */
-class KDECORE_EXPORT KTempDir
+class TDECORE_EXPORT KTempDir
 {
 public:
    /**
diff --git a/tdecore/ktempfile.h b/tdecore/ktempfile.h
index 5b18bf779..18503a534 100644
--- a/tdecore/ktempfile.h
+++ b/tdecore/ktempfile.h
@@ -52,7 +52,7 @@ class KTempFilePrivate;
  *
  * @author Waldo Bastian <bastian@kde.org>
  */
-class KDECORE_EXPORT KTempFile
+class TDECORE_EXPORT KTempFile
 {
    friend class KSaveFile;
 public:
diff --git a/tdecore/ktimezones.h b/tdecore/ktimezones.h
index 3055f202f..77d0ef169 100644
--- a/tdecore/ktimezones.h
+++ b/tdecore/ktimezones.h
@@ -48,7 +48,7 @@ class KTimezonesPrivate;
  * @since 3.5
  * @author S.R.Haque <srhaque@iee.org>.
  */
-class KDECORE_EXPORT KTimezoneSource :
+class TDECORE_EXPORT KTimezoneSource :
     public KShared
 {
 public:
@@ -82,7 +82,7 @@ private:
  * @since 3.5
  * @author S.R.Haque <srhaque@iee.org>.
  */
-class KDECORE_EXPORT KTimezone
+class TDECORE_EXPORT KTimezone
 {
 public:
     /**
@@ -222,7 +222,7 @@ private:
  * @since 3.5
  * @author S.R.Haque <srhaque@iee.org>.
  */
-class KDECORE_EXPORT KTimezoneDetails
+class TDECORE_EXPORT KTimezoneDetails
 {
 public:
     KTimezoneDetails();
@@ -293,7 +293,7 @@ private:
  * @since 3.5
  * @author S.R.Haque <srhaque@iee.org>.
  */
-class KDECORE_EXPORT KTimezones
+class TDECORE_EXPORT KTimezones
 {
 public:
     KTimezones();
diff --git a/tdecore/kuniqueapplication.h b/tdecore/kuniqueapplication.h
index f5c4bcc18..973837850 100644
--- a/tdecore/kuniqueapplication.h
+++ b/tdecore/kuniqueapplication.h
@@ -45,7 +45,7 @@ class KUniqueApplicationPrivate;
  * @see KApplication DCOPObject
  * @author Preston Brown <pbrown@kde.org>
  */
-class KDECORE_EXPORT KUniqueApplication : public KApplication, public DCOPObject
+class TDECORE_EXPORT KUniqueApplication : public KApplication, public DCOPObject
 {
   Q_OBJECT
 public:
diff --git a/tdecore/kurl.h b/tdecore/kurl.h
index eaa0291b9..0fb86a1c8 100644
--- a/tdecore/kurl.h
+++ b/tdecore/kurl.h
@@ -124,7 +124,7 @@ class KURLPrivate;
  *
  *  @author  Torben Weis <weis@kde.org>
  */
-class KDECORE_EXPORT KURL
+class TDECORE_EXPORT KURL
 {
 public:
   /**
@@ -184,7 +184,7 @@ public:
    * @see KURL
    * @see QValueList
    */
-  class KDECORE_EXPORT List : public TQValueList<KURL>
+  class TDECORE_EXPORT List : public TQValueList<KURL>
   {
   public:
     /**
@@ -1793,8 +1793,8 @@ private:
   unsigned short int m_iPort;
   TQString m_strPath_encoded;
 
-  friend KDECORE_EXPORT TQDataStream & operator<< (TQDataStream & s, const KURL & a);
-  friend KDECORE_EXPORT TQDataStream & operator>> (TQDataStream & s, KURL & a);
+  friend TDECORE_EXPORT TQDataStream & operator<< (TQDataStream & s, const KURL & a);
+  friend TDECORE_EXPORT TQDataStream & operator>> (TQDataStream & s, KURL & a);
 private:
   KURLPrivate* d;
 };
@@ -1806,7 +1806,7 @@ private:
  * are nevertheless considered to be unequal.
  * That means no malformed URL equals anything else.
  */
-KDECORE_EXPORT bool urlcmp( const TQString& _url1, const TQString& _url2 );
+TDECORE_EXPORT bool urlcmp( const TQString& _url1, const TQString& _url2 );
 
 /**
  * \relates KURL
@@ -1820,9 +1820,9 @@ KDECORE_EXPORT bool urlcmp( const TQString& _url1, const TQString& _url2 );
  * @param _ignore_trailing Described in KURL::cmp
  * @param _ignore_ref If true, disables comparison of HTML-style references.
  */
-KDECORE_EXPORT bool urlcmp( const TQString& _url1, const TQString& _url2, bool _ignore_trailing, bool _ignore_ref );
+TDECORE_EXPORT bool urlcmp( const TQString& _url1, const TQString& _url2, bool _ignore_trailing, bool _ignore_ref );
 
-KDECORE_EXPORT TQDataStream & operator<< (TQDataStream & s, const KURL & a);
-KDECORE_EXPORT TQDataStream & operator>> (TQDataStream & s, KURL & a);
+TDECORE_EXPORT TQDataStream & operator<< (TQDataStream & s, const KURL & a);
+TDECORE_EXPORT TQDataStream & operator>> (TQDataStream & s, KURL & a);
 
 #endif
diff --git a/tdecore/kurldrag.h b/tdecore/kurldrag.h
index 019119600..15dc2d1ad 100644
--- a/tdecore/kurldrag.h
+++ b/tdecore/kurldrag.h
@@ -41,7 +41,7 @@ class KURLDragPrivate;
  * To create a drag object, use the KURLDrag constructor.
  * To handle drops, use TQUriDrag::canDecode() and KURLDrag::decode()
  */
-class KDECORE_EXPORT KURLDrag : public TQUriDrag
+class TDECORE_EXPORT KURLDrag : public TQUriDrag
 {
 public:
   /**
diff --git a/tdecore/kuser.h b/tdecore/kuser.h
index 5c43b6b69..12b511f9f 100644
--- a/tdecore/kuser.h
+++ b/tdecore/kuser.h
@@ -42,7 +42,7 @@ template <class T> class TQValueList;
  * @author Tim Jansen <tim@tjansen.de>
  * @since 3.2
  */
-class KDECORE_EXPORT KUser {
+class TDECORE_EXPORT KUser {
 
 public:
 
@@ -253,7 +253,7 @@ struct group;
  * @author Jan Schaefer <j_schaef@informatik.uni-kl.de>
  * @since 3.3
  */
-class KDECORE_EXPORT KUserGroup {
+class TDECORE_EXPORT KUserGroup {
 
 public:
 
diff --git a/tdecore/kvmallocator.h b/tdecore/kvmallocator.h
index 50ce78e8d..5cfacb6c3 100644
--- a/tdecore/kvmallocator.h
+++ b/tdecore/kvmallocator.h
@@ -36,7 +36,7 @@ class KVMAllocatorPrivate;
  * 
  * @author Waldo Bastian <bastian@kde.org>
  */
-class KDECORE_EXPORT KVMAllocator
+class TDECORE_EXPORT KVMAllocator
 {
 public:
     struct Block;
diff --git a/tdecore/kwin.h b/tdecore/kwin.h
index 36cccb125..d3df42bd6 100644
--- a/tdecore/kwin.h
+++ b/tdecore/kwin.h
@@ -58,7 +58,7 @@ class NETWinInfo;
  * @see NetWinInfo
  * @author Matthias Ettrich (ettrich@kde.org)
 */
-class KDECORE_EXPORT KWin
+class TDECORE_EXPORT KWin
 {
 public:
 
@@ -466,7 +466,7 @@ public:
     /**
      * @deprecated Use WindowInfo .
      */
-    struct KDECORE_EXPORT Info
+    struct TDECORE_EXPORT Info
     {
       /// The window's id.
 	WId win;
@@ -519,7 +519,7 @@ private:
  * Information about a window.
  * @since 3.2
  */
-class KDECORE_EXPORT KWin::WindowInfo
+class TDECORE_EXPORT KWin::WindowInfo
 {
 public:
     /**
diff --git a/tdecore/kwinmodule.h b/tdecore/kwinmodule.h
index 6083d9b85..261449a16 100644
--- a/tdecore/kwinmodule.h
+++ b/tdecore/kwinmodule.h
@@ -53,7 +53,7 @@ class KWinModulePrivate;
  * @short Base class for KDE Window Manager modules.
  * @author Matthias Ettrich (ettrich@kde.org)
  */
-class KDECORE_EXPORT KWinModule : public TQObject
+class TDECORE_EXPORT KWinModule : public TQObject
 {
     Q_OBJECT
 
diff --git a/tdecore/kxerrorhandler.h b/tdecore/kxerrorhandler.h
index 9c0bd1e24..ab017ace2 100644
--- a/tdecore/kxerrorhandler.h
+++ b/tdecore/kxerrorhandler.h
@@ -54,7 +54,7 @@
  * @author Lubos Lunak <l.lunak@kde.org>
  * @short Handler for X errors
  */
-class KDECORE_EXPORT KXErrorHandler
+class TDECORE_EXPORT KXErrorHandler
     {
     public:
         /**
diff --git a/tdecore/kxmessages.h b/tdecore/kxmessages.h
index a5604c817..34fc559ac 100644
--- a/tdecore/kxmessages.h
+++ b/tdecore/kxmessages.h
@@ -49,7 +49,7 @@ class KXMessagesPrivate;
  * @author Lubos Lunak <l.lunak@kde.org>
  */
 // KDE4 - make this internal for KStartupInfo only?
-class KDECORE_EXPORT KXMessages
+class TDECORE_EXPORT KXMessages
     : public TQWidget
     {
     Q_OBJECT
diff --git a/tdecore/netsupp.h b/tdecore/netsupp.h
index a94040d44..3519d7a35 100644
--- a/tdecore/netsupp.h
+++ b/tdecore/netsupp.h
@@ -162,10 +162,10 @@ struct kde_addrinfo
   int origin;
 };
 
-extern KDECORE_EXPORT int kde_getaddrinfo(const char *name, const char *service,
+extern TDECORE_EXPORT int kde_getaddrinfo(const char *name, const char *service,
 			   const struct addrinfo* hint,
 			   struct kde_addrinfo** result);
-extern KDECORE_EXPORT void kde_freeaddrinfo(struct kde_addrinfo *p);
+extern TDECORE_EXPORT void kde_freeaddrinfo(struct kde_addrinfo *p);
 
 #if !defined(HAVE_GETADDRINFO) || defined(HAVE_BROKEN_GETADDRINFO)
 
@@ -253,15 +253,15 @@ struct addrinfo
 namespace KDE
 {
   /** \internal */
-  extern KDECORE_EXPORT int getaddrinfo(const char *name, const char *service,
+  extern TDECORE_EXPORT int getaddrinfo(const char *name, const char *service,
 			 const struct addrinfo* hint,
 			 struct addrinfo** result);
   /** \internal */
-  extern KDECORE_EXPORT void freeaddrinfo(struct addrinfo* ai);
+  extern TDECORE_EXPORT void freeaddrinfo(struct addrinfo* ai);
   /** \internal */
-  extern KDECORE_EXPORT char *gai_strerror(int errorcode);
+  extern TDECORE_EXPORT char *gai_strerror(int errorcode);
   /** \internal */
-  extern KDECORE_EXPORT int getnameinfo(const struct sockaddr *sa,
+  extern TDECORE_EXPORT int getnameinfo(const struct sockaddr *sa,
 			 unsigned int salen,
 			 char *host, size_t hostlen,
 			 char *serv, size_t servlen,
@@ -281,7 +281,7 @@ namespace KDE
 namespace KDE
 {
   /** \internal */
-  extern KDECORE_EXPORT int inet_pton(int af, const char *cp, void* buf);
+  extern TDECORE_EXPORT int inet_pton(int af, const char *cp, void* buf);
 }
 
 # define inet_pton	KDE::inet_pton
@@ -292,7 +292,7 @@ namespace KDE
 namespace KDE
 {
   /** \internal */
-  extern KDECORE_EXPORT const char* inet_ntop(int af, const void *cp, char *buf, size_t len);
+  extern TDECORE_EXPORT const char* inet_ntop(int af, const void *cp, char *buf, size_t len);
 }
 
 # define inet_ntop	KDE::inet_ntop
diff --git a/tdecore/netsupp_win32.cpp b/tdecore/netsupp_win32.cpp
index 316c5f4cd..fcdb8bef3 100644
--- a/tdecore/netsupp_win32.cpp
+++ b/tdecore/netsupp_win32.cpp
@@ -23,12 +23,12 @@
 
 #include "netsupp.h"
 
-KDECORE_EXPORT void kde_freeaddrinfo(struct kde_addrinfo *ai)
+TDECORE_EXPORT void kde_freeaddrinfo(struct kde_addrinfo *ai)
 {
 	//TODO
 }
 
-KDECORE_EXPORT int kde_getaddrinfo(const char *name, const char *service,
+TDECORE_EXPORT int kde_getaddrinfo(const char *name, const char *service,
 		    const struct addrinfo* hint,
 		    struct kde_addrinfo** result)
 {
@@ -37,7 +37,7 @@ KDECORE_EXPORT int kde_getaddrinfo(const char *name, const char *service,
 	return err;
 }
 
-KDECORE_EXPORT char *gai_strerror(int errorcode)
+TDECORE_EXPORT char *gai_strerror(int errorcode)
 {
   return 0;
 }
@@ -51,13 +51,13 @@ int getnameinfo(const struct sockaddr *sa,
 	return -1;
 }
 
-KDECORE_EXPORT const char* inet_ntop(int af, const void *cp, char *buf, size_t len)
+TDECORE_EXPORT const char* inet_ntop(int af, const void *cp, char *buf, size_t len)
 {
 	//TODO
 	return 0;
 }
 
-KDECORE_EXPORT int inet_pton(int af, const char *cp, void *buf)
+TDECORE_EXPORT int inet_pton(int af, const char *cp, void *buf)
 {
 	//TODO
 	return -1;
diff --git a/tdecore/netwm.h b/tdecore/netwm.h
index cc39ada1d..18d5041fe 100644
--- a/tdecore/netwm.h
+++ b/tdecore/netwm.h
@@ -55,7 +55,7 @@ template <class Z> class NETRArray;
    @see KWin
  **/
 
-class KDECORE_EXPORT NETRootInfo : public NET {
+class TDECORE_EXPORT NETRootInfo : public NET {
 public:
     /**
         Indexes for the properties array.
@@ -775,7 +775,7 @@ private:
  use it instead of NETRootInfo and override also the added virtual methods.
  @since 3.2
 */
-class KDECORE_EXPORT NETRootInfo2
+class TDECORE_EXPORT NETRootInfo2
     : public NETRootInfo
 {
 public:
@@ -847,7 +847,7 @@ protected:
  use it instead of NETRootInfo and override also the added virtual methods.
  @since 3.3
 */
-class KDECORE_EXPORT NETRootInfo3
+class TDECORE_EXPORT NETRootInfo3
     : public NETRootInfo2
 {
 public:
@@ -899,7 +899,7 @@ protected:
  use it instead of NETRootInfo and override also the added virtual methods.
  @since 3.5
 */
-class KDECORE_EXPORT NETRootInfo4
+class TDECORE_EXPORT NETRootInfo4
     : public NETRootInfo3
 {
 public:
@@ -936,7 +936,7 @@ protected:
    @see http://www.freedesktop.org/standards/wm-spec/
  **/
 
-class KDECORE_EXPORT NETWinInfo : public NET {
+class TDECORE_EXPORT NETWinInfo : public NET {
 public:
     /**
         Indexes for the properties array.
diff --git a/tdecore/netwm_def.h b/tdecore/netwm_def.h
index 1f6860243..c2a8e49b0 100644
--- a/tdecore/netwm_def.h
+++ b/tdecore/netwm_def.h
@@ -232,7 +232,7 @@ struct NETStrut {
   @see http://www.freedesktop.org/standards/wm-spec/
  **/
 
-class KDECORE_EXPORT NET {
+class TDECORE_EXPORT NET {
 public:
     /**
        Application role.  This is used internally to determine how several action
diff --git a/tdecore/network/kbufferedsocket.h b/tdecore/network/kbufferedsocket.h
index 8f9dde92c..dffffb5e8 100644
--- a/tdecore/network/kbufferedsocket.h
+++ b/tdecore/network/kbufferedsocket.h
@@ -55,7 +55,7 @@ class KBufferedSocketPrivate;
  * @see KNetwork::KStreamSocket, KNetwork::KServerSocket
  * @author Thiago Macieira <thiago@kde.org>
  */
-class KDECORE_EXPORT KBufferedSocket: public KStreamSocket
+class TDECORE_EXPORT KBufferedSocket: public KStreamSocket
 {
   Q_OBJECT
   TQ_OBJECT
diff --git a/tdecore/network/kclientsocketbase.h b/tdecore/network/kclientsocketbase.h
index 75e796ffc..8228015a0 100644
--- a/tdecore/network/kclientsocketbase.h
+++ b/tdecore/network/kclientsocketbase.h
@@ -50,7 +50,7 @@ class KClientSocketBasePrivate;
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KDECORE_EXPORT KClientSocketBase :
+class TDECORE_EXPORT KClientSocketBase :
 #ifdef USE_QT4
 #else // USE_QT4
 public TQObject,
diff --git a/tdecore/network/kdatagramsocket.h b/tdecore/network/kdatagramsocket.h
index becbe404a..62b17a0c3 100644
--- a/tdecore/network/kdatagramsocket.h
+++ b/tdecore/network/kdatagramsocket.h
@@ -48,7 +48,7 @@ class KResolverEntry;
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KDECORE_EXPORT KDatagramPacket
+class TDECORE_EXPORT KDatagramPacket
 {
   TQByteArray m_data;
   KSocketAddress m_address;
@@ -177,7 +177,7 @@ class KDatagramSocketPrivate;
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KDECORE_EXPORT KDatagramSocket: public KClientSocketBase
+class TDECORE_EXPORT KDatagramSocket: public KClientSocketBase
 {
   Q_OBJECT
   TQ_OBJECT
diff --git a/tdecore/network/khttpproxysocketdevice.h b/tdecore/network/khttpproxysocketdevice.h
index 7c9908ad5..65c2a8f4f 100644
--- a/tdecore/network/khttpproxysocketdevice.h
+++ b/tdecore/network/khttpproxysocketdevice.h
@@ -40,7 +40,7 @@ class KHttpProxySocketDevicePrivate;
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KDECORE_EXPORT KHttpProxySocketDevice: public KSocketDevice
+class TDECORE_EXPORT KHttpProxySocketDevice: public KSocketDevice
 {
 public:
   /**
diff --git a/tdecore/network/kmulticastsocket.h b/tdecore/network/kmulticastsocket.h
index 7fbd6e0f2..848e64491 100644
--- a/tdecore/network/kmulticastsocket.h
+++ b/tdecore/network/kmulticastsocket.h
@@ -45,7 +45,7 @@ class KMulticastSocketPrivate;
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KDECORE_EXPORT KMulticastSocket: public KDatagramSocket
+class TDECORE_EXPORT KMulticastSocket: public KDatagramSocket
 {
   // Q_add-it-here_OBJECT
 public:
diff --git a/tdecore/network/kresolver.h b/tdecore/network/kresolver.h
index 069428904..1b13d676b 100644
--- a/tdecore/network/kresolver.h
+++ b/tdecore/network/kresolver.h
@@ -63,7 +63,7 @@ class KResolverEntryPrivate;
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KDECORE_EXPORT KResolverEntry
+class TDECORE_EXPORT KResolverEntry
 {
 public:
   /**
@@ -194,7 +194,7 @@ class KResolverResultsPrivate;
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KDECORE_EXPORT KResolverResults: public TQValueList<KResolverEntry>
+class TDECORE_EXPORT KResolverResults: public TQValueList<KResolverEntry>
 {
 public:
   /**
@@ -292,7 +292,7 @@ class KResolverPrivate;
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KDECORE_EXPORT KResolver: public TQObject
+class TDECORE_EXPORT KResolver: public TQObject
 {
   Q_OBJECT
   TQ_OBJECT
diff --git a/tdecore/network/kreverseresolver.h b/tdecore/network/kreverseresolver.h
index 1f26f4a2a..044606a63 100644
--- a/tdecore/network/kreverseresolver.h
+++ b/tdecore/network/kreverseresolver.h
@@ -47,7 +47,7 @@ class KReverseResolverPrivate;
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KDECORE_EXPORT KReverseResolver: public TQObject
+class TDECORE_EXPORT KReverseResolver: public TQObject
 {
   Q_OBJECT
   TQ_OBJECT
diff --git a/tdecore/network/kserversocket.h b/tdecore/network/kserversocket.h
index a07ed54a1..c8cef3db3 100644
--- a/tdecore/network/kserversocket.h
+++ b/tdecore/network/kserversocket.h
@@ -104,7 +104,7 @@ class KServerSocketPrivate;
  * @see KNetwork::KStreamSocket, KNetwork::KBufferedSocket
  * @author Thiago Macieira <thiago@kde.org>
  */
-class KDECORE_EXPORT KServerSocket: public TQObject, public KPassiveSocketBase
+class TDECORE_EXPORT KServerSocket: public TQObject, public KPassiveSocketBase
 {
   Q_OBJECT
   TQ_OBJECT
diff --git a/tdecore/network/ksocketaddress.h b/tdecore/network/ksocketaddress.h
index 75deb60ae..6f7869323 100644
--- a/tdecore/network/ksocketaddress.h
+++ b/tdecore/network/ksocketaddress.h
@@ -59,7 +59,7 @@ class KUnixSocketAddress;
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KDECORE_EXPORT KIpAddress
+class TDECORE_EXPORT KIpAddress
 {
 public:
   /**
@@ -420,7 +420,7 @@ class KSocketAddressData;
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KDECORE_EXPORT KSocketAddress
+class TDECORE_EXPORT KSocketAddress
 {
 public:
   /**
@@ -648,7 +648,7 @@ public:				// static
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KDECORE_EXPORT KInetSocketAddress: public KSocketAddress
+class TDECORE_EXPORT KInetSocketAddress: public KSocketAddress
 {
   friend class KSocketAddress;
 public:
@@ -837,7 +837,7 @@ private:
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KDECORE_EXPORT KUnixSocketAddress: public KSocketAddress
+class TDECORE_EXPORT KUnixSocketAddress: public KSocketAddress
 {
   friend class KSocketAddress;
 public:
diff --git a/tdecore/network/ksocketbase.h b/tdecore/network/ksocketbase.h
index 8a94cbbcb..dd1e1e515 100644
--- a/tdecore/network/ksocketbase.h
+++ b/tdecore/network/ksocketbase.h
@@ -94,7 +94,7 @@ class KSocketBasePrivate;
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KDECORE_EXPORT KSocketBase
+class TDECORE_EXPORT KSocketBase
 {
 public:
   /**
@@ -440,7 +440,7 @@ private:
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KDECORE_EXPORT KActiveSocketBase: public TQIODevice, virtual public KSocketBase
+class TDECORE_EXPORT KActiveSocketBase: public TQIODevice, virtual public KSocketBase
 {
 public:
   /**
@@ -689,7 +689,7 @@ protected:
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KDECORE_EXPORT KPassiveSocketBase: virtual public KSocketBase
+class TDECORE_EXPORT KPassiveSocketBase: virtual public KSocketBase
 {
 public:
   /**
diff --git a/tdecore/network/ksocketdevice.h b/tdecore/network/ksocketdevice.h
index 7c288b722..8b972c2cc 100644
--- a/tdecore/network/ksocketdevice.h
+++ b/tdecore/network/ksocketdevice.h
@@ -47,7 +47,7 @@ class KSocketDevicePrivate;
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KDECORE_EXPORT KSocketDevice: public KActiveSocketBase, public KPassiveSocketBase
+class TDECORE_EXPORT KSocketDevice: public KActiveSocketBase, public KPassiveSocketBase
 {
 public:
   /**
diff --git a/tdecore/network/ksockssocketdevice.h b/tdecore/network/ksockssocketdevice.h
index 4db5d1e01..e622b3abc 100644
--- a/tdecore/network/ksockssocketdevice.h
+++ b/tdecore/network/ksockssocketdevice.h
@@ -37,7 +37,7 @@ namespace KNetwork {
  *
  * @warning This code is untested!
  */
-class KDECORE_EXPORT KSocksSocketDevice: public KSocketDevice
+class TDECORE_EXPORT KSocksSocketDevice: public KSocketDevice
 {
 public:
   /** 
diff --git a/tdecore/network/kstreamsocket.h b/tdecore/network/kstreamsocket.h
index 9b58bf23a..0308eb9ab 100644
--- a/tdecore/network/kstreamsocket.h
+++ b/tdecore/network/kstreamsocket.h
@@ -94,7 +94,7 @@ class KStreamSocketPrivate;
  * @see KNetwork::KBufferedSocket, KNetwork::KServerSocket
  * @author Thiago Macieira <thiago@kde.org>
  */
-class KDECORE_EXPORT KStreamSocket: public KClientSocketBase
+class TDECORE_EXPORT KStreamSocket: public KClientSocketBase
 {
   Q_OBJECT
   TQ_OBJECT
diff --git a/tdecore/svgicons/ksvgiconengine.h b/tdecore/svgicons/ksvgiconengine.h
index 3ef2063e9..b4fe50ed4 100644
--- a/tdecore/svgicons/ksvgiconengine.h
+++ b/tdecore/svgicons/ksvgiconengine.h
@@ -27,7 +27,7 @@
 
 class KSVGIconPainter;
 
-class KDECORE_EXPORT KSVGIconEngine
+class TDECORE_EXPORT KSVGIconEngine
 {
 public:
 	KSVGIconEngine();
diff --git a/tdecore/svgicons/ksvgiconpainter.h b/tdecore/svgicons/ksvgiconpainter.h
index 6b00d9d7c..b80eccea8 100644
--- a/tdecore/svgicons/ksvgiconpainter.h
+++ b/tdecore/svgicons/ksvgiconpainter.h
@@ -30,7 +30,7 @@ class TQWMatrix;
 class TQDomElement;
 class TQPointArray;
 
-class KDECORE_EXPORT KSVGIconPainter
+class TDECORE_EXPORT KSVGIconPainter
 {
 public:
 	KSVGIconPainter(int width, int height);