Remove use of TDE_VERSIONHEADmaster

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

2 files changed, 6 insertions, 36 deletions

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"));