Rename KDE_MAKE_VERSION and update TDE version string

r14.0.x
Timothy Pearson 13 years ago
parent 81ed92522a
commit 1cd6ed1b79

@ -19,19 +19,19 @@
#include <tdeversion.h> #include <tdeversion.h>
#ifndef KDE_MAKE_VERSION #ifndef TDE_MAKE_VERSION
#define KDE_MAKE_VERSION(a,b,c) (((a)<<16) | ((b)<<8) | (c)) #define TDE_MAKE_VERSION(a,b,c) (((a)<<16) | ((b)<<8) | (c))
#endif #endif
#ifndef KDE_IS_VERSION #ifndef KDE_IS_VERSION
#define KDE_IS_VERSION(a,b,c) (TDE_VERSION >= KDE_MAKE_VERSION(a,b,c)) #define KDE_IS_VERSION(a,b,c) (TDE_VERSION >= TDE_MAKE_VERSION(a,b,c))
#endif #endif
#ifndef QT_IS_VERSION #ifndef QT_IS_VERSION
#define QT_IS_VERSION(a,b,c) (QT_VERSION >= KDE_MAKE_VERSION(a,b,c)) #define QT_IS_VERSION(a,b,c) (QT_VERSION >= TDE_MAKE_VERSION(a,b,c))
#endif #endif
#if TDE_VERSION < KDE_MAKE_VERSION(3,2,0) #if TDE_VERSION < TDE_MAKE_VERSION(3,2,0)
#define KDE_DEPRECATED #define KDE_DEPRECATED
#endif #endif

@ -31,11 +31,11 @@
// if OFX has a major version number defined, we'll take it // if OFX has a major version number defined, we'll take it
// if not, we assume 0.8.3. 0.8.3 was the last version w/o version number info // if not, we assume 0.8.3. 0.8.3 was the last version w/o version number info
#ifdef LIBOFX_MAJOR_VERSION #ifdef LIBOFX_MAJOR_VERSION
#define LIBOFX_VERSION KDE_MAKE_VERSION(LIBOFX_MAJOR_VERSION, LIBOFX_MINOR_VERSION, LIBOFX_MICRO_VERSION) #define LIBOFX_VERSION TDE_MAKE_VERSION(LIBOFX_MAJOR_VERSION, LIBOFX_MINOR_VERSION, LIBOFX_MICRO_VERSION)
#else #else
#define LIBOFX_VERSION KDE_MAKE_VERSION(0,8,3) #define LIBOFX_VERSION TDE_MAKE_VERSION(0,8,3)
#endif #endif
#define LIBOFX_IS_VERSION(a,b,c) (LIBOFX_VERSION >= KDE_MAKE_VERSION(a,b,c)) #define LIBOFX_IS_VERSION(a,b,c) (LIBOFX_VERSION >= TDE_MAKE_VERSION(a,b,c))
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// QT Includes // QT Includes

@ -42,7 +42,7 @@ class KPushButton;
class MyMoneyMoney; class MyMoneyMoney;
class kMyMoneyCalculator; class kMyMoneyCalculator;
#if TDE_VERSION <= KDE_MAKE_VERSION(3,1,0) #if TDE_VERSION <= TDE_MAKE_VERSION(3,1,0)
#define KDoubleValidator TQDoubleValidator #define KDoubleValidator TQDoubleValidator
#endif #endif

Loading…
Cancel
Save