Replace KDE_DEPRECATED with TDE_DEPRECATED

Signed-off-by: Michele Calgaro <[email protected]>

23 files changed, 136 insertions, 136 deletions

diff --git a/tdecore/kdemacros.h.cmake b/tdecore/kdemacros.h.cmake
index 1600dafa6..72a842a57 100644
--- a/tdecore/kdemacros.h.cmake
+++ b/tdecore/kdemacros.h.cmake
@@ -70,67 +70,67 @@
 #endif
 
 /**
- * The KDE_DEPRECATED macro can be used to trigger compile-time warnings
+ * The TDE_DEPRECATED macro can be used to trigger compile-time warnings
  * with newer compilers when deprecated functions are used.
  *
  * For non-inline functions, the macro gets inserted at the very end of the
  * function declaration, right before the semicolon:
  *
  * \code
- * DeprecatedConstructor() KDE_DEPRECATED;
- * void deprecatedFunctionA() KDE_DEPRECATED;
- * int deprecatedFunctionB() const KDE_DEPRECATED;
+ * DeprecatedConstructor() TDE_DEPRECATED;
+ * void deprecatedFunctionA() TDE_DEPRECATED;
+ * int deprecatedFunctionB() const TDE_DEPRECATED;
  * \endcode
  *
  * Functions which are implemented inline are handled differently: for them,
- * the KDE_DEPRECATED macro is inserted at the front, right before the return
+ * the TDE_DEPRECATED macro is inserted at the front, right before the return
  * type, but after "static" or "virtual":
  *
  * \code
- * KDE_DEPRECATED void deprecatedInlineFunctionA() { .. }
- * virtual KDE_DEPRECATED int deprecatedInlineFunctionB() { .. }
- * static KDE_DEPRECATED bool deprecatedInlineFunctionC() { .. }
+ * TDE_DEPRECATED void deprecatedInlineFunctionA() { .. }
+ * virtual TDE_DEPRECATED int deprecatedInlineFunctionB() { .. }
+ * static TDE_DEPRECATED bool deprecatedInlineFunctionC() { .. }
  * \end
  *
  * You can also mark whole structs or classes as deprecated, by inserting the
- * KDE_DEPRECATED macro after the struct/class keyword, but before the
+ * TDE_DEPRECATED macro after the struct/class keyword, but before the
  * name of the struct/class:
  *
  * \code
- * class KDE_DEPRECATED DeprecatedClass { };
- * struct KDE_DEPRECATED DeprecatedStruct { };
+ * class TDE_DEPRECATED DeprecatedClass { };
+ * struct TDE_DEPRECATED DeprecatedStruct { };
  * \endcode
  *
  * \note
- * It does not make much sense to use the KDE_DEPRECATED keyword for a Qt signal;
+ * It does not make much sense to use the TDE_DEPRECATED keyword for a TQt signal;
  * this is because usually get called by the class which they belong to,
  * and one'd assume that a class author doesn't use deprecated methods of his
  * own class. The only exception to this are signals which are connected to
  * other signals; they get invoked from moc-generated code. In any case, 
  * printing a warning message in either case is not useful.
  * For slots, it can make sense (since slots can be invoked directly) but be
- * aware that if the slots get triggered by a signal, the will get called from
+ * aware that if the slots get triggered by a signal, it will get called from
  * moc code as well and thus the warnings are useless.
  *
  * \par
- * Also note that it is not possible to use KDE_DEPRECATED for classes which
+ * Also note that it is not possible to use TDE_DEPRECATED for classes which
  * use the k_dcop keyword (to indicate a DCOP interface declaration); this is
  * because the dcopidl program would choke on the unexpected declaration
  * syntax.
  */
 
-#ifndef KDE_DEPRECATED
-#if __GNUC__ - 0 > 3 || (__GNUC__ - 0 == 3 && __GNUC_MINOR__ - 0 >= 2)
-  /* gcc >= 3.2 */
-# define KDE_DEPRECATED __attribute__ ((deprecated))
-#elif defined(_MSC_VER) && (_MSC_VER >= 1300)
-  /* msvc >= 7 */
-# define KDE_DEPRECATED __declspec(deprecated)
-#else
-# define KDE_DEPRECATED
-#endif
+#ifndef TDE_DEPRECATED
+ #ifdef __GNUC__ 
+  #define TDE_DEPRECATED __attribute__ ((deprecated))
+ #elif defined(_MSC_VER)
+  #define TDE_DEPRECATED __declspec(deprecated)
+ #else
+  #define TDE_DEPRECATED
+ #endif
 #endif
 
