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

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

47 files changed, 69 insertions, 69 deletions

diff --git a/kicker/applets/clock/init.cpp b/kicker/applets/clock/init.cpp
index 55ee382fd..9ef80514f 100644
--- a/kicker/applets/clock/init.cpp
+++ b/kicker/applets/clock/init.cpp
@@ -68,7 +68,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 extern "C"
 {
-    KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
+    TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
     {
         TDEGlobal::locale()->insertCatalogue("clockapplet");
         TDEGlobal::locale()->insertCatalogue("timezones"); // For time zone translations
diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp
index 3f0ee88a8..876c85926 100644
--- a/kicker/applets/launcher/quicklauncher.cpp
+++ b/kicker/applets/launcher/quicklauncher.cpp
@@ -69,7 +69,7 @@ const ButtonGroup::Index Append=ButtonGroup::Append;
 
 extern "C"
 {
-    KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
+    TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
     {
         TDEGlobal::locale()->insertCatalogue("quicklauncher");
         return new QuickLauncher(configFile, KPanelApplet::Normal,
diff --git a/kicker/applets/lockout/lockout.cpp b/kicker/applets/lockout/lockout.cpp
index fcda62468..f0d6a7e85 100644
--- a/kicker/applets/lockout/lockout.cpp
+++ b/kicker/applets/lockout/lockout.cpp
@@ -46,7 +46,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 extern "C"
 {
-    KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
+    TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
     {
         TDEGlobal::locale()->insertCatalogue("lockout");
         return new Lockout(configFile, parent, "lockout");
diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp
index 89f836492..f1d6c6e2a 100644
--- a/kicker/applets/media/mediaapplet.cpp
+++ b/kicker/applets/media/mediaapplet.cpp
@@ -33,7 +33,7 @@
 
 extern "C"
 {
-    KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString configFile)
+    TDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString configFile)
     {
         TDEGlobal::locale()->insertCatalogue("mediaapplet");
         return new MediaApplet(configFile, KPanelApplet::Normal,
diff --git a/kicker/applets/menu/menuapplet.cpp b/kicker/applets/menu/menuapplet.cpp
index dff03a036..52e3da93b 100644
--- a/kicker/applets/menu/menuapplet.cpp
+++ b/kicker/applets/menu/menuapplet.cpp
@@ -59,7 +59,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 extern "C"
 {
-    KDE_EXPORT KPanelApplet* init( TQWidget* parent_P, const TQString& configFile_P )
+    TDE_EXPORT KPanelApplet* init( TQWidget* parent_P, const TQString& configFile_P )
     {
       TDEGlobal::locale()->insertCatalogue("kmenuapplet");
       return new KickerMenuApplet::Applet( configFile_P, parent_P );
diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp
index 437bae679..003df72fc 100644
--- a/kicker/applets/minipager/pagerapplet.cpp
+++ b/kicker/applets/minipager/pagerapplet.cpp
@@ -73,7 +73,7 @@ static const int bgOffset = 300;
 
 extern "C"
 {
-    KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
+    TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
     {
       TDEGlobal::locale()->insertCatalogue("kminipagerapplet");
       return new KMiniPager(configFile, KPanelApplet::Normal, 0, parent, "kminipagerapplet");
diff --git a/kicker/applets/naughty/NaughtyApplet.cpp b/kicker/applets/naughty/NaughtyApplet.cpp
index 83db26d12..71e08bbe1 100644
--- a/kicker/applets/naughty/NaughtyApplet.cpp
+++ b/kicker/applets/naughty/NaughtyApplet.cpp
@@ -38,7 +38,7 @@
 
 extern "C"
 {
-  KDE_EXPORT KPanelApplet*  init(TQWidget * parent, const TQString & configFile)
+  TDE_EXPORT KPanelApplet*  init(TQWidget * parent, const TQString & configFile)
   {
     TDEGlobal::locale()->insertCatalogue("naughtyapplet");
 
diff --git a/kicker/applets/run/runapplet.cpp b/kicker/applets/run/runapplet.cpp
index 638ce93c8..3d1321140 100644
--- a/kicker/applets/run/runapplet.cpp
+++ b/kicker/applets/run/runapplet.cpp
@@ -42,7 +42,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 extern "C"
 {
-  KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
+  TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
   {
     TDEGlobal::locale()->insertCatalogue("krunapplet");
     return new RunApplet(configFile, KPanelApplet::Stretch, 0, parent, "krunapplet");
diff --git a/kicker/applets/swallow/swallow.cpp b/kicker/applets/swallow/swallow.cpp
index c30a31cff..272096fb8 100644
--- a/kicker/applets/swallow/swallow.cpp
+++ b/kicker/applets/swallow/swallow.cpp
@@ -53,7 +53,7 @@ SwallowApplet * SwallowApplet::self = 0L;
 
 extern "C"
 {
-    KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) {
+    TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) {
 	return new SwallowApplet(configFile, parent, "kswallow applet");
     }
 }
diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp
index 664dd85ad..50781f9cd 100644
--- a/kicker/applets/systemtray/systemtrayapplet.cpp
+++ b/kicker/applets/systemtray/systemtrayapplet.cpp
@@ -63,7 +63,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 extern "C"
 {
-    KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
+    TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
     {
         TDEGlobal::locale()->insertCatalogue("ksystemtrayapplet");
         return new SystemTrayApplet(configFile, KPanelApplet::Normal,
diff --git a/kicker/applets/taskbar/taskbarapplet.cpp b/kicker/applets/taskbar/taskbarapplet.cpp
index 37a78a923..3c9bbead7 100644
--- a/kicker/applets/taskbar/taskbarapplet.cpp
+++ b/kicker/applets/taskbar/taskbarapplet.cpp
@@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 extern "C"
 {
-    KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile )
+    TDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile )
     {
         // FIXME: what about two taskbars? perhaps this should be inserted just once
         TDEGlobal::locale()->insertCatalogue( "ktaskbarapplet" );
diff --git a/kicker/applets/trash/trashapplet.cpp b/kicker/applets/trash/trashapplet.cpp
index 9fe7eccf6..b86b5ef9d 100644
--- a/kicker/applets/trash/trashapplet.cpp
+++ b/kicker/applets/trash/trashapplet.cpp
@@ -31,7 +31,7 @@
 
 extern "C"
 {
-	KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile)
+	TDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile)
 	{
 		TDEGlobal::locale()->insertCatalogue("trashapplet");
 		return new TrashApplet(configFile, KPanelApplet::Normal,
diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp
index a5aeefa57..56d002b7b 100644
--- a/kicker/extensions/dockbar/dockbarextension.cpp
+++ b/kicker/extensions/dockbar/dockbarextension.cpp
@@ -44,7 +44,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 extern "C"
 {
-    KDE_EXPORT KPanelExtension* init(TQWidget *parent, const TQString& configFile)
+    TDE_EXPORT KPanelExtension* init(TQWidget *parent, const TQString& configFile)
     {
 	TDEGlobal::locale()->insertCatalogue("dockbarextension");
 	return new DockBarExtension(configFile, KPanelExtension::Normal,
diff --git a/kicker/extensions/kasbar/kasbar.h b/kicker/extensions/kasbar/kasbar.h
index 5aad7392a..7780775f5 100644
--- a/kicker/extensions/kasbar/kasbar.h
+++ b/kicker/extensions/kasbar/kasbar.h
@@ -72,7 +72,7 @@ typedef TQPtrList<KasItem> KasItemList;
 /**
  * The main view for KasBar.
  */
-class KDE_EXPORT KasBar : public TQWidget
+class TDE_EXPORT KasBar : public TQWidget
 {
    TQ_OBJECT
    TQ_PROPERTY( int maxBoxes READ maxBoxes )
diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp
index 327fd564c..ff29d4dd3 100644
--- a/kicker/extensions/kasbar/kasbarextension.cpp
+++ b/kicker/extensions/kasbar/kasbarextension.cpp
@@ -74,7 +74,7 @@
 
 extern "C"
 {
-   KDE_EXPORT KPanelExtension *init( TQWidget *parent, const TQString& configFile )
+   TDE_EXPORT KPanelExtension *init( TQWidget *parent, const TQString& configFile )
    {
       TDEGlobal::locale()->insertCatalogue("kasbarextension");
       return new KasBarExtension( configFile,
diff --git a/kicker/extensions/kasbar/kasclockitem.h b/kicker/extensions/kasbar/kasclockitem.h
index b6b263318..d81815c7f 100644
--- a/kicker/extensions/kasbar/kasclockitem.h
+++ b/kicker/extensions/kasbar/kasclockitem.h
@@ -6,7 +6,7 @@
 /**
  * An item that displays a clock.
  */
-class KDE_EXPORT KasClockItem : public KasItem
+class TDE_EXPORT KasClockItem : public KasItem
 {
     TQ_OBJECT
 
diff --git a/kicker/extensions/kasbar/kasitem.h b/kicker/extensions/kasbar/kasitem.h
index 508955f9d..0a6dff12e 100644
--- a/kicker/extensions/kasbar/kasitem.h
+++ b/kicker/extensions/kasbar/kasitem.h
@@ -73,7 +73,7 @@ class KasPopup;
  *
  * @author Richard Moore, rich@kde.org
  */
-class KDE_EXPORT KasItem : public TQObject
+class TDE_EXPORT KasItem : public TQObject
 {
     TQ_OBJECT
 
diff --git a/kicker/extensions/kasbar/kasloaditem.h b/kicker/extensions/kasbar/kasloaditem.h
index 91af06080..0c0d179e7 100644
--- a/kicker/extensions/kasbar/kasloaditem.h
+++ b/kicker/extensions/kasbar/kasloaditem.h
@@ -8,7 +8,7 @@
 /**
  * An item that displays the system load.
  */
-class KDE_EXPORT KasLoadItem : public KasItem
+class TDE_EXPORT KasLoadItem : public KasItem
 {
     TQ_OBJECT
 
diff --git a/kicker/extensions/kasbar/kastasker.h b/kicker/extensions/kasbar/kastasker.h
index c05c13bb6..c37ea39ef 100644
--- a/kicker/extensions/kasbar/kastasker.h
+++ b/kicker/extensions/kasbar/kastasker.h
@@ -80,7 +80,7 @@ class KasGrouper;
  *
  * @author Richard Moore, rich@kde.org
  */
-class KDE_EXPORT KasTasker : public KasBar
+class TDE_EXPORT KasTasker : public KasBar
 {
     TQ_OBJECT
     TQ_PROPERTY( bool isTopLevel READ isTopLevel )
diff --git a/kicker/extensions/sidebar/sidebarextension.cpp b/kicker/extensions/sidebar/sidebarextension.cpp
index 142b42ee3..ae30b6174 100644
--- a/kicker/extensions/sidebar/sidebarextension.cpp
+++ b/kicker/extensions/sidebar/sidebarextension.cpp
@@ -31,7 +31,7 @@
 
 extern "C"
 {
-   KDE_EXPORT KPanelExtension *init( TQWidget *parent, const TQString& configFile )
+   TDE_EXPORT KPanelExtension *init( TQWidget *parent, const TQString& configFile )
    {
       TDEGlobal::locale()->insertCatalogue("kickersidebarextension");
       TDEGlobal::locale()->insertCatalogue("konqueror");
diff --git a/kicker/extensions/taskbar/taskbarextension.cpp b/kicker/extensions/taskbar/taskbarextension.cpp
index 56f33c66d..382e42795 100644
--- a/kicker/extensions/taskbar/taskbarextension.cpp
+++ b/kicker/extensions/taskbar/taskbarextension.cpp
@@ -42,7 +42,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 extern "C"
 {
-    KDE_EXPORT KPanelExtension* init( TQWidget *parent, const TQString& configFile )
+    TDE_EXPORT KPanelExtension* init( TQWidget *parent, const TQString& configFile )
     {
         TDEGlobal::locale()->insertCatalogue( "taskbarextension" );
    	return new TaskBarExtension( configFile, KPanelExtension::Stretch,
diff --git a/kicker/kicker/core/main.cpp b/kicker/kicker/core/main.cpp
index 23cefb044..02941c127 100644
--- a/kicker/kicker/core/main.cpp
+++ b/kicker/kicker/core/main.cpp
@@ -54,7 +54,7 @@ static void sighandler(int)
     TQApplication::exit();
 }
 
-extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
+extern "C" TDE_EXPORT int kdemain( int argc, char ** argv )
 {
     {
         TQCString multiHead = getenv("TDE_MULTIHEAD");
diff --git a/kicker/kicker/core/pluginmanager.h b/kicker/kicker/core/pluginmanager.h
index d78d1b07a..f2d2adccf 100644
--- a/kicker/kicker/core/pluginmanager.h
+++ b/kicker/kicker/core/pluginmanager.h
@@ -38,7 +38,7 @@ class KPanelApplet;
 class KPanelExtension;
 class TQPopupMenu;
 
-class KDE_EXPORT PluginManager : public TQObject
+class TDE_EXPORT PluginManager : public TQObject
 {
     TQ_OBJECT
 
diff --git a/kicker/kicker/interfaces/kickoff-search-plugin.h b/kicker/kicker/interfaces/kickoff-search-plugin.h
index fc733f207..39af6a1f6 100644
--- a/kicker/kicker/interfaces/kickoff-search-plugin.h
+++ b/kicker/kicker/interfaces/kickoff-search-plugin.h
@@ -89,7 +89,7 @@ public:
 
 namespace KickoffSearch {
 
-    class KDE_EXPORT Plugin : public TQObject
+    class TDE_EXPORT Plugin : public TQObject
     {
         TQ_OBJECT
 
diff --git a/kicker/kicker/interfaces/kickoffsearchinterface.cpp b/kicker/kicker/interfaces/kickoffsearchinterface.cpp
index 66b1add77..7c77cff0c 100644
--- a/kicker/kicker/interfaces/kickoffsearchinterface.cpp
+++ b/kicker/kicker/interfaces/kickoffsearchinterface.cpp
@@ -19,7 +19,7 @@
 
 #include "kickoffsearchinterface.h"
 
-KDE_EXPORT KickoffSearch::KickoffSearchInterface::KickoffSearchInterface( TQObject* parent, const char* name )
+TDE_EXPORT KickoffSearch::KickoffSearchInterface::KickoffSearchInterface( TQObject* parent, const char* name )
     :TQObject( parent, name )
 {
 }
diff --git a/kicker/kicker/interfaces/kickoffsearchinterface.h b/kicker/kicker/interfaces/kickoffsearchinterface.h
index b8a866c7b..9c2a647af 100644
--- a/kicker/kicker/interfaces/kickoffsearchinterface.h
+++ b/kicker/kicker/interfaces/kickoffsearchinterface.h
@@ -28,7 +28,7 @@ class HitMenuItem;
 
 namespace KickoffSearch
 {
-    class KDE_EXPORT KickoffSearchInterface :public TQObject
+    class TDE_EXPORT KickoffSearchInterface :public TQObject
     {
         TQ_OBJECT
 
diff --git a/kicker/kicker/ui/clicklineedit.h b/kicker/kicker/ui/clicklineedit.h
index 22dc8f904..d6dbcc4f1 100644
--- a/kicker/kicker/ui/clicklineedit.h
+++ b/kicker/kicker/ui/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
   public:
diff --git a/kicker/kicker/ui/service_mnu.h b/kicker/kicker/ui/service_mnu.h
index a52e10d45..be4d47332 100644
--- a/kicker/kicker/ui/service_mnu.h
+++ b/kicker/kicker/ui/service_mnu.h
@@ -48,7 +48,7 @@ typedef TQValueVector<TQPopupMenu*> PopupMenuList;
 class PanelServiceMenu;
 typedef TQMap<PanelServiceMenu*,int> PanelServiceMenuMap;
 
-class KDE_EXPORT PanelServiceMenu : public KPanelMenu
+class TDE_EXPORT PanelServiceMenu : public KPanelMenu
 {
     TQ_OBJECT
 
diff --git a/kicker/libkicker/appletinfo.h b/kicker/libkicker/appletinfo.h
index f89bb6aea..b6b41fbed 100644
--- a/kicker/libkicker/appletinfo.h
+++ b/kicker/libkicker/appletinfo.h
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <kdemacros.h>
 
-class KDE_EXPORT AppletInfo
+class TDE_EXPORT AppletInfo
 {
     public:
         typedef TQValueVector<AppletInfo> List;
diff --git a/kicker/libkicker/global.h b/kicker/libkicker/global.h
index 61ba2f0ea..6520d55c8 100644
--- a/kicker/libkicker/global.h
+++ b/kicker/libkicker/global.h
@@ -37,38 +37,38 @@ namespace KickerLib
 /*
  * Functions to convert between various enums
  */
-KDE_EXPORT KPanelExtension::Position directionToPosition(KPanelApplet::Direction d);
-KDE_EXPORT KPanelExtension::Position directionToPopupPosition(KPanelApplet::Direction d);
-KDE_EXPORT KPanelApplet::Direction positionToDirection(KPanelExtension::Position p);
-KDE_EXPORT KPanelApplet::Direction arrowToDirection(TQt::ArrowType p);
-KDE_EXPORT int sizeValue(KPanelExtension::Size s);
+TDE_EXPORT KPanelExtension::Position directionToPosition(KPanelApplet::Direction d);
+TDE_EXPORT KPanelExtension::Position directionToPopupPosition(KPanelApplet::Direction d);
+TDE_EXPORT KPanelApplet::Direction positionToDirection(KPanelExtension::Position p);
+TDE_EXPORT KPanelApplet::Direction arrowToDirection(TQt::ArrowType p);
+TDE_EXPORT int sizeValue(KPanelExtension::Size s);
 
 /**
  * Pixel sizes for but sizes and margins
  */
-KDE_EXPORT int maxButtonDim();
+TDE_EXPORT int maxButtonDim();
 
 /**
  * Tint the image to reflect the current color scheme
  * Used, for instance, by KMenu side bar
  */
-KDE_EXPORT void colorize(TQImage& image);
+TDE_EXPORT void colorize(TQImage& image);
 
 /**
  * Blend a color rectangle on a painter
  */
-KDE_EXPORT void drawBlendedRect(TQPainter *p, const TQRect &r, const TQColor &color = TQt::black, int alpha = 0x40);
+TDE_EXPORT void drawBlendedRect(TQPainter *p, const TQRect &r, const TQColor &color = TQt::black, int alpha = 0x40);
 
 /**
  * Blend two colours together to get a colour halfway in between
  */
-KDE_EXPORT TQColor blendColors(const TQColor& c1, const TQColor& c2);
+TDE_EXPORT TQColor blendColors(const TQColor& c1, const TQColor& c2);
 
 /**
  * Create or copy .desktop files for use in kicker safely and easily
  */
-KDE_EXPORT TQString copyDesktopFile(const KURL&url);
-KDE_EXPORT TQString newDesktopFile(const KURL&url);
+TDE_EXPORT TQString copyDesktopFile(const KURL&url);
+TDE_EXPORT TQString newDesktopFile(const KURL&url);
 
 
 /**
@@ -80,7 +80,7 @@ KDE_EXPORT TQString newDesktopFile(const KURL&url);
  * This function checks whether that is the case and returns either the
  * original menu or the sub-menu when appropriate.
  */
-KDE_EXPORT TQPopupMenu *reduceMenu(TQPopupMenu *);
+TDE_EXPORT TQPopupMenu *reduceMenu(TQPopupMenu *);
 
 
 /**
@@ -88,7 +88,7 @@ KDE_EXPORT TQPopupMenu *reduceMenu(TQPopupMenu *);
  * direction, the size of the menu, the widget geometry, and a optional
  * point in the local coordinates of the widget.
  */
-KDE_EXPORT TQPoint popupPosition(KPanelApplet::Direction d,
+TDE_EXPORT TQPoint popupPosition(KPanelApplet::Direction d,
                                 const TQWidget* popup,
                                 const TQWidget* source,
                                 const TQPoint& offset = TQPoint(0, 0));
@@ -97,7 +97,7 @@ KDE_EXPORT TQPoint popupPosition(KPanelApplet::Direction d,
  * Calculate an acceptable inverse of the given color wich will be used
  * as the shadow color.
  */
-KDE_EXPORT TQColor shadowColor(const TQColor& c);
+TDE_EXPORT TQColor shadowColor(const TQColor& c);
 
 /**
  * Get an appropriate for a menu in Plasma. As the user may set this size
@@ -105,7 +105,7 @@ KDE_EXPORT TQColor shadowColor(const TQColor& c);
  * @param icon the name of icon requested
  * @return the icon set for the requested icon
  */
-KDE_EXPORT TQIconSet menuIconSet(const TQString& icon);
+TDE_EXPORT TQIconSet menuIconSet(const TQString& icon);
 
 }
 
diff --git a/kicker/libkicker/kickerSettings.kcfgc b/kicker/libkicker/kickerSettings.kcfgc
index 8e0b42d93..1ac8fa567 100644
--- a/kicker/libkicker/kickerSettings.kcfgc
+++ b/kicker/libkicker/kickerSettings.kcfgc
@@ -2,7 +2,7 @@ File=kickerSettings.kcfg
 Singleton=true
 ClassName=KickerSettings
 Mutators=true
-Visibility=KDE_EXPORT
+Visibility=TDE_EXPORT
 IncludeFiles=tqapplication.h
 GlobalEnums=true
 MemberVariables=dpointer
diff --git a/kicker/libkicker/kickertip.h b/kicker/libkicker/kickertip.h
index 7295b4efa..bcc956eee 100644
--- a/kicker/libkicker/kickertip.h
+++ b/kicker/libkicker/kickertip.h
@@ -38,7 +38,7 @@ class TQPaintEvent;
 class TQSimpleRichText;
 class TQTimer;
 
-class KDE_EXPORT KickerTip : public TQWidget
+class TDE_EXPORT KickerTip : public TQWidget
 {
     TQ_OBJECT
 
@@ -58,7 +58,7 @@ public:
             TQMimeSourceFactory* mimeFactory;
     };
 
-    class KDE_EXPORT Client
+    class TDE_EXPORT Client
     {
         public:
             virtual void updateKickerTip(KickerTip::Data&) = 0;
diff --git a/kicker/libkicker/kshadowengine.h b/kicker/libkicker/kshadowengine.h
index 1ddc093ff..9757ebede 100644
--- a/kicker/libkicker/kshadowengine.h
+++ b/kicker/libkicker/kshadowengine.h
@@ -40,7 +40,7 @@ class KShadowSettings;
  * @author laur.ivan@corvil.com
  * @since 3.2
  */
-class KDE_EXPORT KShadowEngine
+class TDE_EXPORT KShadowEngine
 {
 public:
     /// Creates a new shadow engine.
@@ -112,7 +112,7 @@ private:
     void *d;
 };
 
-class KDE_EXPORT KTextShadowEngine : public KShadowEngine
+class TDE_EXPORT KTextShadowEngine : public KShadowEngine
 {
 public:
     KTextShadowEngine();
diff --git a/kicker/libkicker/kshadowsettings.h b/kicker/libkicker/kshadowsettings.h
index e222b964d..774340c01 100644
--- a/kicker/libkicker/kshadowsettings.h
+++ b/kicker/libkicker/kshadowsettings.h
@@ -41,7 +41,7 @@
  * @author laur.ivan@corvil.com
  * @since 3.2
  */
-class KDE_EXPORT KShadowSettings
+class TDE_EXPORT KShadowSettings
 {
 	public:
 		/**
diff --git a/kicker/libkicker/menuinfo.h b/kicker/libkicker/menuinfo.h
index 5925d4826..8d9b2d5e1 100644
--- a/kicker/libkicker/menuinfo.h
+++ b/kicker/libkicker/menuinfo.h
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 class KPanelMenu;
 class TQWidget;
 
-class KDE_EXPORT MenuInfo
+class TDE_EXPORT MenuInfo
 {
 public:
     MenuInfo(const TQString& desktopFile);
diff --git a/kicker/libkicker/panelbutton.h b/kicker/libkicker/panelbutton.h
index cea132680..15193c3bf 100644
--- a/kicker/libkicker/panelbutton.h
+++ b/kicker/libkicker/panelbutton.h
@@ -43,7 +43,7 @@ class KShadowEngine;
  * placed in Kicker's panels. It inherits TQButton, and
  * KickerTip::Client.
  */
-class KDE_EXPORT PanelButton: public TQButton, public KickerTip::Client
+class TDE_EXPORT PanelButton: public TQButton, public KickerTip::Client
 {
     TQ_OBJECT
 
@@ -420,7 +420,7 @@ private:
 /**
  * Base class for panelbuttons which popup a menu
  */
-class KDE_EXPORT PanelPopupButton : public PanelButton
+class TDE_EXPORT PanelPopupButton : public PanelButton
 {
     TQ_OBJECT
 
diff --git a/kicker/libkicker/paneldrag.h b/kicker/libkicker/paneldrag.h
index 6684c32c6..435e06b6d 100644
--- a/kicker/libkicker/paneldrag.h
+++ b/kicker/libkicker/paneldrag.h
@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class BaseContainer;
 
-class KDE_EXPORT PanelDrag : public TQDragObject
+class TDE_EXPORT PanelDrag : public TQDragObject
 {
     public:
         PanelDrag(BaseContainer* container, TQWidget *dragSource);
@@ -48,7 +48,7 @@ class KDE_EXPORT PanelDrag : public TQDragObject
         TQByteArray a;
 };
 
-class KDE_EXPORT AppletInfoDrag : public TQDragObject
+class TDE_EXPORT AppletInfoDrag : public TQDragObject
 {
     public:
         AppletInfoDrag(const AppletInfo& container, TQWidget *dragSource);
diff --git a/kicker/libkicker/panner.h b/kicker/libkicker/panner.h
index 36305bb0c..6d73ba5a8 100644
--- a/kicker/libkicker/panner.h
+++ b/kicker/libkicker/panner.h
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 class TQBoxLayout;
 class TQTimer;
 
-class KDE_EXPORT Panner : public TQWidget
+class TDE_EXPORT Panner : public TQWidget
 {
     TQ_OBJECT
 
diff --git a/kicker/libkicker/simplebutton.h b/kicker/libkicker/simplebutton.h
index 7f1718273..d923eef55 100644
--- a/kicker/libkicker/simplebutton.h
+++ b/kicker/libkicker/simplebutton.h
@@ -26,7 +26,7 @@
 
 #include <kdemacros.h>
 
-class KDE_EXPORT SimpleButton : public TQButton
+class TDE_EXPORT SimpleButton : public TQButton
 {
     TQ_OBJECT
 
@@ -61,7 +61,7 @@ class KDE_EXPORT SimpleButton : public TQButton
         SimpleButtonPrivate* d;
 };
 
-class KDE_EXPORT SimpleArrowButton: public SimpleButton
+class TDE_EXPORT SimpleArrowButton: public SimpleButton
 {
     TQ_OBJECT
     
diff --git a/kicker/menuext/tom/tom.cpp b/kicker/menuext/tom/tom.cpp
index 973c52ee9..3e97cf385 100644
--- a/kicker/menuext/tom/tom.cpp
+++ b/kicker/menuext/tom/tom.cpp
@@ -62,7 +62,7 @@ const int destMenuTitleID = 10001;
 
 extern "C"
 {
-    KDE_EXPORT void* init_kickermenu_tom()
+    TDE_EXPORT void* init_kickermenu_tom()
     {
         TDEGlobal::locale()->insertCatalogue("libkickermenu_tom");
         return new TOMFactory;
diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp
index daf6312d9..9c0bdbfb4 100644
--- a/kicker/proxy/appletproxy.cpp
+++ b/kicker/proxy/appletproxy.cpp
@@ -68,7 +68,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( "kicker", I18N_NOOP("Panel applet proxy.")
                           , "v0.1.0"
diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp
index 4168bc14a..9a255ab26 100644
--- a/kicker/proxy/extensionproxy.cpp
+++ b/kicker/proxy/extensionproxy.cpp
@@ -54,7 +54,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( "extensionproxy", I18N_NOOP("Panel Extension Proxy")
                           , "v0.1.0"
diff --git a/kicker/taskbar/taskbarcontainer.h b/kicker/taskbar/taskbarcontainer.h
index a8b078d67..006724e30 100644
--- a/kicker/taskbar/taskbarcontainer.h
+++ b/kicker/taskbar/taskbarcontainer.h
@@ -36,7 +36,7 @@ class KWindowListMenu;
 class TaskBar;
 class TaskBarSettings;
 
-class KDE_EXPORT TaskBarContainer : public TQFrame, public DCOPObject
+class TDE_EXPORT TaskBarContainer : public TQFrame, public DCOPObject
 {
     TQ_OBJECT
     K_DCOP
diff --git a/kicker/taskbar/taskbarsettings.kcfgc b/kicker/taskbar/taskbarsettings.kcfgc
index c5219f64e..1e6a7c8cc 100644
--- a/kicker/taskbar/taskbarsettings.kcfgc
+++ b/kicker/taskbar/taskbarsettings.kcfgc
@@ -2,6 +2,6 @@ File=taskbar.kcfg
 Singleton=false
 ClassName=TaskBarSettings
 Mutators=true
-Visibility=KDE_EXPORT
+Visibility=TDE_EXPORT
 SetUserTexts=true
 GlobalEnums=true
diff --git a/kicker/taskmanager/tasklmbmenu.h b/kicker/taskmanager/tasklmbmenu.h
index 4c20819b6..f0ff70afc 100644
--- a/kicker/taskmanager/tasklmbmenu.h
+++ b/kicker/taskmanager/tasklmbmenu.h
@@ -51,7 +51,7 @@ private:
 
 /*****************************************************************************/
 
-class KDE_EXPORT TaskLMBMenu : public TQPopupMenu
+class TDE_EXPORT TaskLMBMenu : public TQPopupMenu
 {
     TQ_OBJECT
 
diff --git a/kicker/taskmanager/taskmanager.h b/kicker/taskmanager/taskmanager.h
index 3771d29a6..289c6af55 100644
--- a/kicker/taskmanager/taskmanager.h
+++ b/kicker/taskmanager/taskmanager.h
@@ -68,7 +68,7 @@ typedef TQValueList<WId> WindowList;
  * @see TaskManager
  * @see KWinModule
  */
-class KDE_EXPORT Task: public TQObject, public TDEShared
+class TDE_EXPORT Task: public TQObject, public TDEShared
 {
     TQ_OBJECT
     TQ_PROPERTY( TQString visibleIconicName READ visibleIconicName )
@@ -483,7 +483,7 @@ private:
 /**
  * Provids a drag object for tasks across desktops.
  */
-class KDE_EXPORT TaskDrag : public TQStoredDrag
+class TDE_EXPORT TaskDrag : public TQStoredDrag
 {
 public:
     /**
@@ -511,7 +511,7 @@ public:
  *
  * @see TaskManager
  */
-class KDE_EXPORT Startup: public TQObject, public TDEShared
+class TDE_EXPORT Startup: public TQObject, public TDEShared
 {
     TQ_OBJECT
     TQ_PROPERTY( TQString text READ text )
@@ -565,7 +565,7 @@ private:
  * @see Startup
  * @see KWinModule
  */
-class KDE_EXPORT TaskManager : public TQObject
+class TDE_EXPORT TaskManager : public TQObject
 {
     TQ_OBJECT
     TQ_PROPERTY( int currentDesktop READ currentDesktop )
diff --git a/kicker/taskmanager/taskrmbmenu.h b/kicker/taskmanager/taskrmbmenu.h
index a73d83d3a..b82d0338d 100644
--- a/kicker/taskmanager/taskrmbmenu.h
+++ b/kicker/taskmanager/taskrmbmenu.h
@@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <tqpopupmenu.h>
 
-class KDE_EXPORT TaskRMBMenu : public TQPopupMenu
+class TDE_EXPORT TaskRMBMenu : public TQPopupMenu
 {
 	TQ_OBJECT