From 933b892946bd640e29ddbf5279ffebec99df5b1c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 15 Nov 2011 18:47:14 -0600 Subject: Rename KDE_VERSION to TDE_VERSION --- kexi/formeditor/commands.cpp | 4 ++-- kexi/formeditor/factories/containerfactory.cpp | 8 ++++---- kexi/formeditor/factories/stdwidgetfactory.cpp | 8 ++++---- kexi/formeditor/formIO.cpp | 2 +- kexi/formeditor/formmanager.cpp | 2 +- kexi/main/keximainwindowimpl_p.h | 2 +- kexi/main/kexistatusbar.cpp | 4 ++-- kexi/main/kexistatusbar.h | 2 +- kexi/plugins/forms/kexidbfactory.cpp | 6 +++--- 9 files changed, 19 insertions(+), 19 deletions(-) (limited to 'kexi') 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 -#if KDE_VERSION < KDE_MAKE_VERSION(3,1,9) +#if TDE_VERSION < KDE_MAKE_VERSION(3,1,9) # define KInputDialog TQInputDialog # include # include @@ -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 #include -#if KDE_VERSION < KDE_MAKE_VERSION(3,1,9) +#if TDE_VERSION < KDE_MAKE_VERSION(3,1,9) # include # 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 #include -#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 #endif diff --git a/kexi/main/keximainwindowimpl_p.h b/kexi/main/keximainwindowimpl_p.h index 974f51c7..c79b58db 100644 --- a/kexi/main/keximainwindowimpl_p.h +++ b/kexi/main/keximainwindowimpl_p.h @@ -290,7 +290,7 @@ void updatePropEditorDockWidthInfo() { // ds->setKeepSize(true); config->setGroup("MainWindow"); -# if KDE_VERSION >= KDE_MAKE_VERSION(3,4,0) +# if TDE_VERSION >= KDE_MAKE_VERSION(3,4,0) if (wasAutoOpen) //(dw2->isVisible()) // ds->setSeparatorPosInPercent( 100 * nav->width() / wnd->width() ); diff --git a/kexi/main/kexistatusbar.cpp b/kexi/main/kexistatusbar.cpp index 6ccc8d8f..e2240e5c 100644 --- a/kexi/main/kexistatusbar.cpp +++ b/kexi/main/kexistatusbar.cpp @@ -80,7 +80,7 @@ void KexiStatusBar::activePartChanged(KParts::Part *part) connect( part->widget(), TQT_SIGNAL( viewStatusMsg( const TQString & ) ), this, TQT_SLOT( settqStatus( const TQString & ) ) ); -# if KDE_VERSION < KDE_MAKE_VERSION(3,1,90) +# if TDE_VERSION < KDE_MAKE_VERSION(3,1,90) changeItem(m_map[ m_activePart ], m_msgID); // m_status->setText( m_map[ m_activePart ] ); # endif @@ -117,7 +117,7 @@ void KexiStatusBar::settqStatus(const TQString &str) changeItem(str, m_msgID); #if defined(KDE_MAKE_VERSION) -# if KDE_VERSION < KDE_MAKE_VERSION(3,1,90) +# if TDE_VERSION < KDE_MAKE_VERSION(3,1,90) m_map[m_activePart] = str; # endif #endif diff --git a/kexi/main/kexistatusbar.h b/kexi/main/kexistatusbar.h index c498e2f5..15b8f583 100644 --- a/kexi/main/kexistatusbar.h +++ b/kexi/main/kexistatusbar.h @@ -68,7 +68,7 @@ class KexiStatusBar : public KStatusBar // still hoping for a fix for KDE-3.1 #if defined(KDE_MAKE_VERSION) -# if KDE_VERSION < KDE_MAKE_VERSION(3,1,90) +# if TDE_VERSION < KDE_MAKE_VERSION(3,1,90) TQMap m_map; # endif #endif diff --git a/kexi/plugins/forms/kexidbfactory.cpp b/kexi/plugins/forms/kexidbfactory.cpp index 89f8ae11..3f47a6ec 100644 --- a/kexi/plugins/forms/kexidbfactory.cpp +++ b/kexi/plugins/forms/kexidbfactory.cpp @@ -210,7 +210,7 @@ KexiDBFactory::KexiDBFactory(TQObject *parent, const char *name, const TQStringL #endif /* -#if KDE_VERSION >= KDE_MAKE_VERSION(3,1,9) +#if TDE_VERSION >= KDE_MAKE_VERSION(3,1,9) KexiDataAwareWidgetInfo *wDate = new KexiDataAwareWidgetInfo(this, "stdwidgets", "KDateWidget"); #else KexiDataAwareWidgetInfo *wDate = new KexiDataAwareWidgetInfo(this, "stdwidgets", TQDATEEDIT_OBJECT_NAME_STRING); @@ -225,7 +225,7 @@ KexiDBFactory::KexiDBFactory(TQObject *parent, const char *name, const TQStringL wDate->setDescription(i18n("A widget to input and display a date")); addClass(wDate); -#if KDE_VERSION >= KDE_MAKE_VERSION(3,1,9) +#if TDE_VERSION >= KDE_MAKE_VERSION(3,1,9) KexiDataAwareWidgetInfo *wTime = new KexiDataAwareWidgetInfo(this, "stdwidgets", "KTimeWidget"); #else KexiDataAwareWidgetInfo *wTime = new KexiDataAwareWidgetInfo(this, "stdwidgets", TQTIMEEDIT_OBJECT_NAME_STRING); @@ -240,7 +240,7 @@ KexiDBFactory::KexiDBFactory(TQObject *parent, const char *name, const TQStringL wTime->setDescription(i18n("A widget to input and display a time")); addClass(wTime); -#if KDE_VERSION >= KDE_MAKE_VERSION(3,1,9) +#if TDE_VERSION >= KDE_MAKE_VERSION(3,1,9) KexiDataAwareWidgetInfo *wDateTime = new KexiDataAwareWidgetInfo(this, "stdwidgets", "KDateTimeWidget"); #else KexiDataAwareWidgetInfo *wDateTime = new KexiDataAwareWidgetInfo(this, "stdwidgets", "KDateTimeWidget"); -- cgit v1.2.1