+#define KDE_DEPRECATED TDE_DEPRECATED
+
 /**
  * The KDE_ISLIKELY macro tags a boolean expression as likely to evaluate to
  * 'true'. When used in an if ( ) statement, it gives a hint to the compiler
diff --git a/tdecore/kdemacros.h.in b/tdecore/kdemacros.h.in
index aa17c976c..37916a051 100644
--- a/tdecore/kdemacros.h.in
+++ b/tdecore/kdemacros.h.in
@@ -69,39 +69,39 @@
 #endif
 
 /**
- * The KDE_DEPRECATED macro can be used to trigger compile-time warnings
+ * The TDE_DEPRECATED macro can be used to trigger compile-time warnings
  * with newer compilers when deprecated functions are used.
  *
  * For non-inline functions, the macro gets inserted at the very end of the
  * function declaration, right before the semicolon:
  *
  * \code
- * DeprecatedConstructor() KDE_DEPRECATED;
- * void deprecatedFunctionA() KDE_DEPRECATED;
- * int deprecatedFunctionB() const KDE_DEPRECATED;
+ * DeprecatedConstructor() TDE_DEPRECATED;
+ * void deprecatedFunctionA() TDE_DEPRECATED;
+ * int deprecatedFunctionB() const TDE_DEPRECATED;
  * \endcode
  *
  * Functions which are implemented inline are handled differently: for them,
- * the KDE_DEPRECATED macro is inserted at the front, right before the return
+ * the TDE_DEPRECATED macro is inserted at the front, right before the return
  * type, but after "static" or "virtual":
  *
  * \code
- * KDE_DEPRECATED void deprecatedInlineFunctionA() { .. }
- * virtual KDE_DEPRECATED int deprecatedInlineFunctionB() { .. }
- * static KDE_DEPRECATED bool deprecatedInlineFunctionC() { .. }
+ * TDE_DEPRECATED void deprecatedInlineFunctionA() { .. }
+ * virtual TDE_DEPRECATED int deprecatedInlineFunctionB() { .. }
+ * static TDE_DEPRECATED bool deprecatedInlineFunctionC() { .. }
  * \end
  *
  * You can also mark whole structs or classes as deprecated, by inserting the
- * KDE_DEPRECATED macro after the struct/class keyword, but before the
+ * TDE_DEPRECATED macro after the struct/class keyword, but before the
  * name of the struct/class:
  *
  * \code
- * class KDE_DEPRECATED DeprecatedClass { };
- * struct KDE_DEPRECATED DeprecatedStruct { };
+ * class TDE_DEPRECATED DeprecatedClass { };
+ * struct TDE_DEPRECATED DeprecatedStruct { };
  * \endcode
  *
  * \note
- * It does not make much sense to use the KDE_DEPRECATED keyword for a Qt signal;
+ * It does not make much sense to use the TDE_DEPRECATED keyword for a Qt signal;
  * this is because usually get called by the class which they belong to,
  * and one'd assume that a class author doesn't use deprecated methods of his
  * own class. The only exception to this are signals which are connected to
@@ -112,24 +112,24 @@
  * moc code as well and thus the warnings are useless.
  *
  * \par
- * Also note that it is not possible to use KDE_DEPRECATED for classes which
+ * Also note that it is not possible to use TDE_DEPRECATED for classes which
  * use the k_dcop keyword (to indicate a DCOP interface declaration); this is
  * because the dcopidl program would choke on the unexpected declaration
  * syntax.
  */
 
-#ifndef KDE_DEPRECATED
-#if __GNUC__ - 0 > 3 || (__GNUC__ - 0 == 3 && __GNUC_MINOR__ - 0 >= 2)
-  /* gcc >= 3.2 */
-# define KDE_DEPRECATED __attribute__ ((deprecated))
-#elif defined(_MSC_VER) && (_MSC_VER >= 1300)
-  /* msvc >= 7 */
-# define KDE_DEPRECATED __declspec(deprecated)
-#else
-# define KDE_DEPRECATED
-#endif
+#ifndef TDE_DEPRECATED
+ #ifdef __GNUC__ 
+  #define TDE_DEPRECATED __attribute__ ((deprecated))
+ #elif defined(_MSC_VER)
+  #define TDE_DEPRECATED __declspec(deprecated)
+ #else
+  #define TDE_DEPRECATED
+ #endif
 #endif
 
+#define KDE_DEPRECATED TDE_DEPRECATED
+
 /**
  * The KDE_ISLIKELY macro tags a boolean expression as likely to evaluate to
  * 'true'. When used in an if ( ) statement, it gives a hint to the compiler
diff --git a/tdecore/kdesktopfile.h b/tdecore/kdesktopfile.h
index 12cf85225..b4f59085a 100644
--- a/tdecore/kdesktopfile.h
+++ b/tdecore/kdesktopfile.h
@@ -230,7 +230,7 @@ private:
   /**
    * @deprecated Use fileName() instead.
    */
-    KDE_DEPRECATED TQString filename() const { return fileName(); };
+    TDE_DEPRECATED TQString filename() const { return fileName(); };
 
 private:
 
diff --git a/tdecore/kextsock.h b/tdecore/kextsock.h
index 095cc7a43..3b3018b59 100644
--- a/tdecore/kextsock.h
+++ b/tdecore/kextsock.h
@@ -931,7 +931,7 @@ public:
    * @param flags	the same flags as getnameinfo()
    * @returns 0 on success, nonzero otherwise.
    */
-  static int resolve(sockaddr* sock, ksocklen_t len, TQString& host, TQString& port, int flags = 0) KDE_DEPRECATED;
+  static int resolve(sockaddr* sock, ksocklen_t len, TQString& host, TQString& port, int flags = 0) TDE_DEPRECATED;
 
   /**
    * Performs resolution on the given socket address.
@@ -945,7 +945,7 @@ public:
    * @param flags	the same flags as getnameinfo()
    * @returns 0 on success, nonzero otherwise.
    */
-  static int resolve(::TDESocketAddress* sock, TQString& host, TQString& port, int flags = 0) KDE_DEPRECATED;
+  static int resolve(::TDESocketAddress* sock, TQString& host, TQString& port, int flags = 0) TDE_DEPRECATED;
 
   /** @deprecated
    * This function is now deprecated. Please use @ref KNetwork::KResolver::resolve.
@@ -967,7 +967,7 @@ public:
    * @param error	pointer to a variable holding the error code
    * @return a list of KAddressInfos
    */
-  static TQPtrList<KAddressInfo> lookup(const TQString& host, const TQString& port, int flags = 0, int *error = 0) KDE_DEPRECATED;
+  static TQPtrList<KAddressInfo> lookup(const TQString& host, const TQString& port, int flags = 0, int *error = 0) TDE_DEPRECATED;
 
   /**
    * Returns the local socket address
@@ -975,7 +975,7 @@ public:
    * @param fd		the file descriptor
    * @return the local socket address or 0 if an error occurred. Delete after use.
    */
