diff options
Diffstat (limited to 'kexi/plugins/forms')
-rw-r--r-- | kexi/plugins/forms/kexidataprovider.cpp | 2 | ||||
-rw-r--r-- | kexi/plugins/forms/kexidbfactory.cpp | 32 | ||||
-rw-r--r-- | kexi/plugins/forms/kexiformpart.cpp | 6 | ||||
-rw-r--r-- | kexi/plugins/forms/widgets/kexidbcombobox.cpp | 2 | ||||
-rw-r--r-- | kexi/plugins/forms/widgets/kexidbform.cpp | 6 |
5 files changed, 24 insertions, 24 deletions
diff --git a/kexi/plugins/forms/kexidataprovider.cpp b/kexi/plugins/forms/kexidataprovider.cpp index 637c9434..c8594e22 100644 --- a/kexi/plugins/forms/kexidataprovider.cpp +++ b/kexi/plugins/forms/kexidataprovider.cpp @@ -56,7 +56,7 @@ void KexiFormDataProvider::setMainDataSourceWidget(TQWidget* mainWidget) return; //find widgets whose will work as data items - TQObjectList *l = m_mainWidget->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *l = m_mainWidget->queryList( "TQWidget" ); TQObjectListIt it( *l ); TQObject *obj; TQDict<char> tmpSources; diff --git a/kexi/plugins/forms/kexidbfactory.cpp b/kexi/plugins/forms/kexidbfactory.cpp index 1154e110..19241a36 100644 --- a/kexi/plugins/forms/kexidbfactory.cpp +++ b/kexi/plugins/forms/kexidbfactory.cpp @@ -101,7 +101,7 @@ KexiDBFactory::KexiDBFactory(TQObject *parent, const char *name, const TQStringL wi = new KexiDataAwareWidgetInfo(this, "stdwidgets", "KLineEdit"); wi->setPixmap("lineedit"); wi->setClassName("KexiDBLineEdit"); - wi->addAlternateClassName(TQLINEEDIT_OBJECT_NAME_STRING, true/*override*/); + wi->addAlternateClassName("TQLineEdit", true/*override*/); wi->addAlternateClassName("KLineEdit", true/*override*/); wi->setIncludeFileName("klineedit.h"); wi->setName(i18n("Text Box")); @@ -115,7 +115,7 @@ KexiDBFactory::KexiDBFactory(TQObject *parent, const char *name, const TQStringL wi = new KexiDataAwareWidgetInfo(this, "stdwidgets", "KTextEdit"); wi->setPixmap("textedit"); wi->setClassName("KexiDBTextEdit"); - wi->addAlternateClassName(TQTEXTEDIT_OBJECT_NAME_STRING, true/*override*/); + wi->addAlternateClassName("TQTextEdit", true/*override*/); wi->addAlternateClassName("KTextEdit", true/*override*/); wi->setIncludeFileName("ktextedit.h"); wi->setName(i18n("Text Editor")); @@ -126,10 +126,10 @@ KexiDBFactory::KexiDBFactory(TQObject *parent, const char *name, const TQStringL addClass(wi); wi = new KFormDesigner::WidgetInfo( - this, "containers", TQFRAME_OBJECT_NAME_STRING /*we're inheriting to get i18n'd strings already translated there*/); + this, "containers", "TQFrame" /*we're inheriting to get i18n'd strings already translated there*/); wi->setPixmap("frame"); wi->setClassName("KexiFrame"); - wi->addAlternateClassName(TQFRAME_OBJECT_NAME_STRING, true/*override*/); + wi->addAlternateClassName("TQFrame", true/*override*/); wi->setName(i18n("Frame")); wi->setNamePrefix( i18n("Widget name. This string will be used to name widgets of this class. " @@ -138,10 +138,10 @@ KexiDBFactory::KexiDBFactory(TQObject *parent, const char *name, const TQStringL addClass(wi); wi = new KexiDataAwareWidgetInfo( - this, "stdwidgets", TQLABEL_OBJECT_NAME_STRING /*we're inheriting to get i18n'd strings already translated there*/); + this, "stdwidgets", "TQLabel" /*we're inheriting to get i18n'd strings already translated there*/); wi->setPixmap("label"); wi->setClassName("KexiDBLabel"); - wi->addAlternateClassName(TQLABEL_OBJECT_NAME_STRING, true/*override*/); + wi->addAlternateClassName("TQLabel", true/*override*/); wi->addAlternateClassName("KexiLabel", true/*override*/); //older wi->setName(i18n("Text Label", "Label")); wi->setNamePrefix( @@ -184,10 +184,10 @@ KexiDBFactory::KexiDBFactory(TQObject *parent, const char *name, const TQStringL addClass(wi); #endif - wi = new KexiDataAwareWidgetInfo(this, "stdwidgets", TQCHECKBOX_OBJECT_NAME_STRING); + wi = new KexiDataAwareWidgetInfo(this, "stdwidgets", "TQCheckBox"); wi->setPixmap("check"); wi->setClassName("KexiDBCheckBox"); - wi->addAlternateClassName(TQCHECKBOX_OBJECT_NAME_STRING, true/*override*/); + wi->addAlternateClassName("TQCheckBox", true/*override*/); wi->setName(i18n("Check Box")); wi->setNamePrefix( i18n("Widget name. This string will be used to name widgets of this class. " @@ -213,11 +213,11 @@ KexiDBFactory::KexiDBFactory(TQObject *parent, const char *name, const TQStringL #if TDE_VERSION >= TDE_MAKE_VERSION(3,1,9) KexiDataAwareWidgetInfo *wDate = new KexiDataAwareWidgetInfo(this, "stdwidgets", "KDateWidget"); #else - KexiDataAwareWidgetInfo *wDate = new KexiDataAwareWidgetInfo(this, "stdwidgets", TQDATEEDIT_OBJECT_NAME_STRING); + KexiDataAwareWidgetInfo *wDate = new KexiDataAwareWidgetInfo(this, "stdwidgets", "TQDateEdit"); #endif wDate->setPixmap("dateedit"); wDate->setClassName("KexiDBDateEdit"); - wDate->addAlternateClassName(TQDATEEDIT_OBJECT_NAME_STRING, true);//override + wDate->addAlternateClassName("TQDateEdit", true);//override wDate->addAlternateClassName("KDateWidget", true);//override wDate->setName(i18n("Date Widget")); wDate->setNamePrefix( @@ -228,11 +228,11 @@ KexiDBFactory::KexiDBFactory(TQObject *parent, const char *name, const TQStringL #if TDE_VERSION >= TDE_MAKE_VERSION(3,1,9) KexiDataAwareWidgetInfo *wTime = new KexiDataAwareWidgetInfo(this, "stdwidgets", "KTimeWidget"); #else - KexiDataAwareWidgetInfo *wTime = new KexiDataAwareWidgetInfo(this, "stdwidgets", TQTIMEEDIT_OBJECT_NAME_STRING); + KexiDataAwareWidgetInfo *wTime = new KexiDataAwareWidgetInfo(this, "stdwidgets", "TQTimeEdit"); #endif wTime->setPixmap("timeedit"); wTime->setClassName("KexiDBTimeEdit"); - wTime->addAlternateClassName(TQTIMEEDIT_OBJECT_NAME_STRING, true);//override + wTime->addAlternateClassName("TQTimeEdit", true);//override wTime->addAlternateClassName("KTimeWidget", true);//override wTime->setName(i18n("Time Widget")); wTime->setNamePrefix( @@ -247,7 +247,7 @@ KexiDBFactory::KexiDBFactory(TQObject *parent, const char *name, const TQStringL #endif wDateTime->setPixmap("datetimeedit"); wDateTime->setClassName("KexiDBDateTimeEdit"); - wDateTime->addAlternateClassName(TQDATETIMEEDIT_OBJECT_NAME_STRING, true);//override + wDateTime->addAlternateClassName("TQDateTimeEdit", true);//override wDateTime->addAlternateClassName("KDateTimeWidget", true);//override wDateTime->setName(i18n("Date/Time Widget")); wDateTime->setNamePrefix( @@ -259,7 +259,7 @@ KexiDBFactory::KexiDBFactory(TQObject *parent, const char *name, const TQStringL /* KexiDataAwareWidgetInfo *wIntSpinBox = new KexiDataAwareWidgetInfo(this, "stdwidgets", "KIntSpinBox"); wIntSpinBox->setPixmap("spin"); wIntSpinBox->setClassName("KexiDBIntSpinBox"); - wIntSpinBox->addAlternateClassName(TQSPINBOX_OBJECT_NAME_STRING, true); + wIntSpinBox->addAlternateClassName("TQSpinBox", true); wIntSpinBox->addAlternateClassName("KIntSpinBox", true); wIntSpinBox->setName(i18n("Integer Number Spin Box")); wIntSpinBox->setNamePrefix( @@ -374,7 +374,7 @@ KexiDBFactory::createWidget(const TQCString &c, TQWidget *p, const char *n, if (designMode) w->setCursor(TQCursor(TQt::ArrowCursor)); } - else if(c == TQFRAME_OBJECT_NAME_STRING || c == "KexiFrame") + else if(c == "TQFrame" || c == "KexiFrame") { w = new KexiFrame(p, n); new KFormDesigner::Container(container, w, container); @@ -415,7 +415,7 @@ bool KexiDBFactory::createMenuActions(const TQCString &classname, TQWidget *w, TQPopupMenu *menu, KFormDesigner::Container *) { - if(classname == TQPUSHBUTTON_OBJECT_NAME_STRING || classname == "KPushButton" || classname == "KexiPushButton") + if(classname == "TQPushButton" || classname == "KPushButton" || classname == "KexiPushButton") { /*! @todo also call createMenuActions() for inherited factory! */ m_assignAction->plug( menu ); diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp index 0b5f83ef..cce155d4 100644 --- a/kexi/plugins/forms/kexiformpart.cpp +++ b/kexi/plugins/forms/kexiformpart.cpp @@ -262,10 +262,10 @@ KexiFormPart::generateForm(KexiDB::FieldList *list, TQDomDocument &domDoc) TQDomElement baseClass = domDoc.createElement("class"); uiElement.appendChild(baseClass); - TQDomText baseClassV = domDoc.createTextNode(TQWIDGET_OBJECT_NAME_STRING); + TQDomText baseClassV = domDoc.createTextNode("TQWidget"); baseClass.appendChild(baseClassV); TQDomElement baseWidget = domDoc.createElement("widget"); - baseWidget.setAttribute("class", TQWIDGET_OBJECT_NAME_STRING); + baseWidget.setAttribute("class", "TQWidget"); int y=0; @@ -273,7 +273,7 @@ KexiFormPart::generateForm(KexiDB::FieldList *list, TQDomDocument &domDoc) { TQDomElement lclass = domDoc.createElement("widget"); baseWidget.appendChild(lclass); - lclass.setAttribute("class", TQLABEL_OBJECT_NAME_STRING); + lclass.setAttribute("class", "TQLabel"); TQDomElement lNameProperty = domDoc.createElement("property"); lNameProperty.setAttribute("name", "name"); TQDomElement lType = domDoc.createElement("cstring"); diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp index cf6e5cc3..c7a378df 100644 --- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp +++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp @@ -197,7 +197,7 @@ void KexiDBComboBox::createEditor() d->subWidgetsWithDisabledEvents = new TQPtrDict<char>(); d->subWidgetsWithDisabledEvents->insert(m_subwidget, (char*)1); m_subwidget->installEventFilter(this); - TQObjectList *l = m_subwidget->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *l = m_subwidget->queryList( "TQWidget" ); for ( TQObjectListIt it( *l ); it.current(); ++it ) { d->subWidgetsWithDisabledEvents->insert(it.current(), (char*)1); it.current()->installEventFilter(this); diff --git a/kexi/plugins/forms/widgets/kexidbform.cpp b/kexi/plugins/forms/widgets/kexidbform.cpp index 17242953..980e384d 100644 --- a/kexi/plugins/forms/widgets/kexidbform.cpp +++ b/kexi/plugins/forms/widgets/kexidbform.cpp @@ -128,7 +128,7 @@ KexiDataAwareObjectInterface* KexiDBForm::dataAwareObject() const { return d->da //repaint all children widgets static void repaintAll(TQWidget *w) { - TQObjectList *list = w->queryList(TQWIDGET_OBJECT_NAME_STRING); + TQObjectList *list = w->queryList("TQWidget"); TQObjectListIt it(*list); for (TQObject *obj; (obj=it.current()); ++it ) { TQT_TQWIDGET(obj)->repaint(); @@ -314,7 +314,7 @@ void KexiDBForm::updateTabStopsOrder(KFormDesigner::Form* form) //this widget has tab focus: it.current()->widget()->installEventFilter(this); //also filter events for data-aware children of this widget (i.e. KexiDBAutoField's editors) - TQObjectList *children = it.current()->widget()->queryList(TQWIDGET_OBJECT_NAME_STRING); + TQObjectList *children = it.current()->widget()->queryList("TQWidget"); for (TQObjectListIt childrenIt(*children); childrenIt.current(); ++childrenIt) { // if (dynamic_cast<KexiFormDataItemInterface*>(childrenIt.current())) { kexipluginsdbg << "KexiDBForm::updateTabStopsOrder(): also adding '" @@ -404,7 +404,7 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e ) if (!tab && !backtab) { //for buttons, left/up and right/down keys act like tab/backtab (see qbutton.cpp) - if (realWidget->inherits(TQBUTTON_OBJECT_NAME_STRING)) { + if (realWidget->inherits("TQButton")) { if (ke->state() == Qt::NoButton && (key == TQt::Key_Right || key == TQt::Key_Down)) tab = true; else if (ke->state() == Qt::NoButton && (key == TQt::Key_Left || key == TQt::Key_Up)) |