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

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

32 files changed, 96 insertions, 96 deletions

diff --git a/kcontrol/access/kcmaccess.cpp b/kcontrol/access/kcmaccess.cpp
index 5c6cc68b4..374bec295 100644
--- a/kcontrol/access/kcmaccess.cpp
+++ b/kcontrol/access/kcmaccess.cpp
@@ -799,7 +799,7 @@ void KAccessConfig::checkAccess()
 
 extern "C"
 {
-  KDE_EXPORT TDECModule *create_access(TQWidget *parent, const char *name)
+  TDE_EXPORT TDECModule *create_access(TQWidget *parent, const char *name)
   {
     return new KAccessConfig(parent, name);
   }
@@ -807,7 +807,7 @@ extern "C"
   /* This one gets called by kcminit
 
    */
-  KDE_EXPORT void init_access()
+  TDE_EXPORT void init_access()
   {
     TDEConfig *config = new TDEConfig("kaccessrc", true, false);
     bool run = needToRunKAccessDaemon( config );
diff --git a/kcontrol/access/main.cpp b/kcontrol/access/main.cpp
index aede70579..11aedc50b 100644
--- a/kcontrol/access/main.cpp
+++ b/kcontrol/access/main.cpp
@@ -4,7 +4,7 @@
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
 
-extern "C" KDE_EXPORT int kdemain(int argc, char * argv[] )
+extern "C" TDE_EXPORT int kdemain(int argc, char * argv[] )
 {
   TDEAboutData about(I18N_NOOP("kaccess"), I18N_NOOP("TDE Accessibility Tool"),
                   0, 0, TDEAboutData::License_GPL,
diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp
index 5f78072a1..b3e02595d 100644
--- a/kcontrol/arts/arts.cpp
+++ b/kcontrol/arts/arts.cpp
@@ -53,9 +53,9 @@
 #include "arts.h"
 
 extern "C" {
-	KDE_EXPORT void init_arts();
+	TDE_EXPORT void init_arts();
 
-    KDE_EXPORT TDECModule *create_arts(TQWidget *parent, const char* /*name*/)
+    TDE_EXPORT TDECModule *create_arts(TQWidget *parent, const char* /*name*/)
 	{
 		TDEGlobal::locale()->insertCatalogue("kcmarts");
 		return new KArtsModule(parent, "kcmarts" );
diff --git a/kcontrol/bell/bell.cpp b/kcontrol/bell/bell.cpp
index 8abc606db..0b956523b 100644
--- a/kcontrol/bell/bell.cpp
+++ b/kcontrol/bell/bell.cpp
@@ -40,12 +40,12 @@
 
 extern "C"
 {
-  KDE_EXPORT TDECModule *create_bell(TQWidget *parent, const char *)
+  TDE_EXPORT TDECModule *create_bell(TQWidget *parent, const char *)
   {
     return new KBellConfig(parent, "kcmbell");
   }
 
-  KDE_EXPORT void init_bell()
+  TDE_EXPORT void init_bell()
   {
     XKeyboardState kbd;
     XKeyboardControl kbdc;
diff --git a/kcontrol/componentchooser/kcm_componentchooser.cpp b/kcontrol/componentchooser/kcm_componentchooser.cpp
index 6c71f8a42..279a16fc1 100644
--- a/kcontrol/componentchooser/kcm_componentchooser.cpp
+++ b/kcontrol/componentchooser/kcm_componentchooser.cpp
@@ -55,7 +55,7 @@ void KCMComponentChooser::defaults(){
 
 extern "C"
 {
-    KDE_EXPORT TDECModule *create_componentchooser( TQWidget *parent, const char * )
+    TDE_EXPORT TDECModule *create_componentchooser( TQWidget *parent, const char * )
     {
         TDEGlobal::locale()->insertCatalogue("kcmcomponentchooser");
         return new KCMComponentChooser( parent, "kcmcomponentchooser" );
diff --git a/kcontrol/energy/energy.cpp b/kcontrol/energy/energy.cpp
index f967387e8..04f5c8c17 100644
--- a/kcontrol/energy/energy.cpp
+++ b/kcontrol/energy/energy.cpp
@@ -80,11 +80,11 @@ static const int DFLT_OFF   = 60;
 
 extern "C" {
 
-    KDE_EXPORT TDECModule *create_energy(TQWidget *parent, char *) {
+    TDE_EXPORT TDECModule *create_energy(TQWidget *parent, char *) {
 	return new KEnergy(parent, "kcmenergy");
     }
 
-    KDE_EXPORT void init_energy() {
+    TDE_EXPORT void init_energy() {
 #ifdef HAVE_DPMS
         TDEConfig *cfg = new TDEConfig("kcmdisplayrc", true /*readonly*/, false /*no globals*/);
         cfg->setGroup("DisplayEnergy");
diff --git a/kcontrol/filetypes/control.cpp b/kcontrol/filetypes/control.cpp
index 5a0fd097b..ef46b8b8b 100644
--- a/kcontrol/filetypes/control.cpp
+++ b/kcontrol/filetypes/control.cpp
@@ -2,7 +2,7 @@
 
 extern "C"
 {
-	  KDE_EXPORT TDECModule *create_filetypes(TQWidget *parent, const char *)
+	  TDE_EXPORT TDECModule *create_filetypes(TQWidget *parent, const char *)
           {
         return new FileTypesView(parent, "filetypes");
 	  }
diff --git a/kcontrol/info/main.cpp b/kcontrol/info/main.cpp
index 780b6532e..85ef53687 100644
--- a/kcontrol/info/main.cpp
+++ b/kcontrol/info/main.cpp
@@ -34,7 +34,7 @@
 extern "C"
 {
 
-  KDE_EXPORT TDECModule *create_cpu(TQWidget *parent, const char * /*name*/)
+  TDE_EXPORT TDECModule *create_cpu(TQWidget *parent, const char * /*name*/)
   { 
 #ifdef INFO_CPU_AVAILABLE
     return new KInfoListWidget(i18n("Processor(s)"), parent, "kcminfo", GetInfo_CPU);
@@ -43,7 +43,7 @@ extern "C"
 #endif
   }
 
-  KDE_EXPORT TDECModule *create_irq(TQWidget *parent, const char * /*name*/)
+  TDE_EXPORT TDECModule *create_irq(TQWidget *parent, const char * /*name*/)
   { 
 #ifdef INFO_IRQ_AVAILABLE
     return new KInfoListWidget(i18n("Interrupt"), parent, "kcminfo", GetInfo_IRQ);
@@ -52,7 +52,7 @@ extern "C"
 #endif
   }
 
-  KDE_EXPORT TDECModule *create_pci(TQWidget *parent, const char * /*name*/)
+  TDE_EXPORT TDECModule *create_pci(TQWidget *parent, const char * /*name*/)
   { 
 #ifdef INFO_PCI_AVAILABLE
     return new KInfoListWidget(i18n("PCI"), parent, "kcminfo", GetInfo_PCI);
@@ -61,7 +61,7 @@ extern "C"
 #endif
   }
 
-  KDE_EXPORT TDECModule *create_dma(TQWidget *parent, const char * /*name*/)
+  TDE_EXPORT TDECModule *create_dma(TQWidget *parent, const char * /*name*/)
   { 
 #ifdef INFO_DMA_AVAILABLE
     return new KInfoListWidget(i18n("DMA-Channel"), parent, "kcminfo", GetInfo_DMA);
@@ -70,7 +70,7 @@ extern "C"
 #endif
   }
 
-  KDE_EXPORT TDECModule *create_ioports(TQWidget *parent, const char * /*name*/)
+  TDE_EXPORT TDECModule *create_ioports(TQWidget *parent, const char * /*name*/)
   { 
 #ifdef INFO_IOPORTS_AVAILABLE
     return new KInfoListWidget(i18n("I/O-Port"), parent, "kcminfo", GetInfo_IO_Ports);
@@ -79,7 +79,7 @@ extern "C"
 #endif
   }
 
-  KDE_EXPORT TDECModule *create_sound(TQWidget *parent, const char * /*name*/)
+  TDE_EXPORT TDECModule *create_sound(TQWidget *parent, const char * /*name*/)
   { 
 #ifdef INFO_SOUND_AVAILABLE
     return new KInfoListWidget(i18n("Soundcard"), parent, "kcminfo", GetInfo_Sound);
@@ -88,7 +88,7 @@ extern "C"
 #endif
   }
 
-  KDE_EXPORT TDECModule *create_scsi(TQWidget *parent, const char * /*name*/)
+  TDE_EXPORT TDECModule *create_scsi(TQWidget *parent, const char * /*name*/)
   { 
 #ifdef INFO_SCSI_AVAILABLE
     return new KInfoListWidget(i18n("SCSI"), parent, "kcminfo", GetInfo_SCSI);
@@ -97,7 +97,7 @@ extern "C"
 #endif
   }
 
-  KDE_EXPORT TDECModule *create_devices(TQWidget *parent, const char * /*name*/)
+  TDE_EXPORT TDECModule *create_devices(TQWidget *parent, const char * /*name*/)
   { 
 #ifdef INFO_DEVICES_AVAILABLE
     return new KInfoListWidget(i18n("Devices"), parent, "kcminfo", GetInfo_Devices);
@@ -106,7 +106,7 @@ extern "C"
 #endif
   }
 
-  KDE_EXPORT TDECModule *create_partitions(TQWidget *parent, const char * /*name*/)
+  TDE_EXPORT TDECModule *create_partitions(TQWidget *parent, const char * /*name*/)
   { 
 #ifdef INFO_PARTITIONS_AVAILABLE
     return new KInfoListWidget(i18n("Partitions"), parent, "kcminfo", GetInfo_Partitions);
@@ -115,7 +115,7 @@ extern "C"
 #endif
   }
 
-  KDE_EXPORT TDECModule *create_xserver(TQWidget *parent, const char * /*name*/)
+  TDE_EXPORT TDECModule *create_xserver(TQWidget *parent, const char * /*name*/)
   { 
 #ifdef INFO_XSERVER_AVAILABLE
     return new KInfoListWidget(i18n("X-Server"), parent, "kcminfo", GetInfo_XServer_and_Video);
@@ -124,12 +124,12 @@ extern "C"
 #endif
   }
 
-  KDE_EXPORT TDECModule *create_memory(TQWidget *parent, const char * /*name*/)
+  TDE_EXPORT TDECModule *create_memory(TQWidget *parent, const char * /*name*/)
   { 
     return new KMemoryWidget(parent, "kcminfo");
   }
 
-  KDE_EXPORT TDECModule *create_opengl(TQWidget *parent, const char * )
+  TDE_EXPORT TDECModule *create_opengl(TQWidget *parent, const char * )
   { 
 #ifdef INFO_OPENGL_AVAILABLE
     return new KInfoListWidget(i18n("OpenGL"), parent, "kcminfo", GetInfo_OpenGL);
@@ -139,7 +139,7 @@ extern "C"
   }
 
 /* create_cdinfo function for CD-ROM Info ~Jahshan */
-  KDE_EXPORT TDECModule *create_cdinfo(TQWidget *parent, const char * /*name*/)
+  TDE_EXPORT TDECModule *create_cdinfo(TQWidget *parent, const char * /*name*/)
   { 
 #ifdef INFO_CD_ROM_AVAILABLE
     return new KInfoListWidget(i18n("CD-ROM Info"), parent, "kcminfo", GetInfo_CD_ROM);
diff --git a/kcontrol/input/main.cpp b/kcontrol/input/main.cpp
index 254f2ee5c..d72dd0aa6 100644
--- a/kcontrol/input/main.cpp
+++ b/kcontrol/input/main.cpp
@@ -41,12 +41,12 @@
 
 extern "C"
 {
-  KDE_EXPORT TDECModule *create_mouse(TQWidget *parent, const char *)
+  TDE_EXPORT TDECModule *create_mouse(TQWidget *parent, const char *)
   {
     return new MouseConfig(parent, "kcminput");
   }
 
-  KDE_EXPORT void init_mouse()
+  TDE_EXPORT void init_mouse()
   {
     TDEConfig *config = new TDEConfig("kcminputrc", true, false); // Read-only, no globals
     MouseSettings settings;
diff --git a/kcontrol/joystick/joystick.cpp b/kcontrol/joystick/joystick.cpp
index d0521d81e..05e431af9 100644
--- a/kcontrol/joystick/joystick.cpp
+++ b/kcontrol/joystick/joystick.cpp
@@ -35,7 +35,7 @@ K_EXPORT_COMPONENT_FACTORY(kcm_joystick, JoystickFactory("joystick"))
 
 extern "C"
 {
-  KDE_EXPORT bool test_joystick()
+  TDE_EXPORT bool test_joystick()
   { /* Code stolen from JoyWidget::init() */
     int i;
     char dev[30];
diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp
index aa5227532..7d709bce5 100644
--- a/kcontrol/kcontrol/main.cpp
+++ b/kcontrol/kcontrol/main.cpp
@@ -98,7 +98,7 @@ KControlApp::~KControlApp()
   delete toplevel;
 }
 
-extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
+extern "C" TDE_EXPORT int kdemain(int argc, char *argv[])
 {
   TDELocale::setMainCatalogue("kcontrol");
   TDEAboutData aboutKControl( "kcontrol", I18N_NOOP("Trinity Control Center"),
diff --git a/kcontrol/keys/main.cpp b/kcontrol/keys/main.cpp
index de0cc2dbc..bba777adb 100644
--- a/kcontrol/keys/main.cpp
+++ b/kcontrol/keys/main.cpp
@@ -146,7 +146,7 @@ TQString KeyModule::handbookSection() const
 
 extern "C"
 {
-  KDE_EXPORT TDECModule *create_keys(TQWidget *parent, const char * /*name*/)
+  TDE_EXPORT TDECModule *create_keys(TQWidget *parent, const char * /*name*/)
   {
 	// What does this do?  Why not insert klipper and kxkb, too? --ellis, 2002/01/15
 	TDEGlobal::locale()->insertCatalogue("twin");
@@ -155,7 +155,7 @@ extern "C"
 	return new KeyModule(parent, "kcmkeys");
   }
 
-  KDE_EXPORT void initModifiers()
+  TDE_EXPORT void initModifiers()
   {
 	kdDebug(125) << "KeyModule::initModifiers()" << endl;
 
@@ -165,7 +165,7 @@ extern "C"
 		ModifiersModule::setupMacModifierKeys();
   }
 
-  KDE_EXPORT void init_keys()
+  TDE_EXPORT void init_keys()
   {
 	kdDebug(125) << "KeyModule::init()\n";
 
diff --git a/kcontrol/kicker/main.cpp b/kcontrol/kicker/main.cpp
index a0e14ba17..db7d5339f 100644
--- a/kcontrol/kicker/main.cpp
+++ b/kcontrol/kicker/main.cpp
@@ -371,7 +371,7 @@ TDEAboutData *KickerConfig::aboutData()
 
 extern "C"
 {
-    KDE_EXPORT TDECModule *create_kicker(TQWidget *parent, const char *name)
+    TDE_EXPORT TDECModule *create_kicker(TQWidget *parent, const char *name)
     {
         TDECModuleContainer *container = new TDECModuleContainer(parent, "kcmkicker");
         container->addModule("kicker_config_arrangement");
@@ -381,26 +381,26 @@ extern "C"
         return container;
     }
 
-    KDE_EXPORT TDECModule *create_kicker_arrangement(TQWidget *parent, const char * /*name*/)
+    TDE_EXPORT TDECModule *create_kicker_arrangement(TQWidget *parent, const char * /*name*/)
     {
         TDEGlobal::dirs()->addResourceType("extensions", TDEStandardDirs::kde_default("data") +
                                          "kicker/extensions");
         return new PositionConfig(parent, "kcmkicker");
     }
 
-    KDE_EXPORT TDECModule *create_kicker_hiding(TQWidget *parent, const char * /*name*/)
+    TDE_EXPORT TDECModule *create_kicker_hiding(TQWidget *parent, const char * /*name*/)
     {
         TDEGlobal::dirs()->addResourceType("extensions", TDEStandardDirs::kde_default("data") +
                                          "kicker/extensions");
         return new HidingConfig(parent, "kcmkicker");
     }
 
-    KDE_EXPORT TDECModule *create_kicker_menus(TQWidget *parent, const char * /*name*/)
+    TDE_EXPORT TDECModule *create_kicker_menus(TQWidget *parent, const char * /*name*/)
     {
         return new MenuConfig(parent, "kcmkicker");
     }
 
-    KDE_EXPORT TDECModule *create_kicker_appearance(TQWidget *parent, const char * /*name*/)
+    TDE_EXPORT TDECModule *create_kicker_appearance(TQWidget *parent, const char * /*name*/)
     {
         KImageIO::registerFormats();
         TDEGlobal::dirs()->addResourceType("tiles", TDEStandardDirs::kde_default("data") +
diff --git a/kcontrol/konq/desktop.cpp b/kcontrol/konq/desktop.cpp
index 5125a03f1..6ea6178db 100644
--- a/kcontrol/konq/desktop.cpp
+++ b/kcontrol/konq/desktop.cpp
@@ -39,7 +39,7 @@
 
 extern "C"
 {
-  KDE_EXPORT TDECModule *create_virtualdesktops(TQWidget *parent, const char * /*name*/)
+  TDE_EXPORT TDECModule *create_virtualdesktops(TQWidget *parent, const char * /*name*/)
   {
     return new KDesktopConfig(parent, "kcmkonq");
   }
diff --git a/kcontrol/konq/main.cpp b/kcontrol/konq/main.cpp
index 5ca7cb4ad..c4e3ea506 100644
--- a/kcontrol/konq/main.cpp
+++ b/kcontrol/konq/main.cpp
@@ -48,48 +48,48 @@ static TQCString configname()
 
 extern "C"
 {
-  KDE_EXPORT TDECModule *create_browser(TQWidget *parent, const char *name)
+  TDE_EXPORT TDECModule *create_browser(TQWidget *parent, const char *name)
   {
     TDEConfig *config = new TDEConfig("konquerorrc", false, true);
     return new KBrowserOptions(config, "FMSettings", parent, name);
   }
 
-  KDE_EXPORT TDECModule *create_behavior(TQWidget *parent, const char *name)
+  TDE_EXPORT TDECModule *create_behavior(TQWidget *parent, const char *name)
   {
     TDEConfig *config = new TDEConfig("konquerorrc", false, true);
     return new KBehaviourOptions(config, "FMSettings", parent, name);
   }
 
-  KDE_EXPORT TDECModule *create_appearance(TQWidget *parent, const char *name)
+  TDE_EXPORT TDECModule *create_appearance(TQWidget *parent, const char *name)
   {
     TDEConfig *config = new TDEConfig("konquerorrc", false, true);
     return new KonqFontOptions(config, "FMSettings", false, parent, name);
   }
 
-  KDE_EXPORT TDECModule *create_previews(TQWidget *parent, const char *name)
+  TDE_EXPORT TDECModule *create_previews(TQWidget *parent, const char *name)
   {
     return new KPreviewOptions(parent, name);
   }
 
-  KDE_EXPORT TDECModule *create_dbehavior(TQWidget *parent, const char* /*name*/)
+  TDE_EXPORT TDECModule *create_dbehavior(TQWidget *parent, const char* /*name*/)
   {
     TDEConfig *config = new TDEConfig(configname(), false, false);
     return new DesktopBehaviorModule(config, parent);
   }
 
-  KDE_EXPORT TDECModule *create_dappearance(TQWidget *parent, const char* /*name*/)
+  TDE_EXPORT TDECModule *create_dappearance(TQWidget *parent, const char* /*name*/)
   {
     TDEConfig *config = new TDEConfig(configname(), false, false);
     return new KonqFontOptions(config, "FMSettings", true, parent);
   }
 
-  KDE_EXPORT TDECModule *create_dpath(TQWidget *parent, const char* /*name*/)
+  TDE_EXPORT TDECModule *create_dpath(TQWidget *parent, const char* /*name*/)
   {
     //TDEConfig *config = new TDEConfig(configname(), false, false);
     return new DesktopPathConfig(parent);
   }
 
-  KDE_EXPORT TDECModule *create_ddesktop(TQWidget *parent, const char* /*name*/)
+  TDE_EXPORT TDECModule *create_ddesktop(TQWidget *parent, const char* /*name*/)
   {
     return new KDesktopConfig(parent, "VirtualDesktops");
   }
diff --git a/kcontrol/konqhtml/main.cpp b/kcontrol/konqhtml/main.cpp
index 0794b390b..3f407fa23 100644
--- a/kcontrol/konqhtml/main.cpp
+++ b/kcontrol/konqhtml/main.cpp
@@ -44,37 +44,37 @@
 
 extern "C"
 {
-	KDE_EXPORT TDECModule *create_tdehtml_behavior(TQWidget *parent, const char *name)
+	TDE_EXPORT TDECModule *create_tdehtml_behavior(TQWidget *parent, const char *name)
 	{
 		TDEConfig *c = new TDEConfig( "konquerorrc", false, false );
 		return new KMiscHTMLOptions(c, "HTML Settings", parent, name);
 	}
 
-	KDE_EXPORT TDECModule *create_tdehtml_fonts(TQWidget *parent, const char *name)
+	TDE_EXPORT TDECModule *create_tdehtml_fonts(TQWidget *parent, const char *name)
 	{
 		TDEConfig *c = new TDEConfig( "konquerorrc", false, false );
 		return new KAppearanceOptions(c, "HTML Settings", parent, name);
 	}
 
-	KDE_EXPORT TDECModule *create_tdehtml_java_js(TQWidget *parent, const char* /*name*/)
+	TDE_EXPORT TDECModule *create_tdehtml_java_js(TQWidget *parent, const char* /*name*/)
 	{
 		TDEConfig *c = new TDEConfig( "konquerorrc", false, false );
 		return new KJSParts(c, parent, "kcmkonqhtml");
 	}
 
-	KDE_EXPORT TDECModule *create_tdehtml_plugins(TQWidget *parent, const char *name)
+	TDE_EXPORT TDECModule *create_tdehtml_plugins(TQWidget *parent, const char *name)
 	{
 		TDEConfig *c = new TDEConfig( "konquerorrc", false, false );
 		return new KPluginOptions(c, "Java/JavaScript Settings", parent, name);
 	}
 
-  KDE_EXPORT TDECModule *create_tdehtml_filter(TQWidget *parent, const char *name )
+  TDE_EXPORT TDECModule *create_tdehtml_filter(TQWidget *parent, const char *name )
   {
     TDEConfig *c = new TDEConfig( "tdehtmlrc", false, false );
     return new KCMFilter(c, "Filter Settings", parent, name);
   }
 
-  KDE_EXPORT TDECModule *create_tdehtml_userinterface(TQWidget *parent, const char *name )
+  TDE_EXPORT TDECModule *create_tdehtml_userinterface(TQWidget *parent, const char *name )
   {
     TDEConfig *c = new TDEConfig( "konquerorrc", false, false );
     return new userInterConfig(c, "FMSettings", parent, name);
diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp
index 4d3791511..dec553976 100644
--- a/kcontrol/kthememanager/kthememanager.cpp
+++ b/kcontrol/kthememanager/kthememanager.cpp
@@ -413,7 +413,7 @@ void kthememanager::updatePreview( const TQString & pixFile )
 
 extern "C"
 {
-    KDE_EXPORT TDECModule *create_kthememanager(TQWidget *parent, const char *)
+    TDE_EXPORT TDECModule *create_kthememanager(TQWidget *parent, const char *)
     {
         TDEGlobal::locale()->insertCatalogue( "kthememanager" );
         return new kthememanager( parent, "kthememanager" );
diff --git a/kcontrol/locale/main.cpp b/kcontrol/locale/main.cpp
index 634c3bd45..8842b3852 100644
--- a/kcontrol/locale/main.cpp
+++ b/kcontrol/locale/main.cpp
@@ -22,7 +22,7 @@
 #include "toplevel.h"
 
 extern "C" {
-  KDE_EXPORT void *init_kcm_locale() {
+  TDE_EXPORT void *init_kcm_locale() {
     TDELocale::setMainCatalogue("kcmlocale");
     return new TDELocaleFactory("kcmlocale");
   }
diff --git a/kcontrol/performance/kcmperformance.cpp b/kcontrol/performance/kcmperformance.cpp
index c6d1d9068..328e55294 100644
--- a/kcontrol/performance/kcmperformance.cpp
+++ b/kcontrol/performance/kcmperformance.cpp
@@ -28,12 +28,12 @@
 
 extern "C"
 {
-    KDE_EXPORT TDECModule* create_performance( TQWidget* parent_P, const char* name_P )
+    TDE_EXPORT TDECModule* create_performance( TQWidget* parent_P, const char* name_P )
     {
     return new KCMPerformance::Config( parent_P, name_P );
     }
 
-    KDE_EXPORT TDECModule* create_konqueror( TQWidget* parent_P, const char* name_P )
+    TDE_EXPORT TDECModule* create_konqueror( TQWidget* parent_P, const char* name_P )
     {
     return new KCMPerformance::KonquerorConfig( parent_P, name_P );
     }
diff --git a/kcontrol/privacy/privacy.cpp b/kcontrol/privacy/privacy.cpp
index 0aa05a90e..87247547e 100644
--- a/kcontrol/privacy/privacy.cpp
+++ b/kcontrol/privacy/privacy.cpp
@@ -318,7 +318,7 @@ void Privacy::cleanup()
 extern "C"
 {
 
-  KDE_EXPORT TDECModule *create_privacy(TQWidget *parent, const char * /*name*/)
+  TDE_EXPORT TDECModule *create_privacy(TQWidget *parent, const char * /*name*/)
   {
     TDEGlobal::locale()->insertCatalogue("privacy");
     return new Privacy(parent, "Privacy");
diff --git a/kcontrol/randr/tderandrmodule.cpp b/kcontrol/randr/tderandrmodule.cpp
index f13a863b9..b8a53ce89 100644
--- a/kcontrol/randr/tderandrmodule.cpp
+++ b/kcontrol/randr/tderandrmodule.cpp
@@ -48,12 +48,12 @@ K_EXPORT_COMPONENT_FACTORY (kcm_randr, KSSFactory("tderandr") )
 extern "C"
 
 {
-	KDE_EXPORT void init_randr()
+	TDE_EXPORT void init_randr()
 	{
 		KRandRModule::performApplyOnStartup();
 	}
 
-	KDE_EXPORT bool test_randr()
+	TDE_EXPORT bool test_randr()
 	{
 	        int eventBase, errorBase;
 		if( XRRQueryExtension(tqt_xdisplay(), &eventBase, &errorBase ) )
diff --git a/kcontrol/smartcard/smartcard.cpp b/kcontrol/smartcard/smartcard.cpp
index 1e53bc3d9..8c58b1e8f 100644
--- a/kcontrol/smartcard/smartcard.cpp
+++ b/kcontrol/smartcard/smartcard.cpp
@@ -372,12 +372,12 @@ TQString KSmartcardConfig::quickHelp() const
 
 extern "C"
 {
-  KDE_EXPORT TDECModule *create_smartcard(TQWidget *parent, const char *)
+  TDE_EXPORT TDECModule *create_smartcard(TQWidget *parent, const char *)
   {
     return new KSmartcardConfig(parent, "kcmsmartcard");
   }
 
-  KDE_EXPORT void init_smartcard()
+  TDE_EXPORT void init_smartcard()
   {
     TDEConfig *config = new TDEConfig("ksmartcardrc", false, false);
     bool start = config->readBoolEntry("Enable Support", false);
diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp
index 27a599b09..9dd53616c 100644
--- a/kcontrol/style/kcmstyle.cpp
+++ b/kcontrol/style/kcmstyle.cpp
@@ -73,13 +73,13 @@
 // Danimo: Why do we use the old interface?!
 extern "C"
 {
-    KDE_EXPORT TDECModule *create_style(TQWidget *parent, const char*)
+    TDE_EXPORT TDECModule *create_style(TQWidget *parent, const char*)
     {
         TDEGlobal::locale()->insertCatalogue("kcmstyle");
         return new KCMStyle(parent, "kcmstyle");
     }
 
-    KDE_EXPORT void init_style()
+    TDE_EXPORT void init_style()
     {
         uint flags = KRdbExportQtSettings | KRdbExportQtColors | KRdbExportXftSettings;
         TDEConfig config("kcmdisplayrc", true /*readonly*/, false /*don't read kdeglobals etc.*/);
diff --git a/kcontrol/style/keramik/keramikconf.cpp b/kcontrol/style/keramik/keramikconf.cpp
index 6ac4e6d4c..17000c1d2 100644
--- a/kcontrol/style/keramik/keramikconf.cpp
+++ b/kcontrol/style/keramik/keramikconf.cpp
@@ -32,7 +32,7 @@ DEALINGS IN THE SOFTWARE.
 
 extern "C"
 {
-	KDE_EXPORT TQWidget* allocate_tdestyle_config(TQWidget* parent)
+	TDE_EXPORT TQWidget* allocate_tdestyle_config(TQWidget* parent)
 	{
 		return new KeramikStyleConfig(parent);
 	}
diff --git a/kcontrol/tdefontinst/lib/FcEngine.h b/kcontrol/tdefontinst/lib/FcEngine.h
index 535baa6e1..5db48b0c3 100644
--- a/kcontrol/tdefontinst/lib/FcEngine.h
+++ b/kcontrol/tdefontinst/lib/FcEngine.h
@@ -45,7 +45,7 @@ typedef struct _XftFont  XftFont;
 namespace KFI
 {
 
-class KDE_EXPORT CFcEngine
+class TDE_EXPORT CFcEngine
 {
     public:
 
diff --git a/kcontrol/tdefontinst/lib/Misc.h b/kcontrol/tdefontinst/lib/Misc.h
index ee8de5445..3fd49d34a 100644
--- a/kcontrol/tdefontinst/lib/Misc.h
+++ b/kcontrol/tdefontinst/lib/Misc.h
@@ -50,25 +50,25 @@ namespace Misc
         DIR_PERMS    = 0755
     };
 
-    extern KDE_EXPORT bool    check(const TQString &path, unsigned int fmt, bool checkW=false);
-    inline KDE_EXPORT bool    fExists(const TQString &p)     { return check(p, S_IFREG, false); }
-    inline KDE_EXPORT bool    dExists(const TQString &p)     { return check(p, S_IFDIR, false); }
-    inline KDE_EXPORT bool    fWritable(const TQString &p)   { return check(p, S_IFREG, true); }
-    inline KDE_EXPORT bool    dWritable(const TQString &p)   { return check(p, S_IFDIR, true); }
-    inline KDE_EXPORT bool    isLink(const TQString &i)      { return check(i, S_IFLNK, false); }
-    extern KDE_EXPORT TQString linkedTo(const TQString &i);
-    extern KDE_EXPORT TQString dirSyntax(const TQString &d);  // Has trailing slash:  /file/path/
-    extern KDE_EXPORT TQString xDirSyntax(const TQString &d); // No trailing slash:   /file/path
-    inline KDE_EXPORT TQString fileSyntax(const TQString &f)  { return xDirSyntax(f); }
-    extern KDE_EXPORT TQString getDir(const TQString &f);
-    extern KDE_EXPORT TQString getFile(const TQString &f);
-    extern KDE_EXPORT bool    createDir(const TQString &dir);
-    extern KDE_EXPORT TQString changeExt(const TQString &f, const TQString &newExt);
-    extern KDE_EXPORT bool    doCmd(const TQString &cmd, const TQString &p1=TQString::null, const TQString &p2=TQString::null, const TQString &p3=TQString::null);
-    inline KDE_EXPORT bool    root() { return 0==getuid(); }
-    extern KDE_EXPORT void    getAssociatedUrls(const KURL &url, KURL::List &list, bool afmAndPfm=true, TQWidget *widget=NULL);
-    extern KDE_EXPORT void    createBackup(const TQString &f);
-    extern KDE_EXPORT time_t  getTimeStamp(const TQString &item);
+    extern TDE_EXPORT bool    check(const TQString &path, unsigned int fmt, bool checkW=false);
+    inline TDE_EXPORT bool    fExists(const TQString &p)     { return check(p, S_IFREG, false); }
+    inline TDE_EXPORT bool    dExists(const TQString &p)     { return check(p, S_IFDIR, false); }
+    inline TDE_EXPORT bool    fWritable(const TQString &p)   { return check(p, S_IFREG, true); }
+    inline TDE_EXPORT bool    dWritable(const TQString &p)   { return check(p, S_IFDIR, true); }
+    inline TDE_EXPORT bool    isLink(const TQString &i)      { return check(i, S_IFLNK, false); }
+    extern TDE_EXPORT TQString linkedTo(const TQString &i);
+    extern TDE_EXPORT TQString dirSyntax(const TQString &d);  // Has trailing slash:  /file/path/
+    extern TDE_EXPORT TQString xDirSyntax(const TQString &d); // No trailing slash:   /file/path
+    inline TDE_EXPORT TQString fileSyntax(const TQString &f)  { return xDirSyntax(f); }
+    extern TDE_EXPORT TQString getDir(const TQString &f);
+    extern TDE_EXPORT TQString getFile(const TQString &f);
+    extern TDE_EXPORT bool    createDir(const TQString &dir);
+    extern TDE_EXPORT TQString changeExt(const TQString &f, const TQString &newExt);
+    extern TDE_EXPORT bool    doCmd(const TQString &cmd, const TQString &p1=TQString::null, const TQString &p2=TQString::null, const TQString &p3=TQString::null);
+    inline TDE_EXPORT bool    root() { return 0==getuid(); }
+    extern TDE_EXPORT void    getAssociatedUrls(const KURL &url, KURL::List &list, bool afmAndPfm=true, TQWidget *widget=NULL);
+    extern TDE_EXPORT void    createBackup(const TQString &f);
+    extern TDE_EXPORT time_t  getTimeStamp(const TQString &item);
 }
 
 }
diff --git a/kcontrol/tdefontinst/tdeio/KioFonts.cpp b/kcontrol/tdefontinst/tdeio/KioFonts.cpp
index 54de7bdcf..0dccc06a3 100644
--- a/kcontrol/tdefontinst/tdeio/KioFonts.cpp
+++ b/kcontrol/tdefontinst/tdeio/KioFonts.cpp
@@ -97,7 +97,7 @@ static const int    constMaxFcCheckTime=10;
 
 extern "C"
 {
-    KDE_EXPORT int kdemain(int argc, char **argv);
+    TDE_EXPORT int kdemain(int argc, char **argv);
 }
 
 int kdemain(int argc, char **argv)
diff --git a/kcontrol/tdefontinst/thumbnail/FontThumbnail.cpp b/kcontrol/tdefontinst/thumbnail/FontThumbnail.cpp
index a053393f4..c7c00ef0f 100644
--- a/kcontrol/tdefontinst/thumbnail/FontThumbnail.cpp
+++ b/kcontrol/tdefontinst/thumbnail/FontThumbnail.cpp
@@ -38,7 +38,7 @@
 
 extern "C"
 {
-    KDE_EXPORT ThumbCreator *new_creator()
+    TDE_EXPORT ThumbCreator *new_creator()
     {
         return new KFI::CFontThumbnail;
     }
diff --git a/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp
index a43f9d1d2..90b65eebf 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp
+++ b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp
@@ -35,7 +35,7 @@
 
 extern "C"
 {
-    KDE_EXPORT void* init_libtdefontviewpart()
+    TDE_EXPORT void* init_libtdefontviewpart()
     {
         TDEGlobal::locale()->insertCatalogue("tdefontinst");
         return new KFI::CFontViewPartFactory;
diff --git a/kcontrol/tdeio/main.cpp b/kcontrol/tdeio/main.cpp
index 0116764c8..7000f2542 100644
--- a/kcontrol/tdeio/main.cpp
+++ b/kcontrol/tdeio/main.cpp
@@ -40,37 +40,37 @@
 extern "C"
 {
 
-  KDE_EXPORT TDECModule *create_cookie(TQWidget *parent, const char /**name*/)
+  TDE_EXPORT TDECModule *create_cookie(TQWidget *parent, const char /**name*/)
   {
     return new KCookiesMain(parent);
   }
 
-  KDE_EXPORT TDECModule *create_smb(TQWidget *parent, const char /**name*/)
+  TDE_EXPORT TDECModule *create_smb(TQWidget *parent, const char /**name*/)
   {
     return new SMBRoOptions(parent);
   }
 
-  KDE_EXPORT TDECModule *create_useragent(TQWidget *parent, const char /**name*/)
+  TDE_EXPORT TDECModule *create_useragent(TQWidget *parent, const char /**name*/)
   {
     return new UserAgentDlg(parent);
   }
 
-  KDE_EXPORT TDECModule *create_proxy(TQWidget *parent, const char /**name*/)
+  TDE_EXPORT TDECModule *create_proxy(TQWidget *parent, const char /**name*/)
   {
     return new KProxyOptions(parent);
   }
 
-  KDE_EXPORT TDECModule *create_cache(TQWidget *parent, const char /**name*/)
+  TDE_EXPORT TDECModule *create_cache(TQWidget *parent, const char /**name*/)
   {
     return new KCacheConfigDialog( parent );
   }
 
-  KDE_EXPORT TDECModule *create_netpref(TQWidget *parent, const char /**name*/)
+  TDE_EXPORT TDECModule *create_netpref(TQWidget *parent, const char /**name*/)
   {
     return new KIOPreferences(parent);
   }
 
-  KDE_EXPORT TDECModule *create_lanbrowser(TQWidget *parent, const char *)
+  TDE_EXPORT TDECModule *create_lanbrowser(TQWidget *parent, const char *)
   {
     return new LanBrowser(parent);
   }
diff --git a/kcontrol/view1394/view1394.cpp b/kcontrol/view1394/view1394.cpp
index a3815b90f..c9b9ccc30 100644
--- a/kcontrol/view1394/view1394.cpp
+++ b/kcontrol/view1394/view1394.cpp
@@ -323,7 +323,7 @@ TQString OuiDb::vendor(octlet_t guid)
 extern "C"
 {
 
-   KDE_EXPORT TDECModule *create_view1394(TQWidget *parent, const char *name)
+   TDE_EXPORT TDECModule *create_view1394(TQWidget *parent, const char *name)
    {
       TDEGlobal::locale()->insertCatalogue("kcmview1394");
       return new View1394(parent, name);
diff --git a/kcontrol/xinerama/kcmxinerama.cpp b/kcontrol/xinerama/kcmxinerama.cpp
index 2c0fd2bba..4456a6d84 100644
--- a/kcontrol/xinerama/kcmxinerama.cpp
+++ b/kcontrol/xinerama/kcmxinerama.cpp
@@ -239,12 +239,12 @@ void KCMXinerama::clearIndicator() {
 }
 
 extern "C" {
-        KDE_EXPORT TDECModule *create_xinerama(TQWidget *parent, const char *name) {
+        TDE_EXPORT TDECModule *create_xinerama(TQWidget *parent, const char *name) {
    	    TDEGlobal::locale()->insertCatalogue("kcmxinerama");
 	    return new KCMXinerama(parent, name);
         }
 
-	KDE_EXPORT bool test_xinerama() {
+	TDE_EXPORT bool test_xinerama() {
 		return TQApplication::desktop()->isVirtualDesktop();
 	}
 }