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

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

14 files changed, 61 insertions, 58 deletions

diff --git a/tdecore/kdemacros.h.cmake b/tdecore/kdemacros.h.cmake
index 683538f9d..f48f518f6 100644
--- a/tdecore/kdemacros.h.cmake
+++ b/tdecore/kdemacros.h.cmake
@@ -25,7 +25,7 @@
 #cmakedefine __KDE_HAVE_GCC_VISIBILITY 1
 
 /**
- * The KDE_NO_EXPORT macro marks the symbol of the given variable 
+ * The TDE_NO_EXPORT macro marks the symbol of the given variable 
  * to be hidden. A hidden symbol is stripped during the linking step, 
  * so it can't be used from outside the resulting library, which is similar
  * to static. However, static limits the visibility to the current 
@@ -33,29 +33,32 @@
  * units.
  *
  * \code
- * int KDE_NO_EXPORT foo;
- * int KDE_EXPORT bar;
+ * int TDE_NO_EXPORT foo;
+ * int TDE_EXPORT bar;
  * \end
  */
 
 #ifdef __KDE_HAVE_GCC_VISIBILITY
-#define KDE_NO_EXPORT __attribute__ ((visibility("hidden")))
-#define KDE_EXPORT __attribute__ ((visibility("default")))
+#define TDE_NO_EXPORT __attribute__ ((visibility("hidden")))
+#define TDE_EXPORT __attribute__ ((visibility("default")))
 #elif defined(TQ_WS_WIN)
-#define KDE_NO_EXPORT
-#define KDE_EXPORT __declspec(dllexport)
+#define TDE_NO_EXPORT
+#define TDE_EXPORT __declspec(dllexport)
 #else
-#define KDE_NO_EXPORT
-#define KDE_EXPORT
+#define TDE_NO_EXPORT
+#define TDE_EXPORT
 #endif
 
+#define KDE_NO_EXPORT TDE_NO_EXPORT
+#define KDE_EXPORT TDE_EXPORT
+
 /**
  * KDE_Q_EXPORT_PLUGIN is a workaround for Qt not being able to
  * cope with symbol visibility.
  */
 #define KDE_Q_EXPORT_PLUGIN(PLUGIN) \
-  TQ_EXTERN_C KDE_EXPORT const char* qt_ucm_query_verification_data(); \
-  TQ_EXTERN_C KDE_EXPORT TQUnknownInterface* ucm_instantiate(); \
+  TQ_EXTERN_C TDE_EXPORT const char* qt_ucm_query_verification_data(); \
+  TQ_EXTERN_C TDE_EXPORT TQUnknownInterface* ucm_instantiate(); \
   TQ_EXPORT_PLUGIN(PLUGIN)
 
 /**
diff --git a/tdecore/kdemacros.h.in b/tdecore/kdemacros.h.in
index d72efe36c..aa17c976c 100644
--- a/tdecore/kdemacros.h.in
+++ b/tdecore/kdemacros.h.in
@@ -24,7 +24,7 @@
 #undef __KDE_HAVE_GCC_VISIBILITY
 
 /**
- * The KDE_NO_EXPORT macro marks the symbol of the given variable 
+ * The TDE_NO_EXPORT macro marks the symbol of the given variable 
  * to be hidden. A hidden symbol is stripped during the linking step, 
  * so it can't be used from outside the resulting library, which is similar
  * to static. However, static limits the visibility to the current 
@@ -32,20 +32,20 @@
  * units.
  *
  * \code
- * int KDE_NO_EXPORT foo;
- * int KDE_EXPORT bar;
+ * int TDE_NO_EXPORT foo;
+ * int TDE_EXPORT bar;
  * \end
  */
 
 #ifdef __KDE_HAVE_GCC_VISIBILITY
-#define KDE_NO_EXPORT __attribute__ ((visibility("hidden")))
-#define KDE_EXPORT __attribute__ ((visibility("default")))
+#define TDE_NO_EXPORT __attribute__ ((visibility("hidden")))
+#define TDE_EXPORT __attribute__ ((visibility("default")))
 #elif defined(TQ_WS_WIN)
