diff options
Diffstat (limited to 'kexi/formeditor')
-rw-r--r-- | kexi/formeditor/commands.cpp | 4 | ||||
-rw-r--r-- | kexi/formeditor/factories/containerfactory.cpp | 8 | ||||
-rw-r--r-- | kexi/formeditor/factories/stdwidgetfactory.cpp | 8 | ||||
-rw-r--r-- | kexi/formeditor/formIO.cpp | 2 | ||||
-rw-r--r-- | kexi/formeditor/formmanager.cpp | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/kexi/formeditor/commands.cpp b/kexi/formeditor/commands.cpp index e7a5ad8e..c9bad809 100644 --- a/kexi/formeditor/commands.cpp +++ b/kexi/formeditor/commands.cpp @@ -744,7 +744,7 @@ InsertWidgetCommand::execute() kdWarning() << "InsertWidgetCommand::execute() ERROR: widget creation failed" << endl; return; } -#if KDE_VERSION >= KDE_MAKE_VERSION(3,4,0) +#if TDE_VERSION >= KDE_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 @@ -897,7 +897,7 @@ CreateLayoutCommand::execute() m_name = m_form->objectTree()->generateUniqueName(classname); TQWidget *w = lib->createWidget(classname, container->widget(), m_name.latin1(), container); -#if KDE_VERSION >= KDE_MAKE_VERSION(3,4,0) +#if TDE_VERSION >= KDE_MAKE_VERSION(3,4,0) //! @todo allow setting this for data view mode as well if (w) { if (m_form->designMode()) { diff --git a/kexi/formeditor/factories/containerfactory.cpp b/kexi/formeditor/factories/containerfactory.cpp index 2a38803a..a7fa5d3e 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 KDE_VERSION < KDE_MAKE_VERSION(3,1,9) +#if TDE_VERSION < KDE_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 KDE_VERSION >= KDE_MAKE_VERSION(3,1,9) +#if TDE_VERSION >= KDE_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) && KDE_VERSION >= KDE_MAKE_VERSION(3,1,9) +#if defined(USE_KTabWidget) && TDE_VERSION >= KDE_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 KDE_VERSION < KDE_MAKE_VERSION(3,1,9) +#if TDE_VERSION < KDE_MAKE_VERSION(3,1,9) TQLineEdit::Normal, #endif tab->tabLabel(w), &ok, w->tqtopLevelWidget()); diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp index bfc9db63..b9e85b9c 100644 --- a/kexi/formeditor/factories/stdwidgetfactory.cpp +++ b/kexi/formeditor/factories/stdwidgetfactory.cpp @@ -35,7 +35,7 @@ #include <kdebug.h> #include <kdeversion.h> -#if KDE_VERSION < KDE_MAKE_VERSION(3,1,9) +#if TDE_VERSION < KDE_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 KDE_VERSION >= KDE_MAKE_VERSION(3,1,9) +#if TDE_VERSION >= KDE_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 KDE_VERSION >= KDE_MAKE_VERSION(3,1,9) +#if TDE_VERSION >= KDE_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 KDE_VERSION >= KDE_MAKE_VERSION(3,1,9) +#if TDE_VERSION >= KDE_MAKE_VERSION(3,1,9) wDateTime->addAlternateClassName(TQDATETIMEEDIT_OBJECT_NAME_STRING); wDateTime->setIncludeFileName("kdatetimewidget.h"); #endif diff --git a/kexi/formeditor/formIO.cpp b/kexi/formeditor/formIO.cpp index 563d89fd..2759fe98 100644 --- a/kexi/formeditor/formIO.cpp +++ b/kexi/formeditor/formIO.cpp @@ -1197,7 +1197,7 @@ FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *paren if(!w) return; -#if KDE_VERSION >= KDE_MAKE_VERSION(3,4,0) +#if TDE_VERSION >= KDE_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 diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp index ce25d710..6ec87fc0 100644 --- a/kexi/formeditor/formmanager.cpp +++ b/kexi/formeditor/formmanager.cpp @@ -51,7 +51,7 @@ #include <kfontdialog.h> #include <kdeversion.h> -#if KDE_VERSION >= KDE_MAKE_VERSION(3,1,9) && !defined(TQ_WS_WIN) +#if TDE_VERSION >= KDE_MAKE_VERSION(3,1,9) && !defined(TQ_WS_WIN) # include <kactioncollection.h> #endif |