-  static ::TDESocketAddress *localAddress(int fd) KDE_DEPRECATED;
+  static ::TDESocketAddress *localAddress(int fd) TDE_DEPRECATED;
 
   /**
    * Returns the peer socket address. Use KExtendedSocket::resolve() to
@@ -984,7 +984,7 @@ public:
    * @param fd		the file descriptor
    * @return the peer socket address or 0 if an error occurred. Delete after use.
    */
-  static ::TDESocketAddress *peerAddress(int fd) KDE_DEPRECATED;
+  static ::TDESocketAddress *peerAddress(int fd) TDE_DEPRECATED;
 
   /**
    * Returns the representing text of this error code
@@ -1003,7 +1003,7 @@ public:
    * @param enable	if true, set address reusable
    * @return true on success, false on failure.
    */
-  static bool setAddressReusable(int fd, bool enable) KDE_DEPRECATED;
+  static bool setAddressReusable(int fd, bool enable) TDE_DEPRECATED;
 
 protected:
   virtual void virtual_hook( int id, void* data );
@@ -1040,20 +1040,20 @@ public:
    * Returns the KAddressInfo's TDESocketAddress.
    * Only valid as long as the KAddressInfo exists.
    */
-  inline KDE_DEPRECATED operator const ::TDESocketAddress*() const 
+  inline TDE_DEPRECATED operator const ::TDESocketAddress*() const 
   { return addr; }
 
   /**
    * Returns the KAddressInfo's addrinfo.
    */
-  inline KDE_DEPRECATED operator const addrinfo&() const
+  inline TDE_DEPRECATED operator const addrinfo&() const
   { return *ai; }
 
   /**
    * Returns a pointer to KAddressInfo's addrinfo.
    * Only valid as long as the KAddressInfo exists.
    */
-  inline KDE_DEPRECATED operator const addrinfo*() const
+  inline TDE_DEPRECATED operator const addrinfo*() const
   { return ai; }
 
   /**
@@ -1061,32 +1061,32 @@ public:
    * Only valid as long as the KAddressInfo exists.
    * @return the KAddressInfo's TDESocketAddress.
    */
-  inline KDE_DEPRECATED const ::TDESocketAddress* address() const
+  inline TDE_DEPRECATED const ::TDESocketAddress* address() const
   { return addr; }
 
   /**
    * Returns the flags of the address info (see getaddrinfo(3)).
    * @return the flags of the addres info.
    */
-  int flags() const KDE_DEPRECATED;
+  int flags() const TDE_DEPRECATED;
 
   /**
    * Returns the family of the address info (see getaddrinfo(3)).
    * @return the family of the addres info.
    */
-  int family() const KDE_DEPRECATED;
+  int family() const TDE_DEPRECATED;
 
   /**
    * Returns the socket type of the address info (see getaddrinfo(3)).
    * @return the socket type of the addres info.
    */
-  int socktype() const KDE_DEPRECATED;
+  int socktype() const TDE_DEPRECATED;
 
   /**
    * Returns the protocol of the address info (see getaddrinfo(3)).
    * @return the protocol of the addres info.
    */
-  int protocol() const KDE_DEPRECATED;
+  int protocol() const TDE_DEPRECATED;
 
 
   /**
@@ -1094,7 +1094,7 @@ public:
    * Only valid as long as the KAddressInfo exists.
    * @return the official name of the host
    */
-  const char* canonname() const KDE_DEPRECATED;
+  const char* canonname() const TDE_DEPRECATED;
 
   /**
    * Returns the length of the TDESocketAddress.
diff --git a/tdecore/knotifyclient.h b/tdecore/knotifyclient.h
index a824d5a37..723c4bb45 100644
--- a/tdecore/knotifyclient.h
+++ b/tdecore/knotifyclient.h
@@ -185,7 +185,7 @@ namespace KNotifyClient
 	 *             the user connected the event to sound, only. Can be TQString::null.
 	 * @return a value > 0, unique for this event if successful, 0 otherwise
 	 */
-	TDECORE_EXPORT int event(const TQString &message, const TQString &text=TQString::null) KDE_DEPRECATED;
+	TDECORE_EXPORT int event(const TQString &message, const TQString &text=TQString::null) TDE_DEPRECATED;
 
 	/**
 	 * @deprecated
@@ -194,7 +194,7 @@ namespace KNotifyClient
 	 * @param text The text explaining the event you raise. Can be TQString::null.
 	 * @return a value > 0, unique for this event if successful, 0 otherwise
 	 */
-	TDECORE_EXPORT int event( StandardEvent event, const TQString& text=TQString::null ) KDE_DEPRECATED;
+	TDECORE_EXPORT int event( StandardEvent event, const TQString& text=TQString::null ) TDE_DEPRECATED;
 
 	/**
 	 * @deprecated
@@ -207,7 +207,7 @@ namespace KNotifyClient
 	 * @return a value > 0, unique for this event if successful, 0 otherwise
 	 */
 	TDECORE_EXPORT int userEvent(const TQString &text=TQString::null, int present=Default, int level=Default,
-	                             const TQString &sound=TQString::null, const TQString &file=TQString::null) KDE_DEPRECATED;
+	                             const TQString &sound=TQString::null, const TQString &file=TQString::null) TDE_DEPRECATED;
 	
 //#endif
 
diff --git a/tdecore/kprocess.h b/tdecore/kprocess.h
index 3e6250486..211e3cc7f 100644
--- a/tdecore/kprocess.h
+++ b/tdecore/kprocess.h
@@ -219,7 +219,7 @@ public:
 	 @see operator<<()
 
   */