-#define KDE_NO_EXPORT
-#define KDE_EXPORT __declspec(dllexport)
+#define TDE_NO_EXPORT
+#define TDE_EXPORT __declspec(dllexport)
 #else
-#define KDE_NO_EXPORT
-#define KDE_EXPORT
+#define TDE_NO_EXPORT
+#define TDE_EXPORT
 #endif
 
 /**
@@ -53,8 +53,8 @@
  * cope with symbol visibility.
  */
 #define KDE_Q_EXPORT_PLUGIN(PLUGIN) \
-  TQ_EXTERN_C KDE_EXPORT const char* qt_ucm_query_verification_data(); \
-  TQ_EXTERN_C KDE_EXPORT TQUnknownInterface* ucm_instantiate(); \
+  TQ_EXTERN_C TDE_EXPORT const char* qt_ucm_query_verification_data(); \
+  TQ_EXTERN_C TDE_EXPORT TQUnknownInterface* ucm_instantiate(); \
   TQ_EXPORT_PLUGIN(PLUGIN)
 
 /**
diff --git a/tdecore/klibloader.h b/tdecore/klibloader.h
index 82b268c16..813106164 100644
--- a/tdecore/klibloader.h
+++ b/tdecore/klibloader.h
@@ -36,7 +36,7 @@ class KLibLoaderPrivate;
 class KLibraryPrivate;
 
 # define K_EXPORT_COMPONENT_FACTORY( libname, factory ) \
-    extern "C" { KDE_EXPORT void *init_##libname() { return new factory; } }
+    extern "C" { TDE_EXPORT void *init_##libname() { return new factory; } }
 
 /**
  * @short Represents a dynamically loaded library.
diff --git a/tdecore/kprotocolinfo_tdecore.cpp b/tdecore/kprotocolinfo_tdecore.cpp
index 4377ec9ce..af48a5386 100644
--- a/tdecore/kprotocolinfo_tdecore.cpp
+++ b/tdecore/kprotocolinfo_tdecore.cpp
@@ -18,7 +18,7 @@
 
 #ifdef MAKE_TDECORE_LIB //needed for proper linkage (win32)
 #undef TDEIO_EXPORT
-#define TDEIO_EXPORT KDE_EXPORT
+#define TDEIO_EXPORT TDE_EXPORT
 #endif
 
 #define KPROTOCOLINFO_TDECORE
diff --git a/tdecore/ksock.h b/tdecore/ksock.h
index e56b0efbb..28d64a9dc 100644
--- a/tdecore/ksock.h
+++ b/tdecore/ksock.h
@@ -340,7 +340,7 @@ protected:
 private:
     // HACK
 #ifdef TDESOCKET_BINARY_COMPAT_HACK
-    KDE_EXPORT bool bindAndListen();
+    TDE_EXPORT bool bindAndListen();
 #endif // TDESOCKET_BINARY_COMPAT_HACK
 
     TDEServerSocket(const TDEServerSocket&);
diff --git a/tdecore/netsupp.cpp b/tdecore/netsupp.cpp
index 0c072752c..397005183 100644
--- a/tdecore/netsupp.cpp
+++ b/tdecore/netsupp.cpp
@@ -1233,5 +1233,5 @@ int inet_pton(int af, const char *cp, void *buf)
 namespace KDE
 {
   /** @internal */
-  extern const int KDE_EXPORT resolverFlags = KRF_getaddrinfo | KRF_resolver | KRF_afinet6 | KRF_inet_ntop | KRF_inet_pton;
+  extern const int TDE_EXPORT resolverFlags = KRF_getaddrinfo | KRF_resolver | KRF_afinet6 | KRF_inet_ntop | KRF_inet_pton;
 }
diff --git a/tdecore/network/kresolver_p.h b/tdecore/network/kresolver_p.h
index c9d64e4bc..896fe536f 100644
--- a/tdecore/network/kresolver_p.h
+++ b/tdecore/network/kresolver_p.h
@@ -206,7 +206,7 @@ namespace KNetwork
       KResolverManager();
 
     public:
