summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-26 20:29:21 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-26 20:29:21 -0600
commitfa12053f24264cd97e6f9c5b9a8d6170b8ec483d (patch)
tree5014fa2f0109621512b8bfe1747e957a638a14a0
parent66c856af16022947d202b4d3ca7e25cf28ea0acc (diff)
downloadtdewebdev-fa12053f24264cd97e6f9c5b9a8d6170b8ec483d.tar.gz
tdewebdev-fa12053f24264cd97e6f9c5b9a8d6170b8ec483d.zip
Rename KDE_MAKE_VERSION and update TDE version string
-rw-r--r--kimagemapeditor/kimeshell.cpp8
-rw-r--r--quanta/utility/tagaction.cpp4
2 files changed, 6 insertions, 6 deletions
diff --git a/kimagemapeditor/kimeshell.cpp b/kimagemapeditor/kimeshell.cpp
index 6b0311a9..7005fe00 100644
--- a/kimagemapeditor/kimeshell.cpp
+++ b/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());
diff --git a/quanta/utility/tagaction.cpp b/quanta/utility/tagaction.cpp
index 1db14cf1..3a911291 100644
--- a/quanta/utility/tagaction.cpp
+++ b/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();