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

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit d6705bac5da767ff271b66c0f01ff6ed6352515e)

62 files changed, 125 insertions, 125 deletions

diff --git a/libtdepim/addresseediffalgo.h b/libtdepim/addresseediffalgo.h
index 7b133823d..2cda4ef56 100644
--- a/libtdepim/addresseediffalgo.h
+++ b/libtdepim/addresseediffalgo.h
@@ -27,7 +27,7 @@
 
 namespace KPIM {
 
-class KDE_EXPORT AddresseeDiffAlgo : public DiffAlgo
+class TDE_EXPORT AddresseeDiffAlgo : public DiffAlgo
 {
   public:
     AddresseeDiffAlgo( const TDEABC::Addressee &leftAddressee, const TDEABC::Addressee &rightAddressee );
diff --git a/libtdepim/addresseeemailselection.h b/libtdepim/addresseeemailselection.h
index f4394a93f..d3464b183 100644
--- a/libtdepim/addresseeemailselection.h
+++ b/libtdepim/addresseeemailselection.h
@@ -26,7 +26,7 @@
 
 namespace KPIM {
 
-class KDE_EXPORT AddresseeEmailSelection : public Selection
+class TDE_EXPORT AddresseeEmailSelection : public Selection
 {
   public:
     AddresseeEmailSelection();
diff --git a/libtdepim/addresseelineedit.h b/libtdepim/addresseelineedit.h
index 95457fd16..17ad5f058 100644
--- a/libtdepim/addresseelineedit.h
+++ b/libtdepim/addresseelineedit.h
@@ -50,7 +50,7 @@ typedef TQMap< TQString, TQPair<int,int> > CompletionItemsMap;
 
 namespace KPIM {
 
-class KDE_EXPORT AddresseeLineEdit : public ClickLineEdit, public DCOPObject
+class TDE_EXPORT AddresseeLineEdit : public ClickLineEdit, public DCOPObject
 {
   K_DCOP
   TQ_OBJECT
diff --git a/libtdepim/addresseeselector.h b/libtdepim/addresseeselector.h
index fa4a3c76b..bfe3e4aef 100644
--- a/libtdepim/addresseeselector.h
+++ b/libtdepim/addresseeselector.h
@@ -41,7 +41,7 @@ namespace KPIM {
 
 class AddresseeSelector;
 
-class KDE_EXPORT Selection
+class TDE_EXPORT Selection
 {
   friend class AddresseeSelector;
 
@@ -163,7 +163,7 @@ class SelectionItem
     TQBitArray mField;
 };
 
-class KDE_EXPORT AddresseeSelector : public TQWidget
+class TDE_EXPORT AddresseeSelector : public TQWidget
 {
   TQ_OBJECT
   
@@ -213,7 +213,7 @@ class KDE_EXPORT AddresseeSelector : public TQWidget
     AddressBookManager *mAddressBookManager;
 };
 
-class KDE_EXPORT AddresseeSelectorDialog : public KDialogBase
+class TDE_EXPORT AddresseeSelectorDialog : public KDialogBase
 {
   TQ_OBJECT
   
diff --git a/libtdepim/addresseeview.h b/libtdepim/addresseeview.h
index 59a02124f..43e442f36 100644
--- a/libtdepim/addresseeview.h
+++ b/libtdepim/addresseeview.h
@@ -40,7 +40,7 @@ class TQPopupMenu;
 namespace KPIM {
 
 
-class KDE_EXPORT AddresseeView : public KTextBrowser
+class TDE_EXPORT AddresseeView : public KTextBrowser
 {
   TQ_OBJECT
   
diff --git a/libtdepim/addressesdialog.h b/libtdepim/addressesdialog.h
index da56b31f1..dcfee2005 100644
--- a/libtdepim/addressesdialog.h
+++ b/libtdepim/addressesdialog.h
@@ -76,7 +76,7 @@ namespace KPIM {
     AddresseeViewItemPrivate *d;
   };
 
-  class KDE_EXPORT AddressesDialog : public KDialogBase
+  class TDE_EXPORT AddressesDialog : public KDialogBase
   {
     TQ_OBJECT
   
diff --git a/libtdepim/broadcaststatus.h b/libtdepim/broadcaststatus.h
index 37da6f952..8cfc2e2ed 100644
--- a/libtdepim/broadcaststatus.h
+++ b/libtdepim/broadcaststatus.h
@@ -29,7 +29,7 @@ class ProgressItem;
   */
 
 
-class KDE_EXPORT BroadcastStatus : public TQObject
+class TDE_EXPORT BroadcastStatus : public TQObject
 {
 
   TQ_OBJECT
diff --git a/libtdepim/calendardiffalgo.h b/libtdepim/calendardiffalgo.h
index 9ccd6c8c0..c83f3aab2 100644
--- a/libtdepim/calendardiffalgo.h
+++ b/libtdepim/calendardiffalgo.h
@@ -29,7 +29,7 @@
 
 namespace KPIM {
 
-class KDE_EXPORT CalendarDiffAlgo : public DiffAlgo
+class TDE_EXPORT CalendarDiffAlgo : public DiffAlgo
 {
   public:
     CalendarDiffAlgo( KCal::Incidence *leftIncidence, KCal::Incidence *rightIncidence );
diff --git a/libtdepim/categoryeditdialog.h b/libtdepim/categoryeditdialog.h
index 32d2c26cc..3f45ca8ff 100644
--- a/libtdepim/categoryeditdialog.h
+++ b/libtdepim/categoryeditdialog.h
@@ -29,7 +29,7 @@ class KPimPrefs;
 
 namespace KPIM {
 
-class KDE_EXPORT CategoryEditDialog : public KDialogBase
+class TDE_EXPORT CategoryEditDialog : public KDialogBase
 {
     TQ_OBJECT
   
diff --git a/libtdepim/categoryselectdialog.h b/libtdepim/categoryselectdialog.h
index 9c4f4149e..ec0af3dce 100644
--- a/libtdepim/categoryselectdialog.h
+++ b/libtdepim/categoryselectdialog.h
@@ -30,7 +30,7 @@ class CategorySelectDialog_base;
 
 namespace KPIM {
 
-class KDE_EXPORT CategorySelectDialog : public KDialogBase
+class TDE_EXPORT CategorySelectDialog : public KDialogBase
 { 
     TQ_OBJECT
   
diff --git a/libtdepim/clicklineedit.h b/libtdepim/clicklineedit.h
index 1d6ad5c28..a570e44e0 100644
--- a/libtdepim/clicklineedit.h
+++ b/libtdepim/clicklineedit.h
@@ -33,7 +33,7 @@ namespace KPIM {
   @short LineEdit with customizable "Click here" text
   @author Daniel Molkentin
 */
-class KDE_EXPORT ClickLineEdit : public KLineEdit
+class TDE_EXPORT ClickLineEdit : public KLineEdit
 {
   TQ_OBJECT
   
diff --git a/libtdepim/collectingprocess.h b/libtdepim/collectingprocess.h
index f0128a0c0..5de4960cf 100644
--- a/libtdepim/collectingprocess.h
+++ b/libtdepim/collectingprocess.h
@@ -46,7 +46,7 @@ namespace KPIM {
  *
  * @author Ingo Kloecker <[email protected]>
  */
-class KDE_EXPORT CollectingProcess : public TDEProcess {
+class TDE_EXPORT CollectingProcess : public TDEProcess {
   TQ_OBJECT
   
 public:
diff --git a/libtdepim/configmanager.h b/libtdepim/configmanager.h
index 213524c48..c3d93b16f 100644
--- a/libtdepim/configmanager.h
+++ b/libtdepim/configmanager.h
@@ -29,7 +29,7 @@ namespace KPIM {
  * @short Class for managing a set of config options.
  * @author Marc Mutz <[email protected]>
  **/
-class KDE_EXPORT ConfigManager : public TQObject {
+class TDE_EXPORT ConfigManager : public TQObject {
   TQ_OBJECT
   
 public:
diff --git a/libtdepim/designerfields.h b/libtdepim/designerfields.h
index b243e48ce..ee50c8db3 100644
--- a/libtdepim/designerfields.h
+++ b/libtdepim/designerfields.h
@@ -32,7 +32,7 @@
 
 namespace KPIM {
 
-class KDE_EXPORT DesignerFields : public TQWidget
+class TDE_EXPORT DesignerFields : public TQWidget
 {
     TQ_OBJECT
   
diff --git a/libtdepim/diffalgo.h b/libtdepim/diffalgo.h
index a437d9d5b..2bb6a2b9f 100644
--- a/libtdepim/diffalgo.h
+++ b/libtdepim/diffalgo.h
@@ -76,7 +76,7 @@ class DiffAlgoDisplay
 };
 
 
-class KDE_EXPORT DiffAlgo
+class TDE_EXPORT DiffAlgo
 {
   public:
     /**
diff --git a/libtdepim/embeddedurlpage.h b/libtdepim/embeddedurlpage.h
index d644ce6f5..d8e0e0030 100644
--- a/libtdepim/embeddedurlpage.h
+++ b/libtdepim/embeddedurlpage.h
@@ -29,7 +29,7 @@ namespace KParts { class ReadOnlyPart; }
 
 namespace KPIM {
 
-class KDE_EXPORT EmbeddedURLPage : public TQWidget
+class TDE_EXPORT EmbeddedURLPage : public TQWidget
 {
     TQ_OBJECT
   
diff --git a/libtdepim/htmldiffalgodisplay.h b/libtdepim/htmldiffalgodisplay.h
index e38b7a604..5eccc00c8 100644
--- a/libtdepim/htmldiffalgodisplay.h
+++ b/libtdepim/htmldiffalgodisplay.h
@@ -29,7 +29,7 @@
 
 namespace KPIM {
 
-class KDE_EXPORT HTMLDiffAlgoDisplay : virtual public DiffAlgoDisplay, public KTextBrowser
+class TDE_EXPORT HTMLDiffAlgoDisplay : virtual public DiffAlgoDisplay, public KTextBrowser
 {
   public:
     HTMLDiffAlgoDisplay( TQWidget *parent );
diff --git a/libtdepim/infoextension.h b/libtdepim/infoextension.h
index 737cbf8e2..16da91437 100644
--- a/libtdepim/infoextension.h
+++ b/libtdepim/infoextension.h
@@ -35,7 +35,7 @@ namespace KParts
   /**
    * Provides a way to get information out of a PIM-Part
    **/
-	class KDE_EXPORT InfoExtension : public TQObject
+	class TDE_EXPORT InfoExtension : public TQObject
 	{
 		TQ_OBJECT
   
diff --git a/libtdepim/interfaces/AddressBookServiceIface.h b/libtdepim/interfaces/AddressBookServiceIface.h
index e39b8fc7c..d14a7e688 100644
--- a/libtdepim/interfaces/AddressBookServiceIface.h
+++ b/libtdepim/interfaces/AddressBookServiceIface.h
@@ -31,7 +31,7 @@
 
 namespace KPIM {
 
-#define AddressBookServiceIface KDE_EXPORT AddressBookServiceIface 
+#define AddressBookServiceIface TDE_EXPORT AddressBookServiceIface 
   class AddressBookServiceIface : virtual public DCOPObject
 #undef AddressBookServiceIface
   {
diff --git a/libtdepim/interfaces/MailTransportServiceIface.h b/libtdepim/interfaces/MailTransportServiceIface.h
index 3a69f83b6..3dfbf3002 100644
--- a/libtdepim/interfaces/MailTransportServiceIface.h
+++ b/libtdepim/interfaces/MailTransportServiceIface.h
@@ -32,7 +32,7 @@
 
 namespace KPim {
 
-#define MailTransportServiceIface KDE_EXPORT MailTransportServiceIface
+#define MailTransportServiceIface TDE_EXPORT MailTransportServiceIface
   class MailTransportServiceIface : virtual public DCOPObject
 #undef MailTransportServiceIface
   {
diff --git a/libtdepim/kaccount.h b/libtdepim/kaccount.h
index e5ec2d79f..8fd645222 100644
--- a/libtdepim/kaccount.h
+++ b/libtdepim/kaccount.h
@@ -37,7 +37,7 @@
 
 class TDEConfig;
 
-class KDE_EXPORT KAccount
+class TDE_EXPORT KAccount
 {
   public:
     /** Type information */
diff --git a/libtdepim/kaddrbook.h b/libtdepim/kaddrbook.h
index bd44e25ae..c68266b20 100644
--- a/libtdepim/kaddrbook.h
+++ b/libtdepim/kaddrbook.h
@@ -17,7 +17,7 @@ namespace TDEABC {
 
 class TQWidget;
 
-class KDE_EXPORT KAddrBookExternal {
+class TDE_EXPORT KAddrBookExternal {
 public:
   static void addEmail( const TQString &addr, TQWidget *parent );
   static void addNewAddressee( TQWidget* );
diff --git a/libtdepim/kcmdesignerfields.h b/libtdepim/kcmdesignerfields.h
index c90eff484..dc1f344eb 100644
--- a/libtdepim/kcmdesignerfields.h
+++ b/libtdepim/kcmdesignerfields.h
@@ -33,7 +33,7 @@ class TQPushButton;
 
 namespace KPIM {
 
-class KDE_EXPORT KCMDesignerFields : public TDECModule
+class TDE_EXPORT KCMDesignerFields : public TDECModule
 {
   TQ_OBJECT
   
diff --git a/libtdepim/kdateedit.h b/libtdepim/kdateedit.h
index 9475f7529..e031751b2 100644
--- a/libtdepim/kdateedit.h
+++ b/libtdepim/kdateedit.h
@@ -51,7 +51,7 @@ class TQEvent;
   @author David Jarvie <[email protected]>
   @author Tobias Koenig <[email protected]>
 */
-class KDE_EXPORT KDateEdit : public TQComboBox
+class TDE_EXPORT KDateEdit : public TQComboBox
 {
   TQ_OBJECT
   
diff --git a/libtdepim/kdatepickerpopup.h b/libtdepim/kdatepickerpopup.h
index 9156fddc5..6b3de6352 100644
--- a/libtdepim/kdatepickerpopup.h
+++ b/libtdepim/kdatepickerpopup.h
@@ -42,7 +42,7 @@
 
    @author Bram Schoenmakers <[email protected]>
 */
-class KDE_EXPORT KDatePickerPopup: public TQPopupMenu
+class TDE_EXPORT KDatePickerPopup: public TQPopupMenu
 {
     TQ_OBJECT
   
diff --git a/libtdepim/kfoldertree.h b/libtdepim/kfoldertree.h
index d881976de..536118f95 100644
--- a/libtdepim/kfoldertree.h
+++ b/libtdepim/kfoldertree.h
@@ -139,7 +139,7 @@ struct KPaintInfo {
 
 //==========================================================================
 
-class KDE_EXPORT KFolderTreeItem : public TDEListViewItem
+class TDE_EXPORT KFolderTreeItem : public TDEListViewItem
 {
   public:
     /** Protocol information */
@@ -238,7 +238,7 @@ class KDE_EXPORT KFolderTreeItem : public TDEListViewItem
 
 //==========================================================================
 
-class KDE_EXPORT KFolderTree : public TDEListView
+class TDE_EXPORT KFolderTree : public TDEListView
 {
   TQ_OBJECT
   
diff --git a/libtdepim/kincidencechooser.h b/libtdepim/kincidencechooser.h
index 4a2a507e4..ceffc0b04 100644
--- a/libtdepim/kincidencechooser.h
+++ b/libtdepim/kincidencechooser.h
@@ -39,7 +39,7 @@ class TQButtonGroup;
 /** Dialog to change the korganizer configuration.
   */
 
-class KDE_EXPORT KIncidenceChooser : public KDialog
+class TDE_EXPORT KIncidenceChooser : public KDialog
 {
   TQ_OBJECT
   
diff --git a/libtdepim/komposer/core/prefsmodule.cpp b/libtdepim/komposer/core/prefsmodule.cpp
index f8260c10a..ce21e222b 100644
--- a/libtdepim/komposer/core/prefsmodule.cpp
+++ b/libtdepim/komposer/core/prefsmodule.cpp
@@ -35,7 +35,7 @@
 
 extern "C"
 {
-  KDE_EXPORT TDECModule *create_komposerconfig( TQWidget *parent, const char * ) {
+  TDE_EXPORT TDECModule *create_komposerconfig( TQWidget *parent, const char * ) {
     return new Komposer::PrefsModule( parent, "komposerprefs" );
   }
 }
diff --git a/libtdepim/kpimprefs.h b/libtdepim/kpimprefs.h
index b67d24916..fad92a086 100644
--- a/libtdepim/kpimprefs.h
+++ b/libtdepim/kpimprefs.h
@@ -28,7 +28,7 @@
 
 class TQString;
 
-class KDE_EXPORT KPimPrefs : public TDEConfigSkeleton
+class TDE_EXPORT KPimPrefs : public TDEConfigSkeleton
 {
   public:
     KPimPrefs( const TQString &name = TQString() );
diff --git a/libtdepim/kpimurlrequesterdlg.h b/libtdepim/kpimurlrequesterdlg.h
index 8679923d8..a0954ab1a 100644
--- a/libtdepim/kpimurlrequesterdlg.h
+++ b/libtdepim/kpimurlrequesterdlg.h
@@ -26,7 +26,7 @@
 
 class TQWidget;
 
-class KDE_EXPORT KPimURLRequesterDlg
+class TDE_EXPORT KPimURLRequesterDlg
 {
 	public:
     /**
diff --git a/libtdepim/kpixmapregionselectordialog.h b/libtdepim/kpixmapregionselectordialog.h
index 2f77ab890..c02d6b02a 100644
--- a/libtdepim/kpixmapregionselectordialog.h
+++ b/libtdepim/kpixmapregionselectordialog.h
@@ -43,7 +43,7 @@ namespace KPIM {
  * @author Antonio Larrosa <[email protected]>
  * @since 3.4
  */
-class KDE_EXPORT KPixmapRegionSelectorDialog : public KDialogBase
+class TDE_EXPORT KPixmapRegionSelectorDialog : public KDialogBase
 {
 public:
    /**
diff --git a/libtdepim/kprefsdialog.h b/libtdepim/kprefsdialog.h
index 080d592ee..851253827 100644
--- a/libtdepim/kprefsdialog.h
+++ b/libtdepim/kprefsdialog.h
@@ -55,7 +55,7 @@ class KURLRequester;
   KPrefsDialog. The control element consists of a set of widgets for handling
   a certain type of configuration information.
 */
-class KDE_EXPORT KPrefsWid : public TQObject
+class TDE_EXPORT KPrefsWid : public TQObject
 {
     TQ_OBJECT
   
@@ -89,7 +89,7 @@ class KDE_EXPORT KPrefsWid : public TQObject
   This class provides a control element for configuring bool values. It is meant
   to be used by KPrefsDialog. The user is responsible for the layout management.
 */
-class KDE_EXPORT KPrefsWidBool : public KPrefsWid
+class TDE_EXPORT KPrefsWidBool : public KPrefsWid
 {
   public:
     /**
@@ -123,7 +123,7 @@ class KDE_EXPORT KPrefsWidBool : public KPrefsWid
   meant to be used by KPrefsDialog. The user is responsible for the layout
   management.
 */
-class KDE_EXPORT KPrefsWidInt : public KPrefsWid
+class TDE_EXPORT KPrefsWidInt : public KPrefsWid
 {
   public:
     /**
@@ -164,7 +164,7 @@ class KDE_EXPORT KPrefsWidInt : public KPrefsWid
   meant to be used by KPrefsDialog. The user is responsible for the layout
   management.
 */
-class KDE_EXPORT KPrefsWidTime : public KPrefsWid
+class TDE_EXPORT KPrefsWidTime : public KPrefsWid
 {
   public:
     /**
@@ -201,7 +201,7 @@ class KDE_EXPORT KPrefsWidTime : public KPrefsWid
   meant to be used by KPrefsDialog. The user is responsible for the layout
   management.
 */
-class KDE_EXPORT KPrefsWidDuration : public KPrefsWid
+class TDE_EXPORT KPrefsWidDuration : public KPrefsWid
 {
   public:
     /**
@@ -239,7 +239,7 @@ class KDE_EXPORT KPrefsWidDuration : public KPrefsWid
   meant to be used by KPrefsDialog. The user is responsible for the layout
   management.
 */
-class KDE_EXPORT KPrefsWidDate : public KPrefsWid
+class TDE_EXPORT KPrefsWidDate : public KPrefsWid
 {
   public:
     /**
@@ -276,7 +276,7 @@ class KDE_EXPORT KPrefsWidDate : public KPrefsWid
   meant to be used by KPrefsDialog. The user is responsible for the layout
   management.
 */
-class KDE_EXPORT KPrefsWidColor : public KPrefsWid
+class TDE_EXPORT KPrefsWidColor : public KPrefsWid
 {
     TQ_OBJECT
   
@@ -319,7 +319,7 @@ class KDE_EXPORT KPrefsWidColor : public KPrefsWid
   This class provides a control element for configuring font values. It is meant
   to be used by KPrefsDialog. The user is responsible for the layout management.
 */
-class KDE_EXPORT KPrefsWidFont : public KPrefsWid
+class TDE_EXPORT KPrefsWidFont : public KPrefsWid
 {
     TQ_OBJECT
   
@@ -377,7 +377,7 @@ class KDE_EXPORT KPrefsWidFont : public KPrefsWid
   the radio button. The position of the button is defined by the sequence of
   @ref addRadio() calls, starting with 0.
 */
-class KDE_EXPORT KPrefsWidRadios : public KPrefsWid
+class TDE_EXPORT KPrefsWidRadios : public KPrefsWid
 {
   public:
     /**
@@ -425,7 +425,7 @@ class KDE_EXPORT KPrefsWidRadios : public KPrefsWid
   The setting is interpreted as an int value, corresponding to the index in 
   the combo box.
 */
-class KDE_EXPORT KPrefsWidCombo : public KPrefsWid
+class TDE_EXPORT KPrefsWidCombo : public KPrefsWid
 {
   public:
     /**
@@ -458,7 +458,7 @@ class KDE_EXPORT KPrefsWidCombo : public KPrefsWid
   meant to be used by KPrefsDialog. The user is responsible for the layout
   management.
 */
-class KDE_EXPORT KPrefsWidString : public KPrefsWid
+class TDE_EXPORT KPrefsWidString : public KPrefsWid
 {
   public:
     /**
@@ -505,7 +505,7 @@ class KDE_EXPORT KPrefsWidString : public KPrefsWid
   meant to be used by KPrefsDialog. The user is responsible for the layout
   management.
 */
-class KDE_EXPORT KPrefsWidPath : public KPrefsWid
+class TDE_EXPORT KPrefsWidPath : public KPrefsWid
 {
   public:
     /**
@@ -554,7 +554,7 @@ class KDE_EXPORT KPrefsWidPath : public KPrefsWid
   transparent way. The user has to add the widgets by the corresponding addWid
   functions and KPrefsWidManager handles the rest automatically.
 */
-class KDE_EXPORT KPrefsWidManager
+class TDE_EXPORT KPrefsWidManager
 {
   public:
     /**
@@ -718,7 +718,7 @@ class KDE_EXPORT KPrefsWidManager
   default values is handled automatically. Custom widgets have to be handled in
   the functions @ref usrReadConfig() and @ref usrWriteConfig().
 */
-class KDE_EXPORT KPrefsDialog : public KDialogBase, public KPrefsWidManager
+class TDE_EXPORT KPrefsDialog : public KDialogBase, public KPrefsWidManager
 {
     TQ_OBJECT
   
@@ -772,7 +772,7 @@ class KDE_EXPORT KPrefsDialog : public KDialogBase, public KPrefsWidManager
 };
 
 
-class KDE_EXPORT KPrefsModule : public TDECModule, public KPrefsWidManager
+class TDE_EXPORT KPrefsModule : public TDECModule, public KPrefsWidManager
 {
     TQ_OBJECT
   
diff --git a/libtdepim/kregexp3.h b/libtdepim/kregexp3.h
index 909e6bfa9..da30ddfa4 100644
--- a/libtdepim/kregexp3.h
+++ b/libtdepim/kregexp3.h
@@ -76,7 +76,7 @@
     @see TQRegExp
 */
 
-class KDE_EXPORT KRegExp3 : public TQRegExp
+class TDE_EXPORT KRegExp3 : public TQRegExp
 {
 public:
   KRegExp3()
diff --git a/libtdepim/kresourceprefs.h b/libtdepim/kresourceprefs.h
index 398490a13..102d5c5a1 100644
--- a/libtdepim/kresourceprefs.h
+++ b/libtdepim/kresourceprefs.h
@@ -35,7 +35,7 @@ class TQString;
   The prefix should be an unique identifier to avoid name clashes and the method
   has to be called before readConfig(), otherwise the wrong entries are read.
  */
-class KDE_EXPORT KResourcePrefs : public TDEConfigSkeleton
+class TDE_EXPORT KResourcePrefs : public TDEConfigSkeleton
 {
   public:
     KResourcePrefs( const TQString &name = TQString() );
diff --git a/libtdepim/krsqueezedtextlabel.h b/libtdepim/krsqueezedtextlabel.h
index 518493c10..7262b2cd8 100644
--- a/libtdepim/krsqueezedtextlabel.h
+++ b/libtdepim/krsqueezedtextlabel.h
@@ -38,7 +38,7 @@
 /*
  * TQLabel
  */
-class KDE_EXPORT KRSqueezedTextLabel : public TQLabel {
+class TDE_EXPORT KRSqueezedTextLabel : public TQLabel {
   TQ_OBJECT
   
 
diff --git a/libtdepim/kscoring.h b/libtdepim/kscoring.h
index 07ddb1786..93c76e3ca 100644
--- a/libtdepim/kscoring.h
+++ b/libtdepim/kscoring.h
@@ -55,13 +55,13 @@ class TQLabel;
  */
 
 //----------------------------------------------------------------------------
-class KDE_EXPORT ScorableGroup
+class TDE_EXPORT ScorableGroup
 {
 public:
   virtual ~ScorableGroup();
 };
 
-class KDE_EXPORT ScorableArticle
+class TDE_EXPORT ScorableArticle
 {
 public:
   virtual ~ScorableArticle();
@@ -81,7 +81,7 @@ public:
 /**
   Base class for other Action classes.
  */
-class KDE_EXPORT ActionBase {
+class TDE_EXPORT ActionBase {
  public:
   ActionBase();
   virtual ~ActionBase();
@@ -100,7 +100,7 @@ class KDE_EXPORT ActionBase {
   enum ActionTypes { SETSCORE, NOTIFY, COLOR, MARKASREAD };
 };
 
-class KDE_EXPORT ActionColor : public ActionBase {
+class TDE_EXPORT ActionColor : public ActionBase {
 public:
   ActionColor(const TQColor&);
   ActionColor(const TQString&);
@@ -118,7 +118,7 @@ private:
   TQColor color;
 };
 
-class KDE_EXPORT ActionSetScore : public ActionBase {
+class TDE_EXPORT ActionSetScore : public ActionBase {
  public:
   ActionSetScore(short);
   ActionSetScore(const ActionSetScore&);
@@ -136,7 +136,7 @@ class KDE_EXPORT ActionSetScore : public ActionBase {
   short val;
 };
 
-class KDE_EXPORT ActionNotify : public ActionBase {
+class TDE_EXPORT ActionNotify : public ActionBase {
  public:
   ActionNotify(const TQString&);
   ActionNotify(const ActionNotify&);
@@ -151,7 +151,7 @@ class KDE_EXPORT ActionNotify : public ActionBase {
   TQString note;
 };
 
-class KDE_EXPORT ActionMarkAsRead : public ActionBase {
+class TDE_EXPORT ActionMarkAsRead : public ActionBase {
   public:
     ActionMarkAsRead();
     ActionMarkAsRead( const ActionMarkAsRead& );
@@ -162,7 +162,7 @@ class KDE_EXPORT ActionMarkAsRead : public ActionBase {
     virtual ActionMarkAsRead* clone() const;
 };
 
-class KDE_EXPORT NotifyCollection
+class TDE_EXPORT NotifyCollection
 {
 public:
   NotifyCollection();
@@ -182,7 +182,7 @@ private:
 
 
 //----------------------------------------------------------------------------
-class KDE_EXPORT KScoringExpression
+class TDE_EXPORT KScoringExpression
 {
   friend class KScoringRule;
  public:
@@ -217,7 +217,7 @@ class KDE_EXPORT KScoringExpression
 };
 
 //----------------------------------------------------------------------------
-class KDE_EXPORT KScoringRule
+class TDE_EXPORT KScoringRule
 {
   friend class KScoringManager;
  public:
@@ -280,7 +280,7 @@ private:
     With the help of this class its very easy for the KScoringManager
     to temporary drop lists of rules and restore them afterwards
 */
-class KDE_EXPORT RuleStack
+class TDE_EXPORT RuleStack
 {
 public:
   RuleStack();
@@ -300,7 +300,7 @@ private:
 
 //----------------------------------------------------------------------------
 // Manages the score rules.
-class KDE_EXPORT KScoringManager : public TQObject
+class TDE_EXPORT KScoringManager : public TQObject
 {
   TQ_OBJECT
   
@@ -407,7 +407,7 @@ class KDE_EXPORT KScoringManager : public TQObject
 
 
 //----------------------------------------------------------------------------
-class KDE_EXPORT NotifyDialog : public KDialogBase
+class TDE_EXPORT NotifyDialog : public KDialogBase
 {
   TQ_OBJECT
   
diff --git a/libtdepim/kscoringeditor.h b/libtdepim/kscoringeditor.h
index 8df84e177..81e7a21f8 100644
--- a/libtdepim/kscoringeditor.h
+++ b/libtdepim/kscoringeditor.h
@@ -49,7 +49,7 @@ class KColorCombo;
 /** this widget implements an editor for one condition.
     It is used in ExpressionEditWidget
 */
-class KDE_EXPORT SingleConditionWidget : public TQFrame
+class TDE_EXPORT SingleConditionWidget : public TQFrame
 {
   TQ_OBJECT
   
@@ -131,7 +131,7 @@ private:
 
 /** this widget implements the action editor
  */
-class KDE_EXPORT ActionEditWidget : public KWidgetLister
+class TDE_EXPORT ActionEditWidget : public KWidgetLister
 {
   TQ_OBJECT
   
@@ -200,7 +200,7 @@ private:
 /** This widget shows a list of rules with buttons for
     copy, delete aso.
 */
-class KDE_EXPORT RuleListWidget : public TQWidget
+class TDE_EXPORT RuleListWidget : public TQWidget
 {
   TQ_OBJECT
   
@@ -251,7 +251,7 @@ private:
   TQPushButton *mRuleDown;
 };
 
-class KDE_EXPORT KScoringEditor : public KDialogBase
+class TDE_EXPORT KScoringEditor : public KDialogBase
 {
   TQ_OBJECT
   
@@ -299,7 +299,7 @@ private:
   TQString ruleName;
 };
 
-class KDE_EXPORT KScoringEditorWidget : public TQWidget
+class TDE_EXPORT KScoringEditorWidget : public TQWidget
 {
   TQ_OBJECT
   
diff --git a/libtdepim/ksubscription.h b/libtdepim/ksubscription.h
index c2d710503..97488fde6 100644
--- a/libtdepim/ksubscription.h
+++ b/libtdepim/ksubscription.h
@@ -42,7 +42,7 @@ class KAccount;
 
 //==========================================================================
 
-class KDE_EXPORT KGroupInfo
+class TDE_EXPORT KGroupInfo
 {
   public:
     enum Status {
@@ -69,7 +69,7 @@ class KDE_EXPORT KGroupInfo
 //==========================================================================
 
 /** A class representing a single group item (what's that?) */
-class KDE_EXPORT GroupItem : public TQCheckListItem
+class TDE_EXPORT GroupItem : public TQCheckListItem
 {
   public:
     GroupItem( TQListView *v, const KGroupInfo &gi, KSubscription* browser,
@@ -185,7 +185,7 @@ class KDE_EXPORT GroupItem : public TQCheckListItem
  *
  */
 
-class KDE_EXPORT KSubscription : public KDialogBase
+class TDE_EXPORT KSubscription : public KDialogBase
 {
   TQ_OBJECT
   
diff --git a/libtdepim/ktimeedit.h b/libtdepim/ktimeedit.h
index a4dbc7545..7669295bb 100644
--- a/libtdepim/ktimeedit.h
+++ b/libtdepim/ktimeedit.h
@@ -41,7 +41,7 @@
   @short Provides a way to edit times in a user-friendly manner.
   @author Preston Brown, Ian Dawes
 */
-class KDE_EXPORT KTimeEdit : public TQComboBox
+class TDE_EXPORT KTimeEdit : public TQComboBox
 {
     TQ_OBJECT
   
diff --git a/libtdepim/kvcarddrag.h b/libtdepim/kvcarddrag.h
index 9a9cfda31..d6e21cde2 100644
--- a/libtdepim/kvcarddrag.h
+++ b/libtdepim/kvcarddrag.h
@@ -37,7 +37,7 @@ class KVCardDragPrivate;
  *
  * See the TQt drag'n'drop documentation.
  */
-class KDE_EXPORT KVCardDrag : public TQStoredDrag
+class TDE_EXPORT KVCardDrag : public TQStoredDrag
 {
   TQ_OBJECT
   
diff --git a/libtdepim/kwidgetlister.h b/libtdepim/kwidgetlister.h
index 4924f6841..1af5b0103 100644
--- a/libtdepim/kwidgetlister.h
+++ b/libtdepim/kwidgetlister.h
@@ -62,7 +62,7 @@ class TQHBox;
 
 */
 
-class KDE_EXPORT KWidgetLister : public TQWidget
+class TDE_EXPORT KWidgetLister : public TQWidget
 {
   TQ_OBJECT
   
diff --git a/libtdepim/kxface.h b/libtdepim/kxface.h
index ce7e98b38..f0a036be2 100644
--- a/libtdepim/kxface.h
+++ b/libtdepim/kxface.h
@@ -519,7 +519,7 @@ class TQString;
 
 namespace KPIM {
 
-  class KDE_EXPORT KXFace : public TQObject
+  class TDE_EXPORT KXFace : public TQObject
   {
     TQ_OBJECT
   
diff --git a/libtdepim/ldapclient.h b/libtdepim/ldapclient.h
index a6249f7ab..8f1e3c2aa 100644
--- a/libtdepim/ldapclient.h
+++ b/libtdepim/ldapclient.h
@@ -139,7 +139,7 @@ class LdapObject
   * We mean it!
   *
   */
-class KDE_EXPORT LdapClient : public TQObject
+class TDE_EXPORT LdapClient : public TQObject
 {
   TQ_OBJECT
   
@@ -243,7 +243,7 @@ typedef TQValueList<LdapResult> LdapResultList;
   * We mean it!
   *
   */
-class KDE_EXPORT LdapSearch : public TQObject
+class TDE_EXPORT LdapSearch : public TQObject
 {
   TQ_OBJECT
   
diff --git a/libtdepim/linklocator.h b/libtdepim/linklocator.h
index 3fb3330b5..ce5bba1c2 100644
--- a/libtdepim/linklocator.h
+++ b/libtdepim/linklocator.h
@@ -38,7 +38,7 @@
  * @short Identifies URLs and email addresses embedded in plaintext.
  * @author Dave Corrie <[email protected]>
  */
-class KDE_EXPORT LinkLocator
+class TDE_EXPORT LinkLocator
 {
 public:
   /**
diff --git a/libtdepim/maillistdrag.h b/libtdepim/maillistdrag.h
index c0a95c8a5..d83aaebf1 100644
--- a/libtdepim/maillistdrag.h
+++ b/libtdepim/maillistdrag.h
@@ -44,7 +44,7 @@
 
 namespace KPIM {
 
-class KDE_EXPORT MailSummary 
+class TDE_EXPORT MailSummary 
 {
 public:
     MailSummary( TQ_UINT32 serialNumber, TQString messageId, TQString subject, 
@@ -83,7 +83,7 @@ private:
 typedef TQValueList<MailSummary> MailList;
 
 // Object for the drag object to call-back for message fulltext
-class KDE_EXPORT MailTextSource {
+class TDE_EXPORT MailTextSource {
 public:
     MailTextSource() {}
     virtual ~MailTextSource() {}
@@ -92,7 +92,7 @@ public:
 };
 
 // Drag and drop object for mails
-class KDE_EXPORT MailListDrag : public TQStoredDrag
+class TDE_EXPORT MailListDrag : public TQStoredDrag
 {
 public:
     // Takes ownership of "src" and deletes it when done
diff --git a/libtdepim/pluginloader.h b/libtdepim/pluginloader.h
index 1ec8dc6f9..5e69c265e 100644
--- a/libtdepim/pluginloader.h
+++ b/libtdepim/pluginloader.h
@@ -76,7 +76,7 @@ namespace KPIM {
    *
    **/
   template< typename T, typename T_config >
-  class KDE_EXPORT PluginLoader : public PluginLoaderBase {
+  class TDE_EXPORT PluginLoader : public PluginLoaderBase {
   protected:
     PluginLoader() : PluginLoaderBase() {}
 
@@ -122,7 +122,7 @@ namespace KPIM {
 
 #define KPIM_DEFINE_PLUGIN_LOADER( pl, t, mf, p ) \
   namespace { /* don't pollute namespaces */ \
-    struct KDE_EXPORT pl##Config { \
+    struct TDE_EXPORT pl##Config { \
       static const char * const mainfunc; \
       static const char * const path; \
     }; \
diff --git a/libtdepim/pluginloaderbase.h b/libtdepim/pluginloaderbase.h
index 6edc61bee..d622ea446 100644
--- a/libtdepim/pluginloaderbase.h
+++ b/libtdepim/pluginloaderbase.h
@@ -32,7 +32,7 @@ class TQStringList;
 
 namespace KPIM {
 
-  class KDE_EXPORT PluginMetaData {
+  class TDE_EXPORT PluginMetaData {
   public:
     PluginMetaData() {}
     PluginMetaData( const TQString & lib, const TQString & name,
@@ -45,7 +45,7 @@ namespace KPIM {
     mutable bool loaded;
   };
 
-  class KDE_EXPORT PluginLoaderBase {
+  class TDE_EXPORT PluginLoaderBase {
   protected:
     PluginLoaderBase();
     virtual ~PluginLoaderBase();
diff --git a/libtdepim/progressdialog.h b/libtdepim/progressdialog.h
index 85a82bbd5..090bfde21 100644
--- a/libtdepim/progressdialog.h
+++ b/libtdepim/progressdialog.h
@@ -115,7 +115,7 @@ protected:
   ProgressItem* mItem;
 };
 
-class KDE_EXPORT ProgressDialog : public OverlayWidget
+class TDE_EXPORT ProgressDialog : public OverlayWidget
 {
     TQ_OBJECT
   
diff --git a/libtdepim/progressmanager.h b/libtdepim/progressmanager.h
index 59dc7262b..8610f9c92 100644
--- a/libtdepim/progressmanager.h
+++ b/libtdepim/progressmanager.h
@@ -36,7 +36,7 @@ class ProgressItem;
 class ProgressManager;
 typedef TQMap<ProgressItem*, bool> ProgressItemMap;
 
-class KDE_EXPORT ProgressItem : public TQObject
+class TDE_EXPORT ProgressItem : public TQObject
 {
   TQ_OBJECT
   
@@ -263,7 +263,7 @@ signals:
  * items to parents by id.
  */
 
-class KDE_EXPORT ProgressManager : public TQObject
+class TDE_EXPORT ProgressManager : public TQObject
 {
 
   TQ_OBJECT
diff --git a/libtdepim/qutf7codec.h b/libtdepim/qutf7codec.h
index 01e97494a..6fe3a4739 100644
--- a/libtdepim/qutf7codec.h
+++ b/libtdepim/qutf7codec.h
@@ -45,7 +45,7 @@
 
     @author Marc Mutz <[email protected]> */
 
-class KDE_EXPORT TQUtf7Codec : public TQTextCodec {
+class TDE_EXPORT TQUtf7Codec : public TQTextCodec {
     bool encOpt, encLwsp;
 public:
     TQUtf7Codec() : TQTextCodec() {}
@@ -81,7 +81,7 @@ public:
     @short A variant of @ref TQUtf7Codec, which protectes certain
     characters in MIME transport
     @author Marc Mutz <[email protected]> */
-class KDE_EXPORT TQStrictUtf7Codec : public TQUtf7Codec {
+class TDE_EXPORT TQStrictUtf7Codec : public TQUtf7Codec {
 public:
   TQStrictUtf7Codec() : TQUtf7Codec() {}
 
diff --git a/libtdepim/recentaddresses.h b/libtdepim/recentaddresses.h
index f9f6a6ceb..c0d2fc2d0 100644
--- a/libtdepim/recentaddresses.h
+++ b/libtdepim/recentaddresses.h
@@ -41,7 +41,7 @@ class TDEConfig;
 class KEditListBox;
 namespace TDERecentAddress {
 
-class KDE_EXPORT RecentAddressDialog : public KDialogBase
+class TDE_EXPORT RecentAddressDialog : public KDialogBase
 {
  public:
   RecentAddressDialog( TQWidget *parent, const char *name = 0 );
@@ -58,7 +58,7 @@ class KDE_EXPORT RecentAddressDialog : public KDialogBase
  * @author Carsten Pfeiffer <[email protected]>
  */
 
-class KDE_EXPORT RecentAddresses
+class TDE_EXPORT RecentAddresses
 {
 public:
     ~RecentAddresses();
diff --git a/libtdepim/resourceabc.h b/libtdepim/resourceabc.h
index 0eee0901f..9b7c942c5 100644
--- a/libtdepim/resourceabc.h
+++ b/libtdepim/resourceabc.h
@@ -41,7 +41,7 @@ namespace KPIM {
  * handle subresources.
  */
 
-class KDE_EXPORT ResourceABC : public TDEABC::Resource
+class TDE_EXPORT ResourceABC : public TDEABC::Resource
 {
   TQ_OBJECT
   
diff --git a/libtdepim/sidebarextension.h b/libtdepim/sidebarextension.h
index 9abd6ea7d..eead6af6a 100644
--- a/libtdepim/sidebarextension.h
+++ b/libtdepim/sidebarextension.h
@@ -35,7 +35,7 @@ namespace KParts
    * Provides a way to export a widget which will be displayed in Kontacts
    * stackview at the left
    **/
-  class KDE_EXPORT SideBarExtension : public TQObject
+  class TDE_EXPORT SideBarExtension : public TQObject
   {
     TQ_OBJECT
   
diff --git a/libtdepim/spellingfilter.h b/libtdepim/spellingfilter.h
index d0a8d8845..23a43ef1e 100644
--- a/libtdepim/spellingfilter.h
+++ b/libtdepim/spellingfilter.h
@@ -29,7 +29,7 @@
 
 #include <kdemacros.h>
 
-class KDE_EXPORT SpellingFilter
+class TDE_EXPORT SpellingFilter
 {
 public:
   enum UrlFiltering { DontFilterUrls, FilterUrls };
diff --git a/libtdepim/statusbarprogresswidget.h b/libtdepim/statusbarprogresswidget.h
index def30fee4..caee11724 100644
--- a/libtdepim/statusbarprogresswidget.h
+++ b/libtdepim/statusbarprogresswidget.h
@@ -51,7 +51,7 @@ class SSLLabel;
 class ProgressItem;
 class ProgressDialog;
 
-class KDE_EXPORT StatusbarProgressWidget : public TQFrame {
+class TDE_EXPORT StatusbarProgressWidget : public TQFrame {
 
   TQ_OBJECT
   
diff --git a/libtdepim/tdeabcresourcecached.h b/libtdepim/tdeabcresourcecached.h
index 5d3e27a38..6960b25bd 100644
--- a/libtdepim/tdeabcresourcecached.h
+++ b/libtdepim/tdeabcresourcecached.h
@@ -31,7 +31,7 @@
 
 namespace TDEABC {
 
-class KDE_EXPORT ResourceCached : public Resource
+class TDE_EXPORT ResourceCached : public Resource
 {
   TQ_OBJECT
   
diff --git a/libtdepim/tdeconfigpropagator.h b/libtdepim/tdeconfigpropagator.h
index 94a0bff8f..7a24384c2 100644
--- a/libtdepim/tdeconfigpropagator.h
+++ b/libtdepim/tdeconfigpropagator.h
@@ -31,7 +31,7 @@
 class TDEConfigSkeleton;
 class TDEConfigSkeletonItem;
 
-class KDE_EXPORT TDEConfigPropagator
+class TDE_EXPORT TDEConfigPropagator
 {
   public:
 
@@ -55,7 +55,7 @@ class KDE_EXPORT TDEConfigPropagator
     */
     void commit();
 
-    class KDE_EXPORT Condition
+    class TDE_EXPORT Condition
     {
       public:
         Condition() : isValid( false ) {}
@@ -68,7 +68,7 @@ class KDE_EXPORT TDEConfigPropagator
         bool isValid;
     };
 
-    class KDE_EXPORT Rule
+    class TDE_EXPORT Rule
     {
       public:
         typedef TQValueList<Rule> List;
@@ -88,7 +88,7 @@ class KDE_EXPORT TDEConfigPropagator
         bool hideValue;
     };
 
-    class KDE_EXPORT Change
+    class TDE_EXPORT Change
     {
       public:
         typedef TQPtrList<Change> List;
@@ -108,7 +108,7 @@ class KDE_EXPORT TDEConfigPropagator
         TQString mTitle;
     };
 
-    class KDE_EXPORT ChangeConfig : public Change
+    class TDE_EXPORT ChangeConfig : public Change
     {
       public:
         ChangeConfig();
diff --git a/libtdepim/tdeconfigwizard.h b/libtdepim/tdeconfigwizard.h
index 19da572d7..e9922d614 100644
--- a/libtdepim/tdeconfigwizard.h
+++ b/libtdepim/tdeconfigwizard.h
@@ -30,7 +30,7 @@ class TQListView;
 /**
   @short Configuration wizard base class
 */
-class KDE_EXPORT TDEConfigWizard : public KDialogBase
+class TDE_EXPORT TDEConfigWizard : public KDialogBase
 {
     TQ_OBJECT
   
diff --git a/libtdepim/tdefileio.cpp b/libtdepim/tdefileio.cpp
index ec798a722..95eb77285 100644
--- a/libtdepim/tdefileio.cpp
+++ b/libtdepim/tdefileio.cpp
@@ -33,7 +33,7 @@ static void msgDialog(const TQString &msg)
 
 
 //-----------------------------------------------------------------------------
-KDE_EXPORT TQCString kFileToString(const TQString &aFileName, bool aEnsureNL, bool aVerbose)
+TDE_EXPORT TQCString kFileToString(const TQString &aFileName, bool aEnsureNL, bool aVerbose)
 {
   TQCString result;
   TQFileInfo info(aFileName);
@@ -173,7 +173,7 @@ TQByteArray kFileToBytes(const TQString &aFileName, bool aVerbose)
 #endif
 
 //-----------------------------------------------------------------------------
-KDE_EXPORT bool kBytesToFile(const char* aBuffer, int len,
+TDE_EXPORT bool kBytesToFile(const char* aBuffer, int len,
 		   const TQString &aFileName,
 		   bool aAskIfExists, bool aBackup, bool aVerbose)
 {
@@ -253,14 +253,14 @@ KDE_EXPORT bool kBytesToFile(const char* aBuffer, int len,
   return TRUE;
 }
 
-KDE_EXPORT bool kCStringToFile(const TQCString& aBuffer, const TQString &aFileName,
+TDE_EXPORT bool kCStringToFile(const TQCString& aBuffer, const TQString &aFileName,
 		   bool aAskIfExists, bool aBackup, bool aVerbose)
 {
     return kBytesToFile(aBuffer, aBuffer.length(), aFileName, aAskIfExists,
 	aBackup, aVerbose);
 }
 
-KDE_EXPORT bool kByteArrayToFile(const TQByteArray& aBuffer, const TQString &aFileName,
+TDE_EXPORT bool kByteArrayToFile(const TQByteArray& aBuffer, const TQString &aFileName,
 		   bool aAskIfExists, bool aBackup, bool aVerbose)
 {
     return kBytesToFile(aBuffer, aBuffer.size(), aFileName, aAskIfExists,
diff --git a/libtdepim/tdefileio.h b/libtdepim/tdefileio.h
index f0cd8d8d4..2f2e04535 100644
--- a/libtdepim/tdefileio.h
+++ b/libtdepim/tdefileio.h
@@ -26,7 +26,7 @@ namespace KPIM {
  * If ensureNewline is TRUE the string will always have a trailing newline.
  */
 TQCString kFileToString(const TQString &fileName, bool ensureNewline=true,
-		      bool withDialogs=true) KDE_EXPORT;
+		      bool withDialogs=true) TDE_EXPORT;
 
 // unused
 //TQByteArray kFileToBytes(const TQString &fileName, bool withDialogs=true);
@@ -39,15 +39,15 @@ TQCString kFileToString(const TQString &fileName, bool ensureNewline=true,
  */
 bool kBytesToFile(const char* aBuffer, int len,
                   const TQString &aFileName,
-                  bool aAskIfExists, bool aBackup, bool aVerbose) KDE_EXPORT;
+                  bool aAskIfExists, bool aBackup, bool aVerbose) TDE_EXPORT;
 
 bool kCStringToFile(const TQCString& buffer, const TQString &fileName,
 		   bool askIfExists=false, bool createBackup=true,
-		   bool withDialogs=true) KDE_EXPORT;
+		   bool withDialogs=true) TDE_EXPORT;
 /** Does not stop at NUL */
-KDE_EXPORT bool kByteArrayToFile(const TQByteArray& buffer, const TQString &fileName,
+bool kByteArrayToFile(const TQByteArray& buffer, const TQString &fileName,
 		   bool askIfExists=false, bool createBackup=true,
-		   bool withDialogs=true) KDE_EXPORT;
+		   bool withDialogs=true) TDE_EXPORT;
 
 
   /**
diff --git a/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp b/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp
index 18952fe15..58b247b85 100644
--- a/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp
+++ b/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp
@@ -106,8 +106,8 @@ bool KPartsWidgetPlugin::isContainer( const TQString & /*key*/ ) const {
 /// Duplicated from tdelibs/tdecore/kdemacros.h.in for those with tdelibs < 3.4
 #ifndef KDE_TQ_EXPORT_PLUGIN
 #define KDE_TQ_EXPORT_PLUGIN(PLUGIN) \
-  TQ_EXTERN_C KDE_EXPORT const char* qt_ucm_query_verification_data(); \
-  TQ_EXTERN_C KDE_EXPORT TQUnknownInterface* ucm_instantiate(); \
+  TQ_EXTERN_C TDE_EXPORT const char* qt_ucm_query_verification_data(); \
+  TQ_EXTERN_C TDE_EXPORT TQUnknownInterface* ucm_instantiate(); \
   TQ_EXPORT_PLUGIN(PLUGIN)
 #endif
 
diff --git a/libtdepim/weaver.h b/libtdepim/weaver.h
index b949a1109..6f38b8701 100644
--- a/libtdepim/weaver.h
+++ b/libtdepim/weaver.h
@@ -50,22 +50,22 @@ namespace ThreadWeaver {
         Use setDebugLevel () to integrate adapt debug () to your platform.
     */
 
-    KDE_EXPORT extern bool Debug;
-    KDE_EXPORT extern int DebugLevel;
+    TDE_EXPORT extern bool Debug;
+    TDE_EXPORT extern int DebugLevel;
 
-    KDE_EXPORT inline void setDebugLevel (bool debug, int level)
+    TDE_EXPORT inline void setDebugLevel (bool debug, int level)
         {
             Debug = debug;
             DebugLevel = level;
         }
 
-    KDE_EXPORT inline void debug(int severity, const char * cformat, ...)
+    TDE_EXPORT inline void debug(int severity, const char * cformat, ...)
 #ifdef __GNUC__
         __attribute__ ( (format (printf, 2, 3 ) ) )
 #endif
 ;
 
-    KDE_EXPORT inline void debug(int severity, const char * cformat, ...)
+    TDE_EXPORT inline void debug(int severity, const char * cformat, ...)
     {
         if ( Debug == true && ( severity<=DebugLevel || severity == 0) )
         {
@@ -96,7 +96,7 @@ namespace ThreadWeaver {
         Note: Do not create and use SPR/APR events, use Job::triggerSPR or
         Job::triggerAPR to create the requests. */
 
-    class KDE_EXPORT Event : public TQCustomEvent
+    class TDE_EXPORT Event : public TQCustomEvent
     {
     public:
         enum Action {
@@ -160,7 +160,7 @@ namespace ThreadWeaver {
         Note: When using an APR, you better make sure to receive the signal
         with some object, otherwise the calling thread will block forever!
     */
-    class KDE_EXPORT Job : public TQObject
+    class TDE_EXPORT Job : public TQObject
     {
         TQ_OBJECT
   
@@ -246,7 +246,7 @@ namespace ThreadWeaver {
 
     /** The class Thread is used to represent the worker threads in
         the weaver's inventory. It is not meant to be overloaded. */
-    class KDE_EXPORT Thread : public TQThread
+    class TDE_EXPORT Thread : public TQThread
     {
     public:
         /** Create a thread.
@@ -293,7 +293,7 @@ namespace ThreadWeaver {
 
     /** A weaver is the manager of worker threads (Thread objects) to
         which it assigns jobs from it's queue. */
-    class KDE_EXPORT Weaver : public TQObject
+    class TDE_EXPORT Weaver : public TQObject
     {
         TQ_OBJECT