summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-26 20:06:03 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-26 20:06:03 -0600
commit1cd6ed1b7950c59356741903005cff18cd9f2e30 (patch)
tree1bc378c4ec1532d37653c26e4cbf7800cd0b76d3
parent81ed92522a3cc6b80e9d790bd7a52b0eb4d412b9 (diff)
downloadkmymoney-1cd6ed1b7950c59356741903005cff18cd9f2e30.tar.gz
kmymoney-1cd6ed1b7950c59356741903005cff18cd9f2e30.zip
Rename KDE_MAKE_VERSION and update TDE version string
-rw-r--r--kdecompat.h10
-rw-r--r--kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.h6
-rw-r--r--kmymoney2/widgets/kmymoneyedit.h2
3 files changed, 9 insertions, 9 deletions
diff --git a/kdecompat.h b/kdecompat.h
index 90f443a..05fb2ab 100644
--- a/kdecompat.h
+++ b/kdecompat.h
@@ -19,19 +19,19 @@
#include <tdeversion.h>
-#ifndef KDE_MAKE_VERSION
-#define KDE_MAKE_VERSION(a,b,c) (((a)<<16) | ((b)<<8) | (c))
+#ifndef TDE_MAKE_VERSION
+#define TDE_MAKE_VERSION(a,b,c) (((a)<<16) | ((b)<<8) | (c))
#endif
#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
#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
-#if TDE_VERSION < KDE_MAKE_VERSION(3,2,0)
+#if TDE_VERSION < TDE_MAKE_VERSION(3,2,0)
#define KDE_DEPRECATED
#endif
diff --git a/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.h b/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.h
index ccb3ee6..70029ff 100644
--- a/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.h
+++ b/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.h
@@ -31,11 +31,11 @@
// 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
#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
- #define LIBOFX_VERSION KDE_MAKE_VERSION(0,8,3)
+ #define LIBOFX_VERSION TDE_MAKE_VERSION(0,8,3)
#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
diff --git a/kmymoney2/widgets/kmymoneyedit.h b/kmymoney2/widgets/kmymoneyedit.h
index 2aeea47..a8f3a6f 100644
--- a/kmymoney2/widgets/kmymoneyedit.h
+++ b/kmymoney2/widgets/kmymoneyedit.h
@@ -42,7 +42,7 @@ class KPushButton;
class MyMoneyMoney;
class kMyMoneyCalculator;
-#if TDE_VERSION <= KDE_MAKE_VERSION(3,1,0)
+#if TDE_VERSION <= TDE_MAKE_VERSION(3,1,0)
#define KDoubleValidator TQDoubleValidator
#endif