From 1cd6ed1b7950c59356741903005cff18cd9f2e30 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Mon, 26 Dec 2011 20:06:03 -0600
Subject: Rename KDE_MAKE_VERSION and update TDE version string

---
 kdecompat.h                                               | 10 +++++-----
 kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.h |  6 +++---
 kmymoney2/widgets/kmymoneyedit.h                          |  2 +-
 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
 
-- 
cgit v1.2.3