Rename KDE_MAKE_VERSION and update TDE version string

kimagemapeditor/kimeshell.cpp

@@ -246,8 +246,8 @@ void KimeShell::optionsConfigureKeys() {
 
 void KimeShell::optionsConfigureToolbars()
 {
-#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() );
@@ -265,8 +265,8 @@ void KimeShell::optionsConfigureToolbars()
 
 void KimeShell::applyNewToolbarConfig()
 {
-#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());

quanta/utility/tagaction.cpp

@@ -92,7 +92,7 @@ TagAction::TagAction( TQDomElement *element, KMainWindow *parentMainWindow, bool
   setIcon(s);
   m_file = 0L;
   loopStarted = false;
-#if TDE_VERSION >= KDE_MAKE_VERSION(3,4,0)
+#if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0)
   connect(this, TQT_SIGNAL(activated(KAction::ActivationReason, TQt::ButtonState)), 
           TQT_SLOT(slotActionActivated(KAction::ActivationReason, TQt::ButtonState)));
 #else
@@ -113,7 +113,7 @@ TQString TagAction::type()
    return tag.attribute("type","");
 }
 
-#if TDE_VERSION >= KDE_MAKE_VERSION(3,4,0)
+#if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0)
 bool TagAction::slotActionActivated(KAction::ActivationReason reason, TQt::ButtonState /*state*/)
 {
     QuantaView *view = ViewManager::ref()->activeView();