-  bool setExecutable(const TQString& proc) KDE_DEPRECATED;
+  bool setExecutable(const TQString& proc) TDE_DEPRECATED;
 
 
   /**
@@ -320,7 +320,7 @@ public:
    * @deprecated
    * Use pid() instead.
    */
-  KDE_DEPRECATED pid_t getPid() const { return pid(); }
+  TDE_DEPRECATED pid_t getPid() const { return pid(); }
 
   /**
    * Suspend processing of data from stdout of the child process.
diff --git a/tdecore/kprocio.h b/tdecore/kprocio.h
index e58e0972c..eda8c6eab 100644
--- a/tdecore/kprocio.h
+++ b/tdecore/kprocio.h
@@ -120,7 +120,7 @@ public:
    * @return true if successful, false otherwise
    * @deprecated
    **/
-  KDE_DEPRECATED bool fputs (const TQString &line, bool AppendNewLine=true)
+  TDE_DEPRECATED bool fputs (const TQString &line, bool AppendNewLine=true)
     { return writeStdin(line, AppendNewLine); }
 
   /**
@@ -159,7 +159,7 @@ public:
    * @deprecated use readln. Note that it has an inverted autoAck default,
    *  though.
    **/
-  KDE_DEPRECATED int fgets (TQString &line, bool autoAck=false)
+  TDE_DEPRECATED int fgets (TQString &line, bool autoAck=false)
     { return readln (line, autoAck); }
 
   /**
diff --git a/tdecore/kregexp.h b/tdecore/kregexp.h
index cc5ff0ea6..0bb2b04ca 100644
--- a/tdecore/kregexp.h
+++ b/tdecore/kregexp.h
@@ -57,7 +57,7 @@ class KRegExpPrivate;
  *
  * @author Torben Weis <[email protected]>
  */
