diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-26 20:07:39 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-26 20:07:39 -0600 |
| commit | 4163a7bc764c85387ab50a0a9042401aac430547 (patch) | |
| tree | c2ede39f3fbc7e64aa67e9823aa37182289e22c3 /kexi/formeditor/factories | |
| parent | 039393e199a49b5158929668908f9cb1fe226484 (diff) | |
| download | koffice-4163a7bc764c85387ab50a0a9042401aac430547.tar.gz koffice-4163a7bc764c85387ab50a0a9042401aac430547.zip | |
Rename KDE_MAKE_VERSION and update TDE version string
Diffstat (limited to 'kexi/formeditor/factories')
| -rw-r--r-- | kexi/formeditor/factories/containerfactory.cpp | 8 | ||||
| -rw-r--r-- | kexi/formeditor/factories/stdwidgetfactory.cpp | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/kexi/formeditor/factories/containerfactory.cpp b/kexi/formeditor/factories/containerfactory.cpp index e87c300e..81360927 100644 --- a/kexi/formeditor/factories/containerfactory.cpp +++ b/kexi/formeditor/factories/containerfactory.cpp @@ -56,7 +56,7 @@ #include "widgetlibrary.h" #include <formeditor/utils.h> -#if TDE_VERSION < KDE_MAKE_VERSION(3,1,9) +#if TDE_VERSION < TDE_MAKE_VERSION(3,1,9) # define KInputDialog TQInputDialog # include <tqinputdialog.h> # include <tqlineedit.h> @@ -367,7 +367,7 @@ ContainerFactory::ContainerFactory(TQObject *parent, const char *, const TQStrin KFormDesigner::WidgetInfo *wTabWidget = new KFormDesigner::WidgetInfo(this); wTabWidget->setPixmap("tabwidget"); wTabWidget->setClassName("KFDTabWidget"); -#if TDE_VERSION >= KDE_MAKE_VERSION(3,1,9) +#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,9) wTabWidget->addAlternateClassName("KTabWidget"); wTabWidget->addAlternateClassName(TQTABWIDGET_OBJECT_NAME_STRING); //tmp: wTabWidget->setSavingName(TQTABWIDGET_OBJECT_NAME_STRING); @@ -518,7 +518,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 >= KDE_MAKE_VERSION(3,1,9) +#if defined(USE_KTabWidget) && TDE_VERSION >= TDE_MAKE_VERSION(3,1,9) tab->setTabReorderingEnabled(true); connect(tab, TQT_SIGNAL(movedTab(int,int)), this, TQT_SLOT(reorderTabs(int,int))); #endif @@ -857,7 +857,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 < KDE_MAKE_VERSION(3,1,9) +#if TDE_VERSION < TDE_MAKE_VERSION(3,1,9) TQLineEdit::Normal, #endif tab->tabLabel(w), &ok, w->topLevelWidget()); diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp index e6b13f0e..be97d921 100644 --- a/kexi/formeditor/factories/stdwidgetfactory.cpp +++ b/kexi/formeditor/factories/stdwidgetfactory.cpp @@ -35,7 +35,7 @@ #include <kdebug.h> #include <tdeversion.h> -#if TDE_VERSION < KDE_MAKE_VERSION(3,1,9) +#if TDE_VERSION < TDE_MAKE_VERSION(3,1,9) # include <tqdatetimeedit.h> # define KTimeWidget TQTimeEdit # define KDateWidget TQDateEdit @@ -280,7 +280,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin KFormDesigner::WidgetInfo *wDate = new KFormDesigner::WidgetInfo(this); wDate->setPixmap("dateedit"); wDate->setClassName("KDateWidget"); -#if TDE_VERSION >= KDE_MAKE_VERSION(3,1,9) +#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,9) wDate->addAlternateClassName(TQDATEEDIT_OBJECT_NAME_STRING); wDate->setIncludeFileName("kdatewidget.h"); #endif @@ -293,7 +293,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin KFormDesigner::WidgetInfo *wTime = new KFormDesigner::WidgetInfo(this); wTime->setPixmap("timeedit"); wTime->setClassName("KTimeWidget"); -#if TDE_VERSION >= KDE_MAKE_VERSION(3,1,9) +#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,9) wTime->addAlternateClassName(TQTIMEEDIT_OBJECT_NAME_STRING); wTime->setIncludeFileName("ktimewidget.h"); #endif @@ -306,7 +306,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin KFormDesigner::WidgetInfo *wDateTime = new KFormDesigner::WidgetInfo(this); wDateTime->setPixmap("datetimeedit"); wDateTime->setClassName("KDateTimeWidget"); -#if TDE_VERSION >= KDE_MAKE_VERSION(3,1,9) +#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,9) wDateTime->addAlternateClassName(TQDATETIMEEDIT_OBJECT_NAME_STRING); wDateTime->setIncludeFileName("kdatetimewidget.h"); #endif |