diff options
Diffstat (limited to 'kexi/formeditor/factories/containerfactory.cpp')
| -rw-r--r-- | kexi/formeditor/factories/containerfactory.cpp | 21 |
1 files changed, 3 insertions, 18 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); } |