Rename KDE_MAKE_VERSION and update TDE version string

atlantik/client/atlantik.cpp

@@ -38,8 +38,8 @@
 
 #include <tdeversion.h>
 #undef KDE_3_2_FEATURES
-#if defined(KDE_MAKE_VERSION)
-#if TDE_VERSION >= KDE_MAKE_VERSION(3,2,0)
+#if defined(TDE_MAKE_VERSION)
+#if TDE_VERSION >= TDE_MAKE_VERSION(3,2,0)
 	#define KDE_3_2_FEATURES
 #endif
 #endif

atlantik/client/configdlg.cpp

@@ -22,11 +22,11 @@
 #include <tdeversion.h>
 #undef KDE_3_1_FEATURES
 #undef KDE_3_3_FEATURES
-#if defined(KDE_MAKE_VERSION)
-#if TDE_VERSION >= KDE_MAKE_VERSION(3,1,0)
+#if defined(TDE_MAKE_VERSION)
+#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0)
 #define KDE_3_1_FEATURES
 #endif
-#if TDE_VERSION >= KDE_MAKE_VERSION(3,2,90)
+#if TDE_VERSION >= TDE_MAKE_VERSION(3,2,90)
 #define KDE_3_3_FEATURES
 #endif
 #endif

atlantik/kio_atlantik/kio_atlantik.cpp

@@ -20,8 +20,8 @@
 
 #include <tdeversion.h>
 #undef KDE_3_1_FEATURES
-#ifdef KDE_MAKE_VERSION
-#if TDE_VERSION > KDE_MAKE_VERSION (3, 1, 0)
+#ifdef TDE_MAKE_VERSION
+#if TDE_VERSION > TDE_MAKE_VERSION (3, 1, 0)
 #define KDE_3_1_FEATURES
 #endif
 #endif

atlantik/libatlantikui/estateview.cpp

@@ -404,8 +404,8 @@ void EstateView::paintEvent(TQPaintEvent *)
 		TQFont font = TQFont( KGlobalSettings::generalFont().family(), KGlobalSettings::generalFont().pointSize(), TQFont::Normal );
 		painter.setFont(font);
 		TQString estateName = m_estate->name();
-#if defined(KDE_MAKE_VERSION)
-#if TDE_VERSION >= KDE_MAKE_VERSION(3,2,0)
+#if defined(TDE_MAKE_VERSION)
+#if TDE_VERSION >= TDE_MAKE_VERSION(3,2,0)
                 if ( m_estate->color().isValid() && ( m_orientation == West || m_orientation == East ) )
 			estateName = KStringHandler::rPixelSqueeze( m_estate->name(), TQFontMetrics( font ), 3*width()/4 );
 		else

kgoldrunner/src/kgoldrunner.cpp

@@ -767,8 +767,8 @@ void KGoldrunner::optionsConfigureKeys()
 void KGoldrunner::optionsConfigureToolbars()
 {
     // use the standard toolbar editor
-#if defined(KDE_MAKE_VERSION)
-# if TDE_VERSION >= KDE_MAKE_VERSION(3,1,0)
+#if defined(TDE_MAKE_VERSION)
+# if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0)
     saveMainWindowSettings(KGlobal::config(), autoSaveGroup());
 # else
     saveMainWindowSettings(KGlobal::config());
@@ -784,8 +784,8 @@ void KGoldrunner::newToolbarConfig()
     // recreate our GUI, and re-apply the settings (e.g. "text under icons", etc.)
     createGUI();
 
-#if defined(KDE_MAKE_VERSION)
-# if TDE_VERSION >= KDE_MAKE_VERSION(3,1,0)
+#if defined(TDE_MAKE_VERSION)
+# if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0)
     applyMainWindowSettings(KGlobal::config(), autoSaveGroup());
 # else
     applyMainWindowSettings(KGlobal::config());