diff options
| author | ormorph <roma251078@mail.ru> | 2020-08-27 19:48:01 +0300 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2020-08-28 20:54:25 +0900 |
| commit | 155659674046c19b610d38cd2963628798add11d (patch) | |
| tree | 9dbb4b553d33996ffc562ac8ab33533e7901087d | |
| parent | f3edeac1f13d71e8e12bdc713f1b8c7ad936b548 (diff) | |
| download | tdewebdev-155659674046c19b610d38cd2963628798add11d.tar.gz tdewebdev-155659674046c19b610d38cd2963628798add11d.zip | |
Rename *OBJECT_NAME_STRING
Signed-off-by: ormorph <roma251078@mail.ru>
(cherry picked from commit ae3ed3d32920f5780af51aad9683b82179e9655d)
73 files changed, 789 insertions, 789 deletions
diff --git a/kommander/editor/actiondnd.cpp b/kommander/editor/actiondnd.cpp index d07bfebf..48f8a427 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_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQPopupMenu" ) ) 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_OBJECT_NAME_STRING ) ) { + if ( w->inherits( "TQToolBar" ) ) { TQToolBar *tb = (TQToolBar*)w; wid = new QDesignerToolBarSeparator( tb->orientation(), tb ); return true; - } else if ( w->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) ) { + } else if ( w->inherits( "TQPopupMenu" ) ) { 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_OBJECT_NAME_STRING ) ) { + if ( w->inherits( "TQToolBar" ) ) { delete wid; return true; - } else if ( w->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) ) { + } else if ( w->inherits( "TQPopupMenu" ) ) { ( (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_OBJECT_NAME_STRING ) ) { + if ( a->inherits( "TQActionGroup" ) ) { ( (QDesignerActionGroup*)a )->widget()->installEventFilter( this ); actionMap.insert( ( (QDesignerActionGroup*)a )->widget(), a ); } else if ( a->inherits( "QSeparatorAction" ) ) { @@ -222,7 +222,7 @@ static void fixObject( TQObject *&o ) bool QDesignerToolBar::eventFilter( TQObject *o, TQEvent *e ) { - if ( !o || !e || o->inherits( TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING ) || o->inherits( "TQDockWindowTitleBar" ) ) + if ( !o || !e || o->inherits( "TQDockWindowHandle" ) || o->inherits( "TQDockWindowTitleBar" ) ) return TQToolBar::eventFilter( o, e ); if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) && e->type() == TQEvent::MouseButtonPress && @@ -450,7 +450,7 @@ void QDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o ) TQApplication::sendPostedEvents(); adjustSize(); - TQString type = a->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? TQString( "application/x-designer-actiongroup" ) : + TQString type = a->inherits( "TQActionGroup" ) ? 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_OBJECT_NAME_STRING ) ) { + if ( a->inherits( "TQActionGroup" ) ) { actionMap.insert( ( (QDesignerActionGroup*)a )->widget(), a ); if ( ( (QDesignerActionGroup*)a )->widget() ) ( (QDesignerActionGroup*)a )->widget()->installEventFilter( this ); @@ -691,7 +691,7 @@ void QDesignerToolBar::installEventFilters( TQWidget *w ) { if ( !w ) return; - TQObjectList *l = w->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *l = w->queryList( "TQWidget" ); for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( this ); delete l; @@ -1074,7 +1074,7 @@ void QDesignerPopupMenu::mouseMoveEvent( TQMouseEvent *e ) formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); - TQString type = a->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? TQString( "application/x-designer-actiongroup" ) : + TQString type = a->inherits( "TQActionGroup" ) ? 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 b71d2c2c..eeb255a2 100644 --- a/kommander/editor/actiondnd.h +++ b/kommander/editor/actiondnd.h @@ -41,7 +41,7 @@ class QDesignerActionGroup : public TQActionGroup public: QDesignerActionGroup( TQObject *parent ) - : TQActionGroup( !parent || parent->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? parent : 0 ), wid( 0 ), idx( -1 ) {} + : TQActionGroup( !parent || parent->inherits( "TQActionGroup" ) ? parent : 0 ), wid( 0 ), idx( -1 ) {} TQWidget *widget() const { return wid; } TQWidget *widget( TQAction *a ) const { return *widgets.find( a ); } @@ -72,9 +72,9 @@ class QDesignerAction : public TQAction public: QDesignerAction( TQObject *parent ) - : TQAction( !parent || parent->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( 0 ) {} + : TQAction( !parent || parent->inherits( "TQActionGroup" ) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( 0 ) {} QDesignerAction( TQWidget *w, TQObject *parent ) - : TQAction( !parent || parent->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( w ) {} + : TQAction( !parent || parent->inherits( "TQActionGroup" ) ? 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 8dea07ad..22f30088 100644 --- a/kommander/editor/actioneditorimpl.cpp +++ b/kommander/editor/actioneditorimpl.cpp @@ -117,7 +117,7 @@ void ActionEditor::newAction() ActionItem *actionParent = (ActionItem*)listActions->selectedItem(); if ( actionParent ) { if ( !actionParent->actionGroup() || - !actionParent->actionGroup()->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ) + !actionParent->actionGroup()->inherits( "TQActionGroup" ) ) actionParent = (ActionItem*)actionParent->parent(); } @@ -149,7 +149,7 @@ void ActionEditor::newActionGroup() ActionItem *actionParent = (ActionItem*)listActions->selectedItem(); if ( actionParent ) { if ( !actionParent->actionGroup() || - !actionParent->actionGroup()->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ) + !actionParent->actionGroup()->inherits( "TQActionGroup" ) ) actionParent = (ActionItem*)actionParent->parent(); } @@ -186,18 +186,18 @@ void ActionEditor::setFormWindow( FormWindow *fw ) formWindow = fw; if ( !formWindow || !formWindow->mainContainer() || - !formWindow->mainContainer()->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) { + !formWindow->mainContainer()->inherits( "TQMainWindow" ) ) { 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_OBJECT_NAME_STRING ) ) + if ( a->parent() && a->parent()->inherits( "TQAction" ) ) continue; i = new ActionItem( listActions, a ); i->setText( 0, a->name() ); i->setPixmap( 0, a->iconSet().pixmap() ); - if ( a->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ) { + if ( a->inherits( "TQActionGroup" ) ) { insertChildActions( i ); } } @@ -219,14 +219,14 @@ void ActionEditor::insertChildActions( ActionItem *i ) while ( it.current() ) { TQObject *o = it.current(); ++it; - if ( !o->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !o->inherits( "TQAction" ) ) 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_OBJECT_NAME_STRING ) ) + if ( a->inherits( "TQActionGroup" ) ) insertChildActions( i2 ); } } diff --git a/kommander/editor/actionlistview.cpp b/kommander/editor/actionlistview.cpp index 80d4d94c..78b883b0 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_OBJECT_NAME_STRING ) ) + if ( ac->inherits( "TQActionGroup" ) ) 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_OBJECT_NAME_STRING ) ) + if ( ac->inherits( "TQActionGroup" ) ) g = (QDesignerActionGroup*)ac; else a = (QDesignerAction*)ac; diff --git a/kommander/editor/command.cpp b/kommander/editor/command.cpp index 63343b35..757a6197 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_OBJECT_NAME_STRING ) && + if ( propName == "name" && widget->inherits( "TQAction" ) && formWindow()->mainContainer() && - formWindow()->mainContainer()->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) { + formWindow()->mainContainer()->inherits( "TQMainWindow" ) ) { formWindow()->mainWindow()->actioneditor()->updateActionName( (TQAction*)widget ); } - if ( propName == "iconSet" && widget->inherits( TQACTION_OBJECT_NAME_STRING ) && + if ( propName == "iconSet" && widget->inherits( "TQAction" ) && formWindow()->mainContainer() && - formWindow()->mainContainer()->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) { + formWindow()->mainContainer()->inherits( "TQMainWindow" ) ) { formWindow()->mainWindow()->actioneditor()->updateActionIcon( (TQAction*)widget ); } if ( propName == "caption" ) { @@ -751,9 +751,9 @@ BreakLayoutCommand::BreakLayoutCommand( const TQString &n, FormWindow *fw, margin = MetaDataBase::margin( TQT_TQOBJECT(layoutBase) ); layout = 0; if ( lay == WidgetFactory::HBox ) - layout = new HorizontalLayout( wl, layoutBase, fw, layoutBase, false, layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ); + layout = new HorizontalLayout( wl, layoutBase, fw, layoutBase, false, layoutBase->inherits( "TQSplitter" ) ); else if ( lay == WidgetFactory::VBox ) - layout = new VerticalLayout( wl, layoutBase, fw, layoutBase, false, layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ); + layout = new VerticalLayout( wl, layoutBase, fw, layoutBase, false, layoutBase->inherits( "TQSplitter" ) ); else if ( lay == WidgetFactory::Grid ) layout = new GridLayout( wl, layoutBase, fw, layoutBase, TQSize( TQMAX( 5, fw->grid().x()), TQMAX( 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_OBJECT_NAME_STRING ) || ( (TQActionGroup*)action )->usesDropDown()) { + if ( !action->inherits( "TQActionGroup" ) || ( (TQActionGroup*)action )->usesDropDown()) { if ( index == -1 ) toolBar->appendAction( action ); else @@ -1620,7 +1620,7 @@ void AddActionToToolBarCommand::execute() while ( it.current() ) { TQObject *o = it.current(); ++it; - if ( !o->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !o->inherits( "TQAction" ) ) continue; // ### fix it for nested actiongroups if ( o->inherits( "QDesignerAction" ) ) { @@ -1650,7 +1650,7 @@ void AddActionToToolBarCommand::unexecute() toolBar->removeAction( action ); action->removeFrom( toolBar ); TQObject::disconnect( action, TQT_SIGNAL( destroyed() ), toolBar, TQT_SLOT( actionRemoved() ) ); - if ( !action->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) || ( (TQActionGroup*)action )->usesDropDown()) { + if ( !action->inherits( "TQActionGroup" ) || ( (TQActionGroup*)action )->usesDropDown()) { action->removeEventFilter( toolBar ); } else { TQObjectList clo = action->childrenListObject(); @@ -1659,7 +1659,7 @@ void AddActionToToolBarCommand::unexecute() while ( it.current() ) { TQObject *o = it.current(); ++it; - if ( !o->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !o->inherits( "TQAction" ) ) continue; if ( o->inherits( "QDesignerAction" ) ) { o->removeEventFilter( toolBar ); @@ -1680,7 +1680,7 @@ AddActionToPopupCommand::AddActionToPopupCommand( const TQString &n, FormWindow void AddActionToPopupCommand::execute() { - if ( action->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ) { + if ( action->inherits( "TQActionGroup" ) ) { if ( ( (TQActionGroup*)action )->usesDropDown() ) { action->addTo( popup ); popup->insertAction( index, action ); @@ -1693,7 +1693,7 @@ void AddActionToPopupCommand::execute() while ( it.current() ) { TQObject *o = it.current(); ++it; - if ( !o->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !o->inherits( "TQAction" ) ) continue; QDesignerAction *ac = (QDesignerAction*)o; popup->insertAction( index + (i++), ac ); @@ -1717,7 +1717,7 @@ void AddActionToPopupCommand::unexecute() action->removeFrom( popup ); popup->removeAction( action ); TQObject::disconnect( action, TQT_SIGNAL( destroyed() ), popup, TQT_SLOT( actionRemoved() ) ); - if ( !action->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) || ( (TQActionGroup*)action )->usesDropDown()) { + if ( !action->inherits( "TQActionGroup" ) || ( (TQActionGroup*)action )->usesDropDown()) { action->removeEventFilter( popup ); } else { TQObjectList clo = action->childrenListObject(); @@ -1726,7 +1726,7 @@ void AddActionToPopupCommand::unexecute() while ( it.current() ) { TQObject *o = it.current(); ++it; - if ( !o->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !o->inherits( "TQAction" ) ) continue; if ( o->inherits( "QDesignerAction" ) ) { o->removeEventFilter( popup ); @@ -1752,7 +1752,7 @@ void AddMenuCommand::execute() formWindow()->unify( TQT_TQOBJECT(popup), n, true ); popup->setName( n ); } - if ( !mainWindow->child( 0, TQMENUBAR_OBJECT_NAME_STRING ) ) { + if ( !mainWindow->child( 0, "TQMenuBar" ) ) { menuBar = new QDesignerMenuBar( (TQWidget*)mainWindow ); menuBar->setName( "menubar" ); } else { diff --git a/kommander/editor/connectioneditorimpl.cpp b/kommander/editor/connectioneditorimpl.cpp index 2ca7934d..2b57437f 100644 --- a/kommander/editor/connectioneditorimpl.cpp +++ b/kommander/editor/connectioneditorimpl.cpp @@ -105,7 +105,7 @@ ConnectionEditor::ConnectionEditor(TQWidget* parent, TQObject* sndr, TQObject* r for (TQPtrDictIterator<TQWidget> it(*m_formWindow->widgets()); it.current(); ++it) { if (it.current()->isVisibleTo(this) && - !it.current()->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING) && + !it.current()->inherits("TQLayoutWidget") && !it.current()->inherits("Spacer") && qstrcmp(it.current()->name(), "central widget") && !m_formWindow->isMainContainer(TQT_TQOBJECT(it.current())) && diff --git a/kommander/editor/formwindow.cpp b/kommander/editor/formwindow.cpp index 70796291..ea76109e 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_OBJECT_NAME_STRING), this); + TQWidget *w = WidgetFactory::create(WidgetDatabase::idFromClassName("TQFrame"), this); setMainContainer(w); propertyWidget = TQT_TQOBJECT(w); targetContainer = 0; @@ -297,7 +297,7 @@ void FormWindow::insertWidget() bool useSizeHint = !oldRectValid || (currRect.width() < 2 && currRect.height() < 2); Qt::Orientation orient =Qt::Horizontal; TQString n = WidgetDatabase::className(currTool); - if (useSizeHint && (n == "Spacer" || n == TQSLIDER_OBJECT_NAME_STRING || n == "Line" || n == TQSCROLLBAR_OBJECT_NAME_STRING)) { + if (useSizeHint && (n == "Spacer" || n == "TQSlider" || n == "Line" || n == "TQScrollBar")) { 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_OBJECT_NAME_STRING) && + if (mainContainer()->inherits("TQMainWindow") && ((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_OBJECT_NAME_STRING); + TQObjectList *l = w->queryList("TQWidget"); 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(TQT_TQOBJECT(wid))); if ((WidgetDatabase::isContainer(id) || wid == mainContainer()) && - !wid->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING) && !wid->inherits(TQSPLITTER_OBJECT_NAME_STRING)) + !wid->inherits("TQLayoutWidget") && !wid->inherits("TQSplitter")) { insertParent = WidgetFactory::containerOfWidget(wid); // found another parent, store it break; @@ -795,7 +795,7 @@ void FormWindow::handleMouseMove(TQMouseEvent *e, TQWidget *w) wid = designerWidget(TQT_TQOBJECT(wid)); if (wid && (isMainContainer(TQT_TQOBJECT(wid)) || insertedWidgets.find(wid)) && wid->isVisibleTo(this)) newReceiver = wid; - if (newReceiver && (newReceiver->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING) + if (newReceiver && (newReceiver->inherits("TQLayoutWidget") || newReceiver->inherits("Spacer"))) newReceiver = (TQWidget*)connectReceiver; drawRecRect = TQT_BASE_OBJECT(newReceiver) != TQT_BASE_OBJECT(connectReceiver); @@ -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_OBJECT_NAME_STRING)) + if (!emitSelChanged && i->inherits("TQButton")) { - if (i->parentWidget() && i->parentWidget()->inherits(TQBUTTONGROUP_OBJECT_NAME_STRING) || - wa->inherits(TQBUTTONGROUP_OBJECT_NAME_STRING)) + if (i->parentWidget() && i->parentWidget()->inherits("TQButtonGroup") || + wa->inherits("TQButtonGroup")) emitSelChanged = true; - if (!wa->inherits(TQBUTTONGROUP_OBJECT_NAME_STRING)) + if (!wa->inherits("TQButtonGroup")) { MetaDataBase::setPropertyChanged(TQT_TQOBJECT(i), "buttonGroupId", false); - if (i->parentWidget() && i->parentWidget()->inherits(TQBUTTONGROUP_OBJECT_NAME_STRING)) + if (i->parentWidget() && i->parentWidget()->inherits("TQButtonGroup")) ((TQButtonGroup *) i->parentWidget())->remove((TQButton *) i); } } @@ -1061,7 +1061,7 @@ void FormWindow::handleKeyPress(TQKeyEvent * e, TQWidget * w) } if (!e->isAccepted()) { - TQObjectList *l = queryList(TQWIDGET_OBJECT_NAME_STRING); + TQObjectList *l = queryList("TQWidget"); if (!l) return; if (l->find(TQT_TQOBJECT(w)) != -1) @@ -1096,7 +1096,7 @@ void FormWindow::selectWidget(TQObject * o, bool select) return; } - if (mainContainer()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING) && + if (mainContainer()->inherits("TQMainWindow") && w == ((TQMainWindow *) mainContainer())->centralWidget()) { TQObject *opw = propertyWidget; @@ -1281,7 +1281,7 @@ void FormWindow::endRectDraw() void FormWindow::selectWidgets() { - TQObjectList *l = mainContainer()->queryList(TQWIDGET_OBJECT_NAME_STRING); + TQObjectList *l = mainContainer()->queryList("TQWidget"); 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_OBJECT_NAME_STRING); + TQObjectList *l = w->queryList("TQWidget"); 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_OBJECT_NAME_STRING); + TQObjectList *l = w->queryList("TQWidget"); 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_OBJECT_NAME_STRING, 0, false, false); + TQObjectList *l = w->parentWidget()->queryList("TQWidget", 0, false, false); moving.clear(); if (l) { @@ -1686,7 +1686,7 @@ void FormWindow::showOrderIndicators() { hideOrderIndicators(); orderIndicators.setAutoDelete(true); - TQObjectList *l = mainContainer()->queryList(TQWIDGET_OBJECT_NAME_STRING); + TQObjectList *l = mainContainer()->queryList("TQWidget"); 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_OBJECT_NAME_STRING); + TQObjectList *l = mainContainer()->queryList("TQWidget"); 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_OBJECT_NAME_STRING); + TQObjectList *l = mainContainer()->queryList("TQWidget"); 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(TQLAYOUTWIDGET_OBJECT_NAME_STRING) && !w->inherits(TQSPLITTER_OBJECT_NAME_STRING)) + if (!w->inherits("TQLayoutWidget") && !w->inherits("TQSplitter")) 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_OBJECT_NAME_STRING); + TQObjectList *l = w->queryList("TQWidget"); 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_OBJECT_NAME_STRING); + TQObjectList *l = a->queryList("TQAction"); 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_OBJECT_NAME_STRING)) + if (mainContainer()->inherits("TQMainWindow")) { if (!found) { - TQObjectList *l = mainContainer()->queryList(TQDOCKWINDOW_OBJECT_NAME_STRING, 0, true); + TQObjectList *l = mainContainer()->queryList("TQDockWindow", 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 TQT_NO_SQL TQStringList dbClasses; - dbClasses << TQDATATABLE_OBJECT_NAME_STRING; // add more here + dbClasses << "TQDataTable"; // 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(TQLAYOUTWIDGET_OBJECT_NAME_STRING)) + if (it.current()->inherits("TQLayoutWidget")) continue; - if (it.current()->inherits(TQSPLITTER_OBJECT_NAME_STRING)) + if (it.current()->inherits("TQSplitter")) 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_OBJECT_NAME_STRING); + TQAction *ac = (TQAction*)a->child(name.latin1(), "TQAction"); if (ac) return ac; } @@ -2555,7 +2555,7 @@ TQAction *FormWindow::findAction(const TQString &name) void FormWindow::killAccels(TQObject *top) { - TQObjectList *l = top->queryList(TQACCEL_OBJECT_NAME_STRING); + TQObjectList *l = top->queryList("TQAccel"); 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_OBJECT_NAME_STRING)) + if (!mainContainer()->inherits("TQMainWindow")) return false; return TQT_BASE_OBJECT(w) == TQT_BASE_OBJECT(((TQMainWindow*)mainContainer())->centralWidget()); } diff --git a/kommander/editor/functionsimpl.cpp b/kommander/editor/functionsimpl.cpp index 37ae23ab..c1c3f41d 100644 --- a/kommander/editor/functionsimpl.cpp +++ b/kommander/editor/functionsimpl.cpp @@ -279,7 +279,7 @@ void FunctionsDialog::showParameters() combos[i]->setShown(false); edits[i]->setShown(i < argsCount); edits[i]->clear(); - if (type == TQSTRING_OBJECT_NAME_STRING) + if (type == "TQString") { quotes[i]->setShown(i < argsCount); } @@ -336,7 +336,7 @@ void FunctionsDialog::showParameters() combos[i]->setShown(false); edits[i]->setShown(i < argsCount); edits[i]->clear(); - if (m_function.argumentType(i) == TQSTRING_OBJECT_NAME_STRING) + if (m_function.argumentType(i) == "TQString") { quotes[i]->setShown(i < argsCount); } @@ -362,8 +362,8 @@ TQString FunctionsDialog::params() TQString s = edits[i]->text(); if (!s.isEmpty() || i < m_function.minArg()) { - if (quotes[i]->isChecked() && ( (!slotsShown && m_function.argumentType(i) == TQSTRING_OBJECT_NAME_STRING) - || (slotsShown && labels[i]->text().startsWith(TQSTRING_OBJECT_NAME_STRING)) ) ) + if (quotes[i]->isChecked() && ( (!slotsShown && m_function.argumentType(i) == "TQString") + || (slotsShown && labels[i]->text().startsWith("TQString")) ) ) s = '"' + s + '"'; pars.append(s); } diff --git a/kommander/editor/hierarchyview.cpp b/kommander/editor/hierarchyview.cpp index df8beeb5..116b75a5 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_OBJECT_NAME_STRING ) && + if ( w->parent() && w->parent()->inherits( "TQWidgetStack" ) && w->parent()->parent() && - ( 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 ) ) + ( w->parent()->parent()->inherits( "TQTabWidget" ) || + w->parent()->parent()->inherits( "TQWizard" ) ) ) { + if ( w->parent()->parent()->inherits( "TQTabWidget" ) ) ( (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_OBJECT_NAME_STRING ) ) { + if ( o && o->inherits( "TQMainWindow" ) ) { TQObject *cw = TQT_TQOBJECT(( (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( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) ) { + if ( o->inherits( "TQLayoutWidget" ) ) { 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_OBJECT_NAME_STRING ) && + if ( o->parent() && o->parent()->inherits( "TQWidgetStack" ) && o->parent()->parent() ) { - if ( o->parent()->parent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) + if ( o->parent()->parent()->inherits( "TQTabWidget" ) ) name = ( (TQTabWidget*)o->parent()->parent() )->tabLabel( (TQWidget*)o ); - else if ( o->parent()->parent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) + else if ( o->parent()->parent()->inherits( "TQWizard" ) ) 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_OBJECT_NAME_STRING; + className = "TQMainWindow"; } if ( !parent ) @@ -412,7 +412,7 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent ) item = new HierarchyItem( HierarchyItem::Widget, parent, name, className, dbInfo ); if ( !parent ) item->setPixmap( 0, PixmapChooser::loadPixmap( "form.xpm", PixmapChooser::Mini ) ); - else if ( o->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING) ) + else if ( o->inherits( "TQLayoutWidget") ) item->setPixmap( 0, PixmapChooser::loadPixmap( "layout.xpm", PixmapChooser::Small ) ); else item->setPixmap( 0, WidgetDatabase::iconSet( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( o ) ) ). @@ -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_OBJECT_NAME_STRING ) || - it.current()->parent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) && - it.current()->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) { + ( it.current()->parent()->inherits( "TQTabWidget" ) || + it.current()->parent()->inherits( "TQWizard" ) ) && + it.current()->inherits( "TQWidgetStack" ) ) { TQObject *obj = it.current(); - TQObjectList *l2 = obj->queryList( TQWIDGET_OBJECT_NAME_STRING, 0, true, false ); + TQObjectList *l2 = obj->queryList( "TQWidget", 0, true, false ); QDesignerTabWidget *tw = 0; QDesignerWizard *dw = 0; - if ( it.current()->parent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) + if ( it.current()->parent()->inherits( "TQTabWidget" ) ) tw = (QDesignerTabWidget*)it.current()->parent(); - if ( it.current()->parent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) + if ( it.current()->parent()->inherits( "TQWizard" ) ) 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_OBJECT_NAME_STRING ) && !w->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) { + if ( !w->inherits( "TQTabWidget" ) && !w->inherits( "TQWizard" ) ) { 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_OBJECT_NAME_STRING ) ) { + if ( w->inherits( "TQTabWidget" ) ) { 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_OBJECT_NAME_STRING ) ) { + } else if ( w->inherits( "TQWizard" ) ) { 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_OBJECT_NAME_STRING ) ) { + if ( w->inherits( "TQTabWidget" ) ) { 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_OBJECT_NAME_STRING ) ) { + } else if ( w->inherits( "TQWizard" ) ) { 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_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQMainWindow" ) ) w2 = ( (TQMainWindow*)w )->centralWidget(); listview->changeNameOf( w2, w->name() ); } diff --git a/kommander/editor/layout.cpp b/kommander/editor/layout.cpp index 8c35f8e6..8fa45d95 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( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) || layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ); + needReparent = needMove || layoutBase->inherits( "TQLayoutWidget" ) || layoutBase->inherits( "TQSplitter" ); if ( !layoutBase ) { if ( !useSplitter ) - layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQLAYOUTWIDGET_OBJECT_NAME_STRING ), + layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQLayoutWidget" ), WidgetFactory::containerOfWidget( parent ) ); else - layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQSPLITTER_OBJECT_NAME_STRING ), + layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQSplitter" ), WidgetFactory::containerOfWidget( parent ) ); } else { WidgetFactory::deleteLayout( layoutBase ); @@ -208,7 +208,7 @@ void Layout::undoLayout() } formWindow->selectWidget( TQT_TQOBJECT(layoutBase), false ); WidgetFactory::deleteLayout( layoutBase ); - if ( parent != layoutBase && !layoutBase->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) { + if ( parent != layoutBase && !layoutBase->inherits( "TQMainWindow" ) ) { layoutBase->hide(); TQString n = layoutBase->name(); n.prepend( "qt_dead_widget_" ); @@ -231,11 +231,11 @@ void Layout::breakLayout() rects.insert( w, w->geometry() ); } WidgetFactory::deleteLayout( layoutBase ); - bool needReparent = qstrcmp( layoutBase->className(), TQLAYOUTWIDGET_OBJECT_NAME_STRING ) == 0 || - qstrcmp( layoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0 || + bool needReparent = qstrcmp( layoutBase->className(), "TQLayoutWidget" ) == 0 || + qstrcmp( layoutBase->className(), "TQSplitter" ) == 0 || ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(TQT_TQOBJECT( layoutBase )) ) ) && layoutBase != formWindow->mainContainer() ); - bool needResize = qstrcmp( layoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0; + bool needResize = qstrcmp( layoutBase->className(), "TQSplitter" ) == 0; bool add = geometries.isEmpty(); for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { if ( needReparent ) @@ -313,13 +313,13 @@ void HorizontalLayout::doLayout() layout->addWidget( w, 0, ( (Spacer*)w )->alignment() ); else layout->addWidget( w ); - if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQLayoutWidget" ) ) ( (TQLayoutWidget*)w )->updateSizePolicy(); } w->show(); } - if ( layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ) + if ( layoutBase->inherits( "TQSplitter" ) ) ( (TQSplitter*)layoutBase )->setOrientation( Qt::Horizontal ); finishLayout( needMove, layout ); @@ -377,13 +377,13 @@ void VerticalLayout::doLayout() layout->addWidget( w, 0, ( (Spacer*)w )->alignment() ); else layout->addWidget( w ); - if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQLayoutWidget" ) ) ( (TQLayoutWidget*)w )->updateSizePolicy(); } w->show(); } - if ( layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ) + if ( layoutBase->inherits( "TQSplitter" ) ) ( (TQSplitter*)layoutBase )->setOrientation( Qt::Vertical ); finishLayout( needMove, layout ); @@ -749,7 +749,7 @@ void GridLayout::doLayout() } else { layout->addMultiCellWidget( w, r, r+rs-1, c, c+cs-1, w->inherits( "Spacer" ) ? ( (Spacer*)w )->alignment() : 0 ); } - if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQLayoutWidget" ) ) ( (TQLayoutWidget*)w )->updateSizePolicy(); w->show(); } else { diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp index 0abb7de2..497be25b 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_OBJECT_NAME_STRING), this, 0, false); + TQWidget *w = WidgetFactory::create(WidgetDatabase::idFromClassName("TQWidget"), this, 0, false); delete w; w = WidgetFactory::create(WidgetDatabase::idFromClassName("Dialog"), this, 0, false); delete w; - w = WidgetFactory::create(WidgetDatabase::idFromClassName(TQLABEL_OBJECT_NAME_STRING), this, 0, false); + w = WidgetFactory::create(WidgetDatabase::idFromClassName("TQLabel"), this, 0, false); delete w; - w = WidgetFactory::create(WidgetDatabase::idFromClassName(TQTABWIDGET_OBJECT_NAME_STRING), this, 0, false); + w = WidgetFactory::create(WidgetDatabase::idFromClassName("TQTabWidget"), this, 0, false); delete w; - w = WidgetFactory::create(WidgetDatabase::idFromClassName(TQFRAME_OBJECT_NAME_STRING), this, 0, false); + w = WidgetFactory::create(WidgetDatabase::idFromClassName("TQFrame"), this, 0, false); delete w; assistant = new AssistProc(TQT_TQOBJECT(this), "Internal Assistant", assistantPath()); @@ -630,28 +630,28 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) break; if (o && currentTool() == POINTER_TOOL && (o->inherits("QDesignerMenuBar") || o->inherits("QDesignerToolBar") || - (o->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) || o->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) || o->inherits("QDesignerToolBarSeparator")) && + (o->inherits("TQComboBox") || o->inherits("TQToolButton") || o->inherits("QDesignerToolBarSeparator")) && o->parent() && o->parent()->inherits("QDesignerToolBar"))) { TQWidget *w = (TQWidget*)o; - if (w->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) || w->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) || w->inherits("QDesignerToolBarSeparator")) + if (w->inherits("TQToolButton") || w->inherits("TQComboBox") || w->inherits("QDesignerToolBarSeparator")) w = w->parentWidget(); TQWidget *pw = w->parentWidget(); while (pw) { if (pw->inherits("FormWindow")) { ((FormWindow*)pw)->emitShowProperties(TQT_TQOBJECT(w)); if (!o->inherits("QDesignerToolBar")) - return !o->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) && !o->inherits(TQMENUBAR_OBJECT_NAME_STRING) && - !o->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) && !o->inherits("QDesignerToolBarSeparator"); + return !o->inherits("TQToolButton") && !o->inherits("TQMenuBar") && + !o->inherits("TQComboBox") && !o->inherits("QDesignerToolBarSeparator"); } pw = pw->parentWidget(); } } - if (o && (o->inherits("QDesignerToolBar") || o->inherits(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING)) + if (o && (o->inherits("QDesignerToolBar") || o->inherits("TQDockWindowHandle")) && e->type() == TQEvent::ContextMenu) break; if (isAToolBarChild(o) && currentTool() != CONNECT_TOOL) break; - if (o && o->inherits(TQSIZEGRIP_OBJECT_NAME_STRING)) + if (o && o->inherits("TQSizeGrip")) 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_OBJECT_NAME_STRING)) + if (o && o->inherits("TQSizeGrip")) 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_OBJECT_NAME_STRING) && !o->inherits(TQMENUBAR_OBJECT_NAME_STRING) && - !o->inherits(TQSIZEGRIP_OBJECT_NAME_STRING)) + !o->inherits("TQPopupMenu") && !o->inherits("TQMenuBar") && + !o->inherits("TQSizeGrip")) return true; - if (o && o->inherits(TQSIZEGRIP_OBJECT_NAME_STRING)) + if (o && o->inherits("TQSizeGrip")) 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_OBJECT_NAME_STRING) && ((TQToolButton*)o)->isOn() && - o->parent() && o->parent()->inherits(TQTOOLBAR_OBJECT_NAME_STRING) && formWindow()) + if (o && o->inherits("TQToolButton") && ((TQToolButton*)o)->isOn() && + o->parent() && o->parent()->inherits("TQToolBar") && 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_OBJECT_NAME_STRING) && !o->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING)) + if (o->parent() && o->parent()->inherits("TQWizard") && !o->inherits("TQPushButton")) 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_OBJECT_NAME_STRING) != 0) + if (text && qstrcmp(text->type(), "TQString") != 0) text = 0; const TQMetaProperty* title = w->metaObject()->property(w->metaObject()->findProperty("title", true), true); - if (title && qstrcmp(title->type(), TQSTRING_OBJECT_NAME_STRING) != 0) + if (title && qstrcmp(title->type(), "TQString") != 0) title = 0; const TQMetaProperty* pagetitle = w->metaObject()->property(w->metaObject()->findProperty("pageTitle", true), true); - if (pagetitle && qstrcmp(pagetitle->type(), TQSTRING_OBJECT_NAME_STRING) != 0) + if (pagetitle && qstrcmp(pagetitle->type(), "TQString") != 0) pagetitle = 0; const TQMetaProperty* pixmap = w->metaObject()->property(w->metaObject()->findProperty("pixmap", true), true); - if (pixmap && qstrcmp(pixmap->type(), TQPIXMAP_OBJECT_NAME_STRING) != 0) + if (pixmap && qstrcmp(pixmap->type(), "TQPixmap") != 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_OBJECT_NAME_STRING)) { + if (text && text->designable(w) && !w->inherits("TQTextEdit")) { 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_OBJECT_NAME_STRING)) { + if (w->inherits("TQTabWidget")) { 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_OBJECT_NAME_STRING)) { + if (w->inherits("TQToolBox")) { 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_OBJECT_NAME_STRING)) { + if (fw->mainContainer()->inherits("TQWizard")) { 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_OBJECT_NAME_STRING)) { + } else if (fw->mainContainer()->inherits("TQMainWindow")) { 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_OBJECT_NAME_STRING) || w->inherits(TQLABEL_OBJECT_NAME_STRING)) { + if (w->inherits("TQTextView") || w->inherits("TQLabel")) { 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_OBJECT_NAME_STRING)) { + if (w->inherits("TQTabWidget")) { 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_OBJECT_NAME_STRING)) { + if (w->inherits("TQToolBox")) { 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_OBJECT_NAME_STRING)) { + if (fw->mainContainer()->inherits("TQWizard")) { 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_OBJECT_NAME_STRING)) { + } else if (fw->mainContainer()->inherits("TQMainWindow")) { 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_OBJECT_NAME_STRING) || w->inherits(TQLABEL_OBJECT_NAME_STRING)) { + if (w->inherits("TQTextView") || w->inherits("TQLabel")) { text = TextEditor::getText(this, w->property("text").toString()); ok = !text.isEmpty(); } else { diff --git a/kommander/editor/mainwindowactions.cpp b/kommander/editor/mainwindowactions.cpp index eb8fd6b3..3800bbbd 100644 --- a/kommander/editor/mainwindowactions.cpp +++ b/kommander/editor/mainwindowactions.cpp @@ -785,7 +785,7 @@ void MainWindow::fileCreateTemplate() for (i = 0; i < WidgetDatabase::count(); ++i) { if (WidgetDatabase::isContainer(i) && !WidgetDatabase::isForm(i) && - WidgetDatabase::className(i) != TQTABWIDGET_OBJECT_NAME_STRING && WidgetDatabase::widgetGroup(i) != "Temp") + WidgetDatabase::className(i) != "TQTabWidget" && WidgetDatabase::widgetGroup(i) != "Temp") { dia.listClass->insertItem(WidgetDatabase::className(i)); } diff --git a/kommander/editor/metadatabase.cpp b/kommander/editor/metadatabase.cpp index 23e97618..8b35aa77 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_OBJECT_NAME_STRING ) ) + if ( o->inherits( "TQMainWindow" ) ) o = TQT_TQOBJECT(( (TQMainWindow*)o )->centralWidget()); MetaDataBaseRecord *r = db->find( TQT_TQOBJECT(o) ); if ( !r || !o->isWidgetType() ) { @@ -318,7 +318,7 @@ int MetaDataBase::margin( TQObject *o ) if ( !o ) return -1; setupDataBase(); - if ( o->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) + if ( o->inherits( "TQMainWindow" ) ) o = TQT_TQOBJECT(( (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 98cfd39c..6ac39c22 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_OBJECT_NAME_STRING); + TQObjectList *l = queryList("TQWidget"); TQObjectListIt it(*l); TQObject * obj; while ((obj = it.current()) != 0) { diff --git a/kommander/editor/propertyeditor.cpp b/kommander/editor/propertyeditor.cpp index f105a4e8..58509db1 100644 --- a/kommander/editor/propertyeditor.cpp +++ b/kommander/editor/propertyeditor.cpp @@ -842,7 +842,7 @@ TQDateEdit *PropertyDateItem::lined() if ( lin ) return lin; lin = new TQDateEdit( listview->viewport() ); - TQObjectList *l = lin->queryList( TQLINEEDIT_OBJECT_NAME_STRING ); + TQObjectList *l = lin->queryList( "TQLineEdit" ); for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( listview ); delete l; @@ -919,7 +919,7 @@ TQTimeEdit *PropertyTimeItem::lined() lin = new TQTimeEdit( listview->viewport() ); connect( lin, TQT_SIGNAL( valueChanged( const TQTime & ) ), this, TQT_SLOT( setValue() ) ); - TQObjectList *l = lin->queryList( TQLINEEDIT_OBJECT_NAME_STRING ); + TQObjectList *l = lin->queryList( "TQLineEdit" ); for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( listview ); delete l; @@ -994,7 +994,7 @@ TQDateTimeEdit *PropertyDateTimeItem::lined() lin = new TQDateTimeEdit( listview->viewport() ); connect( lin, TQT_SIGNAL( valueChanged( const TQDateTime & ) ), this, TQT_SLOT( setValue() ) ); - TQObjectList *l = lin->queryList( TQLINEEDIT_OBJECT_NAME_STRING ); + TQObjectList *l = lin->queryList( "TQLineEdit" ); 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_OBJECT_NAME_STRING ); + TQObjectList *ol = spinBx->queryList( "TQLineEdit" ); 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_OBJECT_NAME_STRING ); + TQObjectList *ol = comb->queryList( "TQLineEdit" ); 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_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQScrollView" ) ) w = ( (TQScrollView*)w )->viewport(); TQPalette pal = PaletteEditor::getPalette( &ok, val.toPalette(), #if defined(TQT_NON_COMMERCIAL) @@ -2500,7 +2500,7 @@ static TQVariant::Type type_to_variant( const TQString &s ) #ifndef TQT_NO_SQL static bool parent_is_data_aware( TQObject *o ) { - if ( !o->inherits( TQWIDGET_OBJECT_NAME_STRING ) ) + if ( !o->inherits( "TQWidget" ) ) return false; TQWidget *w = (TQWidget*)o; TQWidget *p = w->parentWidget(); @@ -2575,7 +2575,7 @@ void PropertyList::setupProperties() continue; if ( parentHasLayout && qstrcmp( p->name(), "geometry" ) == 0 ) continue; - if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) || w->inherits( "Spacer" ) ) { + if ( w->inherits( "TQLayoutWidget" ) || w->inherits( "Spacer" ) ) { if ( qstrcmp( p->name(), "sizePolicy" ) == 0 ) continue; if ( qstrcmp( p->name(), "minimumHeight" ) == 0 ) @@ -2618,7 +2618,7 @@ void PropertyList::setupProperties() continue; } } - if ( w->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ) { + if ( w->inherits( "TQActionGroup" ) ) { 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 TQ_PROPERTY can take a function (isInButtonGroup() in this case) if ( !editor->widget()->isWidgetType() || !editor->widget()->parent() || - !editor->widget()->parent()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) + !editor->widget()->parent()->inherits( "TQButtonGroup" ) ) 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_OBJECT_NAME_STRING ) ) { + if ( !editor->widget()->inherits( "TQMultiLineEdit" ) ) { 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_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQGroupBox" ) ) item->setVisible( false ); setPropertyValue( item ); if ( MetaDataBase::isPropertyChanged( editor->widget(), "wordwrap" ) ) @@ -2702,7 +2702,7 @@ void PropertyList::setupProperties() } } - if ( !w->inherits( TQSPLITTER_OBJECT_NAME_STRING ) && !w->inherits( "QDesignerMenuBar" ) && !w->inherits( "QDesignerToolBar" ) && + if ( !w->inherits( "TQSplitter" ) && !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( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) && !w->inherits( TQACTION_OBJECT_NAME_STRING ) && + if ( !w->inherits( "Spacer" ) && !w->inherits( "TQLayoutWidget" ) && !w->inherits( "TQAction" ) && !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 TQT_NO_SQL - 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() ) ) { + if ( !editor->widget()->inherits( "TQDataTable" ) && !editor->widget()->inherits( "TQDataBrowser" ) && + !editor->widget()->inherits( "TQDataView" ) && 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_OBJECT_NAME_STRING ) || editor->widget()->inherits( TQDATABROWSER_OBJECT_NAME_STRING ) || editor->widget()->inherits( TQDATAVIEW_OBJECT_NAME_STRING ) ) { + if ( editor->widget()->inherits( "TQDataTable" ) || editor->widget()->inherits( "TQDataBrowser" ) || editor->widget()->inherits( "TQDataView" ) ) { 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_OBJECT_NAME_STRING ) || editor->widget()->inherits( TQTEXTVIEW_OBJECT_NAME_STRING ) ); + editor->widget()->inherits( "TQLabel" ) || editor->widget()->inherits( "TQTextView" ) ); 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_OBJECT_NAME_STRING ) || - ( o->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) && ( (TQLineEdit*)o )->isReadOnly() ) ) && + } else if ( ( !o->inherits( "TQLineEdit" ) || + ( o->inherits( "TQLineEdit" ) && ( (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_OBJECT_NAME_STRING ) ) { + } else if ( ( ke->key() == Key_Return || ke->key() == Key_Enter ) && o->inherits( "TQComboBox" ) ) { TQKeyEvent ke2( TQEvent::KeyPress, Key_Space, 0, 0 ); TQApplication::sendEvent( o, &ke2 ); return true; } - } else if ( e->type() == TQEvent::FocusOut && o->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) && editor->formWindow() ) { + } else if ( e->type() == TQEvent::FocusOut && o->inherits( "TQLineEdit" ) && editor->formWindow() ) { TQTimer::singleShot( 100, editor->formWindow()->commandHistory(), TQT_SLOT( checkCompressedCommand() ) ); } else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(viewport()) ) { TQMouseEvent *me; diff --git a/kommander/editor/resource.cpp b/kommander/editor/resource.cpp index d9d3fa7d..6246498f 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( TQT_TQOBJECT(formwindow->mainContainer()), 0, ts, 0 ); - if ( formwindow->mainContainer()->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) { + if ( formwindow->mainContainer()->inherits( "TQMainWindow" ) ) { 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_OBJECT_NAME_STRING ) ) + if ( formwindow->mainContainer()->inherits( "TQMainWindow" ) ) 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_OBJECT_NAME_STRING ) ) { + if ( obj->inherits( "TQTabWidget" ) ) { TQTabWidget* tw = (TQTabWidget*) obj; - TQObjectList* tmpl = tw->queryList( TQWIDGETSTACK_OBJECT_NAME_STRING ); + TQObjectList* tmpl = tw->queryList( "TQWidgetStack" ); 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_OBJECT_NAME_STRING ) ) { + else if ( obj->inherits( "TQWizard" ) ) { 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_OBJECT_NAME_STRING ) ) { + } else if ( obj->inherits( "TQMainWindow" ) ) { saveChildrenOf( TQT_TQOBJECT(( (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_OBJECT_NAME_STRING ) || obj->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) { + if ( obj->inherits( "TQListBox" ) || obj->inherits( "TQComboBox" ) ) { TQListBox *lb = 0; - if ( obj->inherits( TQLISTBOX_OBJECT_NAME_STRING ) ) + if ( obj->inherits( "TQListBox" ) ) 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_OBJECT_NAME_STRING ) ) { + } else if ( obj->inherits( "TQIconView" ) ) { 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_OBJECT_NAME_STRING ) ) { + } else if ( obj->inherits( "TQListView" ) ) { 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 TQT_NO_TABLE - else if ( obj->inherits( TQTABLE_OBJECT_NAME_STRING ) ) { + else if ( obj->inherits( "TQTable" ) ) { TQTable *table = (TQTable*)obj; int i; TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( TQT_TQOBJECT(table) ); - bool isDataTable = table->inherits( TQDATATABLE_OBJECT_NAME_STRING ); + bool isDataTable = table->inherits( "TQDataTable" ); 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_OBJECT_NAME_STRING ) && !columnFields.isEmpty() ) { + if ( table->inherits( "TQDataTable" ) && !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_OBJECT_NAME_STRING ) && + if ( !obj->inherits( "TQSplitter" ) && 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_OBJECT_NAME_STRING ) ) { // #### should be cleaner (RS) + } else if ( w->inherits( "TQLayout" ) ) { // #### 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_OBJECT_NAME_STRING ) && qstrcmp( p->name(), "pixmap" ) == 0 && + if ( w->inherits( "TQLabel" ) && 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_OBJECT_NAME_STRING ) ) { + if ( w && w->inherits( "TQLayout" ) ) { if ( name == "spacing" ) num = MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(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_OBJECT_NAME_STRING ) ) { + if ( w && w->inherits( "TQLayout" ) ) { if ( name == "spacing" ) num = MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(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_OBJECT_NAME_STRING ); + TQString className = e.attribute( "class", "TQWidget" ); if ( !className.isNull() ) { obj = TQT_TQOBJECT(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_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQMainWindow" ) ) 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_OBJECT_NAME_STRING ) && !parent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) && !parent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) ) + if ( !parent || ( !parent->inherits( "TQToolBox" ) && !parent->inherits( "TQTabWidget" ) && !parent->inherits( "TQWizard" ) ) ) formwindow->insertWidget( w, pasting ); - else if ( parent && ( parent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) || parent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) || parent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) ) + else if ( parent && ( parent->inherits( "TQToolBox" ) || parent->inherits( "TQTabWidget" ) || parent->inherits( "TQWizard" ) ) ) MetaDataBase::addEntry( TQT_TQOBJECT(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_OBJECT_NAME_STRING ) ) { + if ( parent->inherits( "TQTabWidget" ) ) { if ( attrib == "title" ) ( (TQTabWidget*)parent )->insertTab( w, v.toString() ); } else - if ( parent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) { + if ( parent->inherits( "TQToolBox" ) ) { if ( attrib == "label" ) ( (TQToolBox*)parent )->addItem( w, v.toString() ); - } else if ( parent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) { + } else if ( parent->inherits( "TQWizard" ) ) { 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_OBJECT_NAME_STRING ) && e.tagName() == "column" ) { + if ( widget->inherits( "TQListView" ) && 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 TQT_NO_TABLE - else if ( widget->inherits( TQTABLE_OBJECT_NAME_STRING ) ) { + else if ( widget->inherits( "TQTable" ) ) { 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( TQT_TQOBJECT(widget) ) ) ) ) return; - if ( widget->inherits( TQLISTBOX_OBJECT_NAME_STRING ) || widget->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) { + if ( widget->inherits( "TQListBox" ) || widget->inherits( "TQComboBox" ) ) { TQDomElement n = e.firstChild().toElement(); TQPixmap pix; bool hasPixmap = false; TQString txt; loadItem( n, pix, txt, hasPixmap ); TQListBox *lb = 0; - if ( widget->inherits( TQLISTBOX_OBJECT_NAME_STRING ) ) + if ( widget->inherits( "TQListBox" ) ) 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_OBJECT_NAME_STRING ) ) { + } else if ( widget->inherits( "TQIconView" ) ) { 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_OBJECT_NAME_STRING ) ) { + } else if ( widget->inherits( "TQListView" ) ) { 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_OBJECT_NAME_STRING ) ) + if ( layout->inherits( "TQBoxLayout" ) ) ( (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_OBJECT_NAME_STRING ) ) {// no layouts in metadatabase... (RS) + if ( !obj->inherits( "TQLayout" ) ) {// 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_OBJECT_NAME_STRING ) ) { + if ( obj->inherits( "TQLayout" ) ) { if ( prop == "spacing" ) { MetaDataBase::setSpacing( TQT_TQOBJECT(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_OBJECT_NAME_STRING ); + TQObjectList *l = formwindow->queryList( "TQWidget" ); l->append( formwindow ); TQPtrList<TQAction> lst = formwindow->actionList(); for ( TQAction *a = lst.first(); a; a = lst.next() ) @@ -2374,10 +2374,10 @@ void Resource::saveChildActions( TQAction *a, TQTextStream &ts, int indent ) while ( it.current() ) { TQObject *o = it.current(); ++it; - if ( !o->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !o->inherits( "TQAction" ) ) continue; TQAction *ac = (TQAction*)o; - bool isGroup = ac->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ); + bool isGroup = ac->inherits( "TQActionGroup" ); if ( isGroup ) ts << makeIndent( indent ) << "<actiongroup>" << endl; else @@ -2406,7 +2406,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_OBJECT_NAME_STRING ); + bool isGroup = a->inherits( "TQActionGroup" ); if ( isGroup ) ts << makeIndent( indent ) << "<actiongroup>" << endl; else @@ -2450,7 +2450,7 @@ void Resource::loadChildAction( TQObject *parent, const TQDomElement &e ) } n2 = n2.nextSibling().toElement(); } - if ( !parent->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !parent->inherits( "TQAction" ) ) formwindow->actionList().append( a ); } else if ( n.tagName() == "actiongroup" ) { a = new QDesignerActionGroup( parent ); @@ -2472,7 +2472,7 @@ void Resource::loadChildAction( TQObject *parent, const TQDomElement &e ) } n2 = n2.nextSibling().toElement(); } - if ( !parent->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !parent->inherits( "TQAction" ) ) formwindow->actionList().append( a ); } } @@ -2539,7 +2539,7 @@ void Resource::saveToolBars( TQMainWindow *mw, TQTextStream &ts, int indent ) void Resource::saveMenuBar( TQMainWindow *mw, TQTextStream &ts, int indent ) { - if ( !mw->child( 0, TQMENUBAR_OBJECT_NAME_STRING ) ) + if ( !mw->child( 0, "TQMenuBar" ) ) return; ts << makeIndent( indent ) << "<menubar>" << endl; indent++; diff --git a/kommander/editor/tableeditorimpl.cpp b/kommander/editor/tableeditorimpl.cpp index 25883793..cb07cd7c 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_OBJECT_NAME_STRING ) ) { + if ( !editTable->inherits( "TQDataTable" ) ) { labelFields->hide(); comboFields->hide(); labelTable->hide(); labelTableValue->hide(); } #ifndef TQT_NO_SQL - if ( editTable->inherits( TQDATATABLE_OBJECT_NAME_STRING ) ) { + if ( editTable->inherits( "TQDataTable" ) ) { // ## 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_OBJECT_NAME_STRING ) ) { + if ( formWindow->project() && editTable->inherits( "TQDataTable" ) ) { 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 TQT_NO_TABLE - if ( editTable->inherits( TQDATATABLE_OBJECT_NAME_STRING ) ) { + if ( editTable->inherits( "TQDataTable" ) ) { 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_OBJECT_NAME_STRING ) ) { + if ( editTable->inherits( "TQDataTable" ) ) { comboFields->setFocus(); } else { editColumnText->setFocus(); diff --git a/kommander/editor/widgetdatabase.cpp b/kommander/editor/widgetdatabase.cpp index e3ab6de0..1418c1a2 100644 --- a/kommander/editor/widgetdatabase.cpp +++ b/kommander/editor/widgetdatabase.cpp @@ -134,35 +134,35 @@ void WidgetDatabase::setupDataBase( int id ) /* Designer widgets */ r = new WidgetDatabaseRecord; r->iconName = "pushbutton.xpm"; - r->name = TQPUSHBUTTON_OBJECT_NAME_STRING; + r->name = "TQPushButton"; r->group = widgetGroup("Buttons"); r->toolTip = i18n("Push Button"); append(r); r = new WidgetDatabaseRecord; r->iconName = "toolbutton.xpm"; - r->name = TQTOOLBUTTON_OBJECT_NAME_STRING; + r->name = "TQToolButton"; r->group = widgetGroup("Buttons"); r->toolTip = i18n("Tool Button"); append(r); r = new WidgetDatabaseRecord; r->iconName = "radiobutton.xpm"; - r->name = TQRADIOBUTTON_OBJECT_NAME_STRING; + r->name = "TQRadioButton"; r->group = widgetGroup("Buttons"); r->toolTip = i18n("Radio Button"); append(r); r = new WidgetDatabaseRecord; r->iconName = "checkbox.xpm"; - r->name = TQCHECKBOX_OBJECT_NAME_STRING; + r->name = "TQCheckBox"; r->group = widgetGroup("Buttons"); r->toolTip = i18n("Check Box"); append(r); r = new WidgetDatabaseRecord; r->iconName = "groupbox.xpm"; - r->name = TQGROUPBOX_OBJECT_NAME_STRING; + r->name = "TQGroupBox"; r->group = widgetGroup("Containers"); r->toolTip = i18n("Group Box"); r->isContainer = true; @@ -170,7 +170,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconName = "buttongroup.xpm"; - r->name = TQBUTTONGROUP_OBJECT_NAME_STRING; + r->name = "TQButtonGroup"; r->group = widgetGroup("Containers"); r->toolTip = i18n("Button Group"); r->isContainer = true; @@ -178,7 +178,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconName = "frame.xpm"; - r->name = TQFRAME_OBJECT_NAME_STRING; + r->name = "TQFrame"; r->group = widgetGroup("Containers"); r->toolTip = i18n("Frame"); r->isContainer = true; @@ -186,7 +186,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconName = "tabwidget.xpm"; - r->name = TQTABWIDGET_OBJECT_NAME_STRING; + r->name = "TQTabWidget"; r->group = widgetGroup("Containers"); r->toolTip = i18n("Tabwidget"); r->isContainer = true; @@ -194,14 +194,14 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconName = "listbox.xpm"; - r->name = TQLISTBOX_OBJECT_NAME_STRING; + r->name = "TQListBox"; r->group = widgetGroup("Views"); r->toolTip = i18n("List Box"); append(r); r = new WidgetDatabaseRecord; r->iconName = "listview.xpm"; - r->name = TQLISTVIEW_OBJECT_NAME_STRING; + r->name = "TQListView"; r->group = widgetGroup("Views"); r->toolTip = i18n("List View"); append(r); @@ -209,7 +209,7 @@ void WidgetDatabase::setupDataBase( int id ) #if !defined(TQT_NO_ICONVIEW) || defined(UIC) r = new WidgetDatabaseRecord; r->iconName = "iconview.xpm"; - r->name = TQICONVIEW_OBJECT_NAME_STRING; + r->name = "TQIconView"; r->group = widgetGroup("Views"); r->toolTip = i18n("Icon View"); append(r); @@ -218,7 +218,7 @@ void WidgetDatabase::setupDataBase( int id ) #if !defined(TQT_NO_TABLE) r = new WidgetDatabaseRecord; r->iconName = "table.xpm"; - r->name = TQTABLE_OBJECT_NAME_STRING; + r->name = "TQTable"; r->group = widgetGroup("Views"); r->toolTip = i18n("Table"); append(r); @@ -228,7 +228,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconName = "datatable.xpm"; r->includeFile = "tqdatatable.h"; - r->name = TQDATATABLE_OBJECT_NAME_STRING; + r->name = "TQDataTable"; r->group = widgetGroup("Database"); r->toolTip = i18n("Data Table"); append(r); @@ -236,21 +236,21 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconName = "lineedit.xpm"; - r->name = TQLINEEDIT_OBJECT_NAME_STRING; + r->name = "TQLineEdit"; r->group = widgetGroup("Input"); r->toolTip = i18n("Line Edit"); append(r); r = new WidgetDatabaseRecord; r->iconName = "spinbox.xpm"; - r->name = TQSPINBOX_OBJECT_NAME_STRING; + r->name = "TQSpinBox"; r->group = widgetGroup("Input"); r->toolTip = i18n("Spin Box"); append(r); r = new WidgetDatabaseRecord; r->iconName = "dateedit.xpm"; - r->name = TQDATEEDIT_OBJECT_NAME_STRING; + r->name = "TQDateEdit"; r->group = widgetGroup("Input"); r->toolTip = i18n("Date Edit"); r->includeFile = "tqdatetimeedit.h"; @@ -258,7 +258,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconName = "timeedit.xpm"; - r->name = TQTIMEEDIT_OBJECT_NAME_STRING; + r->name = "TQTimeEdit"; r->group = widgetGroup("Input"); r->toolTip = i18n("Time Edit"); r->includeFile = "tqdatetimeedit.h"; @@ -266,7 +266,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconName = "datetimeedit.xpm"; - r->name = TQDATETIMEEDIT_OBJECT_NAME_STRING; + r->name = "TQDateTimeEdit"; r->group = widgetGroup("Input"); r->toolTip = i18n("Date-Time Edit"); r->includeFile = "tqdatetimeedit.h"; @@ -274,77 +274,77 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconName = "multilineedit.xpm"; - r->name = TQMULTILINEEDIT_OBJECT_NAME_STRING; + r->name = "TQMultiLineEdit"; r->group = widgetGroup("Temp"); r->toolTip = i18n("Multi Line Edit"); append(r); r = new WidgetDatabaseRecord; r->iconName = "richtextedit.xpm"; - r->name = TQTEXTEDIT_OBJECT_NAME_STRING; + r->name = "TQTextEdit"; r->group = widgetGroup("Input"); r->toolTip = i18n("Rich Text Edit"); append(r); r = new WidgetDatabaseRecord; r->iconName = "combobox.xpm"; - r->name = TQCOMBOBOX_OBJECT_NAME_STRING; + r->name = "TQComboBox"; r->group = widgetGroup("Input"); r->toolTip = i18n("Combo Box"); append(r); r = new WidgetDatabaseRecord; r->iconName = "slider.xpm"; - r->name = TQSLIDER_OBJECT_NAME_STRING; + r->name = "TQSlider"; r->group = widgetGroup("Input"); r->toolTip = i18n("Slider"); append(r); r = new WidgetDatabaseRecord; r->iconName = "scrollbar.xpm"; - r->name = TQSCROLLBAR_OBJECT_NAME_STRING; + r->name = "TQScrollBar"; r->group = widgetGroup("Input"); r->toolTip = i18n("Scrollbar"); append(r); r = new WidgetDatabaseRecord; r->iconName = "dial.xpm"; - r->name = TQDIAL_OBJECT_NAME_STRING; + r->name = "TQDial"; r->group = widgetGroup("Input"); r->toolTip = i18n("Dial"); append(r); r = new WidgetDatabaseRecord; r->iconName = "label.xpm"; - r->name = TQLABEL_OBJECT_NAME_STRING; + r->name = "TQLabel"; r->group = widgetGroup("Temp"); r->toolTip = i18n("Label"); append(r); r = new WidgetDatabaseRecord; r->iconName = "lcdnumber.xpm"; - r->name = TQLCDNUMBER_OBJECT_NAME_STRING; + r->name = "TQLCDNumber"; r->group = widgetGroup("Display"); r->toolTip = i18n("LCD Number"); append(r); r = new WidgetDatabaseRecord; r->iconName = "progress.xpm"; - r->name = TQPROGRESSBAR_OBJECT_NAME_STRING; + r->name = "TQProgressBar"; r->group = widgetGroup("Display"); r->toolTip = i18n("Progress Bar"); append(r); r = new WidgetDatabaseRecord; r->iconName = "textview.xpm"; - r->name = TQTEXTVIEW_OBJECT_NAME_STRING; + r->name = "TQTextView"; r->group = widgetGroup("Temp"); r->toolTip = i18n("Text View"); append(r); r = new WidgetDatabaseRecord; r->iconName = "textbrowser.xpm"; - r->name = TQTEXTBROWSER_OBJECT_NAME_STRING; + r->name = "TQTextBrowser"; r->group = widgetGroup("Display"); r->toolTip = i18n("Text Browser"); append(r); @@ -359,19 +359,19 @@ void WidgetDatabase::setupDataBase( int id ) append(r); r = new WidgetDatabaseRecord; - r->name = TQWIDGET_OBJECT_NAME_STRING; + r->name = "TQWidget"; r->isForm = true; r->group = widgetGroup("Forms"); append(r); r = new WidgetDatabaseRecord; - r->name = TQDIALOG_OBJECT_NAME_STRING; + r->name = "TQDialog"; r->group = widgetGroup("Forms"); r->isForm = true; append(r); r = new WidgetDatabaseRecord; - r->name = TQWIZARD_OBJECT_NAME_STRING; + r->name = "TQWizard"; r->group = widgetGroup("Forms"); r->isContainer = true; append(r); @@ -383,14 +383,14 @@ void WidgetDatabase::setupDataBase( int id ) append(r); r = new WidgetDatabaseRecord; - r->name = TQLAYOUTWIDGET_OBJECT_NAME_STRING; + r->name = "TQLayoutWidget"; r->group = widgetGroup("Temp"); r->includeFile = ""; r->isContainer = true; append(r); r = new WidgetDatabaseRecord; - r->name = TQSPLITTER_OBJECT_NAME_STRING; + r->name = "TQSplitter"; r->group = widgetGroup("Temp"); r->includeFile = "tqsplitter.h"; r->isContainer = true; @@ -419,7 +419,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconName = ""; - r->name = TQMAINWINDOW_OBJECT_NAME_STRING; + r->name = "TQMainWindow"; r->includeFile = "tqmainwindow.h"; r->group = widgetGroup("Temp"); r->isContainer = true; @@ -427,7 +427,7 @@ void WidgetDatabase::setupDataBase( int id ) #ifndef TQT_NO_SQL r = new WidgetDatabaseRecord; - r->name = TQDATABROWSER_OBJECT_NAME_STRING; + r->name = "TQDataBrowser"; r->includeFile = "tqdatabrowser.h"; r->group = widgetGroup("Database"); r->toolTip = "Data Browser"; @@ -436,7 +436,7 @@ void WidgetDatabase::setupDataBase( int id ) append(r); r = new WidgetDatabaseRecord; - r->name = TQDATAVIEW_OBJECT_NAME_STRING; + r->name = "TQDataView"; r->includeFile = "tqdataview.h"; r->group = widgetGroup("Database"); r->toolTip = "Data View"; @@ -849,7 +849,7 @@ TQString WidgetDatabase::createWidgetName( int id ) { setupDataBase( id ); TQString n = className( id ); - if ( n == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) + if ( n == "TQLayoutWidget" ) n = "Layout"; if ( n[ 0 ] == 'Q' ) n = n.mid( 1 ); @@ -871,7 +871,7 @@ int WidgetDatabase::idFromClassName( const TQString &name ) if ( i ) return *i; if ( name == "FormWindow" ) - return idFromClassName( TQLAYOUTWIDGET_OBJECT_NAME_STRING ); + return idFromClassName( "TQLayoutWidget" ); #ifdef UIC setupDataBase( -2 ); i = className2Id->find( name ); diff --git a/kommander/editor/widgetfactory.cpp b/kommander/editor/widgetfactory.cpp index 15f9ad1d..6b71979b 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( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) && + if ( widget && !widget->inherits( "TQLayoutWidget" ) && ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(widget) ) ) ) || widget && widget->parentWidget() && widget->parentWidget()->inherits( "FormWindow" ) ) ) margin = MainWindow::self->currentLayoutDefaultMargin(); - if ( !layout && widget && widget->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) + if ( !layout && widget && widget->inherits( "TQTabWidget" ) ) widget = ((TQTabWidget*)widget)->currentPage(); - if ( !layout && widget && widget->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) + if ( !layout && widget && widget->inherits( "TQToolBox" ) ) widget = ((TQToolBox*)widget)->currentItem(); - if ( !layout && widget && widget->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) + if ( !layout && widget && widget->inherits( "TQWizard" ) ) widget = ((TQWizard*)widget)->currentPage(); - if ( !layout && widget && widget->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) + if ( !layout && widget && widget->inherits( "TQMainWindow" ) ) widget = ((TQMainWindow*)widget)->centralWidget(); - if ( !layout && widget && widget->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) + if ( !layout && widget && widget->inherits( "TQWidgetStack" ) ) widget = ((TQWidgetStack*)widget)->visibleWidget(); MetaDataBase::addEntry( TQT_TQOBJECT(widget) ); - if ( !layout && widget && widget->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) { + if ( !layout && widget && widget->inherits( "TQGroupBox" ) ) { 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_OBJECT_NAME_STRING ) ) + if ( widget->inherits( "TQTabWidget" ) ) widget = ((TQTabWidget*)widget)->currentPage(); - if ( widget->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) + if ( widget->inherits( "TQWizard" ) ) widget = ((TQWizard*)widget)->currentPage(); - if ( widget->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) + if ( widget->inherits( "TQMainWindow" ) ) widget = ((TQMainWindow*)widget)->centralWidget(); - if ( widget->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) + if ( widget->inherits( "TQWidgetStack" ) ) 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_OBJECT_NAME_STRING) + if (className == "TQPushButton") { 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_OBJECT_NAME_STRING)); + b->setAutoDefault(w && ((FormWindow *) w)->mainContainer()->inherits("TQDialog")); return b; - } else if (className == TQTOOLBUTTON_OBJECT_NAME_STRING) + } else if (className == "TQToolButton") { 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_OBJECT_NAME_STRING) + } else if (className == "TQCheckBox") { 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_OBJECT_NAME_STRING) + } else if (className == "TQRadioButton") { 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_OBJECT_NAME_STRING) + } else if (className == "TQGroupBox") { if (init) return new TQGroupBox(TQString::fromLatin1(name), parent, name); return new TQGroupBox(parent, name); - } else if (className == TQBUTTONGROUP_OBJECT_NAME_STRING) + } else if (className == "TQButtonGroup") { if (init) return new TQButtonGroup(TQString::fromLatin1(name), parent, name); return new TQButtonGroup(parent, name); - } else if (className == TQICONVIEW_OBJECT_NAME_STRING) + } else if (className == "TQIconView") { #if !defined(TQT_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_OBJECT_NAME_STRING) + } else if (className == "TQTable") { #if !defined(TQT_NO_TABLE) if (init) @@ -903,20 +903,20 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare return 0; #endif #ifndef TQT_NO_SQL - } else if (className == TQDATATABLE_OBJECT_NAME_STRING) + } else if (className == "TQDataTable") { return new TQDataTable(parent, name); #endif //TQT_NO_SQL - } else if (className == TQDATEEDIT_OBJECT_NAME_STRING) + } else if (className == "TQDateEdit") { return new TQDateEdit(parent, name); - } else if (className == TQTIMEEDIT_OBJECT_NAME_STRING) + } else if (className == "TQTimeEdit") { return new TQTimeEdit(parent, name); - } else if (className == TQDATETIMEEDIT_OBJECT_NAME_STRING) + } else if (className == "TQDateTimeEdit") { return new TQDateTimeEdit(parent, name); - } else if (className == TQLISTBOX_OBJECT_NAME_STRING) + } else if (className == "TQListBox") { 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_OBJECT_NAME_STRING) + } else if (className == "TQListView") { 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_OBJECT_NAME_STRING) + } else if (className == "TQLineEdit") return new TQLineEdit(parent, name); - else if (className == TQSPINBOX_OBJECT_NAME_STRING) + else if (className == "TQSpinBox") return new TQSpinBox(parent, name); - else if (className == TQSPLITTER_OBJECT_NAME_STRING) + else if (className == "TQSplitter") return new TQSplitter(parent, name); - else if (className == TQMULTILINEEDIT_OBJECT_NAME_STRING) + else if (className == "TQMultiLineEdit") return new TQMultiLineEdit(parent, name); - else if (className == TQTEXTEDIT_OBJECT_NAME_STRING) + else if (className == "TQTextEdit") return new TQTextEdit(parent, name); - else if (className == TQLABEL_OBJECT_NAME_STRING) + else if (className == "TQLabel") { QDesignerLabel *l = new QDesignerLabel(parent, name); if (init) @@ -955,9 +955,9 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare MetaDataBase::setPropertyChanged(TQT_TQOBJECT(l), "text", true); } return l; - } else if (className == TQLAYOUTWIDGET_OBJECT_NAME_STRING) + } else if (className == "TQLayoutWidget") return new TQLayoutWidget(parent, name); - else if (className == TQTABWIDGET_OBJECT_NAME_STRING) + else if (className == "TQTabWidget") { TQTabWidget *tw = new QDesignerTabWidget(parent, name); if (init) @@ -972,14 +972,14 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare MetaDataBase::addEntry(TQT_TQOBJECT(w)); } return tw; - } else if (className == TQCOMBOBOX_OBJECT_NAME_STRING) + } else if (className == "TQComboBox") { return new TQComboBox(false, parent, name); - } else if (className == TQWIDGET_OBJECT_NAME_STRING) + } else if (className == "TQWidget") { if (parent && - (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))) + (parent->inherits("FormWindow") || parent->inherits("TQWizard") + || parent->inherits("TQTabWidget") || parent->inherits("TQToolBox") || parent->inherits("TQMainWindow"))) { 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_OBJECT_NAME_STRING) + } else if (className == "TQDialog") { 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_OBJECT_NAME_STRING) + } else if (className == "TQWizard") { 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_OBJECT_NAME_STRING) + } else if (className == "TQLCDNumber") return new TQLCDNumber(parent, name); - else if (className == TQPROGRESSBAR_OBJECT_NAME_STRING) + else if (className == "TQProgressBar") return new TQProgressBar(parent, name); - else if (className == TQTEXTVIEW_OBJECT_NAME_STRING) + else if (className == "TQTextView") return new TQTextView(parent, name); - else if (className == TQTEXTBROWSER_OBJECT_NAME_STRING) + else if (className == "TQTextBrowser") return new TQTextBrowser(parent, name); - else if (className == TQDIAL_OBJECT_NAME_STRING) + else if (className == "TQDial") return new TQDial(parent, name); - else if (className == TQSLIDER_OBJECT_NAME_STRING) + else if (className == "TQSlider") { TQSlider *s = new TQSlider(parent, name); if (!r) @@ -1052,7 +1052,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare MetaDataBase::addEntry(TQT_TQOBJECT(s)); MetaDataBase::setPropertyChanged(TQT_TQOBJECT(s), "orientation", true); return s; - } else if (className == TQSCROLLBAR_OBJECT_NAME_STRING) + } else if (className == "TQScrollBar") { TQScrollBar *s = new TQScrollBar(parent, name); if (!r) @@ -1064,7 +1064,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare MetaDataBase::addEntry(TQT_TQOBJECT(s)); MetaDataBase::setPropertyChanged(TQT_TQOBJECT(s), "orientation", true); return s; - } else if (className == TQFRAME_OBJECT_NAME_STRING) + } else if (className == "TQFrame") { 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_OBJECT_NAME_STRING) + } else if (className == "TQMainWindow") { TQMainWindow *mw = new KmdrMainWindow(parent, name, 0); mw->setDockEnabled(TQt::DockMinimized, false); @@ -1098,13 +1098,13 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare return mw; } #ifndef TQT_NO_SQL - else if (className == TQDATABROWSER_OBJECT_NAME_STRING) + else if (className == "TQDataBrowser") { TQWidget *w = new QDesignerDataBrowser(parent, name); if (parent) w->reparent(parent, TQPoint(0, 0), true); return w; - } else if (className == TQDATAVIEW_OBJECT_NAME_STRING) + } else if (className == "TQDataView") { 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_OBJECT_NAME_STRING ) ) + if ( w && w->inherits( "TQTabWidget" ) ) w = ((TQTabWidget*)w)->currentPage(); - if ( w->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQToolBox" ) ) w = ((TQToolBox*)w)->currentItem(); - if ( w && w->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) + if ( w && w->inherits( "TQWizard" ) ) w = ((TQWizard*)w)->currentPage(); - if ( w && w->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) + if ( w && w->inherits( "TQMainWindow" ) ) w = ((TQMainWindow*)w)->centralWidget(); - if ( w && w->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) + if ( w && w->inherits( "TQWidgetStack" ) ) w = ((TQWidgetStack*)w)->visibleWidget(); - if ( w && w->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ) + if ( w && w->inherits( "TQSplitter" ) ) return ( (TQSplitter*)w )->orientation() ==Qt::Horizontal ? HBox : VBox; if ( !w || !w->layout() ) return NoLayout; TQLayout *lay = w->layout(); - if ( w->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) { - TQObjectList *l = TQT_TQOBJECT(lay)->queryList( TQLAYOUT_OBJECT_NAME_STRING ); + if ( w->inherits( "TQGroupBox" ) ) { + TQObjectList *l = TQT_TQOBJECT(lay)->queryList( "TQLayout" ); if ( l && l->first() ) lay = (TQLayout*)l->first(); delete l; } layout = lay; - if ( lay->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) ) + if ( lay->inherits( "TQHBoxLayout" ) ) return HBox; - else if ( lay->inherits( TQVBOXLAYOUT_OBJECT_NAME_STRING ) ) + else if ( lay->inherits( "TQVBoxLayout" ) ) return VBox; - else if ( lay->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) + else if ( lay->inherits( "TQGridLayout" ) ) 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_OBJECT_NAME_STRING ) ) + if ( layout->inherits( "TQHBoxLayout" ) ) return HBox; - else if ( layout->inherits( TQVBOXLAYOUT_OBJECT_NAME_STRING ) ) + else if ( layout->inherits( "TQVBoxLayout" ) ) return VBox; - else if ( layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) + else if ( layout->inherits( "TQGridLayout" ) ) return Grid; return NoLayout; } @@ -1349,15 +1349,15 @@ TQWidget* WidgetFactory::containerOfWidget( TQWidget *w ) { if ( !w ) return w; - if ( w->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQTabWidget" ) ) return ((TQTabWidget*)w)->currentPage(); - if ( w->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQToolBox" ) ) return ((TQToolBox*)w)->currentItem(); - if ( w->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQWizard" ) ) return ((TQWizard*)w)->currentPage(); - if ( w->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQWidgetStack" ) ) return ((TQWidgetStack*)w)->visibleWidget(); - if ( w->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQMainWindow" ) ) 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_OBJECT_NAME_STRING ) ) + if ( w->parentWidget() && w->parentWidget()->inherits( "TQWidgetStack" ) ) w = w->parentWidget(); while ( w ) { if ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(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_OBJECT_NAME_STRING ) || ::tqqt_cast<TQToolBox*>(o->parent()) ) + if ( o->inherits( "TQTabBar" ) || ::tqqt_cast<TQToolBox*>(o->parent()) ) return true; - else if ( o->inherits( TQSIZEGRIP_OBJECT_NAME_STRING ) ) + else if ( o->inherits( "TQSizeGrip" ) ) return true; - else if ( o->inherits( TQTOOLBUTTON_OBJECT_NAME_STRING ) && o->parent() && o->parent()->inherits( TQTABBAR_OBJECT_NAME_STRING ) ) + else if ( o->inherits( "TQToolButton" ) && o->parent() && o->parent()->inherits( "TQTabBar" ) ) return true; - else if ( o->parent() && o->parent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) && o->inherits( TQPUSHBUTTON_OBJECT_NAME_STRING ) ) + else if ( o->parent() && o->parent()->inherits( "TQWizard" ) && o->inherits( "TQPushButton" ) ) return true; - else if ( o->parent() && o->parent()->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) && o->inherits( TQMENUBAR_OBJECT_NAME_STRING ) ) + else if ( o->parent() && o->parent()->inherits( "TQMainWindow" ) && o->inherits( "TQMenuBar" ) ) return true; - else if ( o->inherits( TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING ) ) + else if ( o->inherits( "TQDockWindowHandle" ) ) return true; - else if ( o->inherits( TQHIDEDOCK_OBJECT_NAME_STRING ) ) + else if ( o->inherits( "TQHideDock" ) ) return true; return false; @@ -1416,7 +1416,7 @@ bool WidgetFactory::isPassiveInteractor( TQObject* o ) const char* WidgetFactory::classNameOf( TQObject* o ) { if (o->inherits("QDesignerTabWidget")) - return TQTABWIDGET_OBJECT_NAME_STRING; + return "TQTabWidget"; #ifdef KOMMANDER else if (o->inherits("EditorTabWidget")) return "TabWidget"; @@ -1424,34 +1424,34 @@ const char* WidgetFactory::classNameOf( TQObject* o ) return "ToolBox"; #endif else if (o->inherits("QDesignerDialog")) - return TQDIALOG_OBJECT_NAME_STRING; + return "TQDialog"; else if (o->inherits("QDesignerWidget")) - return TQWIDGET_OBJECT_NAME_STRING; + return "TQWidget"; else if (o->inherits("CustomWidget")) return ((CustomWidget *) o)->realClassName().latin1(); else if (o->inherits("QDesignerLabel")) - return TQLABEL_OBJECT_NAME_STRING; + return "TQLabel"; else if (o->inherits("QDesignerWizard")) - return TQWIZARD_OBJECT_NAME_STRING; + return "TQWizard"; else if (o->inherits("EditorWizard")) return "Wizard"; else if (o->inherits("QDesignerPushButton")) - return TQPUSHBUTTON_OBJECT_NAME_STRING; + return "TQPushButton"; else if (o->inherits("QDesignerToolButton")) - return TQTOOLBUTTON_OBJECT_NAME_STRING; + return "TQToolButton"; else if (o->inherits("QDesignerRadioButton")) - return TQRADIOBUTTON_OBJECT_NAME_STRING; + return "TQRadioButton"; else if (o->inherits("QDesignerCheckBox")) - return TQCHECKBOX_OBJECT_NAME_STRING; + return "TQCheckBox"; else if (o->inherits("QDesignerMenuBar")) - return TQMENUBAR_OBJECT_NAME_STRING; + return "TQMenuBar"; else if (o->inherits("QDesignerToolBar")) - return TQTOOLBAR_OBJECT_NAME_STRING; + return "TQToolBar"; #ifndef TQT_NO_SQL else if (o->inherits("QDesignerDataBrowser")) - return TQDATABROWSER_OBJECT_NAME_STRING; + return "TQDataBrowser"; else if (o->inherits("QDesignerDataView")) - return TQDATAVIEW_OBJECT_NAME_STRING; + return "TQDataView"; #endif else if (o->inherits("EditorDialog")) return "Dialog"; @@ -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_OBJECT_NAME_STRING ) || o->inherits(TQRADIOBUTTON_OBJECT_NAME_STRING) || o->inherits( TQCHECKBOX_OBJECT_NAME_STRING ) || o->inherits( TQTOOLBUTTON_OBJECT_NAME_STRING ) ) + if ( o->inherits( "TQPushButton" ) || o->inherits("TQRadioButton") || o->inherits( "TQCheckBox" ) || o->inherits( "TQToolButton" ) ) MetaDataBase::setPropertyChanged( o, "text", true ); else if (::tqqt_cast<TQToolButton*>(o) && ::tqqt_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_OBJECT_NAME_STRING ) ) + } else if ( o->inherits( "TQGroupBox" ) ) MetaDataBase::setPropertyChanged( o, "title", true ); - else if ( o->isA( TQFRAME_OBJECT_NAME_STRING ) ) { + else if ( o->isA( "TQFrame" ) ) { MetaDataBase::setPropertyChanged( o, "frameShadow", true ); MetaDataBase::setPropertyChanged( o, "frameShape", true ); - } else if ( o->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) || o->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) { + } else if ( o->inherits( "TQTabWidget" ) || o->inherits( "TQWizard" ) ) { MetaDataBase::setPropertyChanged( o, "pageTitle", true ); MetaDataBase::setPropertyChanged( o, "pageName", true ); #ifndef TQT_NO_TABLE - } else if ( o->inherits( TQTABLE_OBJECT_NAME_STRING ) && !o->inherits( TQDATATABLE_OBJECT_NAME_STRING ) ) { + } else if ( o->inherits( "TQTable" ) && !o->inherits( "TQDataTable" ) ) { 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_OBJECT_NAME_STRING ) ) { + } else if ( o->inherits( "TQSplitter" ) ) { 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_OBJECT_NAME_STRING || className == TQMULTILINEEDIT_OBJECT_NAME_STRING) + if (className == "TQTextEdit" || className == "TQMultiLineEdit") 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_OBJECT_NAME_STRING)) + if (!editWidget->inherits("TQComboBox")) 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_OBJECT_NAME_STRING)) + if (!editWidget->inherits("TQListView")) 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_OBJECT_NAME_STRING)) + if (!editWidget->inherits("TQListBox")) 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_OBJECT_NAME_STRING)) + if (!editWidget->inherits("TQListBox")) 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_OBJECT_NAME_STRING)) + if (!editWidget->inherits("TQComboBox")) 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_OBJECT_NAME_STRING)) + if (!editWidget->inherits("TQListView")) 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_OBJECT_NAME_STRING)) + if (!editWidget->inherits("TQIconView")) 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_OBJECT_NAME_STRING || className == TQTEXTEDIT_OBJECT_NAME_STRING) + if (className == "TQMultiLineEdit" || className == "TQTextEdit") { MultiLineEditor *e = new MultiLineEditor(parent, editWidget, fw); e->exec(); @@ -1687,7 +1687,7 @@ TQVariant WidgetFactory::defaultValue( TQObject *w, const TQString &propName ) } else if ( propName == "frameworkCode" ) { return TQVariant( true, 0 ); } else if ( propName == "layoutMargin" ) { - if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQLayoutWidget" ) ) return TQVariant( 0 ); else if ( MainWindow::self->formWindow() ) return TQVariant( MainWindow::self->formWindow()->layoutDefaultMargin() ); @@ -1751,7 +1751,7 @@ void QDesignerLabel::updateBuddy() if ( myBuddy.isEmpty() ) return; - TQObjectList *l = topLevelWidget()->queryList( TQWIDGET_OBJECT_NAME_STRING, myBuddy, false, true ); + TQObjectList *l = topLevelWidget()->queryList( "TQWidget", myBuddy, false, true ); if ( !l || !l->first() ) { delete l; return; @@ -1825,15 +1825,15 @@ void TQLayoutWidget::updateSizePolicy() TQLayout *parentLayout = 0; if ( parent() && parent()->isWidgetType() ) { parentLayout = ((TQWidget *)parent())->layout(); - if ( parentLayout && parentLayout->mainWidget()->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING) ) + if ( parentLayout && parentLayout->mainWidget()->inherits("TQLayoutWidget") ) parentLayout = 0; } TQObjectListIt it( childrenListObject() ); TQObject *o; - if ( layout()->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) ) { - if ( parentLayout && parentLayout->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) ) + if ( layout()->inherits("TQVBoxLayout") ) { + if ( parentLayout && parentLayout->inherits("TQHBoxLayout") ) vt = TQSizePolicy::Minimum; else vt = TQSizePolicy::Fixed; @@ -1853,8 +1853,8 @@ void TQLayoutWidget::updateSizePolicy() if ( w->sizePolicy().mayShrinkVertically() ) vt |= TQSizePolicy::Maximum; } - } else if ( layout()->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) ) { - if ( parentLayout && parentLayout->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) ) + } else if ( layout()->inherits("TQHBoxLayout") ) { + if ( parentLayout && parentLayout->inherits("TQVBoxLayout") ) ht = TQSizePolicy::Minimum; else ht = TQSizePolicy::Fixed; @@ -1874,13 +1874,13 @@ void TQLayoutWidget::updateSizePolicy() if ( !w->sizePolicy().mayShrinkVertically() ) vt &= ~TQSizePolicy::Maximum; } - } else if ( layout()->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) { + } else if ( layout()->inherits("TQGridLayout") ) { ht = TQSizePolicy::Fixed; vt = TQSizePolicy::Fixed; if ( parentLayout ) { - if ( parentLayout->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) ) + if ( parentLayout->inherits("TQVBoxLayout") ) ht = TQSizePolicy::Minimum; - else if ( parentLayout->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) ) + else if ( parentLayout->inherits("TQHBoxLayout") ) vt = TQSizePolicy::Minimum; } diff --git a/kommander/editor/widgetfactory.h b/kommander/editor/widgetfactory.h index 2341b676..c844cfc4 100644 --- a/kommander/editor/widgetfactory.h +++ b/kommander/editor/widgetfactory.h @@ -381,13 +381,13 @@ public: : TQToolButton( parent, name ) {} bool isInButtonGroup() const { - return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ); + return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ); } int buttonGroupId() const { - return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; + return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; } void setButtonGroupId( int id ) { - if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) { + if ( parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ) { ( (TQButtonGroup*)parentWidget() )->remove( this ); ( (TQButtonGroup*)parentWidget() )->insert( this, id ); } @@ -405,13 +405,13 @@ public: : TQRadioButton( parent, name ) {} bool isInButtonGroup() const { - return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ); + return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ); } int buttonGroupId() const { - return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; + return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; } void setButtonGroupId( int id ) { - if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) { + if ( parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ) { ( (TQButtonGroup*)parentWidget() )->remove( this ); ( (TQButtonGroup*)parentWidget() )->insert( this, id ); } @@ -430,13 +430,13 @@ public: : TQPushButton( parent, name ) {} bool isInButtonGroup() const { - return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ); + return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ); } int buttonGroupId() const { - return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; + return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; } void setButtonGroupId( int id ) { - if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) { + if ( parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ) { ( (TQButtonGroup*)parentWidget() )->remove( this ); ( (TQButtonGroup*)parentWidget() )->insert( this, id ); } @@ -455,13 +455,13 @@ public: : TQCheckBox( parent, name ) {} bool isInButtonGroup() const { - return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ); + return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ); } int buttonGroupId() const { - return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; + return parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; } void setButtonGroupId( int id ) { - if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) { + if ( parentWidget() && parentWidget()->inherits( "TQButtonGroup" ) ) { ( (TQButtonGroup*)parentWidget() )->remove( this ); ( (TQButtonGroup*)parentWidget() )->insert( this, id ); } diff --git a/kommander/examples/current/a1.kmdr b/kommander/examples/current/a1.kmdr index 3b81701d..6e069e9e 100644 --- a/kommander/examples/current/a1.kmdr +++ b/kommander/examples/current/a1.kmdr @@ -49,7 +49,7 @@ debug("pid="+pid)</string> <cstring>StatusBar8</cstring> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout37</cstring> </property> @@ -121,7 +121,7 @@ debug("pid="+pid)</string> <string>and again</string> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout83</cstring> </property> @@ -185,7 +185,7 @@ StatusBar8.setText("Returned: "+b)</string> </spacer> </hbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout84</cstring> </property> diff --git a/kommander/examples/current/editor-poc.kmdr b/kommander/examples/current/editor-poc.kmdr index 3713cb84..2cc912c4 100644 --- a/kommander/examples/current/editor-poc.kmdr +++ b/kommander/examples/current/editor-poc.kmdr @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>KEdemo</class> -<widget class=TQMAINWINDOW_OBJECT_NAME_STRING> +<widget class="TQMainWindow"> <property name="name"> <cstring>KEdemo</cstring> </property> @@ -331,7 +331,7 @@ debug("Clicked at: "+Self.Item(0)+" "+Self.Item(1)) <property name="spacing"> <number>6</number> </property> - <widget class=TQSPLITTER_OBJECT_NAME_STRING row="0" column="0" rowspan="2" colspan="2"> + <widget class="TQSplitter" row="0" column="0" rowspan="2" colspan="2"> <property name="name"> <cstring>Splitter5</cstring> </property> diff --git a/kommander/examples/current/keyvaluecombo.kmdr b/kommander/examples/current/keyvaluecombo.kmdr index 489c4f6d..a318d185 100644 --- a/kommander/examples/current/keyvaluecombo.kmdr +++ b/kommander/examples/current/keyvaluecombo.kmdr @@ -63,7 +63,7 @@ PopupMenu1.insertMenuItem("Help About", "PopupMenu1", 10) <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout27</cstring> </property> @@ -100,7 +100,7 @@ PopupMenu1.insertMenuItem("Help About", "PopupMenu1", 10) </widget> </hbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout30</cstring> </property> @@ -122,7 +122,7 @@ PopupMenu1.insertMenuItem("Help About", "PopupMenu1", 10) <string>Right click for menu</string> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="2"> + <widget class="TQLayoutWidget" row="0" column="2"> <property name="name"> <cstring>Layout24</cstring> </property> @@ -164,7 +164,7 @@ PopupMenu1.insertMenuItem("Help About", "PopupMenu1", 10) </widget> </vbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout23</cstring> </property> @@ -227,7 +227,7 @@ PopupMenu1.insertMenuItem("Help About", "PopupMenu1", 10) </widget> </grid> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> <cstring>Layout31</cstring> </property> diff --git a/kommander/examples/current/kpartmwframe.kmdr b/kommander/examples/current/kpartmwframe.kmdr index 7d15aecf..7211785b 100644 --- a/kommander/examples/current/kpartmwframe.kmdr +++ b/kommander/examples/current/kpartmwframe.kmdr @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>KKPdemo</class> -<widget class=TQMAINWINDOW_OBJECT_NAME_STRING> +<widget class="TQMainWindow"> <property name="name"> <cstring>KKPdemo</cstring> </property> @@ -58,7 +58,7 @@ </sizepolicy> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout5</cstring> </property> diff --git a/kommander/examples/current/kpartpart.kmdr b/kommander/examples/current/kpartpart.kmdr index d6e83b95..c7fc0dbb 100644 --- a/kommander/examples/current/kpartpart.kmdr +++ b/kommander/examples/current/kpartpart.kmdr @@ -51,7 +51,7 @@ Because of all this and the fact that the Actions on the unsupported MainWindow This demo is intended to run both kpartwmframe.kmdr and kpartpart.kmdr. </string> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout70</cstring> </property> diff --git a/kommander/examples/current/passvariables.kmdr b/kommander/examples/current/passvariables.kmdr index 3d4b848d..96a83fdb 100644 --- a/kommander/examples/current/passvariables.kmdr +++ b/kommander/examples/current/passvariables.kmdr @@ -279,7 +279,7 @@ echo round(@Self.Item(1)/@Self.Item(2),5) </size> </property> </spacer> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0" rowspan="1" colspan="7"> + <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="7"> <property name="name"> <cstring>Layout1</cstring> </property> diff --git a/kommander/examples/current/tableselect.kmdr b/kommander/examples/current/tableselect.kmdr index a7d84367..c227acf0 100644 --- a/kommander/examples/current/tableselect.kmdr +++ b/kommander/examples/current/tableselect.kmdr @@ -51,7 +51,7 @@ AboutDialog9.setBugAddress("eric@kdewebdev.org")</string> <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="3" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="1" column="3" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -99,7 +99,7 @@ AboutDialog9.setBugAddress("eric@kdewebdev.org")</string> </widget> </grid> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout1</cstring> </property> diff --git a/kommander/examples/old/execprogram.kmdr b/kommander/examples/old/execprogram.kmdr index ea7e9dad..67914305 100644 --- a/kommander/examples/old/execprogram.kmdr +++ b/kommander/examples/old/execprogram.kmdr @@ -35,7 +35,7 @@ </stringlist> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout2</cstring> </property> diff --git a/kommander/examples/old/firstform.kmdr.kmdr b/kommander/examples/old/firstform.kmdr.kmdr index df90066e..454c2a67 100644 --- a/kommander/examples/old/firstform.kmdr.kmdr +++ b/kommander/examples/old/firstform.kmdr.kmdr @@ -35,7 +35,7 @@ </stringlist> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> diff --git a/kommander/examples/old/form2.kmdr b/kommander/examples/old/form2.kmdr index 23e8e372..272c9b7e 100644 --- a/kommander/examples/old/form2.kmdr +++ b/kommander/examples/old/form2.kmdr @@ -25,7 +25,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -73,7 +73,7 @@ </widget> </vbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> diff --git a/kommander/examples/old/form4.kmdr b/kommander/examples/old/form4.kmdr index 7a5abe1a..db66649e 100644 --- a/kommander/examples/old/form4.kmdr +++ b/kommander/examples/old/form4.kmdr @@ -25,7 +25,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> diff --git a/kommander/examples/old/form5.kmdr b/kommander/examples/old/form5.kmdr index ceba4883..ef7127c2 100644 --- a/kommander/examples/old/form5.kmdr +++ b/kommander/examples/old/form5.kmdr @@ -64,7 +64,7 @@ <bool>true</bool> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -152,7 +152,7 @@ <bool>true</bool> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> diff --git a/kommander/examples/old/newfile.kmdr b/kommander/examples/old/newfile.kmdr index d74528a0..8fd01660 100644 --- a/kommander/examples/old/newfile.kmdr +++ b/kommander/examples/old/newfile.kmdr @@ -15,7 +15,7 @@ <property name="caption"> <string>Quick Start</string> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -31,7 +31,7 @@ <string>Title:</string> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> diff --git a/kommander/examples/old/populate.kmdr b/kommander/examples/old/populate.kmdr index 644faadc..565ba3ee 100644 --- a/kommander/examples/old/populate.kmdr +++ b/kommander/examples/old/populate.kmdr @@ -25,7 +25,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -39,7 +39,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> diff --git a/kommander/examples/old/resize.kmdr b/kommander/examples/old/resize.kmdr index 92f9806b..7ab76276 100644 --- a/kommander/examples/old/resize.kmdr +++ b/kommander/examples/old/resize.kmdr @@ -25,7 +25,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -65,7 +65,7 @@ <enum>Directory</enum> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -73,7 +73,7 @@ <string>Source directory:</string> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -83,7 +83,7 @@ </widget> </grid> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -97,7 +97,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -115,7 +115,7 @@ </stringlist> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -152,7 +152,7 @@ </spacer> </hbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout4</cstring> </property> diff --git a/kommander/examples/old/selectedwidgettext.kmdr b/kommander/examples/old/selectedwidgettext.kmdr index ddb6d0ba..c91629c9 100644 --- a/kommander/examples/old/selectedwidgettext.kmdr +++ b/kommander/examples/old/selectedwidgettext.kmdr @@ -50,7 +50,7 @@ </stringlist> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> diff --git a/kommander/examples/old/settings.kmdr b/kommander/examples/old/settings.kmdr index b7037ea9..988dc3f9 100644 --- a/kommander/examples/old/settings.kmdr +++ b/kommander/examples/old/settings.kmdr @@ -35,7 +35,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout7</cstring> </property> @@ -49,7 +49,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -83,7 +83,7 @@ </stringlist> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout6</cstring> </property> @@ -97,7 +97,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout5</cstring> </property> @@ -158,7 +158,7 @@ Items") </widget> </vbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout2</cstring> </property> diff --git a/kommander/examples/old/simplelist.kmdr b/kommander/examples/old/simplelist.kmdr index 6435f181..f1123039 100644 --- a/kommander/examples/old/simplelist.kmdr +++ b/kommander/examples/old/simplelist.kmdr @@ -15,7 +15,7 @@ <property name="caption"> <string>Form1</string> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> diff --git a/kommander/examples/old/tar.kmdr b/kommander/examples/old/tar.kmdr index 128f324d..840ac02c 100644 --- a/kommander/examples/old/tar.kmdr +++ b/kommander/examples/old/tar.kmdr @@ -131,7 +131,7 @@ </widget> </vbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout9</cstring> </property> @@ -288,7 +288,7 @@ </size> </property> </spacer> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout7</cstring> </property> @@ -329,7 +329,7 @@ </widget> </hbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout5</cstring> </property> @@ -343,7 +343,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -358,7 +358,7 @@ </widget> </vbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout6</cstring> </property> @@ -372,7 +372,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -390,7 +390,7 @@ </widget> </vbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout7</cstring> </property> diff --git a/kommander/examples/old/tidy.kmdr b/kommander/examples/old/tidy.kmdr index 785b9dcf..e8641450 100644 --- a/kommander/examples/old/tidy.kmdr +++ b/kommander/examples/old/tidy.kmdr @@ -29,7 +29,7 @@ <property name="name"> <cstring>TabWidget1</cstring> </property> - <widget class=TQWIDGET_OBJECT_NAME_STRING> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -51,7 +51,7 @@ <property name="title"> <string>Non Tidy Option</string> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -119,7 +119,7 @@ instances of Quanta running.</string> </stringlist> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -356,7 +356,7 @@ instances of Quanta running.</string> </property> </widget> </widget> - <widget class=TQWIDGET_OBJECT_NAME_STRING> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -373,7 +373,7 @@ instances of Quanta running.</string> <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -477,7 +477,7 @@ instances of Quanta running.</string> </stringlist> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -541,7 +541,7 @@ instances of Quanta running.</string> </stringlist> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -613,7 +613,7 @@ instances of Quanta running.</string> </widget> </grid> </widget> - <widget class=TQWIDGET_OBJECT_NAME_STRING> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -889,7 +889,7 @@ instances of Quanta running.</string> </widget> </grid> </widget> - <widget class=TQWIDGET_OBJECT_NAME_STRING> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> diff --git a/kommander/examples/old/widgetgenerator.kmdr b/kommander/examples/old/widgetgenerator.kmdr index 45f441fa..d4ebfc78 100644 --- a/kommander/examples/old/widgetgenerator.kmdr +++ b/kommander/examples/old/widgetgenerator.kmdr @@ -25,7 +25,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout12</cstring> </property> @@ -274,7 +274,7 @@ echo "$cppContent" > @directory/$classNameLower.cpp</string> </spacer> </hbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout37</cstring> </property> @@ -288,7 +288,7 @@ echo "$cppContent" > @directory/$classNameLower.cpp</string> <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -296,7 +296,7 @@ echo "$cppContent" > @directory/$classNameLower.cpp</string> <string>Author:</string> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel6</cstring> </property> @@ -304,7 +304,7 @@ echo "$cppContent" > @directory/$classNameLower.cpp</string> <string>Email:</string> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -312,7 +312,7 @@ echo "$cppContent" > @directory/$classNameLower.cpp</string> <string>Description:</string> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -320,7 +320,7 @@ echo "$cppContent" > @directory/$classNameLower.cpp</string> <string>Date started:</string> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -328,7 +328,7 @@ echo "$cppContent" > @directory/$classNameLower.cpp</string> <string>Class name:</string> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel7</cstring> </property> @@ -336,7 +336,7 @@ echo "$cppContent" > @directory/$classNameLower.cpp</string> <string>Base class name:</string> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel5</cstring> </property> @@ -346,7 +346,7 @@ echo "$cppContent" > @directory/$classNameLower.cpp</string> </widget> </vbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> <cstring>Layout36</cstring> </property> diff --git a/kommander/examples/old/wizard.kmdr b/kommander/examples/old/wizard.kmdr index ed07ab03..352aaef3 100644 --- a/kommander/examples/old/wizard.kmdr +++ b/kommander/examples/old/wizard.kmdr @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>Wizard1</class> -<widget class=TQWIZARD_OBJECT_NAME_STRING> +<widget class="TQWizard"> <property name="name"> <cstring>Wizard1</cstring> </property> @@ -15,7 +15,7 @@ <property name="caption"> <string>Demo Wizard</string> </property> - <widget class=TQWIDGET_OBJECT_NAME_STRING> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -132,7 +132,7 @@ </property> </widget> </widget> - <widget class=TQWIDGET_OBJECT_NAME_STRING> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -189,7 +189,7 @@ </property> </widget> </widget> - <widget class=TQWIDGET_OBJECT_NAME_STRING> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> diff --git a/kommander/examples/tutorial/append.kmdr b/kommander/examples/tutorial/append.kmdr index d9c07451..b30c318c 100644 --- a/kommander/examples/tutorial/append.kmdr +++ b/kommander/examples/tutorial/append.kmdr @@ -40,7 +40,7 @@ </stringlist> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout2</cstring> </property> diff --git a/kommander/examples/tutorial/arrays.kmdr b/kommander/examples/tutorial/arrays.kmdr index d0ae1d5e..b4a0ec5d 100644 --- a/kommander/examples/tutorial/arrays.kmdr +++ b/kommander/examples/tutorial/arrays.kmdr @@ -36,7 +36,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -93,7 +93,7 @@ </stringlist> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="3" column="0"> + <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> <cstring>Layout4</cstring> </property> diff --git a/kommander/examples/tutorial/calc.kmdr b/kommander/examples/tutorial/calc.kmdr index cfe7233f..3308b2e3 100644 --- a/kommander/examples/tutorial/calc.kmdr +++ b/kommander/examples/tutorial/calc.kmdr @@ -32,7 +32,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> <cstring>Layout7</cstring> </property> @@ -46,7 +46,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -124,7 +124,7 @@ </widget> </vbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -138,7 +138,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -146,7 +146,7 @@ <string>Expression:</string> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="4" column="0"> + <widget class="TQLayoutWidget" row="4" column="0"> <property name="name"> <cstring>Layout1</cstring> </property> diff --git a/kommander/examples/tutorial/dcop.kmdr b/kommander/examples/tutorial/dcop.kmdr index a4fe69fc..0d591cf5 100644 --- a/kommander/examples/tutorial/dcop.kmdr +++ b/kommander/examples/tutorial/dcop.kmdr @@ -35,7 +35,7 @@ </stringlist> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout2</cstring> </property> diff --git a/kommander/examples/tutorial/dialogs.kmdr b/kommander/examples/tutorial/dialogs.kmdr index cb3c81e2..fd5b678f 100644 --- a/kommander/examples/tutorial/dialogs.kmdr +++ b/kommander/examples/tutorial/dialogs.kmdr @@ -85,7 +85,7 @@ ListBox1.setText(a) </stringlist> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout1</cstring> </property> diff --git a/kommander/examples/tutorial/globals.kmdr b/kommander/examples/tutorial/globals.kmdr index 33d5dd40..d4d92d89 100644 --- a/kommander/examples/tutorial/globals.kmdr +++ b/kommander/examples/tutorial/globals.kmdr @@ -32,7 +32,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout1</cstring> </property> diff --git a/kommander/examples/tutorial/initialize.kmdr b/kommander/examples/tutorial/initialize.kmdr index 9dde0bfc..96239366 100644 --- a/kommander/examples/tutorial/initialize.kmdr +++ b/kommander/examples/tutorial/initialize.kmdr @@ -35,7 +35,7 @@ dcop @dcopid KommanderIf changeWidgetText CloseLabel "$CLOSE" <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -98,7 +98,7 @@ dcop @dcopid KommanderIf changeWidgetText CloseLabel "$CLOSE" </spacer> </hbox> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>OpenLabel</cstring> </property> @@ -106,7 +106,7 @@ dcop @dcopid KommanderIf changeWidgetText CloseLabel "$CLOSE" <string>Opened:</string> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>CloseLabel</cstring> </property> diff --git a/kommander/examples/tutorial/loop.kmdr b/kommander/examples/tutorial/loop.kmdr index a415a103..d5672338 100644 --- a/kommander/examples/tutorial/loop.kmdr +++ b/kommander/examples/tutorial/loop.kmdr @@ -79,7 +79,7 @@ </stringlist> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -93,7 +93,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> diff --git a/kommander/examples/tutorial/picview.kmdr b/kommander/examples/tutorial/picview.kmdr index c01a10e9..1617b53d 100644 --- a/kommander/examples/tutorial/picview.kmdr +++ b/kommander/examples/tutorial/picview.kmdr @@ -52,7 +52,7 @@ <enum>Directory</enum> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout2</cstring> </property> diff --git a/kommander/examples/tutorial/settings.kmdr b/kommander/examples/tutorial/settings.kmdr index f4aaa0b1..d59d1bcf 100644 --- a/kommander/examples/tutorial/settings.kmdr +++ b/kommander/examples/tutorial/settings.kmdr @@ -32,7 +32,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -46,7 +46,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -69,7 +69,7 @@ </widget> </hbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout5</cstring> </property> diff --git a/kommander/examples/tutorial/slots.kmdr b/kommander/examples/tutorial/slots.kmdr index 6bbf7d5f..d4f2b524 100644 --- a/kommander/examples/tutorial/slots.kmdr +++ b/kommander/examples/tutorial/slots.kmdr @@ -30,7 +30,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -44,7 +44,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -68,7 +68,7 @@ </widget> </hbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -82,7 +82,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -105,7 +105,7 @@ </widget> </vbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> <cstring>Layout3</cstring> </property> diff --git a/kommander/examples/tutorial/strings.kmdr b/kommander/examples/tutorial/strings.kmdr index 0b4af608..53f3908f 100644 --- a/kommander/examples/tutorial/strings.kmdr +++ b/kommander/examples/tutorial/strings.kmdr @@ -81,7 +81,7 @@ fi </stringlist> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -95,7 +95,7 @@ fi <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -121,7 +121,7 @@ fi </widget> </hbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> <cstring>Layout2</cstring> </property> diff --git a/kommander/examples/tutorial/table.kmdr b/kommander/examples/tutorial/table.kmdr index ff8982d4..8b219269 100644 --- a/kommander/examples/tutorial/table.kmdr +++ b/kommander/examples/tutorial/table.kmdr @@ -77,7 +77,7 @@ </stringlist> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -170,7 +170,7 @@ </spacer> </vbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout4</cstring> </property> diff --git a/kommander/examples/tutorial/tree.kmdr b/kommander/examples/tutorial/tree.kmdr index 0e5d76df..72410f79 100644 --- a/kommander/examples/tutorial/tree.kmdr +++ b/kommander/examples/tutorial/tree.kmdr @@ -33,7 +33,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -109,7 +109,7 @@ </stringlist> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -130,7 +130,7 @@ <enum>Directory</enum> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout3</cstring> </property> diff --git a/kommander/examples/tutorial/widgets.kmdr b/kommander/examples/tutorial/widgets.kmdr index 5f283e49..03123265 100644 --- a/kommander/examples/tutorial/widgets.kmdr +++ b/kommander/examples/tutorial/widgets.kmdr @@ -82,7 +82,7 @@ </stringlist> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -96,7 +96,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> diff --git a/kommander/executor/instance.cpp b/kommander/executor/instance.cpp index 863b0153..e23a206a 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_OBJECT_NAME_STRING)) + if (m_instance->inherits("TQDialog")) dynamic_cast<TQDialog*>((TQWidget*)m_instance)->exec(); - else if (m_instance->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) + else if (m_instance->inherits("TQMainWindow")) { 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_OBJECT_NAME_STRING)) + if (child && child->inherits("TQWidget")) ((TQWidget*)child)->setEnabled(enable); } void Instance::setVisible(const TQString& widgetName, bool visible) { TQObject* child = stringToWidget(widgetName); - if (child && child->inherits(TQWIDGET_OBJECT_NAME_STRING)) + if (child && child->inherits("TQWidget")) ((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_OBJECT_NAME_STRING)) + else if (child && child->inherits("TQLabel")) { 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_OBJECT_NAME_STRING)) + else if (child && child->inherits("TQLabel")) 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_OBJECT_NAME_STRING)) + else if (child && child->inherits("TQLabel")) ((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_OBJECT_NAME_STRING)) + if (child && child->inherits("TQWidget")) return child->className(); return TQString(); } @@ -438,9 +438,9 @@ TQStringList Instance::children(const TQString& parent, bool recursive) TQObjectList* widgets; if (!child) child = TQT_TQOBJECT(m_instance); - if (child->inherits(TQWIDGET_OBJECT_NAME_STRING)) + if (child->inherits("TQWidget")) { - widgets = child->queryList(TQWIDGET_OBJECT_NAME_STRING, 0, false, recursive); + widgets = child->queryList("TQWidget", 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 3f7b91c3..c81ec3ad 100644 --- a/kommander/factory/kommanderfactory.cpp +++ b/kommander/factory/kommanderfactory.cpp @@ -217,7 +217,7 @@ TQWidget *KommanderFactory::create( TQIODevice *dev, TQObject *connector, TQWidg if ( !imageCollection.isNull() ) widgetFactory->loadImageCollection( imageCollection ); - widgetFactory->createWidgetInternal( widget, parent, 0, widget.attribute("class", TQWIDGET_OBJECT_NAME_STRING) ); + widgetFactory->createWidgetInternal( widget, parent, 0, widget.attribute("class", "TQWidget") ); TQWidget *w = widgetFactory->toplevel; if ( !w ) { delete widgetFactory; @@ -266,7 +266,7 @@ TQWidget *KommanderFactory::create( TQIODevice *dev, TQObject *connector, TQWidg } for ( TQMap<TQString, TQStringList>::Iterator it = widgetFactory->dbTables.begin(); it != widgetFactory->dbTables.end(); ++it ) { - TQDataTable *table = (TQDataTable*)widgetFactory->toplevel->child( it.key(), TQDATATABLE_OBJECT_NAME_STRING ); + TQDataTable *table = (TQDataTable*)widgetFactory->toplevel->child( it.key(), "TQDataTable" ); if ( !table ) continue; if ( widgetFactory->noDatabaseWidgets.find( table->name() ) != widgetFactory->noDatabaseWidgets.end() ) @@ -292,8 +292,8 @@ TQWidget *KommanderFactory::create( TQIODevice *dev, TQObject *connector, TQWidg } for ( TQMap<TQString, TQString>::Iterator it = widgetFactory->buddies.begin(); it != widgetFactory->buddies.end(); ++it ) { - TQLabel *label = (TQLabel*)widgetFactory->toplevel->child( it.key(), TQLABEL_OBJECT_NAME_STRING ); - TQWidget *buddy = (TQWidget*)widgetFactory->toplevel->child( *it, TQWIDGET_OBJECT_NAME_STRING ); + TQLabel *label = (TQLabel*)widgetFactory->toplevel->child( it.key(), "TQLabel" ); + TQWidget *buddy = (TQWidget*)widgetFactory->toplevel->child( *it, "TQWidget" ); if ( label && buddy ) label->setBuddy( buddy ); } @@ -315,77 +315,77 @@ TQWidget *KommanderFactory::createWidget( const TQString &literalClassName, TQWi TQString className = literalClassName; // create widgets we know - if (className == TQPUSHBUTTON_OBJECT_NAME_STRING) + if (className == "TQPushButton") return new TQPushButton(parent, name); - else if (className == TQTOOLBUTTON_OBJECT_NAME_STRING) + else if (className == "TQToolButton") return new TQToolButton(parent, name); - else if (className == TQCHECKBOX_OBJECT_NAME_STRING) + else if (className == "TQCheckBox") return new TQCheckBox(parent, name); - else if (className == TQRADIOBUTTON_OBJECT_NAME_STRING) + else if (className == "TQRadioButton") return new TQRadioButton(parent, name); - else if (className == TQGROUPBOX_OBJECT_NAME_STRING) + else if (className == "TQGroupBox") return new TQGroupBox(parent, name); - else if (className == TQBUTTONGROUP_OBJECT_NAME_STRING) + else if (className == "TQButtonGroup") return new TQButtonGroup(parent, name); - else if (className == TQICONVIEW_OBJECT_NAME_STRING) + else if (className == "TQIconView") { #if !defined(TQT_NO_ICONVIEW) return new TQIconView(parent, name); #endif } - else if (className == TQTABLE_OBJECT_NAME_STRING) + else if (className == "TQTable") { #if !defined(TQT_NO_TABLE) return new TQTable(parent, name); #endif } - else if (className == TQLISTBOX_OBJECT_NAME_STRING) + else if (className == "TQListBox") return new TQListBox(parent, name); - else if (className == TQLISTVIEW_OBJECT_NAME_STRING) + else if (className == "TQListView") return new TQListView(parent, name); - else if (className == TQLINEEDIT_OBJECT_NAME_STRING) + else if (className == "TQLineEdit") return new TQLineEdit(parent, name); - else if (className == TQSPINBOX_OBJECT_NAME_STRING) + else if (className == "TQSpinBox") return new TQSpinBox(parent, name); - else if (className == TQMULTILINEEDIT_OBJECT_NAME_STRING) + else if (className == "TQMultiLineEdit") return new TQMultiLineEdit(parent, name); - else if (className == TQLABEL_OBJECT_NAME_STRING) + else if (className == "TQLabel") return new TQLabel(parent, name); - else if (className == TQLAYOUTWIDGET_OBJECT_NAME_STRING) + else if (className == "TQLayoutWidget") return new TQWidget(parent, name); - else if (className == TQTABWIDGET_OBJECT_NAME_STRING) + else if (className == "TQTabWidget") return new TQTabWidget(parent, name); - else if (className == TQCOMBOBOX_OBJECT_NAME_STRING) + else if (className == "TQComboBox") return new TQComboBox(false, parent, name); - else if (className == TQWIDGET_OBJECT_NAME_STRING) + else if (className == "TQWidget") { if (!qwf_stays_on_top) return new TQWidget(parent, name); return new TQWidget(parent, name, TQt::WStyle_StaysOnTop); } - else if (className == TQDIALOG_OBJECT_NAME_STRING) + else if (className == "TQDialog") { if (!qwf_stays_on_top) return new TQDialog(parent, name); return new TQDialog(parent, name, false, TQt::WStyle_StaysOnTop); } - else if (className == TQWIZARD_OBJECT_NAME_STRING) + else if (className == "TQWizard") return new TQWizard(parent, name); - else if (className == TQLCDNUMBER_OBJECT_NAME_STRING) + else if (className == "TQLCDNumber") return new TQLCDNumber(parent, name); - else if (className == TQPROGRESSBAR_OBJECT_NAME_STRING) + else if (className == "TQProgressBar") return new TQProgressBar(parent, name); - else if (className == TQTEXTVIEW_OBJECT_NAME_STRING) + else if (className == "TQTextView") return new TQTextView(parent, name); - else if (className == TQTEXTBROWSER_OBJECT_NAME_STRING) + else if (className == "TQTextBrowser") return new TQTextBrowser(parent, name); - else if (className == TQDIAL_OBJECT_NAME_STRING) + else if (className == "TQDial") return new TQDial(parent, name); - else if (className == TQSLIDER_OBJECT_NAME_STRING) + else if (className == "TQSlider") return new TQSlider(parent, name); - else if (className == TQFRAME_OBJECT_NAME_STRING) + else if (className == "TQFrame") return new TQFrame(parent, name); - else if (className == TQSPLITTER_OBJECT_NAME_STRING) + else if (className == "TQSplitter") return new TQSplitter(parent, name); else if (className == "Line") { @@ -393,21 +393,21 @@ TQWidget *KommanderFactory::createWidget( const TQString &literalClassName, TQWi f->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); return f; } - else if (className == TQTEXTEDIT_OBJECT_NAME_STRING) + else if (className == "TQTextEdit") return new TQTextEdit(parent, name); - else if (className == TQDATEEDIT_OBJECT_NAME_STRING) + else if (className == "TQDateEdit") return new TQDateEdit(parent, name); - else if (className == TQTIMEEDIT_OBJECT_NAME_STRING) + else if (className == "TQTimeEdit") return new TQTimeEdit(parent, name); - else if (className == TQDATETIMEEDIT_OBJECT_NAME_STRING) + else if (className == "TQDateTimeEdit") return new TQDateTimeEdit(parent, name); - else if (className == TQSCROLLBAR_OBJECT_NAME_STRING) + else if (className == "TQScrollBar") return new TQScrollBar(parent, name); - else if (className == TQPOPUPMENU_OBJECT_NAME_STRING) + else if (className == "TQPopupMenu") return new TQPopupMenu(parent, name); - else if (className == TQWIDGETSTACK_OBJECT_NAME_STRING) + else if (className == "TQWidgetStack") return new TQWidgetStack(parent, name); - else if (className == TQMAINWINDOW_OBJECT_NAME_STRING) + else if (className == "TQMainWindow") { TQMainWindow *mw = 0; if (!qwf_stays_on_top) @@ -420,11 +420,11 @@ TQWidget *KommanderFactory::createWidget( const TQString &literalClassName, TQWi return mw; } #if !defined(TQT_NO_SQL) - else if (className == TQDATATABLE_OBJECT_NAME_STRING) + else if (className == "TQDataTable") return new TQDataTable(parent, name); - else if (className == TQDATABROWSER_OBJECT_NAME_STRING) + else if (className == "TQDataBrowser") return new QDesignerDataBrowser2(parent, name); - else if (className == TQDATAVIEW_OBJECT_NAME_STRING) + else if (className == "TQDataView") return new QDesignerDataView2(parent, name); #endif @@ -515,9 +515,9 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge if ( colspan < 1 ) colspan = 1; if ( !className.isEmpty() ) { - if ( !layout && className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) - className = TQWIDGET_OBJECT_NAME_STRING; - if ( layout && className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) { + if ( !layout && className == "TQLayoutWidget" ) + className = "TQWidget"; + if ( layout && className == "TQLayoutWidget" ) { // hide layout widgets w = parent; } else { @@ -529,7 +529,7 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge w = (TQWidget*)obj; if ( !toplevel ) toplevel = w; - if ( w->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) + if ( w->inherits( "TQMainWindow" ) ) w = ( (TQMainWindow*)w )->centralWidget(); if ( layout ) { switch( layoutType( layout ) ) { @@ -559,39 +559,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_OBJECT_NAME_STRING ) ); + createWidgetInternal( n, w, layout, n.attribute( "class", "TQWidget" ) ); dbControls = oldDbControls; } else if ( n.tagName() == "hbox" ) { TQLayout *parentLayout = layout; - if ( layout && layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) + if ( layout && layout->inherits( "TQGridLayout" ) ) layout = createLayout( 0, 0, KommanderFactory::HBox ); else layout = createLayout( w, layout, KommanderFactory::HBox ); obj = TQT_TQOBJECT(layout); n = n.firstChild().toElement(); - if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) + if ( parentLayout && parentLayout->inherits( "TQGridLayout" ) ) ( (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_OBJECT_NAME_STRING ) ) + if ( layout && layout->inherits( "TQGridLayout" ) ) layout = createLayout( 0, 0, KommanderFactory::Grid ); else layout = createLayout( w, layout, KommanderFactory::Grid ); obj = TQT_TQOBJECT(layout); n = n.firstChild().toElement(); - if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) + if ( parentLayout && parentLayout->inherits( "TQGridLayout" ) ) ( (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_OBJECT_NAME_STRING ) ) + if ( layout && layout->inherits( "TQGridLayout" ) ) layout = createLayout( 0, 0, KommanderFactory::VBox ); else layout = createLayout( w, layout, KommanderFactory::VBox ); obj = TQT_TQOBJECT(layout); n = n.firstChild().toElement(); - if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) + if ( parentLayout && parentLayout->inherits( "TQGridLayout" ) ) ( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row, row + rowspan - 1, col, col + colspan - 1 ); continue; } else if ( n.tagName() == "property" && obj ) { @@ -599,14 +599,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_OBJECT_NAME_STRING ) ) { + if ( parent->inherits( "TQTabWidget" ) ) { if ( attrib == "title" ) ( (TQTabWidget*)parent )->insertTab( w, translate(v.toString()) ); } else - if ( parent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) { + if ( parent->inherits( "TQToolBox" ) ) { if ( attrib == "label" ) ( (TQToolBox*)parent )->addItem( w, translate(v.toString()) ); - }else if ( parent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) { + }else if ( parent->inherits( "TQWizard" ) ) { if ( attrib == "title" ) ( (TQWizard*)parent )->addPage( w, translate(v.toString()) ); } @@ -627,18 +627,18 @@ TQLayout *KommanderFactory::createLayout( TQWidget *widget, TQLayout* layout, L int spacing = defSpacing; int margin = defMargin; - if ( !layout && widget && widget->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) + if ( !layout && widget && widget->inherits( "TQTabWidget" ) ) widget = ((TQTabWidget*)widget)->currentPage(); - if ( !layout && widget && widget->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) + if ( !layout && widget && widget->inherits( "TQToolBox" ) ) widget = ((TQToolBox*)widget)->currentItem(); - if ( !layout && widget && widget->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) + if ( !layout && widget && widget->inherits( "TQWizard" ) ) widget = ((TQWizard*)widget)->currentPage(); - if ( !layout && widget && widget->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) + if ( !layout && widget && widget->inherits( "TQWidgetStack" ) ) widget = ((TQWidgetStack*)widget)->visibleWidget(); - if ( !layout && widget && widget->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) { + if ( !layout && widget && widget->inherits( "TQGroupBox" ) ) { TQGroupBox *gb = (TQGroupBox*)widget; gb->setColumnLayout( 0, Qt::Vertical ); gb->layout()->setMargin( 0 ); @@ -717,11 +717,11 @@ TQLayout *KommanderFactory::createLayout( TQWidget *widget, TQLayout* layout, L KommanderFactory::LayoutType KommanderFactory::layoutType( TQLayout *layout ) const { - if ( layout->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) ) + if ( layout->inherits( "TQHBoxLayout" ) ) return HBox; - else if ( layout->inherits( TQVBOXLAYOUT_OBJECT_NAME_STRING ) ) + else if ( layout->inherits( "TQVBoxLayout" ) ) return VBox; - else if ( layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) + else if ( layout->inherits( "TQGridLayout" ) ) return Grid; return NoLayout; } @@ -767,8 +767,8 @@ void KommanderFactory::setProperty( TQObject* obj, const TQString &prop, const T TQWhatsThis::add( (TQWidget*)obj, translate(v.toString()) ); } #ifndef TQT_NO_SQL - if ( prop == "database" && !obj->inherits( TQDATAVIEW_OBJECT_NAME_STRING ) - && !obj->inherits( TQDATABROWSER_OBJECT_NAME_STRING ) ) { + if ( prop == "database" && !obj->inherits( "TQDataView" ) + && !obj->inherits( "TQDataBrowser" ) ) { TQStringList lst = DomTool::elementToVariant( e, TQVariant( TQStringList() ) ).toStringList(); if ( lst.count() > 2 ) { if ( dbControls ) @@ -778,7 +778,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_OBJECT_NAME_STRING ) ) { + if ( lst.count() == 2 && obj->inherits( "TQWidget" ) ) { SqlWidgetConnection conn( lst[ 0 ], lst[ 1 ] ); sqlWidgetConnections.insert( (TQWidget*)obj, conn ); dbControls = conn.dbControls; @@ -792,7 +792,7 @@ void KommanderFactory::setProperty( TQObject* obj, const TQString &prop, const T noDatabaseWidgets << obj->name(); } } else if ( prop == "buttonGroupId" ) { - if ( obj->inherits( TQBUTTON_OBJECT_NAME_STRING ) && obj->parent()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) + if ( obj->inherits( "TQButton" ) && obj->parent()->inherits( "TQButtonGroup" ) ) ( (TQButtonGroup*)obj->parent() )->insert( (TQButton*)obj, v.toInt() ); } @@ -887,7 +887,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_OBJECT_NAME_STRING ) ) + if ( layout->inherits( "TQBoxLayout" ) ) ( (TQBoxLayout*)layout )->addItem( item ); else ( (TQGridLayout*)layout )->addMultiCell( item, row, row + rowspan - 1, col, col + colspan - 1, @@ -1151,7 +1151,7 @@ void KommanderFactory::loadTabOrder( const TQDomElement &e ) void KommanderFactory::createColumn( const TQDomElement &e, TQWidget *widget ) { - if ( widget->inherits( TQLISTVIEW_OBJECT_NAME_STRING ) && e.tagName() == "column" ) { + if ( widget->inherits( "TQListView" ) && e.tagName() == "column" ) { TQListView *lv = (TQListView*)widget; TQDomElement n = e.firstChild().toElement(); TQPixmap pix; @@ -1185,10 +1185,10 @@ void KommanderFactory::createColumn( const TQDomElement &e, TQWidget *widget ) lv->header()->setResizeEnabled( resizeable, i ); } #ifndef TQT_NO_TABLE - else if ( widget->inherits( TQTABLE_OBJECT_NAME_STRING ) ) { + else if ( widget->inherits( "TQTable" ) ) { TQTable *table = (TQTable*)widget; #ifndef TQT_NO_SQL - bool isSql = (widget->inherits( TQDATATABLE_OBJECT_NAME_STRING )); + bool isSql = (widget->inherits( "TQDataTable" )); #endif bool isRow; if ( ( isRow = e.tagName() == "row" ) ) @@ -1273,14 +1273,14 @@ void KommanderFactory::loadItem( const TQDomElement &e, TQPixmap &pix, TQString void KommanderFactory::createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i ) { - if ( widget->inherits( TQLISTBOX_OBJECT_NAME_STRING ) || widget->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) { + if ( widget->inherits( "TQListBox" ) || widget->inherits( "TQComboBox" ) ) { TQDomElement n = e.firstChild().toElement(); TQPixmap pix; bool hasPixmap = false; TQString txt; loadItem( n, pix, txt, hasPixmap ); TQListBox *lb = 0; - if ( widget->inherits( TQLISTBOX_OBJECT_NAME_STRING ) ) + if ( widget->inherits( "TQListBox" ) ) lb = (TQListBox*)widget; else lb = ( (TQComboBox*)widget)->listBox(); @@ -1290,7 +1290,7 @@ void KommanderFactory::createItem( const TQDomElement &e, TQWidget *widget, TQLi new TQListBoxText( lb, txt ); } #ifndef TQT_NO_ICONVIEW - } else if ( widget->inherits( TQICONVIEW_OBJECT_NAME_STRING ) ) { + } else if ( widget->inherits( "TQIconView" ) ) { TQDomElement n = e.firstChild().toElement(); TQPixmap pix; bool hasPixmap = false; @@ -1300,7 +1300,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_OBJECT_NAME_STRING ) ) { + } else if ( widget->inherits( "TQListView" ) ) { TQDomElement n = e.firstChild().toElement(); TQPixmap pix; TQValueList<TQPixmap> pixmaps; @@ -1361,7 +1361,7 @@ void KommanderFactory::loadChildAction( TQObject *parent, const TQDomElement &e } n2 = n2.nextSibling().toElement(); } - if ( !parent->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !parent->inherits( "TQAction" ) ) actionList.append( a ); } else if ( n.tagName() == "actiongroup" ) { a = new TQActionGroup( parent ); @@ -1378,7 +1378,7 @@ void KommanderFactory::loadChildAction( TQObject *parent, const TQDomElement &e } n2 = n2.nextSibling().toElement(); } - if ( !parent->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !parent->inherits( "TQAction" ) ) actionList.append( a ); } if ( a ) @@ -1418,7 +1418,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_OBJECT_NAME_STRING ) ); + (void)createWidgetInternal( n2, tb, 0, n2.attribute( "class", "TQWidget" ) ); } else if ( n2.tagName() == "property" ) { setProperty( TQT_TQOBJECT(tb), n2.attribute( "name" ), n2.firstChild().toElement() ); } @@ -1463,7 +1463,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_OBJECT_NAME_STRING ); + TQAction *ac = (TQAction*)a->child( name.latin1(), "TQAction" ); if ( ac ) return ac; } diff --git a/kommander/kmdrtools/dcoptool-oldparser.kmdr b/kommander/kmdrtools/dcoptool-oldparser.kmdr index f4d758ca..6a21755a 100644 --- a/kommander/kmdrtools/dcoptool-oldparser.kmdr +++ b/kommander/kmdrtools/dcoptool-oldparser.kmdr @@ -131,7 +131,7 @@ args(QString,QString,QString,QString)") <string></string> </stringlist> </property> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout9</cstring> </property> @@ -224,7 +224,7 @@ args(QString,QString,QString,QString)") </stringlist> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -247,7 +247,7 @@ args(QString,QString,QString,QString)") </widget> </vbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout10</cstring> </property> @@ -269,7 +269,7 @@ args(QString,QString,QString,QString)") <property name="spacing"> <number>6</number> </property> - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -326,7 +326,7 @@ args(QString,QString,QString,QString)") </widget> </vbox> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout11</cstring> </property> @@ -578,7 +578,7 @@ fi </stringlist> </property> </widget> - <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> diff --git a/kommander/kmdrtools/examples.kmdr b/kommander/kmdrtools/examples.kmdr index b5a5f5d7..ae3a8ad4 100644 --- a/kommander/kmdrtools/examples.kmdr +++ b/kommander/kmdrtools/examples.kmdr @@ -75,7 +75,7 @@ end <number>0</number> </property> </widget> - <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout90</cstring> </property> diff --git a/kommander/widget/functionlib.cpp b/kommander/widget/functionlib.cpp index cd7b6f4c..dca811e5 100644 --- a/kommander/widget/functionlib.cpp +++ b/kommander/widget/functionlib.cpp @@ -353,7 +353,7 @@ static ParseNode f_dcop(Parser*, const ParameterList& params) byteDataStream << params[i++].toDouble(); else if (*it == "bool") byteDataStream << (bool)params[i++].toInt(); - else if (*it == TQSTRINGLIST_OBJECT_NAME_STRING) + else if (*it == "TQStringList") if (params[i].toString().find('\n') != -1) byteDataStream << TQStringList::split("\n", params[i++].toString(), true); else @@ -371,7 +371,7 @@ static ParseNode f_dcop(Parser*, const ParameterList& params) return ParseNode(); } TQDataStream byteReplyStream(byteReply, IO_ReadOnly); - if (replyType == TQSTRING_OBJECT_NAME_STRING) + if (replyType == "TQString") { TQString text; byteReplyStream >> text; @@ -389,7 +389,7 @@ static ParseNode f_dcop(Parser*, const ParameterList& params) byteReplyStream >> b; return b; } - else if (replyType == TQSTRINGLIST_OBJECT_NAME_STRING) + else if (replyType == "TQStringList") { TQStringList text; byteReplyStream >> text; diff --git a/kommander/widget/kommanderwidget.cpp b/kommander/widget/kommanderwidget.cpp index 7d80c8db..5ccb8375 100644 --- a/kommander/widget/kommanderwidget.cpp +++ b/kommander/widget/kommanderwidget.cpp @@ -295,7 +295,7 @@ TQString KommanderWidget::DCOPQuery(const TQStringList& a_query) byteDataStream << a_query[i+3].toDouble(); else if (argTypes[i] == "bool") byteDataStream << (bool)(a_query[i+3] != "false" && a_query[i+3] != "false" && a_query[i+3] != "0"); - else if (argTypes[i] == TQSTRINGLIST_OBJECT_NAME_STRING) + else if (argTypes[i] == "TQStringList") if (a_query[i+3].find('\n') != -1) byteDataStream << TQStringList::split("\n", a_query[i+3], true); else @@ -312,7 +312,7 @@ TQString KommanderWidget::DCOPQuery(const TQStringList& a_query) } TQDataStream byteReplyStream(byteReply, IO_ReadOnly); - if (replyType == TQSTRING_OBJECT_NAME_STRING) + if (replyType == "TQString") { TQString text; byteReplyStream >> text; @@ -330,7 +330,7 @@ TQString KommanderWidget::DCOPQuery(const TQStringList& a_query) byteReplyStream >> b; return TQString::number(b); } - else if (replyType == TQSTRINGLIST_OBJECT_NAME_STRING) + else if (replyType == "TQStringList") { TQStringList text; byteReplyStream >> text; @@ -413,12 +413,12 @@ void KommanderWidget::printError(const TQString& a_error) const case KDialogBase::Yes: break; case KDialogBase::Cancel: - if (parentDialog()->inherits(TQDIALOG_OBJECT_NAME_STRING)) + if (parentDialog()->inherits("TQDialog")) { parentDialog()->close(); exit(-1); } - else if (parentDialog()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) + else if (parentDialog()->inherits("TQMainWindow")) kapp->quit(); } } @@ -655,7 +655,7 @@ TQWidget* KommanderWidget::parentDialog() const while (superParent->parent()) { superParent = superParent->parent(); - if (superParent->inherits(TQDIALOG_OBJECT_NAME_STRING) || superParent->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) + if (superParent->inherits("TQDialog") || superParent->inherits("TQMainWindow")) 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_OBJECT_NAME_STRING, 0, false, args.count() == 0 || args[0] != "false"); + TQObjectList* widgets = current->queryList("TQWidget", 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 eeb2c79f..30426eb8 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_OBJECT_NAME_STRING)) + if (parent->inherits("TQDialog")) break; } connect(this, TQT_SIGNAL(clicked()), parent, TQT_SLOT(reject())); diff --git a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp index ee670afb..5721b249 100644 --- a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp +++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp @@ -1680,7 +1680,7 @@ void KDockManager::activate() obj->show(); } } - if ( !main->inherits(TQDIALOG_OBJECT_NAME_STRING) ) main->show(); + if ( !main->inherits("TQDialog") ) main->show(); } bool KDockManager::eventFilter( TQObject *obj, TQEvent *event ) @@ -3046,7 +3046,7 @@ void KDockArea::resizeEvent(TQResizeEvent *rsize) #ifndef NO_KDE2 // kdDebug(282)<<"KDockArea::resize"<<endl; #endif - TQObjectList *list=queryList(TQWIDGET_OBJECT_NAME_STRING,0,false); + TQObjectList *list=queryList("TQWidget",0,false); TQObjectListIt it( *list ); // iterate over the buttons TQObject *obj; diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp index 62a973d9..298e0cc4 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.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<TQ_FocusPolicy>* pFocPolDict = new TQDict<TQ_FocusPolicy>; pFocPolDict->setAutoDelete( true ); - TQObjectList *list = m_pClient->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *list = m_pClient->queryList( "TQWidget" ); 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_OBJECT_NAME_STRING ); + TQObjectList *list = m_pClient->queryList( "TQWidget" ); 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<TQ_FocusPolicy>* pFocPolDict ) { // reset the focus policies for all widgets in the view (take them from the dictionary) - TQObjectList* list = m_pClient->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList* list = m_pClient->queryList( "TQWidget" ); 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<TQ_FocusPolicy>* pFocPolDict ) if ( pFocPol != 0 ) widg->setFocusPolicy( *pFocPol ); - if ( !( widg->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) ) ) + if ( !( widg->inherits( "TQPopupMenu" ) ) ) widg->installEventFilter( this ); } @@ -936,7 +936,7 @@ TQDict<TQ_FocusPolicy>* KMdiChildFrm::unlinkChildren() TQDict<TQ_FocusPolicy>* pFocPolDict = new TQDict<TQ_FocusPolicy>; pFocPolDict->setAutoDelete( true ); - TQObjectList *list = m_pClient->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *list = m_pClient->queryList( "TQWidget" ); 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 = TQT_TQOBJECT(( ( TQChildEvent* ) e )->child()); - if ( ( pLostChild != 0L ) /*&& (pLostChild->inherits(TQWIDGET_OBJECT_NAME_STRING))*/ ) + if ( ( pLostChild != 0L ) /*&& (pLostChild->inherits("TQWidget"))*/ ) { 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 ) && ::tqqt_cast<TQWidget*>( pNewChild ) ) { TQWidget * pNewWidget = TQT_TQWIDGET( pNewChild ); - TQObjectList *list = pNewWidget->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *list = pNewWidget->queryList( "TQWidget" ); 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/tdemdi/qextmdi/tdemdichildview.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp index ddc313ab..fce7ab8d 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp @@ -495,7 +495,7 @@ void KMdiChildView::slot_childDestroyed() const TQObject * pLostChild = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(TQT_BASE_OBJECT_NAME::sender())); if ( pLostChild && ( pLostChild->isWidgetType() ) ) { - TQObjectList* list = ( ( TQObject* ) ( pLostChild ) ) ->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList* list = ( ( TQObject* ) ( pLostChild ) ) ->queryList( "TQWidget" ); 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_OBJECT_NAME_STRING ); + TQObjectList * list = queryList( "TQWidget" ); if ( list->find( obj ) != -1 ) m_focusedChildWidget = ( TQWidget* ) obj; @@ -568,7 +568,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e ) TQObject * pLostChild = TQT_TQOBJECT(( ( TQChildEvent* ) e ) ->child()); if ( ( pLostChild != 0L ) && ( pLostChild->isWidgetType() ) ) { - TQObjectList * list = pLostChild->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList * list = pLostChild->queryList( "TQWidget" ); 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( TQt::WType_Dialog | TQt::WShowModal ) ) return false; - TQObjectList *list = pNewWidget->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *list = pNewWidget->queryList( "TQWidget" ); 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_OBJECT_NAME_STRING ); + TQObjectList* list = queryList( "TQWidget" ); TQObjectListIt it( *list ); // iterate over all child widgets TQObject* obj; while ( ( obj = it.current() ) != 0 ) diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdifocuslist.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdifocuslist.cpp index a4592e38..e8a77322 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdifocuslist.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdifocuslist.cpp @@ -34,7 +34,7 @@ void KMdiFocusList::addWidgetTree( TQWidget* w ) w->setFocusPolicy( TQ_ClickFocus ); kdDebug( 760 ) << "KMdiFocusList::addWidgetTree: adding toplevel" << endl; connect( w, TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( objectHasBeenDestroyed( TQObject* ) ) ); - TQObjectList *l = w->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *l = w->queryList( "TQWidget" ); 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 1124273e..389b5402 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_OBJECT_NAME_STRING ); + TQObjectList *l = queryList( "TQListView" ); 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_OBJECT_NAME_STRING ); + TQObjectList *l = w->queryList( "TQListView" ); m_currentListView = static_cast<TQListView*>(TQT_TQWIDGET(l->first())); } diff --git a/quanta/components/framewizard/visualframeeditor.cpp b/quanta/components/framewizard/visualframeeditor.cpp index 4b1f62f3..36974d0d 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_OBJECT_NAME_STRING); + TQObjectList* splitterList = queryList("TQSplitter"); 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_OBJECT_NAME_STRING)) dynamic_cast<TQSplitter *>(parent)->setResizeMode(sa->view(),TQSplitter::KeepSize ); + if(parent->isA("TQSplitter")) 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 f236ef76..0b704529 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_OBJECT_NAME_STRING )) + if (w->inherits( "TQTextEdit" )) setText(((TQTextEdit*)w)->text()); else TQTableItem::setContentFromEditor(w); diff --git a/quanta/quanta_uml.xmi b/quanta/quanta_uml.xmi index ac5b3ffa..a381b6fb 100644 --- a/quanta/quanta_uml.xmi +++ b/quanta/quanta_uml.xmi @@ -18,7 +18,7 @@ </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="89" type="void" abstract="0" documentation="" name="addWrite" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="90" value="" type="Document *" abstract="0" documentation="" name="w" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="91" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="label" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="91" value="" type="TQString" abstract="0" documentation="" name="label" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="92" type="KURL" abstract="0" documentation="" name="baseURL" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="93" type="virtual void" abstract="0" documentation="" name="dragEnterEvent" static="0" scope="202" > @@ -31,8 +31,8 @@ <UML:Operation stereotype="" package="" xmi.id="98" type="void" abstract="0" documentation="" name="initActions" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="99" type="void" abstract="0" documentation="" name="initMenu" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="100" type="void" abstract="0" documentation="" name="insertNewTag" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="101" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tag" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="102" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="attr" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="101" value="" type="TQString" abstract="0" documentation="" name="tag" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="102" value="" type="TQString" abstract="0" documentation="" name="attr" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="103" value="" type="bool" abstract="0" documentation="" name="insertInLine" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="104" type="void" abstract="0" documentation="" name="insertTag" static="0" scope="200" > @@ -49,11 +49,11 @@ <UML:Attribute stereotype="" package="" xmi.id="76" value="" type="bool" abstract="0" documentation="" name="beginOfScriptOutput" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="77" value="" type="int" abstract="0" documentation="" name="column" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="78" value="" type="QuantaDoc *" abstract="0" documentation="" name="doc" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="79" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="dontShowSavePreview" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="79" value="" type="TQString" abstract="0" documentation="" name="dontShowSavePreview" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="80" value="" type="Document *" abstract="0" documentation="" name="oldWrite" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="81" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="scriptErrorDest" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="82" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="scriptOutputDest" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="83" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="space" static="0" scope="201" /> + <UML:Attribute stereotype="" package="" xmi.id="81" value="" type="TQString" abstract="0" documentation="" name="scriptErrorDest" static="0" scope="201" /> + <UML:Attribute stereotype="" package="" xmi.id="82" value="" type="TQString" abstract="0" documentation="" name="scriptOutputDest" static="0" scope="201" /> + <UML:Attribute stereotype="" package="" xmi.id="83" value="" type="TQString" abstract="0" documentation="" name="space" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="84" value="" type="QTabWidget *" abstract="0" documentation="" name="toolbarTab" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="85" value="" type="QTabWidget *" abstract="0" documentation="" name="writeTab" static="0" scope="200" /> </UML:Class> @@ -67,7 +67,7 @@ <UML:Parameter stereotype="" package="" xmi.id="211" value="" type="const QDomElement &" abstract="0" documentation="" name="element" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="212" value="" type="int &" abstract="0" documentation="" name="id" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="213" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="Returns the project default encoding if a project is loaded, otherwise it returns the global default encoding." name="defaultEncoding" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="213" type="TQString" abstract="0" documentation="Returns the project default encoding if a project is loaded, otherwise it returns the global default encoding." name="defaultEncoding" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="214" type="virtual void" abstract="0" documentation="Sets the focus to the editor window and checkes for changes in the edited file when the application gets back the focus." name="focusInEvent" static="0" scope="202" > <UML:Parameter stereotype="" package="" xmi.id="215" value="" type="QFocusEvent *" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> @@ -85,16 +85,16 @@ <UML:Operation stereotype="" package="" xmi.id="227" type="void" abstract="0" documentation="" name="initTagDict" static="0" scope="202" /> <UML:Operation stereotype="" package="" xmi.id="228" type="void" abstract="0" documentation="" name="initView" static="0" scope="202" /> <UML:Operation stereotype="" package="" xmi.id="229" type="void" abstract="0" documentation="" name="loadInitialProject" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="230" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="url" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="230" value="" type="TQString" abstract="0" documentation="" name="url" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="231" type="void" abstract="0" documentation="" name="loadToolbarForDTD" static="0" scope="202" > <UML:Parameter stereotype="" package="" xmi.id="232" value="" type="const QString &" abstract="0" documentation="" name="dtdName" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="233" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="newFileType" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="233" type="TQString" abstract="0" documentation="" name="newFileType" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="234" type="KDockWidget *" abstract="0" documentation="" name="outputDockWidget" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="235" type="QPopupMenu *" abstract="0" documentation="" name="pluginMenu" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="236" type="void" abstract="0" documentation="" name="processDTD" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="237" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="documentType" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="237" value="" type="TQString" abstract="0" documentation="" name="documentType" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="238" type="KURL" abstract="0" documentation="" name="projectBaseURL" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="239" type="virtual bool" abstract="0" documentation="" name="queryClose" static="0" scope="202" /> @@ -103,7 +103,7 @@ <UML:Parameter stereotype="" package="" xmi.id="242" value="" type="QString &" abstract="0" documentation="" name="dirName" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="243" type="uint" abstract="0" documentation="" name="readTagFile" static="0" scope="202" > - <UML:Parameter stereotype="" package="" xmi.id="244" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="fileName" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="244" value="" type="TQString" abstract="0" documentation="" name="fileName" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="245" value="" type="DTDStruct *" abstract="0" documentation="" name="parentDTD" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="246" value="" type="QTagList *" abstract="0" documentation="" name="tagList" static="0" scope="200" /> </UML:Operation> @@ -148,11 +148,11 @@ <UML:Attribute stereotype="" package="" xmi.id="116" value="" type="QWidgetStack *" abstract="0" documentation="" name="bottomWidgetStack" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="117" value="" type="TDEAction *" abstract="0" documentation="" name="closeprjAction" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="118" value="" type="TDEConfig *" abstract="0" documentation="" name="config" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="119" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="currentToolbarDTD" static="0" scope="202" /> + <UML:Attribute stereotype="" package="" xmi.id="119" value="" type="TQString" abstract="0" documentation="" name="currentToolbarDTD" static="0" scope="202" /> <UML:Attribute stereotype="" package="" xmi.id="120" value="" type="DocTreeView *" abstract="0" documentation="" name="dTab" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="121" value="" type="PHP3Debugger *" abstract="0" documentation="" name="dbg3" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="122" value="" type="PHP4Debugger *" abstract="0" documentation="" name="dbg4" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="123" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="debuggerStyle" static="0" scope="201" /> + <UML:Attribute stereotype="" package="" xmi.id="123" value="" type="TQString" abstract="0" documentation="" name="debuggerStyle" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="124" value="" type="QuantaDoc *" abstract="0" documentation="" name="doc" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="125" value="" type="KDockWidget *" abstract="0" documentation="" name="dtabdock" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="126" value="" type="TDEAction *" abstract="0" documentation="" name="editRedo" static="0" scope="201" /> @@ -206,8 +206,8 @@ <UML:Attribute stereotype="" package="" xmi.id="174" value="" type="TDEAction *" abstract="0" documentation="" name="saveSelectionAsLocalTemplateAction" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="175" value="" type="TDEAction *" abstract="0" documentation="" name="saveSelectionAsProjectTemplateAction" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="176" value="" type="TDEAction *" abstract="0" documentation="" name="saveprjAction" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="177" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="scriptBeginRxStr" static="0" scope="202" /> - <UML:Attribute stereotype="" package="" xmi.id="178" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="scriptEndRxStr" static="0" scope="202" /> + <UML:Attribute stereotype="" package="" xmi.id="177" value="" type="TQString" abstract="0" documentation="" name="scriptBeginRxStr" static="0" scope="202" /> + <UML:Attribute stereotype="" package="" xmi.id="178" value="" type="TQString" abstract="0" documentation="" name="scriptEndRxStr" static="0" scope="202" /> <UML:Attribute stereotype="" package="" xmi.id="179" value="" type="TDESelectAction *" abstract="0" documentation="" name="setEndOfLine" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="180" value="" type="TDEToggleAction *" abstract="0" documentation="" name="showDTDToolbar" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="181" value="" type="TDEToggleAction *" abstract="0" documentation="" name="showDTabAction" static="0" scope="201" /> @@ -257,7 +257,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="289" type="void" abstract="0" documentation="" name="nextDocument" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="290" type="void" abstract="0" documentation="" name="openDocument" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="291" value="" type="const KURL &" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="292" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="encoding" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="292" value="" type="TQString" abstract="0" documentation="" name="encoding" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="293" type="void" abstract="0" documentation="" name="prevDocument" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="294" type="void" abstract="0" documentation="" name="readConfig" static="0" scope="200" > @@ -282,7 +282,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="307" abstract="0" documentation="Common static functions used everywhere in the code. " name="QuantaCommon" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="308" type="" abstract="0" documentation="" name="QuantaCommon" static="0" scope="200" /> - <UML:Operation stereotype="" package="" xmi.id="309" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="attrCase" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="309" type="TQString" abstract="0" documentation="" name="attrCase" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="310" value="" type="const QString" abstract="0" documentation="" name="attr" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="311" type="bool" abstract="0" documentation="" name="checkExactMimeType" static="0" scope="200" > @@ -304,13 +304,13 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="323" value="" type="QWidget *" abstract="0" documentation="" name="widget" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="324" value="" type="const KURL &" abstract="0" documentation="" name="url" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="325" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="getDTDNameFromNickName" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="326" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="nickName" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="325" type="TQString" abstract="0" documentation="" name="getDTDNameFromNickName" static="0" scope="200" > + <UML:Parameter stereotype="" package="" xmi.id="326" value="" type="TQString" abstract="0" documentation="" name="nickName" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="327" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="getDTDNickNameFromName" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="328" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="name" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="327" type="TQString" abstract="0" documentation="" name="getDTDNickNameFromName" static="0" scope="200" > + <UML:Parameter stereotype="" package="" xmi.id="328" value="" type="TQString" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="329" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="i18n2normal" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="329" type="TQString" abstract="0" documentation="" name="i18n2normal" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="330" value="" type="const QString &" abstract="0" documentation="" name="a_str" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="331" type="int" abstract="0" documentation="" name="isBetween" static="0" scope="200" > @@ -322,51 +322,51 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="337" value="" type="int" abstract="0" documentation="" name="eCol" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="338" type="bool" abstract="0" documentation="" name="isKnownTag" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="339" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="dtdName" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="340" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tag" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="339" value="" type="TQString" abstract="0" documentation="" name="dtdName" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="340" value="" type="TQString" abstract="0" documentation="" name="tag" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="341" type="bool" abstract="0" documentation="" name="isOptionalTag" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="342" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="dtdName" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="343" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tag" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="342" value="" type="TQString" abstract="0" documentation="" name="dtdName" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="343" value="" type="TQString" abstract="0" documentation="" name="tag" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="344" type="bool" abstract="0" documentation="" name="isSingleTag" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="345" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="dtdName" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="346" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tag" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="345" value="" type="TQString" abstract="0" documentation="" name="dtdName" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="346" value="" type="TQString" abstract="0" documentation="" name="tag" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="347" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="makeRxCompatible" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="347" type="TQString" abstract="0" documentation="" name="makeRxCompatible" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="348" value="" type="const QString" abstract="0" documentation="" name="s" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="349" type="TDEStandardDirs *" abstract="0" documentation="" name="pluginDirs" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="350" value="" type="const char *" abstract="0" documentation="" name="type" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="351" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="qUrl" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="351" type="TQString" abstract="0" documentation="" name="qUrl" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="352" value="" type="const KURL &" abstract="0" documentation="" name="url" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="353" type="void" abstract="0" documentation="" name="setUrl" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="354" value="" type="KURL &" abstract="0" documentation="" name="url" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="355" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="urlString" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="355" value="" type="TQString" abstract="0" documentation="" name="urlString" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="356" type="QStringList *" abstract="0" documentation="" name="tagAttributeValues" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="357" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="dtdName" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="358" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tag" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="359" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="attribute" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="357" value="" type="TQString" abstract="0" documentation="" name="dtdName" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="358" value="" type="TQString" abstract="0" documentation="" name="tag" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="359" value="" type="TQString" abstract="0" documentation="" name="attribute" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="360" type="AttributeList *" abstract="0" documentation="" name="tagAttributes" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="361" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="dtdName" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="362" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tag" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="361" value="" type="TQString" abstract="0" documentation="" name="dtdName" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="362" value="" type="TQString" abstract="0" documentation="" name="tag" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="363" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tagCase" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="363" type="TQString" abstract="0" documentation="" name="tagCase" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="364" value="" type="const QString" abstract="0" documentation="" name="tag" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="365" type="QTag *" abstract="0" documentation="" name="tagFromDTD" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="366" value="" type="DTDStruct *" abstract="0" documentation="" name="dtd" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="367" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tag" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="367" value="" type="TQString" abstract="0" documentation="" name="tag" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="368" type="QTag *" abstract="0" documentation="" name="tagFromDTD" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="369" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="dtdName" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="370" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tag" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="369" value="" type="TQString" abstract="0" documentation="" name="dtdName" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="370" value="" type="TQString" abstract="0" documentation="" name="tag" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="371" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="xmlFromAttributes" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="371" type="TQString" abstract="0" documentation="" name="xmlFromAttributes" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="372" value="" type="AttributeList *" abstract="0" documentation="" name="attributes" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="373" type="" abstract="0" documentation="" name="~QuantaCommon" static="0" scope="200" /> @@ -390,7 +390,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="390" type="KURL" abstract="0" documentation="" name="path" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="391" value="" type="const KURL &" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="392" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="shortName" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="392" type="TQString" abstract="0" documentation="" name="shortName" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="393" value="" type="const QString &" abstract="0" documentation="" name="fname" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="394" type="KURL" abstract="0" documentation="" name="toAbsolute" static="0" scope="200" > @@ -403,7 +403,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="400" type="" abstract="0" documentation="" name="~QExtFileInfo" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="375" value="" type="bool" abstract="0" documentation="" name="bJobOK" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="376" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="lastErrorMsg" static="0" scope="201" /> + <UML:Attribute stereotype="" package="" xmi.id="376" value="" type="TQString" abstract="0" documentation="" name="lastErrorMsg" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="377" value="" type="QPtrList" abstract="0" documentation="" name="lstFilters" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="378" value="" type="QTimer *" abstract="0" documentation="" name="timer" static="0" scope="201" /> </UML:Class> @@ -445,7 +445,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="449" type="bool" abstract="0" documentation="" name="evenQuotes" static="0" scope="202" > <UML:Parameter stereotype="" package="" xmi.id="450" value="" type="const QString &" abstract="0" documentation="" name="text" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="451" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="find" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="451" type="TQString" abstract="0" documentation="" name="find" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="452" value="" type="const QRegExp &" abstract="0" documentation="" name="rx" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="453" value="" type="int" abstract="0" documentation="" name="sLine" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="454" value="" type="int" abstract="0" documentation="" name="sCol" static="0" scope="200" /> @@ -454,10 +454,10 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="457" value="" type="int &" abstract="0" documentation="" name="feLine" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="458" value="" type="int &" abstract="0" documentation="" name="feCol" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="459" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="findDTDName" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="459" type="TQString" abstract="0" documentation="" name="findDTDName" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="460" value="" type="Tag * *" abstract="0" documentation="" name="tag" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="461" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="findRev" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="461" type="TQString" abstract="0" documentation="" name="findRev" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="462" value="" type="const QRegExp &" abstract="0" documentation="" name="rx" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="463" value="" type="int" abstract="0" documentation="" name="sLine" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="464" value="" type="int" abstract="0" documentation="" name="sCol" static="0" scope="200" /> @@ -466,7 +466,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="467" value="" type="int &" abstract="0" documentation="" name="feLine" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="468" value="" type="int &" abstract="0" documentation="" name="feCol" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="469" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="findWordRev" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="469" type="TQString" abstract="0" documentation="" name="findWordRev" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="470" value="" type="const QString &" abstract="0" documentation="" name="textToSearch" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="471" type="Tag *" abstract="0" documentation="" name="findXMLTag" static="0" scope="200" > @@ -477,24 +477,24 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="476" type="QValueList *" abstract="0" documentation="" name="getAttributeCompletions" static="0" scope="202" > <UML:Parameter stereotype="" package="" xmi.id="477" value="" type="DTDStruct *" abstract="0" documentation="" name="dtd" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="478" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tagName" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="479" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="startsWith" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="478" value="" type="TQString" abstract="0" documentation="" name="tagName" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="479" value="" type="TQString" abstract="0" documentation="" name="startsWith" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="480" type="QValueList *" abstract="0" documentation="" name="getAttributeValueCompletions" static="0" scope="202" > <UML:Parameter stereotype="" package="" xmi.id="481" value="" type="DTDStruct *" abstract="0" documentation="" name="dtd" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="482" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tagName" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="483" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="attribute" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="484" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="startsWith" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="482" value="" type="TQString" abstract="0" documentation="" name="tagName" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="483" value="" type="TQString" abstract="0" documentation="" name="attribute" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="484" value="" type="TQString" abstract="0" documentation="" name="startsWith" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="485" type="QValueList *" abstract="0" documentation="" name="getCharacterCompletions" static="0" scope="202" /> - <UML:Operation stereotype="" package="" xmi.id="486" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="getDTDIdentifier" static="0" scope="200" /> - <UML:Operation stereotype="" package="" xmi.id="487" type=TQPOINT_OBJECT_NAME_STRING abstract="0" documentation="" name="getGlobalCursorPos" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="486" type="TQString" abstract="0" documentation="" name="getDTDIdentifier" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="487" type="TQPoint" abstract="0" documentation="" name="getGlobalCursorPos" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="488" type="QValueList *" abstract="0" documentation="" name="getTagCompletions" static="0" scope="202" > <UML:Parameter stereotype="" package="" xmi.id="489" value="" type="DTDStruct *" abstract="0" documentation="" name="dtd" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="490" value="" type="int" abstract="0" documentation="" name="line" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="491" value="" type="int" abstract="0" documentation="" name="col" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="492" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="getTagNameAt" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="492" type="TQString" abstract="0" documentation="" name="getTagNameAt" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="493" value="" type="int" abstract="0" documentation="" name="line" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="494" value="" type="int" abstract="0" documentation="" name="col" static="0" scope="200" /> </UML:Operation> @@ -507,22 +507,22 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="500" value="" type="const KURL &" abstract="0" documentation="" name="url" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="501" type="void" abstract="0" documentation="" name="insertTag" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="502" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="s1" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="503" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="s2" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="502" value="" type="TQString" abstract="0" documentation="" name="s1" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="503" value="" type="TQString" abstract="0" documentation="" name="s2" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="504" type="void" abstract="0" documentation="" name="insertText" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="505" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="505" value="" type="TQString" abstract="0" documentation="" name="" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="506" value="" type="bool" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="507" type="bool" abstract="0" documentation="" name="isModified" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="508" type="bool" abstract="0" documentation="" name="isUntitled" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="509" type="void" abstract="0" documentation="" name="parseVariables" static="0" scope="200" /> - <UML:Operation stereotype="" package="" xmi.id="510" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="parsingDTD" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="510" type="TQString" abstract="0" documentation="" name="parsingDTD" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="511" type="void" abstract="0" documentation="" name="readConfig" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="512" value="" type="TDEConfig *" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="513" type="void" abstract="0" documentation="" name="replaceSelected" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="514" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="s" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="514" value="" type="TQString" abstract="0" documentation="" name="s" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="515" type="void" abstract="0" documentation="" name="resizeEvent" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="516" value="" type="QResizeEvent *" abstract="0" documentation="" name="e" static="0" scope="200" /> @@ -547,7 +547,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="532" value="" type="int" abstract="0" documentation="" name="y2" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="533" type="void" abstract="0" documentation="" name="setDTDIdentifier" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="534" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="id" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="534" value="" type="TQString" abstract="0" documentation="" name="id" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="535" type="void" abstract="0" documentation="" name="setDirtyStatus" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="536" value="" type="bool" abstract="0" documentation="" name="status" static="0" scope="200" /> @@ -559,13 +559,13 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="540" value="" type="const QString &" abstract="0" documentation="" name="dtdName" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="541" type="void" abstract="0" documentation="" name="setUntitledUrl" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="542" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="542" value="" type="TQString" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="543" type="void" abstract="0" documentation="" name="showCodeCompletions" static="0" scope="202" > <UML:Parameter stereotype="" package="" xmi.id="544" value="" type="QValueList < KTextEditor :: CompletionEntry > *" abstract="0" documentation="" name="completions" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="545" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tempFileName" static="0" scope="200" /> - <UML:Operation stereotype="" package="" xmi.id="546" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="text" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="545" type="TQString" abstract="0" documentation="" name="tempFileName" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="546" type="TQString" abstract="0" documentation="" name="text" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="547" value="" type="int" abstract="0" documentation="" name="bLine" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="548" value="" type="int" abstract="0" documentation="" name="bCol" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="549" value="" type="int" abstract="0" documentation="" name="eLine" static="0" scope="200" /> @@ -590,21 +590,21 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Attribute stereotype="" package="" xmi.id="408" value="" type="KURL" abstract="0" documentation="" name="baseURL" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="409" value="" type="bool" abstract="0" documentation="" name="busy" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="410" value="" type="bool" abstract="0" documentation="" name="completionInProgress" static="0" scope="202" /> - <UML:Attribute stereotype="" package="" xmi.id="411" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="dtdName" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="412" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="includeList" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="411" value="" type="TQString" abstract="0" documentation="" name="dtdName" static="0" scope="201" /> + <UML:Attribute stereotype="" package="" xmi.id="412" value="" type="TQStringList" abstract="0" documentation="" name="includeList" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="413" value="" type="bool" abstract="0" documentation="" name="m_dirty" static="0" scope="202" /> - <UML:Attribute stereotype="" package="" xmi.id="414" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_parsingDTD" static="0" scope="202" /> + <UML:Attribute stereotype="" package="" xmi.id="414" value="" type="TQString" abstract="0" documentation="" name="m_parsingDTD" static="0" scope="202" /> <UML:Attribute stereotype="" package="" xmi.id="415" value="" type="QuantaPluginInterface *" abstract="0" documentation="" name="m_pluginInterface" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="416" value="" type="Project *" abstract="0" documentation="" name="m_project" static="0" scope="202" /> - <UML:Attribute stereotype="" package="" xmi.id="417" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_tempFileName" static="0" scope="201" /> + <UML:Attribute stereotype="" package="" xmi.id="417" value="" type="TQString" abstract="0" documentation="" name="m_tempFileName" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="418" value="" type="bool" abstract="0" documentation="" name="oldstat" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="419" value="" type="int" abstract="0" documentation="" name="spellMoved" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="420" value="" type="QValueList *" abstract="0" documentation="" name="spellPos" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="421" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="spellText" static="0" scope="201" /> + <UML:Attribute stereotype="" package="" xmi.id="421" value="" type="TQString" abstract="0" documentation="" name="spellText" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="422" value="" type="KTempFile *" abstract="0" documentation="" name="tempFile" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="423" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="untitledUrl" static="0" scope="201" /> + <UML:Attribute stereotype="" package="" xmi.id="423" value="" type="TQString" abstract="0" documentation="" name="untitledUrl" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="424" value="" type="QTagList" abstract="0" documentation="" name="userTagList" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="425" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="variableList" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="425" value="" type="TQStringList" abstract="0" documentation="" name="variableList" static="0" scope="200" /> </UML:Class> <UML:Class stereotype="" package="" xmi.id="564" abstract="0" documentation="" name="KQApplication" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="565" type="" abstract="0" documentation="" name="KQApplication" static="0" scope="200" /> @@ -641,11 +641,11 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="605" type="" abstract="0" documentation="" name="Tag" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="606" value="" type="const Tag &" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="607" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="attribute" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="607" type="TQString" abstract="0" documentation="" name="attribute" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="608" value="" type="int" abstract="0" documentation="" name="index" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="609" type="int" abstract="0" documentation="" name="attributeIndex" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="610" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="attr" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="610" value="" type="TQString" abstract="0" documentation="" name="attr" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="611" type="int" abstract="0" documentation="" name="attributeIndexAtPos" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="612" value="" type="int" abstract="0" documentation="" name="line" static="0" scope="200" /> @@ -656,10 +656,10 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="616" value="" type="int &" abstract="0" documentation="" name="line" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="617" value="" type="int &" abstract="0" documentation="" name="col" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="618" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="attributeValue" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="619" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="attr" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="618" type="TQString" abstract="0" documentation="" name="attributeValue" static="0" scope="200" > + <UML:Parameter stereotype="" package="" xmi.id="619" value="" type="TQString" abstract="0" documentation="" name="attr" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="620" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="attributeValue" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="620" type="TQString" abstract="0" documentation="" name="attributeValue" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="621" value="" type="int" abstract="0" documentation="" name="index" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="622" type="void" abstract="0" documentation="" name="attributeValuePos" static="0" scope="200" > @@ -686,7 +686,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="638" value="" type="Document *" abstract="0" documentation="" name="p_write" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="639" type="void" abstract="0" documentation="" name="parseAttr" static="0" scope="202" > - <UML:Parameter stereotype="" package="" xmi.id="640" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="text" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="640" value="" type="TQString" abstract="0" documentation="" name="text" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="641" value="" type="int &" abstract="0" documentation="" name="line" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="642" value="" type="int &" abstract="0" documentation="" name="col" static="0" scope="200" /> </UML:Operation> @@ -702,7 +702,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="650" type="void" abstract="0" documentation="" name="setWrite" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="651" value="" type="Document *" abstract="0" documentation="" name="p_write" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="652" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tagStr" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="652" type="TQString" abstract="0" documentation="" name="tagStr" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="653" type="int" abstract="0" documentation="" name="valueIndexAtPos" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="654" value="" type="int" abstract="0" documentation="" name="line" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="655" value="" type="int" abstract="0" documentation="" name="col" static="0" scope="200" /> @@ -713,16 +713,16 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Attribute stereotype="" package="" xmi.id="588" value="" type="TagAttr []" abstract="0" documentation="" name="attrs" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="589" value="" type="int" abstract="0" documentation="" name="beginCol" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="590" value="" type="int" abstract="0" documentation="" name="beginLine" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="591" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="cleanStr" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="591" value="" type="TQString" abstract="0" documentation="" name="cleanStr" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="592" value="" type="bool" abstract="0" documentation="" name="closingMissing" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="593" value="" type="DTDStruct *" abstract="0" documentation="" name="dtd" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="594" value="" type="int" abstract="0" documentation="" name="endCol" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="595" value="" type="int" abstract="0" documentation="" name="endLine" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="596" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_tagStr" static="0" scope="201" /> + <UML:Attribute stereotype="" package="" xmi.id="596" value="" type="TQString" abstract="0" documentation="" name="m_tagStr" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="597" value="" type="Document *" abstract="0" documentation="" name="m_write" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="598" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="name" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="598" value="" type="TQString" abstract="0" documentation="" name="name" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="599" value="" type="bool" abstract="0" documentation="" name="single" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="600" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="structBeginStr" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="600" value="" type="TQString" abstract="0" documentation="" name="structBeginStr" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="601" value="" type="int" abstract="0" documentation="" name="type" static="0" scope="200" /> </UML:Class> <UML:Class stereotype="" package="" xmi.id="658" abstract="0" documentation="" name="QTag" static="0" scope="200" > @@ -744,10 +744,10 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="680" type="int" abstract="0" documentation="" name="attributeCount" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="681" type="AttributeList *" abstract="0" documentation="" name="attributes" static="0" scope="200" /> - <UML:Operation stereotype="" package="" xmi.id="682" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="fileName" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="682" type="TQString" abstract="0" documentation="" name="fileName" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="683" type="bool" abstract="0" documentation="" name="isOptional" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="684" type="bool" abstract="0" documentation="" name="isSingle" static="0" scope="200" /> - <UML:Operation stereotype="" package="" xmi.id="685" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="name" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="685" type="TQString" abstract="0" documentation="" name="name" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="686" type="void" abstract="0" documentation="" name="setFileName" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="687" value="" type="QString &" abstract="0" documentation="" name="fileName" static="0" scope="200" /> </UML:Operation> @@ -762,15 +762,15 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="694" type="" abstract="0" documentation="" name="~QTag" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="659" value="" type="AttributeList" abstract="0" documentation="" name="attrs" static="0" scope="202" /> - <UML:Attribute stereotype="" package="" xmi.id="660" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="commonGroups" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="661" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_fileName" static="0" scope="202" /> + <UML:Attribute stereotype="" package="" xmi.id="660" value="" type="TQStringList" abstract="0" documentation="" name="commonGroups" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="661" value="" type="TQString" abstract="0" documentation="" name="m_fileName" static="0" scope="202" /> <UML:Attribute stereotype="" package="" xmi.id="662" value="" type="bool" abstract="0" documentation="" name="optional" static="0" scope="202" /> <UML:Attribute stereotype="" package="" xmi.id="663" value="" type="DTDStruct *" abstract="0" documentation="" name="parentDTD" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="664" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="returnType" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="664" value="" type="TQString" abstract="0" documentation="" name="returnType" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="665" value="" type="bool" abstract="0" documentation="" name="single" static="0" scope="202" /> - <UML:Attribute stereotype="" package="" xmi.id="666" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="stoppingTags" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="667" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tagName" static="0" scope="202" /> - <UML:Attribute stereotype="" package="" xmi.id="668" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="type" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="666" value="" type="TQStringList" abstract="0" documentation="" name="stoppingTags" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="667" value="" type="TQString" abstract="0" documentation="" name="tagName" static="0" scope="202" /> + <UML:Attribute stereotype="" package="" xmi.id="668" value="" type="TQString" abstract="0" documentation="" name="type" static="0" scope="200" /> </UML:Class> <UML:Class stereotype="" package="" xmi.id="695" abstract="0" documentation="" name="Parser" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="704" type="" abstract="0" documentation="" name="Parser" static="0" scope="200" /> @@ -803,9 +803,9 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="724" type="" abstract="0" documentation="" name="~Parser" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="696" value="" type="QValueList" abstract="0" documentation="" name="dtdList" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="697" value="" type="DTDStruct *" abstract="0" documentation="" name="m_dtd" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="698" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_dtdName" static="0" scope="201" /> + <UML:Attribute stereotype="" package="" xmi.id="698" value="" type="TQString" abstract="0" documentation="" name="m_dtdName" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="699" value="" type="Node *" abstract="0" documentation="" name="m_node" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="700" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_text" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="700" value="" type="TQString" abstract="0" documentation="" name="m_text" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="701" value="" type="int" abstract="0" documentation="" name="maxLines" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="702" value="" type="int" abstract="0" documentation="" name="oldMaxLines" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="703" value="" type="Document *" abstract="0" documentation="" name="write" static="0" scope="201" /> @@ -814,7 +814,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="728" type="" abstract="0" documentation="" name="QuantaCmdPlugin" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="729" type="virtual bool" abstract="0" documentation="" name="isLoaded" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="730" type="virtual bool" abstract="0" documentation="" name="load" static="0" scope="200" /> - <UML:Operation stereotype="" package="" xmi.id="731" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="makeQString" static="0" scope="202" > + <UML:Operation stereotype="" package="" xmi.id="731" type="TQString" abstract="0" documentation="" name="makeQString" static="0" scope="202" > <UML:Parameter stereotype="" package="" xmi.id="732" value="" type="const char *" abstract="0" documentation="" name="" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="733" value="" type="int" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> @@ -843,7 +843,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="751" value="" type="const char *" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="752" type="QDict" abstract="0" documentation="" name="plugins" static="0" scope="200" /> - <UML:Operation stereotype="" package="" xmi.id="753" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="searchPathList" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="753" type="TQStringList" abstract="0" documentation="" name="searchPathList" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="754" type="void" abstract="0" documentation="" name="setSearchPaths" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="755" value="" type="const QStringList &" abstract="0" documentation="" name="paths" static="0" scope="200" /> </UML:Operation> @@ -958,20 +958,20 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="852" type="" abstract="0" documentation="" name="~QuantaPlugin" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="794" value="" type="TDEToggleAction *" abstract="0" documentation="" name="m_action" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="795" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_arguments" static="0" scope="202" /> - <UML:Attribute stereotype="" package="" xmi.id="796" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_fileName" static="0" scope="202" /> - <UML:Attribute stereotype="" package="" xmi.id="797" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_icon" static="0" scope="202" /> + <UML:Attribute stereotype="" package="" xmi.id="795" value="" type="TQString" abstract="0" documentation="" name="m_arguments" static="0" scope="202" /> + <UML:Attribute stereotype="" package="" xmi.id="796" value="" type="TQString" abstract="0" documentation="" name="m_fileName" static="0" scope="202" /> + <UML:Attribute stereotype="" package="" xmi.id="797" value="" type="TQString" abstract="0" documentation="" name="m_icon" static="0" scope="202" /> <UML:Attribute stereotype="" package="" xmi.id="798" value="" type="bool" abstract="0" documentation="" name="m_isRunning" static="0" scope="202" /> - <UML:Attribute stereotype="" package="" xmi.id="799" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_location" static="0" scope="202" /> - <UML:Attribute stereotype="" package="" xmi.id="800" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_name" static="0" scope="202" /> - <UML:Attribute stereotype="" package="" xmi.id="801" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_outputWindow" static="0" scope="202" /> + <UML:Attribute stereotype="" package="" xmi.id="799" value="" type="TQString" abstract="0" documentation="" name="m_location" static="0" scope="202" /> + <UML:Attribute stereotype="" package="" xmi.id="800" value="" type="TQString" abstract="0" documentation="" name="m_name" static="0" scope="202" /> + <UML:Attribute stereotype="" package="" xmi.id="801" value="" type="TQString" abstract="0" documentation="" name="m_outputWindow" static="0" scope="202" /> <UML:Attribute stereotype="" package="" xmi.id="802" value="" type="bool" abstract="0" documentation="" name="m_standard" static="0" scope="202" /> - <UML:Attribute stereotype="" package="" xmi.id="803" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_standardName" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="804" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_type" static="0" scope="202" /> + <UML:Attribute stereotype="" package="" xmi.id="803" value="" type="TQString" abstract="0" documentation="" name="m_standardName" static="0" scope="201" /> + <UML:Attribute stereotype="" package="" xmi.id="804" value="" type="TQString" abstract="0" documentation="" name="m_type" static="0" scope="202" /> </UML:Class> <UML:Class stereotype="" package="" xmi.id="853" abstract="0" documentation="Provides an interface to the installed plugins. " name="QuantaPluginInterface" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="856" type="" abstract="0" documentation="" name="QuantaPluginInterface" static="0" scope="200" /> - <UML:Operation stereotype="" package="" xmi.id="857" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="outputWindows" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="857" type="TQStringList" abstract="0" documentation="" name="outputWindows" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="858" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="859" type="virtual QuantaPlugin *" abstract="0" documentation="" name="plugin" static="0" scope="200" > @@ -981,22 +981,22 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="862" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="863" type="virtual QStringList" abstract="0" documentation="" name="pluginNames" static="0" scope="200" /> - <UML:Operation stereotype="" package="" xmi.id="864" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="pluginTypes" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="864" type="TQStringList" abstract="0" documentation="" name="pluginTypes" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="865" type="QDict" abstract="0" documentation="" name="plugins" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="866" type="virtual void" abstract="0" documentation="" name="readConfig" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="867" type="virtual QStringList" abstract="0" documentation="" name="searchPaths" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="868" type="virtual void" abstract="0" documentation="" name="setPluginNames" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="869" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="869" value="" type="TQStringList" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="870" type="void" abstract="0" documentation="" name="setPlugins" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="871" value="" type="QDict < QuantaPlugin >" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="872" type="virtual void" abstract="0" documentation="" name="setSearchPaths" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="873" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="873" value="" type="TQStringList" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="874" type="virtual void" abstract="0" documentation="" name="writeConfig" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="875" type="" abstract="0" documentation="" name="~QuantaPluginInterface" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="854" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="m_pluginNames" static="0" scope="202" /> + <UML:Attribute stereotype="" package="" xmi.id="854" value="" type="TQStringList" abstract="0" documentation="" name="m_pluginNames" static="0" scope="202" /> <UML:Attribute stereotype="" package="" xmi.id="855" value="" type="QDict" abstract="0" documentation="" name="m_plugins" static="0" scope="202" /> </UML:Class> <UML:Class stereotype="" package="" xmi.id="876" abstract="0" documentation="" name="Project" static="0" scope="200" > @@ -1039,28 +1039,28 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="935" value="" type="TDEConfig *" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="936" type="" abstract="0" documentation="" name="~Project" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="877" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="author" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="877" value="" type="TQString" abstract="0" documentation="" name="author" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="878" value="" type="KURL" abstract="0" documentation="" name="baseURL" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="879" value="" type="QBuffer" abstract="0" documentation="" name="buff" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="880" value="" type="TDEConfig *" abstract="0" documentation="" name="config" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="881" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="currentProjectView" static="0" scope="201" /> + <UML:Attribute stereotype="" package="" xmi.id="881" value="" type="TQString" abstract="0" documentation="" name="currentProjectView" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="882" value="" type="QDomDocument" abstract="0" documentation="" name="dom" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="883" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="email" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="883" value="" type="TQString" abstract="0" documentation="" name="email" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="884" value="" type="bool" abstract="0" documentation="" name="keepPasswd" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="885" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_defaultDTD" static="0" scope="202" /> - <UML:Attribute stereotype="" package="" xmi.id="886" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_defaultEncoding" static="0" scope="202" /> - <UML:Attribute stereotype="" package="" xmi.id="887" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_newFileType" static="0" scope="202" /> + <UML:Attribute stereotype="" package="" xmi.id="885" value="" type="TQString" abstract="0" documentation="" name="m_defaultDTD" static="0" scope="202" /> + <UML:Attribute stereotype="" package="" xmi.id="886" value="" type="TQString" abstract="0" documentation="" name="m_defaultEncoding" static="0" scope="202" /> + <UML:Attribute stereotype="" package="" xmi.id="887" value="" type="TQString" abstract="0" documentation="" name="m_newFileType" static="0" scope="202" /> <UML:Attribute stereotype="" package="" xmi.id="888" value="" type="bool" abstract="0" documentation="" name="modified" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="889" value="" type="KURL" abstract="0" documentation="" name="newURL" static="0" scope="202" /> <UML:Attribute stereotype="" package="" xmi.id="890" value="" type="KURL" abstract="0" documentation="" name="oldURL" static="0" scope="202" /> <UML:Attribute stereotype="" package="" xmi.id="891" value="" type="bool" abstract="0" documentation="" name="olfwprj" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="892" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="passwd" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="892" value="" type="TQString" abstract="0" documentation="" name="passwd" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="893" value="" type="ProjectNewFinal *" abstract="0" documentation="" name="pnf" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="894" value="" type="ProjectNewGeneral *" abstract="0" documentation="" name="png" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="895" value="" type="ProjectNewLocal *" abstract="0" documentation="" name="pnl" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="896" value="" type="ProjectNewWeb *" abstract="0" documentation="" name="pnw" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="897" value="" type="KURL" abstract="0" documentation="" name="previewPrefix" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="898" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="projectName" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="898" value="" type="TQString" abstract="0" documentation="" name="projectName" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="899" value="" type="TDERecentFilesAction *" abstract="0" documentation="" name="projectRecent" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="900" value="" type="KURL" abstract="0" documentation="" name="projectURL" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="901" value="" type="KURL" abstract="0" documentation="" name="remoteDir" static="0" scope="200" /> @@ -1072,19 +1072,19 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="937" abstract="0" documentation="" name="FilesListView" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="940" type="" abstract="0" documentation="" name="FilesListView" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="941" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="dir" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="942" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="topList" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="941" value="" type="TQString" abstract="0" documentation="" name="dir" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="942" value="" type="TQStringList" abstract="0" documentation="" name="topList" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="943" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="944" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="945" type="virtual QString" abstract="0" documentation="" name="currentFileName" static="0" scope="202" /> <UML:Operation stereotype="" package="" xmi.id="946" type="void" abstract="0" documentation="" name="loadDir" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="947" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="path" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="947" value="" type="TQString" abstract="0" documentation="" name="path" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="948" type="virtual void" abstract="0" documentation="" name="slotReload" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="949" type="" abstract="0" documentation="" name="~FilesListView" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="938" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="dir" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="939" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="dirList" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="938" value="" type="TQString" abstract="0" documentation="" name="dir" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="939" value="" type="TQStringList" abstract="0" documentation="" name="dirList" static="0" scope="200" /> </UML:Class> <UML:Class stereotype="" package="" xmi.id="950" abstract="0" documentation="An extended TDEListViewItem for folders." name="FilesTreeFolder" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="955" type="" abstract="0" documentation="" name="FilesTreeFolder" static="0" scope="200" > @@ -1117,11 +1117,11 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="976" value="" type="int" abstract="0" documentation="" name="column" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="977" value="" type="bool" abstract="0" documentation="" name="ascending" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="978" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="text" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="978" type="TQString" abstract="0" documentation="" name="text" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="979" value="" type="int" abstract="0" documentation="" name="column" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="980" type="virtual " abstract="0" documentation="" name="~FilesTreeFolder" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="951" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="name" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="951" value="" type="TQString" abstract="0" documentation="" name="name" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="952" value="" type="FilesTreeFolder *" abstract="0" documentation="" name="parentFolder" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="953" value="" type="FilesTreeView *" abstract="0" documentation="" name="parentView" static="0" scope="202" /> <UML:Attribute stereotype="" package="" xmi.id="954" value="" type="KURL" abstract="0" documentation="" name="url" static="0" scope="200" /> @@ -1129,12 +1129,12 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Class stereotype="" package="" xmi.id="981" abstract="0" documentation="An extended KLIstViewItem for files." name="FilesTreeFile" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="984" type="" abstract="0" documentation="" name="FilesTreeFile" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="985" value="" type="FilesTreeFolder *" abstract="0" documentation="" name="parent" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="986" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="name" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="986" value="" type="TQString" abstract="0" documentation="" name="name" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="987" value="" type="const KURL &" abstract="0" documentation="" name="p_url" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="988" type="" abstract="0" documentation="" name="FilesTreeFile" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="989" value="" type="QListView *" abstract="0" documentation="" name="parent" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="990" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="name" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="990" value="" type="TQString" abstract="0" documentation="" name="name" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="991" value="" type="const KURL &" abstract="0" documentation="" name="p_url" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="992" type="void" abstract="0" documentation="" name="setDirIcon" static="0" scope="200" /> @@ -1152,45 +1152,45 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Class stereotype="" package="" xmi.id="999" abstract="0" documentation="" name="DocItem" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1002" type="" abstract="0" documentation="" name="DocItem" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1003" value="" type="QListView *" abstract="0" documentation="" name="parent" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1004" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="_name" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1005" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="_url" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1004" value="" type="TQString" abstract="0" documentation="" name="_name" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1005" value="" type="TQString" abstract="0" documentation="" name="_url" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1006" type="" abstract="0" documentation="" name="DocItem" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1007" value="" type="QListViewItem *" abstract="0" documentation="" name="parent" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1008" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="_name" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1009" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="_url" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1008" value="" type="TQString" abstract="0" documentation="" name="_name" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1009" value="" type="TQString" abstract="0" documentation="" name="_url" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="1010" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="text" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="1010" type="TQString" abstract="0" documentation="" name="text" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1011" value="" type="int" abstract="0" documentation="" name="column" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1012" type="" abstract="0" documentation="" name="~DocItem" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="1000" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="name" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="1001" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="url" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="1000" value="" type="TQString" abstract="0" documentation="" name="name" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="1001" value="" type="TQString" abstract="0" documentation="" name="url" static="0" scope="200" /> </UML:Class> <UML:Class stereotype="" package="" xmi.id="1013" abstract="0" documentation="" name="DocFolder" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1017" type="" abstract="0" documentation="" name="DocFolder" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1018" value="" type="QListView *" abstract="0" documentation="" name="parent" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1019" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="_name" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1019" value="" type="TQString" abstract="0" documentation="" name="_name" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1020" value="" type="TDEConfig *" abstract="0" documentation="" name="config" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1021" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="basePath" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1021" value="" type="TQString" abstract="0" documentation="" name="basePath" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1022" type="" abstract="0" documentation="" name="DocFolder" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1023" value="" type="QListViewItem *" abstract="0" documentation="" name="parent" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1024" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="_name" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1024" value="" type="TQString" abstract="0" documentation="" name="_name" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1025" value="" type="TDEConfig *" abstract="0" documentation="" name="config" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1026" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="basePath" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1026" value="" type="TQString" abstract="0" documentation="" name="basePath" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1027" type="void" abstract="0" documentation="" name="setOpen" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1028" value="" type="bool" abstract="0" documentation="" name="o" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1029" type="void" abstract="0" documentation="" name="setup" static="0" scope="200" /> - <UML:Operation stereotype="" package="" xmi.id="1030" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="text" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="1030" type="TQString" abstract="0" documentation="" name="text" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1031" value="" type="int" abstract="0" documentation="" name="column" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1032" type="" abstract="0" documentation="" name="~DocFolder" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="1014" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="name" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="1014" value="" type="TQString" abstract="0" documentation="" name="name" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="1015" value="" type="bool" abstract="0" documentation="" name="topLevel" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="1016" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="url" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="1016" value="" type="TQString" abstract="0" documentation="" name="url" static="0" scope="200" /> </UML:Class> <UML:Class stereotype="" package="" xmi.id="1033" abstract="0" documentation="" name="UploadTreeFolder" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1036" type="" abstract="0" documentation="" name="UploadTreeFolder" static="0" scope="200" > @@ -1203,7 +1203,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="1042" value="" type="UploadTreeFolder *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1043" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="1044" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="fullName" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="1044" type="TQString" abstract="0" documentation="" name="fullName" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="1045" type="virtual QString" abstract="0" documentation="" name="key" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1046" value="" type="int" abstract="0" documentation="" name="column" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1047" value="" type="bool" abstract="0" documentation="" name="ascending" static="0" scope="200" /> @@ -1212,7 +1212,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="1049" value="" type="bool" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1050" type="void" abstract="0" documentation="" name="setWhichPixmap" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1051" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="pixmap" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1051" value="" type="TQString" abstract="0" documentation="" name="pixmap" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1052" type="void" abstract="0" documentation="" name="setup" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="1053" type="KURL" abstract="0" documentation="" name="url" static="0" scope="200" /> @@ -1252,16 +1252,16 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="1081" type="" abstract="0" documentation="" name="~ProjectTreeFolder" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="1056" value="" type="QPtrList" abstract="0" documentation="" name="filesTreeList" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="1057" value="" type="ProjectTreeView *" abstract="0" documentation="" name="parentView" static="0" scope="202" /> - <UML:Attribute stereotype="" package="" xmi.id="1058" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="path" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="1058" value="" type="TQString" abstract="0" documentation="" name="path" static="0" scope="200" /> </UML:Class> <UML:Class stereotype="" package="" xmi.id="1082" abstract="0" documentation="Item for project files. It's different from a standard file as the project files are basically XML tag elements." name="ProjectTreeFile" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1084" type="" abstract="0" documentation="" name="ProjectTreeFile" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1085" value="" type="ProjectTreeFolder *" abstract="0" documentation="" name="parent" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1086" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="name" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1086" value="" type="TQString" abstract="0" documentation="" name="name" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1087" value="" type="const KURL &" abstract="0" documentation="" name="p_url" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1088" type="" abstract="0" documentation="" name="~ProjectTreeFile" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="1083" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="fname" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="1083" value="" type="TQString" abstract="0" documentation="" name="fname" static="0" scope="200" /> </UML:Class> <UML:Class stereotype="" package="" xmi.id="1089" abstract="0" documentation="" name="DocTreeView" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1091" type="" abstract="0" documentation="" name="DocTreeView" static="0" scope="200" > @@ -1269,7 +1269,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="1093" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1094" type="QString *" abstract="0" documentation="" name="contextHelp" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1095" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="keyword" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1095" value="" type="TQString" abstract="0" documentation="" name="keyword" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1096" type="" abstract="0" documentation="" name="~DocTreeView" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="1090" value="" type="QDict *" abstract="0" documentation="" name="contextHelpDict" static="0" scope="201" /> @@ -1281,8 +1281,8 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1101" type="UploadTreeFile *" abstract="0" documentation="" name="addItem" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1102" value="" type="const KURL &" abstract="0" documentation="" name="a_url" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1103" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1104" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1103" value="" type="TQString" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1104" value="" type="TQString" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1105" type="int" abstract="0" documentation="" name="checkboxTree" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1106" value="" type="QListViewItem *" abstract="0" documentation="" name="it" static="0" scope="200" /> @@ -1308,7 +1308,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1120" type="UploadTreeFolder *" abstract="0" documentation="" name="printTree" static="0" scope="202" > <UML:Parameter stereotype="" package="" xmi.id="1121" value="" type="UploadTreeFolder *" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1122" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1122" value="" type="TQString" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1123" type="virtual void" abstract="0" documentation="" name="selectAll" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1124" value="" type="bool" abstract="0" documentation="" name="select" static="0" scope="200" /> @@ -1347,7 +1347,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1166" type="" abstract="0" documentation="" name="~StructTreeView" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="1127" value="" type="TDEConfig *" abstract="0" documentation="" name="config" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="1128" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="dtdList" static="0" scope="201" /> + <UML:Attribute stereotype="" package="" xmi.id="1128" value="" type="TQStringList" abstract="0" documentation="" name="dtdList" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="1129" value="" type="QPopupMenu *" abstract="0" documentation="" name="dtdMenu" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="1130" value="" type="bool" abstract="0" documentation="" name="followCursorFlag" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="1131" value="" type="int" abstract="0" documentation="" name="followCursorId" static="0" scope="201" /> @@ -1368,21 +1368,21 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="1170" type="" abstract="0" documentation="" name="UploadTreeFile" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1171" value="" type="QListView *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1172" value="" type="const KURL &" abstract="0" documentation="" name="a_url" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1173" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1174" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1173" value="" type="TQString" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1174" value="" type="TQString" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1175" type="" abstract="0" documentation="" name="UploadTreeFile" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1176" value="" type="UploadTreeFolder *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1177" value="" type="const KURL &" abstract="0" documentation="" name="a_url" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1178" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1179" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1178" value="" type="TQString" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1179" value="" type="TQString" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1180" type="virtual QString" abstract="0" documentation="" name="key" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1181" value="" type="int" abstract="0" documentation="" name="column" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1182" value="" type="bool" abstract="0" documentation="" name="ascending" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1183" type="void" abstract="0" documentation="" name="setWhichPixmap" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1184" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1184" value="" type="TQString" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1185" type="KURL" abstract="0" documentation="" name="url" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="1186" type="" abstract="0" documentation="" name="~UploadTreeFile" static="0" scope="200" /> @@ -1400,14 +1400,14 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1201" type="virtual QDragObject *" abstract="0" documentation="" name="dragObject" static="0" scope="202" /> <UML:Operation stereotype="" package="" xmi.id="1202" type="void" abstract="0" documentation="" name="readDirInfo" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1203" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="startDir" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1203" value="" type="TQString" abstract="0" documentation="" name="startDir" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1204" type="virtual void" abstract="0" documentation="" name="slotInsertTag" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="1205" type="virtual void" abstract="0" documentation="" name="slotProperties" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="1206" type="virtual void" abstract="0" documentation="" name="slotPropertiesApplied" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="1207" type="virtual void" abstract="0" documentation="" name="slotReload" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="1208" type="void" abstract="0" documentation="" name="writeDirInfo" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1209" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="dirInfoFile" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1209" value="" type="TQString" abstract="0" documentation="" name="dirInfoFile" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1210" type="" abstract="0" documentation="" name="~TemplatesTreeView" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="1188" value="" type="KURL" abstract="0" documentation="" name="baseURL" static="0" scope="201" /> @@ -1454,7 +1454,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Attribute stereotype="" package="" xmi.id="1227" value="" type="int" abstract="0" documentation="" name="openInQuantaId" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="1228" value="" type="ProjectTreeFolder *" abstract="0" documentation="" name="projectDir" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="1229" value="" type="QPopupMenu *" abstract="0" documentation="" name="projectMenu" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="1230" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="projectName" static="0" scope="201" /> + <UML:Attribute stereotype="" package="" xmi.id="1230" value="" type="TQString" abstract="0" documentation="" name="projectName" static="0" scope="201" /> </UML:Class> <UML:Class stereotype="" package="" xmi.id="1241" abstract="0" documentation="Extended FileManage to handle remote and local directory structures in a tree." name="FilesTreeView" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1242" type="" abstract="0" documentation="" name="FilesTreeView" static="0" scope="200" > @@ -1605,7 +1605,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1377" type="" abstract="0" documentation="" name="~ProjectNewWeb" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="1368" value="" type="KURL" abstract="0" documentation="" name="baseURL" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="1369" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="filesList" static="0" scope="201" /> + <UML:Attribute stereotype="" package="" xmi.id="1369" value="" type="TQStringList" abstract="0" documentation="" name="filesList" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="1370" value="" type="TDEProcess *" abstract="0" documentation="" name="proc" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="1371" value="" type="bool" abstract="0" documentation="" name="start" static="0" scope="201" /> </UML:Class> @@ -1617,7 +1617,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="1382" type="void" abstract="0" documentation="" name="setMargin" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1383" value="" type="int" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="1384" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="type" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="1384" type="TQString" abstract="0" documentation="" name="type" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="1385" type="" abstract="0" documentation="" name="~ProjectNewGeneral" static="0" scope="200" /> </UML:Class> <UML:Association nameb="" stereotype="" assoctype="dependency" rolea="1378" roleb="307" multia="" multib="" package="" xmi.id="1386" abstract="0" documentation="" name="" static="0" scope="200" namea="" /> @@ -1626,21 +1626,21 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Association nameb="" stereotype="" assoctype="dependency" rolea="1318" roleb="307" multia="" multib="" package="" xmi.id="1389" abstract="0" documentation="" name="" static="0" scope="200" namea="" /> <UML:Class stereotype="" package="" xmi.id="1390" abstract="0" documentation="" name="CSSSelectorEditor" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1391" type="" abstract="0" documentation="" name="CSSSelectorEditor" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1392" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="code" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1392" value="" type="TQString" abstract="0" documentation="" name="code" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1393" value="" type="bool" abstract="0" documentation="" name="editSelector" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1394" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1395" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="1396" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="code" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="1396" type="TQString" abstract="0" documentation="" name="code" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="1397" type="void" abstract="0" documentation="" name="splitValueTRBL" static="0" scope="202" > - <UML:Parameter stereotype="" package="" xmi.id="1398" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="value" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1398" value="" type="TQString" abstract="0" documentation="" name="value" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1399" value="" type="QString &" abstract="0" documentation="" name="" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1400" value="" type="QString &" abstract="0" documentation="" name="" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1401" value="" type="QString &" abstract="0" documentation="" name="" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1402" value="" type="QString &" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1403" type="void" abstract="0" documentation="" name="widgetFromCode" static="0" scope="202" > - <UML:Parameter stereotype="" package="" xmi.id="1404" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1404" value="" type="TQString" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1405" type="" abstract="0" documentation="" name="~CSSSelectorEditor" static="0" scope="200" /> </UML:Class> @@ -1648,7 +1648,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Class stereotype="" package="" xmi.id="1407" abstract="0" documentation="" name="TagDialog" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1415" type="" abstract="0" documentation="" name="TagDialog" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1416" value="" type="QTag *" abstract="0" documentation="" name="dtdTag" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1417" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="attrs" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1417" value="" type="TQString" abstract="0" documentation="" name="attrs" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1418" value="" type="KURL" abstract="0" documentation="" name="a_baseURL" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1419" type="" abstract="0" documentation="" name="TagDialog" static="0" scope="200" > @@ -1657,10 +1657,10 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="1422" value="" type="KURL" abstract="0" documentation="" name="a_baseURL" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1423" type="KURL" abstract="0" documentation="" name="baseURL" static="0" scope="200" /> - <UML:Operation stereotype="" package="" xmi.id="1424" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="getAttribute" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1425" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="attr" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="1424" type="TQString" abstract="0" documentation="" name="getAttribute" static="0" scope="200" > + <UML:Parameter stereotype="" package="" xmi.id="1425" value="" type="TQString" abstract="0" documentation="" name="attr" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="1426" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="getAttributeString" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="1426" type="TQString" abstract="0" documentation="" name="getAttributeString" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="1427" type="QDict *" abstract="0" documentation="" name="getAttributes" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="1428" type="void" abstract="0" documentation="" name="init" static="0" scope="202" > <UML:Parameter stereotype="" package="" xmi.id="1429" value="" type="QTag *" abstract="0" documentation="" name="dtdTag" static="0" scope="200" /> @@ -1675,7 +1675,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="1436" value="" type="bool" abstract="0" documentation="" name="insertInLine" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1437" type="void" abstract="0" documentation="" name="parseAttributes" static="0" scope="202" > - <UML:Parameter stereotype="" package="" xmi.id="1438" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="attrs" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1438" value="" type="TQString" abstract="0" documentation="" name="attrs" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1439" type="void" abstract="0" documentation="" name="parseTag" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="1440" type="" abstract="0" documentation="" name="~TagDialog" static="0" scope="200" /> @@ -1755,8 +1755,8 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Attribute stereotype="" package="" xmi.id="1481" value="" type="bool" abstract="0" documentation="" name="firstOutput" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="1482" value="" type="QuantaView *" abstract="0" documentation="" name="m_view" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="1483" value="" type="TDEProcess *" abstract="0" documentation="" name="proc" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="1484" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="scriptErrorDest" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="1485" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="scriptOutputDest" static="0" scope="201" /> + <UML:Attribute stereotype="" package="" xmi.id="1484" value="" type="TQString" abstract="0" documentation="" name="scriptErrorDest" static="0" scope="201" /> + <UML:Attribute stereotype="" package="" xmi.id="1485" value="" type="TQString" abstract="0" documentation="" name="scriptOutputDest" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="1486" value="" type="QDomElement" abstract="0" documentation="" name="tag" static="0" scope="201" /> </UML:Class> <UML:Association nameb="" stereotype="" assoctype="dependency" rolea="1479" roleb="307" multia="" multib="" package="" xmi.id="1504" abstract="0" documentation="" name="" static="0" scope="200" namea="" /> @@ -1813,9 +1813,9 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="1552" value="" type="bool" abstract="0" documentation="" name="absolutePath" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1553" type="void" abstract="0" documentation="" name="setText" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1554" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1554" value="" type="TQString" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="1555" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="text" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="1555" type="TQString" abstract="0" documentation="" name="text" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="1556" type="" abstract="0" documentation="" name="~FileCombo" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="1538" value="" type="KURL" abstract="0" documentation="" name="baseURL" static="0" scope="202" /> <UML:Attribute stereotype="" package="" xmi.id="1539" value="" type="QPushButton *" abstract="0" documentation="" name="button" static="0" scope="202" /> diff --git a/quanta/scripts/TemplateMagic.pl b/quanta/scripts/TemplateMagic.pl index 400187d1..8b91e0d0 100644 --- a/quanta/scripts/TemplateMagic.pl +++ b/quanta/scripts/TemplateMagic.pl @@ -228,7 +228,7 @@ sub createUI() { =pod Structure for label widget: height is 20 - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2_2</cstring> </property> @@ -292,7 +292,7 @@ Structure for a text widget: height is 30 for $k (0..$#OrderedVars) { $Layouts{$OrderedVars[$k][0]}{y}=$y_loc; print OFH <<E - <widget class=TQLABEL_OBJECT_NAME_STRING> + <widget class="TQLabel"> <property name="name"> <cstring>LBL_$OrderedVars[$k][0]</cstring> </property> |