5 files changed, 1 insertions, 16 deletions
diff --git a/quanta/utility/Makefile.am b/quanta/utility/Makefile.am
index 56522430..dbabd0bd 100644
--- a/quanta/utility/Makefile.am
+++ b/quanta/utility/Makefile.am
@@ -14,7 +14,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/quanta/src \
 	-I$(top_srcdir)/quanta/project \
 	-I$(top_srcdir)/lib \
 	$(KNEWSTUFF_INCLUDES) \
-	$(KMDI_INCLUDES) $(all_includes)
+	$(all_includes)
 
 libutility_la_LDFLAGS = $(all_libraries)
 noinst_HEADERS = qpevents.h tagactionmanager.h tagactionset.h
diff --git a/quanta/utility/quantacommon.h b/quanta/utility/quantacommon.h
index b341d6ac..b98be802 100644
--- a/quanta/utility/quantacommon.h
+++ b/quanta/utility/quantacommon.h
@@ -16,8 +16,6 @@
 #ifndef QUANTACOMMON_H
 #define QUANTACOMMON_H
 
-#include <tdeversion.h>
-
 #include "qtag.h"
 #include "node.h"
 #include "parser.h"
diff --git a/quanta/utility/tagaction.cpp b/quanta/utility/tagaction.cpp
index 5b620852..62e01c36 100644
--- a/quanta/utility/tagaction.cpp
+++ b/quanta/utility/tagaction.cpp
@@ -92,12 +92,8 @@ TagAction::TagAction( TQDomElement *element, TDEMainWindow *parentMainWindow, bo
   setIcon(s);
   m_file = 0L;
   loopStarted = false;
-#if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0)
   connect(this, TQ_SIGNAL(activated(TDEAction::ActivationReason, TQt::ButtonState)), 
           TQ_SLOT(slotActionActivated(TDEAction::ActivationReason, TQt::ButtonState)));
-#else
-  connect(this, TQ_SIGNAL(activated()), TQ_SLOT(slotActionActivated()));
-#endif
   connect(this, TQ_SIGNAL(showMessage(const TQString&, bool)), m_parentMainWindow, TQ_SIGNAL(showMessage(const TQString&, bool)));
   connect(this, TQ_SIGNAL(clearMessages()), m_parentMainWindow, TQ_SIGNAL(clearMessages()));
   connect(this, TQ_SIGNAL(showMessagesView()), m_parentMainWindow, TQ_SLOT(slotShowMessagesView()));
@@ -113,7 +109,6 @@ TQString TagAction::type()
    return tag.attribute("type","");
 }
 
-#if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0)
 bool TagAction::slotActionActivated(TDEAction::ActivationReason reason, TQt::ButtonState /*state*/)
 {
     QuantaView *view = ViewManager::ref()->activeView();
@@ -485,12 +480,6 @@ bool TagAction::slotActionActivated(TDEAction::ActivationReason reason, TQt::But
     }    
     return true;
 }
-#else
- // hack to compile. moc doesn't check the "#ifdef" at the declaration and the compiler complains 
- // of no matching function.
-bool TagAction::slotActionActivated(TDEAction::ActivationReason /*reason*/, TQt::ButtonState /*state*/)
-{return true;}
-#endif
 
 bool TagAction::slotActionActivated()
 {
diff --git a/quanta/utility/tagaction.h b/quanta/utility/tagaction.h
index 783665e3..f2e0aa78 100644
--- a/quanta/utility/tagaction.h
+++ b/quanta/utility/tagaction.h
@@ -18,7 +18,6 @@
 #ifndef TAGACTION_H
 #define TAGACTION_H
 
-#include <tdeversion.h>
 #include <tdeaction.h>
 #include <tdeactioncollection.h>
 
diff --git a/quanta/utility/toolbartabwidget.cpp b/quanta/utility/toolbartabwidget.cpp
index e23145e3..789e8439 100644
--- a/quanta/utility/toolbartabwidget.cpp
+++ b/quanta/utility/toolbartabwidget.cpp
@@ -25,7 +25,6 @@
 //kde includes
 #include <tdeaction.h>
 #include <tdeaccelmanager.h>
-#include <tdeversion.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>