Remove use of TDE_VERSIONremove/tde-version

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

7 files changed, 7 insertions, 46 deletions

diff --git a/kexi/formeditor/commands.cpp b/kexi/formeditor/commands.cpp
index 85f407073..a5677ba23 100644
--- a/kexi/formeditor/commands.cpp
+++ b/kexi/formeditor/commands.cpp
@@ -744,13 +744,11 @@ InsertWidgetCommand::execute()
 		kdWarning() << "InsertWidgetCommand::execute() ERROR: widget creation failed" << endl;
 		return;
 	}
-#if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0)
 //! @todo allow setting this for data view mode as well
 	if (m_form->designMode()) {
 		//don't generate accelerators for widgets in design mode
 		TDEAcceleratorManager::setNoAccel(w);
 	}
-#endif
 
 	// if the insertRect is invalid (ie only one point), we use widget' size hint
 	if(( (m_insertRect.width() < 21) && (m_insertRect.height() < 21)))
@@ -897,7 +895,6 @@ CreateLayoutCommand::execute()
 		m_name = m_form->objectTree()->generateUniqueName(classname);
 
 	TQWidget *w = lib->createWidget(classname, container->widget(), m_name.latin1(), container);
-#if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0)
 //! @todo allow setting this for data view mode as well
 	if (w) {
 		if (m_form->designMode()) {
@@ -905,7 +902,6 @@ CreateLayoutCommand::execute()
 			TDEAcceleratorManager::setNoAccel(w);
 		}
 	}
-#endif
 	ObjectTreeItem *tree = w ? m_form->objectTree()->lookup(w->name()) : 0;
 	if(!tree)
 		return;
diff --git a/kexi/formeditor/factories/containerfactory.cpp b/kexi/formeditor/factories/containerfactory.cpp
index 12a9760f6..49991da4a 100644
--- a/kexi/formeditor/factories/containerfactory.cpp
+++ b/kexi/formeditor/factories/containerfactory.cpp
@@ -44,7 +44,6 @@
 #include <klineedit.h>
 #include <tdelocale.h>
 #include <kdebug.h>
-#include <tdeversion.h>
 
 #include "containerfactory.h"
 #include "container.h"
@@ -55,14 +54,7 @@
 #include "formmanager.h"
 #include "widgetlibrary.h"
 #include <formeditor/utils.h>
-
-#if TDE_VERSION < TDE_MAKE_VERSION(3,1,9)
-# define KInputDialog TQInputDialog
-# include <tqinputdialog.h>
-# include <tqlineedit.h>
-#else
-# include <kinputdialog.h>
-#endif
+#include <kinputdialog.h>
 
 ContainerWidget::ContainerWidget(TQWidget *parent, const char *name)
  : TQWidget(parent, name)
