Rename KDE_MAKE_VERSION and update TDE version string

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

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()));

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

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

kttsd/filters/xmltransformer/xmltransformerproc.cpp

@@ -230,7 +230,7 @@ bool XmlTransformerProc::init(KConfig* config, const TQString& configGroup)
     text.replace(TQRegExp("&(?!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
 

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
 

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
     {

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