diff options
27 files changed, 421 insertions, 421 deletions
diff --git a/kommander/editor/actiondnd.cpp b/kommander/editor/actiondnd.cpp index 17d8af3f..67491ef4 100644 --- a/kommander/editor/actiondnd.cpp +++ b/kommander/editor/actiondnd.cpp @@ -47,7 +47,7 @@ bool QDesignerAction::addTo( TQWidget *w ) if ( !widgetToInsert ) return TQAction::addTo( w ); - if ( w->inherits( "TQPopupMenu" ) ) + if ( w->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) ) return false; widgetToInsert->reparent( w, TQPoint( 0, 0 ), false ); @@ -125,11 +125,11 @@ QSeparatorAction::QSeparatorAction( TQObject *parent ) bool QSeparatorAction::addTo( TQWidget *w ) { - if ( w->inherits( "TQToolBar" ) ) { + if ( w->inherits( TQTOOLBAR_OBJECT_NAME_STRING ) ) { TQToolBar *tb = (TQToolBar*)w; wid = new QDesignerToolBarSeparator( tb->orientation(), tb ); return true; - } else if ( w->inherits( "TQPopupMenu" ) ) { + } else if ( w->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) ) { idx = ( (TQPopupMenu*)w )->count(); ( (TQPopupMenu*)w )->insertSeparator( idx ); return true; @@ -139,10 +139,10 @@ bool QSeparatorAction::addTo( TQWidget *w ) bool QSeparatorAction::removeFrom( TQWidget *w ) { - if ( w->inherits( "TQToolBar" ) ) { + if ( w->inherits( TQTOOLBAR_OBJECT_NAME_STRING ) ) { delete wid; return true; - } else if ( w->inherits( "TQPopupMenu" ) ) { + } else if ( w->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) ) { ( (TQPopupMenu*)w )->removeItemAt( idx ); return true; } @@ -202,7 +202,7 @@ void QDesignerToolBar::addAction( TQAction *a ) { actionList.append( a ); connect( a, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( actionRemoved() ) ); - if ( a->inherits( "TQActionGroup" ) ) { + if ( a->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ) { ( (QDesignerActionGroup*)a )->widget()->installEventFilter( this ); actionMap.insert( ( (QDesignerActionGroup*)a )->widget(), a ); } else if ( a->inherits( "QSeparatorAction" ) ) { @@ -450,7 +450,7 @@ void QDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o ) TQApplication::sendPostedEvents(); adjustSize(); - TQString type = a->inherits( "TQActionGroup" ) ? TQString( "application/x-designer-actiongroup" ) : + TQString type = a->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? TQString( "application/x-designer-actiongroup" ) : a->inherits( "QSeparatorAction" ) ? TQString( "application/x-designer-separator" ) : TQString( "application/x-designer-actions" ); TQStoredDrag *drag = new TQStoredDrag( type, this ); TQString s = TQString::number( (long)a ); // #### huha, that is evil @@ -560,7 +560,7 @@ void QDesignerToolBar::reInsert() clear(); for ( a = actionList.first(); a; a = actionList.next() ) { a->addTo( this ); - if ( a->inherits( "TQActionGroup" ) ) { + if ( a->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ) { actionMap.insert( ( (QDesignerActionGroup*)a )->widget(), a ); if ( ( (QDesignerActionGroup*)a )->widget() ) ( (QDesignerActionGroup*)a )->widget()->installEventFilter( this ); @@ -689,7 +689,7 @@ void QDesignerToolBar::installEventFilters( TQWidget *w ) { if ( !w ) return; - TQObjectList *l = w->queryList( "TQWidget" ); + TQObjectList *l = w->queryList( TQWIDGET_OBJECT_NAME_STRING ); for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( this ); delete l; @@ -1072,7 +1072,7 @@ void QDesignerPopupMenu::mouseMoveEvent( TQMouseEvent *e ) formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); - TQString type = a->inherits( "TQActionGroup" ) ? TQString( "application/x-designer-actiongroup" ) : + TQString type = a->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? TQString( "application/x-designer-actiongroup" ) : a->inherits( "QSeparatorAction" ) ? TQString( "application/x-designer-separator" ) : TQString( "application/x-designer-actions" ); TQStoredDrag *drag = new TQStoredDrag( type, this ); TQString s = TQString::number( (long)a ); // #### huha, that is evil diff --git a/kommander/editor/actiondnd.h b/kommander/editor/actiondnd.h index f821807e..af5a76e5 100644 --- a/kommander/editor/actiondnd.h +++ b/kommander/editor/actiondnd.h @@ -40,7 +40,7 @@ class QDesignerActionGroup : public QActionGroup public: QDesignerActionGroup( TQObject *parent ) - : TQActionGroup( !parent || parent->inherits( "TQActionGroup" ) ? parent : 0 ), wid( 0 ), idx( -1 ) {} + : TQActionGroup( !parent || parent->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? parent : 0 ), wid( 0 ), idx( -1 ) {} TQWidget *widget() const { return wid; } TQWidget *widget( TQAction *a ) const { return *widgets.find( a ); } @@ -70,9 +70,9 @@ class QDesignerAction : public QAction public: QDesignerAction( TQObject *parent ) - : TQAction( !parent || parent->inherits( "TQActionGroup" ) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( 0 ) {} + : TQAction( !parent || parent->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( 0 ) {} QDesignerAction( TQWidget *w, TQObject *parent ) - : TQAction( !parent || parent->inherits( "TQActionGroup" ) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( w ) {} + : TQAction( !parent || parent->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( w ) {} TQWidget *widget() const { return wid; } int index() const { return idx; } diff --git a/kommander/editor/actioneditorimpl.cpp b/kommander/editor/actioneditorimpl.cpp index 9c1ae76d..e5358100 100644 --- a/kommander/editor/actioneditorimpl.cpp +++ b/kommander/editor/actioneditorimpl.cpp @@ -118,7 +118,7 @@ void ActionEditor::newAction() ActionItem *actionParent = (ActionItem*)listActions->selectedItem(); if ( actionParent ) { if ( !actionParent->actionGroup() || - !actionParent->actionGroup()->inherits( "TQActionGroup" ) ) + !actionParent->actionGroup()->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ) actionParent = (ActionItem*)actionParent->parent(); } @@ -150,7 +150,7 @@ void ActionEditor::newActionGroup() ActionItem *actionParent = (ActionItem*)listActions->selectedItem(); if ( actionParent ) { if ( !actionParent->actionGroup() || - !actionParent->actionGroup()->inherits( "TQActionGroup" ) ) + !actionParent->actionGroup()->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ) actionParent = (ActionItem*)actionParent->parent(); } @@ -187,18 +187,18 @@ void ActionEditor::setFormWindow( FormWindow *fw ) formWindow = fw; if ( !formWindow || !formWindow->mainContainer() || - !formWindow->mainContainer()->inherits( "TQMainWindow" ) ) { + !formWindow->mainContainer()->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) { setEnabled( false ); } else { setEnabled( true ); for ( TQAction *a = formWindow->actionList().first(); a; a = formWindow->actionList().next() ) { ActionItem *i = 0; - if ( a->parent() && a->parent()->inherits( "TQAction" ) ) + if ( a->parent() && a->parent()->inherits( TQACTION_OBJECT_NAME_STRING ) ) continue; i = new ActionItem( listActions, a ); i->setText( 0, a->name() ); i->setPixmap( 0, a->iconSet().pixmap() ); - if ( a->inherits( "TQActionGroup" ) ) { + if ( a->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ) { insertChildActions( i ); } } @@ -217,14 +217,14 @@ void ActionEditor::insertChildActions( ActionItem *i ) while ( it.current() ) { TQObject *o = it.current(); ++it; - if ( !o->inherits( "TQAction" ) ) + if ( !o->inherits( TQACTION_OBJECT_NAME_STRING ) ) continue; TQAction *a = (TQAction*)o; ActionItem *i2 = new ActionItem( (TQListViewItem*)i, a ); i->setOpen( true ); i2->setText( 0, a->name() ); i2->setPixmap( 0, a->iconSet().pixmap() ); - if ( a->inherits( "TQActionGroup" ) ) + if ( a->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ) insertChildActions( i2 ); } } diff --git a/kommander/editor/actionlistview.cpp b/kommander/editor/actionlistview.cpp index 6513daf0..1c764f35 100644 --- a/kommander/editor/actionlistview.cpp +++ b/kommander/editor/actionlistview.cpp @@ -37,7 +37,7 @@ ActionListView::ActionListView( TQWidget *parent, const char *name ) ActionItem::ActionItem( TQListView *lv, TQAction *ac ) : TQListViewItem( lv ), a( 0 ), g( 0 ) { - if ( ac->inherits( "TQActionGroup" ) ) + if ( ac->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ) g = (QDesignerActionGroup*)ac; else a = (QDesignerAction*)ac; @@ -47,7 +47,7 @@ ActionItem::ActionItem( TQListView *lv, TQAction *ac ) ActionItem::ActionItem( TQListViewItem *i, TQAction *ac ) : TQListViewItem( i ), a( 0 ), g( 0 ) { - if ( ac->inherits( "TQActionGroup" ) ) + if ( ac->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ) g = (QDesignerActionGroup*)ac; else a = (QDesignerAction*)ac; diff --git a/kommander/editor/command.cpp b/kommander/editor/command.cpp index 4d8e369d..a0f8ec37 100644 --- a/kommander/editor/command.cpp +++ b/kommander/editor/command.cpp @@ -597,14 +597,14 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString ¤ if ( formWindow()->isMainContainer( widget ) ) formWindow()->setName( v.toCString() ); } - if ( propName == "name" && widget->inherits( "TQAction" ) && + if ( propName == "name" && widget->inherits( TQACTION_OBJECT_NAME_STRING ) && formWindow()->mainContainer() && - formWindow()->mainContainer()->inherits( "TQMainWindow" ) ) { + formWindow()->mainContainer()->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) { formWindow()->mainWindow()->actioneditor()->updateActionName( (TQAction*)widget ); } - if ( propName == "iconSet" && widget->inherits( "TQAction" ) && + if ( propName == "iconSet" && widget->inherits( TQACTION_OBJECT_NAME_STRING ) && formWindow()->mainContainer() && - formWindow()->mainContainer()->inherits( "TQMainWindow" ) ) { + formWindow()->mainContainer()->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) { formWindow()->mainWindow()->actioneditor()->updateActionIcon( (TQAction*)widget ); } if ( propName == "caption" ) { @@ -751,9 +751,9 @@ BreakLayoutCommand::BreakLayoutCommand( const TQString &n, FormWindow *fw, margin = MetaDataBase::margin( layoutBase ); layout = 0; if ( lay == WidgetFactory::HBox ) - layout = new HorizontalLayout( wl, layoutBase, fw, layoutBase, false, layoutBase->inherits( "TQSplitter" ) ); + layout = new HorizontalLayout( wl, layoutBase, fw, layoutBase, false, layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ); else if ( lay == WidgetFactory::VBox ) - layout = new VerticalLayout( wl, layoutBase, fw, layoutBase, false, layoutBase->inherits( "TQSplitter" ) ); + layout = new VerticalLayout( wl, layoutBase, fw, layoutBase, false, layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ); else if ( lay == WidgetFactory::Grid ) layout = new GridLayout( wl, layoutBase, fw, layoutBase, TQSize( QMAX( 5, fw->grid().x()), QMAX( 5, fw->grid().y()) ), false ); } @@ -1605,7 +1605,7 @@ void AddActionToToolBarCommand::execute() toolBar->insertAction( ( (QSeparatorAction*)action )->widget(), action ); ( (QSeparatorAction*)action )->widget()->installEventFilter( toolBar ); } - if ( !action->inherits( "TQActionGroup" ) || ( (TQActionGroup*)action )->usesDropDown()) { + if ( !action->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) || ( (TQActionGroup*)action )->usesDropDown()) { if ( index == -1 ) toolBar->appendAction( action ); else @@ -1619,7 +1619,7 @@ void AddActionToToolBarCommand::execute() while ( it.current() ) { TQObject *o = it.current(); ++it; - if ( !o->inherits( "TQAction" ) ) + if ( !o->inherits( TQACTION_OBJECT_NAME_STRING ) ) continue; // ### fix it for nested actiongroups if ( o->inherits( "QDesignerAction" ) ) { @@ -1649,7 +1649,7 @@ void AddActionToToolBarCommand::unexecute() toolBar->removeAction( action ); action->removeFrom( toolBar ); TQObject::disconnect( action, TQT_SIGNAL( destroyed() ), toolBar, TQT_SLOT( actionRemoved() ) ); - if ( !action->inherits( "TQActionGroup" ) || ( (TQActionGroup*)action )->usesDropDown()) { + if ( !action->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) || ( (TQActionGroup*)action )->usesDropDown()) { action->removeEventFilter( toolBar ); } else { if ( action->children() ) { @@ -1657,7 +1657,7 @@ void AddActionToToolBarCommand::unexecute() while ( it.current() ) { TQObject *o = it.current(); ++it; - if ( !o->inherits( "TQAction" ) ) + if ( !o->inherits( TQACTION_OBJECT_NAME_STRING ) ) continue; if ( o->inherits( "QDesignerAction" ) ) { o->removeEventFilter( toolBar ); @@ -1678,7 +1678,7 @@ AddActionToPopupCommand::AddActionToPopupCommand( const TQString &n, FormWindow void AddActionToPopupCommand::execute() { - if ( action->inherits( "TQActionGroup" ) ) { + if ( action->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ) { if ( ( (TQActionGroup*)action )->usesDropDown() ) { action->addTo( popup ); popup->insertAction( index, action ); @@ -1690,7 +1690,7 @@ void AddActionToPopupCommand::execute() while ( it.current() ) { TQObject *o = it.current(); ++it; - if ( !o->inherits( "TQAction" ) ) + if ( !o->inherits( TQACTION_OBJECT_NAME_STRING ) ) continue; QDesignerAction *ac = (QDesignerAction*)o; popup->insertAction( index + (i++), ac ); @@ -1714,7 +1714,7 @@ void AddActionToPopupCommand::unexecute() action->removeFrom( popup ); popup->removeAction( action ); TQObject::disconnect( action, TQT_SIGNAL( destroyed() ), popup, TQT_SLOT( actionRemoved() ) ); - if ( !action->inherits( "TQActionGroup" ) || ( (TQActionGroup*)action )->usesDropDown()) { + if ( !action->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) || ( (TQActionGroup*)action )->usesDropDown()) { action->removeEventFilter( popup ); } else { if ( action->children() ) { @@ -1722,7 +1722,7 @@ void AddActionToPopupCommand::unexecute() while ( it.current() ) { TQObject *o = it.current(); ++it; - if ( !o->inherits( "TQAction" ) ) + if ( !o->inherits( TQACTION_OBJECT_NAME_STRING ) ) continue; if ( o->inherits( "QDesignerAction" ) ) { o->removeEventFilter( popup ); @@ -1748,7 +1748,7 @@ void AddMenuCommand::execute() formWindow()->unify( popup, n, true ); popup->setName( n ); } - if ( !mainWindow->child( 0, "TQMenuBar" ) ) { + if ( !mainWindow->child( 0, TQMENUBAR_OBJECT_NAME_STRING ) ) { menuBar = new QDesignerMenuBar( (TQWidget*)mainWindow ); menuBar->setName( "menubar" ); } else { diff --git a/kommander/editor/formwindow.cpp b/kommander/editor/formwindow.cpp index 2b97dd3b..ac0712b4 100644 --- a/kommander/editor/formwindow.cpp +++ b/kommander/editor/formwindow.cpp @@ -165,7 +165,7 @@ void FormWindow::init() this, TQT_SLOT(modificationChanged(bool))); buffer = 0; - TQWidget *w = WidgetFactory::create(WidgetDatabase::idFromClassName("TQFrame"), this); + TQWidget *w = WidgetFactory::create(WidgetDatabase::idFromClassName(TQFRAME_OBJECT_NAME_STRING), this); setMainContainer(w); propertyWidget = w; targetContainer = 0; @@ -297,7 +297,7 @@ void FormWindow::insertWidget() bool useSizeHint = !oldRectValid || (currRect.width() < 2 && currRect.height() < 2); Orientation orient = Horizontal; TQString n = WidgetDatabase::className(currTool); - if (useSizeHint && (n == "Spacer" || n == "TQSlider" || n == "Line" || n == "TQScrollBar")) { + if (useSizeHint && (n == "Spacer" || n == TQSLIDER_OBJECT_NAME_STRING || n == "Line" || n == TQSCROLLBAR_OBJECT_NAME_STRING)) { TQPopupMenu m(mainWindow()); m.insertItem(i18n("&Horizontal")); int ver = m.insertItem(i18n("&Vertical")); @@ -463,7 +463,7 @@ void FormWindow::handleContextMenu(TQContextMenuEvent *e, TQWidget *w) while (w->parentWidget() && (WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout || !insertedWidgets.find(w))) w = w->parentWidget(); - if (mainContainer()->inherits("TQMainWindow") && + if (mainContainer()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING) && ((TQMainWindow*)mainContainer())->centralWidget() == realWidget) { e->accept(); @@ -524,7 +524,7 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w) // unselect its childs if (WidgetFactory::layoutType(w) != WidgetFactory::NoLayout) { - TQObjectList *l = w->queryList("TQWidget"); + TQObjectList *l = w->queryList(TQWIDGET_OBJECT_NAME_STRING); setPropertyShowingBlocked(true); for (TQObject *o = l->first(); o; o = l->next()) { @@ -636,7 +636,7 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w) { int id = WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(wid)); if ((WidgetDatabase::isContainer(id) || wid == mainContainer()) && - !wid->inherits("QLayoutWidget") && !wid->inherits("TQSplitter")) + !wid->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING) && !wid->inherits(TQSPLITTER_OBJECT_NAME_STRING)) { insertParent = WidgetFactory::containerOfWidget(wid); // found another parent, store it break; @@ -881,15 +881,15 @@ void FormWindow::handleMouseRelease(TQMouseEvent * e, TQWidget * w) for (TQMap < ulong, TQPoint >::Iterator it = moving.begin(); it != moving.end(); ++it) { TQWidget *i = (TQWidget *) it.key(); - if (!emitSelChanged && i->inherits("TQButton")) + if (!emitSelChanged && i->inherits(TQBUTTON_OBJECT_NAME_STRING)) { - if (i->parentWidget() && i->parentWidget()->inherits("TQButtonGroup") || - wa->inherits("TQButtonGroup")) + if (i->parentWidget() && i->parentWidget()->inherits(TQBUTTONGROUP_OBJECT_NAME_STRING) || + wa->inherits(TQBUTTONGROUP_OBJECT_NAME_STRING)) emitSelChanged = true; - if (!wa->inherits("TQButtonGroup")) + if (!wa->inherits(TQBUTTONGROUP_OBJECT_NAME_STRING)) { MetaDataBase::setPropertyChanged(i, "buttonGroupId", false); - if (i->parentWidget() && i->parentWidget()->inherits("TQButtonGroup")) + if (i->parentWidget() && i->parentWidget()->inherits(TQBUTTONGROUP_OBJECT_NAME_STRING)) ((TQButtonGroup *) i->parentWidget())->remove((TQButton *) i); } } @@ -1061,7 +1061,7 @@ void FormWindow::handleKeyPress(TQKeyEvent * e, TQWidget * w) } if (!e->isAccepted()) { - TQObjectList *l = queryList("TQWidget"); + TQObjectList *l = queryList(TQWIDGET_OBJECT_NAME_STRING); if (!l) return; if (l->find(w) != -1) @@ -1096,7 +1096,7 @@ void FormWindow::selectWidget(TQObject * o, bool select) return; } - if (mainContainer()->inherits("TQMainWindow") && + if (mainContainer()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING) && w == ((TQMainWindow *) mainContainer())->centralWidget()) { TQObject *opw = propertyWidget; @@ -1281,7 +1281,7 @@ void FormWindow::endRectDraw() void FormWindow::selectWidgets() { - TQObjectList *l = mainContainer()->queryList("TQWidget"); + TQObjectList *l = mainContainer()->queryList(TQWIDGET_OBJECT_NAME_STRING); if (l) { for (TQObject * o = l->first(); o; o = l->next()) @@ -1340,7 +1340,7 @@ void FormWindow::redo() void FormWindow::raiseChildSelections(TQWidget * w) { - TQObjectList *l = w->queryList("TQWidget"); + TQObjectList *l = w->queryList(TQWIDGET_OBJECT_NAME_STRING); if (!l || !l->first()) { delete l; @@ -1358,7 +1358,7 @@ void FormWindow::raiseChildSelections(TQWidget * w) void FormWindow::updateChildSelections(TQWidget * w) { - TQObjectList *l = w->queryList("TQWidget"); + TQObjectList *l = w->queryList(TQWIDGET_OBJECT_NAME_STRING); if (l) { for (TQObject * o = l->first(); o; o = l->next()) @@ -1374,7 +1374,7 @@ void FormWindow::checkSelectionsForMove(TQWidget * w) { checkedSelectionsForMove = true; - TQObjectList *l = w->parentWidget()->queryList("TQWidget", 0, false, false); + TQObjectList *l = w->parentWidget()->queryList(TQWIDGET_OBJECT_NAME_STRING, 0, false, false); moving.clear(); if (l) { @@ -1686,7 +1686,7 @@ void FormWindow::showOrderIndicators() { hideOrderIndicators(); orderIndicators.setAutoDelete(true); - TQObjectList *l = mainContainer()->queryList("TQWidget"); + TQObjectList *l = mainContainer()->queryList(TQWIDGET_OBJECT_NAME_STRING); stackedWidgets = MetaDataBase::tabOrder(this); if (l) { @@ -1811,7 +1811,7 @@ static void find_accel(const TQString & txt, TQMap < TQChar, TQWidgetList > &acc void FormWindow::checkAccels() { TQMap < TQChar, TQWidgetList > accels; - TQObjectList *l = mainContainer()->queryList("TQWidget"); + TQObjectList *l = mainContainer()->queryList(TQWIDGET_OBJECT_NAME_STRING); if (l) { for (TQObject * o = l->first(); o; o = l->next()) @@ -1883,7 +1883,7 @@ void FormWindow::selectAll() { checkedSelectionsForMove = false; blockSignals(true); - TQObjectList *l = mainContainer()->queryList("TQWidget"); + TQObjectList *l = mainContainer()->queryList(TQWIDGET_OBJECT_NAME_STRING); if (l) { for (TQObject * o = l->first(); o; o = l->next()) @@ -2041,7 +2041,7 @@ void FormWindow::breakLayout(TQWidget * w) Command *cmd = breakLayoutCommand(w); if (cmd) commands.insert(0, cmd); - if (!w->inherits("QLayoutWidget") && !w->inherits("TQSplitter")) + if (!w->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING) && !w->inherits(TQSPLITTER_OBJECT_NAME_STRING)) break; } w = w->parentWidget(); @@ -2093,7 +2093,7 @@ bool FormWindow::hasInsertedChildren(TQWidget *w) const w = WidgetFactory::containerOfWidget(w); if (!w) return false; - TQObjectList *l = w->queryList("TQWidget"); + TQObjectList *l = w->queryList(TQWIDGET_OBJECT_NAME_STRING); if (!l || !l->first()) { delete l; @@ -2291,7 +2291,7 @@ bool FormWindow::unify(TQObject *w, TQString &s, bool changeIt) TQAction *a = 0; for (a = actions.first(); a; a = actions.next()) { - TQObjectList *l = a->queryList("TQAction"); + TQObjectList *l = a->queryList(TQACTION_OBJECT_NAME_STRING); al.append(a); for (TQObject *ao = l->first(); ao; ao = l->next()) al.append((TQAction*)ao); @@ -2310,11 +2310,11 @@ bool FormWindow::unify(TQObject *w, TQString &s, bool changeIt) } } - if (mainContainer()->inherits("TQMainWindow")) + if (mainContainer()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) { if (!found) { - TQObjectList *l = mainContainer()->queryList("TQDockWindow", 0, true); + TQObjectList *l = mainContainer()->queryList(TQDOCKWINDOW_OBJECT_NAME_STRING, 0, true); for (TQObject *o = l->first(); o; o = l->next()) if (o != w && !qstrcmp(o->name(), s.latin1())) { @@ -2361,7 +2361,7 @@ bool FormWindow::isDatabaseWidgetUsed() const { #ifndef QT_NO_SQL TQStringList dbClasses; - dbClasses << "TQDataTable"; // add more here + dbClasses << TQDATATABLE_OBJECT_NAME_STRING; // add more here TQPtrDictIterator<TQWidget> it(insertedWidgets); for (; it.current(); ++it) { @@ -2451,9 +2451,9 @@ TQWidget *FormWindow::containerAt(const TQPoint &pos, TQWidget *notParentOf) } for (; it.current(); ++it) { - if (it.current()->inherits("QLayoutWidget")) + if (it.current()->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING)) continue; - if (it.current()->inherits("TQSplitter")) + if (it.current()->inherits(TQSPLITTER_OBJECT_NAME_STRING)) continue; if (!it.current()->isVisibleTo(this)) continue; @@ -2546,7 +2546,7 @@ TQAction *FormWindow::findAction(const TQString &name) { if (TQString(a->name()) == name) return a; - TQAction *ac = (TQAction*)a->child(name.latin1(), "TQAction"); + TQAction *ac = (TQAction*)a->child(name.latin1(), TQACTION_OBJECT_NAME_STRING); if (ac) return ac; } @@ -2555,7 +2555,7 @@ TQAction *FormWindow::findAction(const TQString &name) void FormWindow::killAccels(TQObject *top) { - TQObjectList *l = top->queryList("TQAccel"); + TQObjectList *l = top->queryList(TQACCEL_OBJECT_NAME_STRING); if (!l) return; for (TQObject *o = l->first(); o; o = l->next()) @@ -2565,7 +2565,7 @@ void FormWindow::killAccels(TQObject *top) bool FormWindow::isCentralWidget(TQObject *w) const { - if (!mainContainer()->inherits("TQMainWindow")) + if (!mainContainer()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) return false; return w == ((TQMainWindow*)mainContainer())->centralWidget(); } diff --git a/kommander/editor/hierarchyview.cpp b/kommander/editor/hierarchyview.cpp index c11a365c..57dc817c 100644 --- a/kommander/editor/hierarchyview.cpp +++ b/kommander/editor/hierarchyview.cpp @@ -255,11 +255,11 @@ void HierarchyList::objectClicked( TQListViewItem *i ) } if ( !formWindow->widgets()->find( w ) ) { - if ( w->parent() && w->parent()->inherits( "TQWidgetStack" ) && + if ( w->parent() && w->parent()->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) && w->parent()->parent() && - ( w->parent()->parent()->inherits( "TQTabWidget" ) || - w->parent()->parent()->inherits( "TQWizard" ) ) ) { - if ( w->parent()->parent()->inherits( "TQTabWidget" ) ) + ( w->parent()->parent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) || + w->parent()->parent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) ) { + if ( w->parent()->parent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) ( (TQTabWidget*)w->parent()->parent() )->showPage( w ); else ( (QDesignerWizard*)w->parent()->parent() )->setCurrentPage( ( (QDesignerWizard*)w->parent()->parent() )->pageNum( w ) ); @@ -356,7 +356,7 @@ void HierarchyList::setOpen( TQListViewItem *i, bool b ) void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent ) { bool fakeMainWindow = false; - if ( o && o->inherits( "TQMainWindow" ) ) { + if ( o && o->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) { TQObject *cw = ( (TQMainWindow*)o )->centralWidget(); if ( cw ) { o = cw; @@ -365,7 +365,7 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent ) } TQListViewItem *item = 0; TQString className = WidgetFactory::classNameOf( o ); - if ( o->inherits( "QLayoutWidget" ) ) { + if ( o->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) ) { switch ( WidgetFactory::layoutType( (TQWidget*)o ) ) { case WidgetFactory::HBox: className = "HBox"; @@ -387,11 +387,11 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent ) #endif TQString name = o->name(); - if ( o->parent() && o->parent()->inherits( "TQWidgetStack" ) && + if ( o->parent() && o->parent()->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) && o->parent()->parent() ) { - if ( o->parent()->parent()->inherits( "TQTabWidget" ) ) + if ( o->parent()->parent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) name = ( (TQTabWidget*)o->parent()->parent() )->tabLabel( (TQWidget*)o ); - else if ( o->parent()->parent()->inherits( "TQWizard" ) ) + else if ( o->parent()->parent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) name = ( (TQWizard*)o->parent()->parent() )->title( (TQWidget*)o ); } @@ -403,7 +403,7 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent ) if ( fakeMainWindow ) { name = o->parent()->name(); - className = "TQMainWindow"; + className = TQMAINWINDOW_OBJECT_NAME_STRING; } if ( !parent ) @@ -429,16 +429,16 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent ) continue; if ( !formWindow->widgets()->find( (TQWidget*)it.current() ) ) { if ( it.current()->parent() && - ( it.current()->parent()->inherits( "TQTabWidget" ) || - it.current()->parent()->inherits( "TQWizard" ) ) && - it.current()->inherits( "TQWidgetStack" ) ) { + ( it.current()->parent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) || + it.current()->parent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) && + it.current()->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) { TQObject *obj = it.current(); - TQObjectList *l2 = obj->queryList( "TQWidget", 0, true, false ); + TQObjectList *l2 = obj->queryList( TQWIDGET_OBJECT_NAME_STRING, 0, true, false ); QDesignerTabWidget *tw = 0; QDesignerWizard *dw = 0; - if ( it.current()->parent()->inherits( "TQTabWidget" ) ) + if ( it.current()->parent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) tw = (QDesignerTabWidget*)it.current()->parent(); - if ( it.current()->parent()->inherits( "TQWizard" ) ) + if ( it.current()->parent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) dw = (QDesignerWizard*)it.current()->parent(); TQWidgetStack *stack = (TQWidgetStack*)obj; for ( obj = l2->last(); obj; obj = l2->prev() ) { @@ -495,7 +495,7 @@ void HierarchyList::showRMBMenu( TQListViewItem *i, const TQPoint & p ) return; if ( w->isVisibleTo( formWindow ) ) { - if ( !w->inherits( "TQTabWidget" ) && !w->inherits( "TQWizard" ) ) { + if ( !w->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) && !w->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) { if ( !normalMenu ) normalMenu = formWindow->mainWindow()->setupNormalHierarchyMenu( this ); normalMenu->popup( p ); @@ -514,13 +514,13 @@ void HierarchyList::addTabPage() TQWidget *w = current(); if ( !w ) return; - if ( w->inherits( "TQTabWidget" ) ) { + if ( w->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) { TQTabWidget *tw = (TQTabWidget*)w; AddTabPageCommand *cmd = new AddTabPageCommand( i18n("Add Page to %1" ).arg( tw->name() ), formWindow, tw, "Tab" ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); - } else if ( w->inherits( "TQWizard" ) ) { + } else if ( w->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) { TQWizard *wiz = (TQWizard*)formWindow->mainContainer(); AddWizardPageCommand *cmd = new AddWizardPageCommand( i18n("Add Page to %1" ).arg( wiz->name() ), formWindow, wiz, "Page" ); @@ -534,7 +534,7 @@ void HierarchyList::removeTabPage() TQWidget *w = current(); if ( !w ) return; - if ( w->inherits( "TQTabWidget" ) ) { + if ( w->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) { TQTabWidget *tw = (TQTabWidget*)w; if ( tw->currentPage() ) { QDesignerTabWidget *dtw = (QDesignerTabWidget*)tw; @@ -544,7 +544,7 @@ void HierarchyList::removeTabPage() formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); } - } else if ( w->inherits( "TQWizard" ) ) { + } else if ( w->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) { TQWizard *wiz = (TQWizard*)formWindow->mainContainer(); if ( wiz->currentPage() ) { QDesignerWizard *dw = (QDesignerWizard*)wiz; @@ -677,7 +677,7 @@ void HierarchyView::widgetsRemoved( const TQWidgetList & ) void HierarchyView::namePropertyChanged( TQWidget *w, const TQVariant & ) { TQWidget *w2 = w; - if ( w->inherits( "TQMainWindow" ) ) + if ( w->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) w2 = ( (TQMainWindow*)w )->centralWidget(); listview->changeNameOf( w2, w->name() ); } diff --git a/kommander/editor/layout.cpp b/kommander/editor/layout.cpp index b0e226c0..7860aeae 100644 --- a/kommander/editor/layout.cpp +++ b/kommander/editor/layout.cpp @@ -159,13 +159,13 @@ bool Layout::prepareLayout( bool &needMove, bool &needReparent ) for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) w->raise(); needMove = !layoutBase; - needReparent = needMove || layoutBase->inherits( "QLayoutWidget" ) || layoutBase->inherits( "TQSplitter" ); + needReparent = needMove || layoutBase->inherits( "QLayoutWidget" ) || layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ); if ( !layoutBase ) { if ( !useSplitter ) layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( "QLayoutWidget" ), WidgetFactory::containerOfWidget( parent ) ); else - layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQSplitter" ), + layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQSPLITTER_OBJECT_NAME_STRING ), WidgetFactory::containerOfWidget( parent ) ); } else { WidgetFactory::deleteLayout( layoutBase ); @@ -208,7 +208,7 @@ void Layout::undoLayout() } formWindow->selectWidget( layoutBase, false ); WidgetFactory::deleteLayout( layoutBase ); - if ( parent != layoutBase && !layoutBase->inherits( "TQMainWindow" ) ) { + if ( parent != layoutBase && !layoutBase->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) { layoutBase->hide(); TQString n = layoutBase->name(); n.prepend( "qt_dead_widget_" ); @@ -232,10 +232,10 @@ void Layout::breakLayout() } WidgetFactory::deleteLayout( layoutBase ); bool needReparent = qstrcmp( layoutBase->className(), "QLayoutWidget" ) == 0 || - qstrcmp( layoutBase->className(), "TQSplitter" ) == 0 || + qstrcmp( layoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0 || ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( layoutBase ) ) ) && layoutBase != formWindow->mainContainer() ); - bool needResize = qstrcmp( layoutBase->className(), "TQSplitter" ) == 0; + bool needResize = qstrcmp( layoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0; bool add = geometries.isEmpty(); for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { if ( needReparent ) @@ -319,7 +319,7 @@ void HorizontalLayout::doLayout() w->show(); } - if ( layoutBase->inherits( "TQSplitter" ) ) + if ( layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ) ( (TQSplitter*)layoutBase )->setOrientation( Qt::Horizontal ); finishLayout( needMove, layout ); @@ -383,7 +383,7 @@ void VerticalLayout::doLayout() w->show(); } - if ( layoutBase->inherits( "TQSplitter" ) ) + if ( layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ) ( (TQSplitter*)layoutBase )->setOrientation( Qt::Vertical ); finishLayout( needMove, layout ); diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp index af062f16..069d30dd 100644 --- a/kommander/editor/mainwindow.cpp +++ b/kommander/editor/mainwindow.cpp @@ -179,16 +179,16 @@ MainWindow::MainWindow(bool asClient) readConfig(); // hack to make WidgetFactory happy (so it knows TQWidget and TQDialog for resetting properties) - TQWidget *w = WidgetFactory::create(WidgetDatabase::idFromClassName("TQWidget"), this, 0, false); + TQWidget *w = WidgetFactory::create(WidgetDatabase::idFromClassName(TQWIDGET_OBJECT_NAME_STRING), this, 0, false); delete w; w = WidgetFactory::create(WidgetDatabase::idFromClassName("Dialog"), this, 0, false); delete w; - w = WidgetFactory::create(WidgetDatabase::idFromClassName("TQLabel"), this, 0, false); + w = WidgetFactory::create(WidgetDatabase::idFromClassName(TQLABEL_OBJECT_NAME_STRING), this, 0, false); delete w; - w = WidgetFactory::create(WidgetDatabase::idFromClassName("TQTabWidget"), this, 0, false); + w = WidgetFactory::create(WidgetDatabase::idFromClassName(TQTABWIDGET_OBJECT_NAME_STRING), this, 0, false); delete w; - w = WidgetFactory::create(WidgetDatabase::idFromClassName("TQFrame"), this, 0, false); + w = WidgetFactory::create(WidgetDatabase::idFromClassName(TQFRAME_OBJECT_NAME_STRING), this, 0, false); delete w; assistant = new AssistProc(this, "Internal Assistant", assistantPath()); @@ -630,18 +630,18 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) break; if (o && currentTool() == POINTER_TOOL && (o->inherits("QDesignerMenuBar") || o->inherits("QDesignerToolBar") || - (o->inherits("TQComboBox") || o->inherits("TQToolButton") || o->inherits("QDesignerToolBarSeparator")) && + (o->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) || o->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) || o->inherits("QDesignerToolBarSeparator")) && o->parent() && o->parent()->inherits("QDesignerToolBar"))) { TQWidget *w = (TQWidget*)o; - if (w->inherits("TQToolButton") || w->inherits("TQComboBox") || w->inherits("QDesignerToolBarSeparator")) + if (w->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) || w->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) || w->inherits("QDesignerToolBarSeparator")) w = w->parentWidget(); TQWidget *pw = w->parentWidget(); while (pw) { if (pw->inherits("FormWindow")) { ((FormWindow*)pw)->emitShowProperties(w); if (!o->inherits("QDesignerToolBar")) - return !o->inherits("TQToolButton") && !o->inherits("TQMenuBar") && - !o->inherits("TQComboBox") && !o->inherits("QDesignerToolBarSeparator"); + return !o->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) && !o->inherits(TQMENUBAR_OBJECT_NAME_STRING) && + !o->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) && !o->inherits("QDesignerToolBarSeparator"); } pw = pw->parentWidget(); } @@ -651,7 +651,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) break; if (isAToolBarChild(o) && currentTool() != CONNECT_TOOL) break; - if (o && o->inherits("TQSizeGrip")) + if (o && o->inherits(TQSIZEGRIP_OBJECT_NAME_STRING)) break; if (!(w = isAFormWindowChild(o)) || o->inherits("SizeHandle") || o->inherits("OrderIndicator")) break; @@ -677,7 +677,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) lastPressWidget = 0; if (isAToolBarChild(o) && currentTool() != CONNECT_TOOL) break; - if (o && o->inherits("TQSizeGrip")) + if (o && o->inherits(TQSIZEGRIP_OBJECT_NAME_STRING)) break; if (!(w = isAFormWindowChild(o)) || o->inherits("SizeHandle") || o->inherits("OrderIndicator")) break; @@ -694,10 +694,10 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) w = isAFormWindowChild(o); if (lastPressWidget != (TQWidget*)o && w && !o->inherits("SizeHandle") && !o->inherits("OrderIndicator") && - !o->inherits("TQPopupMenu") && !o->inherits("TQMenuBar") && - !o->inherits("TQSizeGrip")) + !o->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) && !o->inherits(TQMENUBAR_OBJECT_NAME_STRING) && + !o->inherits(TQSIZEGRIP_OBJECT_NAME_STRING)) return true; - if (o && o->inherits("TQSizeGrip")) + if (o && o->inherits(TQSIZEGRIP_OBJECT_NAME_STRING)) break; if (lastPressWidget != (TQWidget*)o || (!w || o->inherits("SizeHandle") || o->inherits("OrderIndicator"))) @@ -718,8 +718,8 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) break; case TQEvent::MouseButtonDblClick: if (!(w = isAFormWindowChild(o)) || o->inherits("SizeHandle") || o->inherits("OrderIndicator")) { - if (o && o->inherits("TQToolButton") && ((TQToolButton*)o)->isOn() && - o->parent() && o->parent()->inherits("TQToolBar") && formWindow()) + if (o && o->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) && ((TQToolButton*)o)->isOn() && + o->parent() && o->parent()->inherits(TQTOOLBAR_OBJECT_NAME_STRING) && formWindow()) formWindow()->setToolFixed(); break; } @@ -808,7 +808,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) TQWidget *MainWindow::isAFormWindowChild(TQObject *o) const { - if (o->parent() && o->parent()->inherits("TQWizard") && !o->inherits("TQPushButton")) + if (o->parent() && o->parent()->inherits(TQWIZARD_OBJECT_NAME_STRING) && !o->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING)) return 0; while (o) { if (o->inherits("FormWindow")) @@ -1013,18 +1013,18 @@ void MainWindow::popupWidgetMenu(const TQPoint &gp, FormWindow * /*fw*/, TQWidge void MainWindow::setupRMBProperties(TQValueList<int> &ids, TQMap<TQString, int> &props, TQWidget *w) { const TQMetaProperty* text = w->metaObject()->property(w->metaObject()->findProperty("text", true), true); - if (text && qstrcmp(text->type(), "TQString") != 0) + if (text && qstrcmp(text->type(), TQSTRING_OBJECT_NAME_STRING) != 0) text = 0; const TQMetaProperty* title = w->metaObject()->property(w->metaObject()->findProperty("title", true), true); - if (title && qstrcmp(title->type(), "TQString") != 0) + if (title && qstrcmp(title->type(), TQSTRING_OBJECT_NAME_STRING) != 0) title = 0; const TQMetaProperty* pagetitle = w->metaObject()->property(w->metaObject()->findProperty("pageTitle", true), true); - if (pagetitle && qstrcmp(pagetitle->type(), "TQString") != 0) + if (pagetitle && qstrcmp(pagetitle->type(), TQSTRING_OBJECT_NAME_STRING) != 0) pagetitle = 0; const TQMetaProperty* pixmap = w->metaObject()->property(w->metaObject()->findProperty("pixmap", true), true); - if (pixmap && qstrcmp(pixmap->type(), "TQPixmap") != 0) + if (pixmap && qstrcmp(pixmap->type(), TQPIXMAP_OBJECT_NAME_STRING) != 0) pixmap = 0; if (text && text->designable(w) || @@ -1038,7 +1038,7 @@ void MainWindow::setupRMBProperties(TQValueList<int> &ids, TQMap<TQString, int> ids << (id = rmbWidgets->insertItem(i18n("Choose Pixmap..."), -1, 0)); props.insert("pixmap", id); } - if (text && text->designable(w) && !w->inherits("TQTextEdit")) { + if (text && text->designable(w) && !w->inherits(TQTEXTEDIT_OBJECT_NAME_STRING)) { ids << (id = rmbWidgets->insertItem(i18n("Edit Text..."), -1, 0)); props.insert("text", id); } @@ -1068,7 +1068,7 @@ void MainWindow::setupRMBSpecialCommands(TQValueList<int> &ids, TQMap<TQString, commands.insert("assoc", id); } - if (w->inherits("TQTabWidget")) { + if (w->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) { if (ids.isEmpty()) ids << rmbWidgets->insertSeparator(0); if (((QDesignerTabWidget*)w)->count() > 1) { @@ -1078,7 +1078,7 @@ void MainWindow::setupRMBSpecialCommands(TQValueList<int> &ids, TQMap<TQString, ids << (id = rmbWidgets->insertItem(i18n("Add Page"), -1, 0)); commands.insert("add", id); } - if (w->inherits("TQToolBox")) { + if (w->inherits(TQTOOLBOX_OBJECT_NAME_STRING)) { if (ids.isEmpty()) ids << rmbWidgets->insertSeparator(0); if (((TQToolBox*)w)->count() > 1) { @@ -1113,7 +1113,7 @@ void MainWindow::setupRMBSpecialCommands(TQValueList<int> &ids, TQMap<TQString, commands.insert("assoc", id); } - if (fw->mainContainer()->inherits("TQWizard")) { + if (fw->mainContainer()->inherits(TQWIZARD_OBJECT_NAME_STRING)) { if (ids.isEmpty()) ids << rmbFormWindow->insertSeparator(0); @@ -1131,7 +1131,7 @@ void MainWindow::setupRMBSpecialCommands(TQValueList<int> &ids, TQMap<TQString, ids << (id = rmbFormWindow->insertItem(i18n("Edit Pages..."), -1, 0)); commands.insert("edit", id); - } else if (fw->mainContainer()->inherits("TQMainWindow")) { + } else if (fw->mainContainer()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) { if (ids.isEmpty()) ids << rmbFormWindow->insertSeparator(0); ids << (id = rmbFormWindow->insertItem(i18n("Add Menu Item"), -1, 0)); @@ -1146,7 +1146,7 @@ void MainWindow::handleRMBProperties(int id, TQMap<TQString, int> &props, TQWidg if (id == props[ "text" ]) { bool ok = false; TQString text; - if (w->inherits("TQTextView") || w->inherits("TQLabel")) { + if (w->inherits(TQTEXTVIEW_OBJECT_NAME_STRING) || w->inherits(TQLABEL_OBJECT_NAME_STRING)) { text = TextEditor::getText(this, w->property("text").toString()); ok = !text.isEmpty(); } else { @@ -1211,7 +1211,7 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap<TQString, int> &commands editor->show(); } - if (w->inherits("TQTabWidget")) { + if (w->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) { TQTabWidget *tw = (TQTabWidget*)w; if (id == commands[ "add" ]) { AddTabPageCommand *cmd = new AddTabPageCommand(i18n("Add Page to %1").arg(tw->name()), formWindow(), @@ -1229,7 +1229,7 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap<TQString, int> &commands } } } - if (w->inherits("TQToolBox")) { + if (w->inherits(TQTOOLBOX_OBJECT_NAME_STRING)) { TQToolBox *tw = (TQToolBox*)w; if (id == commands[ "add" ]) { AddToolBoxPageCommand *cmd = new AddToolBoxPageCommand(i18n("Add Page to %1").arg(tw->name()), formWindow(), @@ -1264,7 +1264,7 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap<TQString, int> &commands } - if (fw->mainContainer()->inherits("TQWizard")) { + if (fw->mainContainer()->inherits(TQWIZARD_OBJECT_NAME_STRING)) { TQWizard *wiz = (TQWizard*)fw->mainContainer(); if (id == commands[ "add" ]) { AddWizardPageCommand *cmd = new AddWizardPageCommand(i18n("Add Page to %1").arg(wiz->name()), formWindow(), @@ -1297,7 +1297,7 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap<TQString, int> &commands cmd->execute(); } } - } else if (fw->mainContainer()->inherits("TQMainWindow")) { + } else if (fw->mainContainer()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) { TQMainWindow *mw = (TQMainWindow*)fw->mainContainer(); if (id == commands[ "add_toolbar" ]) { AddToolBarCommand *cmd = new AddToolBarCommand(i18n("Add Toolbar to '%1'").arg(formWindow()->name()), formWindow(), mw); @@ -1632,7 +1632,7 @@ bool MainWindow::openEditor(TQWidget* w, FormWindow*) if (text && text->designable(w)) { bool ok = false; TQString text; - if (w->inherits("TQTextView") || w->inherits("TQLabel")) { + if (w->inherits(TQTEXTVIEW_OBJECT_NAME_STRING) || w->inherits(TQLABEL_OBJECT_NAME_STRING)) { text = TextEditor::getText(this, w->property("text").toString()); ok = !text.isEmpty(); } else { diff --git a/kommander/editor/metadatabase.cpp b/kommander/editor/metadatabase.cpp index 84072865..3a8316b8 100644 --- a/kommander/editor/metadatabase.cpp +++ b/kommander/editor/metadatabase.cpp @@ -280,7 +280,7 @@ int MetaDataBase::spacing( TQObject *o ) if ( !o ) return -1; setupDataBase(); - if ( o->inherits( "TQMainWindow" ) ) + if ( o->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) o = ( (TQMainWindow*)o )->centralWidget(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { @@ -318,7 +318,7 @@ int MetaDataBase::margin( TQObject *o ) if ( !o ) return -1; setupDataBase(); - if ( o->inherits( "TQMainWindow" ) ) + if ( o->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) o = ( (TQMainWindow*)o )->centralWidget(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { diff --git a/kommander/editor/previewwidgetimpl.cpp b/kommander/editor/previewwidgetimpl.cpp index 98fb66b7..6e9672be 100644 --- a/kommander/editor/previewwidgetimpl.cpp +++ b/kommander/editor/previewwidgetimpl.cpp @@ -25,7 +25,7 @@ PreviewWidget::PreviewWidget( TQWidget *parent, const char *name ) : PreviewWidgetBase( parent, name ) { // install event filter on child widgets - TQObjectList *l = queryList("TQWidget"); + TQObjectList *l = queryList(TQWIDGET_OBJECT_NAME_STRING); TQObjectListIt it(*l); TQObject * obj; while ((obj = it.current()) != 0) { diff --git a/kommander/editor/propertyeditor.cpp b/kommander/editor/propertyeditor.cpp index ed5e68d5..aeeaecb1 100644 --- a/kommander/editor/propertyeditor.cpp +++ b/kommander/editor/propertyeditor.cpp @@ -842,7 +842,7 @@ QDateEdit *PropertyDateItem::lined() if ( lin ) return lin; lin = new QDateEdit( listview->viewport() ); - TQObjectList *l = lin->queryList( "TQLineEdit" ); + TQObjectList *l = lin->queryList( TQLINEEDIT_OBJECT_NAME_STRING ); for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( listview ); delete l; @@ -919,7 +919,7 @@ QTimeEdit *PropertyTimeItem::lined() lin = new QTimeEdit( listview->viewport() ); connect( lin, TQT_SIGNAL( valueChanged( const TQTime & ) ), this, TQT_SLOT( setValue() ) ); - TQObjectList *l = lin->queryList( "TQLineEdit" ); + TQObjectList *l = lin->queryList( TQLINEEDIT_OBJECT_NAME_STRING ); for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( listview ); delete l; @@ -994,7 +994,7 @@ QDateTimeEdit *PropertyDateTimeItem::lined() lin = new QDateTimeEdit( listview->viewport() ); connect( lin, TQT_SIGNAL( valueChanged( const TQDateTime & ) ), this, TQT_SLOT( setValue() ) ); - TQObjectList *l = lin->queryList( "TQLineEdit" ); + TQObjectList *l = lin->queryList( TQLINEEDIT_OBJECT_NAME_STRING ); for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( listview ); delete l; @@ -1163,7 +1163,7 @@ TQSpinBox *PropertyIntItem::spinBox() spinBx = new TQSpinBox( 0, INT_MAX, 1, listview->viewport() ); spinBx->hide(); spinBx->installEventFilter( listview ); - TQObjectList *ol = spinBx->queryList( "TQLineEdit" ); + TQObjectList *ol = spinBx->queryList( TQLINEEDIT_OBJECT_NAME_STRING ); if ( ol && ol->first() ) ol->first()->installEventFilter( listview ); delete ol; @@ -1256,7 +1256,7 @@ TQComboBox *PropertyListItem::combo() this, TQT_SLOT( setValue() ) ); comb->installEventFilter( listview ); if ( editable ) { - TQObjectList *ol = comb->queryList( "TQLineEdit" ); + TQObjectList *ol = comb->queryList( TQLINEEDIT_OBJECT_NAME_STRING ); if ( ol && ol->first() ) ol->first()->installEventFilter( listview ); delete ol; @@ -2194,7 +2194,7 @@ void PropertyPaletteItem::getPalette() return; bool ok = false; TQWidget *w = (TQWidget*)listview->propertyEditor()->widget(); - if ( w->inherits( "TQScrollView" ) ) + if ( w->inherits( TQSCROLLVIEW_OBJECT_NAME_STRING ) ) w = ( (TQScrollView*)w )->viewport(); TQPalette pal = PaletteEditor::getPalette( &ok, val.toPalette(), #if defined(QT_NON_COMMERCIAL) @@ -2500,7 +2500,7 @@ static TQVariant::Type type_to_variant( const TQString &s ) #ifndef QT_NO_SQL static bool parent_is_data_aware( TQObject *o ) { - if ( !o->inherits( "TQWidget" ) ) + if ( !o->inherits( TQWIDGET_OBJECT_NAME_STRING ) ) return false; TQWidget *w = (TQWidget*)o; TQWidget *p = w->parentWidget(); @@ -2618,7 +2618,7 @@ void PropertyList::setupProperties() continue; } } - if ( w->inherits( "TQActionGroup" ) ) { + if ( w->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ) { if ( qstrcmp( p->name(), "usesDropDown" ) == 0 ) continue; if ( qstrcmp( p->name(), "toggleAction" ) == 0 ) @@ -2635,7 +2635,7 @@ void PropertyList::setupProperties() if ( qstrcmp( p->name(), "buttonGroupId" ) == 0 ) { // #### remove this when designable in Q_PROPERTY can take a function (isInButtonGroup() in this case) if ( !editor->widget()->isWidgetType() || !editor->widget()->parent() || - !editor->widget()->parent()->inherits( "TQButtonGroup" ) ) + !editor->widget()->parent()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) continue; } @@ -2654,7 +2654,7 @@ void PropertyList::setupProperties() setPropertyValue( item ); if ( MetaDataBase::isPropertyChanged( editor->widget(), "hAlign" ) ) item->setChanged( true, false ); - if ( !editor->widget()->inherits( "TQMultiLineEdit" ) ) { + if ( !editor->widget()->inherits( TQMULTILINEEDIT_OBJECT_NAME_STRING ) ) { lst.clear(); lst << p->valueToKey( AlignTop ) << p->valueToKey( AlignVCenter ) @@ -2665,7 +2665,7 @@ void PropertyList::setupProperties() if ( MetaDataBase::isPropertyChanged( editor->widget(), "vAlign" ) ) item->setChanged( true, false ); item = new PropertyBoolItem( this, item, 0, "wordwrap" ); - if ( w->inherits( "TQGroupBox" ) ) + if ( w->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) item->setVisible( false ); setPropertyValue( item ); if ( MetaDataBase::isPropertyChanged( editor->widget(), "wordwrap" ) ) @@ -2702,7 +2702,7 @@ void PropertyList::setupProperties() } } - if ( !w->inherits( "TQSplitter" ) && !w->inherits( "QDesignerMenuBar" ) && !w->inherits( "QDesignerToolBar" ) && + if ( !w->inherits( TQSPLITTER_OBJECT_NAME_STRING ) && !w->inherits( "QDesignerMenuBar" ) && !w->inherits( "QDesignerToolBar" ) && w->isWidgetType() && WidgetFactory::layoutType( (TQWidget*)w ) != WidgetFactory::NoLayout ) { item = new PropertyIntItem( this, item, 0, "layoutSpacing", true ); setPropertyValue( item ); @@ -2713,7 +2713,7 @@ void PropertyList::setupProperties() } - if ( !w->inherits( "Spacer" ) && !w->inherits( "QLayoutWidget" ) && !w->inherits( "TQAction" ) && + if ( !w->inherits( "Spacer" ) && !w->inherits( "QLayoutWidget" ) && !w->inherits( TQACTION_OBJECT_NAME_STRING ) && !w->inherits( "QDesignerMenuBar" ) && !w->inherits( "QDesignerToolBar" ) ) { item = new PropertyTextItem( this, item, 0, "toolTip", true, false ); setPropertyValue( item ); @@ -2726,15 +2726,15 @@ void PropertyList::setupProperties() } #ifndef QT_NO_SQL - if ( !editor->widget()->inherits( "TQDataTable" ) && !editor->widget()->inherits( "TQDataBrowser" ) && - !editor->widget()->inherits( "TQDataView" ) && parent_is_data_aware( editor->widget() ) ) { + if ( !editor->widget()->inherits( TQDATATABLE_OBJECT_NAME_STRING ) && !editor->widget()->inherits( TQDATABROWSER_OBJECT_NAME_STRING ) && + !editor->widget()->inherits( TQDATAVIEW_OBJECT_NAME_STRING ) && parent_is_data_aware( editor->widget() ) ) { item = new PropertyDatabaseItem( this, item, 0, "database", editor->formWindow()->mainContainer() != w ); setPropertyValue( item ); if ( MetaDataBase::isPropertyChanged( editor->widget(), "database" ) ) item->setChanged( true, false ); } - if ( editor->widget()->inherits( "TQDataTable" ) || editor->widget()->inherits( "TQDataBrowser" ) || editor->widget()->inherits( "TQDataView" ) ) { + if ( editor->widget()->inherits( TQDATATABLE_OBJECT_NAME_STRING ) || editor->widget()->inherits( TQDATABROWSER_OBJECT_NAME_STRING ) || editor->widget()->inherits( TQDATAVIEW_OBJECT_NAME_STRING ) ) { item = new PropertyDatabaseItem( this, item, 0, "database", false ); setPropertyValue( item ); if ( MetaDataBase::isPropertyChanged( editor->widget(), "database" ) ) @@ -2780,7 +2780,7 @@ bool PropertyList::addPropertyItem( PropertyItem *&item, const TQCString &name, switch ( t ) { case TQVariant::String: item = new PropertyTextItem( this, item, 0, name, true, - editor->widget()->inherits( "TQLabel" ) || editor->widget()->inherits( "TQTextView" ) ); + editor->widget()->inherits( TQLABEL_OBJECT_NAME_STRING ) || editor->widget()->inherits( TQTEXTVIEW_OBJECT_NAME_STRING ) ); break; case TQVariant::CString: item = new PropertyTextItem( this, item, 0, @@ -2928,8 +2928,8 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e ) !( ke->state() & ControlButton ) ) { TQApplication::sendEvent( this, (TQKeyEvent*)e ); return true; - } else if ( ( !o->inherits( "TQLineEdit" ) || - ( o->inherits( "TQLineEdit" ) && ( (TQLineEdit*)o )->isReadOnly() ) ) && + } else if ( ( !o->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) || + ( o->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) && ( (TQLineEdit*)o )->isReadOnly() ) ) && i && i->hasSubItems() ) { if ( !i->isOpen() && ( ke->key() == Key_Plus || @@ -2939,12 +2939,12 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e ) ( ke->key() == Key_Minus || ke->key() == Key_Left ) ) i->setOpen( false ); - } else if ( ( ke->key() == Key_Return || ke->key() == Key_Enter ) && o->inherits( "TQComboBox" ) ) { + } else if ( ( ke->key() == Key_Return || ke->key() == Key_Enter ) && o->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) { TQKeyEvent ke2( TQEvent::KeyPress, Key_Space, 0, 0 ); TQApplication::sendEvent( o, &ke2 ); return true; } - } else if ( e->type() == TQEvent::FocusOut && o->inherits( "TQLineEdit" ) && editor->formWindow() ) { + } else if ( e->type() == TQEvent::FocusOut && o->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) && editor->formWindow() ) { TQTimer::singleShot( 100, editor->formWindow()->commandHistory(), TQT_SLOT( checkCompressedCommand() ) ); } else if ( o == viewport() ) { TQMouseEvent *me; diff --git a/kommander/editor/resource.cpp b/kommander/editor/resource.cpp index b725b7bc..d1c93cea 100644 --- a/kommander/editor/resource.cpp +++ b/kommander/editor/resource.cpp @@ -440,13 +440,13 @@ bool Resource::save( TQIODevice* dev ) ts << "<!DOCTYPE UI><UI version=\"3.0\" stdsetdef=\"1\">" << endl; saveMetaInfoBefore( ts, 0 ); saveObject( formwindow->mainContainer(), 0, ts, 0 ); - if ( formwindow->mainContainer()->inherits( "TQMainWindow" ) ) { + if ( formwindow->mainContainer()->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) { saveMenuBar( (TQMainWindow*)formwindow->mainContainer(), ts, 0 ); saveToolBars( (TQMainWindow*)formwindow->mainContainer(), ts, 0 ); } if ( !MetaDataBase::customWidgets()->isEmpty() && !usedCustomWidgets.isEmpty() ) saveCustomWidgets( ts, 0 ); - if ( formwindow->mainContainer()->inherits( "TQMainWindow" ) ) + if ( formwindow->mainContainer()->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) saveActions( formwindow->actionList(), ts, 0 ); if ( !images.isEmpty() ) saveImageCollection( ts, 0 ); @@ -615,9 +615,9 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea return; } - if ( obj->inherits( "TQTabWidget" ) ) { + if ( obj->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) { TQTabWidget* tw = (TQTabWidget*) obj; - TQObjectList* tmpl = tw->queryList( "TQWidgetStack" ); + TQObjectList* tmpl = tw->queryList( TQWIDGETSTACK_OBJECT_NAME_STRING ); TQWidgetStack *ws = (TQWidgetStack*)tmpl->first(); TQTabBar *tb = ( (QDesignerTabWidget*)obj )->tabBar(); for ( int i = 0; i < tb->count(); ++i ) { @@ -678,7 +678,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea ts << makeIndent( indent ) << "</widget>" << endl; } } - else if ( obj->inherits( "TQWizard" ) ) { + else if ( obj->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) { TQWizard* wiz = (TQWizard*)obj; for ( int i = 0; i < wiz->pageCount(); ++i ) { TQWidget *w = wiz->page( i ); if ( !w ) @@ -702,7 +702,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea --indent; ts << makeIndent( indent ) << "</widget>" << endl; } - } else if ( obj->inherits( "TQMainWindow" ) ) { + } else if ( obj->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) { saveChildrenOf( ( (TQMainWindow*)obj )->centralWidget(), ts, indent ); } else { saveChildrenOf( obj, ts, indent ); @@ -714,9 +714,9 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent ) { - if ( obj->inherits( "TQListBox" ) || obj->inherits( "TQComboBox" ) ) { + if ( obj->inherits( TQLISTBOX_OBJECT_NAME_STRING ) || obj->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) { TQListBox *lb = 0; - if ( obj->inherits( "TQListBox" ) ) + if ( obj->inherits( TQLISTBOX_OBJECT_NAME_STRING ) ) lb = (TQListBox*)obj; else lb = ( (TQComboBox*)obj )->listBox(); @@ -734,7 +734,7 @@ void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent ) indent--; ts << makeIndent( indent ) << "</item>" << endl; } - } else if ( obj->inherits( "TQIconView" ) ) { + } else if ( obj->inherits( TQICONVIEW_OBJECT_NAME_STRING ) ) { TQIconView *iv = (TQIconView*)obj; TQIconViewItem *i = iv->firstItem(); @@ -750,7 +750,7 @@ void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent ) indent--; ts << makeIndent( indent ) << "</item>" << endl; } - } else if ( obj->inherits( "TQListView" ) ) { + } else if ( obj->inherits( TQLISTVIEW_OBJECT_NAME_STRING ) ) { TQListView *lv = (TQListView*)obj; int i; for ( i = 0; i < lv->header()->count(); ++i ) { @@ -779,11 +779,11 @@ void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent ) saveItem( lv->firstChild(), ts, indent - 1 ); } #ifndef QT_NO_TABLE - else if ( obj->inherits( "TQTable" ) ) { + else if ( obj->inherits( TQTABLE_OBJECT_NAME_STRING ) ) { TQTable *table = (TQTable*)obj; int i; TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( table ); - bool isDataTable = table->inherits( "TQDataTable" ); + bool isDataTable = table->inherits( TQDATATABLE_OBJECT_NAME_STRING ); for ( i = 0; i < table->horizontalHeader()->count(); ++i ) { if ( !table->horizontalHeader()->label( i ).isNull() && table->horizontalHeader()->label( i ).toInt() != i + 1 || @@ -798,7 +798,7 @@ void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent ) if ( table->horizontalHeader()->iconSet( i ) ) pix.append( new TQPixmap( table->horizontalHeader()->iconSet( i )->pixmap() ) ); saveItem( l, pix, ts, indent ); - if ( table->inherits( "TQDataTable" ) && !columnFields.isEmpty() ) { + if ( table->inherits( TQDATATABLE_OBJECT_NAME_STRING ) && !columnFields.isEmpty() ) { ts << makeIndent( indent ) << "<property name=\"field\">" << endl; indent++; ts << makeIndent( indent ) << "<string>" << entitize( *columnFields.find( l[ 0 ] ) ) << "</string>" << endl; @@ -937,7 +937,7 @@ void Resource::saveChildrenOf( TQObject* obj, TQTextStream &ts, int indent ) // if the widget has a layout we pretend that all widget's childs are childs of the layout - makes the structure nicer TQLayout *layout = 0; QDesignerGridLayout* grid = 0; - if ( !obj->inherits( "TQSplitter" ) && + if ( !obj->inherits( TQSPLITTER_OBJECT_NAME_STRING ) && WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( obj ) ) ) && obj->isWidgetType() && WidgetFactory::layoutType( (TQWidget*)obj, layout ) != WidgetFactory::NoLayout ) { @@ -989,7 +989,7 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent ) if ( !changed.contains( "geometry" ) ) changed << "geometry"; } - } else if ( w->inherits( "TQLayout" ) ) { // #### should be cleaner (RS) + } else if ( w->inherits( TQLAYOUT_OBJECT_NAME_STRING ) ) { // #### should be cleaner (RS) changed << "margin" << "spacing"; } @@ -1017,7 +1017,7 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent ) property( w->metaObject()->findProperty( it.current(), true ), true ); if ( !p || !p->stored( w ) || ( inLayout && qstrcmp( p->name(), "geometry" ) == 0 ) ) continue; - if ( w->inherits( "TQLabel" ) && qstrcmp( p->name(), "pixmap" ) == 0 && + if ( w->inherits( TQLABEL_OBJECT_NAME_STRING ) && qstrcmp( p->name(), "pixmap" ) == 0 && ( !( (TQLabel*)w )->pixmap() || ( (TQLabel*)w )->pixmap()->isNull() ) ) continue; if ( w->inherits( "QDesignerMenuBar" ) && @@ -1106,7 +1106,7 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant break; case TQVariant::Int: num = value.toInt(); - if ( w && w->inherits( "TQLayout" ) ) { + if ( w && w->inherits( TQLAYOUT_OBJECT_NAME_STRING ) ) { if ( name == "spacing" ) num = MetaDataBase::spacing( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)w ) ) ); else if ( name == "margin" ) @@ -1124,7 +1124,7 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant break; case TQVariant::UInt: unum = value.toUInt(); - if ( w && w->inherits( "TQLayout" ) ) { + if ( w && w->inherits( TQLAYOUT_OBJECT_NAME_STRING ) ) { if ( name == "spacing" ) num = MetaDataBase::spacing( WidgetFactory::layoutParent( (TQLayout*)w ) ); else if ( name == "margin" ) @@ -1332,7 +1332,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay if ( colspan < 1 ) colspan = 1; - TQString className = e.attribute( "class", "TQWidget" ); + TQString className = e.attribute( "class", TQWIDGET_OBJECT_NAME_STRING ); if ( !className.isNull() ) { obj = WidgetFactory::create( WidgetDatabase::idFromClassName( className ), parent, 0, false ); @@ -1344,7 +1344,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay mainContainerSet = true; } w = (TQWidget*)obj; - if ( w->inherits( "TQMainWindow" ) ) + if ( w->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) w = ( (TQMainWindow*)w )->centralWidget(); if ( layout ) { switch ( WidgetFactory::layoutType( layout ) ) { @@ -1368,9 +1368,9 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay layout = 0; if ( w && formwindow ) { - if ( !parent || ( !parent->inherits( "TQToolBox" ) && !parent->inherits( "TQTabWidget" ) && !parent->inherits( "TQWizard" ) ) ) + if ( !parent || ( !parent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) && !parent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) && !parent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) ) formwindow->insertWidget( w, pasting ); - else if ( parent && ( parent->inherits( "TQToolBox" ) || parent->inherits( "TQTabWidget" ) || parent->inherits( "TQWizard" ) ) ) + else if ( parent && ( parent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) || parent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) || parent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) ) MetaDataBase::addEntry( w ); if (w->inherits("Dialog")) dynamic_cast<Dialog*>(w)->setUseInternalParser(false); @@ -1402,14 +1402,14 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay } else if ( n.tagName() == "attribute" && w ) { TQString attrib = n.attribute( "name" ); TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() ); - if ( parent->inherits( "TQTabWidget" ) ) { + if ( parent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) { if ( attrib == "title" ) ( (TQTabWidget*)parent )->insertTab( w, v.toString() ); } else - if ( parent->inherits( "TQToolBox" ) ) { + if ( parent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) { if ( attrib == "label" ) ( (TQToolBox*)parent )->addItem( w, v.toString() ); - } else if ( parent->inherits( "TQWizard" ) ) { + } else if ( parent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) { if ( attrib == "title" ) ( (TQWizard*)parent )->addPage( w, v.toString() ); } @@ -1436,7 +1436,7 @@ void Resource::createColumn( const TQDomElement &e, TQWidget *widget ) if ( !widget ) return; - if ( widget->inherits( "TQListView" ) && e.tagName() == "column" ) { + if ( widget->inherits( TQLISTVIEW_OBJECT_NAME_STRING ) && e.tagName() == "column" ) { TQListView *lv = (TQListView*)widget; TQDomElement n = e.firstChild().toElement(); TQPixmap pix; @@ -1470,7 +1470,7 @@ void Resource::createColumn( const TQDomElement &e, TQWidget *widget ) lv->header()->setResizeEnabled( resizeable, i ); } #ifndef QT_NO_TABLE - else if ( widget->inherits( "TQTable" ) ) { + else if ( widget->inherits( TQTABLE_OBJECT_NAME_STRING ) ) { TQTable *table = (TQTable*)widget; bool isRow; if ( ( isRow = e.tagName() == "row" ) ) @@ -1537,14 +1537,14 @@ void Resource::createItem( const TQDomElement &e, TQWidget *widget, TQListViewIt if ( !widget || !WidgetFactory::hasItems( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( widget ) ) ) ) return; - if ( widget->inherits( "TQListBox" ) || widget->inherits( "TQComboBox" ) ) { + if ( widget->inherits( TQLISTBOX_OBJECT_NAME_STRING ) || widget->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) { TQDomElement n = e.firstChild().toElement(); TQPixmap pix; bool hasPixmap = false; TQString txt; loadItem( n, pix, txt, hasPixmap ); TQListBox *lb = 0; - if ( widget->inherits( "TQListBox" ) ) + if ( widget->inherits( TQLISTBOX_OBJECT_NAME_STRING ) ) lb = (TQListBox*)widget; else lb = ( (TQComboBox*)widget)->listBox(); @@ -1553,7 +1553,7 @@ void Resource::createItem( const TQDomElement &e, TQWidget *widget, TQListViewIt } else { new TQListBoxText( lb, txt ); } - } else if ( widget->inherits( "TQIconView" ) ) { + } else if ( widget->inherits( TQICONVIEW_OBJECT_NAME_STRING ) ) { TQDomElement n = e.firstChild().toElement(); TQPixmap pix; bool hasPixmap = false; @@ -1562,7 +1562,7 @@ void Resource::createItem( const TQDomElement &e, TQWidget *widget, TQListViewIt TQIconView *iv = (TQIconView*)widget; new TQIconViewItem( iv, txt, pix ); - } else if ( widget->inherits( "TQListView" ) ) { + } else if ( widget->inherits( TQLISTVIEW_OBJECT_NAME_STRING ) ) { TQDomElement n = e.firstChild().toElement(); TQPixmap pix; TQValueList<TQPixmap> pixmaps; @@ -1630,7 +1630,7 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLay if ( formwindow ) formwindow->insertWidget( spacer, pasting ); if ( layout ) { - if ( layout->inherits( "TQBoxLayout" ) ) + if ( layout->inherits( TQBOXLAYOUT_OBJECT_NAME_STRING ) ) ( (TQBoxLayout*)layout )->addWidget( spacer, 0, spacer->alignment() ); else ( (QDesignerGridLayout*)layout )->addMultiCellWidget( spacer, row, row + rowspan - 1, col, col + colspan - 1, @@ -1646,7 +1646,7 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD { const TQMetaProperty *p = obj->metaObject()->property( obj->metaObject()->findProperty( prop, true ), true ); - if ( !obj->inherits( "TQLayout" ) ) {// no layouts in metadatabase... (RS) + if ( !obj->inherits( TQLAYOUT_OBJECT_NAME_STRING ) ) {// no layouts in metadatabase... (RS) if ( obj->inherits( "CustomWidget" ) ) { MetaDataBase::CustomWidget *cw = ( (CustomWidget*)obj )->customWidget(); if ( cw && !cw->hasProperty( prop.latin1() ) && !p && prop != "toolTip" && prop != "whatsThis" ) @@ -1754,7 +1754,7 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD } } - if ( obj->inherits( "TQLayout" ) ) { + if ( obj->inherits( TQLAYOUT_OBJECT_NAME_STRING ) ) { if ( prop == "spacing" ) { MetaDataBase::setSpacing( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)obj ) ), v.toInt() ); return; @@ -1955,7 +1955,7 @@ void Resource::saveConnections( TQTextStream &ts, int indent ) TQString lang = formwindow->project()->language(); LanguageInterface *iface = langIface; if ( iface && MetaDataBase::hasEvents( lang ) ) { - TQObjectList *l = formwindow->queryList( "TQWidget" ); + TQObjectList *l = formwindow->queryList( TQWIDGET_OBJECT_NAME_STRING ); l->append( formwindow ); TQPtrList<TQAction> lst = formwindow->actionList(); for ( TQAction *a = lst.first(); a; a = lst.next() ) @@ -2373,10 +2373,10 @@ void Resource::saveChildActions( TQAction *a, TQTextStream &ts, int indent ) while ( it.current() ) { TQObject *o = it.current(); ++it; - if ( !o->inherits( "TQAction" ) ) + if ( !o->inherits( TQACTION_OBJECT_NAME_STRING ) ) continue; TQAction *ac = (TQAction*)o; - bool isGroup = ac->inherits( "TQActionGroup" ); + bool isGroup = ac->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ); if ( isGroup ) ts << makeIndent( indent ) << "<actiongroup>" << endl; else @@ -2405,7 +2405,7 @@ void Resource::saveActions( const TQPtrList<TQAction> &actions, TQTextStream &ts TQPtrListIterator<TQAction> it( actions ); while ( it.current() ) { TQAction *a = it.current(); - bool isGroup = a->inherits( "TQActionGroup" ); + bool isGroup = a->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ); if ( isGroup ) ts << makeIndent( indent ) << "<actiongroup>" << endl; else @@ -2449,7 +2449,7 @@ void Resource::loadChildAction( TQObject *parent, const TQDomElement &e ) } n2 = n2.nextSibling().toElement(); } - if ( !parent->inherits( "TQAction" ) ) + if ( !parent->inherits( TQACTION_OBJECT_NAME_STRING ) ) formwindow->actionList().append( a ); } else if ( n.tagName() == "actiongroup" ) { a = new QDesignerActionGroup( parent ); @@ -2471,7 +2471,7 @@ void Resource::loadChildAction( TQObject *parent, const TQDomElement &e ) } n2 = n2.nextSibling().toElement(); } - if ( !parent->inherits( "TQAction" ) ) + if ( !parent->inherits( TQACTION_OBJECT_NAME_STRING ) ) formwindow->actionList().append( a ); } } @@ -2538,7 +2538,7 @@ void Resource::saveToolBars( TQMainWindow *mw, TQTextStream &ts, int indent ) void Resource::saveMenuBar( TQMainWindow *mw, TQTextStream &ts, int indent ) { - if ( !mw->child( 0, "TQMenuBar" ) ) + if ( !mw->child( 0, TQMENUBAR_OBJECT_NAME_STRING ) ) return; ts << makeIndent( indent ) << "<menubar>" << endl; indent++; diff --git a/kommander/editor/tableeditorimpl.cpp b/kommander/editor/tableeditorimpl.cpp index 6b5ce13e..58cc554d 100644 --- a/kommander/editor/tableeditorimpl.cpp +++ b/kommander/editor/tableeditorimpl.cpp @@ -33,14 +33,14 @@ TableEditor::TableEditor( TQWidget* parent, TQWidget *editWidget, FormWindow *f labelColumnPixmap->setText( "" ); labelRowPixmap->setText( "" ); - if ( !editTable->inherits( "TQDataTable" ) ) { + if ( !editTable->inherits( TQDATATABLE_OBJECT_NAME_STRING ) ) { labelFields->hide(); comboFields->hide(); labelTable->hide(); labelTableValue->hide(); } #ifndef QT_NO_SQL - if ( editTable->inherits( "TQDataTable" ) ) { + if ( editTable->inherits( TQDATATABLE_OBJECT_NAME_STRING ) ) { // ## why does this behave weird? // TabWidget->removePage( rows_tab ); // rows_tab->hide(); @@ -48,7 +48,7 @@ TableEditor::TableEditor( TQWidget* parent, TQWidget *editWidget, FormWindow *f TabWidget->setTabEnabled( rows_tab, false ); } - if ( formWindow->project() && editTable->inherits( "TQDataTable" ) ) { + if ( formWindow->project() && editTable->inherits( TQDATATABLE_OBJECT_NAME_STRING ) ) { TQStringList lst = MetaDataBase::fakeProperty( editTable, "database" ).toStringList(); if ( lst.count() == 2 && !lst[ 0 ].isEmpty() && !lst[ 1 ].isEmpty() ) { TQStringList fields; @@ -131,7 +131,7 @@ void TableEditor::currentColumnChanged( TQListBoxItem *i ) editColumnText->blockSignals( false ); #ifndef QT_NO_TABLE - if ( editTable->inherits( "TQDataTable" ) ) { + if ( editTable->inherits( TQDATATABLE_OBJECT_NAME_STRING ) ) { TQString s = *fieldMap.find( listColumns->index( i ) ); if ( s.isEmpty() ) comboFields->setCurrentItem( 0 ); @@ -215,7 +215,7 @@ void TableEditor::newColumnClicked() TQListBoxItem *item = listColumns->item( listColumns->count() - 1 ); listColumns->setCurrentItem( item ); listColumns->setSelected( item, true ); - if ( editTable->inherits( "TQDataTable" ) ) { + if ( editTable->inherits( TQDATATABLE_OBJECT_NAME_STRING ) ) { comboFields->setFocus(); } else { editColumnText->setFocus(); diff --git a/kommander/editor/widgetfactory.cpp b/kommander/editor/widgetfactory.cpp index 34cd0514..2becbd33 100644 --- a/kommander/editor/widgetfactory.cpp +++ b/kommander/editor/widgetfactory.cpp @@ -677,29 +677,29 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *layout, Layou int spacing = MainWindow::self->currentLayoutDefaultSpacing(); int margin = 0; - if ( widget && !widget->inherits( "QLayoutWidget" ) && + if ( widget && !widget->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) && ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( widget ) ) ) || widget && widget->parentWidget() && widget->parentWidget()->inherits( "FormWindow" ) ) ) margin = MainWindow::self->currentLayoutDefaultMargin(); - if ( !layout && widget && widget->inherits( "TQTabWidget" ) ) + if ( !layout && widget && widget->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) widget = ((TQTabWidget*)widget)->currentPage(); - if ( !layout && widget && widget->inherits( "TQToolBox" ) ) + if ( !layout && widget && widget->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) widget = ((TQToolBox*)widget)->currentItem(); - if ( !layout && widget && widget->inherits( "TQWizard" ) ) + if ( !layout && widget && widget->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) widget = ((TQWizard*)widget)->currentPage(); - if ( !layout && widget && widget->inherits( "TQMainWindow" ) ) + if ( !layout && widget && widget->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) widget = ((TQMainWindow*)widget)->centralWidget(); - if ( !layout && widget && widget->inherits( "TQWidgetStack" ) ) + if ( !layout && widget && widget->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) widget = ((TQWidgetStack*)widget)->visibleWidget(); MetaDataBase::addEntry( widget ); - if ( !layout && widget && widget->inherits( "TQGroupBox" ) ) { + if ( !layout && widget && widget->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) { TQGroupBox *gb = (TQGroupBox*)widget; gb->setColumnLayout( 0, Qt::Vertical ); gb->layout()->setMargin( 0 ); @@ -811,13 +811,13 @@ void WidgetFactory::deleteLayout( TQWidget *widget ) if ( !widget ) return; - if ( widget->inherits( "TQTabWidget" ) ) + if ( widget->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) widget = ((TQTabWidget*)widget)->currentPage(); - if ( widget->inherits( "TQWizard" ) ) + if ( widget->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) widget = ((TQWizard*)widget)->currentPage(); - if ( widget->inherits( "TQMainWindow" ) ) + if ( widget->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) widget = ((TQMainWindow*)widget)->centralWidget(); - if ( widget->inherits( "TQWidgetStack" ) ) + if ( widget->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) widget = ((TQWidgetStack*)widget)->visibleWidget(); delete widget->layout(); } @@ -832,7 +832,7 @@ void WidgetFactory::deleteLayout( TQWidget *widget ) TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *parent, const char *name, bool init, const TQRect *r, Qt::Orientation orient ) { - if (className == "TQPushButton") + if (className == TQPUSHBUTTON_OBJECT_NAME_STRING) { TQPushButton *b = 0; if (init) @@ -844,9 +844,9 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare b = new QDesignerPushButton(parent, name); } TQWidget *w = find_formwindow(b); - b->setAutoDefault(w && ((FormWindow *) w)->mainContainer()->inherits("TQDialog")); + b->setAutoDefault(w && ((FormWindow *) w)->mainContainer()->inherits(TQDIALOG_OBJECT_NAME_STRING)); return b; - } else if (className == "TQToolButton") + } else if (className == TQTOOLBUTTON_OBJECT_NAME_STRING) { if (init) { @@ -855,7 +855,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare return tb; } return new QDesignerToolButton(parent, name); - } else if (className == "TQCheckBox") + } else if (className == TQCHECKBOX_OBJECT_NAME_STRING) { if (init) { @@ -864,7 +864,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare return cb; } return new QDesignerCheckBox(parent, name); - } else if (className == "TQRadioButton") + } else if (className == TQRADIOBUTTON_OBJECT_NAME_STRING) { if (init) { @@ -873,17 +873,17 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare return rb; } return new QDesignerRadioButton(parent, name); - } else if (className == "TQGroupBox") + } else if (className == TQGROUPBOX_OBJECT_NAME_STRING) { if (init) return new TQGroupBox(TQString::fromLatin1(name), parent, name); return new TQGroupBox(parent, name); - } else if (className == "TQButtonGroup") + } else if (className == TQBUTTONGROUP_OBJECT_NAME_STRING) { if (init) return new TQButtonGroup(TQString::fromLatin1(name), parent, name); return new TQButtonGroup(parent, name); - } else if (className == "TQIconView") + } else if (className == TQICONVIEW_OBJECT_NAME_STRING) { #if !defined(QT_NO_ICONVIEW) TQIconView *iv = new TQIconView(parent, name); @@ -893,7 +893,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare #else return 0; #endif - } else if (className == "TQTable") + } else if (className == TQTABLE_OBJECT_NAME_STRING) { #if !defined(QT_NO_TABLE) if (init) @@ -903,20 +903,20 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare return 0; #endif #ifndef QT_NO_SQL - } else if (className == "TQDataTable") + } else if (className == TQDATATABLE_OBJECT_NAME_STRING) { return new TQDataTable(parent, name); #endif //QT_NO_SQL - } else if (className == "QDateEdit") + } else if (className == TQDATEEDIT_OBJECT_NAME_STRING) { return new QDateEdit(parent, name); - } else if (className == "QTimeEdit") + } else if (className == TQTIMEEDIT_OBJECT_NAME_STRING) { return new QTimeEdit(parent, name); - } else if (className == "QDateTimeEdit") + } else if (className == TQDATETIMEEDIT_OBJECT_NAME_STRING) { return new QDateTimeEdit(parent, name); - } else if (className == "TQListBox") + } else if (className == TQLISTBOX_OBJECT_NAME_STRING) { TQListBox *lb = new TQListBox(parent, name); if (init) @@ -925,7 +925,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare lb->setCurrentItem(0); } return lb; - } else if (className == "TQListView") + } else if (className == TQLISTVIEW_OBJECT_NAME_STRING) { TQListView *lv = new TQListView(parent, name); lv->setSorting(-1); @@ -935,17 +935,17 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare lv->setCurrentItem(new TQListViewItem(lv, i18n("New Item"))); } return lv; - } else if (className == "TQLineEdit") + } else if (className == TQLINEEDIT_OBJECT_NAME_STRING) return new TQLineEdit(parent, name); - else if (className == "TQSpinBox") + else if (className == TQSPINBOX_OBJECT_NAME_STRING) return new TQSpinBox(parent, name); - else if (className == "TQSplitter") + else if (className == TQSPLITTER_OBJECT_NAME_STRING) return new TQSplitter(parent, name); - else if (className == "TQMultiLineEdit") + else if (className == TQMULTILINEEDIT_OBJECT_NAME_STRING) return new TQMultiLineEdit(parent, name); - else if (className == "TQTextEdit") + else if (className == TQTEXTEDIT_OBJECT_NAME_STRING) return new TQTextEdit(parent, name); - else if (className == "TQLabel") + else if (className == TQLABEL_OBJECT_NAME_STRING) { QDesignerLabel *l = new QDesignerLabel(parent, name); if (init) @@ -955,9 +955,9 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare MetaDataBase::setPropertyChanged(l, "text", true); } return l; - } else if (className == "QLayoutWidget") + } else if (className == TQLAYOUTWIDGET_OBJECT_NAME_STRING) return new QLayoutWidget(parent, name); - else if (className == "TQTabWidget") + else if (className == TQTABWIDGET_OBJECT_NAME_STRING) { TQTabWidget *tw = new QDesignerTabWidget(parent, name); if (init) @@ -972,14 +972,14 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare MetaDataBase::addEntry(w); } return tw; - } else if (className == "TQComboBox") + } else if (className == TQCOMBOBOX_OBJECT_NAME_STRING) { return new TQComboBox(false, parent, name); - } else if (className == "TQWidget") + } else if (className == TQWIDGET_OBJECT_NAME_STRING) { if (parent && - (parent->inherits("FormWindow") || parent->inherits("TQWizard") - || parent->inherits("TQTabWidget") || parent->inherits("TQToolBox") || parent->inherits("TQMainWindow"))) + (parent->inherits("FormWindow") || parent->inherits(TQWIZARD_OBJECT_NAME_STRING) + || parent->inherits(TQTABWIDGET_OBJECT_NAME_STRING) || parent->inherits(TQTOOLBOX_OBJECT_NAME_STRING) || parent->inherits(TQMAINWINDOW_OBJECT_NAME_STRING))) { FormWindow *fw = find_formwindow(parent); if (fw) @@ -990,7 +990,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare } } return new TQWidget(parent, name); - } else if (className == "TQDialog") + } else if (className == TQDIALOG_OBJECT_NAME_STRING) { TQDialog *dia = 0; if (parent && parent->inherits("FormWindow")) @@ -1000,7 +1000,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare if (parent && !parent->inherits("MainWindow")) dia->reparent(parent, TQPoint(0, 0), true); return dia; - } else if (className == "TQWizard") + } else if (className == TQWIZARD_OBJECT_NAME_STRING) { TQWizard *wiz = new QDesignerWizard(parent, name); if (parent && !parent->inherits("MainWindow")) @@ -1030,17 +1030,17 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare else s->setOrientation(Qt::Horizontal); return s; - } else if (className == "TQLCDNumber") + } else if (className == TQLCDNUMBER_OBJECT_NAME_STRING) return new TQLCDNumber(parent, name); - else if (className == "TQProgressBar") + else if (className == TQPROGRESSBAR_OBJECT_NAME_STRING) return new TQProgressBar(parent, name); - else if (className == "TQTextView") + else if (className == TQTEXTVIEW_OBJECT_NAME_STRING) return new TQTextView(parent, name); - else if (className == "TQTextBrowser") + else if (className == TQTEXTBROWSER_OBJECT_NAME_STRING) return new TQTextBrowser(parent, name); - else if (className == "TQDial") + else if (className == TQDIAL_OBJECT_NAME_STRING) return new TQDial(parent, name); - else if (className == "TQSlider") + else if (className == TQSLIDER_OBJECT_NAME_STRING) { TQSlider *s = new TQSlider(parent, name); if (!r) @@ -1052,7 +1052,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare MetaDataBase::addEntry(s); MetaDataBase::setPropertyChanged(s, "orientation", true); return s; - } else if (className == "TQScrollBar") + } else if (className == TQSCROLLBAR_OBJECT_NAME_STRING) { TQScrollBar *s = new TQScrollBar(parent, name); if (!r) @@ -1064,7 +1064,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare MetaDataBase::addEntry(s); MetaDataBase::setPropertyChanged(s, "orientation", true); return s; - } else if (className == "TQFrame") + } else if (className == TQFRAME_OBJECT_NAME_STRING) { if (!init) return new TQFrame(parent, name); @@ -1085,7 +1085,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare else if (r->width() < r->height()) l->setOrientation(Qt::Vertical); return l; - } else if (className == "TQMainWindow") + } else if (className == TQMAINWINDOW_OBJECT_NAME_STRING) { TQMainWindow *mw = new KmdrMainWindow(parent, name, 0); mw->setDockEnabled(Qt::DockMinimized, false); @@ -1098,13 +1098,13 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare return mw; } #ifndef QT_NO_SQL - else if (className == "TQDataBrowser") + else if (className == TQDATABROWSER_OBJECT_NAME_STRING) { TQWidget *w = new QDesignerDataBrowser(parent, name); if (parent) w->reparent(parent, TQPoint(0, 0), true); return w; - } else if (className == "TQDataView") + } else if (className == TQDATAVIEW_OBJECT_NAME_STRING) { TQWidget *w = new QDesignerDataView(parent, name); if (parent) @@ -1266,37 +1266,37 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&lay { layout = 0; - if ( w && w->inherits( "TQTabWidget" ) ) + if ( w && w->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) w = ((TQTabWidget*)w)->currentPage(); - if ( w->inherits( "TQToolBox" ) ) + if ( w->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) w = ((TQToolBox*)w)->currentItem(); - if ( w && w->inherits( "TQWizard" ) ) + if ( w && w->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) w = ((TQWizard*)w)->currentPage(); - if ( w && w->inherits( "TQMainWindow" ) ) + if ( w && w->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) w = ((TQMainWindow*)w)->centralWidget(); - if ( w && w->inherits( "TQWidgetStack" ) ) + if ( w && w->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) w = ((TQWidgetStack*)w)->visibleWidget(); - if ( w && w->inherits( "TQSplitter" ) ) + if ( w && w->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ) return ( (TQSplitter*)w )->orientation() == Horizontal ? HBox : VBox; if ( !w || !w->layout() ) return NoLayout; TQLayout *lay = w->layout(); - if ( w->inherits( "TQGroupBox" ) ) { - TQObjectList *l = lay->queryList( "TQLayout" ); + if ( w->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) { + TQObjectList *l = lay->queryList( TQLAYOUT_OBJECT_NAME_STRING ); if ( l && l->first() ) lay = (TQLayout*)l->first(); delete l; } layout = lay; - if ( lay->inherits( "TQHBoxLayout" ) ) + if ( lay->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) ) return HBox; - else if ( lay->inherits( "TQVBoxLayout" ) ) + else if ( lay->inherits( TQVBOXLAYOUT_OBJECT_NAME_STRING ) ) return VBox; - else if ( lay->inherits( "TQGridLayout" ) ) + else if ( lay->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) return Grid; return NoLayout; } @@ -1306,11 +1306,11 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&lay */ WidgetFactory::LayoutType WidgetFactory::layoutType( TQLayout *layout ) { - if ( layout->inherits( "TQHBoxLayout" ) ) + if ( layout->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) ) return HBox; - else if ( layout->inherits( "TQVBoxLayout" ) ) + else if ( layout->inherits( TQVBOXLAYOUT_OBJECT_NAME_STRING ) ) return VBox; - else if ( layout->inherits( "TQGridLayout" ) ) + else if ( layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) return Grid; return NoLayout; } @@ -1349,15 +1349,15 @@ TQWidget* WidgetFactory::containerOfWidget( TQWidget *w ) { if ( !w ) return w; - if ( w->inherits( "TQTabWidget" ) ) + if ( w->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) return ((TQTabWidget*)w)->currentPage(); - if ( w->inherits( "TQToolBox" ) ) + if ( w->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) return ((TQToolBox*)w)->currentItem(); - if ( w->inherits( "TQWizard" ) ) + if ( w->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) return ((TQWizard*)w)->currentPage(); - if ( w->inherits( "TQWidgetStack" ) ) + if ( w->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) return ((TQWidgetStack*)w)->visibleWidget(); - if ( w->inherits( "TQMainWindow" ) ) + if ( w->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) return ((TQMainWindow*)w)->centralWidget(); return w; } @@ -1372,7 +1372,7 @@ TQWidget* WidgetFactory::containerOfWidget( TQWidget *w ) TQWidget* WidgetFactory::widgetOfContainer( TQWidget *w ) { - if ( w->parentWidget() && w->parentWidget()->inherits( "TQWidgetStack" ) ) + if ( w->parentWidget() && w->parentWidget()->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) w = w->parentWidget(); while ( w ) { if ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) ) || @@ -1391,19 +1391,19 @@ bool WidgetFactory::isPassiveInteractor( TQObject* o ) if ( TQApplication::activePopupWidget() ) // if a popup is open, we have to make sure that this one is closed, else X might do funny things return true; - if ( o->inherits( "TQTabBar" ) || ::qt_cast<TQToolBox*>(o->parent()) ) + if ( o->inherits( TQTABBAR_OBJECT_NAME_STRING ) || ::qt_cast<TQToolBox*>(o->parent()) ) return true; - else if ( o->inherits( "TQSizeGrip" ) ) + else if ( o->inherits( TQSIZEGRIP_OBJECT_NAME_STRING ) ) return true; - else if ( o->inherits( "TQToolButton" ) && o->parent() && o->parent()->inherits( "TQTabBar" ) ) + else if ( o->inherits( TQTOOLBUTTON_OBJECT_NAME_STRING ) && o->parent() && o->parent()->inherits( TQTABBAR_OBJECT_NAME_STRING ) ) return true; - else if ( o->parent() && o->parent()->inherits( "TQWizard" ) && o->inherits( "TQPushButton" ) ) + else if ( o->parent() && o->parent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) && o->inherits( TQPUSHBUTTON_OBJECT_NAME_STRING ) ) return true; - else if ( o->parent() && o->parent()->inherits( "TQMainWindow" ) && o->inherits( "TQMenuBar" ) ) + else if ( o->parent() && o->parent()->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) && o->inherits( TQMENUBAR_OBJECT_NAME_STRING ) ) return true; - else if ( o->inherits( "QDockWindowHandle" ) ) + else if ( o->inherits( TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING ) ) return true; - else if ( o->inherits( "QHideDock" ) ) + else if ( o->inherits( TQHIDEDOCK_OBJECT_NAME_STRING ) ) return true; return false; @@ -1469,23 +1469,23 @@ void WidgetFactory::initChangedProperties( TQObject *o ) if ( !o->inherits( "QDesignerToolBar" ) && !o->inherits( "QDesignerMenuBar" ) ) MetaDataBase::setPropertyChanged( o, "geometry", true ); - if ( o->inherits( "TQPushButton" ) || o->inherits("TQRadioButton") || o->inherits( "TQCheckBox" ) || o->inherits( "TQToolButton" ) ) + if ( o->inherits( TQPUSHBUTTON_OBJECT_NAME_STRING ) || o->inherits(TQRADIOBUTTON_OBJECT_NAME_STRING) || o->inherits( TQCHECKBOX_OBJECT_NAME_STRING ) || o->inherits( TQTOOLBUTTON_OBJECT_NAME_STRING ) ) MetaDataBase::setPropertyChanged( o, "text", true ); else if (::qt_cast<TQToolButton*>(o) && ::qt_cast<TQToolBox*>(widgetOfContainer((TQWidget*)o->parent()))) { MetaDataBase::setPropertyChanged( o, "usesTextLabel", TRUE ); MetaDataBase::setPropertyChanged( o, "textLabel", TRUE ); MetaDataBase::setPropertyChanged( o, "autoRaise", TRUE ); MetaDataBase::setPropertyChanged( o, "textPosition", TRUE ); - } else if ( o->inherits( "TQGroupBox" ) ) + } else if ( o->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) MetaDataBase::setPropertyChanged( o, "title", true ); - else if ( o->isA( "TQFrame" ) ) { + else if ( o->isA( TQFRAME_OBJECT_NAME_STRING ) ) { MetaDataBase::setPropertyChanged( o, "frameShadow", true ); MetaDataBase::setPropertyChanged( o, "frameShape", true ); - } else if ( o->inherits( "TQTabWidget" ) || o->inherits( "TQWizard" ) ) { + } else if ( o->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) || o->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) { MetaDataBase::setPropertyChanged( o, "pageTitle", true ); MetaDataBase::setPropertyChanged( o, "pageName", true ); #ifndef QT_NO_TABLE - } else if ( o->inherits( "TQTable" ) && !o->inherits( "TQDataTable" ) ) { + } else if ( o->inherits( TQTABLE_OBJECT_NAME_STRING ) && !o->inherits( TQDATATABLE_OBJECT_NAME_STRING ) ) { MetaDataBase::setPropertyChanged( o, "numRows", true ); MetaDataBase::setPropertyChanged( o, "numCols", true ); TQTable *t = (TQTable*)o; @@ -1501,7 +1501,7 @@ void WidgetFactory::initChangedProperties( TQObject *o ) MetaDataBase::setPropertyChanged( o, "itemIconSet", true ); MetaDataBase::setPropertyChanged( o, "itemToolTip", true ); MetaDataBase::setPropertyChanged( o, "itemBackgroundMode", true ); - } else if ( o->inherits( "TQSplitter" ) ) { + } else if ( o->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ) { MetaDataBase::setPropertyChanged( o, "orientation", true ); } else if ( o->inherits( "QDesignerToolBar" ) ) { MetaDataBase::setPropertyChanged( o, "label", true ); @@ -1528,7 +1528,7 @@ bool WidgetFactory::hasSpecialEditor( int id ) return true; if (className.mid(1) == "IconView") return true; - if (className == "TQTextEdit" || className == "TQMultiLineEdit") + if (className == TQTEXTEDIT_OBJECT_NAME_STRING || className == TQMULTILINEEDIT_OBJECT_NAME_STRING) return true; if (className.contains("Table")) return true; @@ -1557,7 +1557,7 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget, #ifdef KOMMANDER if (className == "ComboBox") { - if (!editWidget->inherits("TQComboBox")) + if (!editWidget->inherits(TQCOMBOBOX_OBJECT_NAME_STRING)) return; TQComboBox *cb = (TQComboBox *) editWidget; @@ -1579,7 +1579,7 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget, } if (className == "TreeWidget") { - if (!editWidget->inherits("TQListView")) + if (!editWidget->inherits(TQLISTVIEW_OBJECT_NAME_STRING)) return; TQListView *lv = (TQListView *) editWidget; ListViewEditor *e = new ListViewEditor(parent, lv, fw); @@ -1589,7 +1589,7 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget, } if (className == "ListBox") { - if (!editWidget->inherits("TQListBox")) + if (!editWidget->inherits(TQLISTBOX_OBJECT_NAME_STRING)) return; ListBoxEditor *e = new ListBoxEditor(parent, editWidget, fw); e->exec(); @@ -1599,7 +1599,7 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget, #endif if (className.mid(1) == "ListBox") { - if (!editWidget->inherits("TQListBox")) + if (!editWidget->inherits(TQLISTBOX_OBJECT_NAME_STRING)) return; ListBoxEditor *e = new ListBoxEditor(parent, editWidget, fw); e->exec(); @@ -1609,7 +1609,7 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget, if (className.mid(1) == "ComboBox") { - if (!editWidget->inherits("TQComboBox")) + if (!editWidget->inherits(TQCOMBOBOX_OBJECT_NAME_STRING)) return; TQComboBox *cb = (TQComboBox *) editWidget; ListBoxEditor *e = new ListBoxEditor(parent, cb->listBox(), fw); @@ -1621,7 +1621,7 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget, if (className.mid(1) == "ListView") { - if (!editWidget->inherits("TQListView")) + if (!editWidget->inherits(TQLISTVIEW_OBJECT_NAME_STRING)) return; TQListView *lv = (TQListView *) editWidget; ListViewEditor *e = new ListViewEditor(parent, lv, fw); @@ -1632,7 +1632,7 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget, if (className.mid(1) == "IconView") { - if (!editWidget->inherits("TQIconView")) + if (!editWidget->inherits(TQICONVIEW_OBJECT_NAME_STRING)) return; IconViewEditor *e = new IconViewEditor(parent, editWidget, fw); e->exec(); @@ -1640,7 +1640,7 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget, return; } - if (className == "TQMultiLineEdit" || className == "TQTextEdit") + if (className == TQMULTILINEEDIT_OBJECT_NAME_STRING || className == TQTEXTEDIT_OBJECT_NAME_STRING) { MultiLineEditor *e = new MultiLineEditor(parent, editWidget, fw); e->exec(); @@ -1751,7 +1751,7 @@ void QDesignerLabel::updateBuddy() if ( myBuddy.isEmpty() ) return; - TQObjectList *l = topLevelWidget()->queryList( "TQWidget", myBuddy, false, true ); + TQObjectList *l = topLevelWidget()->queryList( TQWIDGET_OBJECT_NAME_STRING, myBuddy, false, true ); if ( !l || !l->first() ) { delete l; return; @@ -1831,8 +1831,8 @@ void QLayoutWidget::updateSizePolicy() TQObjectListIt it( *children() ); TQObject *o; - if ( layout()->inherits("TQVBoxLayout") ) { - if ( parentLayout && parentLayout->inherits("TQHBoxLayout") ) + if ( layout()->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) ) { + if ( parentLayout && parentLayout->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) ) vt = TQSizePolicy::Minimum; else vt = TQSizePolicy::Fixed; @@ -1852,8 +1852,8 @@ void QLayoutWidget::updateSizePolicy() if ( w->sizePolicy().mayShrinkVertically() ) vt |= TQSizePolicy::Maximum; } - } else if ( layout()->inherits("TQHBoxLayout") ) { - if ( parentLayout && parentLayout->inherits("TQVBoxLayout") ) + } else if ( layout()->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) ) { + if ( parentLayout && parentLayout->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) ) ht = TQSizePolicy::Minimum; else ht = TQSizePolicy::Fixed; @@ -1873,13 +1873,13 @@ void QLayoutWidget::updateSizePolicy() if ( !w->sizePolicy().mayShrinkVertically() ) vt &= ~TQSizePolicy::Maximum; } - } else if ( layout()->inherits("TQGridLayout") ) { + } else if ( layout()->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) { ht = TQSizePolicy::Fixed; vt = TQSizePolicy::Fixed; if ( parentLayout ) { - if ( parentLayout->inherits("TQVBoxLayout") ) + if ( parentLayout->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) ) ht = TQSizePolicy::Minimum; - else if ( parentLayout->inherits("TQHBoxLayout") ) + else if ( parentLayout->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) ) vt = TQSizePolicy::Minimum; } diff --git a/kommander/editor/widgetfactory.h b/kommander/editor/widgetfactory.h index 44cb4f9d..74713544 100644 --- a/kommander/editor/widgetfactory.h +++ b/kommander/editor/widgetfactory.h @@ -370,13 +370,13 @@ public: : TQToolButton( parent, name ) {} bool isInButtonGroup() const { - return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ); + return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ); } int buttonGroupId() const { - return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; + return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; } void setButtonGroupId( int id ) { - if ( parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ) { + if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) { ( (TQButtonGroup*)parentWidget() )->remove( this ); ( (TQButtonGroup*)parentWidget() )->insert( this, id ); } @@ -393,13 +393,13 @@ public: : TQRadioButton( parent, name ) {} bool isInButtonGroup() const { - return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ); + return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ); } int buttonGroupId() const { - return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; + return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; } void setButtonGroupId( int id ) { - if ( parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ) { + if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) { ( (TQButtonGroup*)parentWidget() )->remove( this ); ( (TQButtonGroup*)parentWidget() )->insert( this, id ); } @@ -417,13 +417,13 @@ public: : TQPushButton( parent, name ) {} bool isInButtonGroup() const { - return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ); + return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ); } int buttonGroupId() const { - return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; + return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; } void setButtonGroupId( int id ) { - if ( parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ) { + if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) { ( (TQButtonGroup*)parentWidget() )->remove( this ); ( (TQButtonGroup*)parentWidget() )->insert( this, id ); } @@ -441,13 +441,13 @@ public: : TQCheckBox( parent, name ) {} bool isInButtonGroup() const { - return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ); + return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ); } int buttonGroupId() const { - return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; + return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; } void setButtonGroupId( int id ) { - if ( parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ) { + if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) { ( (TQButtonGroup*)parentWidget() )->remove( this ); ( (TQButtonGroup*)parentWidget() )->insert( this, id ); } diff --git a/kommander/executor/instance.cpp b/kommander/executor/instance.cpp index 7676f12d..a8ff3400 100644 --- a/kommander/executor/instance.cpp +++ b/kommander/executor/instance.cpp @@ -158,9 +158,9 @@ bool Instance::run() return false; // Handle both dialogs and main windows - if (m_instance->inherits("TQDialog")) + if (m_instance->inherits(TQDIALOG_OBJECT_NAME_STRING)) dynamic_cast<TQDialog*>((TQWidget*)m_instance)->exec(); - else if (m_instance->inherits("TQMainWindow")) + else if (m_instance->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) { kapp->setMainWidget(m_instance); dynamic_cast<TQMainWindow*>((TQWidget*)m_instance)->show(); @@ -234,14 +234,14 @@ bool Instance::isFileValid(const KURL& fname) const void Instance::setEnabled(const TQString& widgetName, bool enable) { TQObject* child = stringToWidget(widgetName); - if (child && child->inherits("TQWidget")) + if (child && child->inherits(TQWIDGET_OBJECT_NAME_STRING)) ((TQWidget*)child)->setEnabled(enable); } void Instance::setVisible(const TQString& widgetName, bool visible) { TQObject* child = stringToWidget(widgetName); - if (child && child->inherits("TQWidget")) + if (child && child->inherits(TQWIDGET_OBJECT_NAME_STRING)) ((TQWidget*)child)->setShown(visible); } @@ -250,7 +250,7 @@ void Instance::setText(const TQString& widgetName, const TQString& text) TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) kommanderWidget(child)->handleDCOP(DCOP::setText, text); - else if (child && child->inherits("TQLabel")) + else if (child && child->inherits(TQLABEL_OBJECT_NAME_STRING)) { TQLabel* label = (TQLabel*)child; if (label->pixmap()) @@ -269,7 +269,7 @@ TQString Instance::text(const TQString& widgetName) TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) return kommanderWidget(child)->handleDCOP(DCOP::text); - else if (child && child->inherits("TQLabel")) + else if (child && child->inherits(TQLABEL_OBJECT_NAME_STRING)) return ((TQLabel*)child)->text(); return TQString(); } @@ -279,7 +279,7 @@ void Instance::setSelection(const TQString& widgetName, const TQString& text) TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) kommanderWidget(child)->handleDCOP(DCOP::setSelection, text); - else if (child && child->inherits("TQLabel")) + else if (child && child->inherits(TQLABEL_OBJECT_NAME_STRING)) ((TQLabel*)child)->setText(text); } @@ -426,7 +426,7 @@ TQStringList Instance::associatedText(const TQString &widgetName) TQString Instance::type(const TQString& widget) { TQObject* child = stringToWidget(widget); - if (child && child->inherits("TQWidget")) + if (child && child->inherits(TQWIDGET_OBJECT_NAME_STRING)) return child->className(); return TQString(); } @@ -438,9 +438,9 @@ TQStringList Instance::children(const TQString& parent, bool recursive) TQObjectList* widgets; if (!child) child = m_instance; - if (child->inherits("TQWidget")) + if (child->inherits(TQWIDGET_OBJECT_NAME_STRING)) { - widgets = child->queryList("TQWidget", 0, false, recursive); + widgets = child->queryList(TQWIDGET_OBJECT_NAME_STRING, 0, false, recursive); for (TQObject* w = widgets->first(); w; w = widgets->next()) if (w->name() && kommanderWidget(w)) matching.append(w->name()); diff --git a/kommander/factory/kommanderfactory.cpp b/kommander/factory/kommanderfactory.cpp index 4b59f93b..ecfcb8cd 100644 --- a/kommander/factory/kommanderfactory.cpp +++ b/kommander/factory/kommanderfactory.cpp @@ -314,75 +314,75 @@ TQWidget *KommanderFactory::createWidget( const TQString &literalClassName, TQWi // create widgets we know if (className == TQPUSHBUTTON_OBJECT_NAME_STRING) return new TQPushButton(parent, name); - else if (className == "TQToolButton") + else if (className == TQTOOLBUTTON_OBJECT_NAME_STRING) return new TQToolButton(parent, name); - else if (className == "TQCheckBox") + else if (className == TQCHECKBOX_OBJECT_NAME_STRING) return new TQCheckBox(parent, name); - else if (className == "TQRadioButton") + else if (className == TQRADIOBUTTON_OBJECT_NAME_STRING) return new TQRadioButton(parent, name); - else if (className == "TQGroupBox") + else if (className == TQGROUPBOX_OBJECT_NAME_STRING) return new TQGroupBox(parent, name); - else if (className == "TQButtonGroup") + else if (className == TQBUTTONGROUP_OBJECT_NAME_STRING) return new TQButtonGroup(parent, name); - else if (className == "TQIconView") + else if (className == TQICONVIEW_OBJECT_NAME_STRING) { #if !defined(QT_NO_ICONVIEW) return new TQIconView(parent, name); #endif } - else if (className == "TQTable") + else if (className == TQTABLE_OBJECT_NAME_STRING) { #if !defined(QT_NO_TABLE) return new TQTable(parent, name); #endif } - else if (className == "TQListBox") + else if (className == TQLISTBOX_OBJECT_NAME_STRING) return new TQListBox(parent, name); - else if (className == "TQListView") + else if (className == TQLISTVIEW_OBJECT_NAME_STRING) return new TQListView(parent, name); - else if (className == "TQLineEdit") + else if (className == TQLINEEDIT_OBJECT_NAME_STRING) return new TQLineEdit(parent, name); - else if (className == "TQSpinBox") + else if (className == TQSPINBOX_OBJECT_NAME_STRING) return new TQSpinBox(parent, name); - else if (className == "TQMultiLineEdit") + else if (className == TQMULTILINEEDIT_OBJECT_NAME_STRING) return new TQMultiLineEdit(parent, name); - else if (className == "TQLabel") + else if (className == TQLABEL_OBJECT_NAME_STRING) return new TQLabel(parent, name); - else if (className == "QLayoutWidget") + else if (className == TQLAYOUTWIDGET_OBJECT_NAME_STRING) return new TQWidget(parent, name); - else if (className == "TQTabWidget") + else if (className == TQTABWIDGET_OBJECT_NAME_STRING) return new TQTabWidget(parent, name); - else if (className == "TQComboBox") + else if (className == TQCOMBOBOX_OBJECT_NAME_STRING) return new TQComboBox(false, parent, name); - else if (className == "TQWidget") + else if (className == TQWIDGET_OBJECT_NAME_STRING) { if (!qwf_stays_on_top) return new TQWidget(parent, name); return new TQWidget(parent, name, Qt::WStyle_StaysOnTop); } - else if (className == "TQDialog") + else if (className == TQDIALOG_OBJECT_NAME_STRING) { if (!qwf_stays_on_top) return new TQDialog(parent, name); return new TQDialog(parent, name, false, Qt::WStyle_StaysOnTop); } - else if (className == "TQWizard") + else if (className == TQWIZARD_OBJECT_NAME_STRING) return new TQWizard(parent, name); - else if (className == "TQLCDNumber") + else if (className == TQLCDNUMBER_OBJECT_NAME_STRING) return new TQLCDNumber(parent, name); - else if (className == "TQProgressBar") + else if (className == TQPROGRESSBAR_OBJECT_NAME_STRING) return new TQProgressBar(parent, name); - else if (className == "TQTextView") + else if (className == TQTEXTVIEW_OBJECT_NAME_STRING) return new TQTextView(parent, name); - else if (className == "TQTextBrowser") + else if (className == TQTEXTBROWSER_OBJECT_NAME_STRING) return new TQTextBrowser(parent, name); - else if (className == "TQDial") + else if (className == TQDIAL_OBJECT_NAME_STRING) return new TQDial(parent, name); - else if (className == "TQSlider") + else if (className == TQSLIDER_OBJECT_NAME_STRING) return new TQSlider(parent, name); - else if (className == "TQFrame") + else if (className == TQFRAME_OBJECT_NAME_STRING) return new TQFrame(parent, name); - else if (className == "TQSplitter") + else if (className == TQSPLITTER_OBJECT_NAME_STRING) return new TQSplitter(parent, name); else if (className == "Line") { @@ -390,21 +390,21 @@ TQWidget *KommanderFactory::createWidget( const TQString &literalClassName, TQWi f->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); return f; } - else if (className == "TQTextEdit") + else if (className == TQTEXTEDIT_OBJECT_NAME_STRING) return new TQTextEdit(parent, name); - else if (className == "QDateEdit") + else if (className == TQDATEEDIT_OBJECT_NAME_STRING) return new QDateEdit(parent, name); - else if (className == "QTimeEdit") + else if (className == TQTIMEEDIT_OBJECT_NAME_STRING) return new QTimeEdit(parent, name); - else if (className == "QDateTimeEdit") + else if (className == TQDATETIMEEDIT_OBJECT_NAME_STRING) return new QDateTimeEdit(parent, name); - else if (className == "TQScrollBar") + else if (className == TQSCROLLBAR_OBJECT_NAME_STRING) return new TQScrollBar(parent, name); - else if (className == "TQPopupMenu") + else if (className == TQPOPUPMENU_OBJECT_NAME_STRING) return new TQPopupMenu(parent, name); - else if (className == "TQWidgetStack") + else if (className == TQWIDGETSTACK_OBJECT_NAME_STRING) return new TQWidgetStack(parent, name); - else if (className == "TQMainWindow") + else if (className == TQMAINWINDOW_OBJECT_NAME_STRING) { TQMainWindow *mw = 0; if (!qwf_stays_on_top) @@ -417,11 +417,11 @@ TQWidget *KommanderFactory::createWidget( const TQString &literalClassName, TQWi return mw; } #if !defined(QT_NO_SQL) - else if (className == "TQDataTable") + else if (className == TQDATATABLE_OBJECT_NAME_STRING) return new TQDataTable(parent, name); - else if (className == "TQDataBrowser") + else if (className == TQDATABROWSER_OBJECT_NAME_STRING) return new QDesignerDataBrowser2(parent, name); - else if (className == "TQDataView") + else if (className == TQDATAVIEW_OBJECT_NAME_STRING) return new QDesignerDataView2(parent, name); #endif @@ -512,9 +512,9 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge if ( colspan < 1 ) colspan = 1; if ( !className.isEmpty() ) { - if ( !layout && className == "QLayoutWidget" ) - className = "TQWidget"; - if ( layout && className == "QLayoutWidget" ) { + if ( !layout && className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) + className = TQWIDGET_OBJECT_NAME_STRING; + if ( layout && className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) { // hide layout widgets w = parent; } else { @@ -526,7 +526,7 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge w = (TQWidget*)obj; if ( !toplevel ) toplevel = w; - if ( w->inherits( "TQMainWindow" ) ) + if ( w->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) w = ( (TQMainWindow*)w )->centralWidget(); if ( layout ) { switch( layoutType( layout ) ) { @@ -556,39 +556,39 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge createSpacer( n, layout ); } else if ( n.tagName() == "widget" ) { TQMap< TQString, TQString> *oldDbControls = dbControls; - createWidgetInternal( n, w, layout, n.attribute( "class", "TQWidget" ) ); + createWidgetInternal( n, w, layout, n.attribute( "class", TQWIDGET_OBJECT_NAME_STRING ) ); dbControls = oldDbControls; } else if ( n.tagName() == "hbox" ) { TQLayout *parentLayout = layout; - if ( layout && layout->inherits( "TQGridLayout" ) ) + if ( layout && layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) layout = createLayout( 0, 0, KommanderFactory::HBox ); else layout = createLayout( w, layout, KommanderFactory::HBox ); obj = layout; n = n.firstChild().toElement(); - if ( parentLayout && parentLayout->inherits( "TQGridLayout" ) ) + if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) ( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row, row + rowspan - 1, col, col + colspan - 1 ); continue; } else if ( n.tagName() == "grid" ) { TQLayout *parentLayout = layout; - if ( layout && layout->inherits( "TQGridLayout" ) ) + if ( layout && layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) layout = createLayout( 0, 0, KommanderFactory::Grid ); else layout = createLayout( w, layout, KommanderFactory::Grid ); obj = layout; n = n.firstChild().toElement(); - if ( parentLayout && parentLayout->inherits( "TQGridLayout" ) ) + if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) ( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row, row + rowspan - 1, col, col + colspan - 1 ); continue; } else if ( n.tagName() == "vbox" ) { TQLayout *parentLayout = layout; - if ( layout && layout->inherits( "TQGridLayout" ) ) + if ( layout && layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) layout = createLayout( 0, 0, KommanderFactory::VBox ); else layout = createLayout( w, layout, KommanderFactory::VBox ); obj = layout; n = n.firstChild().toElement(); - if ( parentLayout && parentLayout->inherits( "TQGridLayout" ) ) + if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) ( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row, row + rowspan - 1, col, col + colspan - 1 ); continue; } else if ( n.tagName() == "property" && obj ) { @@ -596,14 +596,14 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge } else if ( n.tagName() == "attribute" && w ) { TQString attrib = n.attribute( "name" ); TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() ); - if ( parent->inherits( "TQTabWidget" ) ) { + if ( parent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) { if ( attrib == "title" ) ( (TQTabWidget*)parent )->insertTab( w, translate(v.toString()) ); } else - if ( parent->inherits( "TQToolBox" ) ) { + if ( parent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) { if ( attrib == "label" ) ( (TQToolBox*)parent )->addItem( w, translate(v.toString()) ); - }else if ( parent->inherits( "TQWizard" ) ) { + }else if ( parent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) { if ( attrib == "title" ) ( (TQWizard*)parent )->addPage( w, translate(v.toString()) ); } @@ -624,18 +624,18 @@ TQLayout *KommanderFactory::createLayout( TQWidget *widget, TQLayout* layout, L int spacing = defSpacing; int margin = defMargin; - if ( !layout && widget && widget->inherits( "TQTabWidget" ) ) + if ( !layout && widget && widget->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) widget = ((TQTabWidget*)widget)->currentPage(); - if ( !layout && widget && widget->inherits( "TQToolBox" ) ) + if ( !layout && widget && widget->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) widget = ((TQToolBox*)widget)->currentItem(); - if ( !layout && widget && widget->inherits( "TQWizard" ) ) + if ( !layout && widget && widget->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) widget = ((TQWizard*)widget)->currentPage(); - if ( !layout && widget && widget->inherits( "TQWidgetStack" ) ) + if ( !layout && widget && widget->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) widget = ((TQWidgetStack*)widget)->visibleWidget(); - if ( !layout && widget && widget->inherits( "TQGroupBox" ) ) { + if ( !layout && widget && widget->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) { TQGroupBox *gb = (TQGroupBox*)widget; gb->setColumnLayout( 0, Qt::Vertical ); gb->layout()->setMargin( 0 ); @@ -714,11 +714,11 @@ TQLayout *KommanderFactory::createLayout( TQWidget *widget, TQLayout* layout, L KommanderFactory::LayoutType KommanderFactory::layoutType( TQLayout *layout ) const { - if ( layout->inherits( "TQHBoxLayout" ) ) + if ( layout->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) ) return HBox; - else if ( layout->inherits( "TQVBoxLayout" ) ) + else if ( layout->inherits( TQVBOXLAYOUT_OBJECT_NAME_STRING ) ) return VBox; - else if ( layout->inherits( "TQGridLayout" ) ) + else if ( layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) return Grid; return NoLayout; } @@ -764,8 +764,8 @@ void KommanderFactory::setProperty( TQObject* obj, const TQString &prop, const T TQWhatsThis::add( (TQWidget*)obj, translate(v.toString()) ); } #ifndef QT_NO_SQL - if ( prop == "database" && !obj->inherits( "TQDataView" ) - && !obj->inherits( "TQDataBrowser" ) ) { + if ( prop == "database" && !obj->inherits( TQDATAVIEW_OBJECT_NAME_STRING ) + && !obj->inherits( TQDATABROWSER_OBJECT_NAME_STRING ) ) { TQStringList lst = DomTool::elementToVariant( e, TQVariant( TQStringList() ) ).toStringList(); if ( lst.count() > 2 ) { if ( dbControls ) @@ -775,7 +775,7 @@ void KommanderFactory::setProperty( TQObject* obj, const TQString &prop, const T } } else if ( prop == "database" ) { TQStringList lst = DomTool::elementToVariant( e, TQVariant( TQStringList() ) ).toStringList(); - if ( lst.count() == 2 && obj->inherits( "TQWidget" ) ) { + if ( lst.count() == 2 && obj->inherits( TQWIDGET_OBJECT_NAME_STRING ) ) { SqlWidgetConnection conn( lst[ 0 ], lst[ 1 ] ); sqlWidgetConnections.insert( (TQWidget*)obj, conn ); dbControls = conn.dbControls; @@ -789,7 +789,7 @@ void KommanderFactory::setProperty( TQObject* obj, const TQString &prop, const T noDatabaseWidgets << obj->name(); } } else if ( prop == "buttonGroupId" ) { - if ( obj->inherits( "TQButton" ) && obj->parent()->inherits( "TQButtonGroup" ) ) + if ( obj->inherits( TQBUTTON_OBJECT_NAME_STRING ) && obj->parent()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) ( (TQButtonGroup*)obj->parent() )->insert( (TQButton*)obj, v.toInt() ); } @@ -884,7 +884,7 @@ void KommanderFactory::createSpacer( const TQDomElement &e, TQLayout *layout ) TQSpacerItem *item = new TQSpacerItem( w, h, orient == Qt::Horizontal ? sizeType : TQSizePolicy::Minimum, orient == Qt::Vertical ? sizeType : TQSizePolicy::Minimum ); if ( layout ) { - if ( layout->inherits( "TQBoxLayout" ) ) + if ( layout->inherits( TQBOXLAYOUT_OBJECT_NAME_STRING ) ) ( (TQBoxLayout*)layout )->addItem( item ); else ( (TQGridLayout*)layout )->addMultiCell( item, row, row + rowspan - 1, col, col + colspan - 1, @@ -1148,7 +1148,7 @@ void KommanderFactory::loadTabOrder( const TQDomElement &e ) void KommanderFactory::createColumn( const TQDomElement &e, TQWidget *widget ) { - if ( widget->inherits( "TQListView" ) && e.tagName() == "column" ) { + if ( widget->inherits( TQLISTVIEW_OBJECT_NAME_STRING ) && e.tagName() == "column" ) { TQListView *lv = (TQListView*)widget; TQDomElement n = e.firstChild().toElement(); TQPixmap pix; @@ -1182,10 +1182,10 @@ void KommanderFactory::createColumn( const TQDomElement &e, TQWidget *widget ) lv->header()->setResizeEnabled( resizeable, i ); } #ifndef QT_NO_TABLE - else if ( widget->inherits( "TQTable" ) ) { + else if ( widget->inherits( TQTABLE_OBJECT_NAME_STRING ) ) { TQTable *table = (TQTable*)widget; #ifndef QT_NO_SQL - bool isSql = (widget->inherits( "TQDataTable" )); + bool isSql = (widget->inherits( TQDATATABLE_OBJECT_NAME_STRING )); #endif bool isRow; if ( ( isRow = e.tagName() == "row" ) ) @@ -1270,14 +1270,14 @@ void KommanderFactory::loadItem( const TQDomElement &e, TQPixmap &pix, TQString void KommanderFactory::createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i ) { - if ( widget->inherits( "TQListBox" ) || widget->inherits( "TQComboBox" ) ) { + if ( widget->inherits( TQLISTBOX_OBJECT_NAME_STRING ) || widget->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) { TQDomElement n = e.firstChild().toElement(); TQPixmap pix; bool hasPixmap = false; TQString txt; loadItem( n, pix, txt, hasPixmap ); TQListBox *lb = 0; - if ( widget->inherits( "TQListBox" ) ) + if ( widget->inherits( TQLISTBOX_OBJECT_NAME_STRING ) ) lb = (TQListBox*)widget; else lb = ( (TQComboBox*)widget)->listBox(); @@ -1287,7 +1287,7 @@ void KommanderFactory::createItem( const TQDomElement &e, TQWidget *widget, TQLi new TQListBoxText( lb, txt ); } #ifndef QT_NO_ICONVIEW - } else if ( widget->inherits( "TQIconView" ) ) { + } else if ( widget->inherits( TQICONVIEW_OBJECT_NAME_STRING ) ) { TQDomElement n = e.firstChild().toElement(); TQPixmap pix; bool hasPixmap = false; @@ -1297,7 +1297,7 @@ void KommanderFactory::createItem( const TQDomElement &e, TQWidget *widget, TQLi TQIconView *iv = (TQIconView*)widget; new TQIconViewItem( iv, txt, pix ); #endif - } else if ( widget->inherits( "TQListView" ) ) { + } else if ( widget->inherits( TQLISTVIEW_OBJECT_NAME_STRING ) ) { TQDomElement n = e.firstChild().toElement(); TQPixmap pix; TQValueList<TQPixmap> pixmaps; @@ -1358,7 +1358,7 @@ void KommanderFactory::loadChildAction( TQObject *parent, const TQDomElement &e } n2 = n2.nextSibling().toElement(); } - if ( !parent->inherits( "TQAction" ) ) + if ( !parent->inherits( TQACTION_OBJECT_NAME_STRING ) ) actionList.append( a ); } else if ( n.tagName() == "actiongroup" ) { a = new TQActionGroup( parent ); @@ -1375,7 +1375,7 @@ void KommanderFactory::loadChildAction( TQObject *parent, const TQDomElement &e } n2 = n2.nextSibling().toElement(); } - if ( !parent->inherits( "TQAction" ) ) + if ( !parent->inherits( TQACTION_OBJECT_NAME_STRING ) ) actionList.append( a ); } if ( a ) @@ -1415,7 +1415,7 @@ void KommanderFactory::loadToolBars( const TQDomElement &e ) } else if ( n2.tagName() == "separator" ) { tb->addSeparator(); } else if ( n2.tagName() == "widget" ) { - (void)createWidgetInternal( n2, tb, 0, n2.attribute( "class", "TQWidget" ) ); + (void)createWidgetInternal( n2, tb, 0, n2.attribute( "class", TQWIDGET_OBJECT_NAME_STRING ) ); } else if ( n2.tagName() == "property" ) { setProperty( tb, n2.attribute( "name" ), n2.firstChild().toElement() ); } @@ -1460,7 +1460,7 @@ TQAction *KommanderFactory::findAction( const TQString &name ) for ( TQAction *a = actionList.first(); a; a = actionList.next() ) { if ( TQString( a->name() ) == name ) return a; - TQAction *ac = (TQAction*)a->child( name.latin1(), "TQAction" ); + TQAction *ac = (TQAction*)a->child( name.latin1(), TQACTION_OBJECT_NAME_STRING ); if ( ac ) return ac; } diff --git a/kommander/widget/kommanderwidget.cpp b/kommander/widget/kommanderwidget.cpp index 4cfbba8c..8f880c40 100644 --- a/kommander/widget/kommanderwidget.cpp +++ b/kommander/widget/kommanderwidget.cpp @@ -413,12 +413,12 @@ void KommanderWidget::printError(const TQString& a_error) const case KDialogBase::Yes: break; case KDialogBase::Cancel: - if (parentDialog()->inherits("TQDialog")) + if (parentDialog()->inherits(TQDIALOG_OBJECT_NAME_STRING)) { parentDialog()->close(); exit(-1); } - else if (parentDialog()->inherits("TQMainWindow")) + else if (parentDialog()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) kapp->quit(); } } @@ -655,7 +655,7 @@ TQWidget* KommanderWidget::parentDialog() const while (superParent->parent()) { superParent = superParent->parent(); - if (superParent->inherits("TQDialog") || superParent->inherits("TQMainWindow")) + if (superParent->inherits(TQDIALOG_OBJECT_NAME_STRING) || superParent->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) break; } return (TQWidget*)superParent; @@ -695,7 +695,7 @@ TQString KommanderWidget::handleDCOP(const int function, const TQStringList& arg case DCOP::children: { TQStringList matching; - TQObjectList* widgets = current->queryList("TQWidget", 0, false, args.count() == 0 || args[0] != "false"); + TQObjectList* widgets = current->queryList(TQWIDGET_OBJECT_NAME_STRING, 0, false, args.count() == 0 || args[0] != "false"); for (TQObject* w = widgets->first(); w; w = widgets->next()) if (w->name() && (dynamic_cast<KommanderWidget*>(w))) matching.append(w->name()); diff --git a/kommander/widgets/closebutton.cpp b/kommander/widgets/closebutton.cpp index d30a9346..9a9aa4f8 100644 --- a/kommander/widgets/closebutton.cpp +++ b/kommander/widgets/closebutton.cpp @@ -45,7 +45,7 @@ CloseButton::CloseButton(TQWidget* a_parent, const char* a_name) while (parent->parent() != 0) { parent = parent->parent(); - if (parent->inherits("TQDialog")) + if (parent->inherits(TQDIALOG_OBJECT_NAME_STRING)) break; } connect(this, TQT_SIGNAL(clicked()), parent, TQT_SLOT(reject())); diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp b/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp index 89417231..32a5eaf0 100644 --- a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp +++ b/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp @@ -1680,7 +1680,7 @@ void KDockManager::activate() obj->show(); } } - if ( !main->inherits("TQDialog") ) main->show(); + if ( !main->inherits(TQDIALOG_OBJECT_NAME_STRING) ) main->show(); } bool KDockManager::eventFilter( TQObject *obj, TQEvent *event ) @@ -3044,7 +3044,7 @@ void KDockArea::resizeEvent(TQResizeEvent *rsize) #ifndef NO_KDE2 // kdDebug(282)<<"KDockArea::resize"<<endl; #endif - TQObjectList *list=queryList("TQWidget",0,false); + TQObjectList *list=queryList(TQWIDGET_OBJECT_NAME_STRING,0,false); TQObjectListIt it( *list ); // iterate over the buttons TQObject *obj; diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp b/lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp index 5db71969..49378c18 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp @@ -752,7 +752,7 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize ) // memorize the focuses in a dictionary because they will get lost during reparenting TQDict<FocusPolicy>* pFocPolDict = new TQDict<FocusPolicy>; pFocPolDict->setAutoDelete( true ); - TQObjectList *list = m_pClient->queryList( "TQWidget" ); + TQObjectList *list = m_pClient->queryList( TQWIDGET_OBJECT_NAME_STRING ); TQObjectListIt it( *list ); // iterate over the buttons TQObject * obj; int i = 1; @@ -833,7 +833,7 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset ) m_pClient->setMaximumSize( maxs.width(), maxs.height() ); // remember the focus policies using the dictionary and reset them - TQObjectList *list = m_pClient->queryList( "TQWidget" ); + TQObjectList *list = m_pClient->queryList( TQWIDGET_OBJECT_NAME_STRING ); TQObjectListIt it( *list ); // iterate over all child widgets of child frame TQObject * obj; TQWidget* firstFocusableChildWidget = 0; @@ -887,7 +887,7 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset ) void KMdiChildFrm::linkChildren( TQDict<FocusPolicy>* pFocPolDict ) { // reset the focus policies for all widgets in the view (take them from the dictionary) - TQObjectList* list = m_pClient->queryList( "TQWidget" ); + TQObjectList* list = m_pClient->queryList( TQWIDGET_OBJECT_NAME_STRING ); TQObjectListIt it( *list ); // iterate over all child widgets of child frame TQObject* obj; while ( ( obj = it.current() ) != 0 ) @@ -899,7 +899,7 @@ void KMdiChildFrm::linkChildren( TQDict<FocusPolicy>* pFocPolDict ) if ( pFocPol != 0 ) widg->setFocusPolicy( *pFocPol ); - if ( !( widg->inherits( "TQPopupMenu" ) ) ) + if ( !( widg->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) ) ) widg->installEventFilter( this ); } @@ -936,7 +936,7 @@ TQDict<TQWidget::FocusPolicy>* KMdiChildFrm::unlinkChildren() TQDict<FocusPolicy>* pFocPolDict = new TQDict<FocusPolicy>; pFocPolDict->setAutoDelete( true ); - TQObjectList *list = m_pClient->queryList( "TQWidget" ); + TQObjectList *list = m_pClient->queryList( TQWIDGET_OBJECT_NAME_STRING ); TQObjectListIt it( *list ); // iterate over all child widgets of child frame TQObject * obj; int i = 1; @@ -1155,7 +1155,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e ) // if we lost a child we uninstall ourself as event filter for the lost // child and its children TQObject* pLostChild = ( ( TQChildEvent* ) e )->child(); - if ( ( pLostChild != 0L ) /*&& (pLostChild->inherits("TQWidget"))*/ ) + if ( ( pLostChild != 0L ) /*&& (pLostChild->inherits(TQWIDGET_OBJECT_NAME_STRING))*/ ) { TQObjectList* list = pLostChild->queryList(); list->insert( 0, pLostChild ); // add the lost child to the list too, just to save code @@ -1180,7 +1180,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e ) if ( ( pNewChild != 0L ) && ::qt_cast<TQWidget*>( pNewChild ) ) { TQWidget * pNewWidget = static_cast<TQWidget*>( pNewChild ); - TQObjectList *list = pNewWidget->queryList( "TQWidget" ); + TQObjectList *list = pNewWidget->queryList( TQWIDGET_OBJECT_NAME_STRING ); list->insert( 0, pNewChild ); // add the new child to the list too, just to save code TQObjectListIt it( *list ); // iterate over all new child widgets TQObject * obj; diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildview.cpp b/lib/compatibility/kmdi/qextmdi/kmdichildview.cpp index 8fe116e1..57c0bea4 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildview.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdichildview.cpp @@ -495,7 +495,7 @@ void KMdiChildView::slot_childDestroyed() const TQObject * pLostChild = TQObject::sender(); if ( pLostChild && ( pLostChild->isWidgetType() ) ) { - TQObjectList* list = ( ( TQObject* ) ( pLostChild ) ) ->queryList( "TQWidget" ); + TQObjectList* list = ( ( TQObject* ) ( pLostChild ) ) ->queryList( TQWIDGET_OBJECT_NAME_STRING ); list->insert( 0, pLostChild ); // add the lost child to the list too, just to save code TQObjectListIt it( *list ); // iterate over all lost child widgets TQObject* obj; @@ -544,7 +544,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e ) { if ( obj->isWidgetType() ) { - TQObjectList * list = queryList( "TQWidget" ); + TQObjectList * list = queryList( TQWIDGET_OBJECT_NAME_STRING ); if ( list->find( obj ) != -1 ) m_focusedChildWidget = ( TQWidget* ) obj; @@ -568,7 +568,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e ) TQObject * pLostChild = ( ( TQChildEvent* ) e ) ->child(); if ( ( pLostChild != 0L ) && ( pLostChild->isWidgetType() ) ) { - TQObjectList * list = pLostChild->queryList( "TQWidget" ); + TQObjectList * list = pLostChild->queryList( TQWIDGET_OBJECT_NAME_STRING ); list->insert( 0, pLostChild ); // add the lost child to the list too, just to save code TQObjectListIt it( *list ); // iterate over all lost child widgets TQObject * o; @@ -601,7 +601,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e ) TQWidget * pNewWidget = ( TQWidget* ) pNewChild; if ( pNewWidget->testWFlags( Qt::WType_Dialog | Qt::WShowModal ) ) return false; - TQObjectList *list = pNewWidget->queryList( "TQWidget" ); + TQObjectList *list = pNewWidget->queryList( TQWIDGET_OBJECT_NAME_STRING ); list->insert( 0, pNewChild ); // add the new child to the list too, just to save code TQObjectListIt it( *list ); // iterate over all new child widgets TQObject * o; @@ -646,7 +646,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e ) /** Switches interposing in event loop of all current child widgets off. */ void KMdiChildView::removeEventFilterForAllChildren() { - TQObjectList* list = queryList( "TQWidget" ); + TQObjectList* list = queryList( TQWIDGET_OBJECT_NAME_STRING ); TQObjectListIt it( *list ); // iterate over all child widgets TQObject* obj; while ( ( obj = it.current() ) != 0 ) diff --git a/lib/compatibility/kmdi/qextmdi/kmdifocuslist.cpp b/lib/compatibility/kmdi/qextmdi/kmdifocuslist.cpp index 471b9895..2e9b7700 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdifocuslist.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdifocuslist.cpp @@ -34,7 +34,7 @@ void KMdiFocusList::addWidgetTree( TQWidget* w ) w->setFocusPolicy( TQWidget::ClickFocus ); kdDebug( 760 ) << "KMdiFocusList::addWidgetTree: adding toplevel" << endl; connect( w, TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( objectHasBeenDestroyed( TQObject* ) ) ); - TQObjectList *l = w->queryList( "TQWidget" ); + TQObjectList *l = w->queryList( TQWIDGET_OBJECT_NAME_STRING ); TQObjectListIt it( *l ); TQObject *obj; while ( ( obj = it.current() ) != 0 ) diff --git a/quanta/components/csseditor/cssselector.cpp b/quanta/components/csseditor/cssselector.cpp index 73460c05..458c8d13 100644 --- a/quanta/components/csseditor/cssselector.cpp +++ b/quanta/components/csseditor/cssselector.cpp @@ -209,7 +209,7 @@ void CSSSelector::openCSSEditor(TQListViewItem * i){ TQListView *lv = i->listView(); TQListViewItem *temp; TQString s; - TQObjectList *l = queryList( "TQListView" ); + TQObjectList *l = queryList( TQLISTVIEW_OBJECT_NAME_STRING ); TQObjectListIt it( *l ); // iterate over the listviews TQObject *obj; @@ -291,7 +291,7 @@ void CSSSelector::openCSSEditor(TQListViewItem * i){ } void CSSSelector::setCurrentListView(TQWidget* w){ - TQObjectList *l = w->queryList( "TQListView" ); + TQObjectList *l = w->queryList( TQLISTVIEW_OBJECT_NAME_STRING ); m_currentListView = static_cast<TQListView*>(l->first()); } diff --git a/quanta/components/framewizard/visualframeeditor.cpp b/quanta/components/framewizard/visualframeeditor.cpp index ec0d9686..a11dae84 100644 --- a/quanta/components/framewizard/visualframeeditor.cpp +++ b/quanta/components/framewizard/visualframeeditor.cpp @@ -231,7 +231,7 @@ void VisualFrameEditor::paintEvent ( TQPaintEvent * ){ delete m_firstInsertedSA; m_firstInsertedSA = 0L; - TQObjectList* splitterList = queryList("TQSplitter"); + TQObjectList* splitterList = queryList(TQSPLITTER_OBJECT_NAME_STRING); for (uint i = 0; i < splitterList->count(); i++) { TQObject* o = splitterList->at(i); removeChild(o); //this will delete all childr of "o" @@ -301,7 +301,7 @@ void VisualFrameEditor::drawGUI(treeNode *n, TQWidget* parent){ } else { SelectableArea *sa=new SelectableArea(parent,n->label().ascii()); - if(parent->isA("TQSplitter")) dynamic_cast<TQSplitter *>(parent)->setResizeMode(sa->view(),TQSplitter::KeepSize ); + if(parent->isA(TQSPLITTER_OBJECT_NAME_STRING)) dynamic_cast<TQSplitter *>(parent)->setResizeMode(sa->view(),TQSplitter::KeepSize ); else if(!m_firstInsertedSA) m_firstInsertedSA = sa; sa->view()->setGeometry(n->atts()->geometry()); diff --git a/quanta/components/tableeditor/tableitem.cpp b/quanta/components/tableeditor/tableitem.cpp index 6d3da1ac..60625d95 100644 --- a/quanta/components/tableeditor/tableitem.cpp +++ b/quanta/components/tableeditor/tableitem.cpp @@ -54,7 +54,7 @@ TQWidget* TableItem::createEditor() const void TableItem::setContentFromEditor(TQWidget *w) { - if (w->inherits( "TQTextEdit" )) + if (w->inherits( TQTEXTEDIT_OBJECT_NAME_STRING )) setText(((TQTextEdit*)w)->text()); else TQTableItem::setContentFromEditor(w); |