@@ -367,14 +359,10 @@ ContainerFactory::ContainerFactory(TQObject *parent, const char *, const TQStrin
 	KFormDesigner::WidgetInfo *wTabWidget = new KFormDesigner::WidgetInfo(this);
 	wTabWidget->setPixmap("tabwidget");
 	wTabWidget->setClassName("KFDTabWidget");
-#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,9)
 	wTabWidget->addAlternateClassName("KTabWidget");
 	wTabWidget->addAlternateClassName("TQTabWidget");
 //tmp:	wTabWidget->setSavingName("TQTabWidget");
 	wTabWidget->setSavingName("KTabWidget");
-#else
-	wTabWidget->setSavingName("TQTabWidget");
-#endif
 	wTabWidget->setIncludeFileName("ktabwidget.h");
 	wTabWidget->setName(i18n("Tab Widget"));
 	wTabWidget->setNamePrefix(
@@ -518,7 +506,7 @@ ContainerFactory::createWidget(const TQCString &c, TQWidget *p, const char *n,
 	else if(c == "KFDTabWidget")
 	{
 		KFDTabWidget *tab = new KFDTabWidget(p, n);
-#if defined(USE_KTabWidget) && TDE_VERSION >= TDE_MAKE_VERSION(3,1,9)
+#if defined(USE_KTabWidget)
 		tab->setTabReorderingEnabled(true);
 		connect(tab, TQ_SIGNAL(movedTab(int,int)), this, TQ_SLOT(reorderTabs(int,int)));
 #endif
@@ -857,10 +845,7 @@ void ContainerFactory::renameTabPage()
 	bool ok;
 
 	TQString name = KInputDialog::getText(i18n("New Page Title"), i18n("Enter a new title for the current page:"),
-#if TDE_VERSION < TDE_MAKE_VERSION(3,1,9)
-	       TQLineEdit::Normal,
-#endif
-	       tab->tabLabel(w), &ok, w->topLevelWidget());
+	tab->tabLabel(w), &ok, w->topLevelWidget());
 	if(ok)
 		tab->changeTab(w, name);
 }
diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp
index e970b138d..5fd33962e 100644
--- a/kexi/formeditor/factories/stdwidgetfactory.cpp
+++ b/kexi/formeditor/factories/stdwidgetfactory.cpp
@@ -33,18 +33,9 @@
 #include <kgenericfactory.h>
 #include <tdelocale.h>
 #include <kdebug.h>
-#include <tdeversion.h>
-
-#if TDE_VERSION < TDE_MAKE_VERSION(3,1,9)
-# include <tqdatetimeedit.h>
-# define KTimeWidget TQTimeEdit
-# define KDateWidget TQDateEdit
-# define KDateTimeWidget TQDateTimeEdit
-#else
-# include <ktimewidget.h>
-# include <kdatewidget.h>
-# include <kdatetimewidget.h>
-#endif
+#include <ktimewidget.h>
+#include <kdatewidget.h>
+#include <kdatetimewidget.h>
 
 #include "spring.h"
 #include "formIO.h"
@@ -280,10 +271,8 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin
 	KFormDesigner::WidgetInfo *wDate = new KFormDesigner::WidgetInfo(this);
 	wDate->setPixmap("dateedit");
 	wDate->setClassName("KDateWidget");
-#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,9)
 	wDate->addAlternateClassName("TQDateEdit");
 	wDate->setIncludeFileName("kdatewidget.h");
-#endif
 	wDate->setName(i18n("Date Widget"));
 	wDate->setNamePrefix(
 		i18n("Widget name. This string will be used to name widgets of this class. It must _not_ contain white spaces and non latin1 characters.", "dateWidget"));
@@ -293,10 +282,8 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin
 	KFormDesigner::WidgetInfo *wTime = new KFormDesigner::WidgetInfo(this);
 	wTime->setPixmap("timeedit");
 	wTime->setClassName("KTimeWidget");
-#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,9)
 	wTime->addAlternateClassName("TQTimeEdit");
 	wTime->setIncludeFileName("ktimewidget.h");
-#endif
 	wTime->setName(i18n("Time Widget"));
 	wTime->setNamePrefix(
 		i18n("Widget name. This string will be used to name widgets of this class. It must _not_ contain white spaces and non latin1 characters.", "timeWidget"));
@@ -306,10 +293,8 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin
 	KFormDesigner::WidgetInfo *wDateTime = new KFormDesigner::WidgetInfo(this);
 	wDateTime->setPixmap("datetimeedit");
 	wDateTime->setClassName("KDateTimeWidget");
-#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,9)
 	wDateTime->addAlternateClassName("TQDateTimeEdit");
 	wDateTime->setIncludeFileName("kdatetimewidget.h");
-#endif
 	wDateTime->setName(i18n("Date/Time Widget"));
 	wDateTime->setNamePrefix(
 		i18n("Widget name. This string will be used to name widgets of this class. It must _not_ contain white spaces and non latin1 characters.", "dateTimeWidget"));
diff --git a/kexi/formeditor/formIO.cpp b/kexi/formeditor/formIO.cpp
index 188238fdd..2ab38e2dd 100644
--- a/kexi/formeditor/formIO.cpp
+++ b/kexi/formeditor/formIO.cpp
@@ -1197,13 +1197,11 @@ FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *paren
 
 	if(!w)
 		return;
-#if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0) 
 //! @todo allow setting this for data view mode as well
 	if (m_currentForm->designMode()) {
 		//don't generate accelerators for widgets in design mode
 		TDEAcceleratorManager::setNoAccel(w);
 	}
-#endif
 	w->setStyle(&(container->widget()->style()));
 	w->show();
 
diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp
index 235ab2d20..ff440e931 100644
--- a/kexi/formeditor/formmanager.cpp
+++ b/kexi/formeditor/formmanager.cpp
@@ -50,8 +50,7 @@
 #include <ktabwidget.h>
 #include <tdefontdialog.h>
 
-#include <tdeversion.h>
-#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,9) && !defined(TQ_WS_WIN)
+#if !defined(TQ_WS_WIN)
 # include <tdeactioncollection.h>
 #endif
 
diff --git a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
index aa8c3fa45..489716e63 100644
--- a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
+++ b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
@@ -25,7 +25,6 @@
 #include <tqevent.h>
 #include <tqobjectlist.h>
 
-#include <tdeversion.h>
 #include <tdeaction.h>
 #include <tdeinstance.h>
 #include <tdelocale.h>
diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp
index 0a9e88acb..66bf7fd25 100644
--- a/kexi/formeditor/test/kfd_part.cpp
+++ b/kexi/formeditor/test/kfd_part.cpp
@@ -25,7 +25,6 @@
 #include <tqevent.h>
 #include <tqobjectlist.h>
 
-#include <tdeversion.h>
 #include <tdeaction.h>
 #include <tdeinstance.h>
 #include <tdelocale.h>