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

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

88 files changed, 115 insertions, 115 deletions

diff --git a/arts/gui/kde/kartswidget.h b/arts/gui/kde/kartswidget.h
index d33efa15..43cb0b95 100644
--- a/arts/gui/kde/kartswidget.h
+++ b/arts/gui/kde/kartswidget.h
@@ -46,7 +46,7 @@ class KArtsWidgetPrivate;
  * The KArtsWidget class keeps a reference to the content widget, so the
  * content widget will not be freed until the KArtsWidget gets destroyed.
  */
-class KDE_EXPORT KArtsWidget : public TQWidget {
+class TDE_EXPORT KArtsWidget : public TQWidget {
 private:
 	KArtsWidgetPrivate *d;
 
diff --git a/arts/gui/kde/kframe_impl.h b/arts/gui/kde/kframe_impl.h
index 60d0be6b..a55d8271 100644
--- a/arts/gui/kde/kframe_impl.h
+++ b/arts/gui/kde/kframe_impl.h
@@ -26,7 +26,7 @@ class TQFrame;
 
 namespace Arts {
 
-class KDE_EXPORT KFrame_impl : virtual public Arts::Frame_skel,
+class TDE_EXPORT KFrame_impl : virtual public Arts::Frame_skel,
                     public Arts::KWidget_impl
 {
 	protected:
diff --git a/arts/gui/kde/klabel_impl.h b/arts/gui/kde/klabel_impl.h
index b27a4365..1b1c0a73 100644
--- a/arts/gui/kde/klabel_impl.h
+++ b/arts/gui/kde/klabel_impl.h
@@ -35,7 +35,7 @@ class RotateLabel;
 
 namespace Arts {
 
-class KDE_EXPORT KLabel_impl : virtual public Arts::Label_skel,
+class TDE_EXPORT KLabel_impl : virtual public Arts::Label_skel,
                     public Arts::KFrame_impl
 {
 protected:
diff --git a/arts/gui/kde/klayoutbox_impl.h b/arts/gui/kde/klayoutbox_impl.h
index 976e89a2..c42fd146 100644
--- a/arts/gui/kde/klayoutbox_impl.h
+++ b/arts/gui/kde/klayoutbox_impl.h
@@ -32,7 +32,7 @@ class TQBoxLayout;
 
 namespace Arts {
 
-class KDE_EXPORT KLayoutBox_impl : virtual public Arts::LayoutBox_skel,
+class TDE_EXPORT KLayoutBox_impl : virtual public Arts::LayoutBox_skel,
                         public Arts::KFrame_impl
 {
 protected:
@@ -78,7 +78,7 @@ public:
 
 } // namespace
 
-class KDE_EXPORT KLayoutBox_Separator : public TQWidget {
+class TDE_EXPORT KLayoutBox_Separator : public TQWidget {
    TQ_OBJECT
   
 public:
diff --git a/arts/gui/kde/kwidget_impl.h b/arts/gui/kde/kwidget_impl.h
index b0c74fa0..430e8c97 100644
--- a/arts/gui/kde/kwidget_impl.h
+++ b/arts/gui/kde/kwidget_impl.h
@@ -31,7 +31,7 @@
 namespace Arts {
 
 class KWidgetGuard;
-class KDE_EXPORT KWidget_impl : virtual public Arts::Widget_skel {
+class TDE_EXPORT KWidget_impl : virtual public Arts::Widget_skel {
 protected:
 	TQWidget * _qwidget;
 	KWidgetGuard * _guard;
diff --git a/arts/midi/timestampmath.h b/arts/midi/timestampmath.h
index 12131647..ee08996c 100644
--- a/arts/midi/timestampmath.h
+++ b/arts/midi/timestampmath.h
@@ -30,7 +30,7 @@ namespace Arts {
 /**
  * increments the timestamp by delta
  */
-KDE_EXPORT void timeStampInc(TimeStamp& t, const TimeStamp& delta);
+TDE_EXPORT void timeStampInc(TimeStamp& t, const TimeStamp& delta);
 
 /**
  * decrements the timestamp by delta
diff --git a/arts/runtime/moduleinfo.h b/arts/runtime/moduleinfo.h
index 7c1ff15f..11232c8b 100644
--- a/arts/runtime/moduleinfo.h
+++ b/arts/runtime/moduleinfo.h
@@ -28,6 +28,6 @@
 
 #include "artsbuilder.h"
 #include <tdelibs_export.h>
-KDE_EXPORT Arts::ModuleInfo makeModuleInfo(const std::string& name);
+TDE_EXPORT Arts::ModuleInfo makeModuleInfo(const std::string& name);
 
 #endif /* MODULEINFO_H */
diff --git a/arts/runtime/sequenceutils.h b/arts/runtime/sequenceutils.h
index f156b8b7..bcae858d 100644
--- a/arts/runtime/sequenceutils.h
+++ b/arts/runtime/sequenceutils.h
@@ -26,16 +26,16 @@
 #include <string>
 #include <tdelibs_export.h>
 
-KDE_EXPORT int parse_line(const char *in, char *& cmd, char *& param);
+TDE_EXPORT int parse_line(const char *in, char *& cmd, char *& param);
 
-KDE_EXPORT void sqprintf(std::vector<std::string> *list, const char *fmt, ...)
+TDE_EXPORT void sqprintf(std::vector<std::string> *list, const char *fmt, ...)
 #ifdef __GNUC__
     __attribute__ (( format (printf, 2, 3)))
 #endif
 ;
-KDE_EXPORT void addSubStringSeq(std::vector<std::string> *target, const std::vector<std::string> *source);
-KDE_EXPORT void appendStringSeq(std::vector<std::string> *target, const std::vector<std::string> *source);
-KDE_EXPORT int parse_line(const std::string& in, std::string& cmd, std::string& param);
-KDE_EXPORT std::vector<std::string> *getSubStringSeq(const std::vector<std::string> *seq,unsigned long& i);
+TDE_EXPORT void addSubStringSeq(std::vector<std::string> *target, const std::vector<std::string> *source);
+TDE_EXPORT void appendStringSeq(std::vector<std::string> *target, const std::vector<std::string> *source);
+TDE_EXPORT int parse_line(const std::string& in, std::string& cmd, std::string& param);
+TDE_EXPORT std::vector<std::string> *getSubStringSeq(const std::vector<std::string> *seq,unsigned long& i);
 
 #endif /* ARTS_SEQUENCEUTILS_H */
diff --git a/arts/tools/artsactions.h b/arts/tools/artsactions.h
index 5bba632d..f542fb9b 100644
--- a/arts/tools/artsactions.h
+++ b/arts/tools/artsactions.h
@@ -34,7 +34,7 @@ class MidiManagerView;
 class EnvironmentView;
 class MediaTypesView;
 
-class KDE_EXPORT ArtsActions : public TQObject
+class TDE_EXPORT ArtsActions : public TQObject
 {
 	TQ_OBJECT
   
diff --git a/arts/tools/artscontrolapplet.cpp b/arts/tools/artscontrolapplet.cpp
index bada9d2c..6b9b92fd 100644
--- a/arts/tools/artscontrolapplet.cpp
+++ b/arts/tools/artscontrolapplet.cpp
@@ -29,7 +29,7 @@
 
 extern "C"
 {
-  KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString configFile)
+  TDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString configFile)
   {
     TDEGlobal::locale()->insertCatalogue("artscontrol");
     return new ArtsControlApplet(configFile, KPanelApplet::Normal,
diff --git a/arts/tools/artscontrolapplet_private.h b/arts/tools/artscontrolapplet_private.h
index 7d14f458..05b6ee2d 100644
--- a/arts/tools/artscontrolapplet_private.h
+++ b/arts/tools/artscontrolapplet_private.h
@@ -45,7 +45,7 @@
 
 class VolumeSlider;
 
-class KDE_EXPORT ArtsControlAppletPrivate : public TQObject {
+class TDE_EXPORT ArtsControlAppletPrivate : public TQObject {
    TQ_OBJECT
   
 private:
diff --git a/arts/tools/fftscopeview.h b/arts/tools/fftscopeview.h
index 0a0a93cb..91a27378 100644
--- a/arts/tools/fftscopeview.h
+++ b/arts/tools/fftscopeview.h
@@ -38,7 +38,7 @@ class TDEAction;
 class KArtsWidget;
 class ArtsActions;
 
-class KDE_EXPORT FFTScopeView : public Template_ArtsView {
+class TDE_EXPORT FFTScopeView : public Template_ArtsView {
    TQ_OBJECT
   
 protected:
diff --git a/juk/akodeplayer.h b/juk/akodeplayer.h
index 8805f786..ebeeba94 100644
--- a/juk/akodeplayer.h
+++ b/juk/akodeplayer.h
@@ -34,7 +34,7 @@ namespace aKode {
     class Player;
 }
 
-class KDE_EXPORT aKodePlayer : public Player
+class TDE_EXPORT aKodePlayer : public Player
 {
     TQ_OBJECT
   
diff --git a/kmix/kmixapplet.cpp b/kmix/kmixapplet.cpp
index 19bfcbdb..020a27b6 100644
--- a/kmix/kmixapplet.cpp
+++ b/kmix/kmixapplet.cpp
@@ -66,7 +66,7 @@
 
 extern "C"
 {
-  KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
+  TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
   {
      TDEGlobal::locale()->insertCatalogue("kmix");
      return new KMixApplet(configFile, KPanelApplet::Normal,
diff --git a/kmix/kmixctrl.cpp b/kmix/kmixctrl.cpp
index 9f6188c7..c3bfd55a 100644
--- a/kmix/kmixctrl.cpp
+++ b/kmix/kmixctrl.cpp
@@ -46,7 +46,7 @@ static TDECmdLineOptions options[] =
    // INSERT YOUR COMMANDLINE OPTIONS HERE
 };
 
-extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
+extern "C" TDE_EXPORT int kdemain(int argc, char *argv[])
 {
    TDELocale::setMainCatalogue("kmix");
    TDEAboutData aboutData( "kmixctrl", I18N_NOOP("KMixCtrl"),
diff --git a/kmix/kmixsettings.kcfgc b/kmix/kmixsettings.kcfgc
index 07597da8..0ef6cff2 100644
--- a/kmix/kmixsettings.kcfgc
+++ b/kmix/kmixsettings.kcfgc
@@ -2,5 +2,5 @@ File=kmix.kcfg
 Singleton=true
 ClassName=KMixSettings
 Mutators=true
-Visibility=KDE_EXPORT
+Visibility=TDE_EXPORT
 SetUserTexts=true
\ No newline at end of file
diff --git a/kmix/main.cpp b/kmix/main.cpp
index 9b0498d2..1372de92 100644
--- a/kmix/main.cpp
+++ b/kmix/main.cpp
@@ -37,7 +37,7 @@ static TDECmdLineOptions options[] =
    // INSERT YOUR COMMANDLINE OPTIONS HERE
 };
 
-extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
+extern "C" TDE_EXPORT int kdemain(int argc, char *argv[])
 {
    TDEAboutData aboutData( "kmix", I18N_NOOP("KMix"),
                          APP_VERSION, description, TDEAboutData::License_GPL,
diff --git a/krec/main.cpp b/krec/main.cpp
index 5c3a67fb..d294630d 100644
--- a/krec/main.cpp
+++ b/krec/main.cpp
@@ -40,7 +40,7 @@ static TDECmdLineOptions options[] =
 	// INSERT YOUR COMMANDLINE OPTIONS HERE
 };
 
-extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] )
+extern "C" TDE_EXPORT int kdemain( int argc, char* argv[] )
 {
 	//cout<<endl<<"Starting kRec..."<<endl;
 
diff --git a/libkcddb/cache.h b/libkcddb/cache.h
index 7839ba33..50dbdc97 100644
--- a/libkcddb/cache.h
+++ b/libkcddb/cache.h
@@ -29,7 +29,7 @@
 #include <kdemacros.h>
 namespace KCDDB
 {
-  class KDE_EXPORT Cache
+  class TDE_EXPORT Cache
   {
     public:
 
diff --git a/libkcddb/cddb.h b/libkcddb/cddb.h
index 1e397467..5f95c815 100644
--- a/libkcddb/cddb.h
+++ b/libkcddb/cddb.h
@@ -43,7 +43,7 @@ namespace KCDDB
   /** This is just a container class used for interpreting results
    of CDDB queries.
    */
-  class KDE_EXPORT CDDB
+  class TDE_EXPORT CDDB
   {
     public:
 
diff --git a/libkcddb/cdinfo.h b/libkcddb/cdinfo.h
index cafaab53..25d94804 100644
--- a/libkcddb/cdinfo.h
+++ b/libkcddb/cdinfo.h
@@ -32,7 +32,7 @@ namespace KCDDB
   /**
    * Information about a sepecific track in a cd.
    */
-  class KDE_EXPORT TrackInfo
+  class TDE_EXPORT TrackInfo
   {
     public:
 
@@ -65,7 +65,7 @@ namespace KCDDB
    * cddb->lookup(discSignature);
    * CDInfo info = cddb->bestLookupResponse();</code>
    */
-  class KDE_EXPORT CDInfo
+  class TDE_EXPORT CDInfo
   {
     public:
 
diff --git a/libkcddb/client.h b/libkcddb/client.h
index c28d763e..e28f9612 100644
--- a/libkcddb/client.h
+++ b/libkcddb/client.h
@@ -40,7 +40,7 @@ namespace KCDDB
    * cddb->lookup(discSignature);
    * CDInfo info = cddb->bestLookupResponse();</code>
    */
-  class KDE_EXPORT Client : public TQObject
+  class TDE_EXPORT Client : public TQObject
   {
     TQ_OBJECT
   
diff --git a/libkcddb/config.h b/libkcddb/config.h
index adfd59f2..1f5ec8a4 100644
--- a/libkcddb/config.h
+++ b/libkcddb/config.h
@@ -30,7 +30,7 @@
 #include <tdelibs_export.h>
 namespace KCDDB
 {
-  class KDE_EXPORT Config : public ConfigBase
+  class TDE_EXPORT Config : public ConfigBase
   {
     public:
       Config();
diff --git a/libkcddb/configbase.kcfgc b/libkcddb/configbase.kcfgc
index fe089fc8..0cde4e52 100644
--- a/libkcddb/configbase.kcfgc
+++ b/libkcddb/configbase.kcfgc
@@ -1,4 +1,4 @@
 ClassName=ConfigBase
 File=libkcddb.kcfg
 Mutators=true
-Visibility=KDE_EXPORT
+Visibility=TDE_EXPORT
diff --git a/libkcddb/sites.h b/libkcddb/sites.h
index eaa3dacb..c06b1762 100644
--- a/libkcddb/sites.h
+++ b/libkcddb/sites.h
@@ -36,7 +36,7 @@ namespace KCDDB
       TQString description;
   } ;
 
-  class KDE_EXPORT Sites : public CDDB
+  class TDE_EXPORT Sites : public CDDB
   {
     public:
       Sites();
diff --git a/mpeglib/example/yaf/yafcore/buffer.h b/mpeglib/example/yaf/yafcore/buffer.h
index 7c1a3d5c..93f4f3d8 100644
--- a/mpeglib/example/yaf/yafcore/buffer.h
+++ b/mpeglib/example/yaf/yafcore/buffer.h
@@ -24,7 +24,7 @@ extern "C" {
 	   }
 #include <kdemacros.h>
   
-class KDE_EXPORT Buffer {
+class TDE_EXPORT Buffer {
 
   char* msg;
   int nSize;
diff --git a/mpeglib/example/yaf/yafcore/commandTable.h b/mpeglib/example/yaf/yafcore/commandTable.h
index 75dd4325..77d51906 100644
--- a/mpeglib/example/yaf/yafcore/commandTable.h
+++ b/mpeglib/example/yaf/yafcore/commandTable.h
@@ -47,7 +47,7 @@ struct CommandDescriptionStruct {
 typedef struct CommandDescriptionStruct CommandDescription;
 
 
-class KDE_EXPORT CommandTable {
+class TDE_EXPORT CommandTable {
 
   int nCommandDesc;
   CommandDescription commandDesc[50];
diff --git a/mpeglib/example/yaf/yafcore/inputDecoder.h b/mpeglib/example/yaf/yafcore/inputDecoder.h
index 0a5623a0..4051fd3d 100644
--- a/mpeglib/example/yaf/yafcore/inputDecoder.h
+++ b/mpeglib/example/yaf/yafcore/inputDecoder.h
@@ -29,7 +29,7 @@ class CommandTable;
 class CommandTableYAF;
 class CommandLine;
 
-class KDE_EXPORT InputDecoder {
+class TDE_EXPORT InputDecoder {
 
   int status;
   CommandTable* commandTable;
diff --git a/mpeglib/example/yaf/yafcore/inputInterface.h b/mpeglib/example/yaf/yafcore/inputInterface.h
index f3ea0065..d22bc615 100644
--- a/mpeglib/example/yaf/yafcore/inputInterface.h
+++ b/mpeglib/example/yaf/yafcore/inputInterface.h
@@ -37,7 +37,7 @@ extern "C" {
 
 class MultiReader;
 
-class KDE_EXPORT InputInterface {
+class TDE_EXPORT InputInterface {
 
   int currentCommandNumber;
 
diff --git a/mpeglib/example/yaf/yafcore/outputInterface.h b/mpeglib/example/yaf/yafcore/outputInterface.h
index 0a24fd92..fe4c8e71 100644
--- a/mpeglib/example/yaf/yafcore/outputInterface.h
+++ b/mpeglib/example/yaf/yafcore/outputInterface.h
@@ -28,7 +28,7 @@
 //#define _DEBUG_OUTPUT
 
 
-class KDE_EXPORT OutputInterface {
+class TDE_EXPORT OutputInterface {
 
   int protocolSyntax;
   int nr;
diff --git a/mpeglib/example/yaf/yafcore/yaf_control.h b/mpeglib/example/yaf/yafcore/yaf_control.h
index 890a1bb8..630dc398 100644
--- a/mpeglib/example/yaf/yafcore/yaf_control.h
+++ b/mpeglib/example/yaf/yafcore/yaf_control.h
@@ -19,7 +19,7 @@
 // prototypes
 
 //extern "C" void control_xplayer();
-KDE_EXPORT void yaf_control(InputInterface* input,
+TDE_EXPORT void yaf_control(InputInterface* input,
 		 OutputInterface* output,
 		 InputDecoder* decoder);
 
diff --git a/mpeglib/example/yaf/yafxplayer/inputDecoderYAF.h b/mpeglib/example/yaf/yafxplayer/inputDecoderYAF.h
index 2002dc58..798c8a62 100644
--- a/mpeglib/example/yaf/yafxplayer/inputDecoderYAF.h
+++ b/mpeglib/example/yaf/yafxplayer/inputDecoderYAF.h
@@ -23,7 +23,7 @@
 #include <kdemacros.h>
 
 
-class KDE_EXPORT InputDecoderYAF : public InputDecoderXPlayer {
+class TDE_EXPORT InputDecoderYAF : public InputDecoderXPlayer {
 
   DecoderPlugin* plugin;
   YafOutputStream* output;
diff --git a/mpeglib/example/yaf/yafxplayer/yafOutputStream.h b/mpeglib/example/yaf/yafxplayer/yafOutputStream.h
index bb7df423..25d7978f 100644
--- a/mpeglib/example/yaf/yafxplayer/yafOutputStream.h
+++ b/mpeglib/example/yaf/yafxplayer/yafOutputStream.h
@@ -49,7 +49,7 @@
 
 
 
-class KDE_EXPORT YafOutputStream : public OutputStream {
+class TDE_EXPORT YafOutputStream : public OutputStream {
 
 
   long bytes;
diff --git a/mpeglib/lib/decoder/decoderPlugin.h b/mpeglib/lib/decoder/decoderPlugin.h
index b616ed51..a25bee60 100644
--- a/mpeglib/lib/decoder/decoderPlugin.h
+++ b/mpeglib/lib/decoder/decoderPlugin.h
@@ -75,7 +75,7 @@
    
 */
 
-class KDE_EXPORT DecoderPlugin {
+class TDE_EXPORT DecoderPlugin {
 
  public:
   
diff --git a/mpeglib/lib/decoder/mpgPlugin.h b/mpeglib/lib/decoder/mpgPlugin.h
index 79d986cc..d2c57f01 100644
--- a/mpeglib/lib/decoder/mpgPlugin.h
+++ b/mpeglib/lib/decoder/mpgPlugin.h
@@ -28,7 +28,7 @@ class MpegSystemStream;
 class MpegStreamPlayer;
 class MpegVideoLength;
 
-class KDE_EXPORT MpgPlugin : public DecoderPlugin {
+class TDE_EXPORT MpgPlugin : public DecoderPlugin {
 
   MpegSystemHeader* mpegSystemHeader;
   MpegSystemStream* mpegSystemStream;
diff --git a/mpeglib/lib/decoder/nukePlugin.h b/mpeglib/lib/decoder/nukePlugin.h
index a7df2495..9898bd02 100644
--- a/mpeglib/lib/decoder/nukePlugin.h
+++ b/mpeglib/lib/decoder/nukePlugin.h
@@ -18,7 +18,7 @@
 #include "../decoder/decoderPlugin.h"
 #include <kdemacros.h>
 
-class KDE_EXPORT NukePlugin : public DecoderPlugin {
+class TDE_EXPORT NukePlugin : public DecoderPlugin {
 
  public:
 
diff --git a/mpeglib/lib/decoder/splayPlugin.h b/mpeglib/lib/decoder/splayPlugin.h
index d7eed4ec..4bb0d9f9 100644
--- a/mpeglib/lib/decoder/splayPlugin.h
+++ b/mpeglib/lib/decoder/splayPlugin.h
@@ -25,7 +25,7 @@ class PCMFrame;
 class FileAccessWrapper;
 class MpegAudioInfo;
 
-class KDE_EXPORT SplayPlugin : public DecoderPlugin {
+class TDE_EXPORT SplayPlugin : public DecoderPlugin {
   
   int lnoLength;
   int lfirst;
diff --git a/mpeglib/lib/decoder/tplayPlugin.h b/mpeglib/lib/decoder/tplayPlugin.h
index daa0de74..90c6f6d2 100644
--- a/mpeglib/lib/decoder/tplayPlugin.h
+++ b/mpeglib/lib/decoder/tplayPlugin.h
@@ -21,7 +21,7 @@
    Im not sure if you can make mutiple instances of it
 */
 
-class KDE_EXPORT TplayPlugin : public DecoderPlugin {
+class TDE_EXPORT TplayPlugin : public DecoderPlugin {
 
   struct info_struct* info;
   class TimeStamp* startStamp;
diff --git a/mpeglib/lib/frame/IOFrameQueue.h b/mpeglib/lib/frame/IOFrameQueue.h
index d56f25aa..652977b6 100644
--- a/mpeglib/lib/frame/IOFrameQueue.h
+++ b/mpeglib/lib/frame/IOFrameQueue.h
@@ -31,7 +31,7 @@
 
 */
 
-class KDE_EXPORT IOFrameQueue {
+class TDE_EXPORT IOFrameQueue {
 
 
  public:
diff --git a/mpeglib/lib/frame/audioFrame.h b/mpeglib/lib/frame/audioFrame.h
index b1c586c3..853a5391 100644
--- a/mpeglib/lib/frame/audioFrame.h
+++ b/mpeglib/lib/frame/audioFrame.h
@@ -34,7 +34,7 @@
 #define MP3FRAMESIZE         (2*2*2*32*18)
 
 
-class KDE_EXPORT AudioFrame : public Frame {
+class TDE_EXPORT AudioFrame : public Frame {
 
   int stereo;
   int frequencyHZ;
diff --git a/mpeglib/lib/frame/audioFrameQueue.h b/mpeglib/lib/frame/audioFrameQueue.h
index 7e7a01c0..63f8bd57 100644
--- a/mpeglib/lib/frame/audioFrameQueue.h
+++ b/mpeglib/lib/frame/audioFrameQueue.h
@@ -28,7 +28,7 @@
    This class can convert from packets back to a stream.
 */
 
-class KDE_EXPORT AudioFrameQueue : public IOFrameQueue {
+class TDE_EXPORT AudioFrameQueue : public IOFrameQueue {
   
   int frameType;
   int len;
diff --git a/mpeglib/lib/frame/framer.h b/mpeglib/lib/frame/framer.h
index 51c4b26e..2c1081ba 100644
--- a/mpeglib/lib/frame/framer.h
+++ b/mpeglib/lib/frame/framer.h
@@ -70,7 +70,7 @@
 
 
 
-class KDE_EXPORT Framer {
+class TDE_EXPORT Framer {
 
   // this is our destination buffer for the output frame
   // this buffer must be able to store the maximum size
diff --git a/mpeglib/lib/frame/pcmFrame.h b/mpeglib/lib/frame/pcmFrame.h
index a19941bc..f031519f 100644
--- a/mpeglib/lib/frame/pcmFrame.h
+++ b/mpeglib/lib/frame/pcmFrame.h
@@ -20,7 +20,7 @@
 #include <kdemacros.h>
 // this format has a sampleSize of 16, signed, endian==machine
 
-class KDE_EXPORT PCMFrame : public AudioFrame {
+class TDE_EXPORT PCMFrame : public AudioFrame {
 
   short int* data;
   int len;
diff --git a/mpeglib/lib/input/inputPlugin.h b/mpeglib/lib/input/inputPlugin.h
index 5ac68307..7ccc5501 100644
--- a/mpeglib/lib/input/inputPlugin.h
+++ b/mpeglib/lib/input/inputPlugin.h
@@ -29,7 +29,7 @@
 
 #define _INPUT_THREADSAFE     1
 
-class KDE_EXPORT InputPlugin {
+class TDE_EXPORT InputPlugin {
 
  public:
   InputPlugin();
diff --git a/mpeglib/lib/output/outPlugin.h b/mpeglib/lib/output/outPlugin.h
index b70620a6..72b49edf 100644
--- a/mpeglib/lib/output/outPlugin.h
+++ b/mpeglib/lib/output/outPlugin.h
@@ -27,7 +27,7 @@
 
 #define _OUTPUT_THREADSAFE 1
 
-class KDE_EXPORT OutPlugin {
+class TDE_EXPORT OutPlugin {
 
  public:
   OutPlugin();
diff --git a/mpeglib/lib/output/outputStream.h b/mpeglib/lib/output/outputStream.h
index 9ef538fd..b2d1a2fb 100644
--- a/mpeglib/lib/output/outputStream.h
+++ b/mpeglib/lib/output/outputStream.h
@@ -76,7 +76,7 @@
 
 
 
-class KDE_EXPORT OutputStream {
+class TDE_EXPORT OutputStream {
 
   int audioState;
   int videoState;
diff --git a/mpeglib/lib/output/pluginInfo.h b/mpeglib/lib/output/pluginInfo.h
index 7026fce9..1d9e5409 100644
--- a/mpeglib/lib/output/pluginInfo.h
+++ b/mpeglib/lib/output/pluginInfo.h
@@ -26,7 +26,7 @@
 */
 
 
-class KDE_EXPORT PluginInfo {
+class TDE_EXPORT PluginInfo {
 
   int sec;
   DynBuffer* musicName;
diff --git a/mpeglib/lib/splay/mpegAudioFrame.h b/mpeglib/lib/splay/mpegAudioFrame.h
index 8b4f6c4f..100579fb 100644
--- a/mpeglib/lib/splay/mpegAudioFrame.h
+++ b/mpeglib/lib/splay/mpegAudioFrame.h
@@ -26,7 +26,7 @@
 
 
 
-class KDE_EXPORT MpegAudioFrame : public Framer {
+class TDE_EXPORT MpegAudioFrame : public Framer {
 
   // max size of buffer is:
   // header:          4
diff --git a/mpeglib/lib/splay/splayDecoder.h b/mpeglib/lib/splay/splayDecoder.h
index acbfdbfc..6767336d 100644
--- a/mpeglib/lib/splay/splayDecoder.h
+++ b/mpeglib/lib/splay/splayDecoder.h
@@ -46,7 +46,7 @@ class MpegAudioHeader;
 
 
 
-class KDE_EXPORT SplayDecoder {
+class TDE_EXPORT SplayDecoder {
 
   MpegAudioStream* stream;
   MpegAudioHeader* header;
diff --git a/mpeglib/lib/util/audio/dspWrapper.h b/mpeglib/lib/util/audio/dspWrapper.h
index f323096d..8fc21cdf 100644
--- a/mpeglib/lib/util/audio/dspWrapper.h
+++ b/mpeglib/lib/util/audio/dspWrapper.h
@@ -32,7 +32,7 @@ class FloatFrame;
    But a caller can do it in both orders.
 */
 
-class KDE_EXPORT DSPWrapper  {
+class TDE_EXPORT DSPWrapper  {
 
   int lopenDevice;
   int lopenMixer;
diff --git a/mpeglib/lib/util/timeWrapper.h b/mpeglib/lib/util/timeWrapper.h
index 608d5bd0..f8c2c8a3 100644
--- a/mpeglib/lib/util/timeWrapper.h
+++ b/mpeglib/lib/util/timeWrapper.h
@@ -30,7 +30,7 @@ typedef struct timeval_s {
   long tv_usec;  /* microseconds */
 } timeval_t;
 
-class KDE_EXPORT TimeWrapper {
+class TDE_EXPORT TimeWrapper {
 
  public:
   TimeWrapper();
diff --git a/mpeglib/lib/yuv/yuvPlugin.h b/mpeglib/lib/yuv/yuvPlugin.h
index 4a5dc72b..6cc33d7e 100644
--- a/mpeglib/lib/yuv/yuvPlugin.h
+++ b/mpeglib/lib/yuv/yuvPlugin.h
@@ -20,7 +20,7 @@
 #include "../decoder/decoderPlugin.h"
 #include <kdemacros.h>
 
-class KDE_EXPORT YUVPlugin : public DecoderPlugin {
+class TDE_EXPORT YUVPlugin : public DecoderPlugin {
   
   int lCalcLength;
   int nWidth;
diff --git a/noatun/app/main.cpp b/noatun/app/main.cpp
index d39b2735..85f6571c 100644
--- a/noatun/app/main.cpp
+++ b/noatun/app/main.cpp
@@ -14,7 +14,7 @@ static TDECmdLineOptions options[] =
 	TDECmdLineLastOption
 };
 
-extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
+extern "C" TDE_EXPORT int kdemain(int argc, char **argv)
 {
 	TDEAboutData aboutData("noatun", I18N_NOOP("Noatun"),
 	                     version, description, TDEAboutData::License_BSD,
diff --git a/noatun/library/noatun/app.h b/noatun/library/noatun/app.h
index f8927376..1fc61d9a 100644
--- a/noatun/library/noatun/app.h
+++ b/noatun/library/noatun/app.h
@@ -28,7 +28,7 @@ namespace NoatunStdAction
  * @author Charles Samuels
  * @version 2.3
  */
-class KDE_EXPORT NoatunApp : public KUniqueApplication
+class TDE_EXPORT NoatunApp : public KUniqueApplication
 {
 TQ_OBJECT
   
diff --git a/noatun/library/noatun/controls.h b/noatun/library/noatun/controls.h
index 813be2ee..020b030b 100644
--- a/noatun/library/noatun/controls.h
+++ b/noatun/library/noatun/controls.h
@@ -20,7 +20,7 @@ class TQLabel;
  * @author Charles Samuels
  * @version 2.3
  **/
-class KDE_EXPORT L33tSlider : public TQSlider
+class TDE_EXPORT L33tSlider : public TQSlider
 {
 TQ_OBJECT
   
diff --git a/noatun/library/noatun/engine.h b/noatun/library/noatun/engine.h
index e4dc1403..d1fdb845 100644
--- a/noatun/library/noatun/engine.h
+++ b/noatun/library/noatun/engine.h
@@ -30,7 +30,7 @@ class NoatunApp;
  * Does almost everything related to multimedia.
  * Most interfacing should be done with Player
  **/
-class KDE_EXPORT Engine : public TQObject
+class TDE_EXPORT Engine : public TQObject
 {
 TQ_OBJECT
   
diff --git a/noatun/library/noatun/player.h b/noatun/library/noatun/player.h
index 3f3b3ae8..77c24a8f 100644
--- a/noatun/library/noatun/player.h
+++ b/noatun/library/noatun/player.h
@@ -19,7 +19,7 @@ class KLibrary;
  * @author Charles Samuels
  * @version 2.4
  **/
-class KDE_EXPORT Player : public TQObject
+class TDE_EXPORT Player : public TQObject
 {
 TQ_OBJECT
   
diff --git a/noatun/library/noatun/playlist.h b/noatun/library/noatun/playlist.h
index a8188e3b..b6521389 100644
--- a/noatun/library/noatun/playlist.h
+++ b/noatun/library/noatun/playlist.h
@@ -27,7 +27,7 @@ class PlaylistItem;
  * @author Charles Samuels
  * @version 2.3
  **/
-class KDE_EXPORT PlaylistItemData
+class TDE_EXPORT PlaylistItemData
 {
 public:
 	PlaylistItemData();
@@ -205,7 +205,7 @@ private:
  * @author Charles Samuels
  * @version 2.3
  **/
-class KDE_EXPORT PlaylistItem
+class TDE_EXPORT PlaylistItem
 {
 public:
 	PlaylistItem(const PlaylistItem &source);
diff --git a/noatun/library/noatun/plugin.h b/noatun/library/noatun/plugin.h
index f01b0f27..504d2ec3 100644
--- a/noatun/library/noatun/plugin.h
+++ b/noatun/library/noatun/plugin.h
@@ -24,7 +24,7 @@ class NoatunApp;
 /**
  * @short Base class for all plugins
  **/
-class KDE_EXPORT Plugin
+class TDE_EXPORT Plugin
 {
 public:
 	Plugin();
@@ -58,7 +58,7 @@ public:
  * Inherit from this one instead of Plugin if you are
  * a user-interface
  **/
-class KDE_EXPORT UserInterface : public Plugin
+class TDE_EXPORT UserInterface : public Plugin
 {
 public:
 	UserInterface();
@@ -162,7 +162,7 @@ private:
 /**
  * Base class for all kinds of FFT scopes
  **/
-class KDE_EXPORT FFTScope : public Visualization
+class TDE_EXPORT FFTScope : public Visualization
 {
 public:
 	FFTScope(int interval, int pid=0);
@@ -205,7 +205,7 @@ public:
  * An easy to use FFT scope, stereo version.
  * You certainly want to reimplement scopeEvent()
  **/
-class KDE_EXPORT StereoFFTScope : public FFTScope
+class TDE_EXPORT StereoFFTScope : public FFTScope
 {
 public:
 	StereoFFTScope(int timeout=250, int pid=0);
@@ -242,7 +242,7 @@ private:
  * An easy to use FFT scope, mono version.
  * You certainly want to reimplement scopeEvent()
  **/
-class KDE_EXPORT MonoFFTScope : public FFTScope
+class TDE_EXPORT MonoFFTScope : public FFTScope
 {
 public:
 	MonoFFTScope(int timeout=250, int pid=0);
@@ -302,7 +302,7 @@ public:
  * Note: Of course this one also works for audio with more than one channel
  * You certainly want to reimplement scopeEvent()
  */
-class KDE_EXPORT MonoScope : public Scope
+class TDE_EXPORT MonoScope : public Scope
 {
 public:
 	MonoScope(int timeout=250, int pid=0);
diff --git a/noatun/library/noatun/pluginloader.h b/noatun/library/noatun/pluginloader.h
index 04c1b750..1bbb7369 100644
--- a/noatun/library/noatun/pluginloader.h
+++ b/noatun/library/noatun/pluginloader.h
@@ -33,7 +33,7 @@ class Plugin;
 /**
  * Used for loading plugins at runtime
  **/
-class KDE_EXPORT LibraryLoader
+class TDE_EXPORT LibraryLoader
 {
 	friend class Plugin;
 	struct PluginLibrary
diff --git a/noatun/library/noatun/pref.h b/noatun/library/noatun/pref.h
index 4745a010..979dd57a 100644
--- a/noatun/library/noatun/pref.h
+++ b/noatun/library/noatun/pref.h
@@ -54,7 +54,7 @@ private:
  * Create your GUI in constructor, reimplement reopen() and save() and
  * you're all set.
  **/
-class KDE_EXPORT CModule : public TQWidget
+class TDE_EXPORT CModule : public TQWidget
 {
 TQ_OBJECT
   
diff --git a/noatun/library/noatun/stdaction.h b/noatun/library/noatun/stdaction.h
index 0ddf7f20..ff918de5 100644
--- a/noatun/library/noatun/stdaction.h
+++ b/noatun/library/noatun/stdaction.h
@@ -121,64 +121,64 @@ private:
 /**
  * @return pointer to a TDEAction which opens the effects dialog on activation
  */
-KDE_EXPORT TDEAction *effects(TQObject *parent = 0, const char *name = 0);
+TDE_EXPORT TDEAction *effects(TQObject *parent = 0, const char *name = 0);
 
 /**
  * @return pointer to a TDEAction which opens the equalizer dialog on activation
  */
-KDE_EXPORT TDEAction *equalizer(TQObject *parent = 0, const char *name = 0);
+TDE_EXPORT TDEAction *equalizer(TQObject *parent = 0, const char *name = 0);
 
 /**
  * @return pointer to a TDEAction which goes back one track on activation
  */
-KDE_EXPORT TDEAction *back(TQObject *parent = 0, const char *name = 0);
+TDE_EXPORT TDEAction *back(TQObject *parent = 0, const char *name = 0);
 /**
  * @return pointer to a TDEAction which stops playback on activation
  */
-KDE_EXPORT TDEAction *stop(TQObject *parent = 0, const char *name = 0);
+TDE_EXPORT TDEAction *stop(TQObject *parent = 0, const char *name = 0);
 /**
  * @return pointer to a TDEAction which starts/pauses playback on activation
  */
-KDE_EXPORT TDEAction *playpause(TQObject *parent = 0, const char *name = 0);
+TDE_EXPORT TDEAction *playpause(TQObject *parent = 0, const char *name = 0);
 /**
  * @return pointer to a TDEAction which advances one track on activation
  */
-KDE_EXPORT TDEAction *forward(TQObject *parent = 0, const char *name = 0);
+TDE_EXPORT TDEAction *forward(TQObject *parent = 0, const char *name = 0);
 /**
  * @return pointer to a TDEToggleAction which shows/hides the playlist
  */
-KDE_EXPORT TDEToggleAction *playlist(TQObject *parent = 0, const char *name = 0);
+TDE_EXPORT TDEToggleAction *playlist(TQObject *parent = 0, const char *name = 0);
 
 /**
  * loop action
  **/
-KDE_EXPORT LoopActionMenu *loop(TQObject *parent, const char *name);
+TDE_EXPORT LoopActionMenu *loop(TQObject *parent, const char *name);
 
 /**
  * play action
  */
-KDE_EXPORT TDEAction *play(TQObject *parent = 0, const char *name = 0);
+TDE_EXPORT TDEAction *play(TQObject *parent = 0, const char *name = 0);
 
 /**
  * pause action
  */
-KDE_EXPORT TDEAction *pause(TQObject *parent = 0, const char *name = 0);
+TDE_EXPORT TDEAction *pause(TQObject *parent = 0, const char *name = 0);
 
 /**
  * @return pointer to the global PluginActionMenu object (there is only one instance)
  */
-KDE_EXPORT PluginActionMenu *actions();
+TDE_EXPORT PluginActionMenu *actions();
 
 /**
  * @return pointer to a VisActionMenu object
  */
-KDE_EXPORT VisActionMenu *visualizations(TQObject *parent = 0, const char *name = 0);
+TDE_EXPORT VisActionMenu *visualizations(TQObject *parent = 0, const char *name = 0);
 
 /**
  * The global popupmenu of noatun, there's not two or three but only one of these :)
  * @author Charles Samuels
  **/
-class KDE_EXPORT ContextMenu
+class TDE_EXPORT ContextMenu
 {
 public:
 	static TDEPopupMenu *createContextMenu(TQWidget *p);
diff --git a/noatun/library/noatun/vequalizer.h b/noatun/library/noatun/vequalizer.h
index 244fcd11..2eff3715 100644
--- a/noatun/library/noatun/vequalizer.h
+++ b/noatun/library/noatun/vequalizer.h
@@ -76,7 +76,7 @@ class VEqualizer;
  * Represents a single band in a vequalizer
  * @author Charles Samuels
  **/
-class KDE_EXPORT VBand
+class TDE_EXPORT VBand
 {
 	friend class VInterpolation;
 	friend class VEqualizer;
@@ -134,7 +134,7 @@ public:
  * @short interpolated representation of Eq data
  * @author Charles Samuels
  **/
-class KDE_EXPORT VInterpolation : public TQObject, public VBandsInterface
+class TDE_EXPORT VInterpolation : public TQObject, public VBandsInterface
 {
 	TQ_OBJECT
   
@@ -174,7 +174,7 @@ class VPreset;
  * @short Noatun EQ
  * @author Charles Samuels
  **/
-class KDE_EXPORT VEqualizer : public TQObject, public VBandsInterface
+class TDE_EXPORT VEqualizer : public TQObject, public VBandsInterface
 {
 	TQ_OBJECT
   
diff --git a/noatun/modules/dcopiface/dcopiface.cpp b/noatun/modules/dcopiface/dcopiface.cpp
index 731d3cf7..4c9e0f37 100644
--- a/noatun/modules/dcopiface/dcopiface.cpp
+++ b/noatun/modules/dcopiface/dcopiface.cpp
@@ -9,7 +9,7 @@
 
 extern "C"
 {
-	KDE_EXPORT NIF *create_plugin()
+	TDE_EXPORT NIF *create_plugin()
 	{
 		return new NIF();
 	}
diff --git a/noatun/modules/dcopiface/dcopiface.h b/noatun/modules/dcopiface/dcopiface.h
index cd58a228..38767fc4 100644
--- a/noatun/modules/dcopiface/dcopiface.h
+++ b/noatun/modules/dcopiface/dcopiface.h
@@ -7,7 +7,7 @@
 #include <dcopobject.h>
 #include <kdemacros.h>
 
-class KDE_EXPORT NIF : public Plugin, public DCOPObject
+class TDE_EXPORT NIF : public Plugin, public DCOPObject
 {
 K_DCOP
 
diff --git a/noatun/modules/excellent/noatunui.cpp b/noatun/modules/excellent/noatunui.cpp
index a103268d..575dc32a 100644
--- a/noatun/modules/excellent/noatunui.cpp
+++ b/noatun/modules/excellent/noatunui.cpp
@@ -26,7 +26,7 @@
 
 #include "userinterface.h"
 
-extern "C" KDE_EXPORT Plugin *create_plugin()
+extern "C" TDE_EXPORT Plugin *create_plugin()
 {
 	return new Excellent();
 }
diff --git a/noatun/modules/htmlexport/htmlexport.cpp b/noatun/modules/htmlexport/htmlexport.cpp
index b256b421..3facc98c 100644
--- a/noatun/modules/htmlexport/htmlexport.cpp
+++ b/noatun/modules/htmlexport/htmlexport.cpp
@@ -7,7 +7,7 @@
 
 extern "C"
 {
-	KDE_EXPORT Plugin *create_plugin()
+	TDE_EXPORT Plugin *create_plugin()
 	{
 		return new HTMLExport();
 	}
diff --git a/noatun/modules/infrared/infrared.cpp b/noatun/modules/infrared/infrared.cpp
index 92ae3c4f..76b6dc73 100644
--- a/noatun/modules/infrared/infrared.cpp
+++ b/noatun/modules/infrared/infrared.cpp
@@ -14,7 +14,7 @@
 
 extern "C"
 {
-	KDE_EXPORT Plugin *create_plugin()
+	TDE_EXPORT Plugin *create_plugin()
 	{
 		return new InfraRed();
 	}
diff --git a/noatun/modules/kaiman/noatunui.cpp b/noatun/modules/kaiman/noatunui.cpp
index bc1bceb0..6dc2538e 100644
--- a/noatun/modules/kaiman/noatunui.cpp
+++ b/noatun/modules/kaiman/noatunui.cpp
@@ -2,7 +2,7 @@
 
 extern "C"
 {
-        KDE_EXPORT Plugin *create_plugin()
+        TDE_EXPORT Plugin *create_plugin()
         {
                 return new Kaiman();
         }
diff --git a/noatun/modules/keyz/keyz.cpp b/noatun/modules/keyz/keyz.cpp
index 613274e5..cda022a2 100644
--- a/noatun/modules/keyz/keyz.cpp
+++ b/noatun/modules/keyz/keyz.cpp
@@ -14,7 +14,7 @@
 
 extern "C"
 {
-    KDE_EXPORT Plugin *create_plugin()
+    TDE_EXPORT Plugin *create_plugin()
     {
         return new Keyz();
     }
diff --git a/noatun/modules/kjofol-skin/noatunui.cpp b/noatun/modules/kjofol-skin/noatunui.cpp
index b5be87fd..4541e45b 100644
--- a/noatun/modules/kjofol-skin/noatunui.cpp
+++ b/noatun/modules/kjofol-skin/noatunui.cpp
@@ -2,7 +2,7 @@
 
 extern "C"
 {
-	KDE_EXPORT Plugin *create_plugin()
+	TDE_EXPORT Plugin *create_plugin()
 	{
 		return new KJLoader();
 	}
diff --git a/noatun/modules/marquis/plugin.cpp b/noatun/modules/marquis/plugin.cpp
index 146b0979..e9ccc0e2 100644
--- a/noatun/modules/marquis/plugin.cpp
+++ b/noatun/modules/marquis/plugin.cpp
@@ -2,7 +2,7 @@
 
 extern "C"
 {
-	KDE_EXPORT Plugin *create_plugin()
+	TDE_EXPORT Plugin *create_plugin()
 	{
 		return new Marquis();
 	}
diff --git a/noatun/modules/metatag/metatag.cpp b/noatun/modules/metatag/metatag.cpp
index afb55d2e..1df53d35 100644
--- a/noatun/modules/metatag/metatag.cpp
+++ b/noatun/modules/metatag/metatag.cpp
@@ -24,7 +24,7 @@
 
 extern "C"
 {
-	KDE_EXPORT Plugin *create_plugin()
+	TDE_EXPORT Plugin *create_plugin()
 	{
 		return new MetaTagLoader;
 	}
diff --git a/noatun/modules/monoscope/monoscope.cpp b/noatun/modules/monoscope/monoscope.cpp
index ded4a42d..4c717c42 100644
--- a/noatun/modules/monoscope/monoscope.cpp
+++ b/noatun/modules/monoscope/monoscope.cpp
@@ -9,7 +9,7 @@
 
 extern "C"
 {
-	KDE_EXPORT Plugin *create_plugin()
+	TDE_EXPORT Plugin *create_plugin()
 	{
 		return new Monoscope();
 	}
diff --git a/noatun/modules/net/net.cpp b/noatun/modules/net/net.cpp
index 8d67580e..752b2005 100644
--- a/noatun/modules/net/net.cpp
+++ b/noatun/modules/net/net.cpp
@@ -4,7 +4,7 @@
 
 extern "C"
 {
-	KDE_EXPORT Plugin *create_plugin()
+	TDE_EXPORT Plugin *create_plugin()
 	{
 		return new Net();
 	}
diff --git a/noatun/modules/noatunui/noatunui.cpp b/noatun/modules/noatunui/noatunui.cpp
index adb9534b..081b9158 100644
--- a/noatun/modules/noatunui/noatunui.cpp
+++ b/noatun/modules/noatunui/noatunui.cpp
@@ -2,7 +2,7 @@
 
 extern "C"
 {
-	KDE_EXPORT Plugin *create_plugin()
+	TDE_EXPORT Plugin *create_plugin()
 	{
 		return new MilkChocolate;
 	}
diff --git a/noatun/modules/simple/noatunui.cpp b/noatun/modules/simple/noatunui.cpp
index 3b647e42..ba2ca067 100644
--- a/noatun/modules/simple/noatunui.cpp
+++ b/noatun/modules/simple/noatunui.cpp
@@ -13,5 +13,5 @@
 
 extern "C"
 {
-	KDE_EXPORT Plugin *create_plugin() { return new SimpleUI(); }
+	TDE_EXPORT Plugin *create_plugin() { return new SimpleUI(); }
 }
diff --git a/noatun/modules/splitplaylist/splitplaylist.cpp b/noatun/modules/splitplaylist/splitplaylist.cpp
index fd854311..92e075a5 100644
--- a/noatun/modules/splitplaylist/splitplaylist.cpp
+++ b/noatun/modules/splitplaylist/splitplaylist.cpp
@@ -5,7 +5,7 @@
 
 extern "C"
 {
-	KDE_EXPORT Plugin *create_plugin()
+	TDE_EXPORT Plugin *create_plugin()
 	{
 		return new SplitPlaylist();
 	}
diff --git a/noatun/modules/systray/noatunui.cpp b/noatun/modules/systray/noatunui.cpp
index 76f9af25..3beac24e 100644
--- a/noatun/modules/systray/noatunui.cpp
+++ b/noatun/modules/systray/noatunui.cpp
@@ -2,7 +2,7 @@
 
 extern "C"
 {
-	KDE_EXPORT Plugin *create_plugin()
+	TDE_EXPORT Plugin *create_plugin()
 	{
 		return new NoatunSystray();
 	}
diff --git a/noatun/modules/voiceprint/voiceprint.cpp b/noatun/modules/voiceprint/voiceprint.cpp
index 4cfe5d21..f9f65105 100644
--- a/noatun/modules/voiceprint/voiceprint.cpp
+++ b/noatun/modules/voiceprint/voiceprint.cpp
@@ -9,7 +9,7 @@
 
 extern "C"
 {
-	KDE_EXPORT Plugin *create_plugin()
+	TDE_EXPORT Plugin *create_plugin()
 	{
 		return new VoicePrint();
 	}
diff --git a/noatun/modules/winskin/plugin.cpp b/noatun/modules/winskin/plugin.cpp
index 8be9cc77..ff38a4ab 100644
--- a/noatun/modules/winskin/plugin.cpp
+++ b/noatun/modules/winskin/plugin.cpp
@@ -5,7 +5,7 @@
 #include "waSkin.h"
 
 extern "C" {
-    KDE_EXPORT Plugin *create_plugin() {
+    TDE_EXPORT Plugin *create_plugin() {
 	WaSkin *new_skin = new WaSkin();
 	new WinSkinConfig(new_skin, new_skin->skinManager());
 	return new_skin;
diff --git a/tdeioslave/audiocd/audiocd.cpp b/tdeioslave/audiocd/audiocd.cpp
index efd7dc14..8d477987 100644
--- a/tdeioslave/audiocd/audiocd.cpp
+++ b/tdeioslave/audiocd/audiocd.cpp
@@ -31,7 +31,7 @@ extern "C"
 	void paranoiaCallback(long, int);
 
 	#include <kdemacros.h>
-	KDE_EXPORT int kdemain(int argc, char ** argv);
+	TDE_EXPORT int kdemain(int argc, char ** argv);
 }
 
 #include "audiocd.h"
diff --git a/tdeioslave/audiocd/plugins/flac/encoderflac.cpp b/tdeioslave/audiocd/plugins/flac/encoderflac.cpp
index f8a839c5..acdc8128 100644
--- a/tdeioslave/audiocd/plugins/flac/encoderflac.cpp
+++ b/tdeioslave/audiocd/plugins/flac/encoderflac.cpp
@@ -37,7 +37,7 @@
 
 extern "C"
 {
-  KDE_EXPORT void create_audiocd_encoders(TDEIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders)
+  TDE_EXPORT void create_audiocd_encoders(TDEIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders)
   {
     encoders.append(new EncoderFLAC(slave));
   }
diff --git a/tdeioslave/audiocd/plugins/lame/encoderlame.cpp b/tdeioslave/audiocd/plugins/lame/encoderlame.cpp
index 6b375385..76a19122 100644
--- a/tdeioslave/audiocd/plugins/lame/encoderlame.cpp
+++ b/tdeioslave/audiocd/plugins/lame/encoderlame.cpp
@@ -37,7 +37,7 @@
 
 extern "C"
 {
-	KDE_EXPORT void create_audiocd_encoders(TDEIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders) {
+	TDE_EXPORT void create_audiocd_encoders(TDEIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders) {
 		encoders.append(new EncoderLame(slave));
 	}
 }
diff --git a/tdeioslave/audiocd/plugins/vorbis/encodervorbis.cpp b/tdeioslave/audiocd/plugins/vorbis/encodervorbis.cpp
index ca9e0294..1a11bbb3 100644
--- a/tdeioslave/audiocd/plugins/vorbis/encodervorbis.cpp
+++ b/tdeioslave/audiocd/plugins/vorbis/encodervorbis.cpp
@@ -40,7 +40,7 @@
 
 extern "C"
 {
-  KDE_EXPORT void create_audiocd_encoders(TDEIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders)
+  TDE_EXPORT void create_audiocd_encoders(TDEIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders)
   {
     encoders.append(new EncoderVorbis(slave));
   }
diff --git a/tdeioslave/audiocd/plugins/wav/encoderwav.cpp b/tdeioslave/audiocd/plugins/wav/encoderwav.cpp
index 7bed1765..87487733 100644
--- a/tdeioslave/audiocd/plugins/wav/encoderwav.cpp
+++ b/tdeioslave/audiocd/plugins/wav/encoderwav.cpp
@@ -26,7 +26,7 @@
 
 extern "C"
 {
-  KDE_EXPORT void create_audiocd_encoders(TDEIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders)
+  TDE_EXPORT void create_audiocd_encoders(TDEIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders)
   {
     encoders.append( new EncoderWav(slave));
     encoders.append( new EncoderCda(slave));
diff --git a/tdemid/tdemid_part.h b/tdemid/tdemid_part.h
index 7217a7b7..03c053ef 100644
--- a/tdemid/tdemid_part.h
+++ b/tdemid/tdemid_part.h
@@ -9,7 +9,7 @@ class TDEInstance;
 class KMidBrowserExtension;
 class tdemidClient;
 
-class KDE_EXPORT KMidFactory : public KParts::Factory
+class TDE_EXPORT KMidFactory : public KParts::Factory
 {
   TQ_OBJECT
   
diff --git a/tdemid/tdemidframe.h b/tdemid/tdemidframe.h
index 864be3de..247e6745 100644
--- a/tdemid/tdemidframe.h
+++ b/tdemid/tdemidframe.h
@@ -39,7 +39,7 @@ class TDEToolBar;
 class TQDragEvent;
 class TDEAccel;
 
-class KDE_EXPORT tdemidFrame : public TDEMainWindow
+class TDE_EXPORT tdemidFrame : public TDEMainWindow
 {
     TQ_OBJECT