-class TDECORE_EXPORT KDE_DEPRECATED KRegExp
+class TDECORE_EXPORT TDE_DEPRECATED KRegExp
 {
 public:
 
diff --git a/tdecore/ksock.h b/tdecore/ksock.h
index 28d64a9dc..f562ece8f 100644
--- a/tdecore/ksock.h
+++ b/tdecore/ksock.h
@@ -92,20 +92,20 @@ public:
      * Constructs a TDESocket with the provided file descriptor.
      * @param _sock	The file descriptor to use.
      */
-    TDESocket( int _sock ) KDE_DEPRECATED;
+    TDESocket( int _sock ) TDE_DEPRECATED;
     /**
      * Creates a socket and connects to a host.
      * @param _host	The remote host to which to connect.
      * @param _port	The port on the remote host.
      * @param timeOut	The number of seconds waiting for connect (default 30).
      */
-    TDESocket( const char *_host, unsigned short int _port, int timeOut = 30) KDE_DEPRECATED;
+    TDESocket( const char *_host, unsigned short int _port, int timeOut = 30) TDE_DEPRECATED;
 
     /**
      * Connects to a UNIX domain socket.
      * @param _path    The filename of the socket.
      */
-    TDESocket( const char * _path ) KDE_DEPRECATED;
+    TDESocket( const char * _path ) TDE_DEPRECATED;
 
     /**
      * Destructor. Closes the socket if it is still open.
@@ -150,7 +150,7 @@ public:
      * instead
      * @deprecated
      */
-    unsigned long ipv4_addr() KDE_DEPRECATED;
+    unsigned long ipv4_addr() TDE_DEPRECATED;
 
     // BCI: remove in libtdecore.so.4
     /**
@@ -158,7 +158,7 @@ public:
       *  Don't use this in new programs. Use KExtendedSocket::lookup
       *  @deprecated
       */
-    static bool initSockaddr(ksockaddr_in *server_name, const char *hostname, unsigned short int port, int domain = PF_INET) KDE_DEPRECATED;
+    static bool initSockaddr(ksockaddr_in *server_name, const char *hostname, unsigned short int port, int domain = PF_INET) TDE_DEPRECATED;
 #endif
 
 signals:
diff --git a/tdecore/kstaticdeleter.h b/tdecore/kstaticdeleter.h
index b6967268c..28c2d89e2 100644
--- a/tdecore/kstaticdeleter.h
+++ b/tdecore/kstaticdeleter.h
@@ -82,7 +82,7 @@ public:
      * @param isArray tells the destructor to delete an array instead of an object
      * @deprecated See the other setObject variant.
      **/
-    KDE_DEPRECATED type *setObject( type *obj, bool isArray = false) {
+    TDE_DEPRECATED type *setObject( type *obj, bool isArray = false) {
         deleteit = obj;
         globalReference = 0;
 	array = isArray;
diff --git a/tdecore/kstringhandler.h b/tdecore/kstringhandler.h
index f20963d63..2a75a2f7b 100644
--- a/tdecore/kstringhandler.h
+++ b/tdecore/kstringhandler.h
@@ -77,7 +77,7 @@ public:
       * @return the word, or an empty string if not found
       * @deprecated use TQString::section instead
       */
-    static TQString        word( const TQString &text , uint pos ) KDE_DEPRECATED;
+    static TQString        word( const TQString &text , uint pos ) TDE_DEPRECATED;
 
     /** Returns a range of words from that string.
       * Ie:
@@ -183,7 +183,7 @@ public:
       * @return the resulting string
       * @deprecated use TQString::leftJustify instead
       */
-    static TQString        ljust( const TQString &text , uint width ) KDE_DEPRECATED;
+    static TQString        ljust( const TQString &text , uint width ) TDE_DEPRECATED;
 
     /** Right-justifies a string and returns a string at least 'width' characters
       * wide.
@@ -194,7 +194,7 @@ public:
       * @return the resulting string
       * @deprecated use TQString::rightJustify instead
       */
-    static TQString        rjust( const TQString &text , uint width ) KDE_DEPRECATED;
+    static TQString        rjust( const TQString &text , uint width ) TDE_DEPRECATED;
 
     /** Centers a string and returns a string at least 'width' characters
       * wide.
@@ -432,7 +432,7 @@ private:
     /**
      * @deprecated Use matchFileName () instead.
      */
-    static KDE_DEPRECATED bool matchFilename( const TQString& filename, const TQString& pattern )
+    static TDE_DEPRECATED bool matchFilename( const TQString& filename, const TQString& pattern )
     {
         return matchFileName (filename, pattern);
     }
diff --git a/tdecore/kurl.h b/tdecore/kurl.h
index 283fc57f5..ca30a3b0a 100644
--- a/tdecore/kurl.h
+++ b/tdecore/kurl.h
@@ -834,7 +834,7 @@ public:
    *
    * @see isValid()
    */
-  KDE_DEPRECATED bool isMalformed() const { return !isValid(); }
+  TDE_DEPRECATED bool isMalformed() const { return !isValid(); }
 
   /**
    * @brief Tests if the file is local
@@ -1468,7 +1468,7 @@ public:
    *
    * @deprecated Use equals() instead.
    */
-  bool cmp( const KURL &u, bool ignore_trailing = false ) const KDE_DEPRECATED;
+  bool cmp( const KURL &u, bool ignore_trailing = false ) const TDE_DEPRECATED;
 
   /**
    * @brief Compares this URL with another one
diff --git a/tdecore/kurldrag.h b/tdecore/kurldrag.h
index 2c2cd911a..a578ff74c 100644
--- a/tdecore/kurldrag.h
+++ b/tdecore/kurldrag.h
@@ -82,13 +82,13 @@ public:
   /**
    * @deprecated Is equivalent with "new KURLDrag(urls, dragSource, name)".
    */
-  static KURLDrag * newDrag( const KURL::List &urls, TQWidget* dragSource = 0, const char * name = 0 ) KDE_DEPRECATED;
+  static KURLDrag * newDrag( const KURL::List &urls, TQWidget* dragSource = 0, const char * name = 0 ) TDE_DEPRECATED;
 
   /**
    * @deprecated Is equivalent with "new KURLDrag(urls, metaData, dragSource, name)".
    */
   static KURLDrag * newDrag( const KURL::List &urls, const TQMap<TQString, TQString>& metaData,
-                             TQWidget* dragSource = 0, const char * name = 0 ) KDE_DEPRECATED;
+                             TQWidget* dragSource = 0, const char * name = 0 ) TDE_DEPRECATED;
 
   /**
    * Meta-data to associate with those URLs.
@@ -152,7 +152,7 @@ protected:
    * @deprecated Use a KURLDrag constructor with a KURL::List
    */
   KURLDrag( const TQStrList & urls, const TQMap<TQString,TQString>& metaData,
-            TQWidget * dragSource, const char* name ) KDE_DEPRECATED;
+            TQWidget * dragSource, const char* name ) TDE_DEPRECATED;
 
 private:
   void init(const KURL::List &urls);
diff --git a/tdecore/kvmallocator.h b/tdecore/kvmallocator.h
index e85e03446..677293443 100644
--- a/tdecore/kvmallocator.h
+++ b/tdecore/kvmallocator.h
@@ -80,7 +80,7 @@ public:
      * @deprecated
      * @see copyBlock
      */
-    void copy(void *dest, Block *src, int _offset = 0, size_t length = 0) KDE_DEPRECATED;
+    void copy(void *dest, Block *src, int _offset = 0, size_t length = 0) TDE_DEPRECATED;
      
     /**
      * Copy @p length bytes from normal memory at address @p src to 
@@ -98,7 +98,7 @@ public:
      * @deprecated
      * @see copyBlock
      */
-    void copy(Block *dest, void *src, int _offset = 0, size_t length = 0) KDE_DEPRECATED;  
+    void copy(Block *dest, void *src, int _offset = 0, size_t length = 0) TDE_DEPRECATED;  
 
     /**
      * Map a virtual memory block in memory
diff --git a/tdecore/netwm.h b/tdecore/netwm.h
index 8baef6ea3..bdfa67a20 100644
--- a/tdecore/netwm.h
+++ b/tdecore/netwm.h
@@ -109,7 +109,7 @@ public:
         to the first element of the properties array in the above constructor.
     **/
     NETRootInfo(Display *display, Window supportWindow, const char *wmName,
-		unsigned long properties, int screen = -1, bool doActivate = true) KDE_DEPRECATED;
+		unsigned long properties, int screen = -1, bool doActivate = true) TDE_DEPRECATED;
 
     /**
        Clients should use this constructor to create a NETRootInfo object, which
@@ -258,7 +258,7 @@ public:
 
        @see NET::Property
     **/
-    unsigned long supported() const KDE_DEPRECATED;
+    unsigned long supported() const TDE_DEPRECATED;
 
     /**
        Returns an array of Window id's, which contain all managed windows.
@@ -727,7 +727,7 @@ protected:
 
        @param window the id of the window to activate
     **/
-    virtual KDE_DEPRECATED void changeActiveWindow(Window window) { Q_UNUSED(window); }
+    virtual TDE_DEPRECATED void changeActiveWindow(Window window) { Q_UNUSED(window); }
 
     /**
        A Window Manager should subclass NETRootInfo and reimplement this function
@@ -1029,7 +1029,7 @@ public:
 
        @see NET::Property
     **/
-    unsigned long properties() const KDE_DEPRECATED;
+    unsigned long properties() const TDE_DEPRECATED;
 
     /**
        Returns the icon geometry.
@@ -1083,7 +1083,7 @@ public:
 
        @return the type of the window
     **/
