diff options
Diffstat (limited to 'experimental/tqtinterface/qt4/tools/designer/designer')
53 files changed, 573 insertions, 573 deletions
diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/actiondnd.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/actiondnd.cpp index d52fad400..605a264f6 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/actiondnd.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/actiondnd.cpp @@ -244,7 +244,7 @@ TQDesignerToolBar::TQDesignerToolBar( TQMainWindow *mw ) indicator->hide(); installEventFilter( this ); widgetInserting = FALSE; - tqfindFormWindow(); + findFormWindow(); mw->setDockEnabled( TQt::DockTornOff, FALSE ); } @@ -259,11 +259,11 @@ TQDesignerToolBar::TQDesignerToolBar( TQMainWindow *mw, TQt::Dock dock ) MetaDataBase::addEntry( this ); installEventFilter( this ); widgetInserting = FALSE; - tqfindFormWindow(); + findFormWindow(); mw->setDockEnabled( TQt::DockTornOff, FALSE ); } -void TQDesignerToolBar::tqfindFormWindow() +void TQDesignerToolBar::findFormWindow() { TQWidget *w = this; while ( w ) { @@ -395,7 +395,7 @@ void TQDesignerToolBar::buttonMouseReleaseEvent( TQMouseEvent *e, TQObject *w ) { if ( widgetInserting ) doInsertWidget( mapFromGlobal( e->globalPos() ) ); - else if ( w->isWidgetType() && formWindow->widgets()->tqfind( w ) ) { + else if ( w->isWidgetType() && formWindow->widgets()->find( w ) ) { formWindow->clearSelection( FALSE ); formWindow->selectWidget( w ); } @@ -409,7 +409,7 @@ void TQDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject const int ID_DELETE = 1; const int ID_SEP = 2; const int ID_DELTOOLBAR = 3; - TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.tqfind( (TQWidget*)o ); + TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.find( (TQWidget*)o ); if ( it != actionMap.end() && ::tqqt_cast<TQSeparatorAction*>(*it) ) menu.insertItem( tr( "Delete Separator" ), ID_DELETE ); else @@ -419,11 +419,11 @@ void TQDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject menu.insertItem( tr( "Delete Toolbar" ), ID_DELTOOLBAR ); int res = menu.exec( e->globalPos() ); if ( res == ID_DELETE ) { - TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.tqfind( (TQWidget*)o ); + TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.find( (TQWidget*)o ); if ( it == actionMap.end() ) return; TQAction *a = *it; - int index = actionList.tqfind( a ); + int index = actionList.find( a ); RemoveActionFromToolBarCommand *cmd = new RemoveActionFromToolBarCommand( tr( "Delete Action '%1' from Toolbar '%2'" ). arg( a->name() ).arg( caption() ), @@ -433,7 +433,7 @@ void TQDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject } else if ( res == ID_SEP ) { calcIndicatorPos( mapFromGlobal( e->globalPos() ) ); TQAction *a = new TQSeparatorAction( 0 ); - int index = actionList.tqfindRef( *actionMap.tqfind( insertAnchor ) ); + int index = actionList.findRef( *actionMap.find( insertAnchor ) ); if ( index != -1 && afterAnchor ) ++index; if ( !insertAnchor ) @@ -474,11 +474,11 @@ void TQDesignerToolBar::buttonMousePressEvent( TQMouseEvent *e, TQObject * ) void TQDesignerToolBar::removeWidget( TQWidget *w ) { - TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.tqfind( w ); + TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.find( w ); if ( it == actionMap.end() ) return; TQAction *a = *it; - int index = actionList.tqfind( a ); + int index = actionList.find( a ); RemoveActionFromToolBarCommand *cmd = new RemoveActionFromToolBarCommand( tr( "Delete Action '%1' from Toolbar '%2'" ). arg( a->name() ).arg( caption() ), @@ -495,13 +495,13 @@ void TQDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o ) return; if ( TQABS( TQPoint( dragStartPos - e->pos() ).manhattanLength() ) < TQApplication::startDragDistance() ) return; - TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.tqfind( (TQWidget*)o ); + TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.find( (TQWidget*)o ); if ( it == actionMap.end() ) return; TQAction *a = *it; if ( !a ) return; - int index = actionList.tqfind( a ); + int index = actionList.find( a ); RemoveActionFromToolBarCommand *cmd = new RemoveActionFromToolBarCommand( tr( "Delete Action '%1' from Toolbar '%2'" ). arg( a->name() ).arg( caption() ), @@ -516,7 +516,7 @@ void TQDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o ) TQStoredDrag *drag = new ActionDrag( type, a, this ); drag->setPixmap( a->iconSet().pixmap() ); if ( ::tqqt_cast<TQDesignerAction*>(a) ) { - if ( formWindow->widgets()->tqfind( ( (TQDesignerAction*)a )->widget() ) ) + if ( formWindow->widgets()->find( ( (TQDesignerAction*)a )->widget() ) ) formWindow->selectWidget( ( (TQDesignerAction*)a )->widget(), FALSE ); } if ( !drag->drag() ) { @@ -564,7 +564,7 @@ void TQDesignerToolBar::dropEvent( TQDropEvent *e ) indicator->hide(); TQAction *a = 0; - int index = actionList.tqfindRef( *actionMap.tqfind( insertAnchor ) ); + int index = actionList.findRef( *actionMap.find( insertAnchor ) ); if ( index != -1 && afterAnchor ) ++index; if ( !insertAnchor ) @@ -579,7 +579,7 @@ void TQDesignerToolBar::dropEvent( TQDropEvent *e ) a = ::tqqt_cast<TQDesignerActionGroup*>(ActionDrag::action()); } - if ( actionList.tqfindRef( a ) != -1 ) { + if ( actionList.findRef( a ) != -1 ) { TQMessageBox::warning( MainWindow::self, tr( "Insert/Move Action" ), tr( "Action '%1' has already been added to this toolbar.\n" "An Action may only occur once in a given toolbar." ). @@ -708,7 +708,7 @@ void TQDesignerToolBar::doInsertWidget( const TQPoint &p ) installEventFilters( w ); MainWindow::self->formWindow()->insertWidget( w, TRUE ); TQDesignerAction *a = new TQDesignerAction( w, tqparent() ); - int index = actionList.tqfindRef( *actionMap.tqfind( insertAnchor ) ); + int index = actionList.findRef( *actionMap.find( insertAnchor ) ); if ( index != -1 && afterAnchor ) ++index; if ( !insertAnchor ) diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/actiondnd.h b/experimental/tqtinterface/qt4/tools/designer/designer/actiondnd.h index adde1b4d3..e6ec52836 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/actiondnd.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/actiondnd.h @@ -85,7 +85,7 @@ public: void init(); TQWidget *widget() const { return wid; } - TQWidget *widget( TQAction *a ) const { return *widgets.tqfind( a ); } + TQWidget *widget( TQAction *a ) const { return *widgets.find( a ); } int index() const { return idx; } protected: @@ -230,7 +230,7 @@ private: void buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o ); void buttonMouseReleaseEvent( TQMouseEvent *e, TQObject *o ); void doInsertWidget( const TQPoint &p ); - void tqfindFormWindow(); + void findFormWindow(); private: TQPoint lastIndicatorPos; diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/asciivalidator.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/asciivalidator.cpp index c13571617..9c91def4c 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/asciivalidator.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/asciivalidator.cpp @@ -92,7 +92,7 @@ TQValidator::State AsciiValidator::validate( TQString &s, int & ) const } } - if ( allowedChars.tqfind( s[ i ] ) != -1 ) + if ( allowedChars.find( s[ i ] ) != -1 ) continue; s[i] = '_'; diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/command.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/command.cpp index 2f3489269..10bf2919c 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/command.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/command.cpp @@ -376,7 +376,7 @@ DeleteCommand::DeleteCommand( const TQString &n, FormWindow *fw, for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { TQObjectList *tqchildren = w->queryList( "TQWidget" ); for ( TQWidget *c = (TQWidget *)tqchildren->first(); c; c = (TQWidget *)tqchildren->next() ) { - if ( copyOfWidgets.tqfind( c ) == -1 && formWindow()->widgets()->tqfind( c ) ) { + if ( copyOfWidgets.find( c ) == -1 && formWindow()->widgets()->find( c ) ) { widgets.insert(widgets.at() + 1, c); widgets.prev(); copyOfWidgets.append(c); @@ -422,7 +422,7 @@ void DeleteCommand::unexecute() w->setName( s ); formWindow()->widgets()->insert( w, w ); formWindow()->selectWidget( w ); - TQValueList<MetaDataBase::Connection> conns = *connections.tqfind( w ); + TQValueList<MetaDataBase::Connection> conns = *connections.find( w ); TQValueList<MetaDataBase::Connection>::Iterator it = conns.begin(); for ( ; it != conns.end(); ++it ) { MetaDataBase::addConnection( formWindow(), (*it).sender, @@ -493,7 +493,7 @@ bool SetPropertyCommand::canMerge( Command *c ) if ( !widget ) return FALSE; const TQMetaProperty *p = - widget->tqmetaObject()->property( widget->tqmetaObject()->tqfindProperty( propName, TRUE ), TRUE ); + widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( propName, TRUE ), TRUE ); if ( !p ) { if ( propName == "toolTip" || propName == "whatsThis" ) return TRUE; @@ -566,16 +566,16 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString ¤ if ( select ) editor->propertyList()->setCurrentProperty( propName ); const TQMetaProperty *p = - widget->tqmetaObject()->property( widget->tqmetaObject()->tqfindProperty( propName, TRUE ), TRUE ); + widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( propName, TRUE ), TRUE ); if ( !p ) { if ( propName == "hAlign" ) { - p = widget->tqmetaObject()->property( widget->tqmetaObject()->tqfindProperty( "tqalignment", TRUE ), TRUE ); + p = widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( "tqalignment", TRUE ), TRUE ); int align = widget->property( "tqalignment" ).toInt(); align &= ~( AlignHorizontal_Mask ); align |= p->keyToValue( currentItemText ); widget->setProperty( "tqalignment", TQVariant( align ) ); } else if ( propName == "vAlign" ) { - p = widget->tqmetaObject()->property( widget->tqmetaObject()->tqfindProperty( "tqalignment", TRUE ), TRUE ); + p = widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( "tqalignment", TRUE ), TRUE ); int align = widget->property( "tqalignment" ).toInt(); align &= ~( AlignVertical_Mask ); align |= p->keyToValue( currentItemText ); @@ -1723,7 +1723,7 @@ PopulateTableCommand::PopulateTableCommand( const TQString &n, FormWindow *fw, T col.text = table->horizontalHeader()->label( i ); if ( table->horizontalHeader()->iconSet( i ) ) col.pix = table->horizontalHeader()->iconSet( i )->pixmap(); - col.field = *columnFields.tqfind( col.text ); + col.field = *columnFields.find( col.text ); oldColumns.append( col ); } for ( i = 0; i < table->verticalHeader()->count(); ++i ) { @@ -2058,7 +2058,7 @@ void AddActionToPopupCommand::execute() void AddActionToPopupCommand::unexecute() { item->hideMenu(); - int i = menu->tqfind( item->action() ); + int i = menu->find( item->action() ); menu->remove( i ); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } @@ -2127,7 +2127,7 @@ RenameActionCommand::RenameActionCommand( const TQString &n, void RenameActionCommand::execute() { TQString actionText = newName; - actionText.tqreplace("&&", "&"); + actionText.replace("&&", "&"); TQString menuText = newName; action->setText( actionText ); action->setMenuText( menuText ); @@ -2206,7 +2206,7 @@ void AddMenuCommand::execute() popup->setName( "PopupMenuEditor" ); formWindow()->insertWidget( popup, TRUE ); mb->insertItem( name, popup, index ); - index = mb->tqfindItem( popup ); + index = mb->findItem( popup ); item = mb->item( index ); } else { PopupMenuEditor *popup = item->menu(); @@ -2224,7 +2224,7 @@ void AddMenuCommand::unexecute() return; } item->menu()->hide(); - int i = mb->tqfindItem( item ); + int i = mb->findItem( item ); formWindow()->removeWidget( item->menu() ); mb->removeItemAt( i ); formWindow()->mainWindow()->objectHierarchy()->rebuild(); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/configtoolboxdialog.ui.h b/experimental/tqtinterface/qt4/tools/designer/designer/configtoolboxdialog.ui.h index 4eb046bf4..2778f8bb1 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/configtoolboxdialog.ui.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/configtoolboxdialog.ui.h @@ -58,7 +58,7 @@ void ConfigToolboxDialog::init() a; a = MainWindow::self->toolActions.prev() ) { TQString grp = ( (WidgetAction*)a )->group(); - TQListViewItem *tqparent = groups.tqfind( grp ); + TQListViewItem *tqparent = groups.find( grp ); if ( !tqparent ) { tqparent = new TQListViewItem( listViewTools ); tqparent->setText( 0, grp ); @@ -102,7 +102,7 @@ void ConfigToolboxDialog::addTool() listViewCommon->ensureItemVisible( i ); } else if ( !addKids ) { // Children processing not set, so set it - // Also tqfind the item were we shall quit + // Also find the item were we shall quit // processing tqchildren...if any such item addKids = TRUE; nextSibling = (*it)->nextSibling(); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/connectiondialog.ui.h b/experimental/tqtinterface/qt4/tools/designer/designer/connectiondialog.ui.h index 0113b95e0..da8fd8cc0 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/connectiondialog.ui.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/connectiondialog.ui.h @@ -194,15 +194,15 @@ void ConnectionDialog::okClicked() for ( ConnectionContainer *c = connections.first(); c; c = connections.next() ) { MetaDataBase::Connection conn; - // tqfind sender widget + // find sender widget conn.sender = MainWindow::self->formWindow()->child( c->senderItem()->currentText() ); - if ( !conn.sender ) // if no sender widget, tqfind sender action - conn.sender = MainWindow::self->formWindow()->tqfindAction( c->senderItem()->currentText() ); + if ( !conn.sender ) // if no sender widget, find sender action + conn.sender = MainWindow::self->formWindow()->findAction( c->senderItem()->currentText() ); - // tqfind receiver widget + // find receiver widget conn.receiver = MainWindow::self->formWindow()->child( c->receiverItem()->currentText() ); - if ( !conn.receiver ) // if no receiver widget, tqfind receiver action - conn.receiver = MainWindow::self->formWindow()->tqfindAction( c->receiverItem()->currentText() ); + if ( !conn.receiver ) // if no receiver widget, find receiver action + conn.receiver = MainWindow::self->formWindow()->findAction( c->receiverItem()->currentText() ); conn.signal = c->signalItem()->currentText(); conn.slot = c->slotItem()->currentText(); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/connectionitems.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/connectionitems.cpp index b6ab06a14..1627ef880 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/connectionitems.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/connectionitems.cpp @@ -227,7 +227,7 @@ SenderItem::SenderItem( TQTable *table, FormWindow *fw ) TQPtrDictIterator<TQWidget> it( *formWindow->widgets() ); while ( it.current() ) { - if ( lst.tqfind( it.current()->name() ) != lst.end() ) { + if ( lst.find( it.current()->name() ) != lst.end() ) { ++it; continue; } @@ -267,7 +267,7 @@ void SenderItem::senderChanged( const TQString &sender ) { TQObject *o = formWindow->child( sender, "TQObject" ); if ( !o ) - o = formWindow->tqfindAction( sender ); + o = formWindow->findAction( sender ); if ( !o ) return; emit currentSenderChanged( o ); @@ -284,7 +284,7 @@ ReceiverItem::ReceiverItem( TQTable *table, FormWindow *fw ) TQPtrDictIterator<TQWidget> it( *formWindow->widgets() ); while ( it.current() ) { - if ( lst.tqfind( it.current()->name() ) != lst.end() ) { + if ( lst.find( it.current()->name() ) != lst.end() ) { ++it; continue; } @@ -324,7 +324,7 @@ void ReceiverItem::receiverChanged( const TQString &receiver ) { TQObject *o = formWindow->child( receiver, "TQObject" ); if ( !o ) - o = formWindow->tqfindAction( receiver ); + o = formWindow->findAction( receiver ); if ( !o ) return; emit currentReceiverChanged( o ); @@ -460,7 +460,7 @@ void SlotItem::updateSlotList() TQMetaData::Protected) ) && !ignoreSlot( md->name() ) && checkConnectArgs( signal.latin1(), lastReceiver, md->name() ) ) - if ( lst.tqfind( md->name() ) == lst.end() ) + if ( lst.find( md->name() ) == lst.end() ) lst << MetaDataBase::normalizeFunction( md->name() ); } @@ -477,7 +477,7 @@ void SlotItem::updateSlotList() continue; s = MetaDataBase::normalizeFunction( s ); if ( checkConnectArgs( signal.latin1(), lastReceiver, s ) ) { - if ( lst.tqfind( (*it).function ) == lst.end() ) + if ( lst.find( (*it).function ) == lst.end() ) lst << s; } } @@ -494,7 +494,7 @@ void SlotItem::updateSlotList() continue; s = MetaDataBase::normalizeFunction( s ); if ( checkConnectArgs( signal.latin1(), lastReceiver, s ) ) { - if ( lst.tqfind( (*it).function ) == lst.end() ) + if ( lst.find( (*it).function ) == lst.end() ) lst << s; } } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/customwidgeteditor.ui b/experimental/tqtinterface/qt4/tools/designer/designer/customwidgeteditor.ui index f5d5a019b..4565fb8b6 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/customwidgeteditor.ui +++ b/experimental/tqtinterface/qt4/tools/designer/designer/customwidgeteditor.ui @@ -185,7 +185,7 @@ <string>Loads widget description file</string> </property> <property name="whatsThis" stdset="0"> - <string><b>Load Descriptions</b><p>Loads a file which tqcontains descriptions of custom widgets, so that these custom widgets can be used in the Qt Designer.</p> + <string><b>Load Descriptions</b><p>Loads a file which contains descriptions of custom widgets, so that these custom widgets can be used in the Qt Designer.</p> <p>Since it is a lot of work to type in all the information for custom widgets, you should consider using the createcw tool which is in $QTDIR/tools/designer/tools/createcw. Using createcw you can create custom widget description files for your custom widgets without the need to type in all the information manually. For more information about the README file in the createcw directory</p></string> </property> </widget> diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.cpp index 91531c37f..7d364c5da 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.cpp @@ -112,7 +112,7 @@ void CustomWidgetEditor::setupSignals() { editSignal->setEnabled( FALSE ); buttonRemoveSignal->setEnabled( FALSE ); - MetaDataBase::CustomWidget *w = tqfindWidget( boxWidgets->item( boxWidgets->currentItem() ) ); + MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( !w ) return; listSignals->clear(); @@ -130,7 +130,7 @@ void CustomWidgetEditor::setupSlots() comboAccess->setEnabled( FALSE ); buttonRemoveSlot->setEnabled( FALSE ); - MetaDataBase::CustomWidget *w = tqfindWidget( boxWidgets->item( boxWidgets->currentItem() ) ); + MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( !w ) return; listSlots->clear(); @@ -149,7 +149,7 @@ void CustomWidgetEditor::setupProperties() comboType->setEnabled( FALSE ); buttonRemoveProperty->setEnabled( FALSE ); - MetaDataBase::CustomWidget *w = tqfindWidget( boxWidgets->item( boxWidgets->currentItem() ) ); + MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( !w ) return; listProperties->clear(); @@ -167,7 +167,7 @@ void CustomWidgetEditor::currentWidgetChanged( TQListBoxItem *i ) checkTimer->stop(); checkWidgetName(); - MetaDataBase::CustomWidget *w = tqfindWidget( i ); + MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) { buttonChooseHeader->setEnabled( FALSE ); editClass->setEnabled( FALSE ); @@ -239,7 +239,7 @@ void CustomWidgetEditor::addWidgetClicked() void CustomWidgetEditor::classNameChanged( const TQString &s ) { TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); - MetaDataBase::CustomWidget *w = tqfindWidget( i ); + MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) return; @@ -269,7 +269,7 @@ void CustomWidgetEditor::deleteWidgetClicked() checkWidgetName(); TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); - MetaDataBase::CustomWidget *w = tqfindWidget( i ); + MetaDataBase::CustomWidget *w = findWidget( i ); if ( mainWindow->isCustomWidgetUsed( w ) ) { TQMessageBox::information( mainWindow, tr( "Removing Custom Widget" ), @@ -299,7 +299,7 @@ void CustomWidgetEditor::deleteWidgetClicked() void CustomWidgetEditor::headerFileChanged( const TQString &s ) { TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); - MetaDataBase::CustomWidget *w = tqfindWidget( i ); + MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) return; @@ -309,7 +309,7 @@ void CustomWidgetEditor::headerFileChanged( const TQString &s ) void CustomWidgetEditor::heightChanged( int h ) { TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); - MetaDataBase::CustomWidget *w = tqfindWidget( i ); + MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) return; @@ -320,7 +320,7 @@ void CustomWidgetEditor::heightChanged( int h ) void CustomWidgetEditor::includePolicyChanged( int p ) { TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); - MetaDataBase::CustomWidget *w = tqfindWidget( i ); + MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) return; @@ -330,7 +330,7 @@ void CustomWidgetEditor::includePolicyChanged( int p ) void CustomWidgetEditor::pixmapChoosen() { TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); - MetaDataBase::CustomWidget *w = tqfindWidget( i ); + MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) return; @@ -353,7 +353,7 @@ void CustomWidgetEditor::pixmapChoosen() void CustomWidgetEditor::widthChanged( int wid ) { TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); - MetaDataBase::CustomWidget *w = tqfindWidget( i ); + MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) return; @@ -361,12 +361,12 @@ void CustomWidgetEditor::widthChanged( int wid ) updateCustomWidgetSizes(); } -MetaDataBase::CustomWidget *CustomWidgetEditor::tqfindWidget( TQListBoxItem *i ) +MetaDataBase::CustomWidget *CustomWidgetEditor::findWidget( TQListBoxItem *i ) { if ( !i ) return 0; - TQMap<TQListBoxItem*, MetaDataBase::CustomWidget*>::Iterator it = customWidgets.tqfind( i ); + TQMap<TQListBoxItem*, MetaDataBase::CustomWidget*>::Iterator it = customWidgets.find( i ); if ( it == customWidgets.end() ) return 0; return *it; @@ -375,7 +375,7 @@ MetaDataBase::CustomWidget *CustomWidgetEditor::tqfindWidget( TQListBoxItem *i ) void CustomWidgetEditor::chooseHeader() { TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); - MetaDataBase::CustomWidget *w = tqfindWidget( i ); + MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) return; @@ -389,7 +389,7 @@ void CustomWidgetEditor::chooseHeader() void CustomWidgetEditor::checkWidgetName() { TQListBoxItem *i = oldItem ? oldItem : boxWidgets->item( boxWidgets->currentItem() ); - MetaDataBase::CustomWidget *w = tqfindWidget( i ); + MetaDataBase::CustomWidget *w = findWidget( i ); oldItem = 0; if ( !i || !w ) return; @@ -442,7 +442,7 @@ void CustomWidgetEditor::addSignal() TQListBoxItem *i = new TQListBoxText( listSignals, "signal()" ); listSignals->setCurrentItem( i ); listSignals->setSelected( i, TRUE ); - MetaDataBase::CustomWidget *w = tqfindWidget( boxWidgets->item( boxWidgets->currentItem() ) ); + MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( w ) w->lstSignals.append( i->text().latin1() ); } @@ -453,18 +453,18 @@ void CustomWidgetEditor::removeSignal() delete listSignals->item( listSignals->currentItem() ); if ( listSignals->currentItem() != -1 ) listSignals->setSelected( listSignals->currentItem(), TRUE ); - MetaDataBase::CustomWidget *w = tqfindWidget( boxWidgets->item( boxWidgets->currentItem() ) ); + MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( w ) w->lstSignals.remove( s.latin1() ); } void CustomWidgetEditor::signalNameChanged( const TQString &s ) { - MetaDataBase::CustomWidget *w = tqfindWidget( boxWidgets->item( boxWidgets->currentItem() ) ); + MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( !w || listSignals->currentItem() == -1 ) return; - TQValueList<TQCString>::Iterator it = w->lstSignals.tqfind( listSignals->currentText().latin1() ); + TQValueList<TQCString>::Iterator it = w->lstSignals.find( listSignals->currentText().latin1() ); if ( it != w->lstSignals.end() ) w->lstSignals.remove( it ); listSignals->blockSignals( TRUE ); @@ -475,14 +475,14 @@ void CustomWidgetEditor::signalNameChanged( const TQString &s ) void CustomWidgetEditor::slotAccessChanged( const TQString &s ) { - MetaDataBase::CustomWidget *w = tqfindWidget( boxWidgets->item( boxWidgets->currentItem() ) ); + MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( !w || !listSlots->currentItem() ) return; MetaDataBase::Function slot; slot.function = listSlots->currentItem()->text( 0 ); slot.access = listSlots->currentItem()->text( 1 ); - TQValueList<MetaDataBase::Function>::Iterator it = w->lstSlots.tqfind( slot ); + TQValueList<MetaDataBase::Function>::Iterator it = w->lstSlots.find( slot ); if ( it != w->lstSlots.end() ) w->lstSlots.remove( it ); listSlots->currentItem()->setText( 1, s ); @@ -493,7 +493,7 @@ void CustomWidgetEditor::slotAccessChanged( const TQString &s ) void CustomWidgetEditor::slotNameChanged( const TQString &s ) { - MetaDataBase::CustomWidget *w = tqfindWidget( boxWidgets->item( boxWidgets->currentItem() ) ); + MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( !w || !listSlots->currentItem() ) return; @@ -501,7 +501,7 @@ void CustomWidgetEditor::slotNameChanged( const TQString &s ) slot.function = listSlots->currentItem()->text( 0 ); slot.access = listSlots->currentItem()->text( 1 ); slot.type = "slot"; - TQValueList<MetaDataBase::Function>::Iterator it = w->lstSlots.tqfind( slot ); + TQValueList<MetaDataBase::Function>::Iterator it = w->lstSlots.find( slot ); if ( it != w->lstSlots.end() ) w->lstSlots.remove( it ); listSlots->currentItem()->setText( 0, s ); @@ -515,7 +515,7 @@ void CustomWidgetEditor::addSlot() TQListViewItem *i = new TQListViewItem( listSlots, "slot()", "public" ); listSlots->setCurrentItem( i ); listSlots->setSelected( i, TRUE ); - MetaDataBase::CustomWidget *w = tqfindWidget( boxWidgets->item( boxWidgets->currentItem() ) ); + MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( w ) { MetaDataBase::Function slot; slot.function = "slot()"; @@ -536,7 +536,7 @@ void CustomWidgetEditor::removeSlot() delete listSlots->currentItem(); if ( listSlots->currentItem() ) listSlots->setSelected( listSlots->currentItem(), TRUE ); - MetaDataBase::CustomWidget *w = tqfindWidget( boxWidgets->item( boxWidgets->currentItem() ) ); + MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( w && slot.function != "1 2 3" ) w->lstSlots.remove( slot ); } @@ -570,14 +570,14 @@ void CustomWidgetEditor::currentSlotChanged( TQListViewItem *i ) void CustomWidgetEditor::propertyTypeChanged( const TQString &s ) { - MetaDataBase::CustomWidget *w = tqfindWidget( boxWidgets->item( boxWidgets->currentItem() ) ); + MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( !w || !listProperties->currentItem() ) return; MetaDataBase::Property property; property.property = listProperties->currentItem()->text( 0 ); property.type = listProperties->currentItem()->text( 1 ); - TQValueList<MetaDataBase::Property>::Iterator it = w->lstProperties.tqfind( property ); + TQValueList<MetaDataBase::Property>::Iterator it = w->lstProperties.find( property ); if ( it != w->lstProperties.end() ) w->lstProperties.remove( it ); listProperties->currentItem()->setText( 1, s ); @@ -588,14 +588,14 @@ void CustomWidgetEditor::propertyTypeChanged( const TQString &s ) void CustomWidgetEditor::propertyNameChanged( const TQString &s ) { - MetaDataBase::CustomWidget *w = tqfindWidget( boxWidgets->item( boxWidgets->currentItem() ) ); + MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( !w || !listProperties->currentItem() ) return; MetaDataBase::Property property; property.property = listProperties->currentItem()->text( 0 ); property.type = listProperties->currentItem()->text( 1 ); - TQValueList<MetaDataBase::Property>::Iterator it = w->lstProperties.tqfind( property ); + TQValueList<MetaDataBase::Property>::Iterator it = w->lstProperties.find( property ); if ( it != w->lstProperties.end() ) w->lstProperties.remove( it ); listProperties->currentItem()->setText( 0, s ); @@ -609,7 +609,7 @@ void CustomWidgetEditor::addProperty() TQListViewItem *i = new TQListViewItem( listProperties, "property", "String" ); listProperties->setCurrentItem( i ); listProperties->setSelected( i, TRUE ); - MetaDataBase::CustomWidget *w = tqfindWidget( boxWidgets->item( boxWidgets->currentItem() ) ); + MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( w ) { MetaDataBase::Property prop; prop.property = "property"; @@ -629,7 +629,7 @@ void CustomWidgetEditor::removeProperty() delete listProperties->currentItem(); if ( listProperties->currentItem() ) listProperties->setSelected( listProperties->currentItem(), TRUE ); - MetaDataBase::CustomWidget *w = tqfindWidget( boxWidgets->item( boxWidgets->currentItem() ) ); + MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( w && property.property != "1 2 3" ) w->lstProperties.remove( property ); } @@ -674,11 +674,11 @@ static TQString makeIndent2( int indent ) static TQString entitize2( const TQString &s ) { TQString s2 = s; - s2 = s2.tqreplace( "\"", """ ); - s2 = s2.tqreplace( "&", "&" ); - s2 = s2.tqreplace( ">", ">" ); - s2 = s2.tqreplace( "<", "<" ); - s2 = s2.tqreplace( "'", "'" ); + s2 = s2.replace( "\"", """ ); + s2 = s2.replace( "&", "&" ); + s2 = s2.replace( ">", ">" ); + s2 = s2.replace( "<", "<" ); + s2 = s2.replace( "'", "'" ); return s2; } @@ -793,7 +793,7 @@ void CustomWidgetEditor::horDataChanged( int a ) { TQSizePolicy::SizeType st = int_to_size_type( a ); TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); - MetaDataBase::CustomWidget *w = tqfindWidget( i ); + MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) return; @@ -814,7 +814,7 @@ void CustomWidgetEditor::verDataChanged( int a ) { TQSizePolicy::SizeType st = int_to_size_type( a ); TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); - MetaDataBase::CustomWidget *w = tqfindWidget( i ); + MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) return; @@ -834,7 +834,7 @@ void CustomWidgetEditor::verDataChanged( int a ) void CustomWidgetEditor::widgetIsContainer( bool b ) { TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); - MetaDataBase::CustomWidget *w = tqfindWidget( i ); + MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) return; diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.h b/experimental/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.h index 719b1c20f..ed0caf94e 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.h @@ -86,7 +86,7 @@ protected Q_SLOTS: void widgetIsContainer( bool ); private: - MetaDataBase::CustomWidget *tqfindWidget( TQListBoxItem *i ); + MetaDataBase::CustomWidget *findWidget( TQListBoxItem *i ); void setupDefinition(); void setupSignals(); void setupSlots(); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/designer.pro b/experimental/tqtinterface/qt4/tools/designer/designer/designer.pro index 4d98c514e..7d147bca1 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/designer.pro +++ b/experimental/tqtinterface/qt4/tools/designer/designer/designer.pro @@ -2,7 +2,7 @@ TEMPLATE = lib CONFIG += qt warn_on staticlib qmake_cache CONFIG -= dll -!force_static:!win32:tqcontains(QT_PRODUCT,qt-internal) { +!force_static:!win32:contains(QT_PRODUCT,qt-internal) { CONFIG -= staticlib CONFIG += dll } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/designer_de.ts b/experimental/tqtinterface/qt4/tools/designer/designer/designer_de.ts index 4fd54decc..ec81eced4 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/designer_de.ts +++ b/experimental/tqtinterface/qt4/tools/designer/designer/designer_de.ts @@ -423,8 +423,8 @@ so it is not possible to rename it to this name.</source> <translation type="unfinished"></translation> </message> <message encoding="UTF-8"> - <source><b>Load Descriptions</b><p>Loads a file which tqcontains descriptions of custom widgets, so that these custom widgets can be used in the Qt Designer.</p> -<p>As it is a lot of work to type in all the information for custom widgets, you should check the tool createcw which you can tqfind in $QTDIR/tools/designer/tools/createcw. Using that tool you can create custom widget description files for your custom widgets without the need of typing in all that information. For more information about that see the README file in that directory</p></source> + <source><b>Load Descriptions</b><p>Loads a file which contains descriptions of custom widgets, so that these custom widgets can be used in the Qt Designer.</p> +<p>As it is a lot of work to type in all the information for custom widgets, you should check the tool createcw which you can find in $QTDIR/tools/designer/tools/createcw. Using that tool you can create custom widget description files for your custom widgets without the need of typing in all that information. For more information about that see the README file in that directory</p></source> <translation type="unfinished"></translation> </message> <message encoding="UTF-8"> @@ -1278,7 +1278,7 @@ Do you want to reload it?</source> <translation type="unfinished"></translation> </message> <message> - <source>The project tqcontains already a form with the + <source>The project contains already a form with the filename '%1'. Please choose a new filename.</source> <translation type="unfinished"></translation> </message> @@ -2265,7 +2265,7 @@ but they are not known to the designer:</source> <translation type="unfinished"></translation> </message> <message> - <source>Couldn't tqfind the Qt documentation property index file! + <source>Couldn't find the Qt documentation property index file! Define the correct documentation path in the preferences dialog.</source> <translation type="unfinished"></translation> </message> @@ -4690,7 +4690,7 @@ Do you want to reload it?</source> <translation type="unfinished"></translation> </message> <message> - <source>The project tqcontains already a sourcefile with the + <source>The project contains already a sourcefile with the filename '%1'. Please choose a new filename.</source> <translation type="unfinished"></translation> </message> diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/designer_fr.ts b/experimental/tqtinterface/qt4/tools/designer/designer/designer_fr.ts index 4fd54decc..ec81eced4 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/designer_fr.ts +++ b/experimental/tqtinterface/qt4/tools/designer/designer/designer_fr.ts @@ -423,8 +423,8 @@ so it is not possible to rename it to this name.</source> <translation type="unfinished"></translation> </message> <message encoding="UTF-8"> - <source><b>Load Descriptions</b><p>Loads a file which tqcontains descriptions of custom widgets, so that these custom widgets can be used in the Qt Designer.</p> -<p>As it is a lot of work to type in all the information for custom widgets, you should check the tool createcw which you can tqfind in $QTDIR/tools/designer/tools/createcw. Using that tool you can create custom widget description files for your custom widgets without the need of typing in all that information. For more information about that see the README file in that directory</p></source> + <source><b>Load Descriptions</b><p>Loads a file which contains descriptions of custom widgets, so that these custom widgets can be used in the Qt Designer.</p> +<p>As it is a lot of work to type in all the information for custom widgets, you should check the tool createcw which you can find in $QTDIR/tools/designer/tools/createcw. Using that tool you can create custom widget description files for your custom widgets without the need of typing in all that information. For more information about that see the README file in that directory</p></source> <translation type="unfinished"></translation> </message> <message encoding="UTF-8"> @@ -1278,7 +1278,7 @@ Do you want to reload it?</source> <translation type="unfinished"></translation> </message> <message> - <source>The project tqcontains already a form with the + <source>The project contains already a form with the filename '%1'. Please choose a new filename.</source> <translation type="unfinished"></translation> </message> @@ -2265,7 +2265,7 @@ but they are not known to the designer:</source> <translation type="unfinished"></translation> </message> <message> - <source>Couldn't tqfind the Qt documentation property index file! + <source>Couldn't find the Qt documentation property index file! Define the correct documentation path in the preferences dialog.</source> <translation type="unfinished"></translation> </message> @@ -4690,7 +4690,7 @@ Do you want to reload it?</source> <translation type="unfinished"></translation> </message> <message> - <source>The project tqcontains already a sourcefile with the + <source>The project contains already a sourcefile with the filename '%1'. Please choose a new filename.</source> <translation type="unfinished"></translation> </message> diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/designerappiface.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/designerappiface.cpp index 5acbf58d1..a959d42d4 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/designerappiface.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/designerappiface.cpp @@ -348,12 +348,12 @@ void DesignerProjectImpl::breakPoints( TQMap<TQString, TQValueList<uint> > &bps TQString DesignerProjectImpl::breakPointCondition( TQObject *o, int line ) const { - return MetaDataBase::breakPointCondition( MainWindow::self->tqfindRealObject( o ), line ); + return MetaDataBase::breakPointCondition( MainWindow::self->findRealObject( o ), line ); } void DesignerProjectImpl::setBreakPointCondition( TQObject *o, int line, const TQString &condition ) { - MetaDataBase::setBreakPointCondition( MainWindow::self->tqfindRealObject( o ), line, condition ); + MetaDataBase::setBreakPointCondition( MainWindow::self->findRealObject( o ), line, condition ); } void DesignerProjectImpl::clearAllBreakpoints() const @@ -739,7 +739,7 @@ TQAction *DesignerFormWindowImpl::createAction( const TQString& text, const TQIc void DesignerFormWindowImpl::addAction( TQAction *a ) { - if ( formWindow->actionList().tqfindRef( a ) != -1 ) + if ( formWindow->actionList().findRef( a ) != -1 ) return; formWindow->actionList().append( a ); MetaDataBase::addEntry( a ); @@ -777,7 +777,7 @@ void DesignerFormWindowImpl::addFunction( const TQCString &function, const TQStr void DesignerFormWindowImpl::setProperty( TQObject *o, const char *property, const TQVariant &value ) { - int id = o->tqmetaObject()->tqfindProperty( property, TRUE ); + int id = o->tqmetaObject()->findProperty( property, TRUE ); const TQMetaProperty* p = o->tqmetaObject()->property( id, TRUE ); if ( p && p->isValid() ) o->setProperty( property, value ); @@ -787,7 +787,7 @@ void DesignerFormWindowImpl::setProperty( TQObject *o, const char *property, con TQVariant DesignerFormWindowImpl::property( TQObject *o, const char *prop ) const { - int id = o->tqmetaObject()->tqfindProperty( prop, TRUE ); + int id = o->tqmetaObject()->findProperty( prop, TRUE ); const TQMetaProperty* p = o->tqmetaObject()->property( id, TRUE ); if ( p && p->isValid() ) return o->property( prop ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/editfunctionsimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/editfunctionsimpl.cpp index 062a79ca3..a8ee282be 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/editfunctionsimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/editfunctionsimpl.cpp @@ -177,10 +177,10 @@ void EditFunctions::okClicked() TQString s = function.function; s = s.simplifyWhiteSpace(); bool startNum = s[ 0 ] >= '0' && s[ 0 ] <= '9'; - bool noParens = s.tqcontains( '(' ) != 1 || s.tqcontains( ')' ) != 1; - bool illegalSpace = s.tqfind( ' ' ) != -1 && s.tqfind( ' ' ) < s.tqfind( '(' ); + bool noParens = s.contains( '(' ) != 1 || s.contains( ')' ) != 1; + bool illegalSpace = s.find( ' ' ) != -1 && s.find( ' ' ) < s.find( '(' ); - if ( startNum || noParens || illegalSpace || lst.tqfind( function.function ) != -1 ) { + if ( startNum || noParens || illegalSpace || lst.find( function.function ) != -1 ) { invalidFunctions = TRUE; invalidItems.append( (*it) ); continue; @@ -456,7 +456,7 @@ void EditFunctions::currentTypeChanged( const TQString &type ) void EditFunctions::changeItem( TQListViewItem *item, Attribute a, const TQString &nV ) { int itemId; - TQMap<TQListViewItem*, int>::Iterator fit = functionIds.tqfind( item ); + TQMap<TQListViewItem*, int>::Iterator fit = functionIds.find( item ); if ( fit != functionIds.end() ) itemId = *fit; else diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/finddialog.ui.h b/experimental/tqtinterface/qt4/tools/designer/designer/finddialog.ui.h index 4eba2051c..b4ff3e3e4 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/finddialog.ui.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/finddialog.ui.h @@ -48,7 +48,7 @@ void FindDialog::doFind() if ( !editor ) return; - if ( !editor->tqfind( comboFind->currentText(), checkCase->isChecked(), + if ( !editor->find( comboFind->currentText(), checkCase->isChecked(), checkWords->isChecked(), radioForward->isChecked(), !checkBegin->isChecked() ) ) checkBegin->setChecked( TRUE ); else diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/formfile.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/formfile.cpp index 3701d023f..6b706a9e7 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/formfile.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/formfile.cpp @@ -53,17 +53,17 @@ static TQString make_func_pretty( const TQString &s ) { TQString res = s; - if ( res.tqfind( ")" ) - res.tqfind( "(" ) == 1 ) + if ( res.find( ")" ) - res.find( "(" ) == 1 ) return res; - res.tqreplace( "(", "( " ); - res.tqreplace( ")", " )" ); - res.tqreplace( "&", " &" ); - res.tqreplace( "*", " *" ); - res.tqreplace( ",", ", " ); - res.tqreplace( ":", " : " ); + res.replace( "(", "( " ); + res.replace( ")", " )" ); + res.replace( "&", " &" ); + res.replace( "*", " *" ); + res.replace( ",", ", " ); + res.replace( ":", " : " ); res = res.simplifyWhiteSpace(); - res.tqreplace( " : : ", "::" ); - res.tqreplace( ">>", "> >" ); + res.replace( " : : ", "::" ); + res.replace( ">>", "> >" ); return res; } @@ -113,7 +113,7 @@ void FormFile::setFileName( const TQString &fn ) return; if ( fn.isEmpty() ) { fileNameTemp = TRUE; - if ( filename.tqfind( "unnamed" ) != 0 ) + if ( filename.find( "unnamed" ) != 0 ) filename = createUnnamedFileName(); return; } else { @@ -267,7 +267,7 @@ bool FormFile::saveAs( bool ignoreModified ) TQString f = pro->makeAbsolute( fileName() ); if ( fileNameTemp && formWindow() ) { f = TQString( formWindow()->name() ).lower(); - f.tqreplace( "::", "_" ); + f.replace( "::", "_" ); f = pro->makeAbsolute( f + ".ui" ); } bool saved = FALSE; @@ -767,7 +767,7 @@ void FormFile::removeFunctionCode( MetaDataBase::Function function ) int line = 0; int start = 0; while ( line < (*fit).start - 1 ) { - start = sourceCode.tqfind( '\n', start ); + start = sourceCode.find( '\n', start ); if ( start == -1 ) return; start++; @@ -777,7 +777,7 @@ void FormFile::removeFunctionCode( MetaDataBase::Function function ) return; int end = start; while ( line < (*fit).end + 1 ) { - end = sourceCode.tqfind( '\n', end ); + end = sourceCode.find( '\n', end ); if ( end == -1 ) { if ( line <= (*fit).end ) end = sourceCode.length() - 1; @@ -799,7 +799,7 @@ void FormFile::functionNameChanged( const TQString &oldName, const TQString &new { if ( !cod.isEmpty() ) { TQString funcStart = TQString( formWindow()->name() ) + TQString( "::" ); - int i = cod.tqfind( funcStart + oldName ); + int i = cod.find( funcStart + oldName ); if ( i != -1 ) { cod.remove( i + funcStart.length(), oldName.length() ); cod.insert( i + funcStart.length(), newName ); @@ -813,7 +813,7 @@ void FormFile::functionRetTypeChanged( const TQString &fuName, const TQString &o TQString oldFunct = oldType + " " + TQString( formWindow()->name() ) + "::" + fuName; TQString newFunct = newType + " " + TQString( formWindow()->name() ) + "::" + fuName; - int i = cod.tqfind( oldFunct ); + int i = cod.find( oldFunct ); if ( i != -1 ) { cod.remove( i, oldFunct.length() ); cod.insert( i, newFunct ); @@ -838,7 +838,7 @@ TQString FormFile::formName() const while ( !ts.eof() ) { line = ts.readLine(); if ( !className.isEmpty() ) { - int end = line.tqfind( "</class>" ); + int end = line.find( "</class>" ); if ( end == -1 ) { className += line; } else { @@ -848,8 +848,8 @@ TQString FormFile::formName() const continue; } int start; - if ( ( start = line.tqfind( "<class>" ) ) != -1 ) { - int end = line.tqfind( "</class>" ); + if ( ( start = line.find( "<class>" ) ) != -1 ) { + int end = line.find( "</class>" ); if ( end == -1 ) { className = line.mid( start + 7 ); } else { @@ -872,10 +872,10 @@ void FormFile::formWindowChangedSomehow() bool FormFile::checkFileName( bool allowBreak ) { - FormFile *ff = pro->tqfindFormFile( filename, this ); + FormFile *ff = pro->findFormFile( filename, this ); if ( ff ) TQMessageBox::warning( MainWindow::self, tr( "Invalid Filename" ), - tr( "The project already tqcontains a form with a\n" + tr( "The project already contains a form with a\n" "filename of '%1'. Please choose a new filename." ).arg( filename ) ); if (!formWindow()) // We are starting up return FALSE; @@ -892,7 +892,7 @@ bool FormFile::checkFileName( bool allowBreak ) return FALSE; } filename = pro->makeRelative( fn ); - ff = pro->tqfindFormFile( filename, this ); + ff = pro->findFormFile( filename, this ); } return TRUE; } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/formwindow.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/formwindow.cpp index 0b102e9fa..f3155eef3 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/formwindow.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/formwindow.cpp @@ -97,7 +97,7 @@ static void setCursorToAll( const TQCursor &c, TQWidget *start ) static void restoreCursors( TQWidget *start, FormWindow *fw ) { - if ( fw->widgets()->tqfind( start ) ) + if ( fw->widgets()->find( start ) ) start->setCursor( MetaDataBase::cursor( start ) ); else start->setCursor( TQt::ArrowCursor ); @@ -256,7 +256,7 @@ void FormWindow::paintGrid( TQWidget *w, TQPaintEvent *e ) TQPixmap grid; TQString grid_name; grid_name.sprintf("FormWindowGrid_%d_%d", mainWindow()->grid().x(), mainWindow()->grid().y()); - if( !TQPixmapCache::tqfind( grid_name, grid ) ) { + if( !TQPixmapCache::find( grid_name, grid ) ) { grid = TQPixmap( 350 + ( 350 % mainWindow()->grid().x() ), 350 + ( 350 % mainWindow()->grid().y() ) ); grid.fill( tqcolorGroup().color( TQColorGroup::Foreground ) ); TQBitmap tqmask( grid.width(), grid.height() ); @@ -432,10 +432,10 @@ void FormWindow::insertWidget() ++it; if ( o->isWidgetType() && ( (TQWidget*)o )->isVisibleTo( this ) && - insertedWidgets.tqfind( (TQWidget*)o ) && o != TQT_TQOBJECT(w) ) { + insertedWidgets.find( (TQWidget*)o ) && o != TQT_TQOBJECT(w) ) { TQRect r2( ( (TQWidget*)o )->pos(), ( (TQWidget*)o )->size() ); - if ( r.tqcontains( r2 ) ) + if ( r.contains( r2 ) ) lst.append( (TQWidget*)o ); } } @@ -535,11 +535,11 @@ void FormWindow::handleContextMenu( TQContextMenuEvent *e, TQWidget *w ) if ( !isMainContainer( w ) && qstrcmp( w->name(), "central widget" ) != 0 ) { // press on a child widget raiseChildSelections( w ); // raise selections and select widget selectWidget( w ); - // if widget is laid out, tqfind the first non-laid out super-widget + // if widget is laid out, find the first non-laid out super-widget TQWidget *realWidget = w; // but store the original one while ( w->parentWidget() && ( WidgetFactory::layoutType( w->parentWidget()) != WidgetFactory::NoLayout || - !insertedWidgets.tqfind(w) ) ) + !insertedWidgets.find(w) ) ) w = w->parentWidget(); if ( ::tqqt_cast<TQMainWindow*>(mainContainer()) && ((TQMainWindow*)mainContainer())->centralWidget() == realWidget ) { e->accept(); @@ -596,7 +596,7 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) for ( TQObject *o = l->first(); o; o = l->next() ) { if ( !o->isWidgetType() ) continue; - if ( insertedWidgets.tqfind( (TQWidget*)o ) ) + if ( insertedWidgets.find( (TQWidget*)o ) ) selectWidget( (TQWidget*)o, FALSE ); } setPropertyShowingBlocked( FALSE ); @@ -614,9 +614,9 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) raiseChildSelections( w ); // raise selections and select widget selectWidget( w ); - // if widget is laid out, tqfind the first non-laid out super-widget + // if widget is laid out, find the first non-laid out super-widget while ( w->parentWidget() && - ( WidgetFactory::layoutType( w->parentWidget()) != WidgetFactory::NoLayout || !insertedWidgets.tqfind(w) ) ) + ( WidgetFactory::layoutType( w->parentWidget()) != WidgetFactory::NoLayout || !insertedWidgets.find(w) ) ) w = w->parentWidget(); if ( e->button() == Qt::LeftButton ) { // left button: store original tqgeometry and more as the widget might start moving @@ -674,7 +674,7 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) orderedWidgets.removeRef( w ); orderedWidgets.append( w ); for ( TQWidget *wid = orderedWidgets.last(); wid; wid = orderedWidgets.prev() ) { - int i = stackedWidgets.tqfindRef( wid ); + int i = stackedWidgets.findRef( wid ); if ( i != -1 ) { stackedWidgets.removeRef( wid ); stackedWidgets.insert( 0, wid ); @@ -690,7 +690,7 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) default: // any insert widget tool if ( e->button() == Qt::LeftButton ) { insertParent = WidgetFactory::containerOfWidget( mainContainer() ); // default tqparent for new widget is the formwindow - if ( !isMainContainer( w ) ) { // press was not on formwindow, check if we can tqfind another tqparent + if ( !isMainContainer( w ) ) { // press was not on formwindow, check if we can find another tqparent TQWidget *wid = w; for (;;) { int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( wid ) ); @@ -720,7 +720,7 @@ void FormWindow::handleMouseDblClick( TQMouseEvent *, TQWidget *w ) orderedWidgets.clear(); orderedWidgets.append( w ); for ( TQWidget *wid = orderedWidgets.last(); wid; wid = orderedWidgets.prev() ) { - int i = stackedWidgets.tqfindRef( wid ); + int i = stackedWidgets.findRef( wid ); if ( i != -1 ) { stackedWidgets.removeRef( wid ); stackedWidgets.insert( 0, wid ); @@ -752,9 +752,9 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w ) case POINTER_TOOL: if ( widgetPressed && allowMove( w ) ) { // we are prepated for a move - // if widget is laid out, tqfind the first non-laid out super-widget + // if widget is laid out, find the first non-laid out super-widget while ( w->parentWidget() && - ( WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout || !insertedWidgets.tqfind(w ) ) ) + ( WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout || !insertedWidgets.find(w ) ) ) w = w->parentWidget(); // calc correct position @@ -860,13 +860,13 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w ) wid = tqApp->widgetAt( e->globalPos(), TRUE ); if ( wid ) wid = designerWidget( wid ); - if ( wid && ( isMainContainer( wid ) || insertedWidgets.tqfind( wid ) ) && wid->isVisibleTo( this ) ) + if ( wid && ( isMainContainer( wid ) || insertedWidgets.find( wid ) ) && wid->isVisibleTo( this ) ) newendWidget = wid; if ( ::tqqt_cast<TQLayoutWidget*>(newendWidget) || ::tqqt_cast<Spacer*>(newendWidget) ) newendWidget = (TQWidget*)endWidget; drawRecRect = newendWidget != endWidget; if ( newendWidget && - ( isMainContainer( newendWidget ) || insertedWidgets.tqfind( newendWidget ) ) && !isCentralWidget( newendWidget ) ) + ( isMainContainer( newendWidget ) || insertedWidgets.find( newendWidget ) ) && !isCentralWidget( newendWidget ) ) endWidget = newendWidget; mainWindow()->statusBar()->message( tr( "Connect '%1' to '%2'" ).arg( startWidget->name() ). arg( endWidget->name() ) ); @@ -893,7 +893,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w ) drawRecRect = newendWidget != endWidget; if ( !newendWidget ) endWidget = newendWidget; - else if ( insertedWidgets.tqfind( newendWidget ) && !isCentralWidget( newendWidget ) ) + else if ( insertedWidgets.find( newendWidget ) && !isCentralWidget( newendWidget ) ) endWidget = newendWidget; if ( endWidget ) mainWindow()->statusBar()->message( tr( "Set buddy '%1' to '%2'" ).arg( startWidget->name() ). @@ -927,7 +927,7 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w ) if ( widgetPressed && allowMove( w ) ) { // we moved the widget sizePreviewLabel->hide(); - if ( moving.isEmpty() || w->pos() == *moving.tqfind(w) ) + if ( moving.isEmpty() || w->pos() == *moving.find(w) ) break; // restore targetContainer @@ -1160,7 +1160,7 @@ void FormWindow::handleKeyPress( TQKeyEvent *e, TQWidget *w ) TQObjectList *l = queryList( "TQWidget" ); if ( !l ) return; - if ( l->tqfind( TQT_TQOBJECT(w) ) != -1 ) + if ( l->find( TQT_TQOBJECT(w) ) != -1 ) e->accept(); delete l; } @@ -1210,7 +1210,7 @@ void FormWindow::selectWidget( TQT_BASE_OBJECT_NAME *o, bool select ) repaintSelection( (TQWidget*)opw ); if ( !isPropertyShowingBlocked() ) emitShowProperties( propertyWidget ); - WidgetSelection *s = usedSelections.tqfind( w ); + WidgetSelection *s = usedSelections.find( w ); if ( s ) { s->show(); return; @@ -1230,7 +1230,7 @@ void FormWindow::selectWidget( TQT_BASE_OBJECT_NAME *o, bool select ) s->setWidget( w ); emitSelectionChanged(); } else { - WidgetSelection *s = usedSelections.tqfind( w ); + WidgetSelection *s = usedSelections.find( w ); if ( s ) s->setWidget( 0 ); TQObject *opw = propertyWidget; @@ -1255,7 +1255,7 @@ TQPoint FormWindow::grid() const void FormWindow::updateSelection( QWidget *w ) { - WidgetSelection *s = usedSelections.tqfind( w ); + WidgetSelection *s = usedSelections.find( w ); if ( !w->isVisibleTo( this ) ) selectWidget( w, FALSE ); else if ( s ) @@ -1264,14 +1264,14 @@ void FormWindow::updateSelection( QWidget *w ) void FormWindow::raiseSelection( QWidget *w ) { - WidgetSelection *s = usedSelections.tqfind( w ); + WidgetSelection *s = usedSelections.find( w ); if ( s ) s->show(); } void FormWindow::repaintSelection( TQWidget *w ) { - WidgetSelection *s = usedSelections.tqfind( w ); + WidgetSelection *s = usedSelections.find( w ); if ( s ) s->update(); } @@ -1370,7 +1370,7 @@ void FormWindow::selectWidgets() TQPoint p = ( (TQWidget*)o )->mapToGlobal( TQPoint(0,0) ); p = mapFromGlobal( p ); TQRect r( p, ( (TQWidget*)o )->size() ); - if ( r.intersects( currRect ) && !r.tqcontains( currRect ) ) + if ( r.intersects( currRect ) && !r.contains( currRect ) ) selectWidget( (TQWidget*)o ); } } @@ -1382,7 +1382,7 @@ void FormWindow::selectWidgets() bool FormWindow::isWidgetSelected( TQT_BASE_OBJECT_NAME *w ) { if ( w->isWidgetType() ) - return usedSelections.tqfind( (TQWidget*)w ) != 0; + return usedSelections.find( (TQWidget*)w ) != 0; return FALSE; // #### do stuff for TQObjects } @@ -1425,7 +1425,7 @@ void FormWindow::raiseChildSelections( TQWidget *w ) TQPtrDictIterator<WidgetSelection> it( usedSelections ); for ( ; it.current(); ++it ) { - if ( l->tqfindRef( TQT_TQOBJECT(it.current()->widget()) ) != -1 ) + if ( l->findRef( TQT_TQOBJECT(it.current()->widget()) ) != -1 ) it.current()->show(); } delete l; @@ -1437,7 +1437,7 @@ void FormWindow::updateChildSelections( TQWidget *w ) if ( l ) { for ( TQObject *o = l->first(); o; o = l->next() ) { if ( o->isWidgetType() && - insertedWidgets.tqfind( (TQWidget*)o ) ) + insertedWidgets.find( (TQWidget*)o ) ) updateSelection( (TQWidget*)o ); } delete l; @@ -1457,7 +1457,7 @@ void FormWindow::checkSelectionsForMove( TQWidget *w ) if ( it.current()->widget() == mainContainer() ) continue; ++it; - if ( l->tqfind( TQT_TQOBJECT(sel->widget()) ) == -1 ) { + if ( l->find( TQT_TQOBJECT(sel->widget()) ) == -1 ) { if ( WidgetFactory::layoutType( w ) == WidgetFactory::NoLayout ) sel->setWidget( 0 ); } else { @@ -1566,7 +1566,7 @@ void FormWindow::invalidCheckedSelections() void FormWindow::checkPreviewGeometry( TQRect &r ) { - if ( !TQT_TQRECT_OBJECT(rect()).tqcontains( r ) ) { + if ( !TQT_TQRECT_OBJECT(rect()).contains( r ) ) { if ( r.left() < rect().left() ) r.moveTopLeft( TQPoint( 0, r.top() ) ); if ( r.right() > rect().right() ) @@ -1778,7 +1778,7 @@ void FormWindow::showOrderIndicators() w->focusPolicy() != Qt::NoFocus ) { OrderIndicator* ind = new OrderIndicator( order++, w, this ); orderIndicators.append( ind ); - if ( stackedWidgets.tqfindRef( w ) == -1 ) + if ( stackedWidgets.findRef( w ) == -1 ) stackedWidgets.append( w ); } } @@ -1875,16 +1875,16 @@ void FormWindow::lowerWidgets() commandHistory()->addCommand( cmd ); } -void tqfind_accel( const TQString &txt, TQMap<TQChar, TQWidgetList > &accels, TQWidget *w ) +void find_accel( const TQString &txt, TQMap<TQChar, TQWidgetList > &accels, TQWidget *w ) { - int i = txt.tqfind( "&" ); + int i = txt.find( "&" ); if ( i == -1 ) return; TQChar c = txt[ i + 1 ]; if ( c.isNull() || c == '&' ) return; c = c.lower(); - TQMap<TQChar, TQWidgetList >::Iterator it = accels.tqfind( c ); + TQMap<TQChar, TQWidgetList >::Iterator it = accels.find( c ); if ( it == accels.end() ) { TQWidgetList wl; wl.append( w ); @@ -1906,17 +1906,17 @@ void FormWindow::checkAccels() insertedWidgets[ (void*)o ] ) { TQWidget *w = (TQWidget*)o; const TQMetaProperty* text = - w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "text", TRUE ), TRUE ); + w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "text", TRUE ), TRUE ); const TQMetaProperty* title = - w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "title", TRUE ), TRUE ); + w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "title", TRUE ), TRUE ); const TQMetaProperty* pageTitle = - w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "pageTitle", TRUE ), TRUE ); + w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "pageTitle", TRUE ), TRUE ); if ( text ) - tqfind_accel( w->property( "text" ).toString(), accels, w ); + find_accel( w->property( "text" ).toString(), accels, w ); if ( title ) - tqfind_accel( w->property( "title" ).toString(), accels, w ); + find_accel( w->property( "title" ).toString(), accels, w ); if ( pageTitle ) - tqfind_accel( w->property( "pageTitle" ).toString(), accels, w ); + find_accel( w->property( "pageTitle" ).toString(), accels, w ); } else if ( ::tqqt_cast<MenuBarEditor*>(o) ) { ((MenuBarEditor *)o)->checkAccels( accels ); } @@ -2055,7 +2055,7 @@ void FormWindow::layoutHorizontalContainer( TQWidget *w ) for ( TQObject *o = WidgetFactory::containerOfWidget(w)->childrenListObject().first(); o; o = WidgetFactory::containerOfWidget(w)->childrenListObject().next() ) { if ( o->isWidgetType() && ( (TQWidget*)o )->isVisibleTo( this ) && - insertedWidgets.tqfind( (TQWidget*)o ) ) + insertedWidgets.find( (TQWidget*)o ) ) widgets.append( (TQWidget*)o ); } LayoutHorizontalCommand *cmd = new LayoutHorizontalCommand( tr( "Lay out tqchildren horizontally" ), @@ -2075,7 +2075,7 @@ void FormWindow::layoutVerticalContainer( TQWidget *w ) for ( TQObject *o = WidgetFactory::containerOfWidget(w)->childrenListObject().first(); o; o = WidgetFactory::containerOfWidget(w)->childrenListObject().next() ) { if ( o->isWidgetType() && ( (TQWidget*)o )->isVisibleTo( this ) && - insertedWidgets.tqfind( (TQWidget*)o ) ) + insertedWidgets.find( (TQWidget*)o ) ) widgets.append( (TQWidget*)o ); } LayoutVerticalCommand *cmd = new LayoutVerticalCommand( tr( "Lay out tqchildren vertically" ), @@ -2098,7 +2098,7 @@ void FormWindow::layoutGridContainer( TQWidget *w ) for ( TQObject *o = WidgetFactory::containerOfWidget(w)->childrenListObject().first(); o; o = WidgetFactory::containerOfWidget(w)->childrenListObject().next() ) { if ( o->isWidgetType() && ( (TQWidget*)o )->isVisibleTo( this ) && - insertedWidgets.tqfind( (TQWidget*)o ) ) + insertedWidgets.find( (TQWidget*)o ) ) widgets.append( (TQWidget*)o ); } LayoutGridCommand *cmd = new LayoutGridCommand( tr( "Lay out tqchildren in a grid" ), @@ -2149,7 +2149,7 @@ BreakLayoutCommand *FormWindow::breakLayoutCommand( TQWidget *w ) if ( o->isWidgetType() && !mainWindow()->isAToolBarChild( (TQWidget*)o ) && ( (TQWidget*)o )->isVisibleTo( this ) && - insertedWidgets.tqfind( (TQWidget*)o ) ) + insertedWidgets.find( (TQWidget*)o ) ) widgets.append( (TQWidget*)o ); } return new BreakLayoutCommand( tr( "Break Layout" ), this, WidgetFactory::widgetOfContainer( w ), widgets ); @@ -2182,7 +2182,7 @@ bool FormWindow::hasInsertedChildren( TQWidget *w ) const for ( TQObject *o = l->first(); o; o = l->next() ) { if ( o->isWidgetType() && ( (TQWidget*)o )->isVisibleTo( (FormWindow*)this ) && - insertedWidgets.tqfind( (TQWidget*)o ) ) { + insertedWidgets.find( (TQWidget*)o ) ) { delete l; return TRUE; } @@ -2196,7 +2196,7 @@ bool FormWindow::allowMove( TQWidget *w ) { w = w->parentWidget(); while ( w ) { - if ( ( isMainContainer( w ) || insertedWidgets.tqfind( w ) ) && WidgetFactory::layoutType( w ) == WidgetFactory::NoLayout ) + if ( ( isMainContainer( w ) || insertedWidgets.find( w ) ) && WidgetFactory::layoutType( w ) == WidgetFactory::NoLayout ) return TRUE; w = w->parentWidget(); } @@ -2272,7 +2272,7 @@ void FormWindow::restoreConnectionLine() w = h = 64; r = r.normalize(); - while ( r.tqcontains( p ) ) { + while ( r.contains( p ) ) { unclippedPainter->drawPixmap( p, *buffer, TQRect( p, TQSize( w, h ) ) ); unclippedPainter->setPen( Qt::red ); p.setX( p.x() + dx ); @@ -2443,7 +2443,7 @@ bool FormWindow::isDatabaseWidgetUsed() const TQPtrDictIterator<TQWidget> it( insertedWidgets ); for ( ; it.current(); ++it ) { TQString c( it.current()->className() ); - if ( dbClasses.tqcontains( c ) > 0 ) { + if ( dbClasses.contains( c ) > 0 ) { return TRUE; } } @@ -2517,7 +2517,7 @@ TQWidget *FormWindow::containerAt( const TQPoint &pos, TQWidget *notParentOf ) TQWidget *container = 0; int depth = -1; TQWidgetList selected = selectedWidgets(); - if ( TQT_TQRECT_OBJECT(rect()).tqcontains( mapFromGlobal( pos ) ) ) { + if ( TQT_TQRECT_OBJECT(rect()).contains( mapFromGlobal( pos ) ) ) { container = mainContainer(); depth = widgetDepth( container ); } @@ -2528,7 +2528,7 @@ TQWidget *FormWindow::containerAt( const TQPoint &pos, TQWidget *notParentOf ) continue; if ( !it.current()->isVisibleTo( this ) ) continue; - if ( selected.tqfind( it.current() ) != -1 ) + if ( selected.find( it.current() ) != -1 ) continue; if ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( it.current() ) ) ) && it.current() != mainContainer() ) @@ -2537,7 +2537,7 @@ TQWidget *FormWindow::containerAt( const TQPoint &pos, TQWidget *notParentOf ) // the rectangles of all ancestors of the container must contain the insert position TQWidget *w = it.current(); while ( w && !w->isTopLevel() ) { - if ( !TQT_TQRECT_OBJECT(w->rect()).tqcontains( ( w->mapFromGlobal( pos ) ) ) ) + if ( !TQT_TQRECT_OBJECT(w->rect()).contains( ( w->mapFromGlobal( pos ) ) ) ) break; w = w->parentWidget(); } @@ -2545,8 +2545,8 @@ TQWidget *FormWindow::containerAt( const TQPoint &pos, TQWidget *notParentOf ) int wd = widgetDepth( it.current() ); if ( wd == depth && container ) { - if ( ( it.current()->parentWidget()->childrenListObject() ).tqfind( TQT_TQOBJECT(it.current()) ) > - ( container->parentWidget()->childrenListObject() ).tqfind( TQT_TQOBJECT(container) ) ) + if ( ( it.current()->parentWidget()->childrenListObject() ).find( TQT_TQOBJECT(it.current()) ) > + ( container->parentWidget()->childrenListObject() ).find( TQT_TQOBJECT(container) ) ) wd++; } if ( wd > depth && !isChildOf( it.current(), notParentOf ) ) { @@ -2650,7 +2650,7 @@ Project *FormWindow::project() const return proj; } -TQAction *FormWindow::tqfindAction( const TQString &name ) +TQAction *FormWindow::findAction( const TQString &name ) { for ( TQAction *a = actionList().first(); a; a = actionList().next() ) { if ( TQString( a->name() ) == name ) diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/formwindow.h b/experimental/tqtinterface/qt4/tools/designer/designer/formwindow.h index bacc45fb5..a4dd567a3 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/formwindow.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/formwindow.h @@ -190,7 +190,7 @@ public: void setActiveObject( TQT_BASE_OBJECT_NAME *o ); TQPtrList<TQAction> &actionList() { return actions; } - TQAction *tqfindAction( const TQString &name ); + TQAction *findAction( const TQString &name ); void setProject( Project *pro ); Project *project() const; diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/hierarchyview.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/hierarchyview.cpp index d583bdc28..11f6523a0 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/hierarchyview.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/hierarchyview.cpp @@ -244,7 +244,7 @@ TQObject *HierarchyList::handleObjectClick( TQListViewItem *i ) if ( !i ) return 0; - TQObject *o = tqfindObject( i ); + TQObject *o = findObject( i ); if ( !o ) return 0; if ( TQT_BASE_OBJECT(formWindow) == TQT_BASE_OBJECT(o) ) { @@ -255,7 +255,7 @@ TQObject *HierarchyList::handleObjectClick( TQListViewItem *i ) } if ( o->isWidgetType() ) { TQWidget *w = (TQWidget*)o; - if ( !formWindow->widgets()->tqfind( w ) ) { + if ( !formWindow->widgets()->find( w ) ) { if ( ::tqqt_cast<TQWidgetStack*>(w->tqparent()) ) { if (::tqqt_cast<TQTabWidget*>(w->tqparent()->tqparent()) ) { ((TQTabWidget*)w->tqparent()->tqparent())->showPage( w ); @@ -274,7 +274,7 @@ TQObject *HierarchyList::handleObjectClick( TQListViewItem *i ) } else if ( ::tqqt_cast<TQMenuBar*>(w) || ::tqqt_cast<TQDockWindow*>(w) ) { formWindow->setActiveObject( w ); } else if ( ::tqqt_cast<TQPopupMenu*>(w) ) { - return 0; // ### we could try to tqfind our menu bar and change the currentMenu to our index + return 0; // ### we could try to find our menu bar and change the currentMenu to our index } else { return 0; } @@ -316,12 +316,12 @@ void HierarchyList::objectClicked( TQListViewItem *i ) } } -TQObject *HierarchyList::tqfindObject( TQListViewItem *i ) +TQObject *HierarchyList::findObject( TQListViewItem *i ) { return ( (HierarchyItem*)i )->object(); } -TQListViewItem *HierarchyList::tqfindItem( TQT_BASE_OBJECT_NAME *o ) +TQListViewItem *HierarchyList::findItem( TQT_BASE_OBJECT_NAME *o ) { TQListViewItemIterator it( this ); while ( it.current() ) { @@ -341,7 +341,7 @@ TQObject *HierarchyList::current() const void HierarchyList::changeNameOf( TQT_BASE_OBJECT_NAME *o, const TQString &name ) { - TQListViewItem *item = tqfindItem( o ); + TQListViewItem *item = findItem( o ); if ( !item ) return; item->setText( 0, name ); @@ -353,7 +353,7 @@ void HierarchyList::changeDatabaseOf( TQT_BASE_OBJECT_NAME *o, const TQString &i #ifndef TQT_NO_SQL if ( !formWindow->isDatabaseAware() ) return; - TQListViewItem *item = tqfindItem( o ); + TQListViewItem *item = findItem( o ); if ( !item ) return; item->setText( 2, info ); @@ -474,7 +474,7 @@ void HierarchyList::insertObject( TQT_BASE_OBJECT_NAME *tqbo, TQListViewItem *tq if ( !it.current()->isWidgetType() || ( (TQWidget*)it.current() )->isHidden() ) continue; - if ( !formWindow->widgets()->tqfind( (TQWidget*)it.current() ) ) { + if ( !formWindow->widgets()->find( (TQWidget*)it.current() ) ) { if ( ::tqqt_cast<TQWidgetStack*>(it.current()->tqparent()) || ::tqqt_cast<TQWidgetStack*>(it.current()) ) { TQObject *obj = it.current(); @@ -485,7 +485,7 @@ void HierarchyList::insertObject( TQT_BASE_OBJECT_NAME *tqbo, TQListViewItem *tq stack = (TQWidgetStack*)obj; else stack = (TQWidgetStack*)obj->tqparent(); - if ( widgetStacks->tqfindRef( stack ) != -1 ) + if ( widgetStacks->findRef( stack ) != -1 ) continue; widgetStacks->append( stack ); TQObjectList *l2 = stack->queryList( "TQWidget", 0, TRUE, FALSE ); @@ -590,12 +590,12 @@ void HierarchyList::showRMBMenu( TQListViewItem *i, const TQPoint & p ) if ( !i ) return; - TQObject *o = tqfindObject( i ); + TQObject *o = findObject( i ); if ( !o ) return; if ( !o->isWidgetType() || - ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(formWindow) && !formWindow->widgets()->tqfind( (TQWidget*)o ) ) ) + ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(formWindow) && !formWindow->widgets()->find( (TQWidget*)o ) ) ) return; TQWidget *w = (TQWidget*)o; diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/hierarchyview.h b/experimental/tqtinterface/qt4/tools/designer/designer/hierarchyview.h index 9b04c0d09..a9f2fae15 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/hierarchyview.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/hierarchyview.h @@ -138,8 +138,8 @@ public Q_SLOTS: private: void insertObject( TQT_BASE_OBJECT_NAME *o, TQListViewItem *tqparent ); - TQObject *tqfindObject( TQListViewItem *i ); - TQListViewItem *tqfindItem( TQT_BASE_OBJECT_NAME *o ); + TQObject *findObject( TQListViewItem *i ); + TQListViewItem *findItem( TQT_BASE_OBJECT_NAME *o ); TQObject *current() const; TQObject *handleObjectClick( TQListViewItem *i ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/layout.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/layout.cpp index acb676611..e6e34e1c0 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/layout.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/layout.cpp @@ -118,7 +118,7 @@ void Layout::setup() lastList->append( w ); } - // So, now tqfind the list with the most entries + // So, now find the list with the most entries lastList = 0; TQValueList<TQWidgetList>::Iterator it = lists.begin(); for ( ; it != lists.end(); ++it ) { @@ -204,7 +204,7 @@ void Layout::finishLayout( bool needMove, TQLayout *tqlayout ) formWindow->insertWidget( layoutBase ); formWindow->selectWidget( layoutBase ); TQString n = layoutBase->name(); - if ( n.tqfind( "qt_dead_widget_" ) != -1 ) { + if ( n.find( "qt_dead_widget_" ) != -1 ) { n.remove( 0, TQString( "qt_dead_widget_" ).length() ); layoutBase->setName( n ); } @@ -257,7 +257,7 @@ void Layout::breakLayout() w->reparent( layoutBase->parentWidget(), 0, layoutBase->pos() + w->pos(), TRUE ); if ( needResize ) { - TQMap<TQWidget*, TQRect>::Iterator it = rects.tqfind( w ); + TQMap<TQWidget*, TQRect>::Iterator it = rects.find( w ); if ( it != rects.end() ) w->setGeometry( TQRect( layoutBase->pos() + (*it).topLeft(), (*it).size() ) ); } @@ -842,7 +842,7 @@ void GridLayout::buildGrid() delete grid; grid = new Grid( (int)(y.size()-1), (int)(x.size()-1) ); - // Mark the cells in the grid that tqcontains a widget + // Mark the cells in the grid that contains a widget for ( w = widgets.first(); w; w = widgets.next() ) { TQRect c(0,0,0,0), widgetPos = w->tqgeometry(); // From left til right (not including) diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/listboxdnd.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/listboxdnd.cpp index 191ea34fa..83f02b5fd 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/listboxdnd.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/listboxdnd.cpp @@ -256,7 +256,7 @@ bool ListBoxItemDrag::decode( TQDropEvent * event, TQListBox * tqparent, TQListB int count = 0; stream >> count; - TQ_UINT8 recievePtr = 0; // data tqcontains just item pointers; no data + TQ_UINT8 recievePtr = 0; // data contains just item pointers; no data stream >> recievePtr; TQListBoxItem * item = 0; diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/listviewdnd.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/listviewdnd.cpp index f283dd706..6de076519 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/listviewdnd.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/listviewdnd.cpp @@ -153,7 +153,7 @@ int ListViewDnd::buildFlatList( ListViewItemList & list ) list.append( *it ); } else if ( !addKids ) { // Children processing not set, so set it - // Also tqfind the item were we shall quit + // Also find the item were we shall quit // processing tqchildren...if any such item addKids = TRUE; nextSibling = (*it)->nextSibling(); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/listvieweditorimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/listvieweditorimpl.cpp index 5e2866332..9d86a9f12 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/listvieweditorimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/listvieweditorimpl.cpp @@ -146,7 +146,7 @@ void ListViewEditor::okClicked() void ListViewEditor::columnClickable( bool b ) { - Column *c = tqfindColumn( colPreview->item( colPreview->currentItem() ) ); + Column *c = findColumn( colPreview->item( colPreview->currentItem() ) ); if ( !c ) return; c->clickable = b; @@ -171,7 +171,7 @@ void ListViewEditor::columnDownClicked() void ListViewEditor::columnPixmapChosen() { - Column *c = tqfindColumn( colPreview->item( colPreview->currentItem() ) ); + Column *c = findColumn( colPreview->item( colPreview->currentItem() ) ); if ( !c ) return; @@ -198,7 +198,7 @@ void ListViewEditor::columnPixmapChosen() void ListViewEditor::columnPixmapDeleted() { - Column *c = tqfindColumn( colPreview->item( colPreview->currentItem() ) ); + Column *c = findColumn( colPreview->item( colPreview->currentItem() ) ); if ( !c ) return; @@ -216,7 +216,7 @@ void ListViewEditor::columnPixmapDeleted() void ListViewEditor::columnResizable( bool b ) { - Column *c = tqfindColumn( colPreview->item( colPreview->currentItem() ) ); + Column *c = findColumn( colPreview->item( colPreview->currentItem() ) ); if ( !c ) return; c->resizable = b; @@ -224,7 +224,7 @@ void ListViewEditor::columnResizable( bool b ) void ListViewEditor::columnTextChanged( const TQString &txt ) { - Column *c = tqfindColumn( colPreview->item( colPreview->currentItem() ) ); + Column *c = findColumn( colPreview->item( colPreview->currentItem() ) ); if ( !c ) return; @@ -256,7 +256,7 @@ void ListViewEditor::columnUpClicked() void ListViewEditor::currentColumnChanged( TQListBoxItem *i ) { - Column *c = tqfindColumn( i ); + Column *c = findColumn( i ); if ( !i || !c ) { colText->setEnabled( FALSE ); colPixmap->setEnabled( FALSE ); @@ -601,7 +601,7 @@ void ListViewEditor::setupItems() int i = 0; TQHeader *header = itemsPreview->header(); for ( TQListBoxItem *item = colPreview->firstItem(); item; item = item->next() ) { - Column *col = tqfindColumn( item ); + Column *col = findColumn( item ); if ( !col ) continue; if ( i >= itemsPreview->columns() ) @@ -617,7 +617,7 @@ void ListViewEditor::setupItems() itemColumn->setValue( TQMIN( numColumns - 1, itemColumn->value() ) ); } -ListViewEditor::Column *ListViewEditor::tqfindColumn( TQListBoxItem *i ) +ListViewEditor::Column *ListViewEditor::findColumn( TQListBoxItem *i ) { if ( !i ) return 0; diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/listvieweditorimpl.h b/experimental/tqtinterface/qt4/tools/designer/designer/listvieweditorimpl.h index 8f2135b90..24367cd07 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/listvieweditorimpl.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/listvieweditorimpl.h @@ -94,7 +94,7 @@ private: private: void setupColumns(); void setupItems(); - Column *tqfindColumn( TQListBoxItem *i ); + Column *findColumn( TQListBoxItem *i ); void transferItems( TQListView *from, TQListView *to ); void displayItem( TQListViewItem *i, int col ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/mainwindow.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/mainwindow.cpp index def15eb2a..c5c74851c 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/mainwindow.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/mainwindow.cpp @@ -143,7 +143,7 @@ static TQString textNoAccel( const TQString& text) { TQString t = text; int i; - while ( (i = t.tqfind('&') )>= 0 ) { + while ( (i = t.find('&') )>= 0 ) { t.remove(i,1); } return t; @@ -752,10 +752,10 @@ void MainWindow::helpContents() TQTextStream ts( &f ); while ( !ts.eof() ) { TQString s = ts.readLine(); - int from = s.tqfind( "\"" ); + int from = s.find( "\"" ); if ( from == -1 ) continue; - int to = s.tqfindRev( "\"" ); + int to = s.findRev( "\"" ); if ( to == -1 ) continue; propertyDocumentation[ s.mid( from + 1, to - from - 1 ) ] = s.mid( to + 2 ) + "-prop"; @@ -781,7 +781,7 @@ void MainWindow::helpContents() else source = propertyDocumentation[ "TQObject/name" ]; } else { - while ( mo && !propertyDocumentation.tqcontains( ( s = TQString( mo->className() ) + "/" + cp ) ) ) + while ( mo && !propertyDocumentation.contains( ( s = TQString( mo->className() ) + "/" + cp ) ) ) mo = TQT_TQMETAOBJECT(const_cast<QMetaObject*>(mo->superClass())); if ( mo ) source = "p:" + propertyDocumentation[s]; @@ -939,12 +939,12 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) TQPoint pos = ((TQMouseEvent*)e)->pos(); MenuBarEditor *m = ::tqqt_cast<MenuBarEditor*>(o); showProperties( o ); - if ( m->tqfindItem( pos ) >= m->count() ) + if ( m->findItem( pos ) >= m->count() ) m->setFocus(); } else if ( e->type() == TQEvent::MouseButtonPress && ::tqqt_cast<PopupMenuEditor*>(o) ) { PopupMenuEditor *m = ::tqqt_cast<PopupMenuEditor*>(o); PopupMenuEditorItem *i = m->at( ((TQMouseEvent*)e)->pos() ); - if ( m->tqfind( i->action() ) != -1 && !i->isSeparator() ) + if ( m->find( i->action() ) != -1 && !i->isSeparator() ) showProperties( i->action() ); } return TQMainWindow::eventFilter( o, e ); @@ -1261,7 +1261,7 @@ FormWindow *MainWindow::formWindow() if ( ::tqqt_cast<FormWindow*>(qworkspace->activeWindow()) ) fw = (FormWindow*)qworkspace->activeWindow(); else if ( lastActiveFormWindow && - qworkspace->windowList().tqfind( lastActiveFormWindow ) != -1) + qworkspace->windowList().find( lastActiveFormWindow ) != -1) fw = lastActiveFormWindow; return fw; } @@ -1555,18 +1555,18 @@ void MainWindow::popupWidgetMenu( const TQPoint &gp, FormWindow * /*fw*/, TQWidg void MainWindow::setupRMBProperties( TQValueList<uint> &ids, TQMap<TQString, int> &props, TQWidget *w ) { - const TQMetaProperty* text = w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "text", TRUE ), TRUE ); + const TQMetaProperty* text = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "text", TRUE ), TRUE ); if ( text && qstrcmp( text->type(), "TQString") != 0 ) text = 0; - const TQMetaProperty* title = w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "title", TRUE ), TRUE ); + const TQMetaProperty* title = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "title", TRUE ), TRUE ); if ( title && qstrcmp( title->type(), "TQString") != 0 ) title = 0; const TQMetaProperty* pagetitle = - w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "pageTitle", TRUE ), TRUE ); + w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "pageTitle", TRUE ), TRUE ); if ( pagetitle && qstrcmp( pagetitle->type(), "TQString") != 0 ) pagetitle = 0; const TQMetaProperty* pixmap = - w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "pixmap", TRUE ), TRUE ); + w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "pixmap", TRUE ), TRUE ); if ( pixmap && qstrcmp( pixmap->type(), "TQPixmap") != 0 ) pixmap = 0; @@ -2137,7 +2137,7 @@ void MainWindow::selectionChanged() static TQString fixArgs( const TQString &s2 ) { TQString s = s2; - return s.tqreplace( ',', ';' ); + return s.replace( ',', ';' ); } void MainWindow::writeConfig() @@ -2247,7 +2247,7 @@ void MainWindow::writeConfig() static TQString fixArgs2( const TQString &s2 ) { TQString s = s2; - return s.tqreplace( ';', ',' ); + return s.replace( ';', ',' ); } void MainWindow::readConfig() @@ -2295,14 +2295,14 @@ void MainWindow::readConfig() } // We know that the oldSettingsKey() will return 3.1 if ( keybase == DesignerApplication::oldSettingsKey() ) { - if (keybase.tqcontains("3.1")) + if (keybase.contains("3.1")) recentlyFiles = config.readListEntry( keybase + "RecentlyOpenedFiles", ',' ); else recentlyFiles = config.readListEntry(keybase + "RecentlyOpenedFiles"); if ( recentlyFiles.count() == 1 && recentlyFiles[0].isNull() ) recentlyFiles.clear(); - if (keybase.tqcontains("3.1")) + if (keybase.contains("3.1")) recentlyProjects = config.readListEntry( keybase + "RecentlyOpenedProjects", ',' ); else recentlyProjects = config.readListEntry( keybase + "RecentlyOpenedProjects"); @@ -2579,7 +2579,7 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f ) TQString fullSignal; for ( int i = 0; i < (int)sigs.count(); ++i ) { TQString sig = sigs.at( i ); - if ( sig.left( sig.tqfind( '(' ) ) == defSignal ) { + if ( sig.left( sig.find( '(' ) ) == defSignal ) { fullSignal = sig; break; } @@ -2587,14 +2587,14 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f ) if ( !fullSignal.isEmpty() ) { TQString signl = fullSignal; - fullSignal = fullSignal.mid( fullSignal.tqfind( '(' ) + 1 ); + fullSignal = fullSignal.mid( fullSignal.find( '(' ) + 1 ); fullSignal.remove( (int)fullSignal.length() - 1, 1 ); fullSignal = iface->createArguments( fullSignal.simplifyWhiteSpace() ); s += "(" + fullSignal + ")"; if ( !MetaDataBase::hasFunction( f, s.latin1() ) ) MetaDataBase::addFunction( f, s.latin1(), "", "public", "slot", f->project()->language(), "void" ); - s = s.left( s.tqfind( '(' ) ).latin1(); + s = s.left( s.find( '(' ) ).latin1(); if ( !MetaDataBase::hasConnection( f, w, defSignal.latin1(), f->mainContainer(), s.latin1() ) ) { MetaDataBase::Connection conn; conn.sender = TQT_TQOBJECT(w); @@ -2622,8 +2622,8 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f ) return TRUE; } - const TQMetaProperty* text = w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "text", TRUE ), TRUE ); - const TQMetaProperty* title = w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "title", TRUE ), TRUE ); + const TQMetaProperty* text = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "text", TRUE ), TRUE ); + const TQMetaProperty* title = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "title", TRUE ), TRUE ); if ( text && text->designable(w) ) { bool ok = FALSE; bool oldDoWrap = FALSE; @@ -2809,7 +2809,7 @@ void MainWindow::projectSelected( TQAction *a ) a->setOn( TRUE ); if ( currentProject ) currentProject->setActive( FALSE ); - Project *p = *projects.tqfind( a ); + Project *p = *projects.find( a ); p->setActive( TRUE ); if ( currentProject == p ) return; @@ -2886,9 +2886,9 @@ void MainWindow::showDialogHelp() else if ( ::tqqt_cast<ProjectSettingsBase*>(w) ) link += "dialog-project-settings"; else if ( ::tqqt_cast<FindDialog*>(w) ) - link += "dialog-tqfind-text"; + link += "dialog-find-text"; else if ( ::tqqt_cast<ReplaceDialog*>(w) ) - link += "dialog-tqreplace-text"; + link += "dialog-replace-text"; else if ( ::tqqt_cast<GotoLineDialog*>(w) ) link += "dialog-go-to-line"; // else if ( ::tqqt_cast<ConnectionEditorBase*>(w) ) @@ -3037,7 +3037,7 @@ TQStringList MainWindow::projectFileNames() const return res; } -Project *MainWindow::tqfindProject( const TQString &projectName ) const +Project *MainWindow::findProject( const TQString &projectName ) const { for ( TQMap<TQAction*, Project* >::ConstIterator it = projects.begin(); it != projects.end(); ++it ) { if ( (*it)->projectName() == projectName ) @@ -3104,7 +3104,7 @@ void MainWindow::addRecentlyOpened( const TQString &fn, TQStringList &lst ) TQFileInfo fi( fn ); fi.convertToAbs(); TQString f = fi.filePath(); - if ( lst.tqfind( f ) != lst.end() ) + if ( lst.find( f ) != lst.end() ) lst.remove( f ); if ( lst.count() >= 10 ) lst.pop_back(); @@ -3215,7 +3215,7 @@ void MainWindow::setModified( bool b, TQWidget *window ) void MainWindow::editorClosed( SourceEditor *e ) { - sourceEditors.take( sourceEditors.tqfindRef( e ) ); + sourceEditors.take( sourceEditors.findRef( e ) ); } void MainWindow::functionsChanged() @@ -3427,7 +3427,7 @@ void MainWindow::showSourceLine( TQObject *o, int line, LineMode lm ) mblockNewForms = TRUE; if ( !fw ) - openFormWindow( currentProject->makeAbsolute( *qwf_forms->tqfind( (TQWidget*)o ) ) ); + openFormWindow( currentProject->makeAbsolute( *qwf_forms->find( (TQWidget*)o ) ) ); else fw->formFile()->showEditor( FALSE ); tqApp->processEvents(); // give all views the chance to get the formwindow @@ -3449,7 +3449,7 @@ void MainWindow::showSourceLine( TQObject *o, int line, LineMode lm ) } -TQObject *MainWindow::tqfindRealObject( TQObject *o ) +TQObject *MainWindow::findRealObject( TQObject *o ) { TQWidgetList windows = qWorkspace()->windowList(); for ( TQWidget *w = windows.first(); w; w = windows.next() ) { @@ -3625,13 +3625,13 @@ TQString MainWindow::whatsThisFrom( const TQString &key ) } } - int i = menuHelpFile.tqfind( key ); + int i = menuHelpFile.find( key ); if ( i == -1 ) return TQString(); int start = i; int end = i; - start = menuHelpFile.tqfindRev( "<li>", i ) + 4; - end = menuHelpFile.tqfind( '\n', i ) - 1; + start = menuHelpFile.findRev( "<li>", i ) + 4; + end = menuHelpFile.find( '\n', i ) - 1; return menuHelpFile.mid( start, end - start + 1 ); } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/mainwindow.h b/experimental/tqtinterface/qt4/tools/designer/designer/mainwindow.h index 30f04df1c..901f6e0ee 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/mainwindow.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/mainwindow.h @@ -147,7 +147,7 @@ public: TQPtrList<DesignerProject> projectList() const; TQStringList projectNames() const; TQStringList projectFileNames() const; - Project *tqfindProject( const TQString &projectName ) const; + Project *findProject( const TQString &projectName ) const; void setCurrentProject( Project *pro ); void setCurrentProjectByFilename( const TQString& proFilename ); OutputWindow *outputWindow() const { return oWindow; } @@ -172,7 +172,7 @@ public: void createNewProject( const TQString &lang ); void popupProjectMenu( const TQPoint &pos ); - TQObject *tqfindRealObject( TQObject *o ); + TQObject *findRealObject( TQObject *o ); void setSingleProject( Project *pro ); bool singleProjectMode() const { return singleProject; } @@ -452,8 +452,8 @@ private: bool autoSaveEnabled; int autoSaveInterval; TQLineEdit *incrementalSearch; - TQGuardedPtr<FindDialog> tqfindDialog; - TQGuardedPtr<ReplaceDialog> tqreplaceDialog; + TQGuardedPtr<FindDialog> findDialog; + TQGuardedPtr<ReplaceDialog> replaceDialog; TQGuardedPtr<GotoLineDialog> gotoLineDialog; Project *eProject; bool inDebugMode; diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/mainwindowactions.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/mainwindowactions.cpp index 281efdc84..04fe15e97 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/mainwindowactions.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/mainwindowactions.cpp @@ -1042,7 +1042,7 @@ void MainWindow::fileNewDialog() { static int forms = 0; TQString n = "Dialog" + TQString::number( ++forms ); - while ( currentProject->tqfindFormFile( n + ".ui" ) ) + while ( currentProject->findFormFile( n + ".ui" ) ) n = "Dialog" + TQString::number( ++forms ); FormWindow *fw = 0; FormFile *ff = new FormFile( n + ".ui", FALSE, currentProject ); @@ -1240,24 +1240,24 @@ void MainWindow::fileOpen( const TQString &filter, const TQString &extension, co if ( !filename.isEmpty() ) { TQFileInfo fi( filename ); - if ( fi.extension( FALSE ) == "pro" && ( extension.isEmpty() || extension.tqfind( ";pro" ) != -1 ) ) { + if ( fi.extension( FALSE ) == "pro" && ( extension.isEmpty() || extension.find( ";pro" ) != -1 ) ) { addRecentlyOpened( filename, recentlyProjects ); openProject( filename ); - } else if ( fi.extension( FALSE ) == "ui" && ( extension.isEmpty() || extension.tqfind( ";ui" ) != -1 ) ) { + } else if ( fi.extension( FALSE ) == "ui" && ( extension.isEmpty() || extension.find( ";ui" ) != -1 ) ) { if ( !inProject ) setCurrentProject( eProject ); openFormWindow( filename ); addRecentlyOpened( filename, recentlyFiles ); - } else if ( !extension.isEmpty() && extension.tqfind( ";" + fi.extension( FALSE ) ) != -1 || - additionalSources.tqfind( fi.extension( FALSE ) ) != additionalSources.end() ) { - SourceFile *sf = project->tqfindSourceFile( project->makeRelative( filename ) ); + } else if ( !extension.isEmpty() && extension.find( ";" + fi.extension( FALSE ) ) != -1 || + additionalSources.find( fi.extension( FALSE ) ) != additionalSources.end() ) { + SourceFile *sf = project->findSourceFile( project->makeRelative( filename ) ); if ( !sf ) sf = new SourceFile( project->makeRelative( filename ), FALSE, project ); editSource( sf ); } else if ( extension.isEmpty() ) { TQString filter; for ( TQStringList::Iterator it2 = filterlist.begin(); it2 != filterlist.end(); ++it2 ) { - if ( (*it2).tqcontains( "." + fi.extension( FALSE ), FALSE ) ) { + if ( (*it2).contains( "." + fi.extension( FALSE ), FALSE ) ) { filter = *it2; break; } @@ -1314,7 +1314,7 @@ FormWindow *MainWindow::openFormWindow( const TQString &filename, bool validFile } statusBar()->message( tr( "Reading file '%1'...").arg( filename ) ); - FormFile *ff2 = currentProject->tqfindFormFile( currentProject->makeRelative(filename) ); + FormFile *ff2 = currentProject->findFormFile( currentProject->makeRelative(filename) ); if ( ff2 && ff2->formWindow() ) { ff2->formWindow()->setFocus(); return ff2->formWindow(); @@ -1560,7 +1560,7 @@ void MainWindow::editPaste() formWindow()->commandHistory()->setModified( TRUE ); } else { TQMessageBox::information( this, tr( "Paste error" ), - tr( "Can't paste widgets. Designer couldn't tqfind a container\n" + tr( "Can't paste widgets. Designer couldn't find a container\n" "to paste into which does not contain a layout. Break the tqlayout\n" "of the container you want to paste into and select this container\n" "and then paste again." ) ); @@ -1958,14 +1958,14 @@ void MainWindow::searchFind() !::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) return; - if ( !tqfindDialog ) - tqfindDialog = new FindDialog( this, 0, FALSE ); - tqfindDialog->show(); - tqfindDialog->raise(); - tqfindDialog->setEditor( ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface(), + if ( !findDialog ) + findDialog = new FindDialog( this, 0, FALSE ); + findDialog->show(); + findDialog->raise(); + findDialog->setEditor( ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface(), ( (SourceEditor*)qWorkspace()->activeWindow() )->object() ); - tqfindDialog->comboFind->setFocus(); - tqfindDialog->comboFind->lineEdit()->selectAll(); + findDialog->comboFind->setFocus(); + findDialog->comboFind->lineEdit()->selectAll(); } void MainWindow::searchIncremetalFindMenu() @@ -1980,7 +1980,7 @@ void MainWindow::searchIncremetalFind() !::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) return; - ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface()->tqfind( incrementalSearch->text(), + ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface()->find( incrementalSearch->text(), FALSE, FALSE, TRUE, FALSE ); } @@ -1990,7 +1990,7 @@ void MainWindow::searchIncremetalFindNext() !::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) return; - ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface()->tqfind( incrementalSearch->text(), + ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface()->find( incrementalSearch->text(), FALSE, FALSE, TRUE, TRUE ); } @@ -2000,14 +2000,14 @@ void MainWindow::searchReplace() !::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) return; - if ( !tqreplaceDialog ) - tqreplaceDialog = new ReplaceDialog( this, 0, FALSE ); - tqreplaceDialog->show(); - tqreplaceDialog->raise(); - tqreplaceDialog->setEditor( ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface(), + if ( !replaceDialog ) + replaceDialog = new ReplaceDialog( this, 0, FALSE ); + replaceDialog->show(); + replaceDialog->raise(); + replaceDialog->setEditor( ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface(), ( (SourceEditor*)qWorkspace()->activeWindow() )->object() ); - tqreplaceDialog->comboFind->setFocus(); - tqreplaceDialog->comboFind->lineEdit()->selectAll(); + replaceDialog->comboFind->setFocus(); + replaceDialog->comboFind->lineEdit()->selectAll(); } void MainWindow::searchGotoLine() diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/menubareditor.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/menubareditor.cpp index 1bfc82552..429dfb81e 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/menubareditor.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/menubareditor.cpp @@ -44,7 +44,7 @@ #include "menubareditor.h" #include "popupmenueditor.h" -extern void tqfind_accel( const TQString &txt, TQMap<TQChar, TQWidgetList > &accels, TQWidget *w ); +extern void find_accel( const TQString &txt, TQMap<TQChar, TQWidgetList > &accels, TQWidget *w ); // Drag Object Declaration ------------------------------------------- @@ -276,12 +276,12 @@ void MenuBarEditor::removeItem( MenuBarEditorItem * item ) } } -int MenuBarEditor::tqfindItem( MenuBarEditorItem * item ) +int MenuBarEditor::findItem( MenuBarEditorItem * item ) { - return itemList.tqfindRef( item ); + return itemList.findRef( item ); } -int MenuBarEditor::tqfindItem( PopupMenuEditor * menu ) +int MenuBarEditor::findItem( PopupMenuEditor * menu ) { MenuBarEditorItem * i = itemList.first(); @@ -294,7 +294,7 @@ int MenuBarEditor::tqfindItem( PopupMenuEditor * menu ) return -1; } -int MenuBarEditor::tqfindItem( TQPoint & pos ) +int MenuBarEditor::findItem( TQPoint & pos ) { int x = borderSize(); int dx = 0; @@ -319,7 +319,7 @@ int MenuBarEditor::tqfindItem( TQPoint & pos ) r = TQRect( x, y, s.width(), s.height() ); - if ( r.tqcontains( pos ) ) + if ( r.contains( pos ) ) return itemList.at(); addItemSizeToCoords( i, x, y, w ); @@ -339,7 +339,7 @@ int MenuBarEditor::tqfindItem( TQPoint & pos ) r = TQRect( x, y, s.width(), s.height() ); - if ( r.tqcontains( pos ) ) + if ( r.contains( pos ) ) return itemList.count(); return itemList.count() + 1; @@ -420,8 +420,8 @@ void MenuBarEditor::exchange( int a, int b ) ia == &addItem || ia == &addSeparator || ib == &addItem || ib == &addSeparator ) return; // do nothing - itemList.tqreplace( b, ia ); - itemList.tqreplace( a, ib ); + itemList.replace( b, ia ); + itemList.replace( a, ib ); } void MenuBarEditor::showLineEdit( int index ) @@ -549,7 +549,7 @@ void MenuBarEditor::checkAccels( TQMap<TQChar, TQWidgetList > &accels ) MenuBarEditorItem * i = itemList.first(); while ( i ) { t = i->menuText(); - tqfind_accel( t, accels, this ); + find_accel( t, accels, this ); // do not check the accelerators in the popup menus i = itemList.next(); } @@ -600,7 +600,7 @@ void MenuBarEditor::mousePressEvent( TQMouseEvent * e ) mousePressPos = e->pos(); hideItem(); lineEdit->hide(); - currentIndex = tqfindItem( mousePressPos ); + currentIndex = findItem( mousePressPos ); showItem(); update(); e->accept(); @@ -609,7 +609,7 @@ void MenuBarEditor::mousePressEvent( TQMouseEvent * e ) void MenuBarEditor::mouseDoubleClickEvent( TQMouseEvent * e ) { mousePressPos = e->pos(); - currentIndex = tqfindItem( mousePressPos ); + currentIndex = findItem( mousePressPos ); lineEdit->hide(); if ( currentIndex > (int)itemList.count() ) { insertSeparator(); @@ -625,7 +625,7 @@ void MenuBarEditor::mouseMoveEvent( TQMouseEvent * e ) if ( ( e->pos() - mousePressPos ).manhattanLength() > 3 ) { bool itemCreated = FALSE; bool isSeparator = FALSE; - draggedItem = item( tqfindItem( mousePressPos ) ); + draggedItem = item( findItem( mousePressPos ) ); if ( draggedItem == &addItem ) { draggedItem = createItem(); itemCreated = TRUE; @@ -651,7 +651,7 @@ void MenuBarEditor::mouseMoveEvent( TQMouseEvent * e ) // If the item is dropped in the same list, // we will have two instances of the same pointer // in the list. - itemList.tqfind( draggedItem ); + itemList.find( draggedItem ); TQLNode * node = itemList.currentNode(); dropConfirmed = FALSE; d->dragCopy(); // dragevents and stuff happens @@ -697,7 +697,7 @@ void MenuBarEditor::dragMoveEvent( TQDragMoveEvent * e ) TQPoint pos = e->pos(); dropLine->move( snapToItem( pos ) ); - int idx = tqfindItem( pos ); + int idx = findItem( pos ); if ( currentIndex != idx ) { hideItem(); currentIndex = idx; @@ -1009,7 +1009,7 @@ void MenuBarEditor::dropInPlace( MenuBarEditorItem * i, const TQPoint & pos ) hideItem(); Command * cmd = 0; - int iidx = itemList.tqfindRef( i ); + int iidx = itemList.findRef( i ); if ( iidx != -1 ) { // internal dnd cmd = new MoveMenuCommand( "Item Dragged", formWnd, this, iidx, idx ); item( iidx )->tqsetVisible( TRUE ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/menubareditor.h b/experimental/tqtinterface/qt4/tools/designer/designer/menubareditor.h index 913f0a829..7ce2c35d3 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/menubareditor.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/menubareditor.h @@ -107,9 +107,9 @@ public: void removeItemAt( int index ); void removeItem( MenuBarEditorItem * item ); - int tqfindItem( MenuBarEditorItem * item ); - int tqfindItem( PopupMenuEditor * menu ); - int tqfindItem( TQPoint & pos ); + int findItem( MenuBarEditorItem * item ); + int findItem( PopupMenuEditor * menu ); + int findItem( TQPoint & pos ); MenuBarEditorItem * item( int index = -1 ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/metadatabase.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/metadatabase.cpp index 501e6cc7c..f428e989f 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/metadatabase.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/metadatabase.cpp @@ -127,7 +127,7 @@ void MetaDataBase::addEntry( TQT_BASE_OBJECT_NAME *o ) if ( !o ) return; setupDataBase(); - if ( db->tqfind( o ) ) + if ( db->find( o ) ) return; MetaDataBaseRecord *r = new MetaDataBaseRecord; r->object = TQT_TQOBJECT(o); @@ -150,7 +150,7 @@ void MetaDataBase::setPropertyChanged( TQT_BASE_OBJECT_NAME *o, const TQString & ( (PropertyObject*)o )->mdPropertyChanged( property, changed ); return; } - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -158,10 +158,10 @@ void MetaDataBase::setPropertyChanged( TQT_BASE_OBJECT_NAME *o, const TQString & } if ( changed ) { - if ( r->changedProperties.tqfindIndex( property ) == -1 ) + if ( r->changedProperties.findIndex( property ) == -1 ) r->changedProperties.append( property ); } else { - if ( r->changedProperties.tqfindIndex( property ) != -1 ) + if ( r->changedProperties.findIndex( property ) != -1 ) r->changedProperties.remove( property ); } @@ -189,20 +189,20 @@ bool MetaDataBase::isPropertyChanged( TQT_BASE_OBJECT_NAME *o, const TQString &p setupDataBase(); if ( TQT_TQOBJECT(o)->isA( "PropertyObject" ) ) return ( (PropertyObject*)o )->mdIsPropertyChanged( property ); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); return FALSE; } - return r->changedProperties.tqfindIndex( property ) != -1; + return r->changedProperties.findIndex( property ) != -1; } TQStringList MetaDataBase::changedProperties( TQT_BASE_OBJECT_NAME *o ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -220,7 +220,7 @@ void MetaDataBase::setPropertyComment( TQT_BASE_OBJECT_NAME *o, const TQString & ( (PropertyObject*)o )->mdSetPropertyComment( property, comment ); return; } - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -235,14 +235,14 @@ TQString MetaDataBase::propertyComment( TQT_BASE_OBJECT_NAME *o, const TQString setupDataBase(); if ( TQT_TQOBJECT(o)->isA( "PropertyObject" ) ) return ( (PropertyObject*)o )->mdPropertyComment( property ); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); return TQString(); } - return *r->propertyComments.tqfind( property ); + return *r->propertyComments.find( property ); } void MetaDataBase::setFakeProperty( TQT_BASE_OBJECT_NAME *o, const TQString &property, const TQVariant& value ) @@ -252,7 +252,7 @@ void MetaDataBase::setFakeProperty( TQT_BASE_OBJECT_NAME *o, const TQString &pro ( (PropertyObject*)o )->mdSetFakeProperty( property, value ); return; } - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -266,13 +266,13 @@ TQVariant MetaDataBase::fakeProperty( TQT_BASE_OBJECT_NAME * o, const TQString & setupDataBase(); if ( TQT_TQOBJECT(o)->isA( "PropertyObject" ) ) return ( (PropertyObject*)o )->mdFakeProperty( property ); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); return TQVariant(); } - TQMap<TQString, TQVariant>::Iterator it = r->fakeProperties.tqfind( property ); + TQMap<TQString, TQVariant>::Iterator it = r->fakeProperties.find( property ); if ( it != r->fakeProperties.end() ) return r->fakeProperties[property]; return WidgetFactory::defaultValue( o, property ); @@ -282,7 +282,7 @@ TQVariant MetaDataBase::fakeProperty( TQT_BASE_OBJECT_NAME * o, const TQString & TQMap<TQString,TQVariant>* MetaDataBase::fakeProperties( TQT_BASE_OBJECT_NAME* o ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -296,7 +296,7 @@ void MetaDataBase::setSpacing( TQT_BASE_OBJECT_NAME *o, int spacing ) if ( !o ) return; setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -324,7 +324,7 @@ int MetaDataBase::spacing( TQT_BASE_OBJECT_NAME *o ) setupDataBase(); if ( ::tqqt_cast<TQMainWindow*>(o) ) o = ( (TQMainWindow*)o )->centralWidget(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -339,7 +339,7 @@ void MetaDataBase::setMargin( TQT_BASE_OBJECT_NAME *o, int margin ) if ( !o ) return; setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -381,7 +381,7 @@ int MetaDataBase::margin( TQT_BASE_OBJECT_NAME *o ) setupDataBase(); if ( ::tqqt_cast<TQMainWindow*>(o) ) o = ( (TQMainWindow*)o )->centralWidget(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -395,7 +395,7 @@ void MetaDataBase::setResizeMode( TQT_BASE_OBJECT_NAME *o, const TQString &mode if ( !o ) return; setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -412,7 +412,7 @@ TQString MetaDataBase::resizeMode( TQT_BASE_OBJECT_NAME *o ) setupDataBase(); if ( ::tqqt_cast<TQMainWindow*>(o) ) o = ( (TQMainWindow*)o )->centralWidget(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -425,7 +425,7 @@ void MetaDataBase::addConnection( TQT_BASE_OBJECT_NAME *o, TQT_BASE_OBJECT_NAME TQT_BASE_OBJECT_NAME *receiver, const TQCString &slot, bool addCode ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -459,7 +459,7 @@ void MetaDataBase::removeConnection( TQT_BASE_OBJECT_NAME *o, TQObject *sender, TQObject *receiver, const TQCString &slot ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -488,7 +488,7 @@ void MetaDataBase::removeConnection( TQT_BASE_OBJECT_NAME *o, TQObject *sender, void MetaDataBase::setupConnections( TQT_BASE_OBJECT_NAME *o, const TQValueList<LanguageInterface::Connection> &conns ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -506,8 +506,8 @@ void MetaDataBase::setupConnections( TQT_BASE_OBJECT_NAME *o, const TQValueList< cit != conns.end(); ++cit ) { // #### get the correct sender object out of Bla.Blub.sender TQString senderName = (*cit).sender; - if ( senderName.tqfind( '.' ) != -1 ) - senderName = senderName.mid( senderName.tqfindRev( '.' ) + 1 ); + if ( senderName.find( '.' ) != -1 ) + senderName = senderName.mid( senderName.findRev( '.' ) + 1 ); TQObject *sender = 0; if ( formfile->formWindow() ) sender = formfile->formWindow()->child( senderName ); @@ -536,7 +536,7 @@ bool MetaDataBase::hasConnection( TQT_BASE_OBJECT_NAME *o, TQT_BASE_OBJECT_NAME TQT_BASE_OBJECT_NAME *receiver, const TQCString &slot ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -558,7 +558,7 @@ bool MetaDataBase::hasConnection( TQT_BASE_OBJECT_NAME *o, TQT_BASE_OBJECT_NAME TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQT_BASE_OBJECT_NAME *o ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -571,7 +571,7 @@ TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQT_BASE_OBJECT TQT_BASE_OBJECT_NAME *receiver ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -593,7 +593,7 @@ TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQT_BASE_OBJECT TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQT_BASE_OBJECT_NAME *o, TQT_BASE_OBJECT_NAME *object ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -614,7 +614,7 @@ TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQT_BASE_OBJECT void MetaDataBase::doConnections( TQT_BASE_OBJECT_NAME *o ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -657,8 +657,8 @@ void MetaDataBase::doConnections( TQT_BASE_OBJECT_NAME *o ) TQStrList slotList = receiver->tqmetaObject()->slotNames( TRUE ); // avoid warnings - if ( signalList.tqfind( conn.signal ) == -1 || - slotList.tqfind( conn.slot ) == -1 ) + if ( signalList.find( conn.signal ) == -1 || + slotList.find( conn.slot ) == -1 ) continue; TQObject::connect( sender, s, receiver, s2 ); @@ -668,7 +668,7 @@ void MetaDataBase::doConnections( TQT_BASE_OBJECT_NAME *o ) bool MetaDataBase::hasSlot( TQT_BASE_OBJECT_NAME *o, const TQCString &slot, bool onlyCustom ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -677,13 +677,13 @@ bool MetaDataBase::hasSlot( TQT_BASE_OBJECT_NAME *o, const TQCString &slot, bool if ( !onlyCustom ) { TQStrList slotList = TQT_TQOBJECT(o)->tqmetaObject()->slotNames( TRUE ); - if ( slotList.tqfind( slot ) != -1 ) + if ( slotList.find( slot ) != -1 ) return TRUE; if ( ::tqqt_cast<FormWindow*>(o) ) { o = ( (FormWindow*)o )->mainContainer(); slotList = TQT_TQOBJECT(o)->tqmetaObject()->slotNames( TRUE ); - if ( slotList.tqfind( slot ) != -1 ) + if ( slotList.find( slot ) != -1 ) return TRUE; } @@ -712,7 +712,7 @@ bool MetaDataBase::hasSlot( TQT_BASE_OBJECT_NAME *o, const TQCString &slot, bool bool MetaDataBase::isSlotUsed( TQT_BASE_OBJECT_NAME *o, const TQCString &slot ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -733,7 +733,7 @@ void MetaDataBase::addFunction( TQT_BASE_OBJECT_NAME *o, const TQCString &functi const TQString &returnType ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -747,7 +747,7 @@ void MetaDataBase::addFunction( TQT_BASE_OBJECT_NAME *o, const TQCString &functi f.type = type; f.language = language; f.returnType = returnType; - TQValueList<MetaDataBase::Function>::Iterator it = r->functionList.tqfind( f ); + TQValueList<MetaDataBase::Function>::Iterator it = r->functionList.find( f ); if ( it != r->functionList.end() ) r->functionList.remove( it ); r->functionList.append( f ); @@ -757,7 +757,7 @@ void MetaDataBase::addFunction( TQT_BASE_OBJECT_NAME *o, const TQCString &functi void MetaDataBase::setFunctionList( TQT_BASE_OBJECT_NAME *o, const TQValueList<Function> &functionList ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -771,7 +771,7 @@ void MetaDataBase::removeFunction( TQT_BASE_OBJECT_NAME *o, const TQCString &fun const TQString &returnType ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -795,7 +795,7 @@ void MetaDataBase::removeFunction( TQT_BASE_OBJECT_NAME *o, const TQCString &fun void MetaDataBase::removeFunction( TQT_BASE_OBJECT_NAME *o, const TQString &function ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -813,7 +813,7 @@ void MetaDataBase::removeFunction( TQT_BASE_OBJECT_NAME *o, const TQString &func TQValueList<MetaDataBase::Function> MetaDataBase::functionList( TQT_BASE_OBJECT_NAME *o, bool onlyFunctions ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -832,7 +832,7 @@ TQValueList<MetaDataBase::Function> MetaDataBase::functionList( TQT_BASE_OBJECT_ TQValueList<MetaDataBase::Function> MetaDataBase::slotList( TQT_BASE_OBJECT_NAME *o ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -850,7 +850,7 @@ void MetaDataBase::changeFunction( TQT_BASE_OBJECT_NAME *o, const TQString &func const TQString &returnType ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -874,7 +874,7 @@ void MetaDataBase::changeFunctionAttributes( TQT_BASE_OBJECT_NAME *o, const TQSt const TQString &returnType ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -898,7 +898,7 @@ void MetaDataBase::changeFunctionAttributes( TQT_BASE_OBJECT_NAME *o, const TQSt bool MetaDataBase::hasFunction( TQT_BASE_OBJECT_NAME *o, const TQCString &function, bool onlyCustom ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -907,13 +907,13 @@ bool MetaDataBase::hasFunction( TQT_BASE_OBJECT_NAME *o, const TQCString &functi if ( !onlyCustom ) { TQStrList functionList = TQT_TQOBJECT(o)->tqmetaObject()->slotNames( TRUE ); - if ( functionList.tqfind( function ) != -1 ) + if ( functionList.find( function ) != -1 ) return TRUE; if ( ::tqqt_cast<FormWindow*>(o) ) { o = ( (FormWindow*)o )->mainContainer(); functionList = TQT_TQOBJECT(o)->tqmetaObject()->slotNames( TRUE ); - if ( functionList.tqfind( function ) != -1 ) + if ( functionList.find( function ) != -1 ) return TRUE; } @@ -942,7 +942,7 @@ bool MetaDataBase::hasFunction( TQT_BASE_OBJECT_NAME *o, const TQCString &functi TQString MetaDataBase::languageOfFunction( TQT_BASE_OBJECT_NAME *o, const TQCString &function ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1036,7 +1036,7 @@ bool MetaDataBase::hasCustomWidget( const TQString &className ) void MetaDataBase::setTabOrder( TQWidget *w, const TQWidgetList &order ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*) w ); + MetaDataBaseRecord *r = db->find( (void*) w ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", w, w->name(), w->className() ); @@ -1049,7 +1049,7 @@ void MetaDataBase::setTabOrder( TQWidget *w, const TQWidgetList &order ) TQWidgetList MetaDataBase::tabOrder( TQWidget *w ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*) w ); + MetaDataBaseRecord *r = db->find( (void*) w ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", w, w->name(), w->className() ); @@ -1062,7 +1062,7 @@ TQWidgetList MetaDataBase::tabOrder( TQWidget *w ) void MetaDataBase::setIncludes( TQT_BASE_OBJECT_NAME *o, const TQValueList<Include> &incs ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1075,7 +1075,7 @@ void MetaDataBase::setIncludes( TQT_BASE_OBJECT_NAME *o, const TQValueList<Inclu TQValueList<MetaDataBase::Include> MetaDataBase::includes( TQT_BASE_OBJECT_NAME *o ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1088,7 +1088,7 @@ TQValueList<MetaDataBase::Include> MetaDataBase::includes( TQT_BASE_OBJECT_NAME void MetaDataBase::setForwards( TQT_BASE_OBJECT_NAME *o, const TQStringList &fwds ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1101,7 +1101,7 @@ void MetaDataBase::setForwards( TQT_BASE_OBJECT_NAME *o, const TQStringList &fwd TQStringList MetaDataBase::forwards( TQT_BASE_OBJECT_NAME *o ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1114,7 +1114,7 @@ TQStringList MetaDataBase::forwards( TQT_BASE_OBJECT_NAME *o ) void MetaDataBase::setVariables( TQT_BASE_OBJECT_NAME *o, const TQValueList<Variable> &vars ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1127,7 +1127,7 @@ void MetaDataBase::setVariables( TQT_BASE_OBJECT_NAME *o, const TQValueList<Vari void MetaDataBase::addVariable( TQT_BASE_OBJECT_NAME *o, const TQString &name, const TQString &access ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1142,7 +1142,7 @@ void MetaDataBase::addVariable( TQT_BASE_OBJECT_NAME *o, const TQString &name, c void MetaDataBase::removeVariable( TQT_BASE_OBJECT_NAME *o, const TQString &name ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1160,7 +1160,7 @@ void MetaDataBase::removeVariable( TQT_BASE_OBJECT_NAME *o, const TQString &name TQValueList<MetaDataBase::Variable> MetaDataBase::variables( TQT_BASE_OBJECT_NAME *o ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1173,7 +1173,7 @@ TQValueList<MetaDataBase::Variable> MetaDataBase::variables( TQT_BASE_OBJECT_NAM bool MetaDataBase::hasVariable( TQT_BASE_OBJECT_NAME *o, const TQString &name ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1190,7 +1190,7 @@ bool MetaDataBase::hasVariable( TQT_BASE_OBJECT_NAME *o, const TQString &name ) TQString MetaDataBase::extractVariableName( const TQString &name ) { - TQString n = name.right( name.length() - name.tqfindRev( ' ' ) - 1 ); + TQString n = name.right( name.length() - name.findRev( ' ' ) - 1 ); if ( n[ 0 ] == '*' || n[ 0 ] == '&' ) n[ 0 ] = ' '; if ( n[ (int)n.length() - 1 ] == ';' ) @@ -1201,7 +1201,7 @@ TQString MetaDataBase::extractVariableName( const TQString &name ) void MetaDataBase::setSignalList( TQT_BASE_OBJECT_NAME *o, const TQStringList &sigs ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1215,10 +1215,10 @@ void MetaDataBase::setSignalList( TQT_BASE_OBJECT_NAME *o, const TQStringList &s bool hasSemicolon = s.endsWith( ";" ); if ( hasSemicolon ) s = s.left( s.length() - 1 ); - int p = s.tqfind( '(' ); + int p = s.find( '(' ); if ( p < 0 ) p = s.length(); - int sp = s.tqfind( ' ' ); + int sp = s.find( ' ' ); if ( sp >= 0 && sp < p ) { s = s.mid( sp+1 ); p -= sp + 1; @@ -1234,7 +1234,7 @@ void MetaDataBase::setSignalList( TQT_BASE_OBJECT_NAME *o, const TQStringList &s TQStringList MetaDataBase::signalList( TQT_BASE_OBJECT_NAME *o ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1247,7 +1247,7 @@ TQStringList MetaDataBase::signalList( TQT_BASE_OBJECT_NAME *o ) void MetaDataBase::setMetaInfo( TQT_BASE_OBJECT_NAME *o, MetaInfo mi ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1260,7 +1260,7 @@ void MetaDataBase::setMetaInfo( TQT_BASE_OBJECT_NAME *o, MetaInfo mi ) MetaDataBase::MetaInfo MetaDataBase::metaInfo( TQT_BASE_OBJECT_NAME *o ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1306,7 +1306,7 @@ void MetaDataBase::setCursor( TQWidget *w, const TQCursor &c ) ( (PropertyObject*)w )->mdSetCursor( c ); return; } - MetaDataBaseRecord *r = db->tqfind( (void*)w ); + MetaDataBaseRecord *r = db->find( (void*)w ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", w, w->name(), w->className() ); @@ -1321,7 +1321,7 @@ TQCursor MetaDataBase::cursor( TQWidget *w ) setupDataBase(); if ( w->isA( "PropertyObject" ) ) return ( (PropertyObject*)w )->mdCursor(); - MetaDataBaseRecord *r = db->tqfind( (void*)w ); + MetaDataBaseRecord *r = db->find( (void*)w ); if ( !r ) { w->unsetCursor(); return w->cursor(); @@ -1357,7 +1357,7 @@ MetaDataBase::CustomWidget &MetaDataBase::CustomWidget::operator=( const CustomW bool MetaDataBase::CustomWidget::hasSignal( const TQCString &signal ) const { TQStrList sigList = TQWidget::tqstaticMetaObject()->signalNames( TRUE ); - if ( sigList.tqfind( signal ) != -1 ) + if ( sigList.find( signal ) != -1 ) return TRUE; for ( TQValueList<TQCString>::ConstIterator it = lstSignals.begin(); it != lstSignals.end(); ++it ) { if ( normalizeFunction( *it ) == normalizeFunction( signal ) ) @@ -1369,7 +1369,7 @@ bool MetaDataBase::CustomWidget::hasSignal( const TQCString &signal ) const bool MetaDataBase::CustomWidget::hasSlot( const TQCString &slot ) const { TQStrList slotList = TQWidget::tqstaticMetaObject()->slotNames( TRUE ); - if ( slotList.tqfind( normalizeFunction( slot ) ) != -1 ) + if ( slotList.find( normalizeFunction( slot ) ) != -1 ) return TRUE; for ( TQValueList<MetaDataBase::Function>::ConstIterator it = lstSlots.begin(); it != lstSlots.end(); ++it ) { @@ -1382,7 +1382,7 @@ bool MetaDataBase::CustomWidget::hasSlot( const TQCString &slot ) const bool MetaDataBase::CustomWidget::hasProperty( const TQCString &prop ) const { TQStrList propList = TQWidget::tqstaticMetaObject()->propertyNames( TRUE ); - if ( propList.tqfind( prop ) != -1 ) + if ( propList.find( prop ) != -1 ) return TRUE; for ( TQValueList<MetaDataBase::Property>::ConstIterator it = lstProperties.begin(); it != lstProperties.end(); ++it ) { @@ -1397,7 +1397,7 @@ void MetaDataBase::setPixmapArgument( TQT_BASE_OBJECT_NAME *o, int pixmap, const if ( !o ) return; setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1413,14 +1413,14 @@ TQString MetaDataBase::pixmapArgument( TQT_BASE_OBJECT_NAME *o, int pixmap ) if ( !o ) return TQString(); setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); return TQString(); } - return *r->pixmapArguments.tqfind( pixmap ); + return *r->pixmapArguments.find( pixmap ); } void MetaDataBase::clearPixmapArguments( TQT_BASE_OBJECT_NAME *o ) @@ -1428,7 +1428,7 @@ void MetaDataBase::clearPixmapArguments( TQT_BASE_OBJECT_NAME *o ) if ( !o ) return; setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1448,7 +1448,7 @@ void MetaDataBase::setPixmapKey( TQT_BASE_OBJECT_NAME *o, int pixmap, const TQSt ( (PropertyObject*)o )->mdSetPixmapKey( pixmap, arg ); return; } - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1466,21 +1466,21 @@ TQString MetaDataBase::pixmapKey( TQT_BASE_OBJECT_NAME *o, int pixmap ) setupDataBase(); if ( TQT_TQOBJECT(o)->isA( "PropertyObject" ) ) return ( (PropertyObject*)o )->mdPixmapKey( pixmap ); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); return TQString(); } - TQString s = *r->pixmapKeys.tqfind( pixmap ); + TQString s = *r->pixmapKeys.find( pixmap ); if ( !s.isNull() ) return s; if ( !o->isWidgetType() ) return s; TQWidget *w = (TQWidget*)o; if ( w->icon() ) - return *r->pixmapKeys.tqfind( w->icon()->serialNumber() ); + return *r->pixmapKeys.find( w->icon()->serialNumber() ); return s; } @@ -1489,7 +1489,7 @@ void MetaDataBase::clearPixmapKeys( TQT_BASE_OBJECT_NAME *o ) if ( !o ) return; setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1506,7 +1506,7 @@ void MetaDataBase::setColumnFields( TQT_BASE_OBJECT_NAME *o, const TQMap<TQStrin if ( !o ) return; setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1521,7 +1521,7 @@ TQMap<TQString, TQString> MetaDataBase::columnFields( TQT_BASE_OBJECT_NAME *o ) if ( !o ) return TQMap<TQString, TQString>(); setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1538,7 +1538,7 @@ void MetaDataBase::setEditor( const TQStringList &langs ) bool MetaDataBase::hasEditor( const TQString &lang ) { - return editorLangList.tqfind( lang ) != editorLangList.end(); + return editorLangList.find( lang ) != editorLangList.end(); } void MetaDataBase::setupInterfaceManagers( const TQString &plugDir ) @@ -1587,7 +1587,7 @@ void MetaDataBase::setBreakPoints( TQT_BASE_OBJECT_NAME *o, const TQValueList<ui if ( !o ) return; setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1600,8 +1600,8 @@ void MetaDataBase::setBreakPoints( TQT_BASE_OBJECT_NAME *o, const TQValueList<ui while ( it != r->breakPointConditions.end() ) { int line = it.key(); ++it; - if ( r->breakPoints.tqfind( line ) == r->breakPoints.end() ) - r->breakPointConditions.remove( r->breakPointConditions.tqfind( line ) ); + if ( r->breakPoints.find( line ) == r->breakPoints.end() ) + r->breakPointConditions.remove( r->breakPointConditions.find( line ) ); } } @@ -1610,7 +1610,7 @@ TQValueList<uint> MetaDataBase::breakPoints( TQT_BASE_OBJECT_NAME *o ) if ( !o ) return TQValueList<uint>(); setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1625,13 +1625,13 @@ void MetaDataBase::setBreakPointCondition( TQT_BASE_OBJECT_NAME *o, int line, co if ( !o ) return; setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); return; } - r->breakPointConditions.tqreplace( line, condition ); + r->breakPointConditions.replace( line, condition ); } TQString MetaDataBase::breakPointCondition( TQT_BASE_OBJECT_NAME *o, int line ) @@ -1639,13 +1639,13 @@ TQString MetaDataBase::breakPointCondition( TQT_BASE_OBJECT_NAME *o, int line ) if ( !o ) return TQString(); setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); return TQString(); } - TQMap<int, TQString>::Iterator it = r->breakPointConditions.tqfind( line ); + TQMap<int, TQString>::Iterator it = r->breakPointConditions.find( line ); if ( it == r->breakPointConditions.end() ) return TQString(); return *it; @@ -1660,7 +1660,7 @@ void MetaDataBase::setExportMacro( TQT_BASE_OBJECT_NAME *o, const TQString ¯ ( (PropertyObject*)o )->mdSetExportMacro( macro ); return; } - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1677,7 +1677,7 @@ TQString MetaDataBase::exportMacro( TQT_BASE_OBJECT_NAME *o ) setupDataBase(); if ( TQT_TQOBJECT(o)->isA( "PropertyObject" ) ) return ( (PropertyObject*)o )->mdExportMacro(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1689,5 +1689,5 @@ TQString MetaDataBase::exportMacro( TQT_BASE_OBJECT_NAME *o ) bool MetaDataBase::hasObject( TQT_BASE_OBJECT_NAME *o ) { - return !!db->tqfind( o ); + return !!db->find( o ); } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/multilineeditorimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/multilineeditorimpl.cpp index d8a1ff269..819712b92 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/multilineeditorimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/multilineeditorimpl.cpp @@ -234,7 +234,7 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget mlined->setReadOnly( TRUE ); const TQMetaProperty *wordWrap = mlined->tqmetaObject()->property( - mlined->tqmetaObject()->tqfindProperty( "wordWrap", TRUE ), TRUE ); + mlined->tqmetaObject()->findProperty( "wordWrap", TRUE ), TRUE ); oldWrapMode = 0; oldWrapString = "NoWrap"; if ( wordWrap ) { @@ -323,7 +323,7 @@ void MultiLineEditor::insertTags( const TQString &tag ) { int pfrom, pto, ifrom, ito; TQString tagend( tag.simplifyWhiteSpace() ); - tagend.remove( tagend.tqfind( ' ', 0 ), tagend.length() ); + tagend.remove( tagend.find( ' ', 0 ), tagend.length() ); if ( textEdit->hasSelectedText() ) { textEdit->getSelection( &pfrom, &ifrom, &pto, &ito ); TQString buf = textEdit->selectedText(); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/newformimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/newformimpl.cpp index 1192529a7..92a9b8725 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/newformimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/newformimpl.cpp @@ -141,12 +141,12 @@ static void unifyFormName( FormWindow *fw, TQWorkspace *qworkspace ) lst << w->name(); } - if ( lst.tqfindIndex( fw->name() ) == -1 ) + if ( lst.findIndex( fw->name() ) == -1 ) return; TQString origName = fw->name(); TQString n = origName; int i = 1; - while ( lst.tqfindIndex( n ) != -1 ) { + while ( lst.findIndex( n ) != -1 ) { n = origName + TQString::number( i++ ); } fw->setName( n ); @@ -310,7 +310,7 @@ void NewForm::insertTemplates( TQIconView *tView, if ( !fi->isFile() || fi->extension() != "ui" ) continue; TQString name = fi->baseName(); - name = name.tqreplace( '_', ' ' ); + name = name.replace( '_', ' ' ); CustomFormItem *ci = new CustomFormItem( tView, name ); allItems.append( ci ); ci->setDragEnabled( FALSE ); @@ -386,7 +386,7 @@ void NewForm::accept() { if ( !templateView->currentItem() ) return; - Project *pro = MainWindow::self->tqfindProject( projectCombo->currentText() ); + Project *pro = MainWindow::self->findProject( projectCombo->currentText() ); if ( !pro ) return; MainWindow::self->setCurrentProject( pro ); @@ -396,7 +396,7 @@ void NewForm::accept() void NewForm::projectChanged( const TQString &project ) { - Project *pro = MainWindow::self->tqfindProject( project ); + Project *pro = MainWindow::self->findProject( project ); if ( !pro ) return; TQIconViewItem *i; diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/outputwindow.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/outputwindow.cpp index ef3a9432b..8bc6ac30a 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/outputwindow.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/outputwindow.cpp @@ -187,7 +187,7 @@ ErrorItem::ErrorItem( TQListView *tqparent, TQListViewItem *after, const TQStrin setMultiLinesEnabled( TRUE ); TQString m( message ); type = m.startsWith( "Warning: " ) ? Warning : Error; - m = m.mid( m.tqfind( ':' ) + 1 ); + m = m.mid( m.find( ':' ) + 1 ); setText( 0, type == Error ? "Error" : "Warning" ); setText( 1, m ); setText( 2, TQString::number( line ) ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/pixmapchooser.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/pixmapchooser.cpp index 32b1231a6..8d0f41e06 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/pixmapchooser.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/pixmapchooser.cpp @@ -198,7 +198,7 @@ ImageIconProvider::~ImageIconProvider() const TQPixmap * ImageIconProvider::pixmap( const TQFileInfo &fi ) { TQString ext = fi.extension().upper(); - if ( fmts.tqcontains( ext ) ) { + if ( fmts.contains( ext ) ) { return &imagepm; } else { return TQFileIconProvider::pixmap( fi ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/pixmapcollectioneditor.ui.h b/experimental/tqtinterface/qt4/tools/designer/designer/pixmapcollectioneditor.ui.h index 2dfe55639..84c6bcf32 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/pixmapcollectioneditor.ui.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/pixmapcollectioneditor.ui.h @@ -67,7 +67,7 @@ void PixmapCollectionEditor::addPixmap() } updateView(); - TQIconViewItem *item = viewPixmaps->tqfindItem( lastName ); + TQIconViewItem *item = viewPixmaps->findItem( lastName ); if ( item ) { viewPixmaps->setCurrentItem( item ); viewPixmaps->ensureItemVisible( item ); @@ -130,7 +130,7 @@ void PixmapCollectionEditor::setChooserMode( bool c ) void PixmapCollectionEditor::setCurrentItem( const TQString & name ) { - TQIconViewItem *i = viewPixmaps->tqfindItem( name ); + TQIconViewItem *i = viewPixmaps->findItem( name ); if ( i ) { viewPixmaps->setCurrentItem( i ); currentChanged( i ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/popupmenueditor.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/popupmenueditor.cpp index d9d6a175e..ee2eadcac 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/popupmenueditor.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/popupmenueditor.cpp @@ -232,7 +232,7 @@ bool PopupMenuEditorItem::eventFilter( TQObject * o, TQEvent * event ) TQChildEvent * ce = ( TQChildEvent * ) event; TQObject * c = TQT_TQOBJECT(ce->child()); TQAction * action = ::tqqt_cast<TQAction*>( c ); - if ( s->tqfind( action ) != -1 ) // avoid duplicates + if ( s->find( action ) != -1 ) // avoid duplicates return FALSE; TQActionGroup * actionGroup = ::tqqt_cast<TQActionGroup*>( c ); if ( actionGroup ) @@ -246,7 +246,7 @@ bool PopupMenuEditorItem::eventFilter( TQObject * o, TQEvent * event ) void PopupMenuEditorItem::selfDestruct() { hideMenu(); - int i = m->tqfind( s ); + int i = m->find( s ); if ( i != -1 && i < m->count() ) m->remove( i ); // remove this item a = 0; // the selfDestruct call was caused by the deletion of the action @@ -379,7 +379,7 @@ void PopupMenuEditor::insert( TQActionGroup * actionGroup, int index ) delete l; } -int PopupMenuEditor::tqfind( const TQAction * action ) +int PopupMenuEditor::find( const TQAction * action ) { PopupMenuEditorItem * i = itemList.first(); while ( i ) { @@ -390,7 +390,7 @@ int PopupMenuEditor::tqfind( const TQAction * action ) return -1; } -int PopupMenuEditor::tqfind( PopupMenuEditor * menu ) +int PopupMenuEditor::find( PopupMenuEditor * menu ) { PopupMenuEditorItem * i = itemList.first(); while ( i ) { @@ -419,8 +419,8 @@ void PopupMenuEditor::exchange( int a, int b ) ia == &addItem || ia == &addSeparator || ib == &addItem || ib == &addSeparator ) return; // do nothing - itemList.tqreplace( b, ia ); - itemList.tqreplace( a, ib ); + itemList.replace( b, ia ); + itemList.replace( a, ib ); } void PopupMenuEditor::cut( int index ) @@ -785,7 +785,7 @@ void PopupMenuEditor::mouseMoveEvent( TQMouseEvent * e ) // If the item is dropped in the same list, // we will have two instances of the same pointer // in the list. We use node instead. - int idx = itemList.tqfind( draggedItem ); + int idx = itemList.find( draggedItem ); TQLNode * node = itemList.currentNode(); d->dragCopy(); // dragevents and stuff happens @@ -1228,7 +1228,7 @@ void PopupMenuEditor::dropInPlace( PopupMenuEditorItem * i, int y ) idx++; n = itemList.next(); } - int same = itemList.tqfindRef( i ); + int same = itemList.findRef( i ); AddActionToPopupCommand * cmd = new AddActionToPopupCommand( "Drop Item", formWnd, this, i, idx ); formWnd->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -1409,7 +1409,7 @@ void PopupMenuEditor::leaveEditMode( TQKeyEvent * e ) // new item was created TQAction * a = formWnd->mainWindow()->actioneditor()->newActionEx(); TQString actionText = lineEdit->text(); - actionText.tqreplace("&&", "&"); + actionText.replace("&&", "&"); TQString menuText = lineEdit->text(); a->setText( actionText ); a->setMenuText( menuText ); @@ -1450,18 +1450,18 @@ TQString PopupMenuEditor::constructName( PopupMenuEditorItem *item ) TQWidget *e = parentEditor(); PopupMenuEditor *p = ::tqqt_cast<PopupMenuEditor*>(e); if ( p ) { - int idx = p->tqfind( item->m ); + int idx = p->find( item->m ); PopupMenuEditorItem * i = ( idx > -1 ? p->at( idx ) : 0 ); s = ( i ? TQString( i->action()->name() ).remove( "Action" ) : TQString( "" ) ); } else { MenuBarEditor *b = ::tqqt_cast<MenuBarEditor*>(e); if ( b ) { - int idx = b->tqfindItem( item->m ); + int idx = b->findItem( item->m ); MenuBarEditorItem * i = ( idx > -1 ? b->item( idx ) : 0 ); s = ( i ? i->menuText().lower() : TQString( "" ) ); } } - // tqreplace illegal characters + // replace illegal characters return ( RenameMenuCommand::makeLegal( s ) + RenameMenuCommand::makeLegal( name ) + "Action" ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/popupmenueditor.h b/experimental/tqtinterface/qt4/tools/designer/designer/popupmenueditor.h index df070d9bd..1015b093c 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/popupmenueditor.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/popupmenueditor.h @@ -124,8 +124,8 @@ public: void insert( PopupMenuEditorItem * item, int index = -1 ); void insert( TQAction * action, int index = -1 ); void insert( TQActionGroup * actionGroup, int index = -1 ); - int tqfind( const TQAction * action ); - int tqfind( PopupMenuEditor * menu ); + int find( const TQAction * action ); + int find( PopupMenuEditor * menu ); int count(); PopupMenuEditorItem * at( int index ); PopupMenuEditorItem * at( TQPoint pos ) { return itemAt( pos.y() ); } @@ -160,7 +160,7 @@ public Q_SLOTS: void paste() { paste( currentIndex ); } void remove( int index ); - void remove( TQAction * a ) { remove( tqfind( a ) ); } + void remove( TQAction * a ) { remove( find( a ) ); } void resizeToContents(); void showSubMenu(); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/project.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/project.cpp index fa14e25f4..5e0ec5371 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/project.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/project.cpp @@ -113,12 +113,12 @@ bool DatabaseConnection::open( bool suppressDialog ) #ifndef TQT_NO_SQL // register our name, if nec if ( nm == "(default)" ) { - if ( !TQSqlDatabase::tqcontains() ) // default doesn't exists? + if ( !TQSqlDatabase::contains() ) // default doesn't exists? conn = TQSqlDatabase::addDatabase( drv ); else conn = TQSqlDatabase::database(); } else { - if ( !TQSqlDatabase::tqcontains( nm ) ) + if ( !TQSqlDatabase::contains( nm ) ) conn = TQSqlDatabase::addDatabase( drv, nm ); else conn = TQSqlDatabase::database( nm ); @@ -290,8 +290,8 @@ void Project::setFileName( const TQString &fn, bool doClear ) } - if ( proName.tqcontains( '.' ) ) - proName = proName.left( proName.tqfind( '.' ) ); + if ( proName.contains( '.' ) ) + proName = proName.left( proName.find( '.' ) ); if ( !doClear ) return; @@ -450,7 +450,7 @@ void Project::parse() TQStringList::ConstIterator it; - int i = contents.tqfind( "LANGUAGE" ); + int i = contents.find( "LANGUAGE" ); if ( i != -1 ) { lang = ""; is_cpp = FALSE; @@ -459,7 +459,7 @@ void Project::parse() is_cpp = lang == "C++"; } - i = contents.tqfind( "DBFILE" ); + i = contents.find( "DBFILE" ); if ( i != -1 ) { dbFile = ""; TQString part = contents.mid( i + TQString( "DBFILE" ).length() ); @@ -475,7 +475,7 @@ void Project::parse() } - i = contents.tqfind( "TEMPLATE" ); + i = contents.find( "TEMPLATE" ); if ( i != -1 ) { templ = ""; TQString part = contents.mid( i + TQString( "TEMPLATE" ).length() ); @@ -503,12 +503,12 @@ void Project::parse() updateCustomSettings(); for ( it = csList.begin(); it != csList.end(); ++it ) { - i = contents.tqfind( *it ); + i = contents.find( *it ); if ( i != -1 ) { TQString val = ""; TQString part = contents.mid( i + TQString( *it ).length() ); val = parse_part( part ); - customSettings.tqreplace( *it, val ); + customSettings.replace( *it, val ); } } @@ -537,7 +537,7 @@ void Project::clear() bool Project::removeSourceFile( SourceFile *sf ) { - if ( !sourcefiles.tqcontainsRef( sf ) ) + if ( !sourcefiles.containsRef( sf ) ) return FALSE; if ( !sf->close() ) return FALSE; @@ -601,10 +601,10 @@ TQString Project::makeRelative( const TQString &f ) static void remove_contents( TQString &contents, const TQString &s ) { - int i = contents.tqfind( s ); + int i = contents.find( s ); if ( i != -1 ) { int start = i; - int end = contents.tqfind( '\n', i ); + int end = contents.find( '\n', i ); if ( end == -1 ) end = contents.length() - 1; contents.remove( start, end - start + 1 ); @@ -613,9 +613,9 @@ static void remove_contents( TQString &contents, const TQString &s ) static void remove_multiline_contents( TQString &contents, const TQString &s, int *strt = 0 ) { - int i = contents.tqfind( s ); - int startBrace = contents.tqfindRev("{", i); - int endBrace = contents.tqfindRev("}", i); + int i = contents.find( s ); + int startBrace = contents.findRev("{", i); + int endBrace = contents.findRev("}", i); // We found a startBrace before i, but no endBrace after the startBrace before i if (startBrace != -1 && endBrace < startBrace) return; @@ -745,7 +745,7 @@ void Project::save( bool onlyProjectFile ) TQString key = iface->projectKeyForExtension( TQFileInfo( f->fileName() ).extension() ); TQStringList lst = sourceToKey[ key ]; lst << makeRelative( f->fileName() ); - sourceToKey.tqreplace( key, lst ); + sourceToKey.replace( key, lst ); } for ( TQMap<TQString, TQStringList>::Iterator skit = sourceToKey.begin(); @@ -791,7 +791,7 @@ void Project::save( bool onlyProjectFile ) // custom settings for ( TQStringList::Iterator it = csList.begin(); it != csList.end(); ++it ) { - TQString val = *customSettings.tqfind( *it ); + TQString val = *customSettings.find( *it ); if ( !val.isEmpty() ) contents += *it + "\t= " + val + "\n"; } @@ -1145,7 +1145,7 @@ void Project::setCustomSetting( const TQString &key, const TQString &value ) TQString Project::customSetting( const TQString &key ) const { - return *customSettings.tqfind( key ); + return *customSettings.find( key ); } void Project::updateCustomSettings() @@ -1184,7 +1184,7 @@ void Project::addSourceFile( SourceFile *sf ) } -SourceFile* Project::tqfindSourceFile( const TQString& filename, SourceFile *ignore ) const +SourceFile* Project::findSourceFile( const TQString& filename, SourceFile *ignore ) const { TQPtrListIterator<SourceFile> it(sourcefiles); while ( it.current() ) { @@ -1195,7 +1195,7 @@ SourceFile* Project::tqfindSourceFile( const TQString& filename, SourceFile *ign return 0; } -FormFile* Project::tqfindFormFile( const TQString& filename, FormFile *ignore ) const +FormFile* Project::findFormFile( const TQString& filename, FormFile *ignore ) const { TQPtrListIterator<FormFile> it(formfiles); while ( it.current() ) { @@ -1210,23 +1210,23 @@ void Project::setIncludePath( const TQString &platform, const TQString &path ) { if ( inclPath[platform] == path ) return; - inclPath.tqreplace( platform, path ); + inclPath.replace( platform, path ); modified = TRUE; } void Project::setLibs( const TQString &platform, const TQString &path ) { - lbs.tqreplace( platform, path ); + lbs.replace( platform, path ); } void Project::setDefines( const TQString &platform, const TQString &path ) { - defs.tqreplace( platform, path ); + defs.replace( platform, path ); } void Project::setConfig( const TQString &platform, const TQString &config ) { - cfg.tqreplace( platform, config ); + cfg.replace( platform, config ); } TQString Project::config( const TQString &platform ) const @@ -1273,7 +1273,7 @@ void Project::readPlatformSettings( const TQString &contents, TQString key = platforms[ i ]; if ( key.isEmpty() ) key = "(all)"; - res.tqreplace( key, s ); + res.replace( key, s ); } } @@ -1305,7 +1305,7 @@ void Project::writePlatformSettings( TQString &contents, const TQString &setting TQString key = platforms[ i ]; if ( key.isEmpty() ) key = "(all)"; - TQMap<TQString, TQString>::ConstIterator it = input.tqfind( key ); + TQMap<TQString, TQString>::ConstIterator it = input.find( key ); if ( it == input.end() || (*it).isEmpty() ) continue; contents += p + setting + "\t+= " + *it + "\n\n"; @@ -1321,7 +1321,7 @@ void Project::addFormFile( FormFile *ff ) bool Project::removeFormFile( FormFile *ff ) { - if ( !formfiles.tqcontainsRef( ff ) ) + if ( !formfiles.containsRef( ff ) ) return FALSE; if ( !ff->close() ) return FALSE; @@ -1392,7 +1392,7 @@ TQObjectList Project::objects() const FormFile *Project::fakeFormFileFor( TQObject *o ) const { - return fakeFormFiles.tqfind( (void*)o ); + return fakeFormFiles.find( (void*)o ); } TQObject *Project::objectForFakeForm( FormWindow *fw ) const @@ -1451,14 +1451,14 @@ void Project::addAndEditFunction( const TQString &function, const TQString &func return; iface->functions( f->text(), &funcs ); TQString func = function; - int i = func.tqfind( '(' ); + int i = func.find( '(' ); if ( i != -1 ) func = func.left( i ); bool found = FALSE; for ( TQValueList<LanguageInterface::Function>::Iterator it = funcs.begin(); it != funcs.end(); ++it ) { - if ( (*it).name.left( (*it).name.tqfind( '(' ) ) == func ) { + if ( (*it).name.left( (*it).name.find( '(' ) ) == func ) { found = TRUE; break; } @@ -1503,7 +1503,7 @@ TQString Project::qualifiedName( TQObject *o ) TQObject *p = o->tqparent(); while ( p ) { name.prepend( TQString( p->name() ) + "." ); - if ( objs.tqfindRef( p ) != -1 ) + if ( objs.findRef( p ) != -1 ) break; p = p->tqparent(); } @@ -1587,7 +1587,7 @@ TQString Project::locationOfObject( TQObject *o ) return TQString(); } - TQString s = makeRelative( *qwf_forms->tqfind( (TQWidget*)o ) ); + TQString s = makeRelative( *qwf_forms->find( (TQWidget*)o ) ); s += " [Source]"; return s; } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/project.h b/experimental/tqtinterface/qt4/tools/designer/designer/project.h index bb4b8bbf2..ff39f5e95 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/project.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/project.h @@ -181,12 +181,12 @@ public: TQPtrListIterator<SourceFile> sourceFiles() const { return TQPtrListIterator<SourceFile>(sourcefiles); } void addSourceFile( SourceFile *sf ); bool removeSourceFile( SourceFile *sf ); - SourceFile* tqfindSourceFile( const TQString& filename, SourceFile *ignore = 0 ) const; + SourceFile* findSourceFile( const TQString& filename, SourceFile *ignore = 0 ) const; TQPtrListIterator<FormFile> formFiles() const { return TQPtrListIterator<FormFile>(formfiles); } void addFormFile( FormFile *ff ); bool removeFormFile( FormFile *ff ); - FormFile* tqfindFormFile( const TQString& filename, FormFile *ignore = 0 ) const; + FormFile* findFormFile( const TQString& filename, FormFile *ignore = 0 ) const; void setIncludePath( const TQString &platform, const TQString &path ); void setLibs( const TQString &platform, const TQString &path ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp index c74d2a37b..c93201d15 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp @@ -562,7 +562,7 @@ void PropertyItem::setText( int col, const TQString &t ) { TQString txt( t ); if ( col == 1 ) - txt = txt.tqreplace( "\n", " " ); + txt = txt.replace( "\n", " " ); TQListViewItem::setText( col, txt ); } @@ -2737,7 +2737,7 @@ void EnumBox::mousePressEvent( TQMouseEvent *e ) arrowRect.setHeight( TQMAX( height() - (2 * arrowRect.y()), arrowRect.height() ) ); - if ( arrowRect.tqcontains( e->pos() ) ) { + if ( arrowRect.contains( e->pos() ) ) { arrowDown = TRUE; tqrepaint( FALSE ); } @@ -2836,7 +2836,7 @@ void PropertyEnumItem::setValue() enumString += "|" + (*it).key; } if ( !enumString.isEmpty() ) - enumString.tqreplace( 0, 1, "" ); + enumString.replace( 0, 1, "" ); box->setText( enumString ); setText( 1, enumString ); @@ -2859,7 +2859,7 @@ void PropertyEnumItem::setCurrentValues( TQStrList lst ) } } if ( !enumString.isEmpty() ) - enumString.tqreplace( 0, 1, "" ); + enumString.replace( 0, 1, "" ); box->setText( enumString ); setText( 1, enumString ); } @@ -3041,10 +3041,10 @@ void PropertyList::setupProperties() for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) { const TQMetaProperty* p = editor->widget()->tqmetaObject()-> - property( editor->widget()->tqmetaObject()->tqfindProperty( it.current(), allProperties), allProperties ); + property( editor->widget()->tqmetaObject()->findProperty( it.current(), allProperties), allProperties ); if ( !p ) continue; - if ( unique.tqcontains( TQString::tqfromLatin1( it.current() ) ) ) + if ( unique.contains( TQString::tqfromLatin1( it.current() ) ) ) continue; if ( ::tqqt_cast<TQDesignerToolBar*>(editor->widget()) || ::tqqt_cast<MenuBarEditor*>(editor->widget()) ) { @@ -3215,7 +3215,7 @@ void PropertyList::setupProperties() } } if ( item && !p->isSetType() ) { - if ( valueSet.tqfindIndex( item->name() ) == -1 ) { + if ( valueSet.findIndex( item->name() ) == -1 ) { setPropertyValue( item ); valueSet << item->name(); } @@ -3328,7 +3328,7 @@ void PropertyList::setupCusWidgetProperties( MetaDataBase::CustomWidget *cw, for ( TQValueList<MetaDataBase::Property>::Iterator it = cw->lstProperties.begin(); it != cw->lstProperties.end(); ++it ) { - if ( unique.tqcontains( TQString( (*it).property ) ) ) + if ( unique.contains( TQString( (*it).property ) ) ) continue; unique.insert( TQString( (*it).property ), TRUE ); addPropertyItem( item, (*it).property, (QVariant::Type)(int)type_to_variant( (*it).type ) ); @@ -3348,7 +3348,7 @@ bool PropertyList::addPropertyItem( PropertyItem *&item, const TQCString &name, l << ""; while ( it.current() ) { if ( editor->formWindow()->canBeBuddy( it.current() ) ) { - if ( l.tqfind( it.current()->name() ) == l.end() ) + if ( l.find( it.current()->name() ) == l.end() ) l << it.current()->name(); } ++it; @@ -3668,9 +3668,9 @@ static void clearAlignList( TQStrList &l ) { if ( l.count() == 1 ) return; - if ( l.tqfind( "AlignAuto" ) != -1 ) + if ( l.find( "AlignAuto" ) != -1 ) l.remove( "AlignAuto" ); - if ( l.tqfind( "WordBreak" ) != -1 ) + if ( l.find( "WordBreak" ) != -1 ) l.remove( "WordBreak" ); } @@ -3682,12 +3682,12 @@ void PropertyList::setPropertyValue( PropertyItem *i ) { const TQMetaProperty *p = editor->widget()->tqmetaObject()-> - property( editor->widget()->tqmetaObject()->tqfindProperty( i->name(), TRUE), TRUE ); + property( editor->widget()->tqmetaObject()->findProperty( i->name(), TRUE), TRUE ); if ( !p ) { if ( i->name() == "hAlign" ) { int align = editor->widget()->property( "tqalignment" ).toInt(); p = editor->widget()->tqmetaObject()-> - property( editor->widget()->tqmetaObject()->tqfindProperty( "tqalignment", TRUE ), TRUE ); + property( editor->widget()->tqmetaObject()->findProperty( "tqalignment", TRUE ), TRUE ); align &= ~Qt::AlignVertical_Mask; TQStrList l = p->valueToKeys( align ); clearAlignList( l ); @@ -3695,7 +3695,7 @@ void PropertyList::setPropertyValue( PropertyItem *i ) } else if ( i->name() == "vAlign" ) { int align = editor->widget()->property( "tqalignment" ).toInt(); p = editor->widget()->tqmetaObject()-> - property( editor->widget()->tqmetaObject()->tqfindProperty( "tqalignment", TRUE ), TRUE ); + property( editor->widget()->tqmetaObject()->findProperty( "tqalignment", TRUE ), TRUE ); align &= ~Qt::AlignHorizontal_Mask; ( (PropertyListItem*)i )->setCurrentItem( p->valueToKeys( align ).last() ); } else if ( i->name() == "wordwrap" ) { @@ -3859,7 +3859,7 @@ TQString PropertyList::whatsThisText( TQListViewItem *i ) TQString s; s = TQString( mo->className() ) + "::" + prop; TQMap<TQString, TQString>::Iterator it; - if ( ( it = propertyDocs.tqfind( s ) ) != propertyDocs.end() ) { + if ( ( it = propertyDocs.find( s ) ) != propertyDocs.end() ) { return *it; } mo = mo->tqsuperClass(); @@ -3918,15 +3918,15 @@ EventList::EventList( TQWidget *tqparent, FormWindow *fw, PropertyEditor *e ) TQString clean_arguments( const TQString &s ) { TQString slot = s; - TQString arg = slot.mid( slot.tqfind( '(' ) + 1 ); - arg = arg.left( arg.tqfindRev( ')' ) ); + TQString arg = slot.mid( slot.find( '(' ) + 1 ); + arg = arg.left( arg.findRev( ')' ) ); TQStringList args = TQStringList::split( ',', arg ); - slot = slot.left( slot.tqfind( '(' ) + 1 ); + slot = slot.left( slot.find( '(' ) + 1 ); int num = 0; for ( TQStringList::Iterator it = args.begin(); it != args.end(); ++it, ++num ) { TQString a = *it; int i; - if ( ( i =a.tqfind( ':' ) ) == -1 ) + if ( ( i =a.find( ':' ) ) == -1 ) slot += a.simplifyWhiteSpace(); else slot += a.mid( i + 1 ).simplifyWhiteSpace(); @@ -3982,7 +3982,7 @@ void EventList::contentsMouseDoubleClickEvent( TQMouseEvent *e ) TQString s; if ( !formWindow->project()->isCpp() ) { TQString s1 = i->text( 0 ); - int pt = s1.tqfind( "(" ); + int pt = s1.find( "(" ); if ( pt != -1 ) s1 = s1.left( pt ); s = TQString( editor->widget()->name() ) + "_" + s1; @@ -4018,7 +4018,7 @@ void EventList::showRMBMenu( TQListViewItem *i, const TQPoint &pos ) TQString s; if ( !formWindow->project()->isCpp() ) { TQString s1 = ( i->tqparent() ? i->tqparent() : i )->text( 0 ); - int pt = s1.tqfind( "(" ); + int pt = s1.find( "(" ); if ( pt != -1 ) s1 = s1.left( pt ); s = TQString( editor->widget()->name() ) + "_" + s1; @@ -4073,9 +4073,9 @@ void EventList::renamed( TQListViewItem *i ) // #### we should look if the specified slot already // exists and if we can connect to this one TQString funcname = i->text( 0 ).latin1(); - if ( funcname.tqfind( '(' ) == -1 ) { // try to create a signature + if ( funcname.find( '(' ) == -1 ) { // try to create a signature TQString sig = i->tqparent()->text( 0 ); - sig = sig.mid( sig.tqfind( '(' ) + 1 ); + sig = sig.mid( sig.find( '(' ) + 1 ); sig.remove( (int)sig.length() - 1, 1 ); LanguageInterface *iface = MetaDataBase::languageInterface( formWindow->project()->language() ); if ( iface ) @@ -4085,7 +4085,7 @@ void EventList::renamed( TQListViewItem *i ) MetaDataBase::addFunction( formWindow, funcname.latin1(), "virtual", "public", "slot", formWindow->project()->language(), "void" ); editor->formWindow()->mainWindow()-> - editFunction( i->text( 0 ).left( i->text( 0 ).tqfind( "(" ) ), TRUE ); + editFunction( i->text( 0 ).left( i->text( 0 ).find( "(" ) ), TRUE ); cmd->execute(); editor->formWindow()->mainWindow()->objectHierarchy()->updateFormDefinitionView(); editor->formWindow()->formFile()->setModified( TRUE ); @@ -4108,7 +4108,7 @@ void EventList::save( TQListViewItem *p ) \class PropertyEditor propertyeditor.h \brief PropertyEdior toplevel window - This is the toplevel window of the property editor which tqcontains a + This is the toplevel window of the property editor which contains a listview for editing properties. */ @@ -4252,7 +4252,7 @@ TQString PropertyEditor::classOfCurrentProperty() const TQMetaObject *mo = o->tqmetaObject(); while ( mo ) { TQStrList props = mo->propertyNames( FALSE ); - if ( props.tqfind( curr.latin1() ) != -1 ) + if ( props.find( curr.latin1() ) != -1 ) return mo->className(); mo = mo->tqsuperClass(); } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/qcompletionedit.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/qcompletionedit.cpp index 6c1996489..0439dcb7e 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/qcompletionedit.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/qcompletionedit.cpp @@ -187,7 +187,7 @@ bool TQCompletionEdit::eventFilter( TQObject *o, TQEvent *e ) void TQCompletionEdit::addCompletionEntry( const TQString &entry ) { - if ( compList.tqfind( entry ) == compList.end() ) { + if ( compList.find( entry ) == compList.end() ) { compList << entry; compList.sort(); } @@ -195,7 +195,7 @@ void TQCompletionEdit::addCompletionEntry( const TQString &entry ) void TQCompletionEdit::removeCompletionEntry( const TQString &entry ) { - TQStringList::Iterator it = compList.tqfind( entry ); + TQStringList::Iterator it = compList.find( entry ); if ( it != compList.end() ) compList.remove( it ); } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/replacedialog.ui.h b/experimental/tqtinterface/qt4/tools/designer/designer/replacedialog.ui.h index 74fa7cb79..08a86fc11 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/replacedialog.ui.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/replacedialog.ui.h @@ -51,7 +51,7 @@ void ReplaceDialog::doReplace() if ( !editor ) return; - if ( !editor->tqreplace( comboFind->currentText(), comboReplace->currentText(), checkCase->isChecked(), + if ( !editor->replace( comboFind->currentText(), comboReplace->currentText(), checkCase->isChecked(), checkWords->isChecked(), radioForward->isChecked(), !checkBegin->isChecked(), FALSE ) ) checkBegin->setChecked( TRUE ); else @@ -63,7 +63,7 @@ void ReplaceDialog::doReplaceAll() if ( !editor ) return; - if ( !editor->tqreplace( comboFind->currentText(), comboReplace->currentText(), checkCase->isChecked(), + if ( !editor->replace( comboFind->currentText(), comboReplace->currentText(), checkCase->isChecked(), checkWords->isChecked(), radioForward->isChecked(), !checkBegin->isChecked(), TRUE ) ) checkBegin->setChecked( TRUE ); else diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/resource.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/resource.cpp index 053c155f1..8ceca3728 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/resource.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/resource.cpp @@ -98,12 +98,12 @@ static TQString makeIndent( int indent ) static TQString entitize( const TQString &s, bool attribute = FALSE ) { TQString s2 = s; - s2 = s2.tqreplace( "&", "&" ); - s2 = s2.tqreplace( ">", ">" ); - s2 = s2.tqreplace( "<", "<" ); + s2 = s2.replace( "&", "&" ); + s2 = s2.replace( ">", ">" ); + s2 = s2.replace( "<", "<" ); if ( attribute ) { - s2 = s2.tqreplace( "\"", """ ); - s2 = s2.tqreplace( "'", "'" ); + s2 = s2.replace( "\"", """ ); + s2 = s2.replace( "'", "'" ); } return s2; } @@ -238,7 +238,7 @@ static TQString platformNeutralKeySequence(const TQKeySequence &ks) } ++i; } - // If we can't tqfind the actual translatable keyname, + // If we can't find the actual translatable keyname, // fall back on the tqunicode representation of it... // Or else characters like Key_aring may not get displayed // ( Really depends on you locale ) @@ -743,7 +743,7 @@ TQString Resource::copy() TQWidget *p = w->parentWidget(); bool save = TRUE; while ( p ) { - if ( tmp.tqfindRef( p ) != -1 ) { + if ( tmp.findRef( p ) != -1 ) { save = FALSE; break; } @@ -848,7 +848,7 @@ void Resource::saveObject( TQT_BASE_OBJECT_NAME *bobj, TQDesignerGridLayout* gri includeHints << WidgetDatabase::includeFile( classID ); } - if ( TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(formwindow) && !formwindow->widgets()->tqfind( (TQWidget*)obj ) ) + if ( TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(formwindow) && !formwindow->widgets()->find( (TQWidget*)obj ) ) return; // we don't know anything about this thing TQString attributes; @@ -1238,7 +1238,7 @@ void Resource::saveItems( TQT_BASE_OBJECT_NAME *bobj, TQTextStream &ts, int inde if ( isDataTable && !columnFields.isEmpty() ) { ts << makeIndent( indent ) << "<property name=\"field\">" << endl; indent++; - ts << makeIndent( indent ) << "<string>" << entitize( *columnFields.tqfind( l[ 0 ] ) ) << "</string>" << endl; + ts << makeIndent( indent ) << "<string>" << entitize( *columnFields.find( l[ 0 ] ) ) << "</string>" << endl; indent--; ts << makeIndent( indent ) << "</property>" << endl; } @@ -1424,9 +1424,9 @@ void Resource::saveObjectProperties( TQT_BASE_OBJECT_NAME *bobj, TQTextStream &t changed = MetaDataBase::changedProperties( w ); if ( w->isWidgetType() ) { if ( ::tqqt_cast<Spacer*>(w) ) { - if ( !changed.tqcontains( "tqsizeHint" ) ) + if ( !changed.contains( "tqsizeHint" ) ) changed << "tqsizeHint"; - if ( !changed.tqcontains( "geometry" ) ) + if ( !changed.contains( "geometry" ) ) changed << "geometry"; } else { TQToolButton *tb = ::tqqt_cast<TQToolButton*>(w); @@ -1445,9 +1445,9 @@ void Resource::saveObjectProperties( TQT_BASE_OBJECT_NAME *bobj, TQTextStream &t } if ( TQT_BASE_OBJECT(w) == TQT_BASE_OBJECT(formwindow->mainContainer()) ) { - if ( changed.tqfindIndex( "geometry" ) == -1 ) + if ( changed.findIndex( "geometry" ) == -1 ) changed << "geometry"; - if ( changed.tqfindIndex( "caption" ) == -1 ) + if ( changed.findIndex( "caption" ) == -1 ) changed << "caption"; } @@ -1459,13 +1459,13 @@ void Resource::saveObjectProperties( TQT_BASE_OBJECT_NAME *bobj, TQTextStream &t TQStrList lst = w->tqmetaObject()->propertyNames( !::tqqt_cast<Spacer*>(w) ); for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) { - if ( changed.tqfind( TQString::tqfromLatin1( it.current() ) ) == changed.end() ) + if ( changed.find( TQString::tqfromLatin1( it.current() ) ) == changed.end() ) continue; - if ( saved.tqfind( TQString::tqfromLatin1( it.current() ) ) != saved.end() ) + if ( saved.find( TQString::tqfromLatin1( it.current() ) ) != saved.end() ) continue; saved << TQString::tqfromLatin1( it.current() ); const TQMetaProperty* p = w->tqmetaObject()-> - property( w->tqmetaObject()->tqfindProperty( it.current(), TRUE ), TRUE ); + property( w->tqmetaObject()->findProperty( it.current(), TRUE ), TRUE ); if ( !p || !p->stored( w ) || ( inLayout && qstrcmp( p->name(), "geometry" ) == 0 ) ) continue; if ( ::tqqt_cast<TQLabel*>(w) && qstrcmp( p->name(), "pixmap" ) == 0 && @@ -1522,7 +1522,7 @@ void Resource::saveObjectProperties( TQT_BASE_OBJECT_NAME *bobj, TQTextStream &t void Resource::saveSetProperty( TQT_BASE_OBJECT_NAME *bobj, const TQString &name, TQVariant::Type, TQTextStream &ts, int indent ) { TQObject* w = TQT_TQOBJECT(bobj); - const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( name, TRUE ), TRUE ); + const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( name, TRUE ), TRUE ); TQStrList l( p->valueToKeys( w->property( name ).toInt() ) ); TQString v; for ( uint i = 0; i < l.count(); ++i ) { @@ -1536,7 +1536,7 @@ void Resource::saveSetProperty( TQT_BASE_OBJECT_NAME *bobj, const TQString &name void Resource::saveEnumProperty( TQT_BASE_OBJECT_NAME *bobj, const TQString &name, TQVariant::Type, TQTextStream &ts, int indent ) { TQObject* w = TQT_TQOBJECT(bobj); - const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( name, TRUE ), TRUE ); + const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( name, TRUE ), TRUE ); int value = w->property( name ).toInt(); const char* key = p->valueToKey( value ); if (key) @@ -1553,7 +1553,7 @@ void Resource::saveProperty( TQT_BASE_OBJECT_NAME *bobj, const TQString &name, c uint unum; double dob; TQString comment; - if ( w && formwindow->widgets()->tqfind( (TQWidget*)w ) || formwindow->actionList().tqfind( (TQAction*)w ) ) + if ( w && formwindow->widgets()->find( (TQWidget*)w ) || formwindow->actionList().find( (TQAction*)w ) ) comment = MetaDataBase::propertyComment( w, name ); switch ( t ) { case TQVariant::String: @@ -2182,7 +2182,7 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *tqparent, TQL void Resource::setObjectProperty( TQT_BASE_OBJECT_NAME* bobj, const TQString &prop, const TQDomElement &e ) { TQObject* obj = TQT_TQOBJECT(bobj); - const TQMetaProperty *p = obj->tqmetaObject()->property( obj->tqmetaObject()->tqfindProperty( prop, TRUE ), TRUE ); + const TQMetaProperty *p = obj->tqmetaObject()->property( obj->tqmetaObject()->findProperty( prop, TRUE ), TRUE ); if ( !::tqqt_cast<TQLayout*>(obj) ) {// no layouts in metadatabase... (RS) if ( obj->inherits( "CustomWidget" ) ) { @@ -2443,7 +2443,7 @@ static TQImage loadImageData( TQDomElement &n2 ) ba[2] = ( len & 0x0000ff00 ) >> 8; ba[3] = ( len & 0x000000ff ); TQByteArray baunzip = tqUncompress( ba, baSize ); - img.loadFromData( (const uchar*)baunzip.data(), baunzip.size(), format.left(format.tqfind('.')) ); + img.loadFromData( (const uchar*)baunzip.data(), baunzip.size(), format.left(format.find('.')) ); } else { img.loadFromData( (const uchar*)ba+lengthOffset, baSize-lengthOffset, format ); } @@ -2490,9 +2490,9 @@ void Resource::saveConnections( TQTextStream &ts, int indent ) TQValueList<MetaDataBase::Connection>::Iterator it = connections.begin(); for ( ; it != connections.end(); ++it ) { MetaDataBase::Connection conn = *it; - if ( ( knownNames.tqfindIndex( TQString( conn.sender->name() ) ) == -1 && + if ( ( knownNames.findIndex( TQString( conn.sender->name() ) ) == -1 && qstrcmp( conn.sender->name(), "this" ) != 0 ) || - ( knownNames.tqfindIndex( TQString( conn.receiver->name() ) ) == -1 && + ( knownNames.findIndex( TQString( conn.receiver->name() ) ) == -1 && qstrcmp( conn.receiver->name(), "this" ) != 0 ) ) continue; if ( formwindow->isMainContainer( (TQWidget*)(*it).receiver ) && @@ -2551,7 +2551,7 @@ void Resource::loadConnections( const TQDomElement &e ) l = 0; } if ( !conn.sender ) - conn.sender = formwindow->tqfindAction( name ); + conn.sender = formwindow->findAction( name ); } } else if ( n2.tagName() == "signal" ) { conn.signal = n2.firstChild().toText().data(); @@ -2569,7 +2569,7 @@ void Resource::loadConnections( const TQDomElement &e ) l = 0; } if ( !conn.receiver ) - conn.receiver = formwindow->tqfindAction( name ); + conn.receiver = formwindow->findAction( name ); } } else if ( n2.tagName() == "slot" ) { conn.slot = n2.firstChild().toText().data(); @@ -2620,7 +2620,7 @@ void Resource::saveCustomWidgets( TQTextStream &ts, int indent ) TQPtrList<MetaDataBase::CustomWidget> *lst = MetaDataBase::customWidgets(); for ( MetaDataBase::CustomWidget *w = lst->first(); w; w = lst->next() ) { - if ( usedCustomWidgets.tqfindIndex( w->className ) == -1 ) + if ( usedCustomWidgets.findIndex( w->className ) == -1 ) continue; ts << makeIndent( indent ) << "<customwidget>" << endl; indent++; @@ -2755,7 +2755,7 @@ void Resource::saveTabOrder( TQTextStream &ts, int indent ) indent++; for ( TQWidget *w = l.first(); w; w = l.next() ) { - if ( w->testWState( TQt::WState_ForceHide ) || knownNames.tqfindIndex( w->name() ) == -1 ) + if ( w->testWState( TQt::WState_ForceHide ) || knownNames.findIndex( w->name() ) == -1 ) continue; ts << makeIndent( indent ) << "<tabstop>" << w->name() << "</tabstop>" << endl; } @@ -3215,7 +3215,7 @@ void Resource::loadToolBars( const TQDomElement &e ) TQDomElement n2 = n.firstChild().toElement(); while ( !n2.isNull() ) { if ( n2.tagName() == "action" ) { - TQAction *a = formwindow->tqfindAction( n2.attribute( "name" ) ); + TQAction *a = formwindow->findAction( n2.attribute( "name" ) ); if ( a ) { a->addTo( tb ); tb->addAction( a ); @@ -3269,12 +3269,12 @@ void Resource::loadPopupMenu( PopupMenuEditor *p, const TQDomElement &e ) TQAction *a = 0; while ( !n.isNull() ) { if ( n.tagName() == "action" || n.tagName() == "actiongroup") { - a = formwindow->tqfindAction( n.attribute( "name" ) ); + a = formwindow->findAction( n.attribute( "name" ) ); if ( a ) p->insert( a ); } if ( n.tagName() == "item" ) { - PopupMenuEditorItem *i = p->at( p->tqfind( a ) ); + PopupMenuEditorItem *i = p->at( p->find( a ) ); if ( i ) { TQString name = n.attribute( "name" ); formwindow->unify( i, name, TRUE ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/sourcefile.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/sourcefile.cpp index 747822f31..79a73537d 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/sourcefile.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/sourcefile.cpp @@ -191,10 +191,10 @@ TQString SourceFile::createUnnamedFileName( const TQString &extension ) extensionCounter = new TQMap<TQString, int>; int count = -1; TQMap<TQString, int>::Iterator it; - if ( ( it = extensionCounter->tqfind( extension ) ) != extensionCounter->end() ) { + if ( ( it = extensionCounter->find( extension ) ) != extensionCounter->end() ) { count = *it; ++count; - extensionCounter->tqreplace( extension, count ); + extensionCounter->replace( extension, count ); } else { count = 1; extensionCounter->insert( extension, count ); @@ -279,10 +279,10 @@ void SourceFile::checkTimeStamp() bool SourceFile::checkFileName( bool allowBreak ) { - SourceFile *sf = pro->tqfindSourceFile( filename, this ); + SourceFile *sf = pro->findSourceFile( filename, this ); if ( sf ) TQMessageBox::warning( MainWindow::self, tr( "Invalid Filename" ), - tr( "The project already tqcontains a source file with \n" + tr( "The project already contains a source file with \n" "filename '%1'. Please choose a new filename." ).arg( filename ) ); while ( sf ) { LanguageInterface *iface = MetaDataBase::languageInterface( pro->language() ); @@ -296,7 +296,7 @@ bool SourceFile::checkFileName( bool allowBreak ) return FALSE; } filename = pro->makeRelative( fn ); - sf = pro->tqfindSourceFile( filename, this ); + sf = pro->findSourceFile( filename, this ); } return TRUE; } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/startdialogimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/startdialogimpl.cpp index 8d342f455..f736f78b2 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/startdialogimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/startdialogimpl.cpp @@ -59,7 +59,7 @@ void StartDialog::accept() if( !tabindex ) { if ( !templateView->currentItem() ) return; - Project *pro = MainWindow::self->tqfindProject( tr( "<No Project>" ) ); + Project *pro = MainWindow::self->findProject( tr( "<No Project>" ) ); if ( !pro ) return; MainWindow::self->setCurrentProject( pro ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/tableeditorimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/tableeditorimpl.cpp index 1247f5e9d..af20d200f 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/tableeditorimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/tableeditorimpl.cpp @@ -165,11 +165,11 @@ void TableEditor::currentColumnChanged( TQListBoxItem *i ) #ifndef TQT_NO_SQL if ( ::tqqt_cast<TQDataTable*>(editTable) ) { - TQString s = *fieldMap.tqfind( listColumns->index( i ) ); + TQString s = *fieldMap.find( listColumns->index( i ) ); if ( s.isEmpty() ) comboFields->setCurrentItem( 0 ); - else if ( comboFields->listBox()->tqfindItem( s ) ) - comboFields->setCurrentItem( comboFields->listBox()->index( comboFields->listBox()->tqfindItem( s ) ) ); + else if ( comboFields->listBox()->findItem( s ) ) + comboFields->setCurrentItem( comboFields->listBox()->index( comboFields->listBox()->findItem( s ) ) ); else comboFields->lineEdit()->setText( s ); } @@ -241,7 +241,7 @@ void TableEditor::newColumnClicked() m.insert( table->horizontalHeader()->label( i ), TRUE ); int n = table->numCols() - 1; TQString t = TQString::number( n ); - while ( m.tqfind( t ) != m.end() ) + while ( m.find( t ) != m.end() ) t = TQString::number( ++n ); table->horizontalHeader()->setLabel( table->numCols() - 1, t ); listColumns->insertItem( t ); @@ -269,7 +269,7 @@ void TableEditor::newRowClicked() m.insert( table->verticalHeader()->label( i ), TRUE ); int n = table->numRows() - 1; TQString t = TQString::number( n ); - while ( m.tqfind( t ) != m.end() ) + while ( m.find( t ) != m.end() ) t = TQString::number( ++n ); table->verticalHeader()->setLabel( table->numRows() - 1, t ); listRows->insertItem( t ); @@ -340,7 +340,7 @@ void TableEditor::applyClicked() col.text = table->horizontalHeader()->label( i ); if ( table->horizontalHeader()->iconSet( i ) ) col.pix = table->horizontalHeader()->iconSet( i )->pixmap(); - col.field = *fieldMap.tqfind( i ); + col.field = *fieldMap.find( i ); cols.append( col ); } for ( i = 0; i < table->verticalHeader()->count(); ++i ) { @@ -430,7 +430,7 @@ void TableEditor::readFromTable() table->horizontalHeader()->setLabel( i, editTable->horizontalHeader()->label( i ) ); listColumns->insertItem( editTable->horizontalHeader()->label( i ) ); } - TQString cf = *columnFields.tqfind( editTable->horizontalHeader()->label( i ) ); + TQString cf = *columnFields.find( editTable->horizontalHeader()->label( i ) ); fieldMap.insert( i, cf ); } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/variabledialogimpl.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/variabledialogimpl.cpp index e84a332cd..312fcb758 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/variabledialogimpl.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/variabledialogimpl.cpp @@ -69,7 +69,7 @@ VariableDialog::~VariableDialog() void VariableDialog::setCurrentItem( TQString text ) { - TQListViewItem *i = varView->tqfindItem( text, 0 ); + TQListViewItem *i = varView->findItem( text, 0 ); if ( i ) varView->setCurrentItem( i ); } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/widgetfactory.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/widgetfactory.cpp index 84ccb8572..edd455fb7 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/widgetfactory.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/widgetfactory.cpp @@ -103,7 +103,7 @@ #include <globaldefs.h> #include <tqobject.h> -FormWindow *tqfind_formwindow( TQWidget *w ) +FormWindow *find_formwindow( TQWidget *w ) { if ( !w ) return 0; @@ -219,7 +219,7 @@ bool TQDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e ) int index = 0; TQRect rect; for ( ; index < tabBar()->count(); index++ ) { - if ( tabBar()->tabAt( index )->rect().tqcontains( de->pos() ) ) { + if ( tabBar()->tabAt( index )->rect().contains( de->pos() ) ) { rect = tabBar()->tabAt( index )->rect(); break; } @@ -228,7 +228,7 @@ bool TQDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e ) if ( index == tabBar()->count() -1 ) { TQRect rect2 = rect; rect2.setLeft( rect2.left() + rect2.width() / 2 ); - if ( rect2.tqcontains( de->pos() ) ) + if ( rect2.contains( de->pos() ) ) index++; } @@ -256,24 +256,24 @@ bool TQDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e ) int newIndex = 0; for ( ; newIndex < tabBar()->count(); newIndex++ ) { - if ( tabBar()->tabAt( newIndex )->rect().tqcontains( de->pos() ) ) + if ( tabBar()->tabAt( newIndex )->rect().contains( de->pos() ) ) break; } if ( newIndex == tabBar()->count() -1 ) { TQRect rect2 = tabBar()->tabAt( newIndex )->rect(); rect2.setLeft( rect2.left() + rect2.width() / 2 ); - if ( rect2.tqcontains( de->pos() ) ) + if ( rect2.contains( de->pos() ) ) newIndex++; } int oldIndex = 0; for ( ; oldIndex < tabBar()->count(); oldIndex++ ) { - if ( tabBar()->tabAt( oldIndex )->rect().tqcontains( pressPoint ) ) + if ( tabBar()->tabAt( oldIndex )->rect().contains( pressPoint ) ) break; } - FormWindow *fw = tqfind_formwindow( this ); + FormWindow *fw = find_formwindow( this ); MoveTabPageCommand *cmd = new MoveTabPageCommand( tr( "Move Tab Page" ), fw, this, dragPage, dragLabel, newIndex, oldIndex ); @@ -330,7 +330,7 @@ void TQDesignerWidgetStack::nextPage() int TQDesignerWidgetStack::currentPage() const { TQDesignerWidgetStack* that = (TQDesignerWidgetStack*) this; - return that->pages.tqfind( visibleWidget() ); + return that->pages.find( visibleWidget() ); } void TQDesignerWidgetStack::setCurrentPage( int i ) @@ -385,12 +385,12 @@ int TQDesignerWidgetStack::insertPage( TQWidget *p, int i ) raiseWidget( p ); TQApplication::sendPostedEvents(); updateButtons(); - return pages.tqfind( p ); + return pages.find( p ); } int TQDesignerWidgetStack::removePage( TQWidget *p ) { - int i = pages.tqfind( p ); + int i = pages.find( p ); pages.remove( p ); removeWidget( p ); setCurrentPage( 0 ); @@ -465,7 +465,7 @@ int TQDesignerWizard::pageNum( TQWidget *p ) void TQDesignerWizard::addPage( TQWidget *p, const TQString &t ) { TQWizard::addPage( p, t ); - if ( removedPages.tqfind( p ) ) + if ( removedPages.find( p ) ) removedPages.remove( p ); } @@ -478,7 +478,7 @@ void TQDesignerWizard::removePage( TQWidget *p ) void TQDesignerWizard::insertPage( TQWidget *p, const TQString &t, int index ) { TQWizard::insertPage( p, t, index ); - if ( removedPages.tqfind( p ) ) + if ( removedPages.find( p ) ) removedPages.remove( p ); } @@ -490,7 +490,7 @@ TQMap< int, TQStringList > *changedProperties = 0; \brief Set of static functions for creating widgets, layouts and do other stuff The widget factory offers functions to create widgets, create and - delete layouts tqfind out other details - all based on the + delete layouts find out other details - all based on the WidgetDatabase's data. So the functions that use ids use the same ids as in the WidgetDatabase. */ @@ -507,9 +507,9 @@ void WidgetFactory::saveDefaultProperties( TQT_BASE_OBJECT_NAME *tqbo, int id ) var = TQVariant( TQPixmap() ); else if ( !var.isValid() && qstrcmp( "iconSet", lst.at( i ) ) == 0 ) var = TQVariant( TQIconSet() ); - propMap.tqreplace( lst.at( i ), var ); + propMap.replace( lst.at( i ), var ); } - defaultProperties->tqreplace( id, propMap ); + defaultProperties->replace( id, propMap ); } void WidgetFactory::saveChangedProperties( TQT_BASE_OBJECT_NAME *w, int id ) @@ -547,9 +547,9 @@ TQWidget *WidgetFactory::create( int id, TQWidget *tqparent, const char *name, b return 0; MetaDataBase::addEntry( w ); - if ( !defaultProperties->tqcontains( id ) ) + if ( !defaultProperties->contains( id ) ) saveDefaultProperties( w, id ); - if ( !changedProperties->tqcontains( id ) ) + if ( !changedProperties->contains( id ) ) saveChangedProperties( w, id ); return w; @@ -696,7 +696,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } else { b = new TQDesignerPushButton( tqparent, name ); } - TQWidget *w = tqfind_formwindow( b ); + TQWidget *w = find_formwindow( b ); b->setAutoDefault( w && ::tqqt_cast<TQDialog*>(((FormWindow*)w)->mainContainer()) ); return b; } else if ( className == "TQToolButton" ) { @@ -811,7 +811,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa else if ( className == "TQTabWidget" ) { TQTabWidget *tw = new TQDesignerTabWidget( tqparent, name ); if ( init ) { - FormWindow *fw = tqfind_formwindow( tqparent ); + FormWindow *fw = find_formwindow( tqparent ); TQWidget *w = fw ? new TQDesignerWidget( fw, tw, "tab" ) : new TQWidget( tw, "tab" ); tw->addTab( w, MainWindow::tr("Tab 1") ); MetaDataBase::addEntry( w ); @@ -824,7 +824,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } else if ( className == "TQWidgetStack" ) { TQDesignerWidgetStack *ws = new TQDesignerWidgetStack( tqparent, name ); if ( init ) { - FormWindow *fw = tqfind_formwindow( tqparent ); + FormWindow *fw = find_formwindow( tqparent ); TQWidget *w = fw ? new TQDesignerWidget( fw, ws, "WStackPage" ) : new TQWidget( ws, "WStackPage" ); ws->insertPage( w ); MetaDataBase::addEntry( w ); @@ -841,7 +841,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa ::tqqt_cast<TQWidgetStack*>(tqparent) || ::tqqt_cast<TQToolBox*>(tqparent) || ::tqqt_cast<TQMainWindow*>(tqparent) ) ) { - FormWindow *fw = tqfind_formwindow( tqparent ); + FormWindow *fw = find_formwindow( tqparent ); if ( fw ) { TQDesignerWidget *dw = new TQDesignerWidget( fw, tqparent, name ); MetaDataBase::addEntry( dw ); @@ -956,7 +956,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa if ( !init ) return new TQDesignerToolBox( tqparent, name ); TQToolBox *tb = new TQDesignerToolBox( tqparent, name ); - FormWindow *fw = tqfind_formwindow( tqparent ); + FormWindow *fw = find_formwindow( tqparent ); TQWidget *w = fw ? new TQDesignerWidget( fw, tb, "page1" ) : new TQWidget( tb, "page1" ); tb->addItem( w, MainWindow::tr("Page 1") ); @@ -1128,7 +1128,7 @@ TQWidget* WidgetFactory::containerOfWidget( TQWidget *w ) /*! Returns the actual designer widget of the container \a w. This is normally \a w itself, but might be a tqparent or grand tqparent of \a w (e.g. when working with a tabwidget and \a w is the container which - tqcontains and layouts childs, but the actual widget known to the + contains and layouts childs, but the actual widget known to the designer is the tabwidget which is the tqparent of \a w. So this function returns the tabwidget then.) */ @@ -1378,13 +1378,13 @@ bool WidgetFactory::hasSpecialEditor( int id, TQObject *editorWidget ) { TQString className = WidgetDatabase::className( id ); - if ( className.tqcontains( "ListBox" ) ) + if ( className.contains( "ListBox" ) ) return TRUE; - if ( className.tqcontains( "ComboBox" ) ) + if ( className.contains( "ComboBox" ) ) return TRUE; - if ( className.tqcontains( "ListView" ) ) + if ( className.contains( "ListView" ) ) return TRUE; - if ( className.tqcontains( "IconView" ) ) + if ( className.contains( "IconView" ) ) return TRUE; if ( className == "TQTextEdit" || className == "TQMultiLineEdit" ) return TRUE; @@ -1398,8 +1398,8 @@ bool WidgetFactory::hasItems( int id, TQObject *editorWidget ) { TQString className = WidgetDatabase::className( id ); - if ( className.tqcontains( "ListBox" ) || className.tqcontains( "ListView" ) || - className.tqcontains( "IconView" ) || className.tqcontains( "ComboBox" ) || + if ( className.contains( "ListBox" ) || className.contains( "ListView" ) || + className.contains( "IconView" ) || className.contains( "ComboBox" ) || ::tqqt_cast<TQTable*>(editorWidget) != 0 ) return TRUE; @@ -1410,7 +1410,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget { TQString className = WidgetDatabase::className( id ); - if ( className.tqcontains( "ListBox" ) ) { + if ( className.contains( "ListBox" ) ) { if ( !::tqqt_cast<TQListBox*>(editWidget) ) return; ListBoxEditor *e = new ListBoxEditor( tqparent, editWidget, fw ); @@ -1419,7 +1419,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget return; } - if ( className.tqcontains( "ComboBox" ) ) { + if ( className.contains( "ComboBox" ) ) { if ( !::tqqt_cast<TQComboBox*>(editWidget) ) return; TQComboBox *cb = (TQComboBox*)editWidget; @@ -1435,7 +1435,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget return; } - if ( className.tqcontains( "ListView" ) ) { + if ( className.contains( "ListView" ) ) { if ( !::tqqt_cast<TQListView*>(editWidget) ) return; TQListView *lv = (TQListView*)editWidget; @@ -1445,7 +1445,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget return; } - if ( className.tqcontains( "IconView" ) ) { + if ( className.contains( "IconView" ) ) { if ( !::tqqt_cast<TQIconView*>(editWidget) ) return; IconViewEditor *e = new IconViewEditor( tqparent, editWidget, fw ); @@ -1474,15 +1474,15 @@ bool WidgetFactory::canResetProperty( TQT_BASE_OBJECT_NAME *w, const TQString &p { if ( propName == "name" || propName == "geometry" ) return FALSE; - TQStringList l = *changedProperties->tqfind( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) ); - return l.tqfindIndex( propName ) == -1; + TQStringList l = *changedProperties->find( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) ); + return l.findIndex( propName ) == -1; } bool WidgetFactory::resetProperty( TQT_BASE_OBJECT_NAME *tqbo, const TQString &propName ) { TQObject *w = TQT_TQOBJECT(tqbo); const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()-> - tqfindProperty( propName, TRUE ), TRUE ); + findProperty( propName, TRUE ), TRUE ); if (!p ) return FALSE; return p->reset( w ); @@ -1503,14 +1503,14 @@ TQVariant WidgetFactory::defaultValue( TQT_BASE_OBJECT_NAME *w, const TQString & return TQVariant( -1 ); } - return *( *defaultProperties->tqfind( WidgetDatabase::idFromClassName( classNameOf( w ) ) ) ).tqfind( propName ); + return *( *defaultProperties->find( WidgetDatabase::idFromClassName( classNameOf( w ) ) ) ).find( propName ); } TQString WidgetFactory::defaultCurrentItem( TQT_BASE_OBJECT_NAME *tqbo, const TQString &propName ) { TQObject *w = TQT_TQOBJECT(tqbo); const TQMetaProperty *p = w->tqmetaObject()-> - property( w->tqmetaObject()->tqfindProperty( propName, TRUE ), TRUE ); + property( w->tqmetaObject()->findProperty( propName, TRUE ), TRUE ); if ( !p ) { int v = defaultValue( w, "tqalignment" ).toInt(); if ( propName == "hAlign" ) { @@ -1550,7 +1550,7 @@ TQWidget *WidgetFactory::createCustomWidget( TQWidget *tqparent, const char *nam TQVariant WidgetFactory::property( TQT_BASE_OBJECT_NAME *tqbo, const char *name ) { TQObject *w = TQT_TQOBJECT(tqbo); - int id = w->tqmetaObject()->tqfindProperty( name, TRUE ); + int id = w->tqmetaObject()->findProperty( name, TRUE ); const TQMetaProperty* p = w->tqmetaObject()->property( id, TRUE ); if ( !p || !p->isValid() ) return MetaDataBase::fakeProperty( w, name ); diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/widgetfactory.h b/experimental/tqtinterface/qt4/tools/designer/designer/widgetfactory.h index 77c057413..9a672da0d 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/widgetfactory.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/widgetfactory.h @@ -223,7 +223,7 @@ public: void addPage( TQWidget *p, const TQString & ); void removePage( TQWidget *p ); void insertPage( TQWidget *p, const TQString &t, int index ); - bool isPageRemoved( TQWidget *p ) { return (removedPages.tqfind( p ) != 0); } + bool isPageRemoved( TQWidget *p ) { return (removedPages.find( p ) != 0); } bool isModal() const { return modal; } void setModal(bool b) { modal = b; } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/workspace.cpp b/experimental/tqtinterface/qt4/tools/designer/designer/workspace.cpp index 0694112c1..d22a0867c 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/workspace.cpp +++ b/experimental/tqtinterface/qt4/tools/designer/designer/workspace.cpp @@ -381,7 +381,7 @@ void Workspace::sourceFileAdded( SourceFile* sf ) void Workspace::sourceFileRemoved( SourceFile* sf ) { - delete tqfindItem( sf ); + delete findItem( sf ); updateColors(); } @@ -395,7 +395,7 @@ void Workspace::formFileAdded( FormFile* ff ) void Workspace::formFileRemoved( FormFile* ff ) { - delete tqfindItem( ff ); + delete findItem( ff ); updateColors(); } @@ -407,7 +407,7 @@ void Workspace::objectAdded( TQObject *o ) void Workspace::objectRemoved( TQObject *o ) { - delete tqfindItem( o ); + delete findItem( o ); updateColors(); } @@ -419,7 +419,7 @@ void Workspace::update() void Workspace::update( FormFile* ff ) { - TQListViewItem* i = tqfindItem( ff ); + TQListViewItem* i = findItem( ff ); if ( i ) { i->tqrepaint(); if ( (i = i->firstChild()) ) @@ -430,7 +430,7 @@ void Workspace::update( FormFile* ff ) void Workspace::activeFormChanged( FormWindow *fw ) { - WorkspaceItem *i = tqfindItem( fw->formFile() ); + WorkspaceItem *i = findItem( fw->formFile() ); if ( i ) { setCurrentItem( i ); setSelected( i, TRUE ); @@ -448,7 +448,7 @@ void Workspace::activeEditorChanged( SourceEditor *se ) return; if ( se->formWindow() ) { - WorkspaceItem *i = tqfindItem( se->formWindow()->formFile() ); + WorkspaceItem *i = findItem( se->formWindow()->formFile() ); if ( i && i->firstChild() ) { if ( !i->isOpen() ) i->setAutoOpen( TRUE ); @@ -456,7 +456,7 @@ void Workspace::activeEditorChanged( SourceEditor *se ) setSelected( i->firstChild(), TRUE ); } } else { - WorkspaceItem *i = tqfindItem( se->sourceFile() ); + WorkspaceItem *i = findItem( se->sourceFile() ); if ( i ) { setCurrentItem( i ); setSelected( i, TRUE ); @@ -466,7 +466,7 @@ void Workspace::activeEditorChanged( SourceEditor *se ) closeAutoOpenItems(); } -WorkspaceItem *Workspace::tqfindItem( FormFile* ff) +WorkspaceItem *Workspace::findItem( FormFile* ff) { TQListViewItemIterator it( this ); for ( ; it.current(); ++it ) { @@ -476,7 +476,7 @@ WorkspaceItem *Workspace::tqfindItem( FormFile* ff) return 0; } -WorkspaceItem *Workspace::tqfindItem( SourceFile *sf ) +WorkspaceItem *Workspace::findItem( SourceFile *sf ) { TQListViewItemIterator it( this ); for ( ; it.current(); ++it ) { @@ -486,7 +486,7 @@ WorkspaceItem *Workspace::tqfindItem( SourceFile *sf ) return 0; } -WorkspaceItem *Workspace::tqfindItem( TQObject *o ) +WorkspaceItem *Workspace::findItem( TQObject *o ) { TQListViewItemIterator it( this ); for ( ; it.current(); ++it ) { @@ -683,7 +683,7 @@ void Workspace::bufferChosen( const TQString &buffer ) if ( bufferEdit ) bufferEdit->setText( "" ); - if ( MainWindow::self->projectFileNames().tqcontains( buffer ) ) { + if ( MainWindow::self->projectFileNames().contains( buffer ) ) { MainWindow::self->setCurrentProjectByFilename( buffer ); return; } diff --git a/experimental/tqtinterface/qt4/tools/designer/designer/workspace.h b/experimental/tqtinterface/qt4/tools/designer/designer/workspace.h index b889d3f46..de96e9601 100644 --- a/experimental/tqtinterface/qt4/tools/designer/designer/workspace.h +++ b/experimental/tqtinterface/qt4/tools/designer/designer/workspace.h @@ -138,9 +138,9 @@ private Q_SLOTS: void objectRemoved( TQObject * ); private: - WorkspaceItem *tqfindItem( FormFile *ff ); - WorkspaceItem *tqfindItem( SourceFile *sf ); - WorkspaceItem *tqfindItem( TQObject *o ); + WorkspaceItem *findItem( FormFile *ff ); + WorkspaceItem *findItem( SourceFile *sf ); + WorkspaceItem *findItem( TQObject *o ); void closeAutoOpenItems(); |