diff options
86 files changed, 307 insertions, 307 deletions
diff --git a/dcop/dcopclient.h b/dcop/dcopclient.h index 7035e3c72..af7e27557 100644 --- a/dcop/dcopclient.h +++ b/dcop/dcopclient.h @@ -448,7 +448,7 @@ class DCOP_EXPORT DCOPClient : public TQObject */ bool connectDCOPSignal( const TQCString &sender, const TQCString &signal, const TQCString &receiverObj, const TQCString &slot, - bool Volatile) KDE_DEPRECATED; + bool Volatile) TDE_DEPRECATED; /** * Disconnects a DCOP signal. @@ -476,7 +476,7 @@ class DCOP_EXPORT DCOPClient : public TQObject * For backwards compatibility */ bool disconnectDCOPSignal( const TQCString &sender, const TQCString &signal, - const TQCString &receiverObj, const TQCString &slot) KDE_DEPRECATED; + const TQCString &receiverObj, const TQCString &slot) TDE_DEPRECATED; /** * Reimplement this function to handle app-wide function calls unassociated w/an object. @@ -739,7 +739,7 @@ class DCOP_EXPORT DCOPClient : public TQObject * For backwards compatibility with KDE 2.x * // KDE4 remove */ - static TQCString dcopServerFileOld(const TQCString &hostname=0) KDE_DEPRECATED; + static TQCString dcopServerFileOld(const TQCString &hostname=0) TDE_DEPRECATED; /** * Return the path of iceauth or an empty string if not found. diff --git a/libtdemid/player.h b/libtdemid/player.h index ae33de849..5a6a46a95 100644 --- a/libtdemid/player.h +++ b/libtdemid/player.h @@ -181,7 +181,7 @@ struct PlayerController * @deprecated * Not used */ - volatile int message KDE_DEPRECATED; // set one of the following : + volatile int message TDE_DEPRECATED; // set one of the following : #define PLAYER_DOPAUSE 1 #define PLAYER_DOSTOP 2 diff --git a/tdeabc/addressbook.h b/tdeabc/addressbook.h index f2fa1e0e1..f505f5526 100644 --- a/tdeabc/addressbook.h +++ b/tdeabc/addressbook.h @@ -339,7 +339,7 @@ class KABC_EXPORT AddressBook : public TQObject /** @deprecated There is no need to call this function anymore. */ - void cleanUp() KDE_DEPRECATED; + void cleanUp() TDE_DEPRECATED; /** Used for debug output. This function prints out the list diff --git a/tdeabc/ldifconverter.h b/tdeabc/ldifconverter.h index 30c8889d6..50c97f759 100644 --- a/tdeabc/ldifconverter.h +++ b/tdeabc/ldifconverter.h @@ -76,7 +76,7 @@ namespace TDEABC { * @param allowEncode Set to false if you wish no encoding of the value. * @since 3.2 */ - KABC_EXPORT TQString makeLDIFfieldString( TQString field, TQString value, bool allowEncode = true ) KDE_DEPRECATED; + KABC_EXPORT TQString makeLDIFfieldString( TQString field, TQString value, bool allowEncode = true ) TDE_DEPRECATED; diff --git a/tdeabc/stdaddressbook.h b/tdeabc/stdaddressbook.h index 290999d66..2a6b171e5 100644 --- a/tdeabc/stdaddressbook.h +++ b/tdeabc/stdaddressbook.h @@ -83,12 +83,12 @@ class KABC_EXPORT StdAddressBook : public AddressBook @deprecated Use AddressBook::save( Ticket* ) instead */ - static bool save() KDE_DEPRECATED; + static bool save() TDE_DEPRECATED; /** @deprecated There is no need to call this function anymore. */ - static void handleCrash() KDE_DEPRECATED; + static void handleCrash() TDE_DEPRECATED; /** Returns the default file name for vcard-based addressbook diff --git a/tdeabc/vcardconverter.h b/tdeabc/vcardconverter.h index c8944ff1c..9c7cb17de 100644 --- a/tdeabc/vcardconverter.h +++ b/tdeabc/vcardconverter.h @@ -111,12 +111,12 @@ class KABC_EXPORT VCardConverter /** @deprecated */ - bool vCardToAddressee( const TQString&, Addressee &, Version version = v3_0 ) KDE_DEPRECATED; + bool vCardToAddressee( const TQString&, Addressee &, Version version = v3_0 ) TDE_DEPRECATED; /** @deprecated */ - bool addresseeToVCard( const Addressee&, TQString&, Version version = v3_0 ) KDE_DEPRECATED; + bool addresseeToVCard( const Addressee&, TQString&, Version version = v3_0 ) TDE_DEPRECATED; private: /** 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 <weis@kde.org> */ -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; }; diff --git a/tdehtml/dom/dom_node.h b/tdehtml/dom/dom_node.h index b87997547..47f3ba9ef 100644 --- a/tdehtml/dom/dom_node.h +++ b/tdehtml/dom/dom_node.h @@ -900,12 +900,12 @@ public: * @internal returns the index of a node */ unsigned long index() const; - TQString toHTML() KDE_DEPRECATED; + TQString toHTML() TDE_DEPRECATED; void applyChanges(); /** * @deprecated without substitution since 3.2 */ - void getCursor(int offset, int &_x, int &_y, int &height) KDE_DEPRECATED; + void getCursor(int offset, int &_x, int &_y, int &height) TDE_DEPRECATED; /** * not part of the DOM. * @returns the exact coordinates and size of this element. diff --git a/tdehtml/dom/html_form.h b/tdehtml/dom/html_form.h index d0e20da73..63c626356 100644 --- a/tdehtml/dom/html_form.h +++ b/tdehtml/dom/html_form.h @@ -534,12 +534,12 @@ public: /** * @deprecated */ - DOMString size() const KDE_DEPRECATED; + DOMString size() const TDE_DEPRECATED; /** * @deprecated */ - void setSize( const DOMString & ) KDE_DEPRECATED; + void setSize( const DOMString & ) TDE_DEPRECATED; /** * Size information. The precise meaning is specific to each type diff --git a/tdehtml/dom/html_image.h b/tdehtml/dom/html_image.h index 8258d7a63..f6f25b0d6 100644 --- a/tdehtml/dom/html_image.h +++ b/tdehtml/dom/html_image.h @@ -256,12 +256,12 @@ public: /** * @deprecated */ - long border() const KDE_DEPRECATED; + long border() const TDE_DEPRECATED; /** * @deprecated */ - void setBorder( long ) KDE_DEPRECATED; + void setBorder( long ) TDE_DEPRECATED; /** * Override height. See the <a diff --git a/tdehtml/dom/html_misc.h b/tdehtml/dom/html_misc.h index 9cb6dc976..d10ea6af0 100644 --- a/tdehtml/dom/html_misc.h +++ b/tdehtml/dom/html_misc.h @@ -105,12 +105,12 @@ public: /** * @deprecated */ - DOMString size() const KDE_DEPRECATED; + DOMString size() const TDE_DEPRECATED; /** * @deprecated */ - void setSize( const DOMString & ) KDE_DEPRECATED; + void setSize( const DOMString & ) TDE_DEPRECATED; }; // -------------------------------------------------------------------------- diff --git a/tdehtml/dom/html_object.h b/tdehtml/dom/html_object.h index 56c592fa3..6161f8ef2 100644 --- a/tdehtml/dom/html_object.h +++ b/tdehtml/dom/html_object.h @@ -167,12 +167,12 @@ public: /** * @deprecated */ - DOMString hspace() const KDE_DEPRECATED; + DOMString hspace() const TDE_DEPRECATED; /** * @deprecated */ - void setHspace( const DOMString &value ) KDE_DEPRECATED; + void setHspace( const DOMString &value ) TDE_DEPRECATED; /** * The name of the applet. See the <a @@ -220,12 +220,12 @@ public: /** * @deprecated */ - DOMString vspace() const KDE_DEPRECATED; + DOMString vspace() const TDE_DEPRECATED; /** * @deprecated */ - void setVspace( const DOMString & ) KDE_DEPRECATED; + void setVspace( const DOMString & ) TDE_DEPRECATED; /** * Override width. See the <a @@ -419,12 +419,12 @@ public: /** * @deprecated */ - DOMString hspace() const KDE_DEPRECATED; + DOMString hspace() const TDE_DEPRECATED; /** * @deprecated */ - void setHspace( const DOMString & ) KDE_DEPRECATED; + void setHspace( const DOMString & ) TDE_DEPRECATED; /** * Form control or object name when submitted with a form. See the @@ -512,12 +512,12 @@ public: /** * @deprecated */ - DOMString vspace() const KDE_DEPRECATED; + DOMString vspace() const TDE_DEPRECATED; /** * @deprecated */ - void setVspace( const DOMString & ) KDE_DEPRECATED; + void setVspace( const DOMString & ) TDE_DEPRECATED; /** * Override width. See the <a diff --git a/tdeio/kssl/kopenssl.h b/tdeio/kssl/kopenssl.h index 18255034c..d305243e4 100644 --- a/tdeio/kssl/kopenssl.h +++ b/tdeio/kssl/kopenssl.h @@ -1063,15 +1063,15 @@ public: # undef X509_STORE_CTX_set_chain # undef SSLv23_client_method #endif - STACK *sk_dup(const STACK *s) KDE_DEPRECATED; - void sk_free(STACK *s) KDE_DEPRECATED; - STACK *sk_new(int (*cmp)()) KDE_DEPRECATED; - int sk_num(STACK *s) KDE_DEPRECATED; - char *sk_pop(STACK *s) KDE_DEPRECATED; - int sk_push(STACK *s, char *d) KDE_DEPRECATED; - char *sk_value(STACK *s, int n) KDE_DEPRECATED; - void X509_STORE_CTX_set_chain(X509_STORE_CTX *v, STACK_OF(X509)* x) KDE_DEPRECATED; - SSL_METHOD *SSLv23_client_method() KDE_DEPRECATED; + STACK *sk_dup(const STACK *s) TDE_DEPRECATED; + void sk_free(STACK *s) TDE_DEPRECATED; + STACK *sk_new(int (*cmp)()) TDE_DEPRECATED; + int sk_num(STACK *s) TDE_DEPRECATED; + char *sk_pop(STACK *s) TDE_DEPRECATED; + int sk_push(STACK *s, char *d) TDE_DEPRECATED; + char *sk_value(STACK *s, int n) TDE_DEPRECATED; + void X509_STORE_CTX_set_chain(X509_STORE_CTX *v, STACK_OF(X509)* x) TDE_DEPRECATED; + SSL_METHOD *SSLv23_client_method() TDE_DEPRECATED; #endif diff --git a/tdeio/kssl/kssl.h b/tdeio/kssl/kssl.h index 37ee5017b..ec4fb9842 100644 --- a/tdeio/kssl/kssl.h +++ b/tdeio/kssl/kssl.h @@ -177,7 +177,7 @@ public: * @param proxy is the IP or hostname of the proxy server * @deprecated */ - void setProxyUse(bool active, TQString realIP = TQString::null, int realPort = 0, TQString proxy = TQString::null) KDE_DEPRECATED; + void setProxyUse(bool active, TQString realIP = TQString::null, int realPort = 0, TQString proxy = TQString::null) TDE_DEPRECATED; /** * Set the peer hostname to be used for certificate verification. diff --git a/tdeio/kssl/ksslcertchain.h b/tdeio/kssl/ksslcertchain.h index eb6c27d44..bf9c66cc3 100644 --- a/tdeio/kssl/ksslcertchain.h +++ b/tdeio/kssl/ksslcertchain.h @@ -95,7 +95,7 @@ public: * @param chain the certificate chain * @deprecated */ - void setChain(TQStringList chain) KDE_DEPRECATED; + void setChain(TQStringList chain) TDE_DEPRECATED; /** * Set the certificate chain as a list of base64 encoded X.509 diff --git a/tdeio/kssl/ksslcertdlg.h b/tdeio/kssl/ksslcertdlg.h index d4ec4412f..73300ec9d 100644 --- a/tdeio/kssl/ksslcertdlg.h +++ b/tdeio/kssl/ksslcertdlg.h @@ -65,7 +65,7 @@ public: * @param sendChecked send the checked item to the remote host * @deprecated */ - void setup(TQStringList certs, bool saveChecked = false, bool sendChecked = true) KDE_DEPRECATED; + void setup(TQStringList certs, bool saveChecked = false, bool sendChecked = true) TDE_DEPRECATED; /** * Setup the dialog. Call this before you display the dialog. diff --git a/tdeio/kssl/ksslsettings.h b/tdeio/kssl/ksslsettings.h index 18b55331f..47b0de345 100644 --- a/tdeio/kssl/ksslsettings.h +++ b/tdeio/kssl/ksslsettings.h @@ -120,19 +120,19 @@ public: * Do not use this * @deprecated */ - bool warnOnSelfSigned() const KDE_DEPRECATED; + bool warnOnSelfSigned() const TDE_DEPRECATED; /** * Do not use this * @deprecated */ - bool warnOnRevoked() const KDE_DEPRECATED; + bool warnOnRevoked() const TDE_DEPRECATED; /** * Do not use this * @deprecated */ - bool warnOnExpired() const KDE_DEPRECATED; + bool warnOnExpired() const TDE_DEPRECATED; /** * Does the user want to use the Entropy Gathering Daemon? diff --git a/tdeio/tdefile/kpropertiesdialog.h b/tdeio/tdefile/kpropertiesdialog.h index cc1f75b86..61fc22a6b 100644 --- a/tdeio/tdefile/kpropertiesdialog.h +++ b/tdeio/tdefile/kpropertiesdialog.h @@ -129,7 +129,7 @@ public: * @param autoShow tells the dialog whether it should show itself automatically. */ KPropertiesDialog( const KURL& _url, mode_t _mode, TQWidget* parent = 0L, const char* name = 0L, - bool modal = false, bool autoShow = true) KDE_DEPRECATED; + bool modal = false, bool autoShow = true) TDE_DEPRECATED; #endif /** @@ -270,12 +270,12 @@ public: * @return a pointer to the dialog * @deprecated KPropertiesDialog directly inherits from KDialogBase, so use \a this instead */ - KDE_DEPRECATED KDialogBase* dialog() { return this; } + TDE_DEPRECATED KDialogBase* dialog() { return this; } /** * @return a pointer to the dialog * @deprecated KPropertiesDialog directly inherits from KDialogBase, so use \a this instead */ - KDE_DEPRECATED const KDialogBase* dialog() const { return this; } + TDE_DEPRECATED const KDialogBase* dialog() const { return this; } /** * If the dialog is being built from a template, this method diff --git a/tdeio/tdefile/tdefiledialog.h b/tdeio/tdefile/tdefiledialog.h index 9807893d0..3782e455f 100644 --- a/tdeio/tdefile/tdefiledialog.h +++ b/tdeio/tdefile/tdefiledialog.h @@ -309,7 +309,7 @@ public: * Do not use in conjunction with setFilter() * @deprecated */ - void setFilterMimeType(const TQString &label, const KMimeType::List &types, const KMimeType::Ptr &defaultType) KDE_DEPRECATED; + void setFilterMimeType(const TQString &label, const KMimeType::List &types, const KMimeType::Ptr &defaultType) TDE_DEPRECATED; /** * Returns the mimetype for the desired output format. @@ -364,7 +364,7 @@ public: * Ownership is transferred to KFileDialog. You need to create the * preview-widget with "new", i.e. on the heap. */ - void setPreviewWidget(const TQWidget *w) KDE_DEPRECATED; + void setPreviewWidget(const TQWidget *w) TDE_DEPRECATED; /** * Adds a preview widget and enters the preview mode. diff --git a/tdeio/tdeio/global.h b/tdeio/tdeio/global.h index c4ba34f95..77e2da77b 100644 --- a/tdeio/tdeio/global.h +++ b/tdeio/tdeio/global.h @@ -103,7 +103,7 @@ namespace TDEIO * @param speed speed in bytes per second * @return calculated remaining time */ - TDEIO_EXPORT TQTime calculateRemaining( TDEIO::filesize_t totalSize, TDEIO::filesize_t processedSize, TDEIO::filesize_t speed ) KDE_DEPRECATED; + TDEIO_EXPORT TQTime calculateRemaining( TDEIO::filesize_t totalSize, TDEIO::filesize_t processedSize, TDEIO::filesize_t speed ) TDE_DEPRECATED; /** * Helper for showing information about a set of files and directories diff --git a/tdeio/tdeio/jobclasses.h b/tdeio/tdeio/jobclasses.h index d83668f5b..5d04b7f5d 100644 --- a/tdeio/tdeio/jobclasses.h +++ b/tdeio/tdeio/jobclasses.h @@ -1285,7 +1285,7 @@ namespace TDEIO { /** * @deprecated */ - void setSourceSize( off_t size ) KDE_DEPRECATED; + void setSourceSize( off_t size ) TDE_DEPRECATED; /** * Returns the source URL. diff --git a/tdeio/tdeio/kdatatool.h b/tdeio/tdeio/kdatatool.h index d94acdc11..ab5a2ee4b 100644 --- a/tdeio/tdeio/kdatatool.h +++ b/tdeio/tdeio/kdatatool.h @@ -97,13 +97,13 @@ public: * @return a large pixmap for the DataTool. * @deprecated, use iconName() */ - TQPixmap icon() const KDE_DEPRECATED; + TQPixmap icon() const TDE_DEPRECATED; /** * Returns the mini icon of this data tool. * @return a mini pixmap for the DataTool. * @deprecated, use iconName() */ - TQPixmap miniIcon() const KDE_DEPRECATED; + TQPixmap miniIcon() const TDE_DEPRECATED; /** * Returns the icon name for this DataTool. * @return the name of the icon for the DataTool diff --git a/tdeio/tdeio/kfilterdev.h b/tdeio/tdeio/kfilterdev.h index 1783eccdf..c692e3a0b 100644 --- a/tdeio/tdeio/kfilterdev.h +++ b/tdeio/tdeio/kfilterdev.h @@ -114,7 +114,7 @@ private: * @deprecated. Use deviceForFile instead. * To be removed in KDE 3.0 */ - static TQIODevice* createFilterDevice(KFilterBase* base, TQFile* file) KDE_DEPRECATED; + static TQIODevice* createFilterDevice(KFilterBase* base, TQFile* file) TDE_DEPRECATED; public: /** diff --git a/tdeio/tdeio/kmimetype.h b/tdeio/tdeio/kmimetype.h index b6ec9267e..5a7dcd345 100644 --- a/tdeio/tdeio/kmimetype.h +++ b/tdeio/tdeio/kmimetype.h @@ -580,7 +580,7 @@ public: * @param service the service to execute * @deprecated, see the other executeService */ - static void executeService( const TQString& path, KDEDesktopMimeType::Service& service ) KDE_DEPRECATED; + static void executeService( const TQString& path, KDEDesktopMimeType::Service& service ) TDE_DEPRECATED; /** * Execute @p service on the list of @p urls. diff --git a/tdeio/tdeio/kprotocolinfo.h b/tdeio/tdeio/kprotocolinfo.h index 3cf142b69..c729164ef 100644 --- a/tdeio/tdeio/kprotocolinfo.h +++ b/tdeio/tdeio/kprotocolinfo.h @@ -612,38 +612,38 @@ public: // The following methods are deprecated: /// @deprecated - static Type inputType( const TQString& protocol ) KDE_DEPRECATED; + static Type inputType( const TQString& protocol ) TDE_DEPRECATED; /// @deprecated - static Type outputType( const TQString& protocol ) KDE_DEPRECATED; + static Type outputType( const TQString& protocol ) TDE_DEPRECATED; /** * @deprecated * Returns the list of fields this protocol returns when listing * The current possibilities are * Name, Type, Size, Date, AccessDate, Access, Owner, Group, Link, URL, MimeType */ - static TQStringList listing( const TQString& protocol ) KDE_DEPRECATED; + static TQStringList listing( const TQString& protocol ) TDE_DEPRECATED; /// @deprecated - static bool isSourceProtocol( const TQString& protocol ) KDE_DEPRECATED; + static bool isSourceProtocol( const TQString& protocol ) TDE_DEPRECATED; /// @deprecated - static bool supportsListing( const TQString& protocol ) KDE_DEPRECATED; + static bool supportsListing( const TQString& protocol ) TDE_DEPRECATED; /// @deprecated - static bool supportsReading( const TQString& protocol ) KDE_DEPRECATED; + static bool supportsReading( const TQString& protocol ) TDE_DEPRECATED; /// @deprecated - static bool supportsWriting( const TQString& protocol ) KDE_DEPRECATED; + static bool supportsWriting( const TQString& protocol ) TDE_DEPRECATED; /// @deprecated - static bool supportsMakeDir( const TQString& protocol ) KDE_DEPRECATED; + static bool supportsMakeDir( const TQString& protocol ) TDE_DEPRECATED; /// @deprecated - static bool supportsDeleting( const TQString& protocol ) KDE_DEPRECATED; + static bool supportsDeleting( const TQString& protocol ) TDE_DEPRECATED; /// @deprecated - static bool supportsLinking( const TQString& protocol ) KDE_DEPRECATED; + static bool supportsLinking( const TQString& protocol ) TDE_DEPRECATED; /// @deprecated - static bool supportsMoving( const TQString& protocol ) KDE_DEPRECATED; + static bool supportsMoving( const TQString& protocol ) TDE_DEPRECATED; /// @deprecated - static bool canCopyFromFile( const TQString& protocol ) KDE_DEPRECATED; + static bool canCopyFromFile( const TQString& protocol ) TDE_DEPRECATED; /// @deprecated - static bool canCopyToFile( const TQString& protocol ) KDE_DEPRECATED; + static bool canCopyToFile( const TQString& protocol ) TDE_DEPRECATED; /// @deprecated - static TQString defaultMimetype( const TQString& protocol) KDE_DEPRECATED; + static TQString defaultMimetype( const TQString& protocol) TDE_DEPRECATED; //////////////////////// END DEPRECATED /////////////////////// protected: diff --git a/tdeio/tdeio/kurifilter.h b/tdeio/tdeio/kurifilter.h index 3c6861c15..9118f7f89 100644 --- a/tdeio/tdeio/kurifilter.h +++ b/tdeio/tdeio/kurifilter.h @@ -142,7 +142,7 @@ public: * * @deprecated */ - KDE_DEPRECATED bool hasBeenFiltered() const { return true; } + TDE_DEPRECATED bool hasBeenFiltered() const { return true; } /** * Returns the filtered or the original URL. diff --git a/tdeio/tdeio/netaccess.h b/tdeio/tdeio/netaccess.h index b5e126086..5a9767515 100644 --- a/tdeio/tdeio/netaccess.h +++ b/tdeio/tdeio/netaccess.h @@ -119,7 +119,7 @@ public: /** * @deprecated. Use the function above instead. */ - static bool download(const KURL& src, TQString & target) KDE_DEPRECATED; + static bool download(const KURL& src, TQString & target) TDE_DEPRECATED; /** * Removes the specified file if and only if it was created @@ -158,7 +158,7 @@ public: /** * @deprecated. Use the function above instead. */ - static bool upload(const TQString& src, const KURL& target) KDE_DEPRECATED; + static bool upload(const TQString& src, const KURL& target) TDE_DEPRECATED; /** * Alternative to upload for copying over the network. @@ -184,7 +184,7 @@ public: /** * @deprecated. Use the function above instead. */ - static bool copy( const KURL& src, const KURL& target ) KDE_DEPRECATED; + static bool copy( const KURL& src, const KURL& target ) TDE_DEPRECATED; // KDE4: merge with above /** @@ -226,7 +226,7 @@ public: /** * @deprecated. Use the function above instead. */ - static bool dircopy( const KURL& src, const KURL& target ) KDE_DEPRECATED; // KDE4: merge + static bool dircopy( const KURL& src, const KURL& target ) TDE_DEPRECATED; // KDE4: merge /** * Overloaded method, which takes a list of source URLs @@ -283,17 +283,17 @@ public: * @deprecated. Use the function above instead. * @since 3.2 */ - static bool exists(const KURL& url, TQWidget* window) KDE_DEPRECATED; + static bool exists(const KURL& url, TQWidget* window) TDE_DEPRECATED; /** * @deprecated. Use the function above instead. */ - static bool exists(const KURL& url) KDE_DEPRECATED; + static bool exists(const KURL& url) TDE_DEPRECATED; /** * @deprecated. Use the function above instead. */ - static bool exists(const KURL& url, bool source) KDE_DEPRECATED; // KDE4: merge + static bool exists(const KURL& url, bool source) TDE_DEPRECATED; // KDE4: merge /** * Tests whether a URL exists and return information on it. @@ -316,7 +316,7 @@ public: /** * @deprecated. Use the function above instead. */ - static bool stat(const KURL& url, TDEIO::UDSEntry & entry) KDE_DEPRECATED; + static bool stat(const KURL& url, TDEIO::UDSEntry & entry) TDE_DEPRECATED; /** * Tries to map a local URL for the given URL. @@ -358,7 +358,7 @@ public: * you should try to identify a suitable parent widget * if at all possible. */ - static bool del( const KURL & url ) KDE_DEPRECATED; + static bool del( const KURL & url ) TDE_DEPRECATED; /** * Creates a directory in a synchronous way. @@ -383,7 +383,7 @@ public: * you should try to identify a suitable parent widget * if at all possible. */ - static bool mkdir( const KURL & url, int permissions = -1 ) KDE_DEPRECATED; + static bool mkdir( const KURL & url, int permissions = -1 ) TDE_DEPRECATED; /** * Executes a remote process via the fish ioslave in a synchronous way. @@ -472,7 +472,7 @@ public: * you should try to identify a suitable parent widget * if at all possible. */ - static TQString mimetype( const KURL & url ) KDE_DEPRECATED; + static TQString mimetype( const KURL & url ) TDE_DEPRECATED; /** * Returns the error string for the last job, in case it failed. diff --git a/tdeio/tdeio/passdlg.h b/tdeio/tdeio/passdlg.h index c1e3606b4..b5c56ffba 100644 --- a/tdeio/tdeio/passdlg.h +++ b/tdeio/tdeio/passdlg.h @@ -113,7 +113,7 @@ public: /** * @deprecated. Use setUserReadOnly(bool). */ - KDE_DEPRECATED void setEnableUserField( bool enable, bool=false ) { + TDE_DEPRECATED void setEnableUserField( bool enable, bool=false ) { setUserReadOnly( !enable ); }; diff --git a/tdeio/tdeio/slave.h b/tdeio/tdeio/slave.h index 2f8138dc9..dafde7842 100644 --- a/tdeio/tdeio/slave.h +++ b/tdeio/tdeio/slave.h @@ -204,7 +204,7 @@ namespace TDEIO { * within TDEIO::Slave instead. Old code directly accessing connection() * will not be able to access special protocols. */ - KDE_DEPRECATED Connection *connection() { return &slaveconn; } // TODO(BIC): remove before KDE 4 + TDE_DEPRECATED Connection *connection() { return &slaveconn; } // TODO(BIC): remove before KDE 4 void ref() { m_refCount++; } void deref() { m_refCount--; if (!m_refCount) delete this; } diff --git a/tdeio/tdeio/slaveinterface.h b/tdeio/tdeio/slaveinterface.h index 2f9fdbd5a..aca56f09b 100644 --- a/tdeio/tdeio/slaveinterface.h +++ b/tdeio/tdeio/slaveinterface.h @@ -210,12 +210,12 @@ protected: */ void openPassDlg( const TQString& prompt, const TQString& user, const TQString& caption, const TQString& comment, - const TQString& label, bool readOnly ) KDE_DEPRECATED; + const TQString& label, bool readOnly ) TDE_DEPRECATED; /** * @deprecated. Use openPassDlg( AuthInfo& ) instead. */ - void openPassDlg( const TQString& prompt, const TQString& user, bool readOnly ) KDE_DEPRECATED; + void openPassDlg( const TQString& prompt, const TQString& user, bool readOnly ) TDE_DEPRECATED; void messageBox( int type, const TQString &text, const TQString &caption, const TQString &buttonYes, const TQString &buttonNo ); diff --git a/tdeio/tdeio/tcpslavebase.h b/tdeio/tdeio/tcpslavebase.h index 4903dd7ac..a0a8620fc 100644 --- a/tdeio/tdeio/tcpslavebase.h +++ b/tdeio/tdeio/tcpslavebase.h @@ -60,48 +60,48 @@ protected: /** * @deprecated Due to inconsistency with KDE naming convention. */ - KDE_DEPRECATED ssize_t Write(const void *data, ssize_t len) { return write( data, len ); } + TDE_DEPRECATED ssize_t Write(const void *data, ssize_t len) { return write( data, len ); } /** * @deprecated Due to inconsistency with KDE naming convention. */ - KDE_DEPRECATED ssize_t Read(void *data, ssize_t len) { return read( data, len ); } + TDE_DEPRECATED ssize_t Read(void *data, ssize_t len) { return read( data, len ); } /** * @deprecated Due to inconsistency with KDE naming convention. */ - KDE_DEPRECATED ssize_t ReadLine(char *data, ssize_t len) { return readLine( data, len ); } + TDE_DEPRECATED ssize_t ReadLine(char *data, ssize_t len) { return readLine( data, len ); } /** * @deprecated Due to inconsistency with KDE naming convention. */ - KDE_DEPRECATED unsigned short int GetPort(unsigned short int p) { return port(p); } + TDE_DEPRECATED unsigned short int GetPort(unsigned short int p) { return port(p); } /** * @deprecated Due to inconsistency with KDE naming convention. */ - KDE_DEPRECATED bool ConnectToHost( const TQString &host, unsigned int port, + TDE_DEPRECATED bool ConnectToHost( const TQString &host, unsigned int port, bool sendError ) { return connectToHost( host, port, sendError ); } /** * @deprecated Due to inconsistency with KDE naming convention. */ - KDE_DEPRECATED void CloseDescriptor() { closeDescriptor(); } + TDE_DEPRECATED void CloseDescriptor() { closeDescriptor(); } /** * @deprecated Due to inconsistency with KDE naming convention. */ - KDE_DEPRECATED bool AtEOF() { return atEnd(); } + TDE_DEPRECATED bool AtEOF() { return atEnd(); } /** * @deprecated Due to inconsistency with KDE naming convention. */ - KDE_DEPRECATED bool InitializeSSL() { return initializeSSL(); } + TDE_DEPRECATED bool InitializeSSL() { return initializeSSL(); } /** * @deprecated Due to inconsistency with KDE naming convention. */ - KDE_DEPRECATED void CleanSSL() { cleanSSL(); } + TDE_DEPRECATED void CleanSSL() { cleanSSL(); } #endif /** diff --git a/tdemdi/tdemdichildarea.h b/tdemdi/tdemdichildarea.h index a755df515..a36b3ee51 100644 --- a/tdemdi/tdemdichildarea.h +++ b/tdemdi/tdemdichildarea.h @@ -192,7 +192,7 @@ public: * TDEGlobalSettings::inactiveTitleColor() and TDEGlobalSettings::inactiveTextColor() instead. */ static void getCaptionColors( const TQPalette &pal, TQColor &activeBG, TQColor &activeFG, - TQColor &inactiveBG, TQColor &inactiveFG ) KDE_DEPRECATED; + TQColor &inactiveBG, TQColor &inactiveFG ) TDE_DEPRECATED; public slots: /** diff --git a/tdemdi/tdemdimainfrm.h b/tdemdi/tdemdimainfrm.h index 780df6fc4..4af486538 100644 --- a/tdemdi/tdemdimainfrm.h +++ b/tdemdi/tdemdimainfrm.h @@ -643,7 +643,7 @@ public slots: * Sets the appearance of the IDEAl mode. See KMultiTabBar styles for the first 3 bits. * @deprecated use setToolviewStyle(int flags) instead */ - void setIDEAlModeStyle( int flags ) KDE_DEPRECATED; + void setIDEAlModeStyle( int flags ) TDE_DEPRECATED; //KDE4: Get rid of the above. /** * Sets the appearance of the toolview tabs. diff --git a/tdenewstuff/downloaddialog.h b/tdenewstuff/downloaddialog.h index 99016c0ab..8646e5a4e 100644 --- a/tdenewstuff/downloaddialog.h +++ b/tdenewstuff/downloaddialog.h @@ -188,7 +188,7 @@ class TDE_EXPORT DownloadDialog : public KDialogBase @param type a data type such as "korganizer/calendar" @deprecated use open( const TQString& type, const TQString& caption ); */ - static void open(TQString type) KDE_DEPRECATED; // ### KDE 4.0: remove and make caption/parent argument optional + static void open(TQString type) TDE_DEPRECATED; // ### KDE 4.0: remove and make caption/parent argument optional /** Returns the list of installed data entries. diff --git a/tdeprint/kprinter.h b/tdeprint/kprinter.h index 6a0cde6d0..695025aab 100644 --- a/tdeprint/kprinter.h +++ b/tdeprint/kprinter.h @@ -326,7 +326,7 @@ public: * * @see pageList() */ - int fromPage() const KDE_DEPRECATED; + int fromPage() const TDE_DEPRECATED; /** * Returns the last page to be printed. * @deprecated Applications diff --git a/tdeui/kcolordrag.h b/tdeui/kcolordrag.h index 7c46faf2d..af3fb9cb4 100644 --- a/tdeui/kcolordrag.h +++ b/tdeui/kcolordrag.h @@ -65,7 +65,7 @@ public: /** * @deprecated This is equivalent with "new KColorDrag(color, dragsource)". */ - static KColorDrag* makeDrag( const TQColor&,TQWidget *dragsource) KDE_DEPRECATED; + static KColorDrag* makeDrag( const TQColor&,TQWidget *dragsource) TDE_DEPRECATED; private: TQColor m_color; // unused diff --git a/tdeui/kdatepicker.h b/tdeui/kdatepicker.h index 32455144d..e07882a2a 100644 --- a/tdeui/kdatepicker.h +++ b/tdeui/kdatepicker.h @@ -104,7 +104,7 @@ public: * Returns the selected date. * @deprecated **/ - const TQDate& getDate() const KDE_DEPRECATED; + const TQDate& getDate() const TDE_DEPRECATED; /** * @returns the selected date. diff --git a/tdeui/kdialogbase.h b/tdeui/kdialogbase.h index 25f4613ae..d264c525f 100644 --- a/tdeui/kdialogbase.h +++ b/tdeui/kdialogbase.h @@ -898,7 +898,7 @@ class TDEUI_EXPORT KDialogBase : public KDialog */ void setButtonOKText( const TQString &text=TQString::null, const TQString &tooltip=TQString::null, - const TQString &quickhelp=TQString::null ) KDE_DEPRECATED; + const TQString &quickhelp=TQString::null ) TDE_DEPRECATED; /** * Sets the appearance of the Apply button. @@ -928,7 +928,7 @@ class TDEUI_EXPORT KDialogBase : public KDialog */ void setButtonApplyText( const TQString &text=TQString::null, const TQString &tooltip=TQString::null, - const TQString &quickhelp=TQString::null ) KDE_DEPRECATED; + const TQString &quickhelp=TQString::null ) TDE_DEPRECATED; /** * Sets the appearance of the Cancel button. @@ -956,7 +956,7 @@ class TDEUI_EXPORT KDialogBase : public KDialog */ void setButtonCancelText( const TQString &text=TQString::null, const TQString &tooltip=TQString::null, - const TQString &quickhelp=TQString::null ) KDE_DEPRECATED; + const TQString &quickhelp=TQString::null ) TDE_DEPRECATED; /** * Sets the text of any button. @@ -1113,7 +1113,7 @@ class TDEUI_EXPORT KDialogBase : public KDialog * @deprecated * Use backgroundTile() instead. */ - static const TQPixmap *getBackgroundTile() KDE_DEPRECATED; + static const TQPixmap *getBackgroundTile() TDE_DEPRECATED; /** * Sets the background tile. @@ -1142,7 +1142,7 @@ class TDEUI_EXPORT KDialogBase : public KDialog * The results are differences in pixels from the * dialogs corners. */ - void getBorderWidths( int& ulx, int& uly, int& lrx, int& lry ) const KDE_DEPRECATED; + void getBorderWidths( int& ulx, int& uly, int& lrx, int& lry ) const TDE_DEPRECATED; /** * @deprecated @@ -1155,7 +1155,7 @@ class TDEUI_EXPORT KDialogBase : public KDialog * If you need the "overhead" the dialog needs for its elements, * use getBorderWidths(). */ - TQRect getContentsRect() const KDE_DEPRECATED; + TQRect getContentsRect() const TDE_DEPRECATED; /** * Calculate the size hint for the dialog. diff --git a/tdeui/kdockwindow.h b/tdeui/kdockwindow.h index 851502488..12aadf4b7 100644 --- a/tdeui/kdockwindow.h +++ b/tdeui/kdockwindow.h @@ -29,7 +29,7 @@ * This class is obsolete, it is provided for compatibility only. * Use KSystemTray instead. */ -class KDE_DEPRECATED KDockWindow : public KSystemTray +class TDE_DEPRECATED KDockWindow : public KSystemTray { TQ_OBJECT public: diff --git a/tdeui/kkeybutton.h b/tdeui/kkeybutton.h index 03b551679..53ffee8d9 100644 --- a/tdeui/kkeybutton.h +++ b/tdeui/kkeybutton.h @@ -52,7 +52,7 @@ class TDEUI_EXPORT KKeyButton: public TQPushButton virtual ~KKeyButton(); /** @deprecated Use setShortcut( cut, false ) instead */ - void setShortcut( const TDEShortcut& cut ) KDE_DEPRECATED; + void setShortcut( const TDEShortcut& cut ) TDE_DEPRECATED; /// @since 3.1 void setShortcut( const TDEShortcut& cut, bool bQtShortcut ); const TDEShortcut& shortcut() const diff --git a/tdeui/kkeydialog.h b/tdeui/kkeydialog.h index bbfa07f59..302d557c4 100644 --- a/tdeui/kkeydialog.h +++ b/tdeui/kkeydialog.h @@ -377,19 +377,19 @@ public: * @deprecated Obsolete. * Please use KKeyDialog::configure instead */ - static KDE_DEPRECATED int configureKeys( TDEAccel* keys, bool save_settings = true, TQWidget* parent = 0 ) + static TDE_DEPRECATED int configureKeys( TDEAccel* keys, bool save_settings = true, TQWidget* parent = 0 ) { return configure( keys, parent, save_settings ); } /** * @deprecated Obsolete. * Please use KKeyDialog::configure instead */ - static KDE_DEPRECATED int configureKeys( TDEGlobalAccel* keys, bool save_settings = true, TQWidget* parent = 0 ) + static TDE_DEPRECATED int configureKeys( TDEGlobalAccel* keys, bool save_settings = true, TQWidget* parent = 0 ) { return configure( keys, parent, save_settings ); } /** * @deprecated Obsolete. * Please use KKeyDialog::configure instead */ - static KDE_DEPRECATED int configureKeys( TDEActionCollection* coll, const TQString& /*xmlfile*/, + static TDE_DEPRECATED int configureKeys( TDEActionCollection* coll, const TQString& /*xmlfile*/, bool save_settings = true, TQWidget* parent = 0 ) { return configure( coll, parent, save_settings ); } diff --git a/tdeui/kled.h b/tdeui/kled.h index 5bca61467..cab7586f1 100644 --- a/tdeui/kled.h +++ b/tdeui/kled.h @@ -195,7 +195,7 @@ public: * @short Toggles LED on->off / off->on. * @deprecated, use #toggle() instead. */ - void toggleState() KDE_DEPRECATED; + void toggleState() TDE_DEPRECATED; /** * Set the color of the widget. diff --git a/tdeui/klineeditdlg.h b/tdeui/klineeditdlg.h index e0b609dcd..26d1e8dc0 100644 --- a/tdeui/klineeditdlg.h +++ b/tdeui/klineeditdlg.h @@ -57,7 +57,7 @@ public: * @param _value Initial value of the inputline * @param parent Parent widget for the line edit dialog */ - KLineEditDlg( const TQString& _text, const TQString& _value, TQWidget *parent ) KDE_DEPRECATED; + KLineEditDlg( const TQString& _text, const TQString& _value, TQWidget *parent ) TDE_DEPRECATED; virtual ~KLineEditDlg(); /** @@ -80,7 +80,7 @@ public: * @param parent The parent widget */ static TQString getText(const TQString &text, const TQString& value, - bool *ok, TQWidget *parent, TQValidator *validator=0 ) KDE_DEPRECATED; + bool *ok, TQWidget *parent, TQValidator *validator=0 ) TDE_DEPRECATED; /** * Static convenience function to get a textual input from the user. @@ -97,7 +97,7 @@ public: static TQString getText(const TQString &caption, const TQString &text, const TQString& value=TQString::null, bool *ok=0, TQWidget *parent=0, - TQValidator *validator=0) KDE_DEPRECATED; + TQValidator *validator=0) TDE_DEPRECATED; public slots: /** diff --git a/tdeui/knuminput.h b/tdeui/knuminput.h index 28ff17d68..c0bd0f935 100644 --- a/tdeui/knuminput.h +++ b/tdeui/knuminput.h @@ -460,7 +460,7 @@ public: * @param parent parent TQWidget * @param name internal name for this widget */ - KDoubleNumInput(double value, TQWidget *parent=0, const char *name=0) KDE_DEPRECATED; + KDoubleNumInput(double value, TQWidget *parent=0, const char *name=0) TDE_DEPRECATED; /** * Constructor @@ -493,7 +493,7 @@ public: * @param parent parent TQWidget * @param name internal name for this widget **/ - KDoubleNumInput(KNumInput* below, double value, TQWidget* parent=0, const char* name=0) KDE_DEPRECATED; + KDoubleNumInput(KNumInput* below, double value, TQWidget* parent=0, const char* name=0) TDE_DEPRECATED; /** * Constructor diff --git a/tdeui/kpanelapplet.h b/tdeui/kpanelapplet.h index df3bca44b..76d643b9f 100644 --- a/tdeui/kpanelapplet.h +++ b/tdeui/kpanelapplet.h @@ -361,7 +361,7 @@ protected: * @deprecated Reimplement positionChange instead. **/ // FIXME: Remove for KDE 4 - virtual KDE_DEPRECATED void orientationChange( Orientation /* orientation*/) {} + virtual TDE_DEPRECATED void orientationChange( Orientation /* orientation*/) {} /** * A convenience method that translates the position of the applet into which @@ -376,7 +376,7 @@ protected: * @deprecated Reimplement positionChange instead. **/ // FIXME: Remove for KDE 4 - virtual KDE_DEPRECATED void popupDirectionChange( Direction /*direction*/ ) {} + virtual TDE_DEPRECATED void popupDirectionChange( Direction /*direction*/ ) {} bool eventFilter(TQObject *, TQEvent *); diff --git a/tdeui/kpassdlg.h b/tdeui/kpassdlg.h index 039f1c506..3eb2ea100 100644 --- a/tdeui/kpassdlg.h +++ b/tdeui/kpassdlg.h @@ -67,7 +67,7 @@ public: * @deprecated, will be removed in KDE 4.0 * Creates a password input widget using echoMode as "echo mode". */ - KPasswordEdit(TQWidget *parent, const char *name, int echoMode) KDE_DEPRECATED; + KPasswordEdit(TQWidget *parent, const char *name, int echoMode) TDE_DEPRECATED; /** * Destructs the widget. @@ -192,7 +192,7 @@ public: * possibility to specify a parent. Will be removed in KDE 4.0 */ KPasswordDialog(int type, TQString prompt, bool enableKeep=false, - int extraBttn=0) KDE_DEPRECATED; + int extraBttn=0) TDE_DEPRECATED; // note that this implicitly deprecates the 'prompt' variants of // getPassword() below. i guess the above constructor needs to be extended. diff --git a/tdeui/kprogress.h b/tdeui/kprogress.h index ada1f4fc0..68d88e9cf 100644 --- a/tdeui/kprogress.h +++ b/tdeui/kprogress.h @@ -78,7 +78,7 @@ public: * @see setValue() */ // ### Remove this KDE 4.0 - int value() const KDE_DEPRECATED; + int value() const TDE_DEPRECATED; /** * Returns @p true if progress text will be displayed, @@ -99,13 +99,13 @@ public: * Use setTotalSteps() instead */ // ### Remove this KDE 4.0 - void setRange(int min, int max) KDE_DEPRECATED; + void setRange(int min, int max) TDE_DEPRECATED; /** * @deprecated Use totalSteps() instead */ // ### Remove this KDE 4.0 - int maxValue() KDE_DEPRECATED; + int maxValue() TDE_DEPRECATED; public slots: @@ -234,7 +234,7 @@ class TDEUI_EXPORT KProgressDialog : public KDialogBase * @deprecated */ // ### Remove this KDE 4.0 - TQString labelText() KDE_DEPRECATED; + TQString labelText() TDE_DEPRECATED; /** * Returns the current dialog text @@ -257,7 +257,7 @@ class TDEUI_EXPORT KProgressDialog : public KDialogBase * @deprecated */ // ### Remove this KDE 4.0 - bool allowCancel() KDE_DEPRECATED; + bool allowCancel() TDE_DEPRECATED; /** * Returns true if the dialog can be canceled, false otherwise @@ -344,7 +344,7 @@ class TDEUI_EXPORT KProgressDialog : public KDialogBase * @deprecated */ // ### Remove this KDE 4.0 - TQString buttonText() KDE_DEPRECATED; + TQString buttonText() TDE_DEPRECATED; /** * Returns the text on the cancel button @@ -362,7 +362,7 @@ class TDEUI_EXPORT KProgressDialog : public KDialogBase * @deprecated */ // ### Remove this KDE 4.0 - int minimumDuration() KDE_DEPRECATED; + int minimumDuration() TDE_DEPRECATED; /** * Returns the wait duration in milliseconds diff --git a/tdeui/kprogressbox.h b/tdeui/kprogressbox.h index 5d9f3bd8b..b06e85921 100644 --- a/tdeui/kprogressbox.h +++ b/tdeui/kprogressbox.h @@ -115,7 +115,7 @@ class TDEUI_EXPORT KProgressBoxDialog : public KDialogBase * @deprecated */ // ### Remove this KDE 4.0 - TQString labelText() KDE_DEPRECATED; + TQString labelText() TDE_DEPRECATED; /** * Returns the current dialog text @@ -145,7 +145,7 @@ class TDEUI_EXPORT KProgressBoxDialog : public KDialogBase * @deprecated */ // ### Remove this KDE 4.0 - bool allowCancel() KDE_DEPRECATED; + bool allowCancel() TDE_DEPRECATED; /** * Returns true if the dialog can be canceled, false otherwise @@ -232,7 +232,7 @@ class TDEUI_EXPORT KProgressBoxDialog : public KDialogBase * @deprecated */ // ### Remove this KDE 4.0 - TQString buttonText() KDE_DEPRECATED; + TQString buttonText() TDE_DEPRECATED; /** * Returns the text on the cancel button @@ -250,7 +250,7 @@ class TDEUI_EXPORT KProgressBoxDialog : public KDialogBase * @deprecated */ // ### Remove this KDE 4.0 - int minimumDuration() KDE_DEPRECATED; + int minimumDuration() TDE_DEPRECATED; /** * Returns the wait duration in milliseconds diff --git a/tdeui/krootpixmap.h b/tdeui/krootpixmap.h index 485580fbb..194d10d3c 100644 --- a/tdeui/krootpixmap.h +++ b/tdeui/krootpixmap.h @@ -97,7 +97,7 @@ public: * Deprecated, use isAvailable() instead. * @deprecated */ - KDE_DEPRECATED bool checkAvailable(bool) { return isAvailable(); } + TDE_DEPRECATED bool checkAvailable(bool) { return isAvailable(); } #endif /** @since 3.2 diff --git a/tdeui/kruler.h b/tdeui/kruler.h index c962fd947..6279d567d 100644 --- a/tdeui/kruler.h +++ b/tdeui/kruler.h @@ -275,19 +275,19 @@ public: * @deprecated * This method has no effect other than an update. Do not use. **/ - void setValuePerLittleMark(int) KDE_DEPRECATED; + void setValuePerLittleMark(int) TDE_DEPRECATED; /** * @deprecated * This method has no effect other than an update. Do not use. **/ - void setValuePerMediumMark(int) KDE_DEPRECATED; + void setValuePerMediumMark(int) TDE_DEPRECATED; /** * @deprecated * This method has no effect other than an update. Do not use. */ - void setValuePerBigMark(int) KDE_DEPRECATED; + void setValuePerBigMark(int) TDE_DEPRECATED; /** * Show/hide number values of the little marks. diff --git a/tdeui/kstdaction.h b/tdeui/kstdaction.h index 76aad98a8..28194455b 100644 --- a/tdeui/kstdaction.h +++ b/tdeui/kstdaction.h @@ -499,7 +499,7 @@ namespace KStdAction * @since 3.1 */ TDEUI_EXPORT TDEToggleAction *showToolbar(const TQObject *recvr, const char *slot, - TDEActionCollection* parent, const char *name = 0 ) KDE_DEPRECATED; + TDEActionCollection* parent, const char *name = 0 ) TDE_DEPRECATED; /** * @obsolete. toolbar actions are created automatically now in the * Settings menu. Don't use this anymore. @@ -507,7 +507,7 @@ namespace KStdAction * Show/Hide the primary toolbar. */ TDEUI_EXPORT TDEToggleToolBarAction *showToolbar(const char* toolBarName, - TDEActionCollection* parent, const char *name = 0 ) KDE_DEPRECATED; + TDEActionCollection* parent, const char *name = 0 ) TDE_DEPRECATED; /** * Show/Hide the statusbar. diff --git a/tdeui/tdeaboutdialog.h b/tdeui/tdeaboutdialog.h index d637a64b7..3e80bb11d 100644 --- a/tdeui/tdeaboutdialog.h +++ b/tdeui/tdeaboutdialog.h @@ -402,7 +402,7 @@ class TDEUI_EXPORT TDEAboutDialog : public KDialogBase * * @since 3.3 */ - void setIcon( const TQString &fileName ) KDE_DEPRECATED; // KDE4: remove + void setIcon( const TQString &fileName ) TDE_DEPRECATED; // KDE4: remove /** * Overloaded version of setProgramLogo(const TQPixmap& pixmap). diff --git a/tdeui/tdeaction.h b/tdeui/tdeaction.h index 9bf232c49..723522d58 100644 --- a/tdeui/tdeaction.h +++ b/tdeui/tdeaction.h @@ -364,7 +364,7 @@ public: * the TDEAccel configuration dialog (this is somehow deprecated since * there is now a TDEAction key configuration dialog). */ - virtual void plugAccel(TDEAccel *accel, bool configurable = true) KDE_DEPRECATED; + virtual void plugAccel(TDEAccel *accel, bool configurable = true) TDE_DEPRECATED; /** * "Unplug" or remove this action from a given widget. @@ -384,7 +384,7 @@ public: * @deprecated. Complement method to plugAccel(). * Disconnect this action from the TDEAccel. */ - virtual void unplugAccel() KDE_DEPRECATED; + virtual void unplugAccel() TDE_DEPRECATED; /** * returns whether the action is plugged into any container widget or not. @@ -640,7 +640,7 @@ public: * @deprecated. Use shortcut(). * Get the keyboard accelerator associated with this action. */ - int accel() const KDE_DEPRECATED; + int accel() const TDE_DEPRECATED; TQString statusText() const { return toolTip(); } @@ -649,7 +649,7 @@ public: * @deprecated. Use setShortcut(). * Sets the keyboard accelerator associated with this action. */ - void setAccel( int key ) KDE_DEPRECATED; + void setAccel( int key ) TDE_DEPRECATED; /** * @deprecated. Use setToolTip instead (they do the same thing now). diff --git a/tdeui/tdeactionclasses.h b/tdeui/tdeactionclasses.h index f7536a6b3..52d155710 100644 --- a/tdeui/tdeactionclasses.h +++ b/tdeui/tdeactionclasses.h @@ -483,7 +483,7 @@ public: * @deprecated See setMenuAccelsEnabled . * @since 3.1 */ - void setRemoveAmpersandsInCombo( bool b ) KDE_DEPRECATED; + void setRemoveAmpersandsInCombo( bool b ) TDE_DEPRECATED; /// @since 3.1 bool removeAmpersandsInCombo() const; diff --git a/tdeui/tdeactioncollection.h b/tdeui/tdeactioncollection.h index 4de022d3e..a2b3758b8 100644 --- a/tdeui/tdeactioncollection.h +++ b/tdeui/tdeactioncollection.h @@ -143,9 +143,9 @@ public: //bool ownsTDEAccel() const; /** @deprecated Deprecated because of ambiguous name. Use tdeaccel() */ - virtual TDEAccel* accel() KDE_DEPRECATED; + virtual TDEAccel* accel() TDE_DEPRECATED; /** @deprecated Deprecated because of ambiguous name. Use tdeaccel() */ - virtual const TDEAccel* accel() const KDE_DEPRECATED; + virtual const TDEAccel* accel() const TDE_DEPRECATED; /** Returns the TDEAccel object of the most recently set widget. */ TDEAccel* tdeaccel(); diff --git a/tdeui/tdelistview.h b/tdeui/tdelistview.h index c07d040e4..8e42aceaa 100644 --- a/tdeui/tdelistview.h +++ b/tdeui/tdelistview.h @@ -286,7 +286,7 @@ public: * Do not use. * @deprecated */ - bool createChildren() const KDE_DEPRECATED; + bool createChildren() const TDE_DEPRECATED; /** * @return true if drawing of the drop-highlighter has been enabled. False by default. @@ -329,7 +329,7 @@ public: * @deprecated * @see setFullWidth() */ - void setFullWidth() KDE_DEPRECATED; + void setFullWidth() TDE_DEPRECATED; /** * Let the last column fit exactly all the available width. @@ -723,7 +723,7 @@ public slots: * Do not use. * @deprecated */ - virtual void setCreateChildren(bool b) KDE_DEPRECATED; + virtual void setCreateChildren(bool b) TDE_DEPRECATED; /** * Set the selection mode. @@ -1165,7 +1165,7 @@ public: /** * returns the background color for this item */ - const TQColor &backgroundColor() KDE_DEPRECATED; // #### should be removed in 4.0; use below instead + const TQColor &backgroundColor() TDE_DEPRECATED; // #### should be removed in 4.0; use below instead /** * returns the background color for this item at given column diff --git a/tdeui/tdemainwindow.h b/tdeui/tdemainwindow.h index 446b9c937..0a624b040 100644 --- a/tdeui/tdemainwindow.h +++ b/tdeui/tdemainwindow.h @@ -668,7 +668,7 @@ public: * */ // KDE4 to be removed - TQSize sizeForCentralWidgetSize(TQSize size) KDE_DEPRECATED; + TQSize sizeForCentralWidgetSize(TQSize size) TDE_DEPRECATED; /** * @internal diff --git a/tdeui/tdepopupmenu.h b/tdeui/tdepopupmenu.h index 1a03ad11b..d0bc0b49b 100644 --- a/tdeui/tdepopupmenu.h +++ b/tdeui/tdepopupmenu.h @@ -51,14 +51,14 @@ public: */ TDEPopupTitle(KPixmapEffect::GradientType gradient, const TQColor &color, const TQColor &textColor, TQWidget *parent=0, - const char *name=0) KDE_DEPRECATED; + const char *name=0) TDE_DEPRECATED; /** * @deprecated * Constructs a title widget with the specified pixmap and colors. */ TDEPopupTitle(const KPixmap &background, const TQColor &color, const TQColor &textColor, TQWidget *parent=0, - const char *name=0) KDE_DEPRECATED; + const char *name=0) TDE_DEPRECATED; /** * Sets the title string and optional icon for the title widget. * @@ -191,14 +191,14 @@ public: * Obsolete method provided for backwards compatibility only. Use the * normal constructor and insertTitle instead. */ - TDEPopupMenu(const TQString &title, TQWidget *parent=0, const char *name=0) KDE_DEPRECATED; + TDEPopupMenu(const TQString &title, TQWidget *parent=0, const char *name=0) TDE_DEPRECATED; /** * @deprecated * Obsolete method provided for backwards compatibility only. Use * insertTitle and changeTitle instead. */ - void setTitle(const TQString &title) KDE_DEPRECATED; + void setTitle(const TQString &title) TDE_DEPRECATED; /** * Returns the context menu associated with this menu diff --git a/tdeui/tdespell.h b/tdeui/tdespell.h index 802c5567b..1ff854cfc 100644 --- a/tdeui/tdespell.h +++ b/tdeui/tdespell.h @@ -310,7 +310,7 @@ public: * Your application's GUI will still be updated, however. * */ - static int modalCheck( TQString& text ) KDE_DEPRECATED; + static int modalCheck( TQString& text ) TDE_DEPRECATED; /** * Performs a synchronous spellcheck. diff --git a/tdeui/tdetoolbar.h b/tdeui/tdetoolbar.h index 919af5cfe..c2b9d865b 100644 --- a/tdeui/tdetoolbar.h +++ b/tdeui/tdetoolbar.h @@ -733,7 +733,7 @@ public: * Enable or disable moving of toolbar. * @deprecated use setMovingEnabled(bool) instead. */ - void enableMoving(bool flag = true) KDE_DEPRECATED; + void enableMoving(bool flag = true) TDE_DEPRECATED; /** * Set position of toolbar. @@ -755,13 +755,13 @@ public: * @see BarStatus * @deprecated */ - bool enable(BarStatus stat) KDE_DEPRECATED; + bool enable(BarStatus stat) TDE_DEPRECATED; /** * Use setMaximumHeight() instead. * @deprecated */ - void setMaxHeight (int h) KDE_DEPRECATED; // Set max height for vertical toolbars + void setMaxHeight (int h) TDE_DEPRECATED; // Set max height for vertical toolbars /** * Returns the value set with setMaxHeight(). @@ -769,14 +769,14 @@ public: * Use maximumHeight() instead. * @return the value set with setMaxHeight(). */ - int maxHeight() KDE_DEPRECATED; + int maxHeight() TDE_DEPRECATED; /** * Use setMaximumWidth() instead. * Set maximal width of horizontal (top or bottom) toolbar. * @deprecated */ - void setMaxWidth (int dw) KDE_DEPRECATED; + void setMaxWidth (int dw) TDE_DEPRECATED; /** * Returns the value set with setMaxWidth(). @@ -784,7 +784,7 @@ public: * @return the value set with setMaxWidth(). * @deprecated */ - int maxWidth() KDE_DEPRECATED; + int maxWidth() TDE_DEPRECATED; /** * Set title for toolbar when it floats. @@ -798,7 +798,7 @@ public: * Use setMovingEnabled(bool) instead. * @deprecated */ - void enableFloating (bool flag) KDE_DEPRECATED; + void enableFloating (bool flag) TDE_DEPRECATED; /** * Set the kind of painting for buttons. diff --git a/tdeui/tdetoolbarbutton.h b/tdeui/tdetoolbarbutton.h index 0c2d65fb4..a7b1addf9 100644 --- a/tdeui/tdetoolbarbutton.h +++ b/tdeui/tdetoolbarbutton.h @@ -101,7 +101,7 @@ public: * @param pixmap The active pixmap */ // this one is from TQButton, so #ifdef-ing it out doesn't break BC - virtual void setPixmap(const TQPixmap &pixmap) KDE_DEPRECATED; + virtual void setPixmap(const TQPixmap &pixmap) TDE_DEPRECATED; /** * @deprecated @@ -110,7 +110,7 @@ public: * * @param pixmap The pixmap to use as the default (normal) one */ - void setDefaultPixmap(const TQPixmap& pixmap) KDE_DEPRECATED; + void setDefaultPixmap(const TQPixmap& pixmap) TDE_DEPRECATED; /** * @deprecated @@ -119,7 +119,7 @@ public: * * @param pixmap The pixmap to use when disabled */ - void setDisabledPixmap(const TQPixmap& pixmap) KDE_DEPRECATED; + void setDisabledPixmap(const TQPixmap& pixmap) TDE_DEPRECATED; #endif /** @@ -162,7 +162,7 @@ public: * @param generate If true, then the other icons are automagically * generated from this one */ - KDE_DEPRECATED void setIcon(const TQString &icon, bool generate ) { Q_UNUSED(generate); setIcon( icon ); } + TDE_DEPRECATED void setIcon(const TQString &icon, bool generate ) { Q_UNUSED(generate); setIcon( icon ); } /** * @deprecated @@ -171,7 +171,7 @@ public: * * @param icon The icon to use as the default (normal) one */ - void setDefaultIcon(const TQString& icon) KDE_DEPRECATED; + void setDefaultIcon(const TQString& icon) TDE_DEPRECATED; /** * @deprecated @@ -180,7 +180,7 @@ public: * * @param icon The icon to use when disabled */ - void setDisabledIcon(const TQString& icon) KDE_DEPRECATED; + void setDisabledIcon(const TQString& icon) TDE_DEPRECATED; #endif /** diff --git a/tdeutils/kcmultidialog.h b/tdeutils/kcmultidialog.h index 89aedf0a5..2226eaf0d 100644 --- a/tdeutils/kcmultidialog.h +++ b/tdeutils/kcmultidialog.h @@ -102,7 +102,7 @@ public: KCMultiDialog( int dialogFace, const KGuiItem &user2, const KGuiItem &user3=KGuiItem(), int buttonMask=User2, const TQString &caption=i18n("Configure"), TQWidget *parent=0, - const char *name=0, bool modal=false ) KDE_DEPRECATED; + const char *name=0, bool modal=false ) TDE_DEPRECATED; // KDE4 remove the user3 argument, and instead initialize it to KStdGuiItem::adminMode. /** diff --git a/tdeutils/tdecmoduleinfo.h b/tdeutils/tdecmoduleinfo.h index 634dacace..563d8b677 100644 --- a/tdeutils/tdecmoduleinfo.h +++ b/tdeutils/tdecmoduleinfo.h @@ -176,7 +176,7 @@ public: * @deprecated * @return the isHiddenByDefault attribute. */ - bool isHiddenByDefault() const KDE_DEPRECATED; + bool isHiddenByDefault() const TDE_DEPRECATED; /** diff --git a/tdeutils/tdecmoduleloader.h b/tdeutils/tdecmoduleloader.h index a96d23e66..7b93d3498 100644 --- a/tdeutils/tdecmoduleloader.h +++ b/tdeutils/tdecmoduleloader.h @@ -62,7 +62,7 @@ class TDEUTILS_EXPORT TDECModuleLoader */ static TDECModule *loadModule(const TDECModuleInfo &module, bool withFallback=true, TQWidget * parent = 0, const char * name = 0, - const TQStringList & args = TQStringList() ) KDE_DEPRECATED; + const TQStringList & args = TQStringList() ) TDE_DEPRECATED; /** * Loads a @ref TDECModule. If loading fails a zero pointer is returned. @@ -76,7 +76,7 @@ class TDEUTILS_EXPORT TDECModuleLoader * method */ static TDECModule *loadModule(const TQString &module, TQWidget *parent = 0, - const char *name = 0, const TQStringList & args = TQStringList()) KDE_DEPRECATED; + const char *name = 0, const TQStringList & args = TQStringList()) TDE_DEPRECATED; /** * Determines the way errors are reported @@ -147,7 +147,7 @@ class TDEUTILS_EXPORT TDECModuleLoader * @deprecated Use a constructor with ErrorReporting set to Dialog to show a * message box like this function did. */ - static void showLastLoaderError(TQWidget *parent) KDE_DEPRECATED; + static void showLastLoaderError(TQWidget *parent) TDE_DEPRECATED; /** |