-    WindowType windowType() const KDE_DEPRECATED;
+    WindowType windowType() const TDE_DEPRECATED;
 
     /**
        Returns the name of the window in UTF-8 format.
diff --git a/tdecore/tdeaccel.h b/tdecore/tdeaccel.h
index dd0c03aad..c8114059d 100644
--- a/tdecore/tdeaccel.h
+++ b/tdecore/tdeaccel.h
@@ -319,47 +319,47 @@ class TDECORE_EXPORT TDEAccel : public TQAccel
 	 */
 	bool insertItem( const TQString& sLabel, const TQString& sAction,
 	                 const char* psKey,
-	                 int nIDMenu = 0, TQPopupMenu* pMenu = 0, bool bConfigurable = true ) KDE_DEPRECATED;
+	                 int nIDMenu = 0, TQPopupMenu* pMenu = 0, bool bConfigurable = true ) TDE_DEPRECATED;
 	/**
 	 * @deprecated use insert
 	 */
 	bool insertItem( const TQString& sLabel, const TQString& sAction,
 	                 int key,
-	                 int nIDMenu = 0, TQPopupMenu* pMenu = 0, bool bConfigurable = true ) KDE_DEPRECATED;
+	                 int nIDMenu = 0, TQPopupMenu* pMenu = 0, bool bConfigurable = true ) TDE_DEPRECATED;
 	/**
 	 * @deprecated use insert
 	 */
-	bool insertStdItem( TDEStdAccel::StdAccel id, const TQString& descr = TQString::null ) KDE_DEPRECATED;
+	bool insertStdItem( TDEStdAccel::StdAccel id, const TQString& descr = TQString::null ) TDE_DEPRECATED;
 	/**
 	 * @deprecated use insert
 	 */
-	bool connectItem( const TQString& sAction, const TQObject* pObjSlot, const char* psMethodSlot, bool bActivate = true ) KDE_DEPRECATED;
+	bool connectItem( const TQString& sAction, const TQObject* pObjSlot, const char* psMethodSlot, bool bActivate = true ) TDE_DEPRECATED;
 	/**
 	 * @deprecated use insert( accel, pObjSlot, psMethodSlot );
 	 *
 	 */
-	KDE_DEPRECATED bool connectItem( TDEStdAccel::StdAccel accel, const TQObject* pObjSlot, const char* psMethodSlot )
+	TDE_DEPRECATED bool connectItem( TDEStdAccel::StdAccel accel, const TQObject* pObjSlot, const char* psMethodSlot )
 		{ return insert( accel, pObjSlot, psMethodSlot ); }
 	/**
 	 * @deprecated use remove
 	 */
-	bool removeItem( const TQString& sAction ) KDE_DEPRECATED;
+	bool removeItem( const TQString& sAction ) TDE_DEPRECATED;
 	/**
 	 * @deprecated
 	 */
-	bool setItemEnabled( const TQString& sAction, bool bEnable ) KDE_DEPRECATED;
+	bool setItemEnabled( const TQString& sAction, bool bEnable ) TDE_DEPRECATED;
 	/**
 	 * @deprecated see KDE3PORTING.html
 	 */
-	void changeMenuAccel( TQPopupMenu *menu, int id, const TQString& action ) KDE_DEPRECATED;
+	void changeMenuAccel( TQPopupMenu *menu, int id, const TQString& action ) TDE_DEPRECATED;
 	/**
 	 * @deprecated see KDE3PORTING.html
 	 */
-	void changeMenuAccel( TQPopupMenu *menu, int id, TDEStdAccel::StdAccel accel ) KDE_DEPRECATED;
+	void changeMenuAccel( TQPopupMenu *menu, int id, TDEStdAccel::StdAccel accel ) TDE_DEPRECATED;
 	/**
 	 * @deprecated
 	 */
-	static int stringToKey( const TQString& ) KDE_DEPRECATED;
+	static int stringToKey( const TQString& ) TDE_DEPRECATED;
 
 	/**
 	 * @deprecated  Use shortcut().
@@ -368,7 +368,7 @@ class TDECORE_EXPORT TDEAccel : public TQAccel
 	 * @p action, or zero if either the action name cannot be
 	 * found or the current key is set to no key.
 	 */
-	int currentKey( const TQString& action ) const KDE_DEPRECATED;
+	int currentKey( const TQString& action ) const TDE_DEPRECATED;
 
 	/**
 	 * @deprecated  Use actions().actionPtr().
@@ -376,7 +376,7 @@ class TDECORE_EXPORT TDEAccel : public TQAccel
 	 * Return the name of the accelerator item with the keycode @p key,
 	 * or TQString::null if the item cannot be found.
 	 */
-	TQString findKey( int key ) const KDE_DEPRECATED;
+	TQString findKey( int key ) const TDE_DEPRECATED;
 #endif // !KDE_NO_COMPAT
 
  protected:
diff --git a/tdecore/tdeapplication.h b/tdecore/tdeapplication.h
index 1c1563026..f90e8a42b 100644
--- a/tdecore/tdeapplication.h
+++ b/tdecore/tdeapplication.h
@@ -268,7 +268,7 @@ public:
   // REMOVE FOR KDE 4.0 - using it only gives crashing applications because
   // TDECmdLineArgs::init isn't called
   TDEApplication(int& argc, char** argv,
-              const TQCString& rAppName, bool allowStyles=true, bool GUIenabled=true, bool SMenabled=true) KDE_DEPRECATED;
+              const TQCString& rAppName, bool allowStyles=true, bool GUIenabled=true, bool SMenabled=true) TDE_DEPRECATED;
 
 #ifdef Q_QDOC
 #else // Q_QDOC
