diff --git a/chalk/doc/chalk.xmi b/chalk/doc/chalk.xmi index 66fc04cfd..17678b051 100644 --- a/chalk/doc/chalk.xmi +++ b/chalk/doc/chalk.xmi @@ -55,8 +55,8 @@ - - + + @@ -170,7 +170,7 @@ This replaces the KisKrayon facility that used to be present in Krayon." visibil - + @@ -322,7 +322,7 @@ This replaces the KisKrayon facility that used to be present in Krayon." visibil - + @@ -400,10 +400,10 @@ data to rbg for screen rendering." visibility="public" xmi.id="259" name="CMYK" - + - - + + - + - + @@ -939,7 +939,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas - + @@ -978,7 +978,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas - + @@ -988,7 +988,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas - + @@ -1116,15 +1116,15 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas - - + + - - + + - - + + @@ -1227,7 +1227,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas - + @@ -1247,7 +1247,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas - + @@ -1311,7 +1311,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas - + @@ -1732,10 +1732,10 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas - + - + @@ -1842,7 +1842,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas - + @@ -1959,7 +1959,7 @@ cannot be abstract, because otherwise this class would be abstract." visibility= - + @@ -2047,13 +2047,13 @@ cannot be abstract, because otherwise this class would be abstract." visibility= - + - + @@ -2128,11 +2128,11 @@ cannot be abstract, because otherwise this class would be abstract." visibility= - + - + @@ -2225,7 +2225,7 @@ cannot be abstract, because otherwise this class would be abstract." visibility= - + @@ -2233,7 +2233,7 @@ cannot be abstract, because otherwise this class would be abstract." visibility= - + @@ -2242,10 +2242,10 @@ cannot be abstract, because otherwise this class would be abstract." visibility= - - + + - + @@ -2401,7 +2401,7 @@ cannot be abstract, because otherwise this class would be abstract." visibility= - + @@ -2454,7 +2454,7 @@ cannot be abstract, because otherwise this class would be abstract." visibility= - + @@ -2499,11 +2499,11 @@ cannot be abstract, because otherwise this class would be abstract." visibility= - + - + - + @@ -2548,7 +2548,7 @@ cannot be abstract, because otherwise this class would be abstract." visibility= - + @@ -2562,22 +2562,22 @@ cannot be abstract, because otherwise this class would be abstract." visibility= - - - + + + - - + + - - - + + + - - + + - + - + @@ -2634,9 +2634,9 @@ in the constructor, you have to call loadAsync. @param filename the file name to save and load from." visibility="public" xmi.id="2085" type="virtual " name="~KisResource" /> - + - + @@ -2676,7 +2676,7 @@ in the constructor, you have to call loadAsync. - + @@ -2684,8 +2684,8 @@ in the constructor, you have to call loadAsync. - - + + @@ -2810,7 +2810,7 @@ in the constructor, you have to call loadAsync. - + @@ -3170,7 +3170,7 @@ in the constructor, you have to call loadAsync. - + diff --git a/chalk/doc/colorspaces.xmi b/chalk/doc/colorspaces.xmi index 8fae7b488..d263e79fd 100644 --- a/chalk/doc/colorspaces.xmi +++ b/chalk/doc/colorspaces.xmi @@ -500,7 +500,7 @@ model together." isSpecification="false" isLeaf="false" visibility="protected" x - + @@ -513,7 +513,7 @@ model together." isSpecification="false" isLeaf="false" visibility="protected" x - + - + - +
@@ -9248,7 +9248,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -13009,7 +13009,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
diff --git a/chalk/doc/controller.xmi b/chalk/doc/controller.xmi index 539d9cf11..7579734d5 100644 --- a/chalk/doc/controller.xmi +++ b/chalk/doc/controller.xmi @@ -1797,12 +1797,12 @@ and contains data that must be associated with an image for purposes of import/e - + - + @@ -2056,7 +2056,7 @@ That last bit has not been solved yet. - + @@ -2209,13 +2209,13 @@ and the clipboard." isSpecification="false" isLeaf="false" visibility="public" x - + - + @@ -2677,7 +2677,7 @@ the resource has been saved." isSpecification="false" isLeaf="false" visibility= - + @@ -15867,7 +15867,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -16467,7 +16467,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -17964,7 +17964,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -21542,7 +21542,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -21917,7 +21917,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -26390,7 +26390,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
diff --git a/chalk/doc/histograms.xmi b/chalk/doc/histograms.xmi index fb6bc5113..56ad12970 100644 --- a/chalk/doc/histograms.xmi +++ b/chalk/doc/histograms.xmi @@ -148,7 +148,7 @@ - + - + @@ -3163,7 +3163,7 @@ of choice, and rounded to a reasonable precision to avoid 0.999999" isSpecificat - + diff --git a/chalk/ui/kis_view.cpp b/chalk/ui/kis_view.cpp index 59da51890..bf029fb10 100644 --- a/chalk/ui/kis_view.cpp +++ b/chalk/ui/kis_view.cpp @@ -3515,7 +3515,7 @@ bool KisView::eventFilter(TQObject *o, TQEvent *e) child->installEventFilter(this); - TQObjectList *objectList = child->queryList(TQWIDGET_OBJECT_NAME_STRING); + TQObjectList *objectList = child->queryList("TQWidget"); TQObjectListIt it(*objectList); TQObject *obj; while ((obj = it.current()) != 0) { diff --git a/filters/karbon/ai/aielement.cpp b/filters/karbon/ai/aielement.cpp index 2f514d06c..f6f451640 100644 --- a/filters/karbon/ai/aielement.cpp +++ b/filters/karbon/ai/aielement.cpp @@ -283,7 +283,7 @@ void AIElement::detach() /*! Returns the name of the type stored in the aielement. The returned strings describe the C++ datatype used to store the - data: for example, "TQFont", TQSTRING_OBJECT_NAME_STRING, or "TQValueList". + data: for example, "TQFont", "TQString", or "TQValueList". An Invalid aielement returns 0. */ const char* AIElement::typeName() const @@ -311,7 +311,7 @@ static const char* const type_map[ntypes] = { 0, // "TQValueList", - TQSTRING_OBJECT_NAME_STRING, + "TQString", "int", "uint", "double", @@ -319,7 +319,7 @@ static const char* const type_map[ntypes] = "Operator", "Reference", "TQValueVector", - TQBYTEARRAY_OBJECT_NAME_STRING, + "TQByteArray", "uchar", }; diff --git a/filters/karbon/xfig/xfigimport_factory.h b/filters/karbon/xfig/xfigimport_factory.h index 9760a92f2..da49c2731 100644 --- a/filters/karbon/xfig/xfigimport_factory.h +++ b/filters/karbon/xfig/xfigimport_factory.h @@ -37,7 +37,7 @@ public: XFIGImportFactory(TQObject* parent = 0, const char* name = 0); virtual ~XFIGImportFactory(); - virtual TQObject* createObject(TQObject* parent = 0, const char* name = 0, const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); + virtual TQObject* createObject(TQObject* parent = 0, const char* name = 0, const char* classname = "TQObject", const TQStringList &args = TQStringList()); static TDEInstance* global(); diff --git a/filters/kword/libexport/ProcessDocument.cpp b/filters/kword/libexport/ProcessDocument.cpp index 69b14857f..1ec7bc8cb 100644 --- a/filters/kword/libexport/ProcessDocument.cpp +++ b/filters/kword/libexport/ProcessDocument.cpp @@ -213,12 +213,12 @@ static void ProcessBoolIntValueTag ( TQDomNode myNode, void *tagData, KWEFKWordL static void ProcessStringValueTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *leader ) { - ProcessOneAttrTag (myNode, "value", TQSTRING_OBJECT_NAME_STRING, tagData, leader); + ProcessOneAttrTag (myNode, "value", "TQString", tagData, leader); } static void ProcessStringNameTag (TQDomNode myNode, void *tagData, KWEFKWordLeader *leader ) { - ProcessOneAttrTag (myNode, "name", TQSTRING_OBJECT_NAME_STRING, tagData, leader); + ProcessOneAttrTag (myNode, "name", "TQString", tagData, leader); } @@ -311,7 +311,7 @@ void ProcessAnchorTag ( TQDomNode myNode, *instance = TQString(); TQValueList attrProcessingList; attrProcessingList << AttrProcessing ( "type", type ) - << AttrProcessing ( "instance", TQSTRING_OBJECT_NAME_STRING, instance ); + << AttrProcessing ( "instance", "TQString", instance ); ProcessAttributes (myNode, attrProcessingList); if ( type != "frameset" ) @@ -851,7 +851,7 @@ static void ProcessAnyBorderTag ( TQDomNode myNode, void *tagData, KWEFKWordLead static void ProcessFollowingTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *leader ) { - ProcessOneAttrTag (myNode, "name", TQSTRING_OBJECT_NAME_STRING, tagData, leader); + ProcessOneAttrTag (myNode, "name", "TQString", tagData, leader); } static void ProcessLinespacingTag (TQDomNode myNode, void *tagData, KWEFKWordLeader* /*leader*/ ) diff --git a/filters/kword/libexport/TagProcessing.cpp b/filters/kword/libexport/TagProcessing.cpp index 46a8fb353..1a993073b 100644 --- a/filters/kword/libexport/TagProcessing.cpp +++ b/filters/kword/libexport/TagProcessing.cpp @@ -107,7 +107,7 @@ AttrProcessing::AttrProcessing ( const TQString& n, const TQString& t, void *d ) { if ( t == "int" ) type = AttrInt; - else if ( t == TQSTRING_OBJECT_NAME_STRING ) + else if ( t == "TQString" ) type = AttrTQString; else if ( t == "double" ) type = AttrDouble; diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp index 8814176e1..027e1b81c 100644 --- a/kdgantt/KDGanttViewSubwidgets.cpp +++ b/kdgantt/KDGanttViewSubwidgets.cpp @@ -3222,7 +3222,7 @@ KDGanttCanvasView::KDGanttCanvasView( KDGanttView* sender,TQCanvas* canvas, TQWi myMyContentsHeight = 0; _showItemAddPopupMenu = false; - TQObject *scrollViewTimer = child( "scrollview scrollbar timer", TQTIMER_OBJECT_NAME_STRING, false ); + TQObject *scrollViewTimer = child( "scrollview scrollbar timer", "TQTimer", false ); Q_ASSERT( scrollViewTimer ); if ( scrollViewTimer ) { disconnect( scrollViewTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateScrollBars() ) ); diff --git a/kexi/core/kexidialogbase.cpp b/kexi/core/kexidialogbase.cpp index 340576960..7b57d6733 100644 --- a/kexi/core/kexidialogbase.cpp +++ b/kexi/core/kexidialogbase.cpp @@ -100,7 +100,7 @@ void KexiDialogBase::addView(KexiViewBase *view, int mode) // addActionProxyChild( view ); //set focus proxy inside this view - TQWidget *ch = TQT_TQWIDGET(view->child( 0, TQWIDGET_OBJECT_NAME_STRING, false )); + TQWidget *ch = TQT_TQWIDGET(view->child( 0, "TQWidget", false )); if (ch) view->setFocusProxy(ch); diff --git a/kexi/core/kexiviewbase.cpp b/kexi/core/kexiviewbase.cpp index c4eb3eaa2..c2a3f2a5a 100644 --- a/kexi/core/kexiviewbase.cpp +++ b/kexi/core/kexiviewbase.cpp @@ -212,7 +212,7 @@ bool KexiViewBase::removeDataBlock( const TQString& dataID ) bool KexiViewBase::eventFilter( TQObject *o, TQEvent *e ) { - if (e->type()==TQEvent::FocusIn || e->type()==TQEvent::FocusOut) {// && o->inherits(TQWIDGET_OBJECT_NAME_STRING)) { + if (e->type()==TQEvent::FocusIn || e->type()==TQEvent::FocusOut) {// && o->inherits("TQWidget")) { // //hp==true if currently focused widget is a child of this table view // const bool hp = Kexi::hasParent( static_cast(o), focusWidget()); // kexidbg << "KexiViewBase::eventFilter(): " << o->name() << " " << e->type() << endl; diff --git a/kexi/examples/Simple_Database.kexi.sql b/kexi/examples/Simple_Database.kexi.sql index 27ee93c33..97870fb23 100644 --- a/kexi/examples/Simple_Database.kexi.sql +++ b/kexi/examples/Simple_Database.kexi.sql @@ -23,7 +23,7 @@ INSERT INTO "kexi__objectdata" VALUES(4, ' QWidget - + formularz1 @@ -235,7 +235,7 @@ INSERT INTO "kexi__objectdata" VALUES(96, ' QWidget - + report2 @@ -428,7 +428,7 @@ INSERT INTO "kexi__objectdata" VALUES(105, ' QWidget - + form1 diff --git a/kexi/formeditor/commands.cpp b/kexi/formeditor/commands.cpp index 3e22fcdd5..10bd7eb31 100644 --- a/kexi/formeditor/commands.cpp +++ b/kexi/formeditor/commands.cpp @@ -378,10 +378,10 @@ AdjustSizeCommand::AdjustSizeCommand(int type, WidgetList &list, Form *form) { for(TQWidget *w = list.first(); w; w = list.next()) { - if(w->parentWidget() && w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING)) + if(w->parentWidget() && w->parentWidget()->isA("TQWidgetStack")) { w = w->parentWidget(); // widget is WidgetStack page - if(w->parentWidget() && w->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) // widget is tabwidget page + if(w->parentWidget() && w->parentWidget()->inherits("TQTabWidget")) // widget is tabwidget page w = w->parentWidget(); } @@ -888,7 +888,7 @@ CreateLayoutCommand::execute() TQCString classname; switch(m_type) { case Container::HSplitter: case Container::VSplitter: - classname = TQSPLITTER_OBJECT_NAME_STRING; break; + classname = "TQSplitter"; break; default: classname = Container::layoutTypeToString(m_type).latin1(); } @@ -1385,7 +1385,7 @@ DeleteWidgetCommand::DeleteWidgetCommand(WidgetList &list, Form *form) { TQWidget *w = it.current(); // Don't delete tabwidget or widgetstack pages - if(w->parentWidget()->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING)) + if(w->parentWidget()->inherits("TQWidgetStack")) { list.remove(w); continue; diff --git a/kexi/formeditor/container.cpp b/kexi/formeditor/container.cpp index a785893fa..4ea7f97ee 100644 --- a/kexi/formeditor/container.cpp +++ b/kexi/formeditor/container.cpp @@ -61,7 +61,7 @@ EventEater::eventFilter(TQObject *, TQEvent *ev) // When the user click the empty part of tab bar, only MouseReleaseEvent is sent, // we need to simulate the Press event - if(ev->type() == TQEvent::MouseButtonRelease && m_widget->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) + if(ev->type() == TQEvent::MouseButtonRelease && m_widget->inherits("TQTabWidget")) { TQMouseEvent *mev = TQT_TQMOUSEEVENT(ev); if(mev->button() == Qt::LeftButton) @@ -225,7 +225,7 @@ Container::eventFilter(TQObject *s, TQEvent *e) m_state = DrawingSelectionRect; } else { - if(s->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) // to allow changing page by clicking tab + if(s->inherits("TQTabWidget")) // to allow changing page by clicking tab return false; } @@ -299,7 +299,7 @@ Container::eventFilter(TQObject *s, TQEvent *e) { if(!m_toplevel && m_moving == m_container) // no effect for form return false; - if((!m_moving) || (!m_moving->parentWidget()))// || (m_moving->parentWidget()->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING))) + if((!m_moving) || (!m_moving->parentWidget()))// || (m_moving->parentWidget()->inherits("TQWidgetStack"))) return true; moveSelectedWidgetsBy(mev->x() - m_grab.x(), mev->y() - m_grab.y()); @@ -1107,13 +1107,13 @@ Container::moveSelectedWidgetsBy(int realdx, int realdy, TQMouseEvent *mev) for(TQWidget *w = m_form->selectedWidgets()->first(); w; w = m_form->selectedWidgets()->next()) { - if(!w || !w->parent() || w->parent()->inherits(TQTABWIDGET_OBJECT_NAME_STRING) || w->parent()->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING)) + if(!w || !w->parent() || w->parent()->inherits("TQTabWidget") || w->parent()->inherits("TQWidgetStack")) continue; - if(w->parentWidget() && w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING)) + if(w->parentWidget() && w->parentWidget()->isA("TQWidgetStack")) { w = w->parentWidget(); // widget is WidgetStack page - if(w->parentWidget() && w->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) // widget is tabwidget page + if(w->parentWidget() && w->parentWidget()->inherits("TQTabWidget")) // widget is tabwidget page w = w->parentWidget(); } @@ -1133,13 +1133,13 @@ Container::moveSelectedWidgetsBy(int realdx, int realdy, TQMouseEvent *mev) for(TQWidget *w = m_form->selectedWidgets()->first(); w; w = m_form->selectedWidgets()->next()) { // Don't move tab widget pages (or widget stack pages) - if(!w || !w->parent() || w->parent()->inherits(TQTABWIDGET_OBJECT_NAME_STRING) || w->parent()->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING)) + if(!w || !w->parent() || w->parent()->inherits("TQTabWidget") || w->parent()->inherits("TQWidgetStack")) continue; - if(w->parentWidget() && w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING)) + if(w->parentWidget() && w->parentWidget()->isA("TQWidgetStack")) { w = w->parentWidget(); // widget is WidgetStack page - if(w->parentWidget() && w->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) // widget is tabwidget page + if(w->parentWidget() && w->parentWidget()->inherits("TQTabWidget")) // widget is tabwidget page w = w->parentWidget(); } diff --git a/kexi/formeditor/factories/containerfactory.cpp b/kexi/formeditor/factories/containerfactory.cpp index 8b0d5fc58..b0005dd93 100644 --- a/kexi/formeditor/factories/containerfactory.cpp +++ b/kexi/formeditor/factories/containerfactory.cpp @@ -244,11 +244,11 @@ InsertPageCommand::execute() TQWidget *parent = m_form->objectTree()->lookup(m_parentname)->widget(); if(m_name.isEmpty()) { m_name = container->form()->objectTree()->generateUniqueName( - container->form()->library()->displayName(TQWIDGET_OBJECT_NAME_STRING).latin1(), + container->form()->library()->displayName("TQWidget").latin1(), /*!numberSuffixRequired*/false); } - TQWidget *page = container->form()->library()->createWidget(TQWIDGET_OBJECT_NAME_STRING, parent, m_name.latin1(), container); + TQWidget *page = container->form()->library()->createWidget("TQWidget", parent, m_name.latin1(), container); // TQWidget *page = new ContainerWidget(parent, m_name.latin1()); // new KFormDesigner::Container(container, page, parent); @@ -263,7 +263,7 @@ InsertPageCommand::execute() KFormDesigner::ObjectTreeItem *item = container->form()->objectTree()->lookup(m_name); item->addModifiedProperty("title", n); } - else if(classname == TQWIDGETSTACK_OBJECT_NAME_STRING) + else if(classname == "TQWidgetStack") { TQWidgetStack *stack = (TQWidgetStack*)parent; stack->addWidget(page, m_pageid); @@ -291,7 +291,7 @@ InsertPageCommand::unexecute() TabWidgetBase *tab = dynamic_cast(parent); tab->removePage(page); } - else if(classname == TQWIDGETSTACK_OBJECT_NAME_STRING) + else if(classname == "TQWidgetStack") { TQWidgetStack *stack = (TQWidgetStack*)parent; int id = stack->id(page) - 1; @@ -357,7 +357,7 @@ ContainerFactory::ContainerFactory(TQObject *parent, const char *, const TQStrin { KFormDesigner::WidgetInfo *wBtnGroup = new KFormDesigner::WidgetInfo(this); wBtnGroup->setPixmap("frame"); - wBtnGroup->setClassName(TQBUTTONGROUP_OBJECT_NAME_STRING); + wBtnGroup->setClassName("TQButtonGroup"); wBtnGroup->setName(i18n("Button Group")); wBtnGroup->setNamePrefix( i18n("Widget name. This string will be used to name widgets of this class. It must _not_ contain white spaces and non latin1 characters.", "buttonGroup")); @@ -369,11 +369,11 @@ ContainerFactory::ContainerFactory(TQObject *parent, const char *, const TQStrin wTabWidget->setClassName("KFDTabWidget"); #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); + wTabWidget->addAlternateClassName("TQTabWidget"); +//tmp: wTabWidget->setSavingName("TQTabWidget"); wTabWidget->setSavingName("KTabWidget"); #else - wTabWidget->setSavingName(TQTABWIDGET_OBJECT_NAME_STRING); + wTabWidget->setSavingName("TQTabWidget"); #endif wTabWidget->setIncludeFileName("ktabwidget.h"); wTabWidget->setName(i18n("Tab Widget")); @@ -384,7 +384,7 @@ ContainerFactory::ContainerFactory(TQObject *parent, const char *, const TQStrin KFormDesigner::WidgetInfo *wWidget = new KFormDesigner::WidgetInfo(this); wWidget->setPixmap("frame"); - wWidget->setClassName(TQWIDGET_OBJECT_NAME_STRING); + wWidget->setClassName("TQWidget"); wWidget->addAlternateClassName("ContainerWidget"); wWidget->setName(i18n("Basic container")); wWidget->setNamePrefix( @@ -394,7 +394,7 @@ ContainerFactory::ContainerFactory(TQObject *parent, const char *, const TQStrin KFormDesigner::WidgetInfo *wGroupBox = new KFormDesigner::WidgetInfo(this); wGroupBox->setPixmap("groupbox"); - wGroupBox->setClassName(TQGROUPBOX_OBJECT_NAME_STRING); + wGroupBox->setClassName("TQGroupBox"); wGroupBox->addAlternateClassName("GroupBox"); wGroupBox->setName(i18n("Group Box")); wGroupBox->setNamePrefix( @@ -404,7 +404,7 @@ ContainerFactory::ContainerFactory(TQObject *parent, const char *, const TQStrin KFormDesigner::WidgetInfo *wFrame = new KFormDesigner::WidgetInfo(this); wFrame->setPixmap("frame"); - wFrame->setClassName(TQFRAME_OBJECT_NAME_STRING); + wFrame->setClassName("TQFrame"); wFrame->setName(i18n("Frame")); wFrame->setNamePrefix( i18n("Widget name. This string will be used to name widgets of this class. It must _not_ contain white spaces and non latin1 characters.", "frame")); @@ -413,7 +413,7 @@ ContainerFactory::ContainerFactory(TQObject *parent, const char *, const TQStrin KFormDesigner::WidgetInfo *wWidgetStack = new KFormDesigner::WidgetInfo(this); wWidgetStack->setPixmap("widgetstack"); - wWidgetStack->setClassName(TQWIDGETSTACK_OBJECT_NAME_STRING); + wWidgetStack->setClassName("TQWidgetStack"); wWidgetStack->setName(i18n("Widget Stack")); wWidgetStack->setNamePrefix( i18n("Widget name. This string will be used to name widgets of this class. It must _not_ contain white spaces and non latin1 characters.", "widgetStack")); @@ -451,7 +451,7 @@ ContainerFactory::ContainerFactory(TQObject *parent, const char *, const TQStrin //! @todo horizontal/vertical splitter icons wSplitter->setPixmap("frame"); wSplitter->setClassName("Splitter"); - wSplitter->addAlternateClassName(TQSPLITTER_OBJECT_NAME_STRING); + wSplitter->addAlternateClassName("TQSplitter"); wSplitter->setName(i18n("Splitter")); wSplitter->setNamePrefix( i18n("Widget name. This string will be used to name widgets of this class. It must _not_ contain white spaces and non latin1 characters.", "splitter")); @@ -508,7 +508,7 @@ TQWidget* ContainerFactory::createWidget(const TQCString &c, TQWidget *p, const char *n, KFormDesigner::Container *container, int options) { - if(c == TQBUTTONGROUP_OBJECT_NAME_STRING) + if(c == "TQButtonGroup") { TQString text = container->form()->library()->textForWidgetName(n, c); TQButtonGroup *w = new TQButtonGroup(/*i18n("Button Group")*/text, p, n); @@ -538,20 +538,20 @@ ContainerFactory::createWidget(const TQCString &c, TQWidget *p, const char *n, return tab; } - else if(c == TQWIDGET_OBJECT_NAME_STRING || c=="ContainerWidget") + else if(c == "TQWidget" || c=="ContainerWidget") { TQWidget *w = new ContainerWidget(p, n); new KFormDesigner::Container(container, w, TQT_TQOBJECT(p)); return w; } - else if(c == TQGROUPBOX_OBJECT_NAME_STRING || c == "GroupBox") + else if(c == "TQGroupBox" || c == "GroupBox") { TQString text = container->form()->library()->textForWidgetName(n, c); TQGroupBox *w = new GroupBox(text, p, n); new KFormDesigner::Container(container, w, container); return w; } - else if(c == TQFRAME_OBJECT_NAME_STRING) + else if(c == "TQFrame") { TQFrame *w = new TQFrame(p, n); w->setLineWidth(2); @@ -559,7 +559,7 @@ ContainerFactory::createWidget(const TQCString &c, TQWidget *p, const char *n, new KFormDesigner::Container(container, w, container); return w; } - else if(c == TQWIDGETSTACK_OBJECT_NAME_STRING) + else if(c == "TQWidgetStack") { TQWidgetStack *stack = new TQWidgetStack(p, n); stack->setLineWidth(2); @@ -606,7 +606,7 @@ ContainerFactory::createWidget(const TQCString &c, TQWidget *p, const char *n, SubForm *subform = new SubForm(p, n); return subform; } - else if(c == TQSPLITTER_OBJECT_NAME_STRING) { + else if(c == "TQSplitter") { TQSplitter *split = new TQSplitter(p, n); if (0 == (options & WidgetFactory::AnyOrientation)) split->setOrientation( @@ -651,9 +651,9 @@ ContainerFactory::createMenuActions(const TQCString &classname, TQWidget *w, TQP //m_widget = w; // m_container = container; - if((classname == "KFDTabWidget") || (w->parentWidget()->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING))) + if((classname == "KFDTabWidget") || (w->parentWidget()->parentWidget()->inherits("TQTabWidget"))) { - if(w->parentWidget()->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) + if(w->parentWidget()->parentWidget()->inherits("TQTabWidget")) { //m_widget = w->parentWidget()->parentWidget(); setWidget(w->parentWidget()->parentWidget(), m_container->toplevel()); @@ -668,7 +668,7 @@ ContainerFactory::createMenuActions(const TQCString &classname, TQWidget *w, TQP menu->setItemEnabled(id, false); return true; } - else if(w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING) && !w->parentWidget()->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) + else if(w->parentWidget()->isA("TQWidgetStack") && !w->parentWidget()->parentWidget()->inherits("TQTabWidget")) { //m_widget = w->parentWidget(); TQWidgetStack *stack = (TQWidgetStack*)w->parentWidget(); //m_widget; @@ -702,14 +702,14 @@ bool ContainerFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDesigner::Container *container) { m_container = container; - if(classname == TQBUTTONGROUP_OBJECT_NAME_STRING) + if(classname == "TQButtonGroup") { TQButtonGroup *group = static_cast(w); TQRect r = TQRect(group->x()+2, group->y()-5, group->width()-10, w->fontMetrics().height() + 10); createEditor(classname, group->title(), group, container, r, TQt::AlignAuto); return true; } - if(classname == TQGROUPBOX_OBJECT_NAME_STRING || classname == "GroupBox") + if(classname == "TQGroupBox" || classname == "GroupBox") { TQGroupBox *group = static_cast(w); TQRect r = TQRect(group->x()+2, group->y()-5, group->width()-10, w->fontMetrics().height() + 10); @@ -722,12 +722,12 @@ ContainerFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes bool ContainerFactory::saveSpecialProperty(const TQCString &, const TQString &name, const TQVariant &, TQWidget *w, TQDomElement &parentNode, TQDomDocument &parent) { - if((name == "title") && (w->parentWidget()->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING))) + if((name == "title") && (w->parentWidget()->parentWidget()->inherits("TQTabWidget"))) { TabWidgetBase *tab = dynamic_cast(w->parentWidget()->parentWidget()); KFormDesigner::FormIO::savePropertyElement(parentNode, parent, "attribute", "title", tab->tabLabel(w)); } - else if((name == "id") && (w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING))) + else if((name == "id") && (w->parentWidget()->isA("TQWidgetStack"))) { TQWidgetStack *stack = (TQWidgetStack*)w->parentWidget(); KFormDesigner::FormIO::savePropertyElement(parentNode, parent, "attribute", "id", stack->id(w)); @@ -741,7 +741,7 @@ bool ContainerFactory::readSpecialProperty(const TQCString &, TQDomElement &node, TQWidget *w, KFormDesigner::ObjectTreeItem *item) { TQString name = node.attribute("name"); - if((name == "title") && (item->parent()->widget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING))) + if((name == "title") && (item->parent()->widget()->inherits("TQTabWidget"))) { TabWidgetBase *tab = dynamic_cast(w->parentWidget()); tab->addTab(w, node.firstChild().toElement().text()); @@ -749,7 +749,7 @@ ContainerFactory::readSpecialProperty(const TQCString &, TQDomElement &node, TQW return true; } - if((name == "id") && (w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING))) + if((name == "id") && (w->parentWidget()->isA("TQWidgetStack"))) { TQWidgetStack *stack = (TQWidgetStack*)w->parentWidget(); int id = KFormDesigner::FormIO::readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name).toInt(); @@ -768,7 +768,7 @@ ContainerFactory::autoSaveProperties(const TQCString &c) TQValueList lst; // if(c == "SubForm") // lst << "formName"; - if(c == TQSPLITTER_OBJECT_NAME_STRING) + if(c == "TQSplitter") lst << "orientation"; return lst; } @@ -784,7 +784,7 @@ ContainerFactory::isPropertyVisibleInternal(const TQCString &classname, { return property == "name" || property == "geometry"; } - else if (classname == TQGROUPBOX_OBJECT_NAME_STRING || classname=="GroupBox") { + else if (classname == "TQGroupBox" || classname=="GroupBox") { ok = #ifdef KEXI_NO_UNFINISHED /*! @todo Hidden for now in Kexi. "checkable" and "checked" props need adding @@ -821,8 +821,8 @@ ContainerFactory::resizeEditor(TQWidget *editor, TQWidget *widget, const TQCStri void ContainerFactory::addTabPage() { -// if (!m_widget->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) - if (!widget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) +// if (!m_widget->inherits("TQTabWidget")) + if (!widget()->inherits("TQTabWidget")) return; KCommand *com = new InsertPageCommand(m_container, widget()); if(dynamic_cast(widget())->count() == 0) @@ -836,7 +836,7 @@ void ContainerFactory::addTabPage() void ContainerFactory::removeTabPage() { - if (!widget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) + if (!widget()->inherits("TQTabWidget")) return; TabWidgetBase *tab = dynamic_cast(widget()); TQWidget *w = tab->currentPage(); @@ -850,7 +850,7 @@ void ContainerFactory::removeTabPage() void ContainerFactory::renameTabPage() { - if (!widget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) + if (!widget()->inherits("TQTabWidget")) return; TabWidgetBase *tab = dynamic_cast(widget()); TQWidget *w = tab->currentPage(); @@ -878,7 +878,7 @@ void ContainerFactory::reorderTabs(int oldpos, int newpos) void ContainerFactory::addStackPage() { - if (!widget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING)) + if (!widget()->isA("TQWidgetStack")) return; KCommand *com = new InsertPageCommand(m_container, widget()); if(!((TQWidgetStack*)widget())->visibleWidget()) @@ -892,7 +892,7 @@ void ContainerFactory::addStackPage() void ContainerFactory::removeStackPage() { - if (!widget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING)) + if (!widget()->isA("TQWidgetStack")) return; TQWidgetStack *stack = (TQWidgetStack*)widget(); TQWidget *page = stack->visibleWidget(); diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp index adb4d1bf9..a74097a03 100644 --- a/kexi/formeditor/factories/stdwidgetfactory.cpp +++ b/kexi/formeditor/factories/stdwidgetfactory.cpp @@ -125,7 +125,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin KFormDesigner::WidgetInfo *wLabel = new KFormDesigner::WidgetInfo(this); wLabel->setPixmap("label"); - wLabel->setClassName(TQLABEL_OBJECT_NAME_STRING); + wLabel->setClassName("TQLabel"); wLabel->setName(i18n("Text Label")); wLabel->setNamePrefix( i18n("Widget name. This string will be used to name widgets of this class. It must _not_ contain white spaces and non latin1 characters.", "label")); @@ -137,7 +137,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin wPixLabel->setClassName("KexiPictureLabel"); wPixLabel->setName(i18n("Picture Label")); //! @todo TQt designer compatibility: maybe use this class when TQLabel has a pixmap set...? - //wPixLabel->addAlternateClassName(TQLABEL_OBJECT_NAME_STRING); + //wPixLabel->addAlternateClassName("TQLabel"); wPixLabel->setSavingName("KexiPictureLabel"); wPixLabel->setNamePrefix( i18n("Widget name. This string will be used to name widgets of this class. It must _not_ contain white spaces and non latin1 characters.", "picture")); @@ -147,7 +147,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin KFormDesigner::WidgetInfo *wLineEdit = new KFormDesigner::WidgetInfo(this); wLineEdit->setPixmap("lineedit"); wLineEdit->setClassName("KLineEdit"); - wLineEdit->addAlternateClassName(TQLINEEDIT_OBJECT_NAME_STRING); + wLineEdit->addAlternateClassName("TQLineEdit"); wLineEdit->setIncludeFileName("klineedit.h"); wLineEdit->setName(i18n("Line Edit")); wLineEdit->setNamePrefix( @@ -167,7 +167,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin KFormDesigner::WidgetInfo *wPushButton = new KFormDesigner::WidgetInfo(this); wPushButton->setPixmap("button"); wPushButton->setClassName("KPushButton"); - wPushButton->addAlternateClassName(TQPUSHBUTTON_OBJECT_NAME_STRING); + wPushButton->addAlternateClassName("TQPushButton"); wPushButton->setIncludeFileName("kpushbutton.h"); wPushButton->setName(i18n("Push Button")); wPushButton->setNamePrefix( @@ -177,7 +177,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin KFormDesigner::WidgetInfo *wRadioButton = new KFormDesigner::WidgetInfo(this); wRadioButton->setPixmap("radio"); - wRadioButton->setClassName(TQRADIOBUTTON_OBJECT_NAME_STRING); + wRadioButton->setClassName("TQRadioButton"); wRadioButton->setName(i18n("Option Button")); wRadioButton->setNamePrefix( i18n("Widget name. This string will be used to name widgets of this class. It must _not_ contain white spaces and non latin1 characters.", "optionButton")); @@ -186,7 +186,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin KFormDesigner::WidgetInfo *wCheckBox = new KFormDesigner::WidgetInfo(this); wCheckBox->setPixmap("check"); - wCheckBox->setClassName(TQCHECKBOX_OBJECT_NAME_STRING); + wCheckBox->setClassName("TQCheckBox"); wCheckBox->setName(i18n("Check Box")); wCheckBox->setNamePrefix( i18n("Widget name. This string will be used to name widgets of this class. It must _not_ contain white spaces and non latin1 characters.", "checkBox")); @@ -196,7 +196,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin KFormDesigner::WidgetInfo *wSpinBox = new KFormDesigner::WidgetInfo(this); wSpinBox->setPixmap("spin"); wSpinBox->setClassName("KIntSpinBox"); - wSpinBox->addAlternateClassName(TQSPINBOX_OBJECT_NAME_STRING); + wSpinBox->addAlternateClassName("TQSpinBox"); wSpinBox->setIncludeFileName("knuminput.h"); wSpinBox->setName(i18n("Spin Box")); wSpinBox->setNamePrefix( @@ -207,7 +207,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin KFormDesigner::WidgetInfo *wComboBox = new KFormDesigner::WidgetInfo(this); wComboBox->setPixmap("combo"); wComboBox->setClassName("KComboBox"); - wComboBox->addAlternateClassName(TQCOMBOBOX_OBJECT_NAME_STRING); + wComboBox->addAlternateClassName("TQComboBox"); wComboBox->setIncludeFileName("kcombobox.h"); wComboBox->setName(i18n("Combo Box")); wComboBox->setNamePrefix( @@ -218,7 +218,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin KFormDesigner::WidgetInfo *wListBox = new KFormDesigner::WidgetInfo(this); wListBox->setPixmap("listbox"); wListBox->setClassName("TDEListBox"); - wListBox->addAlternateClassName(TQLISTBOX_OBJECT_NAME_STRING); + wListBox->addAlternateClassName("TQListBox"); wListBox->setIncludeFileName("tdelistbox.h"); wListBox->setName(i18n("List Box")); wListBox->setNamePrefix( @@ -229,7 +229,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin KFormDesigner::WidgetInfo *wTextEdit = new KFormDesigner::WidgetInfo(this); wTextEdit->setPixmap("textedit"); wTextEdit->setClassName("KTextEdit"); - wTextEdit->addAlternateClassName(TQTEXTEDIT_OBJECT_NAME_STRING); + wTextEdit->addAlternateClassName("TQTextEdit"); wTextEdit->setIncludeFileName("ktextedit.h"); wTextEdit->setName(i18n("Text Editor")); wTextEdit->setNamePrefix( @@ -240,7 +240,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin KFormDesigner::WidgetInfo *wListView = new KFormDesigner::WidgetInfo(this); wListView->setPixmap("listview"); wListView->setClassName("TDEListView"); - wListView->addAlternateClassName(TQLISTVIEW_OBJECT_NAME_STRING); + wListView->addAlternateClassName("TQListView"); wListView->setIncludeFileName("tdelistview.h"); wListView->setName(i18n("List View")); wListView->setNamePrefix( @@ -250,7 +250,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin KFormDesigner::WidgetInfo *wSlider = new KFormDesigner::WidgetInfo(this); wSlider->setPixmap("slider"); - wSlider->setClassName(TQSLIDER_OBJECT_NAME_STRING); + wSlider->setClassName("TQSlider"); wSlider->setName(i18n("Slider")); wSlider->setNamePrefix( i18n("Widget name. This string will be used to name widgets of this class. It must _not_ contain white spaces and non latin1 characters.", "slider")); @@ -260,7 +260,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin KFormDesigner::WidgetInfo *wProgressBar = new KFormDesigner::WidgetInfo(this); wProgressBar->setPixmap("progress"); wProgressBar->setClassName("KProgress"); - wProgressBar->addAlternateClassName(TQPROGRESSBAR_OBJECT_NAME_STRING); + wProgressBar->addAlternateClassName("TQProgressBar"); wProgressBar->setIncludeFileName("kprogress.h"); wProgressBar->setName(i18n("Progress Bar")); wProgressBar->setNamePrefix( @@ -281,7 +281,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin wDate->setPixmap("dateedit"); wDate->setClassName("KDateWidget"); #if TDE_VERSION >= TDE_MAKE_VERSION(3,1,9) - wDate->addAlternateClassName(TQDATEEDIT_OBJECT_NAME_STRING); + wDate->addAlternateClassName("TQDateEdit"); wDate->setIncludeFileName("kdatewidget.h"); #endif wDate->setName(i18n("Date Widget")); @@ -294,7 +294,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin wTime->setPixmap("timeedit"); wTime->setClassName("KTimeWidget"); #if TDE_VERSION >= TDE_MAKE_VERSION(3,1,9) - wTime->addAlternateClassName(TQTIMEEDIT_OBJECT_NAME_STRING); + wTime->addAlternateClassName("TQTimeEdit"); wTime->setIncludeFileName("ktimewidget.h"); #endif wTime->setName(i18n("Time Widget")); @@ -307,7 +307,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin wDateTime->setPixmap("datetimeedit"); wDateTime->setClassName("KDateTimeWidget"); #if TDE_VERSION >= TDE_MAKE_VERSION(3,1,9) - wDateTime->addAlternateClassName(TQDATETIMEEDIT_OBJECT_NAME_STRING); + wDateTime->addAlternateClassName("TQDateTimeEdit"); wDateTime->setIncludeFileName("kdatetimewidget.h"); #endif wDateTime->setName(i18n("Date/Time Widget")); @@ -385,7 +385,7 @@ StdWidgetFactory::createWidget(const TQCString &c, TQWidget *p, const char *n, TQString text( container->form()->library()->textForWidgetName(n, c) ); const bool designMode = options & KFormDesigner::WidgetFactory::DesignViewMode; - if(c == TQLABEL_OBJECT_NAME_STRING) + if(c == "TQLabel") w = new TQLabel(text, p, n); else if(c == "KexiPictureLabel") w = new KexiPictureLabel(DesktopIcon("image-x-generic"), p, n); @@ -399,10 +399,10 @@ StdWidgetFactory::createWidget(const TQCString &c, TQWidget *p, const char *n, else if(c == "KPushButton") w = new KPushButton(/*i18n("Button")*/text, p, n); - else if(c == TQRADIOBUTTON_OBJECT_NAME_STRING) + else if(c == "TQRadioButton") w = new TQRadioButton(/*i18n("Radio Button")*/text, p, n); - else if(c == TQCHECKBOX_OBJECT_NAME_STRING) + else if(c == "TQCheckBox") w = new TQCheckBox(/*i18n("Check Box")*/text, p, n); else if(c == "KIntSpinBox") @@ -424,7 +424,7 @@ StdWidgetFactory::createWidget(const TQCString &c, TQWidget *p, const char *n, ((TDEListView*)w)->addColumn(i18n("Column 1")); ((TDEListView*)w)->setRootIsDecorated(true); } - else if(c == TQSLIDER_OBJECT_NAME_STRING) + else if(c == "TQSlider") w = new TQSlider(Qt::Horizontal, p, n); else if(c == "KProgress") @@ -470,7 +470,7 @@ bool StdWidgetFactory::createMenuActions(const TQCString &classname, TQWidget *, TQPopupMenu *menu, KFormDesigner::Container *) { - if((classname == TQLABEL_OBJECT_NAME_STRING) || (classname == "KTextEdit")) + if((classname == "TQLabel") || (classname == "KTextEdit")) { menu->insertItem(SmallIconSet("edit"), i18n("Edit Rich Text"), this, TQT_SLOT(editText())); return true; @@ -495,7 +495,7 @@ StdWidgetFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes createEditor(classname, lineedit->text(), lineedit, container, lineedit->geometry(), lineedit->alignment(), true); return true; } - else if(classname == TQLABEL_OBJECT_NAME_STRING) + else if(classname == "TQLabel") { TQLabel *label = static_cast(w); if(label->textFormat() == RichText) @@ -520,7 +520,7 @@ StdWidgetFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes createEditor(classname, push->text(), push, container, editorRect, TQt::AlignCenter, false, false, TQt::PaletteButton); return true; } - else if(classname == TQRADIOBUTTON_OBJECT_NAME_STRING) + else if(classname == "TQRadioButton") { TQRadioButton *radio = static_cast(w); TQRect r = w->style().subRect(TQStyle::SR_RadioButtonContents, w); @@ -528,7 +528,7 @@ StdWidgetFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes createEditor(classname, radio->text(), radio, container, editorRect, TQt::AlignAuto); return true; } - else if(classname == TQCHECKBOX_OBJECT_NAME_STRING) + else if(classname == "TQCheckBox") { TQCheckBox *check = static_cast(w); //TQRect r(check->geometry()); @@ -609,7 +609,7 @@ StdWidgetFactory::changeText(const TQString &text) TQFontMetrics fm = w->fontMetrics(); TQSize s(fm.width( text ), fm.height()); int width; - if(n == TQLABEL_OBJECT_NAME_STRING) // labels are resized to fit the text + if(n == "TQLabel") // labels are resized to fit the text { w->resize(w->sizeHint()); WidgetFactory::m_editor->resize(w->size()); @@ -618,9 +618,9 @@ StdWidgetFactory::changeText(const TQString &text) // and other widgets are just enlarged if needed else if(n == "KPushButton") width = w->style().sizeFromContents( TQStyle::CT_PushButton, w, s).width(); - else if(n == TQCHECKBOX_OBJECT_NAME_STRING) + else if(n == "TQCheckBox") width = w->style().sizeFromContents( TQStyle::CT_CheckBox, w, s).width(); - else if(n == TQRADIOBUTTON_OBJECT_NAME_STRING) + else if(n == "TQRadioButton") width = w->style().sizeFromContents( TQStyle::CT_RadioButton, w, s).width(); else return; @@ -643,13 +643,13 @@ StdWidgetFactory::resizeEditor(TQWidget *editor, TQWidget *widget, const TQCStri TQPoint p = widget->pos(); TQRect r; - if(classname == TQRADIOBUTTON_OBJECT_NAME_STRING) + if(classname == "TQRadioButton") { r = widget->style().subRect(TQStyle::SR_RadioButtonContents, widget); p += r.topLeft(); s.setWidth(r.width()); } - else if(classname == TQCHECKBOX_OBJECT_NAME_STRING) + else if(classname == "TQCheckBox") { r = widget->style().subRect(TQStyle::SR_CheckBoxContents, widget); p += r.topLeft(); @@ -863,7 +863,7 @@ StdWidgetFactory::isPropertyVisibleInternal(const TQCString &classname, if((property == "text") || (property == "indent") || (property == "textFormat") || (property == "font") || (property == "alignment")) return false; } - else if(classname == TQLABEL_OBJECT_NAME_STRING) + else if(classname == "TQLabel") { if(property == "pixmap") return false; @@ -890,11 +890,11 @@ StdWidgetFactory::isPropertyVisibleInternal(const TQCString &classname, if((property == "frameShape") || (property == "font") || (property == "margin")) return false; } - else if(classname==TQCHECKBOX_OBJECT_NAME_STRING) + else if(classname=="TQCheckBox") { ok = m_showAdvancedProperties || (property != "autoRepeat"); } - else if(classname==TQRADIOBUTTON_OBJECT_NAME_STRING) + else if(classname=="TQRadioButton") { ok = m_showAdvancedProperties || (property != "autoRepeat"); } @@ -911,7 +911,7 @@ StdWidgetFactory::autoSaveProperties(const TQCString &classname) { TQValueList l; - if(classname == TQLABEL_OBJECT_NAME_STRING) + if(classname == "TQLabel") l << "text"; if(classname == "KPushButton") l << "text"; @@ -946,7 +946,7 @@ StdWidgetFactory::editText() TQString text; if(classname == "KTextEdit") text = ((KTextEdit*)widget())->text(); - else if(classname == TQLABEL_OBJECT_NAME_STRING) + else if(classname == "TQLabel") text = ((TQLabel*)widget())->text(); if(editRichText(widget(), text)) @@ -955,14 +955,14 @@ StdWidgetFactory::editText() changeProperty("text", text, m_container->form()); } - if(classname == TQLABEL_OBJECT_NAME_STRING) + if(classname == "TQLabel") widget()->resize(widget()->sizeHint()); } void StdWidgetFactory::editListContents() { - if(widget()->inherits(TQLISTVIEW_OBJECT_NAME_STRING)) + if(widget()->inherits("TQListView")) editListView((TQListView*)widget()); } diff --git a/kexi/formeditor/form.cpp b/kexi/formeditor/form.cpp index b52c2087d..66321cf1b 100644 --- a/kexi/formeditor/form.cpp +++ b/kexi/formeditor/form.cpp @@ -268,10 +268,10 @@ Form::setSelectedWidget(TQWidget *w, bool add, bool dontRaise, bool moreWillBeSe emitActionSignals(false); // WidgetStack and TabWidget pages widgets shouldn't have resize handles, but their parent - if(!FormManager::self()->isTopLevel(w) && w->parentWidget() && w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING)) + if(!FormManager::self()->isTopLevel(w) && w->parentWidget() && w->parentWidget()->isA("TQWidgetStack")) { w = w->parentWidget(); - if(w->parentWidget() && w->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) + if(w->parentWidget() && w->parentWidget()->inherits("TQTabWidget")) w = w->parentWidget(); } diff --git a/kexi/formeditor/form.h b/kexi/formeditor/form.h index 7f79cf798..e67f9cb45 100644 --- a/kexi/formeditor/form.h +++ b/kexi/formeditor/form.h @@ -154,7 +154,7 @@ class KFORMEDITOR_EXPORT Form : public TQObject form->createToplevel(toplevel); \endcode */ void createToplevel(TQWidget *container, FormWidget *formWidget =0, - const TQCString &classname=TQWIDGET_OBJECT_NAME_STRING); + const TQCString &classname="TQWidget"); /*! \return the toplevel Container or 0 if this is a preview Form or createToplevel() has not been called yet. */ diff --git a/kexi/formeditor/formIO.cpp b/kexi/formeditor/formIO.cpp index 503814d5b..298c07f8f 100644 --- a/kexi/formeditor/formIO.cpp +++ b/kexi/formeditor/formIO.cpp @@ -177,7 +177,7 @@ FormIO::saveFormToDom(Form *form, TQDomDocument &domDoc) // We create the top class element TQDomElement baseClass = domDoc.createElement("class"); uiElement.appendChild(baseClass); - TQDomText baseClassV = domDoc.createTextNode(TQWIDGET_OBJECT_NAME_STRING); + TQDomText baseClassV = domDoc.createTextNode("TQWidget"); baseClass.appendChild(baseClassV); // Save the toplevel widgets, and so the whole Form @@ -952,11 +952,11 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &do } if(!item->parent()) // Toplevel widget - tclass.setAttribute("class", TQWIDGET_OBJECT_NAME_STRING); - // For compatibility, HBox, VBox and Grid are saved as TQLAYOUTWIDGET_OBJECT_NAME_STRING + tclass.setAttribute("class", "TQWidget"); + // For compatibility, HBox, VBox and Grid are saved as "TQLayoutWidget" else if(item->widget()->isA("HBox") || item->widget()->isA("VBox") || item->widget()->isA("Grid") || item->widget()->isA("HFlow") || item->widget()->isA("VFlow")) - tclass.setAttribute("class", TQLAYOUTWIDGET_OBJECT_NAME_STRING); + tclass.setAttribute("class", "TQLayoutWidget"); else if(item->widget()->isA("CustomWidget")) tclass.setAttribute("class", item->className()); else // Normal widgets @@ -983,7 +983,7 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &do savePropertyValue(tclass, domDoc, "geometry", item->widget()->property("geometry"), item->widget()); // Save the buddy widget for a label - if(item->widget()->inherits(TQLABEL_OBJECT_NAME_STRING) && ((TQLabel*)item->widget())->buddy()) + if(item->widget()->inherits("TQLabel") && ((TQLabel*)item->widget())->buddy()) savePropertyElement(tclass, domDoc, "property", "buddy", ((TQLabel*)item->widget())->buddy()->name()); // We save every property in the modifProp list of the ObjectTreeItem @@ -1141,7 +1141,7 @@ FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *paren // We translate some name (for compatibility) if(el.tagName() == "spacer") classname = "Spring"; - else if(el.attribute("class") == TQLAYOUTWIDGET_OBJECT_NAME_STRING) + else if(el.attribute("class") == "TQLayoutWidget") { for(TQDomNode n = el.firstChild(); !n.isNull(); n = n.nextSibling()) { diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp index 25f13b97b..d502d5e8e 100644 --- a/kexi/formeditor/formmanager.cpp +++ b/kexi/formeditor/formmanager.cpp @@ -291,7 +291,7 @@ FormManager::insertWidget(const TQCString &classname) // form->d->cursors = new TQMap(); if (form->toplevelContainer()) form->widget()->setCursor(TQCursor(CrossCursor)); - TQObjectList *l = form->widget()->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *l = form->widget()->queryList( "TQWidget" ); for(TQObject *o = l->first(); o; o = l->next()) { if( ((TQWidget*)o)->ownCursor() ) @@ -322,7 +322,7 @@ FormManager::stopInsert() for(form = m_forms.first(); form; form = m_forms.next()) { form->widget()->unsetCursor(); - TQObjectList *l = form->widget()->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *l = form->widget()->queryList( "TQWidget" ); for(TQObject *o = l->first(); o; o = l->next()) { TQT_TQWIDGET(o)->unsetCursor(); @@ -373,7 +373,7 @@ FormManager::startCreatingConnection() form->widget()->setCursor(TQCursor(PointingHandCursor)); form->widget()->setMouseTracking(true); } - TQObjectList *l = form->widget()->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *l = form->widget()->queryList( "TQWidget" ); for(TQObject *o = l->first(); o; o = l->next()) { TQWidget *w = TQT_TQWIDGET(o); @@ -432,7 +432,7 @@ FormManager::stopCreatingConnection() { form->widget()->unsetCursor(); form->widget()->setMouseTracking(false); - TQObjectList *l = form->widget()->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *l = form->widget()->queryList( "TQWidget" ); for(TQObject *o = l->first(); o; o = l->next()) { TQWidget *w = (TQWidget*)o; @@ -898,7 +898,7 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu separatorNeeded = true; // We create the buddy menu - if(!multiple && w->inherits(TQLABEL_OBJECT_NAME_STRING) && ((TQLabel*)w)->text().contains("&") && (((TQLabel*)w)->textFormat() != RichText)) + if(!multiple && w->inherits("TQLabel") && ((TQLabel*)w)->text().contains("&") && (((TQLabel*)w)->textFormat() != RichText)) { if (separatorNeeded) m_popup->insertSeparator(); @@ -1210,7 +1210,7 @@ FormManager::slotStyle() TQString style = m_style->currentText(); activeForm()->widget()->setStyle( style ); - TQObjectList *l = activeForm()->widget()->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *l = activeForm()->widget()->queryList( "TQWidget" ); for(TQObject *o = l->first(); o; o = l->next()) (TQT_TQWIDGET(o))->setStyle( style ); delete l; diff --git a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp index 2dcf57b81..f4f7bdf9a 100644 --- a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp +++ b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp @@ -538,7 +538,7 @@ KFormDesignerKDevPart::~KFormDesignerKDevPart() //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 ) { static_cast(obj)->repaint(); diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp index 913ec0512..735b9a9ed 100644 --- a/kexi/formeditor/test/kfd_part.cpp +++ b/kexi/formeditor/test/kfd_part.cpp @@ -562,7 +562,7 @@ KFormDesignerPart::setRedoEnabled(bool enabled, const TQString &text) static void repaintAll(TQWidget *w) { w->repaint(); - TQObjectList *list = w->queryList(TQWIDGET_OBJECT_NAME_STRING); + TQObjectList *list = w->queryList("TQWidget"); TQObjectListIt it(*list); for (TQObject *obj; (obj=it.current()); ++it ) { static_cast(obj)->repaint(); diff --git a/kexi/formeditor/utils.cpp b/kexi/formeditor/utils.cpp index 53a9a15b9..b04222f3b 100644 --- a/kexi/formeditor/utils.cpp +++ b/kexi/formeditor/utils.cpp @@ -89,14 +89,14 @@ KFormDesigner::setRecursiveCursor(TQWidget *w, Form *form) { ObjectTreeItem *tree = form->objectTree()->lookup(w->name()); if(tree && ((tree->modifiedProperties()->contains("cursor")) || !tree->children()->isEmpty()) - && !w->inherits(TQLINEEDIT_OBJECT_NAME_STRING) && !w->inherits(TQTEXTEDIT_OBJECT_NAME_STRING) + && !w->inherits("TQLineEdit") && !w->inherits("TQTextEdit") ) //fix weird behaviour return; // if the user has set a cursor for this widget or this is a container, don't change it if(w->ownCursor()) w->setCursor(TQt::ArrowCursor); - TQObjectList *l = w->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *l = w->queryList( "TQWidget" ); for(TQObject *o = l->first(); o; o = l->next()) ((TQWidget*)o)->setCursor(TQt::ArrowCursor); delete l; diff --git a/kexi/formeditor/utils.h b/kexi/formeditor/utils.h index 1e60f0f54..b28b0b4d6 100644 --- a/kexi/formeditor/utils.h +++ b/kexi/formeditor/utils.h @@ -106,7 +106,7 @@ KFORMEDITOR_EXPORT void removeRecursiveEventFilter(TQObject *object, TQObject *c KFORMEDITOR_EXPORT void setRecursiveCursor(TQWidget *w, Form *form); /*! \return the size of \a w children. This can be used eg to get widget's sizeHint. */ -KFORMEDITOR_EXPORT TQSize getSizeFromChildren(TQWidget *widget, const char *inheritClass=TQWIDGET_OBJECT_NAME_STRING); +KFORMEDITOR_EXPORT TQSize getSizeFromChildren(TQWidget *widget, const char *inheritClass="TQWidget"); } diff --git a/kexi/formeditor/widgetfactory.cpp b/kexi/formeditor/widgetfactory.cpp index b90193bca..14fd26654 100644 --- a/kexi/formeditor/widgetfactory.cpp +++ b/kexi/formeditor/widgetfactory.cpp @@ -431,7 +431,7 @@ WidgetFactory::resetEditor() tree->eventEater()->setContainer(m_container); if(m_widget) {// && !ed) setRecursiveCursor(m_widget, m_container->form()); - if (m_widget->inherits(TQLINEEDIT_OBJECT_NAME_STRING) || m_widget->inherits(TQTEXTEDIT_OBJECT_NAME_STRING)) { //fix weird behaviour + if (m_widget->inherits("TQLineEdit") || m_widget->inherits("TQTextEdit")) { //fix weird behaviour m_widget->unsetCursor(); m_widget->setCursor(TQt::ArrowCursor); } diff --git a/kexi/formeditor/widgetpropertyset.cpp b/kexi/formeditor/widgetpropertyset.cpp index 201826890..99e6f511d 100644 --- a/kexi/formeditor/widgetpropertyset.cpp +++ b/kexi/formeditor/widgetpropertyset.cpp @@ -833,7 +833,7 @@ WidgetPropertySet::createAlignProperty(const TQMetaProperty *meta, TQWidget *wid if(possibleValues.find("WordBreak")!=possibleValues.constEnd() // && isPropertyVisible("wordbreak", false, subwidget->className()) -// && !subWidget->inherits(TQLINEEDIT_OBJECT_NAME_STRING) /* TQLineEdit doesn't support 'word break' is this generic enough?*/ +// && !subWidget->inherits("TQLineEdit") /* TQLineEdit doesn't support 'word break' is this generic enough?*/ ) { // Create the wordbreak property KoProperty::Property *p = new KoProperty::Property("wordbreak", diff --git a/kexi/kexidb/field.h b/kexi/kexidb/field.h index a99e845ed..da719cc7c 100644 --- a/kexi/kexidb/field.h +++ b/kexi/kexidb/field.h @@ -314,7 +314,7 @@ class KEXI_DB_EXPORT Field /*! \return (optional) subtype for this field. Subtype is a string providing additional hint for field's type. E.g. for BLOB type, it can be a MIME type or certain TQVariant type name, - for example: TQPIXMAP_OBJECT_NAME_STRING, "TQColor" or "TQFont" */ + for example: "TQPixmap", "TQColor" or "TQFont" */ inline TQString subType() const { return m_subType; } /*! Sets (optional) subtype for this field. diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp index bede2259a..1c313ba29 100644 --- a/kexi/main/keximainwindowimpl.cpp +++ b/kexi/main/keximainwindowimpl.cpp @@ -290,7 +290,7 @@ KexiMainWindowImpl::KexiMainWindowImpl() } {//store menu popups list - TQObjectList *l = queryList( TQPOPUPMENU_OBJECT_NAME_STRING ); + TQObjectList *l = queryList( "TQPopupMenu" ); for (TQObjectListIt it( *l ); it.current(); ++it ) { //kdDebug() << "name=" <name() << " cname="<className()<inherits(TQPOPUPMENU_OBJECT_NAME_STRING)) { + if (obj->inherits("TQPopupMenu")) { /* Fixes for popup menus behaviour: For hiding/showing: focus previously (d->focus_before_popup) focused window, if known, otherwise focus currently focused one. diff --git a/kexi/main/startup/KexiStartupFileDialog.cpp b/kexi/main/startup/KexiStartupFileDialog.cpp index defa2e06e..8f4457371 100644 --- a/kexi/main/startup/KexiStartupFileDialog.cpp +++ b/kexi/main/startup/KexiStartupFileDialog.cpp @@ -55,7 +55,7 @@ KexiStartupFileDialog::KexiStartupFileDialog( //dirty hack to customize filedialog view: { - TQObjectList *l = queryList( TQPUSHBUTTON_OBJECT_NAME_STRING ); + TQObjectList *l = queryList( "TQPushButton" ); TQObjectListIt it( *l ); TQObject *obj; while ( (obj = it.current()) != 0 ) { @@ -65,7 +65,7 @@ KexiStartupFileDialog::KexiStartupFileDialog( delete l; } { - TQObjectList *l = queryList(TQWIDGET_OBJECT_NAME_STRING); + TQObjectList *l = queryList("TQWidget"); TQObjectListIt it( *l ); TQObject *obj; while ( (obj = it.current()) != 0 ) { diff --git a/kexi/main/startup/KexiStartupFileDialog_win.cpp b/kexi/main/startup/KexiStartupFileDialog_win.cpp index 1432ac3c6..aac7b271c 100644 --- a/kexi/main/startup/KexiStartupFileDialog_win.cpp +++ b/kexi/main/startup/KexiStartupFileDialog_win.cpp @@ -61,10 +61,10 @@ KexiStartupFileDialogBase::KexiStartupFileDialogBase( init(_dirName, filter, parent); //find "OK" button - TQObjectList *l = queryList( TQPUSHBUTTON_OBJECT_NAME_STRING, "OK", false ); + TQObjectList *l = queryList( "TQPushButton", "OK", false ); m_okBtn = dynamic_cast(l->first()); delete l; - l = queryList( TQLINEEDIT_OBJECT_NAME_STRING, "name/filter editor", false ); + l = queryList( "TQLineEdit", "name/filter editor", false ); m_lineEdit = dynamic_cast(l->first()); delete l; diff --git a/kexi/plugins/forms/kexidataprovider.cpp b/kexi/plugins/forms/kexidataprovider.cpp index 637c94346..c8594e22d 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 tmpSources; diff --git a/kexi/plugins/forms/kexidbfactory.cpp b/kexi/plugins/forms/kexidbfactory.cpp index 1154e1107..19241a363 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 0b5f83ef7..cce155d4c 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 cf6e5cc3b..c7a378df8 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(); 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 17242953a..980e384db 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(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)) diff --git a/kexi/plugins/macros/lib/metamethod.cpp b/kexi/plugins/macros/lib/metamethod.cpp index 6642c7069..364b5347f 100644 --- a/kexi/plugins/macros/lib/metamethod.cpp +++ b/kexi/plugins/macros/lib/metamethod.cpp @@ -262,7 +262,7 @@ TDESharedPtr MetaMethod::toVariable(TQUObject* uo) return new Variable(); } - if(desc == TQSTRING_OBJECT_NAME_STRING) { + if(desc == "TQString") { const TQString s = static_TQUType_TQString.get(uo); return new Variable(s); } diff --git a/kexi/plugins/reports/kexireportform.cpp b/kexi/plugins/reports/kexireportform.cpp index cacf40b7f..27e210255 100644 --- a/kexi/plugins/reports/kexireportform.cpp +++ b/kexi/plugins/reports/kexireportform.cpp @@ -43,7 +43,7 @@ KexiReportForm::~KexiReportForm() //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 ) { static_cast(obj)->repaint(); diff --git a/kexi/plugins/scripting/kexidb/kexidbfield.h b/kexi/plugins/scripting/kexidb/kexidbfield.h index 4cc85f38c..a50271929 100644 --- a/kexi/plugins/scripting/kexidb/kexidbfield.h +++ b/kexi/plugins/scripting/kexidb/kexidbfield.h @@ -51,7 +51,7 @@ namespace Kross { namespace KexiDB { /** Returns the optional subtype for this field. Subtype is a string providing additional hint for field's type. E.g. for BLOB type, it can be a MIME type or - certain TQVariant type name, for example: TQPIXMAP_OBJECT_NAME_STRING, "TQColor" or "TQFont". */ + certain TQVariant type name, for example: "TQPixmap", "TQColor" or "TQFont". */ const TQString subType(); /** Sets the optional subtype for this field. */ void setSubType(const TQString& subtype); diff --git a/kexi/widget/kexiscrollview.cpp b/kexi/widget/kexiscrollview.cpp index 59fddb063..6b9a819fa 100644 --- a/kexi/widget/kexiscrollview.cpp +++ b/kexi/widget/kexiscrollview.cpp @@ -253,7 +253,7 @@ KexiScrollView::contentsMouseMoveEvent(TQMouseEvent *ev) tmpy = contentsY(); // we look for the max widget right() (or bottom()), which would be the limit for form resizing (not to hide widgets) - TQObjectList *list = m_widget->queryList(TQWIDGET_OBJECT_NAME_STRING, 0, true, false /* not recursive*/); + TQObjectList *list = m_widget->queryList("TQWidget", 0, true, false /* not recursive*/); for(TQObject *o = list->first(); o; o = list->next()) { TQWidget *w = (TQWidget*)o; diff --git a/kexi/widget/kexisectionheader.cpp b/kexi/widget/kexisectionheader.cpp index cbd48e843..f36dfe479 100644 --- a/kexi/widget/kexisectionheader.cpp +++ b/kexi/widget/kexisectionheader.cpp @@ -101,7 +101,7 @@ void KexiSectionHeader::addButton(const TQString& icon, const TQString& toolTip, bool KexiSectionHeader::eventFilter( TQObject *o, TQEvent *e ) { - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->lbl) && e->type()==TQEvent::MouseButtonRelease) {//|| e->type()==TQEvent::FocusOut) {// && o->inherits(TQWIDGET_OBJECT_NAME_STRING)) { + if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->lbl) && e->type()==TQEvent::MouseButtonRelease) {//|| e->type()==TQEvent::FocusOut) {// && o->inherits("TQWidget")) { if (d->lyr->view) d->lyr->view->setFocus(); // if (KexiUtils::hasParent( this, static_cast(o))) { diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp index f054f0848..c1405c1d3 100644 --- a/kexi/widget/tableview/kexitableview.cpp +++ b/kexi/widget/tableview/kexitableview.cpp @@ -2476,7 +2476,7 @@ bool KexiTableView::eventFilter( TQObject *o, TQEvent *e ) } d->recentCellWithToolTip = TQPoint(-1,-1); } -/* else if (e->type()==TQEvent::FocusOut && o->inherits(TQWIDGET_OBJECT_NAME_STRING)) { +/* else if (e->type()==TQEvent::FocusOut && o->inherits("TQWidget")) { //hp==true if currently focused widget is a child of this table view const bool hp = KexiUtils::hasParent( static_cast(o), focusWidget()); if (!hp && KexiUtils::hasParent( this, static_cast(o))) { diff --git a/kexi/widget/utils/kexigradientwidget.cpp b/kexi/widget/utils/kexigradientwidget.cpp index d93b13ffc..92f53c606 100644 --- a/kexi/widget/utils/kexigradientwidget.cpp +++ b/kexi/widget/utils/kexigradientwidget.cpp @@ -55,11 +55,11 @@ bool KexiGradientWidget::isValidChildWidget( TQObject* child ) { if ( wgt == 0L ) return false; - if ( wgt->inherits( TQSCROLLVIEW_OBJECT_NAME_STRING ) ) + if ( wgt->inherits( "TQScrollView" ) ) return false; - if ( wgt->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) + if ( wgt->inherits( "TQComboBox" ) ) return false; - if ( wgt->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) ) + if ( wgt->inherits( "TQLineEdit" ) ) return false; if ( wgt->inherits( "KexiDBForm" ) ) return false; @@ -68,7 +68,7 @@ bool KexiGradientWidget::isValidChildWidget( TQObject* child ) { } void KexiGradientWidget::buildChildrenList( WidgetList& list, TQWidget* p ) { - TQObjectList* objects = p->queryList( TQWIDGET_OBJECT_NAME_STRING, 0, false, false ); + TQObjectList* objects = p->queryList( "TQWidget", 0, false, false ); for ( TQObjectList::Iterator it = objects->begin(); it != objects->end(); ++it ) { if ( isValidChildWidget( ( *it ) ) == false ) diff --git a/kexi/widget/utils/kexirecordnavigator.cpp b/kexi/widget/utils/kexirecordnavigator.cpp index 18d1b09c0..6579fc426 100644 --- a/kexi/widget/utils/kexirecordnavigator.cpp +++ b/kexi/widget/utils/kexirecordnavigator.cpp @@ -71,7 +71,7 @@ KexiRecordNavigator::KexiRecordNavigator(TQWidget *parent, int leftMargin, const , m_isInsertingEnabled(true) , d( new KexiRecordNavigatorPrivate() ) { - if (parent->inherits(TQSCROLLVIEW_OBJECT_NAME_STRING)) + if (parent->inherits("TQScrollView")) setParentView( dynamic_cast(parent) ); setFrameStyle(TQFrame::NoFrame); d->lyr = new TQHBoxLayout(this,0,0,"nav_lyr"); diff --git a/kivio/kiviopart/kivioarrowheadaction.cpp b/kivio/kiviopart/kivioarrowheadaction.cpp index 31c2c5b3b..8d7beefa4 100644 --- a/kivio/kiviopart/kivioarrowheadaction.cpp +++ b/kivio/kiviopart/kivioarrowheadaction.cpp @@ -85,7 +85,7 @@ int KivioArrowHeadAction::plug( TQWidget* widget, int index) if (kapp && !kapp->authorizeTDEAction(name())) return -1; kdDebug(129) << "TDEAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis - if ( widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) ) + if ( widget->inherits("TQPopupMenu") ) { TQPopupMenu* menu = static_cast( widget ); int id; @@ -139,7 +139,7 @@ int KivioArrowHeadAction::plug( TQWidget* widget, int index) return containerCount() - 1; } - else if ( widget->inherits( TQMENUBAR_OBJECT_NAME_STRING ) ) + else if ( widget->inherits( "TQMenuBar" ) ) { TQMenuBar *bar = static_cast( widget ); diff --git a/kivio/kiviopart/kiviostencilsetaction.cpp b/kivio/kiviopart/kiviostencilsetaction.cpp index d8d08d899..5d0040827 100644 --- a/kivio/kiviopart/kiviostencilsetaction.cpp +++ b/kivio/kiviopart/kiviostencilsetaction.cpp @@ -98,7 +98,7 @@ int KivioStencilSetAction::plug( TQWidget* widget, int index) if (kapp && !kapp->authorizeTDEAction(name())) return -1; kdDebug(129) << "TDEAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis - if ( widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) ) + if ( widget->inherits("TQPopupMenu") ) { TQPopupMenu* menu = static_cast( widget ); int id; @@ -152,7 +152,7 @@ int KivioStencilSetAction::plug( TQWidget* widget, int index) return containerCount() - 1; } - else if ( widget->inherits( TQMENUBAR_OBJECT_NAME_STRING ) ) + else if ( widget->inherits( "TQMenuBar" ) ) { TQMenuBar *bar = static_cast( widget ); diff --git a/kivio/plugins/kivioconnectortool/plugin.h b/kivio/plugins/kivioconnectortool/plugin.h index 7afc83ce1..cc09afcf5 100644 --- a/kivio/plugins/kivioconnectortool/plugin.h +++ b/kivio/plugins/kivioconnectortool/plugin.h @@ -34,7 +34,7 @@ public: ~ConnectorToolFactory(); virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0, - const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); + const char* classname = "TQObject", const TQStringList &args = TQStringList() ); static TDEInstance* global(); diff --git a/kivio/plugins/kivioselecttool/plugin.h b/kivio/plugins/kivioselecttool/plugin.h index ee901dd36..c4e612c19 100644 --- a/kivio/plugins/kivioselecttool/plugin.h +++ b/kivio/plugins/kivioselecttool/plugin.h @@ -34,7 +34,7 @@ public: ~SelectToolFactory(); virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0, - const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); + const char* classname = "TQObject", const TQStringList &args = TQStringList() ); static TDEInstance* global(); diff --git a/kivio/plugins/kiviosmlconnector/plugin.h b/kivio/plugins/kiviosmlconnector/plugin.h index 54c81ebc7..5ac52f5e9 100644 --- a/kivio/plugins/kiviosmlconnector/plugin.h +++ b/kivio/plugins/kiviosmlconnector/plugin.h @@ -34,7 +34,7 @@ public: ~SMLConnectorFactory(); virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0, - const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); + const char* classname = "TQObject", const TQStringList &args = TQStringList() ); static TDEInstance* global(); diff --git a/kivio/plugins/kiviotargettool/kiviotargettoolfactory.h b/kivio/plugins/kiviotargettool/kiviotargettoolfactory.h index 091cba2d2..e6ead8aa8 100644 --- a/kivio/plugins/kiviotargettool/kiviotargettoolfactory.h +++ b/kivio/plugins/kiviotargettool/kiviotargettoolfactory.h @@ -35,7 +35,7 @@ class KivioTargetToolFactory : public KLibFactory ~KivioTargetToolFactory(); virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0, - const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); + const char* classname = "TQObject", const TQStringList &args = TQStringList() ); static TDEInstance* global(); diff --git a/kivio/plugins/kiviotexttool/plugin.h b/kivio/plugins/kiviotexttool/plugin.h index 4eaa9cc6c..681f40d7e 100644 --- a/kivio/plugins/kiviotexttool/plugin.h +++ b/kivio/plugins/kiviotexttool/plugin.h @@ -34,7 +34,7 @@ public: ~TextToolFactory(); virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0, - const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); + const char* classname = "TQObject", const TQStringList &args = TQStringList() ); static TDEInstance* global(); diff --git a/kivio/plugins/kiviozoomtool/plugin.h b/kivio/plugins/kiviozoomtool/plugin.h index 4b2d80388..8db8e5316 100644 --- a/kivio/plugins/kiviozoomtool/plugin.h +++ b/kivio/plugins/kiviozoomtool/plugin.h @@ -34,7 +34,7 @@ public: ~ZoomToolFactory(); virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0, - const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); + const char* classname = "TQObject", const TQStringList &args = TQStringList() ); static TDEInstance* global(); private: diff --git a/kspread/kspread_view.cpp b/kspread/kspread_view.cpp index 519e4425a..f054cbba9 100644 --- a/kspread/kspread_view.cpp +++ b/kspread/kspread_view.cpp @@ -6007,7 +6007,7 @@ void View::openPopupMenu( const TQPoint & _point ) { d->popupMenuFirstToolId = 10; int i = 0; - TQValueList tools = KDataToolInfo::query( TQSTRING_OBJECT_NAME_STRING, "text/plain", doc()->instance() ); + TQValueList tools = KDataToolInfo::query( "TQString", "text/plain", doc()->instance() ); if ( tools.count() > 0 ) { d->popupMenu->insertSeparator(); @@ -6058,7 +6058,7 @@ void View::slotActivateTool( int _id ) TQString text = activeSheet()->getWordSpelling( selectionInfo() ); - if ( tool->run( entry->command, &text, TQSTRING_OBJECT_NAME_STRING, "text/plain") ) + if ( tool->run( entry->command, &text, "TQString", "text/plain") ) { doc()->emitBeginOperation(false); diff --git a/kspread/plugins/calculator/main.h b/kspread/plugins/calculator/main.h index dd4d456fc..8aade3021 100644 --- a/kspread/plugins/calculator/main.h +++ b/kspread/plugins/calculator/main.h @@ -46,7 +46,7 @@ public: ~CalcFactory(); virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0, - const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); + const char* classname = "TQObject", const TQStringList &args = TQStringList() ); static TDEInstance* global(); diff --git a/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py b/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py index e23b9c565..229598093 100755 --- a/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py +++ b/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py @@ -658,7 +658,7 @@ class Samples: 'd = dcopext.DCOPApp(apps[0], dcopclient)', 'result,typename,data = d.appclient.call(apps[0],"klipper","getClipboardContents()","")', 'ds = tqt.TQDataStream(data, tqt.IO_ReadOnly)', - 'print("Clipboard content:\\n%s" % tdecore.dcop_next(ds, TQSTRING_OBJECT_NAME_STRING))', + 'print("Clipboard content:\\n%s" % tdecore.dcop_next(ds, "TQString"))', ) class AmarokCollectionInfos: @@ -708,7 +708,7 @@ class Samples: 'if not state: raise Exception("Failed to call the kopete contacts-function")', '', 'ds = tqt.TQDataStream(rdata.data(), tqt.IO_ReadOnly)', - 'sl = tdecore.dcop_next (ds, TQSTRINGLIST_OBJECT_NAME_STRING)', + 'sl = tdecore.dcop_next (ds, "TQStringList")', 'print("contacts=%s" % [ str(s) for s in sl ])', ) @@ -759,7 +759,7 @@ class Samples: '', '# Get the selected text.', '(state,rtype,rdata) = d.appclient.call(appname, frameset.obj(), "selectedText()", "")', - 'print("Selected Text: %s" % dataToList( rdata,[TQSTRING_OBJECT_NAME_STRING] )[0])', + 'print("Selected Text: %s" % dataToList( rdata,["TQString"] )[0])', ) #################################################################################### diff --git a/lib/kformula/symbolaction.cpp b/lib/kformula/symbolaction.cpp index 8fe3d8f8a..08c5ac7b2 100644 --- a/lib/kformula/symbolaction.cpp +++ b/lib/kformula/symbolaction.cpp @@ -159,7 +159,7 @@ void SymbolAction::updateItems( int id ) TQWidget *w = container( id ); if ( w->inherits( "TDEToolBar" ) ) { TQWidget *r = static_cast( w )->getWidget( itemId( id ) ); - if ( r->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) { + if ( r->inherits( "TQComboBox" ) ) { TQComboBox *cb = static_cast( r ); cb->clear(); diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp index b8dbea814..e465ce77a 100644 --- a/lib/kofficecore/KoDocument.cpp +++ b/lib/kofficecore/KoDocument.cpp @@ -182,7 +182,7 @@ public: virtual void resizeEvent( TQResizeEvent * ) { - TQObject *wid = child( 0, TQWIDGET_OBJECT_NAME_STRING ); + TQObject *wid = child( 0, "TQWidget" ); if ( wid ) TQT_TQWIDGET(wid)->setGeometry( 0, 0, width(), height() ); } diff --git a/lib/kofficecore/KoSpeaker.cpp b/lib/kofficecore/KoSpeaker.cpp index 6bd950da3..d85a69951 100644 --- a/lib/kofficecore/KoSpeaker.cpp +++ b/lib/kofficecore/KoSpeaker.cpp @@ -230,7 +230,7 @@ bool KoSpeaker::maybeSayWidget(TQWidget* w, const TQPoint& pos /*=TQPoint()*/) // Handle widgets that have multiple parts. - if ( w->inherits(TQMENUBAR_OBJECT_NAME_STRING) ) { + if ( w->inherits("TQMenuBar") ) { TQMenuBar* menuBar = dynamic_cast(w); if (pos == TQPoint()) { for (uint i = 0; i < menuBar->count(); ++i) @@ -245,7 +245,7 @@ bool KoSpeaker::maybeSayWidget(TQWidget* w, const TQPoint& pos /*=TQPoint()*/) text = menuBar->text(id); } else - if (w->inherits(TQPOPUPMENU_OBJECT_NAME_STRING)) { + if (w->inherits("TQPopupMenu")) { TQPopupMenu* popupMenu = dynamic_cast(w); if (pos == TQPoint()) { for (uint i = 0; i < popupMenu->count(); ++i) @@ -259,7 +259,7 @@ bool KoSpeaker::maybeSayWidget(TQWidget* w, const TQPoint& pos /*=TQPoint()*/) text = popupMenu->text(id); } else - if (w->inherits(TQTABBAR_OBJECT_NAME_STRING)) { + if (w->inherits("TQTabBar")) { TQTabBar* tabBar = dynamic_cast(w); TQTab* tab = 0; if (pos == TQPoint()) @@ -272,7 +272,7 @@ bool KoSpeaker::maybeSayWidget(TQWidget* w, const TQPoint& pos /*=TQPoint()*/) } } else - if (w->inherits(TQLISTVIEW_OBJECT_NAME_STRING)) { + if (w->inherits("TQListView")) { TQListView* lv = dynamic_cast(w); TQListViewItem* item = 0; if (pos == TQPoint()) @@ -287,7 +287,7 @@ bool KoSpeaker::maybeSayWidget(TQWidget* w, const TQPoint& pos /*=TQPoint()*/) } } else - if (w->inherits(TQLISTBOX_OBJECT_NAME_STRING)) { + if (w->inherits("TQListBox")) { TQListBox* lb = dynamic_cast(w); // qt docs say coordinates are in "on-screen" coordinates. What does that mean? TQListBoxItem* item = 0; @@ -301,7 +301,7 @@ bool KoSpeaker::maybeSayWidget(TQWidget* w, const TQPoint& pos /*=TQPoint()*/) } } else - if (w->inherits(TQICONVIEW_OBJECT_NAME_STRING)) { + if (w->inherits("TQIconView")) { TQIconView* iv = dynamic_cast(w); TQIconViewItem* item = 0; if (pos == TQPoint()) @@ -314,7 +314,7 @@ bool KoSpeaker::maybeSayWidget(TQWidget* w, const TQPoint& pos /*=TQPoint()*/) } } else - if (w->inherits(TQTABLE_OBJECT_NAME_STRING)) { + if (w->inherits("TQTable")) { TQTable* tbl = dynamic_cast(w); int row = -1; int col = -1; @@ -332,7 +332,7 @@ bool KoSpeaker::maybeSayWidget(TQWidget* w, const TQPoint& pos /*=TQPoint()*/) } } else - if (w->inherits(TQGRIDVIEW_OBJECT_NAME_STRING)) { + if (w->inherits("TQGridView")) { TQGridView* gv = dynamic_cast(w); // TODO: TQGridView does not have a "current" row or column. Don't think they can even get focus? int row = -1; @@ -366,22 +366,22 @@ bool KoSpeaker::maybeSayWidget(TQWidget* w, const TQPoint& pos /*=TQPoint()*/) if (d->m_cancelSpeakWidget) return true; // Handle simple, single-part widgets. - if ( w->inherits(TQBUTTON_OBJECT_NAME_STRING) ) + if ( w->inherits("TQButton") ) text = dynamic_cast(w)->text(); else - if (w->inherits(TQCOMBOBOX_OBJECT_NAME_STRING)) + if (w->inherits("TQComboBox")) text = dynamic_cast(w)->currentText(); else - if (w->inherits(TQLINEEDIT_OBJECT_NAME_STRING)) + if (w->inherits("TQLineEdit")) text = dynamic_cast(w)->text(); else - if (w->inherits(TQTEXTEDIT_OBJECT_NAME_STRING)) + if (w->inherits("TQTextEdit")) text = dynamic_cast(w)->text(); else - if (w->inherits(TQLABEL_OBJECT_NAME_STRING)) + if (w->inherits("TQLabel")) text = dynamic_cast(w)->text(); else - if (w->inherits(TQGROUPBOX_OBJECT_NAME_STRING)) { + if (w->inherits("TQGroupBox")) { // TODO: Should calculate this number from font size? if (w->mapFromGlobal(pos).y() < 30) text = dynamic_cast(w)->title(); diff --git a/lib/kofficeui/KoSelectAction.cpp b/lib/kofficeui/KoSelectAction.cpp index 952387647..0558c512c 100644 --- a/lib/kofficeui/KoSelectAction.cpp +++ b/lib/kofficeui/KoSelectAction.cpp @@ -90,7 +90,7 @@ int KoSelectAction::plug(TQWidget* widget, int index) if (kapp && !kapp->authorizeTDEAction(name())) return -1; kdDebug(129) << "TDEAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis - if ( widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) ) + if ( widget->inherits("TQPopupMenu") ) { TQPopupMenu* menu = static_cast( widget ); int id; @@ -144,7 +144,7 @@ int KoSelectAction::plug(TQWidget* widget, int index) return containerCount() - 1; } - else if ( widget->inherits( TQMENUBAR_OBJECT_NAME_STRING ) ) + else if ( widget->inherits( "TQMenuBar" ) ) { TQMenuBar *bar = static_cast( widget ); diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp index 044df16ac..c42ff0010 100644 --- a/lib/kofficeui/KoTemplateChooseDia.cpp +++ b/lib/kofficeui/KoTemplateChooseDia.cpp @@ -357,7 +357,7 @@ void KoTemplateChooseDia::setupFileDialog(TQWidget * widgetbase, TQGridLayout * d->m_filedialog->reparent( widgetbase , point ); //d->m_filedialog->setOperationMode( KFileDialog::Opening); - TQObjectList *l = d->m_filedialog->queryList( TQPUSHBUTTON_OBJECT_NAME_STRING ); + TQObjectList *l = d->m_filedialog->queryList( "TQPushButton" ); TQObjectListIt childit( *l ); TQObject *obj; while ( (obj = childit.current()) != 0 ) { diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp index 1cd5e1c61..0d24cd161 100644 --- a/lib/kofficeui/KoTooluButton.cpp +++ b/lib/kofficeui/KoTooluButton.cpp @@ -309,7 +309,7 @@ void KoColorPanel::mousePressEvent( TQMouseEvent* e ) void KoColorPanel::mouseReleaseEvent( TQMouseEvent* ) { - if ( isVisible() && parentWidget() && parentWidget()->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) ) + if ( isVisible() && parentWidget() && parentWidget()->inherits( "TQPopupMenu" ) ) parentWidget()->close(); emit colorSelected( mapToColor( m_pressedPos ) ); } @@ -425,7 +425,7 @@ void KoColorPanel::keyPressEvent( TQKeyEvent* e ) e->ignore(); } else if ( e->key() == TQt::Key_Return ) { - if ( isVisible() && parentWidget() && parentWidget()->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) ) + if ( isVisible() && parentWidget() && parentWidget()->inherits( "TQPopupMenu" ) ) parentWidget()->close(); emit colorSelected( mapToColor( m_focusPosition ) ); } diff --git a/lib/kofficeui/kcoloractions.cpp b/lib/kofficeui/kcoloractions.cpp index aec1aab28..d34c23923 100644 --- a/lib/kofficeui/kcoloractions.cpp +++ b/lib/kofficeui/kcoloractions.cpp @@ -237,7 +237,7 @@ int TDESelectColorAction::plug( TQWidget* w, int index ) if (kapp && !kapp->authorizeTDEAction(name())) return -1; - if ( w->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) ) + if ( w->inherits("TQPopupMenu") ) { TQPopupMenu* menu = static_cast( w ); int id; diff --git a/lib/kofficeui/tkcoloractions.cpp b/lib/kofficeui/tkcoloractions.cpp index d2476d62b..cf55a84ae 100644 --- a/lib/kofficeui/tkcoloractions.cpp +++ b/lib/kofficeui/tkcoloractions.cpp @@ -165,7 +165,7 @@ void TTDESelectColorAction::updatePixmap() updatePixmap(static_cast(r)); } } - else if(w->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) ) { + else if(w->inherits("TQPopupMenu") ) { TQPixmap pix =iconSet(TDEIcon::Small).pixmap(TQIconSet::Automatic,TQIconSet::Active); if ( pix.isNull() ) return; diff --git a/lib/koproperty/editors/spinbox.cpp b/lib/koproperty/editors/spinbox.cpp index 4743f5702..4d9266a8e 100644 --- a/lib/koproperty/editors/spinbox.cpp +++ b/lib/koproperty/editors/spinbox.cpp @@ -39,7 +39,7 @@ IntSpinBox::IntSpinBox(int lower, int upper, int step, int value, int base, IntE editor()->setAlignment(TQt::AlignLeft); installEventFilter(editor()); installEventFilter(this); - TQObjectList *spinwidgets = queryList( TQSPINWIDGET_OBJECT_NAME_STRING, 0, false, true ); + TQObjectList *spinwidgets = queryList( "TQSpinWidget", 0, false, true ); TQSpinWidget* spin = static_cast(TQT_TQWIDGET(spinwidgets->first())); if (spin) spin->installEventFilter(this); @@ -154,7 +154,7 @@ IntEdit::slotValueChanged(int) void IntEdit::updateSpinWidgets() { - TQObjectList *spinwidgets = queryList( TQSPINWIDGET_OBJECT_NAME_STRING, 0, false, true ); + TQObjectList *spinwidgets = queryList( "TQSpinWidget", 0, false, true ); TQSpinWidget* spin = static_cast(TQT_TQWIDGET(spinwidgets->first())); if (spin) { spin->setUpEnabled(!isReadOnly()); @@ -182,7 +182,7 @@ DoubleSpinBox::DoubleSpinBox (double lower, double upper, double step, double va editor()->setAlignment(TQt::AlignLeft); installEventFilter(editor()); installEventFilter(this); - TQObjectList *spinwidgets = queryList( TQSPINWIDGET_OBJECT_NAME_STRING, 0, false, true ); + TQObjectList *spinwidgets = queryList( "TQSpinWidget", 0, false, true ); TQSpinWidget* spin = static_cast(TQT_TQWIDGET(spinwidgets->first())); if (spin) spin->installEventFilter(this); @@ -307,7 +307,7 @@ DoubleEdit::slotValueChanged(double) void DoubleEdit::updateSpinWidgets() { - TQObjectList *spinwidgets = queryList( TQSPINWIDGET_OBJECT_NAME_STRING, 0, false, true ); + TQObjectList *spinwidgets = queryList( "TQSpinWidget", 0, false, true ); TQSpinWidget* spin = static_cast(TQT_TQWIDGET(spinwidgets->first())); if (spin) { spin->setUpEnabled(!isReadOnly()); diff --git a/lib/kotext/KoTextView.cpp b/lib/kotext/KoTextView.cpp index f6cdf4c46..b7608827d 100644 --- a/lib/kotext/KoTextView.cpp +++ b/lib/kotext/KoTextView.cpp @@ -1122,13 +1122,13 @@ TQPtrList KoTextView::dataToolActionList(TDEInstance * instance, cons // Any tool that works on plain text is relevant TQValueList tools; - tools +=KDataToolInfo::query( TQSTRING_OBJECT_NAME_STRING, "text/plain", instance ); + tools +=KDataToolInfo::query( "TQString", "text/plain", instance ); // Add tools that work on a single word if that is the case if ( m_singleWord ) { _singleWord = true; - tools += KDataToolInfo::query( TQSTRING_OBJECT_NAME_STRING, "application/x-singleword", instance ); + tools += KDataToolInfo::query( "TQString", "application/x-singleword", instance ); } // Maybe one day we'll have tools that use libkotext (or qt3's qrt), to act on formatted text tools += KDataToolInfo::query( "KoTextString", "application/x-qrichtext", instance ); @@ -1169,7 +1169,7 @@ void KoTextView::slotToolActivated( const KDataToolInfo & info, const TQString & if ( !info.mimeTypes().contains( mimetype ) ) { mimetype = "text/plain"; - datatype = TQSTRING_OBJECT_NAME_STRING; + datatype = "TQString"; } // If unsupported (and if we have a single word indeed), try application/x-singleword if ( !info.mimeTypes().contains( mimetype ) && m_singleWord ) diff --git a/lib/kross/api/qtobject.cpp b/lib/kross/api/qtobject.cpp index 631c99434..8f0819aa5 100644 --- a/lib/kross/api/qtobject.cpp +++ b/lib/kross/api/qtobject.cpp @@ -112,7 +112,7 @@ TQUObject* QtObject::toTQUObject(const TQString& signature, List::Ptr arguments) // Fill parameters. uint argcount = arguments ? arguments->count() : 0; for(uint i = 0; i < paramcount; i++) { - if(paramlist[i].find(TQSTRING_OBJECT_NAME_STRING) >= 0) { + if(paramlist[i].find("TQString") >= 0) { const TQString s = (argcount > i) ? Variant::toString(arguments->item(i)) : TQString(); //krossdebug(TQString("EventSlot::toTQUObject s=%1").arg(s)); static_TQUType_TQString.set( &(uo[i + 1]), s ); diff --git a/tools/kthesaurus/main.cpp b/tools/kthesaurus/main.cpp index 9db6e571b..047d23039 100644 --- a/tools/kthesaurus/main.cpp +++ b/tools/kthesaurus/main.cpp @@ -74,7 +74,7 @@ extern "C" KOFFICETOOLS_EXPORT int kdemain(int argc, char **argv) TQString command = "thesaurus_standalone"; // 'standalone' will give us different buttons TQString mimetype = "text/plain"; - TQString datatype = TQSTRING_OBJECT_NAME_STRING; + TQString datatype = "TQString"; //kdDebug() << "KThesaurus command=" << command // << " dataType=" << info->dataType() << endl; diff --git a/tools/spell/main.cpp b/tools/spell/main.cpp index 564f66622..4dc980d80 100644 --- a/tools/spell/main.cpp +++ b/tools/spell/main.cpp @@ -60,7 +60,7 @@ bool SpellChecker::run( const TQString& command, void* data, const TQString& dat } // Check wether we can accept the data - if ( datatype != TQSTRING_OBJECT_NAME_STRING ) + if ( datatype != "TQString" ) { kdDebug(31000) << "SpellChecker only accepts datatype TQString" << endl; return FALSE; diff --git a/tools/thesaurus/main.cpp b/tools/thesaurus/main.cpp index 06da26824..47554d3e2 100644 --- a/tools/thesaurus/main.cpp +++ b/tools/thesaurus/main.cpp @@ -236,7 +236,7 @@ bool Thesaurus::run(const TQString& command, void* data, const TQString& datatyp { // Check whether we can accept the data - if ( datatype != TQSTRING_OBJECT_NAME_STRING ) { + if ( datatype != "TQString" ) { kdDebug(31000) << "Thesaurus only accepts datatype TQString" << endl; return FALSE; }