From d5264aa714128455441f02d33ed191bc0353eb2c Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Mon, 26 Dec 2011 20:09:22 -0600
Subject: [PATCH] Rename KDE_MAKE_VERSION and update TDE version string

---
 src/gui/editors/segment/segmentcanvas/CompositionView.cpp | 2 +-
 src/misc/Debug.cpp                                        | 4 ++--
 src/misc/Debug.h                                          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
index f8ae518..48a06e7 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
+++ b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
@@ -89,7 +89,7 @@ protected:
 CompositionView::CompositionView(RosegardenGUIDoc* doc,
                                  CompositionModel* model,
                                  TQWidget * parent, const char * name, WFlags f)
-#if TDE_VERSION >= KDE_MAKE_VERSION(3,2,0)
+#if TDE_VERSION >= TDE_MAKE_VERSION(3,2,0)
         : RosegardenScrollView(parent, name, f | WNoAutoErase | WStaticContents),
 #else
         :
diff --git a/src/misc/Debug.cpp b/src/misc/Debug.cpp
index 797d067..36a8132 100644
--- a/src/misc/Debug.cpp
+++ b/src/misc/Debug.cpp
@@ -23,7 +23,7 @@
 #include "misc/Debug.h"
 #include "Debug.h"
 
-#if TDE_VERSION < KDE_MAKE_VERSION(3,2,0)
+#if TDE_VERSION < TDE_MAKE_VERSION(3,2,0)
 #include <tqdatetime.h>
 #include <tqpoint.h>
 #include <tqrect.h>
@@ -256,7 +256,7 @@ kdbgostreamAdapter::operator<<(double d)
 //     }
 // }
 
-#if TDE_VERSION < KDE_MAKE_VERSION(3,2,0)
+#if TDE_VERSION < TDE_MAKE_VERSION(3,2,0)
 kdbgstream&
 operator<<(kdbgstream &dbg, const TQDateTime& time)
 {
diff --git a/src/misc/Debug.h b/src/misc/Debug.h
index 107d8f6..37c3eca 100644
--- a/src/misc/Debug.h
+++ b/src/misc/Debug.h
@@ -27,7 +27,7 @@
 #include <kdebug.h>
 #include <tdeversion.h>
 
-#if TDE_VERSION < KDE_MAKE_VERSION(3,2,0)
+#if TDE_VERSION < TDE_MAKE_VERSION(3,2,0)
 class TQDateTime;
 class TQDate;
 class TQTime;