@@ -277,7 +277,7 @@ public:
   // FOR BINARY COMPATIBILITY ONLY
   // REMOVE WHEN PRACTICAL!
   TDEApplication(int& argc, char** argv,
-              const TQCString& rAppName, bool allowStyles, bool GUIenabled) KDE_DEPRECATED;
+              const TQCString& rAppName, bool allowStyles, bool GUIenabled) TDE_DEPRECATED;
 #endif // TDEAPPLICATION_BINARY_COMPAT_HACK
 #endif // Q_QDOC
 
@@ -545,7 +545,7 @@ public:
    *                   value will be appended to the filename,
    *                   prefixed with a "#" (hash) character.
    */
-  void invokeHTMLHelp( const TQString& aFilename, const TQString& aTopic = TQString::null ) const KDE_DEPRECATED;
+  void invokeHTMLHelp( const TQString& aFilename, const TQString& aTopic = TQString::null ) const TDE_DEPRECATED;
 
   /**
    * Convenience method; invokes the standard email application.
@@ -893,7 +893,7 @@ public:
   /**
    * @deprecated
    */
-  KDE_DEPRECATED TDEStyle* tdestyle() const { return 0; }
+  TDE_DEPRECATED TDEStyle* tdestyle() const { return 0; }
 
   /**
    * Builds a caption that contains the application name along with the
@@ -1219,7 +1219,7 @@ public:
    * @deprecated Use keyboardMouseState()
    * @since 3.1
    */
-  static uint keyboardModifiers() KDE_DEPRECATED;
+  static uint keyboardModifiers() TDE_DEPRECATED;
 
   /** @deprecated Same values as Button1Mask etc. in X.h */
   enum { Button1Pressed = 1<<8,
@@ -1231,7 +1231,7 @@ public:
    * @deprecated Use keyboardMouseState()
    * @since 3.1
    */
-  static uint mouseState() KDE_DEPRECATED;
+  static uint mouseState() TDE_DEPRECATED;
 
    /**
    * Returns the VT that the current X server is running on, or -1 if this information is unavailable.
diff --git a/tdecore/tdecmdlineargs.h b/tdecore/tdecmdlineargs.h
index 8705b4d35..013def801 100644
--- a/tdecore/tdecmdlineargs.h
+++ b/tdecore/tdecmdlineargs.h
@@ -257,7 +257,7 @@ public:
     */
   static void init(int _argc, char **_argv,
                    const char *_appname, const char *_description,
-                   const char *_version, bool noKApp = false) KDE_DEPRECATED;
+                   const char *_version, bool noKApp = false) TDE_DEPRECATED;
 
   /**
    * Initialize class.
diff --git a/tdecore/tdeconfigbackend.h b/tdecore/tdeconfigbackend.h
index c4149a69c..ab74f927f 100644
--- a/tdecore/tdeconfigbackend.h
+++ b/tdecore/tdeconfigbackend.h
@@ -159,7 +159,7 @@ private:
   /**
    * @deprecated Use fileName() instead
    */
-  KDE_DEPRECATED TQString filename() const { return mfileName; }
+  TDE_DEPRECATED TQString filename() const { return mfileName; }
 
 protected:
   TDEConfigBase *pConfig;
diff --git a/tdecore/tdelibs_export.h b/tdecore/tdelibs_export.h
index e1b7e3662..bfe07b0e3 100644
--- a/tdecore/tdelibs_export.h
+++ b/tdecore/tdelibs_export.h
@@ -69,18 +69,18 @@
 
 /* workaround for tdecore: stupid moc's grammar doesn't accept two macros
    between 'class' keyword and <classname>: */
-#ifdef KDE_DEPRECATED
+#ifdef TDE_DEPRECATED
 # ifndef TDECORE_EXPORT_DEPRECATED
-#  define TDECORE_EXPORT_DEPRECATED KDE_DEPRECATED TDECORE_EXPORT
+#  define TDECORE_EXPORT_DEPRECATED TDE_DEPRECATED TDECORE_EXPORT
 # endif
 # ifndef TDEIO_EXPORT_DEPRECATED
-#  define TDEIO_EXPORT_DEPRECATED KDE_DEPRECATED TDEIO_EXPORT
+#  define TDEIO_EXPORT_DEPRECATED TDE_DEPRECATED TDEIO_EXPORT
 # endif
 # ifndef TDEUI_EXPORT_DEPRECATED
-#  define TDEUI_EXPORT_DEPRECATED KDE_DEPRECATED TDEUI_EXPORT
+#  define TDEUI_EXPORT_DEPRECATED TDE_DEPRECATED TDEUI_EXPORT
 # endif
 # ifndef KABC_EXPORT_DEPRECATED
-#  define KABC_EXPORT_DEPRECATED KDE_DEPRECATED KABC_EXPORT
+#  define KABC_EXPORT_DEPRECATED TDE_DEPRECATED KABC_EXPORT
 # endif
 #endif
 /* (let's add KDE****_EXPORT_DEPRECATED for other libraries if it's needed) */
diff --git a/tdecore/tdelocale.h b/tdecore/tdelocale.h
index 19525535c..395344890 100644
--- a/tdecore/tdelocale.h
+++ b/tdecore/tdelocale.h
@@ -410,7 +410,7 @@ public:
    *
    * calls formatNumber(numStr, 2)
    */
-  TQString formatNumber(const TQString &numStr) const KDE_DEPRECATED;
+  TQString formatNumber(const TQString &numStr) const TDE_DEPRECATED;
 
   /**
    * Given a string representing a number, converts that to a numeric
@@ -512,7 +512,7 @@ public:
    *
    * @return true if the week starts on Monday
    */
