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

---
 kbstateapplet/kdeexportfix.h                        | 2 +-
 kmousetool/kmousetool/kmousetool.cpp                | 2 +-
 ksayit/Freeverb_plugin/kdeexportfix.h               | 2 +-
 ksayit/KTTSD_Lib/kdeexportfix.h                     | 2 +-
 kttsd/filters/xmltransformer/xmltransformerproc.cpp | 2 +-
 kttsd/kttsd/ssmlconvert.cpp                         | 2 +-
 kttsd/kttsmgr/kttsmgr.cpp                           | 4 ++--
 kttsd/libkttsd/kdeexportfix.h                       | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/kbstateapplet/kdeexportfix.h b/kbstateapplet/kdeexportfix.h
index ff5b9be..a30f3d5 100644
--- a/kbstateapplet/kdeexportfix.h
+++ b/kbstateapplet/kdeexportfix.h
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include <tdeversion.h>
-#if TDE_VERSION < KDE_MAKE_VERSION (3,3,2)
+#if TDE_VERSION < TDE_MAKE_VERSION (3,3,2)
 #undef KDE_EXPORT
 #define KDE_EXPORT
 #endif
diff --git a/kmousetool/kmousetool/kmousetool.cpp b/kmousetool/kmousetool/kmousetool.cpp
index 3df4b68..d0f394a 100644
--- a/kmousetool/kmousetool/kmousetool.cpp
+++ b/kmousetool/kmousetool/kmousetool.cpp
@@ -273,7 +273,7 @@ KMouseTool::KMouseTool(TQWidget *parent, const char *name) : KMouseToolUI(parent
 	connect(buttonHelp, TQT_SIGNAL(clicked()), this, TQT_SLOT(helpSelected()));
 	buttonClose->setGuiItem(KStdGuiItem::close());
 	connect(buttonClose, TQT_SIGNAL(clicked()), this, TQT_SLOT(closeSelected()));
-#if TDE_VERSION >= KDE_MAKE_VERSION (3,1,90)
+#if TDE_VERSION >= TDE_MAKE_VERSION (3,1,90)
 	buttonQuit->setGuiItem(KStdGuiItem::quit());
 #endif // KDE 3.2
 	connect(buttonQuit, TQT_SIGNAL(clicked()), this, TQT_SLOT(quitSelected()));
diff --git a/ksayit/Freeverb_plugin/kdeexportfix.h b/ksayit/Freeverb_plugin/kdeexportfix.h
index ff5b9be..a30f3d5 100644
--- a/ksayit/Freeverb_plugin/kdeexportfix.h
+++ b/ksayit/Freeverb_plugin/kdeexportfix.h
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include <tdeversion.h>
-#if TDE_VERSION < KDE_MAKE_VERSION (3,3,2)
+#if TDE_VERSION < TDE_MAKE_VERSION (3,3,2)
 #undef KDE_EXPORT
 #define KDE_EXPORT
 #endif
diff --git a/ksayit/KTTSD_Lib/kdeexportfix.h b/ksayit/KTTSD_Lib/kdeexportfix.h
index ff5b9be..a30f3d5 100644
--- a/ksayit/KTTSD_Lib/kdeexportfix.h
+++ b/ksayit/KTTSD_Lib/kdeexportfix.h
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include <tdeversion.h>
-#if TDE_VERSION < KDE_MAKE_VERSION (3,3,2)
+#if TDE_VERSION < TDE_MAKE_VERSION (3,3,2)
 #undef KDE_EXPORT
 #define KDE_EXPORT
 #endif
diff --git a/kttsd/filters/xmltransformer/xmltransformerproc.cpp b/kttsd/filters/xmltransformer/xmltransformerproc.cpp
index 8fa9e4b..c1821db 100644
--- a/kttsd/filters/xmltransformer/xmltransformerproc.cpp
+++ b/kttsd/filters/xmltransformer/xmltransformerproc.cpp
@@ -230,7 +230,7 @@ bool XmlTransformerProc::init(KConfig* config, const TQString& configGroup)
     text.replace(TQRegExp("&(?!amp;)"),"&amp;");
     *wstream << text;
     inFile.close();
-#if TDE_VERSION >= KDE_MAKE_VERSION (3,3,0)
+#if TDE_VERSION >= TDE_MAKE_VERSION (3,3,0)
     inFile.sync();
 #endif
 
diff --git a/kttsd/kttsd/ssmlconvert.cpp b/kttsd/kttsd/ssmlconvert.cpp
index 694b355..2ffe852 100644
--- a/kttsd/kttsd/ssmlconvert.cpp
+++ b/kttsd/kttsd/ssmlconvert.cpp
@@ -220,7 +220,7 @@ bool SSMLConvert::transform(const TQString &text, const TQString &xsltFilename)
     // not wrap it in such.  But maybe this should be handled by SpeechData::setText()?
     *wstream << text;
     inFile.close();
-#if TDE_VERSION >= KDE_MAKE_VERSION (3,3,0)
+#if TDE_VERSION >= TDE_MAKE_VERSION (3,3,0)
     inFile.sync();
 #endif
 
diff --git a/kttsd/kttsmgr/kttsmgr.cpp b/kttsd/kttsmgr/kttsmgr.cpp
index f633a11..fadecdf 100644
--- a/kttsd/kttsmgr/kttsmgr.cpp
+++ b/kttsd/kttsmgr/kttsmgr.cpp
@@ -80,7 +80,7 @@ int main (int argc, char *argv[])
 
     KUniqueApplication app;
 
-#if TDE_VERSION >= KDE_MAKE_VERSION (3,3,90)
+#if TDE_VERSION >= TDE_MAKE_VERSION (3,3,90)
     TQPixmap icon = KGlobal::iconLoader()->loadIcon("kttsd", KIcon::Panel);
     aboutdata.setProgramLogo(icon.convertToImage());
 #endif
@@ -118,7 +118,7 @@ int main (int argc, char *argv[])
     else app.setMainWidget(&dlg);
 
     if (showMainWindowOnStartup)
-#if TDE_VERSION < KDE_MAKE_VERSION (3,3,0)
+#if TDE_VERSION < TDE_MAKE_VERSION (3,3,0)
         dlg.show();
 #else
     {
diff --git a/kttsd/libkttsd/kdeexportfix.h b/kttsd/libkttsd/kdeexportfix.h
index 0521808..27811f6 100644
--- a/kttsd/libkttsd/kdeexportfix.h
+++ b/kttsd/libkttsd/kdeexportfix.h
@@ -19,7 +19,7 @@
 #define _KDEEXPORTFIX_H_
 
 #include <tdeversion.h>
-#if TDE_VERSION < KDE_MAKE_VERSION (3,3,2)
+#if TDE_VERSION < TDE_MAKE_VERSION (3,3,2)
 #undef KDE_EXPORT
 #define KDE_EXPORT
 #endif
-- 
cgit v1.2.3