From 97f0944cf74ef186aff1b083dd95c5c385b122fc Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 15 Nov 2011 18:57:25 -0600 Subject: Rename KDE_VERSION to TDE_VERSION --- tdecore/kcmdlineargs.cpp | 2 +- tdecore/kde-config.cpp.cmake | 2 +- tdecore/kde-config.cpp.in | 2 +- tdecore/kdeversion.cpp | 10 +++++----- tdecore/kdeversion.h | 22 +++++++++++----------- 5 files changed, 19 insertions(+), 19 deletions(-) (limited to 'tdecore') diff --git a/tdecore/kcmdlineargs.cpp b/tdecore/kcmdlineargs.cpp index 10793b739..f6b308b93 100644 --- a/tdecore/kcmdlineargs.cpp +++ b/tdecore/kcmdlineargs.cpp @@ -594,7 +594,7 @@ KCmdLineArgs::parseAllArgs() (::qstrcmp(option, "v") == 0)) { printQ( TQString("Qt: %1\n").arg(qVersion())); - printQ( TQString("KDE: %1\n").arg(KDE_VERSION_STRING)); + printQ( TQString("KDE: %1\n").arg(TDE_VERSION_STRING)); printQ( TQString("%1: %2\n"). arg(about->programName()).arg(about->version())); exit(0); diff --git a/tdecore/kde-config.cpp.cmake b/tdecore/kde-config.cpp.cmake index 867e43789..1f093fa91 100644 --- a/tdecore/kde-config.cpp.cmake +++ b/tdecore/kde-config.cpp.cmake @@ -156,7 +156,7 @@ int main(int argc, char **argv) if (args->isSet("version")) { - printf("%s\n", KDE_VERSION_STRING); + printf("%s\n", TDE_VERSION_STRING); return 0; } diff --git a/tdecore/kde-config.cpp.in b/tdecore/kde-config.cpp.in index ec9f24133..2f56483cd 100644 --- a/tdecore/kde-config.cpp.in +++ b/tdecore/kde-config.cpp.in @@ -156,7 +156,7 @@ int main(int argc, char **argv) if (args->isSet("version")) { - printf("%s\n", KDE_VERSION_STRING); + printf("%s\n", TDE_VERSION_STRING); return 0; } diff --git a/tdecore/kdeversion.cpp b/tdecore/kdeversion.cpp index 807618244..8ff80a6bb 100644 --- a/tdecore/kdeversion.cpp +++ b/tdecore/kdeversion.cpp @@ -21,26 +21,26 @@ unsigned int KDE::version() { - return KDE_VERSION; + return TDE_VERSION; } unsigned int KDE::versionMajor() { - return KDE_VERSION_MAJOR; + return TDE_VERSION_MAJOR; } unsigned int KDE::versionMinor() { - return KDE_VERSION_MINOR; + return TDE_VERSION_MINOR; } unsigned int KDE::versionRelease() { - return KDE_VERSION_RELEASE; + return TDE_VERSION_RELEASE; } const char *KDE::versionString() { - return KDE_VERSION_STRING; + return TDE_VERSION_STRING; } diff --git a/tdecore/kdeversion.h b/tdecore/kdeversion.h index 22027fb4f..1d087bb4c 100644 --- a/tdecore/kdeversion.h +++ b/tdecore/kdeversion.h @@ -17,21 +17,21 @@ Boston, MA 02110-1301, USA. */ -#ifndef _KDE_VERSION_H_ -#define _KDE_VERSION_H_ +#ifndef _TDE_VERSION_H_ +#define _TDE_VERSION_H_ #include "kdelibs_export.h" -#define KDE_VERSION_STRING "3.5.13" -#define KDE_VERSION_MAJOR 3 -#define KDE_VERSION_MINOR 5 -#define KDE_VERSION_RELEASE 13 +#define TDE_VERSION_STRING "3.5.13" +#define TDE_VERSION_MAJOR 3 +#define TDE_VERSION_MINOR 5 +#define TDE_VERSION_RELEASE 13 #define KDE_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c)) -#define KDE_VERSION \ - KDE_MAKE_VERSION(KDE_VERSION_MAJOR,KDE_VERSION_MINOR,KDE_VERSION_RELEASE) +#define TDE_VERSION \ + KDE_MAKE_VERSION(TDE_VERSION_MAJOR,TDE_VERSION_MINOR,TDE_VERSION_RELEASE) -#define KDE_IS_VERSION(a,b,c) ( KDE_VERSION >= KDE_MAKE_VERSION(a,b,c) ) +#define KDE_IS_VERSION(a,b,c) ( TDE_VERSION >= KDE_MAKE_VERSION(a,b,c) ) /** * Namespace for general KDE functions. @@ -39,7 +39,7 @@ namespace KDE { /** - * Returns the encoded number of KDE's version, see the KDE_VERSION macro. + * Returns the encoded number of KDE's version, see the TDE_VERSION macro. * In contrary to that macro this function returns the number of the actully * installed KDE version, not the number of the KDE version that was * installed when the program was compiled. @@ -76,4 +76,4 @@ namespace KDE TDECORE_EXPORT const char *versionString(); } -#endif // _KDE_VERSION_H_ +#endif // _TDE_VERSION_H_ -- cgit v1.2.1