-  bool weekStartsMonday() const KDE_DEPRECATED; //### remove for KDE 4.0
+  bool weekStartsMonday() const TDE_DEPRECATED; //### remove for KDE 4.0
 
   /**
    * Use this to determine which day is the first day of the week.
@@ -542,7 +542,7 @@ public:
    * \endcode
    * to the applicable file.
    */
-  TQString monthName(int i, bool shortName = false) const KDE_DEPRECATED;
+  TQString monthName(int i, bool shortName = false) const TDE_DEPRECATED;
 
   /**
    * @deprecated
@@ -567,7 +567,7 @@ public:
    * \endcode
    * to the applicable file.
   */
-  TQString monthNamePossessive(int i, bool shortName = false) const KDE_DEPRECATED;
+  TQString monthNamePossessive(int i, bool shortName = false) const TDE_DEPRECATED;
 
   /**
    * @deprecated use calendar()->weekDayName
@@ -579,7 +579,7 @@ public:
    *
    * @return The name of the day
    */
-  TQString weekDayName(int i, bool shortName = false) const KDE_DEPRECATED;
+  TQString weekDayName(int i, bool shortName = false) const TDE_DEPRECATED;
 
   /**
    * Returns a pointer to the calendar system object.
@@ -880,7 +880,7 @@ public:
    *
    * @param start True if Monday is the first day in the week
    */
-  void setWeekStartsMonday(bool start) KDE_DEPRECATED; //### remove for KDE 4.0
+  void setWeekStartsMonday(bool start) TDE_DEPRECATED; //### remove for KDE 4.0
 
   /**
    * Changes how TDELocale defines the first day in week.
@@ -1148,7 +1148,7 @@ private:
    * @deprecated
    * use formatMoney(double)
    */
-  TQString formatMoney(const TQString &numStr) const KDE_DEPRECATED;
+  TQString formatMoney(const TQString &numStr) const TDE_DEPRECATED;
 
   /**
    * @deprecated
@@ -1156,19 +1156,19 @@ private:
    *
    * @return String containing language codes separated by colons
    */
-  TQString languages() const KDE_DEPRECATED;
+  TQString languages() const TDE_DEPRECATED;
 
   /**
    * @deprecated
    * @return True
    */
-  bool setCharset(const TQString & charset) KDE_DEPRECATED;
+  bool setCharset(const TQString & charset) TDE_DEPRECATED;
 
   /**
    * @deprecated
    * @see encoding
    */
-  TQString charset() const KDE_DEPRECATED;
+  TQString charset() const TDE_DEPRECATED;
 
 protected:
   /**
diff --git a/tdecore/tdestdaccel.h b/tdecore/tdestdaccel.h
index e39b090b9..735c11dd0 100644
--- a/tdecore/tdestdaccel.h
+++ b/tdecore/tdestdaccel.h
@@ -452,22 +452,22 @@ namespace TDEStdAccel
    * @deprecated
    * Obsolete.  Use name().  Returns a string representation for @p accel.
    */
-  TDECORE_EXPORT TQString action(StdAccel id) KDE_DEPRECATED;
+  TDECORE_EXPORT TQString action(StdAccel id) TDE_DEPRECATED;
   /**
    * @deprecated
    * Obsolete.  Use desc().  Returns a localized description of @p accel.
    */
-  TDECORE_EXPORT TQString description(StdAccel id) KDE_DEPRECATED;
+  TDECORE_EXPORT TQString description(StdAccel id) TDE_DEPRECATED;
   /**
    * @deprecated
    * Obsolete.  Use shortcut().  Returns the keybinding for @p accel.
    */
-  TDECORE_EXPORT int key(StdAccel) KDE_DEPRECATED;
+  TDECORE_EXPORT int key(StdAccel) TDE_DEPRECATED;
   /**
    * @deprecated
    * Obsolete.  Use shortcutDefault().
    */
-  TDECORE_EXPORT int defaultKey(StdAccel accel) KDE_DEPRECATED;
+  TDECORE_EXPORT int defaultKey(StdAccel accel) TDE_DEPRECATED;
 
   /**
    * @deprecated.  Use KKey(const TQKeyEvent*) == KKey(int).
@@ -484,7 +484,7 @@ namespace TDEStdAccel
    *
    * @return true if the int value matches the integer representation of the QKeyEvent
    */
-  TDECORE_EXPORT bool isEqual(const TQKeyEvent* pEvent, int keyQt) KDE_DEPRECATED;
+  TDECORE_EXPORT bool isEqual(const TQKeyEvent* pEvent, int keyQt) TDE_DEPRECATED;
 #endif // !KDE_NO_COMPAT
 
 }
diff --git a/tdecore/twin.h b/tdecore/twin.h
index 141edeffc..53d697131 100644
--- a/tdecore/twin.h
+++ b/tdecore/twin.h
@@ -110,7 +110,7 @@ public:
      * @deprecated Consider using activateWindow(), use forceActiveWindow()
      * only if necessary.
      */
-    static void setActiveWindow( WId win ) KDE_DEPRECATED;
+    static void setActiveWindow( WId win ) TDE_DEPRECATED;
 
     /**
      * When application finishes some operation and wants to notify
@@ -502,7 +502,7 @@ public:
      * @deprecated
      * Use windowInfo() .
      */
-    static Info info( WId win ) KDE_DEPRECATED;
+    static Info info( WId win ) TDE_DEPRECATED;
 
 #ifdef KDE_NO_COMPAT
 private:
@@ -511,7 +511,7 @@ private:
      * @deprecated
      * Use TDEStartupInfo::appStarted
      */
-    static void appStarted() KDE_DEPRECATED;
+    static void appStarted() TDE_DEPRECATED;
 };