-      static KResolverManager* manager() KDE_NO_EXPORT;	// creates and returns the global manager
+      static KResolverManager* manager() TDE_NO_EXPORT;	// creates and returns the global manager
 
       // destructor
       ~KResolverManager();
diff --git a/tdecore/network/kresolverstandardworkers_p.h b/tdecore/network/kresolverstandardworkers_p.h
index 05d0d5b26..92d15892a 100644
--- a/tdecore/network/kresolverstandardworkers_p.h
+++ b/tdecore/network/kresolverstandardworkers_p.h
@@ -39,7 +39,7 @@
 
 namespace KNetwork { namespace Internal
 {
-  extern void initStandardWorkers() KDE_NO_EXPORT;
+  extern void initStandardWorkers() TDE_NO_EXPORT;
 
   /**
    * @internal
diff --git a/tdecore/network/ksrvresolverworker.cpp b/tdecore/network/ksrvresolverworker.cpp
index 568e0d22b..732de02a4 100644
--- a/tdecore/network/ksrvresolverworker.cpp
+++ b/tdecore/network/ksrvresolverworker.cpp
@@ -242,7 +242,7 @@ namespace KNetwork
   namespace Internal
   {
 
-    void initSrvWorker() KDE_NO_EXPORT;
+    void initSrvWorker() TDE_NO_EXPORT;
     void initSrvWorker()
     {
       if (getenv("TDE_NO_SRV") != NULL)
diff --git a/tdecore/tdeapplication.cpp b/tdecore/tdeapplication.cpp
index 326388614..d089f24f6 100644
--- a/tdecore/tdeapplication.cpp
+++ b/tdecore/tdeapplication.cpp
@@ -188,7 +188,7 @@ extern int getfd(const char *fnam);
 #include "kappdcopiface.h"
 
 // exported for tdm kfrontend
-KDE_EXPORT bool kde_have_kipc = true; // magic hook to disable kipc in tdm
+TDE_EXPORT bool kde_have_kipc = true; // magic hook to disable kipc in tdm
 bool kde_kiosk_exception = false; // flag to disable kiosk restrictions
 bool kde_kiosk_admin = false;
 
diff --git a/tdecore/tdeconfig_compiler/README.dox b/tdecore/tdeconfig_compiler/README.dox
index b79a086cf..ad02f29b3 100644
--- a/tdecore/tdeconfig_compiler/README.dox
+++ b/tdecore/tdeconfig_compiler/README.dox
@@ -104,7 +104,7 @@ The following options are read from the kcfgc file:
   <td><b>Visibility</b></td>
   <td>string</td>
   <td>-</td>
-  <td>Inserts visibility directive (for example KDE_EXPORT) between "class" keyword and class 
+  <td>Inserts visibility directive (for example TDE_EXPORT) between "class" keyword and class 
   name in header file</td>
 </tr>
 <tr>
diff --git a/tdecore/tdehw/tdehardwaredevices.cpp b/tdecore/tdehw/tdehardwaredevices.cpp
index f54b1e138..59db6d0ae 100644
--- a/tdecore/tdehw/tdehardwaredevices.cpp
+++ b/tdecore/tdehw/tdehardwaredevices.cpp
@@ -124,7 +124,7 @@ TQString readLineFile(TQString fname) {
 TQString decodeHexEncoding(TQString str);
 
 extern "C" {
-	KDE_EXPORT TDEHardwareDevices* create_tdeHardwareDevices()
+	TDE_EXPORT TDEHardwareDevices* create_tdeHardwareDevices()
 	{
 		return new TDEHardwareDevices();
 	}
diff --git a/tdecore/tdehw/tdenetworkconnections.cpp b/tdecore/tdehw/tdenetworkconnections.cpp
index b2ae276a8..9a273cebb 100644
--- a/tdecore/tdehw/tdenetworkconnections.cpp
+++ b/tdecore/tdehw/tdenetworkconnections.cpp
@@ -41,7 +41,7 @@
 /*================================================================================================*/
 
 extern "C" {
-	KDE_EXPORT TDEGlobalNetworkManager* create_tdeGlobalNetworkManager()
+	TDE_EXPORT TDEGlobalNetworkManager* create_tdeGlobalNetworkManager()
 	{
 		return new TDEGlobalNetworkManager();
 	}
diff --git a/tdecore/tdelibs_export.h b/tdecore/tdelibs_export.h
index 9697c6bb4..e1b7e3662 100644
--- a/tdecore/tdelibs_export.h
+++ b/tdecore/tdelibs_export.h
@@ -20,7 +20,7 @@
 #ifndef _TDELIBS_EXPORT_H
 #define _TDELIBS_EXPORT_H
 
-/* needed for KDE_EXPORT macros */
+/* needed for TDE_EXPORT macros */
 #include <kdemacros.h>
 
 /* needed, because e.g. Q_OS_UNIX is so frequently used */
@@ -32,30 +32,30 @@
 #else /* Q_OS_UNIX */
 
 /* export statements for unix */
-#define TDECORE_EXPORT KDE_EXPORT
-#define TDEUI_EXPORT KDE_EXPORT
-#define TDEFX_EXPORT KDE_EXPORT
-#define TDEPRINT_EXPORT KDE_EXPORT
-#define TDEDNSSD_EXPORT KDE_EXPORT
-#define TDEIO_EXPORT KDE_EXPORT
-#define DCOP_EXPORT KDE_EXPORT
-#define TDEPARTS_EXPORT KDE_EXPORT
-#define KTEXTEDITOR_EXPORT KDE_EXPORT
-#define KABC_EXPORT KDE_EXPORT
-#define TDESU_EXPORT KDE_EXPORT
-#define KVCARD_EXPORT KDE_EXPORT
-#define TDERESOURCES_EXPORT KDE_EXPORT
-#define TDESTYLE_EXPORT KDE_EXPORT
-#define TDEHTML_EXPORT KDE_EXPORT
-#define KMDI_EXPORT KDE_EXPORT
-#define TDEUTILS_EXPORT KDE_EXPORT
-#define KATEPARTINTERFACES_EXPORT KDE_EXPORT
-#define KATEPART_EXPORT KDE_EXPORT
-#define KMID_EXPORT KDE_EXPORT
-#define TDERANDR_EXPORT KDE_EXPORT
-#define TDEIMPROXY_EXPORT KDE_EXPORT
-#define KDE_ARTS_EXPORT KDE_EXPORT
-#define TDEUNITTEST_EXPORT KDE_EXPORT
+#define TDECORE_EXPORT TDE_EXPORT
+#define TDEUI_EXPORT TDE_EXPORT
+#define TDEFX_EXPORT TDE_EXPORT
+#define TDEPRINT_EXPORT TDE_EXPORT
+#define TDEDNSSD_EXPORT TDE_EXPORT
+#define TDEIO_EXPORT TDE_EXPORT
+#define DCOP_EXPORT TDE_EXPORT
+#define TDEPARTS_EXPORT TDE_EXPORT
+#define KTEXTEDITOR_EXPORT TDE_EXPORT
+#define KABC_EXPORT TDE_EXPORT
+#define TDESU_EXPORT TDE_EXPORT
+#define KVCARD_EXPORT TDE_EXPORT
+#define TDERESOURCES_EXPORT TDE_EXPORT
+#define TDESTYLE_EXPORT TDE_EXPORT
+#define TDEHTML_EXPORT TDE_EXPORT
+#define KMDI_EXPORT TDE_EXPORT
+#define TDEUTILS_EXPORT TDE_EXPORT
+#define KATEPARTINTERFACES_EXPORT TDE_EXPORT
+#define KATEPART_EXPORT TDE_EXPORT
+#define KMID_EXPORT TDE_EXPORT
+#define TDERANDR_EXPORT TDE_EXPORT
+#define TDEIMPROXY_EXPORT TDE_EXPORT
+#define KDE_ARTS_EXPORT TDE_EXPORT
+#define TDEUNITTEST_EXPORT TDE_EXPORT
 
 #define KPATH_SEPARATOR ':'