diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
| commit | 36c36b53a129509d56fdaa0a7c9fcbcacd0c5826 (patch) | |
| tree | 629d3942958745660e36c30b0d6139af9459c0f8 /kommander | |
| parent | 929d7ae4f69d62b8f1f6d3506adf75f017753935 (diff) | |
| download | tdewebdev-36c36b53a129509d56fdaa0a7c9fcbcacd0c5826.tar.gz tdewebdev-36c36b53a129509d56fdaa0a7c9fcbcacd0c5826.zip | |
rename the following methods:
tqfind find
tqreplace replace
tqcontains contains
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kommander')
61 files changed, 415 insertions, 415 deletions
diff --git a/kommander/Kommander-TODO.kno b/kommander/Kommander-TODO.kno index d90ec71b..824c9063 100644 --- a/kommander/Kommander-TODO.kno +++ b/kommander/Kommander-TODO.kno @@ -147,7 +147,7 @@ <ul type="disc"><li>detect incorrect path at shebang, allow user to choose correct one and remeber that pair</li> <div></div> <div></div></ul> -<p><span style="font-weight:600">If we keep the old parser.<br /><br /></span><br />Make it possible to use any language with Kommander. The idea is to replace Kommander specials with language specific code in a way that it will not break conditions and loops, like now. example:<br />#!/bin/bash<br />array="1 2 3 4 5"<br />for i in $array do<br /> @Label.setText($i)<br />done<br /><br />This does not work now. The idea is to tqreplace @Widget.method() with a language specific DCOP call.<br />If the language has DCOP bindings, use those bindings to execute the dcop call. If not, use the command line<br />DCOP application. This is slower, but always works. In the above case, Kommander would tqreplace <br />@Label.setText($i) <br />with<br />dcop kmdr-executor-PID KommanderIf setText Label $i<br /><br />Kommander will have description files for each supported language about how to execute DCOP calls.<br />If the language has DCOP bindings, this description tells the syntax of the bindings. If it doesn't have, the description gives a way how to execute external applications. This should always exists, as all languages can execute external applications.<br /><br />In KDE4, of course use DBUS instead of DCOP.<br /><br /></p> +<p><span style="font-weight:600">If we keep the old parser.<br /><br /></span><br />Make it possible to use any language with Kommander. The idea is to replace Kommander specials with language specific code in a way that it will not break conditions and loops, like now. example:<br />#!/bin/bash<br />array="1 2 3 4 5"<br />for i in $array do<br /> @Label.setText($i)<br />done<br /><br />This does not work now. The idea is to replace @Widget.method() with a language specific DCOP call.<br />If the language has DCOP bindings, use those bindings to execute the dcop call. If not, use the command line<br />DCOP application. This is slower, but always works. In the above case, Kommander would replace <br />@Label.setText($i) <br />with<br />dcop kmdr-executor-PID KommanderIf setText Label $i<br /><br />Kommander will have description files for each supported language about how to execute DCOP calls.<br />If the language has DCOP bindings, this description tells the syntax of the bindings. If it doesn't have, the description gives a way how to execute external applications. This should always exists, as all languages can execute external applications.<br /><br />In KDE4, of course use DBUS instead of DCOP.<br /><br /></p> </body></html> \NewEntry 1 Aliases diff --git a/kommander/editor/actiondnd.cpp b/kommander/editor/actiondnd.cpp index 54a5e0f9..a9437ad7 100644 --- a/kommander/editor/actiondnd.cpp +++ b/kommander/editor/actiondnd.cpp @@ -329,7 +329,7 @@ void QDesignerToolBar::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 ); } @@ -343,7 +343,7 @@ void QDesignerToolBar::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() && (*it)->inherits( "QSeparatorAction" ) ) menu.insertItem( i18n("Delete Separator" ), ID_DELETE ); else @@ -353,11 +353,11 @@ void QDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject * menu.insertItem( i18n("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( i18n("Delete Action '%1' From Toolbar '%2'" ). tqarg( a->name() ).tqarg( caption() ), @@ -367,7 +367,7 @@ void QDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject * } else if ( res == ID_SEP ) { calcIndicatorPos( mapFromGlobal( e->globalPos() ) ); TQAction *a = new QSeparatorAction( 0 ); - int index = actionList.tqfindRef( *actionMap.tqfind( insertAnchor ) ); + int index = actionList.findRef( *actionMap.find( insertAnchor ) ); if ( index != -1 && afterAnchor ) ++index; if ( !insertAnchor ) @@ -413,11 +413,11 @@ void QDesignerToolBar::buttonMousePressEvent( TQMouseEvent *e, TQObject * ) void QDesignerToolBar::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( i18n("Delete Action '%1' From Toolbar '%2'" ). tqarg( a->name() ).tqarg( caption() ), @@ -434,13 +434,13 @@ void QDesignerToolBar::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( i18n("Delete Action '%1' From Toolbar '%2'" ). tqarg( a->name() ).tqarg( caption() ), @@ -457,7 +457,7 @@ void QDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o ) drag->setEncodedData( TQCString( s.latin1() ) ); drag->setPixmap( a->iconSet().pixmap() ); if ( a->inherits( "QDesignerAction" ) ) { - if ( formWindow->widgets()->tqfind( ( (QDesignerAction*)a )->widget() ) ) + if ( formWindow->widgets()->find( ( (QDesignerAction*)a )->widget() ) ) formWindow->selectWidget( TQT_TQOBJECT(( (QDesignerAction*)a )->widget()), false ); } if ( !drag->drag() ) { @@ -519,7 +519,7 @@ void QDesignerToolBar::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 ) @@ -534,7 +534,7 @@ void QDesignerToolBar::dropEvent( TQDropEvent *e ) a = (QDesignerActionGroup*)s.toLong(); } - if ( actionList.tqfindRef( a ) != -1 ) { + if ( actionList.findRef( a ) != -1 ) { TQMessageBox::warning( MainWindow::self, i18n("Insert/Move Action" ), i18n("Action '%1' has already been added to this toolbar.\n" "An Action may only occur once in a given toolbar." ). @@ -665,7 +665,7 @@ void QDesignerToolBar::doInsertWidget( const TQPoint &p ) installEventFilters( w ); MainWindow::self->formWindow()->insertWidget( w, true ); QDesignerAction *a = new QDesignerAction( w, tqparent() ); - int index = actionList.tqfindRef( *actionMap.tqfind( insertAnchor ) ); + int index = actionList.findRef( *actionMap.find( insertAnchor ) ); if ( index != -1 && afterAnchor ) ++index; if ( !insertAnchor ) @@ -738,7 +738,7 @@ void QDesignerMenuBar::contextMenuEvent( TQContextMenuEvent *e ) menu.insertItem( i18n("Rename Item..." ), 2 ); int res = menu.exec( e->globalPos() ); if ( res == 1 ) { - TQMenuItem *item = tqfindItem( idAt( itm ) ); + TQMenuItem *item = findItem( idAt( itm ) ); RemoveMenuCommand *cmd = new RemoveMenuCommand( i18n("Delete Menu '%1'" ).tqarg( item->text() ), formWindow, (TQMainWindow*)parentWidget(), this, @@ -789,8 +789,8 @@ void QDesignerMenuBar::mouseMoveEvent( TQMouseEvent *e ) int itm = itemAtPos( dragStartPos ); if ( itm == -1 ) return; - TQPopupMenu *popup = tqfindItem( idAt( itm ) )->popup(); - TQString txt = tqfindItem( idAt( itm ) )->text(); + TQPopupMenu *popup = findItem( idAt( itm ) )->popup(); + TQString txt = findItem( idAt( itm ) )->text(); removeItemAt( itm ); TQStoredDrag *drag = new TQStoredDrag( "application/x-designer-menuitem", this ); @@ -874,8 +874,8 @@ void QDesignerMenuBar::dropEvent( TQDropEvent *e ) return; e->accept(); TQString s( e->tqencodedData( "application/x-designer-menuitem" ) ); - TQString s1 = s.left( s.tqfind( "/" ) ); - TQString s2 = s.mid( s.tqfind( "/" ) + 1 ); + TQString s1 = s.left( s.find( "/" ) ); + TQString s2 = s.mid( s.find( "/" ) + 1 ); TQPopupMenu *popup = (TQPopupMenu*)s1.toLong(); // #### huha, that is evil TQString txt = s2; insertItem( txt, popup, -1, insertAt ); @@ -948,14 +948,14 @@ void QDesignerMenuBar::setItemName( const TQCString &s ) { if ( itemNum < 0 || itemNum >= (int)count() ) return; - tqfindItem( idAt( itemNum ) )->popup()->setName( s ); + findItem( idAt( itemNum ) )->popup()->setName( s ); } TQCString QDesignerMenuBar::itemName() const { if ( itemNum < 0 || itemNum >= (int)count() ) return ""; - return tqfindItem( idAt( itemNum ) )->popup()->name(); + return findItem( idAt( itemNum ) )->popup()->name(); } @@ -1155,7 +1155,7 @@ void QDesignerPopupMenu::dropEvent( TQDropEvent *e ) } } - if ( actionList.tqfindRef( a ) != -1 ) { + if ( actionList.findRef( a ) != -1 ) { TQMessageBox::warning( MainWindow::self, i18n("Insert/Move Action" ), i18n("Action '%1' has already been added to this menu.\n" "An Action may only occur once in a given menu." ). diff --git a/kommander/editor/actiondnd.h b/kommander/editor/actiondnd.h index 66a87c5b..c041f9db 100644 --- a/kommander/editor/actiondnd.h +++ b/kommander/editor/actiondnd.h @@ -44,7 +44,7 @@ public: : TQActionGroup( !tqparent || tqparent->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? tqparent : 0 ), wid( 0 ), idx( -1 ) {} 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: diff --git a/kommander/editor/asciivalidator.cpp b/kommander/editor/asciivalidator.cpp index 947b3ec1..33381e0b 100644 --- a/kommander/editor/asciivalidator.cpp +++ b/kommander/editor/asciivalidator.cpp @@ -67,7 +67,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/kommander/editor/assoctexteditorimpl.cpp b/kommander/editor/assoctexteditorimpl.cpp index 76bf67f6..106e0ab0 100644 --- a/kommander/editor/assoctexteditorimpl.cpp +++ b/kommander/editor/assoctexteditorimpl.cpp @@ -113,7 +113,7 @@ AssocTextEditor::AssocTextEditor(TQWidget *a_widget, FormWindow* a_form, if (a) a->plug(popup); popup->insertSeparator(); - a = view->actionCollection()->action("edit_tqfind"); + a = view->actionCollection()->action("edit_find"); if (a) a->plug(popup); a = view->actionCollection()->action("edit_find_next"); @@ -122,7 +122,7 @@ AssocTextEditor::AssocTextEditor(TQWidget *a_widget, FormWindow* a_form, a = view->actionCollection()->action("edit_find_prev"); if (a) a->plug(popup); - a = view->actionCollection()->action("edit_tqreplace"); + a = view->actionCollection()->action("edit_replace"); if (a) a->plug(popup); popup->insertSeparator(); @@ -246,7 +246,7 @@ void AssocTextEditor::setWidget(TQWidget *a_widget) undoIf->clearUndo(); - if (openedWidgets.tqcontains(m_widget)) + if (openedWidgets.contains(m_widget)) { if (readOnlyAction && !readOnly) readOnlyAction->activate(); @@ -317,7 +317,7 @@ TQStringList AssocTextEditor::buildWidgetList() TQMetaObject *metaObj = it.current()->tqmetaObject(); if(metaObj) { - int id = metaObj->tqfindProperty("KommanderWidget", true); + int id = metaObj->findProperty("KommanderWidget", true); const TQMetaProperty *metaProp = metaObj->property(id, true); if(metaProp && metaProp->isValid()) pExists = true; @@ -363,7 +363,7 @@ void AssocTextEditor::stateChanged(int a_index) { if (hlIf->hlModeSectionName(i) == "Scripts") highlightPopup->insertItem(hlIf->hlModeName(i), i); - if (hlIf->hlModeName(i).tqcontains(hlType, false) > 0) + if (hlIf->hlModeName(i).contains(hlType, false) > 0) { hlIf->setHlMode(i); highlightPopup->setItemChecked(i, true); @@ -464,7 +464,7 @@ TQString AssocTextEditor::widgetToString(TQWidget* widget, bool formatted) TQWidget* AssocTextEditor::widgetFromString(const TQString& name) { TQString realname = name; - int i = realname.tqfind(' '); + int i = realname.find(' '); if (i != -1) realname.truncate(i); return m_widgetList[realname]; diff --git a/kommander/editor/choosewidgetimpl.cpp b/kommander/editor/choosewidgetimpl.cpp index 4fe816e2..e440a8fd 100644 --- a/kommander/editor/choosewidgetimpl.cpp +++ b/kommander/editor/choosewidgetimpl.cpp @@ -93,7 +93,7 @@ TQString ChooseWidget::selection() void ChooseWidget::textChanged(const TQString& text) { - TQListViewItem* item = widgetView->tqfindItem(text, 0, TQt::BeginsWith); + TQListViewItem* item = widgetView->findItem(text, 0, TQt::BeginsWith); if (item) { widgetView->setCurrentItem(item); widgetView->ensureItemVisible(item); @@ -106,7 +106,7 @@ bool ChooseWidget::isKommanderWidget(TQObject* w) TQMetaObject *metaObj = w->tqmetaObject(); if (metaObj) { - int id = metaObj->tqfindProperty("KommanderWidget", true); + int id = metaObj->findProperty("KommanderWidget", true); const TQMetaProperty *metaProp = metaObj->property(id, true); if (metaProp && metaProp->isValid()) pExists = true; diff --git a/kommander/editor/command.cpp b/kommander/editor/command.cpp index df4568fb..40a1c088 100644 --- a/kommander/editor/command.cpp +++ b/kommander/editor/command.cpp @@ -396,7 +396,7 @@ void DeleteCommand::unexecute() w->setName( s ); formWindow()->widgets()->insert( w, w ); formWindow()->selectWidget( TQT_TQOBJECT(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( TQT_TQOBJECT(formWindow()), (*it).sender, @@ -461,7 +461,7 @@ bool SetPropertyCommand::canMerge( Command *c ) { SetPropertyCommand *cmd = (SetPropertyCommand*)c; 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; @@ -532,16 +532,16 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString ¤ 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 ); @@ -1522,7 +1522,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 ) { diff --git a/kommander/editor/connectioneditorimpl.cpp b/kommander/editor/connectioneditorimpl.cpp index e6a48fde..62110d73 100644 --- a/kommander/editor/connectioneditorimpl.cpp +++ b/kommander/editor/connectioneditorimpl.cpp @@ -109,7 +109,7 @@ ConnectionEditor::ConnectionEditor(TQWidget* tqparent, TQObject* sndr, TQObject* !it.current()->inherits("Spacer") && qstrcmp(it.current()->name(), "central widget") && !m_formWindow->isMainContainer(TQT_TQOBJECT(it.current())) && - !lst.tqcontains(it.current()->name())) + !lst.contains(it.current()->name())) lst << it.current()->name(); } @@ -213,7 +213,7 @@ void ConnectionEditor::disconnectClicked() if (!p_item) return; - TQMap <TQListViewItem*, MetaDataBase::Connection>::Iterator it = m_connections.tqfind(p_item); + TQMap <TQListViewItem*, MetaDataBase::Connection>::Iterator it = m_connections.find(p_item); if (it != m_connections.end()) m_connections.remove(it); delete p_item; @@ -277,7 +277,7 @@ void ConnectionEditor::senderChanged(const TQString& s) TQStrList p_sigs = m_sender->tqmetaObject()->signalNames(true); signalBox->clear(); for (TQStrListIterator it(p_sigs); it.current(); ++it) - if (!isSignalIgnored(it.current()) && !signalBox->tqfindItem(it.current(), TQt::ExactMatch)) + if (!isSignalIgnored(it.current()) && !signalBox->findItem(it.current(), TQt::ExactMatch)) signalBox->insertItem(it.current()); if (TQT_BASE_OBJECT(m_sender) == TQT_BASE_OBJECT(m_formWindow->mainContainer())) signalBox->insertStringList(MetaDataBase::signalList(TQT_TQOBJECT(m_formWindow))); @@ -298,7 +298,7 @@ void ConnectionEditor::receiverChanged(const TQString& s) for (int i = 0; i < n; ++i) { const TQMetaData* md = m_receiver->tqmetaObject()->slot(i, true); - if (!isSlotIgnored(md) && !slotBox->tqfindItem(md->tqt_mo_ci_name, TQt::ExactMatch)) + if (!isSlotIgnored(md) && !slotBox->findItem(md->tqt_mo_ci_name, TQt::ExactMatch)) slotBox->insertItem(md->tqt_mo_ci_name); } slotBox->sort(); diff --git a/kommander/editor/formfile.cpp b/kommander/editor/formfile.cpp index 90b9ba18..ff2e4c06 100644 --- a/kommander/editor/formfile.cpp +++ b/kommander/editor/formfile.cpp @@ -80,7 +80,7 @@ void FormFile::setFileName(const TQString &fn) return; if (fn.isEmpty()) { fileNameTemp = true; - if (filename.tqfind("unnamed")) + if (filename.find("unnamed")) filename = createUnnamedFileName(); return; } @@ -264,7 +264,7 @@ TQString FormFile::formName() const line = ts.readLine(); if (!className.isEmpty()) { - int end = line.tqfind("</class>"); + int end = line.find("</class>"); if (end == -1) className += line; else @@ -275,9 +275,9 @@ TQString FormFile::formName() const continue; } int start; - if ((start = line.tqfind("<class>")) != -1) + if ((start = line.find("<class>")) != -1) { - int end = line.tqfind("</class>"); + int end = line.find("</class>"); if (end == -1) className = line.mid(start + 7); else diff --git a/kommander/editor/formwindow.cpp b/kommander/editor/formwindow.cpp index 590d1c47..55c1b142 100644 --- a/kommander/editor/formwindow.cpp +++ b/kommander/editor/formwindow.cpp @@ -81,7 +81,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); @@ -210,7 +210,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()); @@ -362,10 +362,10 @@ void FormWindow::insertWidget() TQObject *o = it.current(); ++it; if (o->isWidgetType() && ((TQWidget*)o)->isVisibleTo(this) && - insertedWidgets.tqfind((TQWidget*)o) && TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(w)) + insertedWidgets.find((TQWidget*)o) && TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(w)) { TQRect r2(((TQWidget*)o)->pos(), ((TQWidget*)o)->size()); - if (r.tqcontains(r2)) + if (r.contains(r2)) lst.append((TQWidget*)o); } } @@ -461,7 +461,7 @@ void FormWindow::handleContextMenu(TQContextMenuEvent *e, TQWidget *w) // 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))) + WidgetFactory::NoLayout || !insertedWidgets.find(w))) w = w->parentWidget(); if (mainContainer()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING) && ((TQMainWindow*)mainContainer())->centralWidget() == realWidget) @@ -530,7 +530,7 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w) { if (!o->isWidgetType()) continue; - if (insertedWidgets.tqfind((TQWidget*)o)) + if (insertedWidgets.find((TQWidget*)o)) selectWidget(TQT_TQOBJECT(o), false); } setPropertyShowingBlocked(false); @@ -552,7 +552,7 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w) // 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))) + || !insertedWidgets.find(w))) w = w->parentWidget(); if (e->button() == Qt::LeftButton) @@ -609,7 +609,7 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *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); @@ -665,7 +665,7 @@ void FormWindow::handleMouseDblClick(TQMouseEvent *, TQWidget *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); @@ -696,7 +696,7 @@ void FormWindow::handleMouseMove(TQMouseEvent *e, TQWidget *w) { // we are prepated for a move // 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::NoLayout || !insertedWidgets.find(w))) w = w->parentWidget(); // calc correct position TQPoint pos = w->mapFromGlobal(e->globalPos()); @@ -793,7 +793,7 @@ void FormWindow::handleMouseMove(TQMouseEvent *e, TQWidget *w) wid = tqApp->widgetAt(e->globalPos(), true); if (wid) wid = designerWidget(TQT_TQOBJECT(wid)); - if (wid && (isMainContainer(TQT_TQOBJECT(wid)) || insertedWidgets.tqfind(wid)) && wid->isVisibleTo(this)) + if (wid && (isMainContainer(TQT_TQOBJECT(wid)) || insertedWidgets.find(wid)) && wid->isVisibleTo(this)) newReceiver = wid; if (newReceiver && (newReceiver->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING) || newReceiver->inherits("Spacer"))) @@ -801,7 +801,7 @@ void FormWindow::handleMouseMove(TQMouseEvent *e, TQWidget *w) drawRecRect = TQT_BASE_OBJECT(newReceiver) != TQT_BASE_OBJECT(connectReceiver); currentConnectPos = mapFromGlobal(e->globalPos()); if (newReceiver && (isMainContainer(TQT_TQOBJECT(newReceiver)) - || insertedWidgets.tqfind(newReceiver)) && !isCentralWidget(TQT_TQOBJECT(newReceiver))) + || insertedWidgets.find(newReceiver)) && !isCentralWidget(TQT_TQOBJECT(newReceiver))) connectReceiver = connectableObject(TQT_TQOBJECT(newReceiver), TQT_TQOBJECT(connectReceiver)); mainWindow()->statusBar()->message(i18n("Connect '%1' to '%2'").tqarg(connectSender->name()). arg(connectReceiver->name())); @@ -832,7 +832,7 @@ void FormWindow::handleMouseRelease(TQMouseEvent * e, TQWidget * w) { // we moved the widget sizePreviewLabel->hide(); - if (moving.isEmpty() || w->pos() == *moving.tqfind((ulong) w)) + if (moving.isEmpty() || w->pos() == *moving.find((ulong) w)) break; // restore targetContainer @@ -1064,7 +1064,7 @@ void FormWindow::handleKeyPress(TQKeyEvent * e, TQWidget * w) TQObjectList *l = queryList(TQWIDGET_OBJECT_NAME_STRING); if (!l) return; - if (l->tqfind(TQT_TQOBJECT(w)) != -1) + if (l->find(TQT_TQOBJECT(w)) != -1) e->accept(); delete l; } @@ -1118,7 +1118,7 @@ void FormWindow::selectWidget(TQObject * o, bool select) repaintSelection((TQWidget *) opw); if (!isPropertyShowingBlocked()) emitShowProperties(propertyWidget); - WidgetSelection *s = usedSelections.tqfind(w); + WidgetSelection *s = usedSelections.find(w); if (s) { s->show(); @@ -1143,7 +1143,7 @@ void FormWindow::selectWidget(TQObject * o, bool select) emitSelectionChanged(); } else { - WidgetSelection *s = usedSelections.tqfind(w); + WidgetSelection *s = usedSelections.find(w); if (s) s->setWidget(0); TQObject *opw = propertyWidget; @@ -1168,7 +1168,7 @@ TQPoint FormWindow::grid() const void FormWindow::updateSelection(TQWidget * w) { - WidgetSelection *s = usedSelections.tqfind(w); + WidgetSelection *s = usedSelections.find(w); if (!w->isVisibleTo(this)) selectWidget(TQT_TQOBJECT(w), false); else if (s) @@ -1177,14 +1177,14 @@ void FormWindow::updateSelection(TQWidget * w) void FormWindow::raiseSelection(TQWidget * 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(); } @@ -1291,7 +1291,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(TQT_TQOBJECT(o)); } } @@ -1303,7 +1303,7 @@ void FormWindow::selectWidgets() bool FormWindow::isWidgetSelected(TQObject * w) { if (w->isWidgetType()) - return usedSelections.tqfind((TQWidget *) w) != 0; + return usedSelections.find((TQWidget *) w) != 0; return false; // #### do stuff for TQObjects } @@ -1350,7 +1350,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; @@ -1363,7 +1363,7 @@ void FormWindow::updateChildSelections(TQWidget * w) { for (TQObject * o = l->first(); o; o = l->next()) { - if (o->isWidgetType() && insertedWidgets.tqfind((TQWidget *) o)) + if (o->isWidgetType() && insertedWidgets.find((TQWidget *) o)) updateSelection((TQWidget *) o); } delete l; @@ -1385,7 +1385,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); @@ -1500,7 +1500,7 @@ void FormWindow::invalidCheckedSelections() void FormWindow::checkPreviewGeometry(TQRect & r) { - if (TQT_TQRECT_OBJECT(rect()).tqcontains(r)) + if (TQT_TQRECT_OBJECT(rect()).contains(r)) return; if (r.left() < rect().left()) r.moveTopLeft(TQPoint(0, r.top())); @@ -1699,7 +1699,7 @@ void FormWindow::showOrderIndicators() { OrderIndicator *ind = new OrderIndicator(order++, w, this); orderIndicators.append(ind); - if (stackedWidgets.tqfindRef(w) == -1) + if (stackedWidgets.findRef(w) == -1) stackedWidgets.append(w); } } @@ -1788,14 +1788,14 @@ void FormWindow::lowerWidgets() static 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; @@ -1820,11 +1820,11 @@ void FormWindow::checkAccels() { 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) find_accel(w->property("text").toString(), accels, w); if (title) @@ -1969,7 +1969,7 @@ void FormWindow::layoutHorizontalContainer(TQWidget * w) for (TQObject * o = l.first(); o; o = l.next()) { if (o->isWidgetType() && - ((TQWidget *) o)->isVisibleTo(this) && insertedWidgets.tqfind((TQWidget *) o)) + ((TQWidget *) o)->isVisibleTo(this) && insertedWidgets.find((TQWidget *) o)) widgets.append((TQWidget *) o); } LayoutHorizontalCommand *cmd = new LayoutHorizontalCommand(i18n("Lay Out ChildrenQt::Horizontally"), @@ -1990,7 +1990,7 @@ void FormWindow::layoutVerticalContainer(TQWidget * w) for (TQObject * o = l.first(); o; o = l.next()) { if (o->isWidgetType() && - ((TQWidget *) o)->isVisibleTo(this) && insertedWidgets.tqfind((TQWidget *) o)) + ((TQWidget *) o)->isVisibleTo(this) && insertedWidgets.find((TQWidget *) o)) widgets.append((TQWidget *) o); } LayoutVerticalCommand *cmd = new LayoutVerticalCommand(i18n("Lay Out ChildrenQt::Vertically"), @@ -2014,7 +2014,7 @@ void FormWindow::layoutGridContainer(TQWidget * w) for (TQObject * o = l.first(); o; o = l.next()) { if (o->isWidgetType() && - ((TQWidget *) o)->isVisibleTo(this) && insertedWidgets.tqfind((TQWidget *) o)) + ((TQWidget *) o)->isVisibleTo(this) && insertedWidgets.find((TQWidget *) o)) widgets.append((TQWidget *) o); } LayoutGridCommand *cmd = new LayoutGridCommand(i18n("Lay Out Children in a Grid"), @@ -2067,7 +2067,7 @@ BreakLayoutCommand *FormWindow::breakLayoutCommand(TQWidget * w) { if (o->isWidgetType() && !mainWindow()->isAToolBarChild(TQT_TQOBJECT(o)) && - ((TQWidget *) o)->isVisibleTo(this) && insertedWidgets.tqfind((TQWidget *) o)) + ((TQWidget *) o)->isVisibleTo(this) && insertedWidgets.find((TQWidget *) o)) widgets.append((TQWidget *) o); } return new BreakLayoutCommand(i18n("Break Layout"), this, @@ -2102,7 +2102,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; @@ -2116,7 +2116,7 @@ bool FormWindow::allowMove(TQWidget *w) w = w->parentWidget(); while (w) { - if ((isMainContainer(TQT_TQOBJECT(w)) || insertedWidgets.tqfind(w)) && WidgetFactory::layoutType(w) == + if ((isMainContainer(TQT_TQOBJECT(w)) || insertedWidgets.find(w)) && WidgetFactory::layoutType(w) == WidgetFactory::NoLayout) return true; w = w->parentWidget(); @@ -2197,7 +2197,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(red); @@ -2366,7 +2366,7 @@ bool FormWindow::isDatabaseWidgetUsed() const for (; it.current(); ++it) { TQString c(it.current()->className()); - if (dbClasses.tqcontains(c) > 0) + if (dbClasses.contains(c) > 0) return true; } #endif @@ -2444,7 +2444,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); @@ -2457,7 +2457,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(TQT_TQOBJECT(it.current())))) && it.current() != mainContainer()) @@ -2467,7 +2467,7 @@ TQWidget *FormWindow::containerAt(const TQPoint &pos, TQWidget *notParentOf) 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(); } @@ -2475,8 +2475,8 @@ TQWidget *FormWindow::containerAt(const TQPoint &pos, TQWidget *notParentOf) int wd = widgetDepth(it.current()); if (wd == depth && container && (it.current()->parentWidget()-> - childrenListObject()).tqfind(TQT_TQOBJECT(it.current())) > - (container->parentWidget()->childrenListObject()).tqfind(TQT_TQOBJECT(container))) + childrenListObject()).find(TQT_TQOBJECT(it.current())) > + (container->parentWidget()->childrenListObject()).find(TQT_TQOBJECT(container))) wd++; if (wd > depth && !isChildOf(it.current(), notParentOf)) { depth = wd; diff --git a/kommander/editor/functionsimpl.cpp b/kommander/editor/functionsimpl.cpp index 991377f8..9520360f 100644 --- a/kommander/editor/functionsimpl.cpp +++ b/kommander/editor/functionsimpl.cpp @@ -133,7 +133,7 @@ TQString FunctionsDialog::currentFunctionText() return TQString("%1%2%3").tqarg(prefix).tqarg(functionListBox->currentText()).tqarg(params()); else if (groupComboBox->currentItem() == m_DCOP || groupComboBox->currentItem() == m_Slots) return TQString("%1%2.%3%4").tqarg(prefix).tqarg(widgetComboBox->currentText().section(' ', 0, 0)) - .tqarg(functionListBox->currentText().left(functionListBox->currentText().tqfind('('))).tqarg(params()); + .tqarg(functionListBox->currentText().left(functionListBox->currentText().find('('))).tqarg(params()); else return TQString("%1%2%3%4").tqarg(prefix).tqarg(function) .tqarg(functionListBox->currentText()).tqarg(params()); @@ -152,10 +152,10 @@ void FunctionsDialog::groupChanged(int index) { TQString slot = pFunctions[i]; TQString slotArgStr = slot.section(TQRegExp("\\(|\\)"), 1); - if (slotArgStr.isEmpty() || m_acceptedSlots.tqcontains(slotArgStr)) + if (slotArgStr.isEmpty() || m_acceptedSlots.contains(slotArgStr)) { TQString name = slot.remove("()"); - if (!m_slotList.tqcontains(name)) + if (!m_slotList.contains(name)) { m_slotList[name] = slot; functionListBox->insertItem(name); @@ -238,7 +238,7 @@ void FunctionsDialog::copyText() insertedText->getCursorPosition(¶, &i); // int cursorPos = insertedText->cursorPosition(); insertedText->insert(text); - insertedText->setCursorPosition(para, i + text.tqfind('(') + 1); + insertedText->setCursorPosition(para, i + text.find('(') + 1); } void FunctionsDialog::showParameters() diff --git a/kommander/editor/hierarchyview.cpp b/kommander/editor/hierarchyview.cpp index 318a17a2..ee5c6642 100644 --- a/kommander/editor/hierarchyview.cpp +++ b/kommander/editor/hierarchyview.cpp @@ -254,7 +254,7 @@ void HierarchyList::objectClicked( TQListViewItem *i ) return; } - if ( !formWindow->widgets()->tqfind( w ) ) { + if ( !formWindow->widgets()->find( w ) ) { if ( w->tqparent() && w->tqparent()->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) && w->tqparent()->tqparent() && ( w->tqparent()->tqparent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) || @@ -427,7 +427,7 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *tqparent ) for ( ; it.current(); --it ) { if ( !it.current()->isWidgetType() || ( (TQWidget*)it.current() )->isHidden() ) continue; - if ( !formWindow->widgets()->tqfind( (TQWidget*)it.current() ) ) { + if ( !formWindow->widgets()->find( (TQWidget*)it.current() ) ) { if ( it.current()->tqparent() && ( it.current()->tqparent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) || it.current()->tqparent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) && @@ -491,7 +491,7 @@ void HierarchyList::showRMBMenu( TQListViewItem *i, const TQPoint & p ) return; if ( w != formWindow && - !formWindow->widgets()->tqfind( w ) ) + !formWindow->widgets()->find( w ) ) return; if ( w->isVisibleTo( formWindow ) ) { diff --git a/kommander/editor/kommander-new.xml b/kommander/editor/kommander-new.xml index 7fe9f7dc..5c170485 100644 --- a/kommander/editor/kommander-new.xml +++ b/kommander/editor/kommander-new.xml @@ -140,14 +140,14 @@ <list name="kmdrstring"> <item>str_length</item> - <item>str_tqcontains</item> - <item>str_tqfind</item> - <item>str_tqfindRev</item> + <item>str_contains</item> + <item>str_find</item> + <item>str_findRev</item> <item>str_left</item> <item>str_right</item> <item>str_mid</item> <item>str_remove</item> - <item>str_tqreplace</item> + <item>str_replace</item> <item>str_upper</item> <item>str_lower</item> <item>str_compare</item> diff --git a/kommander/editor/kommander.xml b/kommander/editor/kommander.xml index b88bd6d7..a2f926fa 100644 --- a/kommander/editor/kommander.xml +++ b/kommander/editor/kommander.xml @@ -104,14 +104,14 @@ <list name="kmdrstring"> <item>length</item> - <item>tqcontains</item> - <item>tqfind</item> - <item>tqfindRev</item> + <item>contains</item> + <item>find</item> + <item>findRev</item> <item>left</item> <item>right</item> <item>mid</item> <item>remove</item> - <item>tqreplace</item> + <item>replace</item> <item>upper</item> <item>lower</item> <item>compare</item> @@ -418,7 +418,7 @@ <item> expr </item> <item> fbset </item> <item> file </item> - <item> tqfind </item> + <item> find </item> <item> flex </item> <item> flex++ </item> <item> fmt </item> diff --git a/kommander/editor/layout.cpp b/kommander/editor/layout.cpp index 8d7d3d50..152548b2 100644 --- a/kommander/editor/layout.cpp +++ b/kommander/editor/layout.cpp @@ -189,7 +189,7 @@ void Layout::finishLayout( bool needMove, TQLayout *tqlayout ) formWindow->insertWidget( layoutBase ); formWindow->selectWidget( TQT_TQOBJECT(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 ); } @@ -242,7 +242,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() ) ); } diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp index 8a30d812..8290fbda 100644 --- a/kommander/editor/mainwindow.cpp +++ b/kommander/editor/mainwindow.cpp @@ -108,7 +108,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; @@ -837,7 +837,7 @@ FormWindow *MainWindow::formWindow() if (qworkspace->activeWindow()->inherits("FormWindow")) fw = (FormWindow*)qworkspace->activeWindow(); else if (lastActiveFormWindow && - qworkspace->windowList().tqfind(lastActiveFormWindow) != -1) + qworkspace->windowList().find(lastActiveFormWindow) != -1) fw = lastActiveFormWindow; return fw; } @@ -1012,18 +1012,18 @@ void MainWindow::popupWidgetMenu(const TQPoint &gp, FormWindow * /*fw*/, TQWidge void MainWindow::setupRMBProperties(TQValueList<int> &ids, TQMap<TQString, int> &props, TQWidget *w) { - const TQMetaProperty* text = w->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_OBJECT_NAME_STRING) != 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_OBJECT_NAME_STRING) != 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_OBJECT_NAME_STRING) != 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_OBJECT_NAME_STRING) != 0) pixmap = 0; @@ -1627,8 +1627,8 @@ bool MainWindow::openEditor(TQWidget* w, FormWindow*) 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; TQString text; @@ -1706,9 +1706,9 @@ TQString MainWindow::documentationPath() const TQString result = docPath; if (docPath[0] == '$') { - int fs = docPath.tqfind('/'); + int fs = docPath.find('/'); if (fs == -1) - fs = docPath.tqfind('\\'); + fs = docPath.find('\\'); if (fs > -1) { result = docPath.mid(1, fs-1); @@ -1777,9 +1777,9 @@ void MainWindow::showDialogHelp() else if (w->inherits("DatabaseConnectionBase")) link += "dialog-edit-database-connections"; else if (w->inherits("FindDialog")) - link += "dialog-tqfind-text"; + link += "dialog-find-text"; else if (w->inherits("ReplaceDialog")) - link += "dialog-tqreplace-text"; + link += "dialog-replace-text"; else if (w->inherits("GotoLineDialog")) link += "dialog-go-to-line"; else if (w->inherits("ConnectionEditorBase")) diff --git a/kommander/editor/mainwindowactions.cpp b/kommander/editor/mainwindowactions.cpp index 9ed36f59..356b4804 100644 --- a/kommander/editor/mainwindowactions.cpp +++ b/kommander/editor/mainwindowactions.cpp @@ -393,7 +393,7 @@ void MainWindow::setupToolActions() if (!fi->isFile() || fi->extension() != "kmdr") continue; TQString name = fi->baseName(); - name = name.tqreplace("_", " "); + name = name.replace("_", " "); editMenu->insertItem(name, TQT_TQOBJECT(this), TQT_SLOT(editExternalTool(int)), 0, m_editorTools.count()); m_editorTools.append(fi->filePath()); } diff --git a/kommander/editor/metadatabase.cpp b/kommander/editor/metadatabase.cpp index 72f63de5..acf64cb9 100644 --- a/kommander/editor/metadatabase.cpp +++ b/kommander/editor/metadatabase.cpp @@ -110,7 +110,7 @@ void MetaDataBase::addEntry( TQObject *o ) if ( !o ) return; setupDataBase(); - if ( db->tqfind( o ) ) + if ( db->find( o ) ) return; MetaDataBaseRecord *r = new MetaDataBaseRecord; r->object = o; @@ -129,7 +129,7 @@ void MetaDataBase::removeEntry( TQObject *o ) void MetaDataBase::setPropertyChanged( TQObject *o, const TQString &property, bool changed ) { 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, o->name(), o->className() ); @@ -137,10 +137,10 @@ void MetaDataBase::setPropertyChanged( TQObject *o, const TQString &property, bo } 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 ); } @@ -166,20 +166,20 @@ void MetaDataBase::setPropertyChanged( TQObject *o, const TQString &property, bo bool MetaDataBase::isPropertyChanged( TQObject *o, const TQString &property ) { 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, o->name(), o->className() ); return false; } - return r->changedProperties.tqfindIndex( property ) != -1; + return r->changedProperties.findIndex( property ) != -1; } TQStringList MetaDataBase::changedProperties( TQObject *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, o->name(), o->className() ); @@ -193,7 +193,7 @@ TQStringList MetaDataBase::changedProperties( TQObject *o ) void MetaDataBase::setPropertyComment( TQObject *o, const TQString &property, const TQString &comment ) { 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, o->name(), o->className() ); @@ -206,20 +206,20 @@ void MetaDataBase::setPropertyComment( TQObject *o, const TQString &property, co TQString MetaDataBase::propertyComment( TQObject *o, const TQString &property ) { 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, o->name(), o->className() ); return TQString(); } - return *r->propertyComments.tqfind( property ); + return *r->propertyComments.find( property ); } void MetaDataBase::setFakeProperty( TQObject *o, const TQString &property, const TQVariant& value ) { 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, o->name(), o->className() ); @@ -231,13 +231,13 @@ void MetaDataBase::setFakeProperty( TQObject *o, const TQString &property, const TQVariant MetaDataBase::fakeProperty( TQObject * o, const TQString &property) { 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, o->name(), 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 ); @@ -247,7 +247,7 @@ TQVariant MetaDataBase::fakeProperty( TQObject * o, const TQString &property) TQMap<TQString,TQVariant>* MetaDataBase::fakeProperties( TQObject* 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, o->name(), o->className() ); @@ -261,7 +261,7 @@ void MetaDataBase::setSpacing( TQObject *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, o->name(), o->className() ); @@ -282,7 +282,7 @@ int MetaDataBase::spacing( TQObject *o ) setupDataBase(); if ( o->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) o = TQT_TQOBJECT(( (TQMainWindow*)o )->centralWidget()); - MetaDataBaseRecord *r = db->tqfind( TQT_TQOBJECT(o) ); + MetaDataBaseRecord *r = db->find( TQT_TQOBJECT(o) ); if ( !r || !o->isWidgetType() ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -297,7 +297,7 @@ void MetaDataBase::setMargin( TQObject *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, o->name(), o->className() ); @@ -320,7 +320,7 @@ int MetaDataBase::margin( TQObject *o ) setupDataBase(); if ( o->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) o = TQT_TQOBJECT(( (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, o->name(), o->className() ); @@ -334,7 +334,7 @@ void MetaDataBase::addConnection( TQObject *o, TQObject *sender, const TQCString 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, o->name(), o->className() ); @@ -352,7 +352,7 @@ void MetaDataBase::removeConnection( TQObject *o, TQObject *sender, const TQCStr 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, o->name(), o->className() ); @@ -374,7 +374,7 @@ void MetaDataBase::removeConnection( TQObject *o, TQObject *sender, const TQCStr TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQObject *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, o->name(), o->className() ); @@ -387,7 +387,7 @@ TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQObject *o, TQ TQObject *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, o->name(), o->className() ); @@ -409,7 +409,7 @@ TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQObject *o, TQ TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQObject *o, TQObject *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, o->name(), o->className() ); @@ -430,7 +430,7 @@ TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQObject *o, TQ void MetaDataBase::doConnections( TQObject *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, o->name(), o->className() ); @@ -473,8 +473,8 @@ void MetaDataBase::doConnections( TQObject *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 ); @@ -485,7 +485,7 @@ void MetaDataBase::addSlot( TQObject *o, const TQCString &slot, const TQString& const TQString &access, const TQString &language, 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, o->name(), o->className() ); @@ -498,7 +498,7 @@ void MetaDataBase::addSlot( TQObject *o, const TQCString &slot, const TQString& s.access = access; s.language = language; s.returnType = returnType; - TQValueList<MetaDataBase::Slot>::Iterator it = r->slotList.tqfind( s ); + TQValueList<MetaDataBase::Slot>::Iterator it = r->slotList.find( s ); if ( it != r->slotList.end() ) r->slotList.remove( it ); r->slotList.append( s ); @@ -510,7 +510,7 @@ void MetaDataBase::addSlot( TQObject *o, const TQCString &slot, const TQString& void MetaDataBase::setSlotList( TQObject *o, const TQValueList<Slot> &slotList ) { 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, o->name(), o->className() ); @@ -523,7 +523,7 @@ void MetaDataBase::removeSlot( TQObject *o, const TQCString &slot, const TQStrin const TQString &access, const TQString &language, 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, o->name(), o->className() ); @@ -546,7 +546,7 @@ void MetaDataBase::removeSlot( TQObject *o, const TQCString &slot, const TQStrin void MetaDataBase::removeSlot( TQObject *o, const TQString &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, o->name(), o->className() ); @@ -565,7 +565,7 @@ void MetaDataBase::removeSlot( TQObject *o, const TQString &slot ) TQValueList<MetaDataBase::Slot> MetaDataBase::slotList( TQObject *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, o->name(), o->className() ); @@ -578,7 +578,7 @@ TQValueList<MetaDataBase::Slot> MetaDataBase::slotList( TQObject *o ) bool MetaDataBase::isSlotUsed( TQObject *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, o->name(), o->className() ); @@ -596,7 +596,7 @@ bool MetaDataBase::isSlotUsed( TQObject *o, const TQCString &slot ) void MetaDataBase::changeSlot( TQObject *o, const TQCString &slot, const TQCString &newName ) { 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, o->name(), o->className() ); @@ -617,7 +617,7 @@ void MetaDataBase::changeSlotAttributes( TQObject *o, const TQCString &slot, const TQString &language, 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, o->name(), o->className() ); @@ -639,7 +639,7 @@ void MetaDataBase::changeSlotAttributes( TQObject *o, const TQCString &slot, bool MetaDataBase::hasSlot( TQObject *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, o->name(), o->className() ); @@ -648,13 +648,13 @@ bool MetaDataBase::hasSlot( TQObject *o, const TQCString &slot, bool onlyCustom if ( !onlyCustom ) { TQStrList slotList = o->tqmetaObject()->slotNames( true ); - if ( slotList.tqfind( slot ) != -1 ) + if ( slotList.find( slot ) != -1 ) return true; if ( o->inherits( "FormWindow" ) ) { o = TQT_TQOBJECT(( (FormWindow*)o )->mainContainer()); slotList = o->tqmetaObject()->slotNames( true ); - if ( slotList.tqfind( slot ) != -1 ) + if ( slotList.find( slot ) != -1 ) return true; } @@ -682,7 +682,7 @@ bool MetaDataBase::hasSlot( TQObject *o, const TQCString &slot, bool onlyCustom TQString MetaDataBase::languageOfSlot( TQObject *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, o->name(), o->className() ); @@ -779,7 +779,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() ); @@ -792,7 +792,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() ); @@ -805,7 +805,7 @@ TQWidgetList MetaDataBase::tabOrder( TQWidget *w ) void MetaDataBase::setIncludes( TQObject *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, o->name(), o->className() ); @@ -818,7 +818,7 @@ void MetaDataBase::setIncludes( TQObject *o, const TQValueList<Include> &incs ) TQValueList<MetaDataBase::Include> MetaDataBase::includes( TQObject *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, o->name(), o->className() ); @@ -831,7 +831,7 @@ TQValueList<MetaDataBase::Include> MetaDataBase::includes( TQObject *o ) void MetaDataBase::setForwards( TQObject *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, o->name(), o->className() ); @@ -844,7 +844,7 @@ void MetaDataBase::setForwards( TQObject *o, const TQStringList &fwds ) TQStringList MetaDataBase::forwards( TQObject *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, o->name(), o->className() ); @@ -857,7 +857,7 @@ TQStringList MetaDataBase::forwards( TQObject *o ) void MetaDataBase::setSignalList( TQObject *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, o->name(), o->className() ); @@ -871,10 +871,10 @@ void MetaDataBase::setSignalList( TQObject *o, const TQStringList &sigs ) 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; @@ -890,7 +890,7 @@ void MetaDataBase::setSignalList( TQObject *o, const TQStringList &sigs ) TQStringList MetaDataBase::signalList( TQObject *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, o->name(), o->className() ); @@ -903,7 +903,7 @@ TQStringList MetaDataBase::signalList( TQObject *o ) void MetaDataBase::setMetaInfo( TQObject *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, o->name(), o->className() ); @@ -916,7 +916,7 @@ void MetaDataBase::setMetaInfo( TQObject *o, MetaInfo mi ) MetaDataBase::MetaInfo MetaDataBase::metaInfo( TQObject *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, o->name(), o->className() ); @@ -958,7 +958,7 @@ MetaDataBase::CustomWidget::CustomWidget( const CustomWidget &w ) void MetaDataBase::setCursor( TQWidget *w, const TQCursor &c ) { 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() ); @@ -971,7 +971,7 @@ void MetaDataBase::setCursor( TQWidget *w, const TQCursor &c ) TQCursor MetaDataBase::cursor( TQWidget *w ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)w ); + MetaDataBaseRecord *r = db->find( (void*)w ); if ( !r ) { w->unsetCursor(); return w->cursor(); @@ -1007,7 +1007,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 ( normalizeSlot( *it ) == normalizeSlot( signal ) ) @@ -1019,7 +1019,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( normalizeSlot( slot ) ) != -1 ) + if ( slotList.find( normalizeSlot( slot ) ) != -1 ) return true; for ( TQValueList<MetaDataBase::Slot>::ConstIterator it = lstSlots.begin(); it != lstSlots.end(); ++it ) { @@ -1032,7 +1032,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 ) { @@ -1047,7 +1047,7 @@ void MetaDataBase::setPixmapArgument( TQObject *o, int pixmap, const TQString &a 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, o->name(), o->className() ); @@ -1063,14 +1063,14 @@ TQString MetaDataBase::pixmapArgument( TQObject *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, o->name(), o->className() ); return TQString(); } - return *r->pixmapArguments.tqfind( pixmap ); + return *r->pixmapArguments.find( pixmap ); } void MetaDataBase::clearPixmapArguments( TQObject *o ) @@ -1078,7 +1078,7 @@ void MetaDataBase::clearPixmapArguments( TQObject *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, o->name(), o->className() ); @@ -1094,7 +1094,7 @@ void MetaDataBase::setPixmapKey( TQObject *o, int pixmap, const TQString &arg ) 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, o->name(), o->className() ); @@ -1110,14 +1110,14 @@ TQString MetaDataBase::pixmapKey( TQObject *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, o->name(), o->className() ); return TQString(); } - return *r->pixmapKeys.tqfind( pixmap ); + return *r->pixmapKeys.find( pixmap ); } void MetaDataBase::clearPixmapKeys( TQObject *o ) @@ -1125,7 +1125,7 @@ void MetaDataBase::clearPixmapKeys( TQObject *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, o->name(), o->className() ); @@ -1142,7 +1142,7 @@ void MetaDataBase::setColumnFields( TQObject *o, const TQMap<TQString, TQString> 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, o->name(), o->className() ); @@ -1157,7 +1157,7 @@ TQMap<TQString, TQString> MetaDataBase::columnFields( TQObject *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, o->name(), o->className() ); @@ -1187,7 +1187,7 @@ void MetaDataBase::setExportMacro( TQObject *o, const TQString ¯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, o->name(), o->className() ); @@ -1202,7 +1202,7 @@ TQString MetaDataBase::exportMacro( TQObject *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, o->name(), o->className() ); @@ -1214,6 +1214,6 @@ TQString MetaDataBase::exportMacro( TQObject *o ) bool MetaDataBase::hasObject( TQObject *o ) { - return !!db->tqfind( o ); + return !!db->find( o ); } diff --git a/kommander/editor/newformimpl.cpp b/kommander/editor/newformimpl.cpp index e1ef5662..37e47e6a 100644 --- a/kommander/editor/newformimpl.cpp +++ b/kommander/editor/newformimpl.cpp @@ -100,12 +100,12 @@ static void unifyFormName(FormWindow *fw, TQWorkspace *qworkspace) if (w != fw) 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); fw->setCaption(n); @@ -173,7 +173,7 @@ NewForm::NewForm(TQWidget *tqparent, const TQString &templatePath) if (!fi->isFile() || fi->extension() != "kmdr") continue; TQString name = fi->baseName(); - name = name.tqreplace("_", " "); + name = name.replace("_", " "); CustomFormItem *ci = new CustomFormItem(templateView, name); allItems.append(ci); ci->setDragEnabled(false); diff --git a/kommander/editor/parser.cpp b/kommander/editor/parser.cpp index cbd3946a..fa264796 100644 --- a/kommander/editor/parser.cpp +++ b/kommander/editor/parser.cpp @@ -32,9 +32,9 @@ public: TQString Parser::cleanArgs( const TQString &func ) { TQString slot( func ); - int begin = slot.tqfind( "(" ) + 1; + int begin = slot.find( "(" ) + 1; TQString args = slot.mid( begin ); - args = args.left( args.tqfind( ")" ) ); + args = args.left( args.find( ")" ) ); TQStringList lst = TQStringList::split( ',', args ); TQString res = slot.left( begin ); for ( TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { @@ -42,13 +42,13 @@ TQString Parser::cleanArgs( const TQString &func ) res += ","; TQString arg = *it; int pos = 0; - if ( ( pos = arg.tqfind( "&" ) ) != -1 ) { + if ( ( pos = arg.find( "&" ) ) != -1 ) { arg = arg.left( pos + 1 ); - } else if ( ( pos = arg.tqfind( "*" ) ) != -1 ) { + } else if ( ( pos = arg.find( "*" ) ) != -1 ) { arg = arg.left( pos + 1 ); } else { arg = arg.simplifyWhiteSpace(); - if ( ( pos = arg.tqfind( ':' ) ) != -1 ) + if ( ( pos = arg.find( ':' ) ) != -1 ) arg = arg.left( pos ).simplifyWhiteSpace() + ":" + arg.mid( pos + 1 ).simplifyWhiteSpace(); TQStringList l = TQStringList::split( ' ', arg ); if ( l.count() == 2 ) { diff --git a/kommander/editor/pics/images.h b/kommander/editor/pics/images.h index 4b14e2ac..57997088 100644 --- a/kommander/editor/pics/images.h +++ b/kommander/editor/pics/images.h @@ -10957,7 +10957,7 @@ static struct Embed { static const TQByteArray& qembed_findData( const char* name ) { static TQDict<TQByteArray> dict; - TQByteArray* ba = dict.tqfind( name ); + TQByteArray* ba = dict.find( name ); if ( !ba ) { for ( int i = 0; embed_vec[i].data; i++ ) { if ( strcmp(embed_vec[i].name, name) == 0 ) { diff --git a/kommander/editor/pixmapchooser.cpp b/kommander/editor/pixmapchooser.cpp index f0e8ab3a..c94bf065 100644 --- a/kommander/editor/pixmapchooser.cpp +++ b/kommander/editor/pixmapchooser.cpp @@ -1016,7 +1016,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/kommander/editor/propertyeditor.cpp b/kommander/editor/propertyeditor.cpp index d579c3b6..9d72fe02 100644 --- a/kommander/editor/propertyeditor.cpp +++ b/kommander/editor/propertyeditor.cpp @@ -548,7 +548,7 @@ void PropertyItem::setText( int col, const TQString &t ) { TQString txt( t ); if ( col == 1 ) - txt = txt.tqreplace( TQRegExp( "\n" ), " " ); + txt = txt.replace( TQRegExp( "\n" ), " " ); TQListViewItem::setText( col, txt ); } @@ -2534,10 +2534,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 ( editor->widget()->inherits( "QDesignerToolBar" ) || editor->widget()->inherits( "QDesignerMenuBar" ) ) { if ( qstrcmp( p->name(), "minimumHeight" ) == 0 ) @@ -2693,7 +2693,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(); } @@ -2750,7 +2750,7 @@ void PropertyList::setupProperties() MetaDataBase::CustomWidget *cw = ( (CustomWidget*)w )->customWidget(); if ( 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, type_to_variant( (*it).type ) ); @@ -3048,9 +3048,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" ); } @@ -3062,12 +3062,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 &= ~AlignVertical_Mask; TQStrList l = p->valueToKeys( align ); clearAlignList( l ); @@ -3075,7 +3075,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 &= ~AlignHorizontal_Mask; ( (PropertyListItem*)i )->setCurrentItem( p->valueToKeys( align ).last() ); } else if ( i->name() == "wordwrap" ) { @@ -3235,7 +3235,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(); @@ -3363,7 +3363,7 @@ void EventList::contentsMouseDoubleClickEvent( TQMouseEvent *e ) if ( MetaDataBase::hasEvents( "C++" ) ) { #endif 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; @@ -3403,7 +3403,7 @@ void EventList::showRMBMenu( TQListViewItem *i, const TQPoint &pos ) if ( MetaDataBase::hasEvents( "C++" ) ) { #endif 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; @@ -3491,7 +3491,7 @@ void EventList::renamed( TQListViewItem *i ) "C++", "void" ); #endif editor->formWindow()->mainWindow()-> - editFunction( i->text( 0 ).left( i->text( 0 ).tqfind( "(" ) ), + editFunction( i->text( 0 ).left( i->text( 0 ).find( "(" ) ), #ifndef KOMMANDER editor->formWindow()->project()->language(), true ); #else @@ -3677,7 +3677,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/kommander/editor/qcompletionedit.cpp b/kommander/editor/qcompletionedit.cpp index 61d0407e..537216c5 100644 --- a/kommander/editor/qcompletionedit.cpp +++ b/kommander/editor/qcompletionedit.cpp @@ -154,7 +154,7 @@ bool QCompletionEdit::eventFilter( TQObject *o, TQEvent *e ) void QCompletionEdit::addCompletionEntry( const TQString &entry ) { - if ( compList.tqfind( entry ) == compList.end() ) { + if ( compList.find( entry ) == compList.end() ) { compList << entry; compList.sort(); } @@ -162,7 +162,7 @@ void QCompletionEdit::addCompletionEntry( const TQString &entry ) void QCompletionEdit::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/kommander/editor/resource.cpp b/kommander/editor/resource.cpp index f55c963c..c2ece48b 100644 --- a/kommander/editor/resource.cpp +++ b/kommander/editor/resource.cpp @@ -84,12 +84,12 @@ static TQString makeIndent( int indent ) static TQString entitize( const TQString &s, bool attribute = false ) { TQString s2 = s; - s2 = s2.tqreplace( TQRegExp( "&" ), "&" ); - s2 = s2.tqreplace( TQRegExp( ">" ), ">" ); - s2 = s2.tqreplace( TQRegExp( "<" ), "<" ); + s2 = s2.replace( TQRegExp( "&" ), "&" ); + s2 = s2.replace( TQRegExp( ">" ), ">" ); + s2 = s2.replace( TQRegExp( "<" ), "<" ); if ( attribute ) { - s2 = s2.tqreplace( TQRegExp( "\"" ), """ ); - s2 = s2.tqreplace( TQRegExp( "'" ), "'" ); + s2 = s2.replace( TQRegExp( "\"" ), """ ); + s2 = s2.replace( TQRegExp( "'" ), "'" ); } return s2; } @@ -181,7 +181,7 @@ bool Resource::load( FormFile *ff, TQIODevice* dev ) TQString content = stream.read(); if (content.startsWith("#!")) { - content = content.mid(content.tqfind('\n')); + content = content.mid(content.find('\n')); } if ( !doc.setContent( content) ) { // qDebug( TQString("Parse error: ") + errMsg + TQString(" in line %d"), errLine ); @@ -476,7 +476,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; } @@ -580,7 +580,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea const char* className = WidgetFactory::classNameOf( obj ); if ( obj->isA( "CustomWidget" ) ) usedCustomWidgets << TQString( className ); - 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; @@ -801,7 +801,7 @@ void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent ) if ( table->inherits( TQDATATABLE_OBJECT_NAME_STRING ) && !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; } @@ -984,9 +984,9 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent ) changed = MetaDataBase::changedProperties( w ); if ( w->isWidgetType() ) { if ( w->inherits( "Spacer" ) ) { - if ( !changed.tqcontains( "tqsizeHint" ) ) + if ( !changed.contains( "tqsizeHint" ) ) changed << "tqsizeHint"; - if ( !changed.tqcontains( "geometry" ) ) + if ( !changed.contains( "geometry" ) ) changed << "geometry"; } } else if ( w->inherits( TQLAYOUT_OBJECT_NAME_STRING ) ) { // #### should be cleaner (RS) @@ -994,9 +994,9 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent ) } 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"; } @@ -1008,13 +1008,13 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent ) TQStrList lst = w->tqmetaObject()->propertyNames( !w->inherits( "Spacer" ) ); 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 ( w->inherits( TQLABEL_OBJECT_NAME_STRING ) && qstrcmp( p->name(), "pixmap" ) == 0 && @@ -1066,7 +1066,7 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent ) void Resource::saveSetProperty( TQObject *w, const TQString &name, TQVariant::Type, TQTextStream &ts, int indent ) { - 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 ) { @@ -1079,7 +1079,7 @@ void Resource::saveSetProperty( TQObject *w, const TQString &name, TQVariant::Ty void Resource::saveEnumProperty( TQObject *w, const TQString &name, TQVariant::Type, TQTextStream &ts, int indent ) { - const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( name, true ), true ); + const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( name, true ), true ); ts << makeIndent( indent ) << "<enum>" << p->valueToKey( w->property( name ).toInt() ) << "</enum>" << endl; } @@ -1090,7 +1090,7 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant int num, unum; double dob; TQString comment; - if ( w && formwindow->widgets()->tqfind( (TQWidget*)w ) ) + if ( w && formwindow->widgets()->find( (TQWidget*)w ) ) comment = MetaDataBase::propertyComment( w, name ); switch ( t ) { case TQVariant::String: @@ -1644,7 +1644,7 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *tqparent, TQL */ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQDomElement &e ) { - 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 ( !obj->inherits( TQLAYOUT_OBJECT_NAME_STRING ) ) {// no layouts in metadatabase... (RS) if ( obj->inherits( "CustomWidget" ) ) { @@ -1920,9 +1920,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( TQT_TQOBJECT((*it).receiver) ) && @@ -2080,7 +2080,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++; @@ -2214,7 +2214,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; } @@ -2547,9 +2547,9 @@ void Resource::saveMenuBar( TQMainWindow *mw, TQTextStream &ts, int indent ) for ( int i = 0; i < (int)mw->menuBar()->count(); ++i ) { ts << makeIndent( indent ) << "<item text=\"" << entitize( mw->menuBar()->text( mw->menuBar()->idAt( i ) ) ) - << "\" name=\"" << entitize( mw->menuBar()->tqfindItem( mw->menuBar()->idAt( i ) )->popup()->name() ) << "\">" << endl; + << "\" name=\"" << entitize( mw->menuBar()->findItem( mw->menuBar()->idAt( i ) )->popup()->name() ) << "\">" << endl; indent++; - TQMenuItem *m = mw->menuBar()->tqfindItem( mw->menuBar()->idAt( i ) ); + TQMenuItem *m = mw->menuBar()->findItem( mw->menuBar()->idAt( i ) ); if ( !m ) continue; TQPtrList<TQAction> actionList = ( (QDesignerPopupMenu*)m->popup() )->insertedActions(); @@ -2668,7 +2668,7 @@ void Resource::saveFormCode() for ( ; sit != slotList.end(); ++sit ) { MetaDataBase::Slot slot = *sit; TQMap<TQString, TQString>::Iterator it = - functionBodies.tqfind( MetaDataBase::normalizeSlot( (*sit).slot ) ); + functionBodies.find( MetaDataBase::normalizeSlot( (*sit).slot ) ); LanguageInterface::Function func; func.name = slot.slot; func.body = *it; @@ -2700,14 +2700,14 @@ void Resource::saveFormCode() static TQString make_function_pretty( const TQString &s ) { TQString res = s; - if ( res.tqfind( ")" ) - res.tqfind( "(" ) == 1 ) + if ( res.find( ")" ) - res.find( "(" ) == 1 ) return res; - res.tqreplace( TQRegExp( "[(]" ), "( " ); - res.tqreplace( TQRegExp( "[)]" ), " )" ); - res.tqreplace( TQRegExp( "&" ), " &" ); - res.tqreplace( TQRegExp( "[*]" ), " *" ); - res.tqreplace( TQRegExp( "," ), ", " ); - res.tqreplace( TQRegExp( ":" ), " : " ); + res.replace( TQRegExp( "[(]" ), "( " ); + res.replace( TQRegExp( "[)]" ), " )" ); + res.replace( TQRegExp( "&" ), " &" ); + res.replace( TQRegExp( "[*]" ), " *" ); + res.replace( TQRegExp( "," ), ", " ); + res.replace( TQRegExp( ":" ), " : " ); res = res.simplifyWhiteSpace(); return res; } @@ -2747,7 +2747,7 @@ void Resource::loadFunctions( const TQDomElement &e ) ( (*it).returnType.isEmpty() ? TQString( "void" ) : (*it).returnType ) ); - TQMap<TQString, TQString>::Iterator bit = bodies.tqfind( MetaDataBase::normalizeSlot( (*it).slot ) ); + TQMap<TQString, TQString>::Iterator bit = bodies.find( MetaDataBase::normalizeSlot( (*it).slot ) ); if ( bit != bodies.end() ) code += "\n" + *bit + "\n\n"; else diff --git a/kommander/editor/tableeditorimpl.cpp b/kommander/editor/tableeditorimpl.cpp index e5b39340..777fd874 100644 --- a/kommander/editor/tableeditorimpl.cpp +++ b/kommander/editor/tableeditorimpl.cpp @@ -132,11 +132,11 @@ void TableEditor::currentColumnChanged( TQListBoxItem *i ) #ifndef TQT_NO_TABLE if ( editTable->inherits( TQDATATABLE_OBJECT_NAME_STRING ) ) { - 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 ); } @@ -208,7 +208,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 ); @@ -233,7 +233,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 ); @@ -302,7 +302,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 ) { @@ -392,7 +392,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/kommander/editor/widgetdatabase.cpp b/kommander/editor/widgetdatabase.cpp index 63f5c2d8..37c9672d 100644 --- a/kommander/editor/widgetdatabase.cpp +++ b/kommander/editor/widgetdatabase.cpp @@ -867,14 +867,14 @@ int WidgetDatabase::idFromClassName( const TQString &name ) setupDataBase( -1 ); if ( name.isEmpty() ) return 0; - int *i = className2Id->tqfind( name ); + int *i = className2Id->find( name ); if ( i ) return *i; if ( name == "FormWindow" ) return idFromClassName( TQLAYOUTWIDGET_OBJECT_NAME_STRING ); #ifdef UIC setupDataBase( -2 ); - i = className2Id->tqfind( name ); + i = className2Id->find( name ); if ( i ) return *i; #endif @@ -883,7 +883,7 @@ int WidgetDatabase::idFromClassName( const TQString &name ) bool WidgetDatabase::hasWidget( const TQString &name ) { - return className2Id->tqfind( name ) != 0; + return className2Id->find( name ) != 0; } WidgetDatabaseRecord *WidgetDatabase::at( int index ) @@ -916,7 +916,7 @@ void WidgetDatabase::append( WidgetDatabaseRecord *r ) TQString WidgetDatabase::widgetGroup( const TQString &g ) { - if ( wGroups->tqfind( g ) == -1 ) + if ( wGroups->find( g ) == -1 ) wGroups->append( g ); return g; } @@ -957,7 +957,7 @@ int WidgetDatabase::numWidgetGroups() bool WidgetDatabase::isGroupVisible( const TQString &g ) { setupDataBase( -1 ); - return invisibleGroups->tqfind( g ) == -1; + return invisibleGroups->find( g ) == -1; } int WidgetDatabase::addCustomWidget( WidgetDatabaseRecord *r ) diff --git a/kommander/editor/widgetfactory.cpp b/kommander/editor/widgetfactory.cpp index 43011071..f33d27b3 100644 --- a/kommander/editor/widgetfactory.cpp +++ b/kommander/editor/widgetfactory.cpp @@ -232,7 +232,7 @@ bool QDesignerTabWidget::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; } @@ -241,7 +241,7 @@ bool QDesignerTabWidget::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++; } @@ -269,20 +269,20 @@ bool QDesignerTabWidget::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; } @@ -365,7 +365,7 @@ int QDesignerWizard::pageNum( TQWidget *p ) void QDesignerWizard::addPage( TQWidget *p, const TQString &t ) { TQWizard::addPage( p, t ); - if ( removedPages.tqfind( p ) ) + if ( removedPages.find( p ) ) removedPages.remove( p ); } @@ -378,7 +378,7 @@ void QDesignerWizard::removePage( TQWidget *p ) void QDesignerWizard::insertPage( TQWidget *p, const TQString &t, int index ) { TQWizard::insertPage( p, t, index ); - if ( removedPages.tqfind( p ) ) + if ( removedPages.find( p ) ) removedPages.remove( p ); } @@ -406,9 +406,9 @@ void WidgetFactory::saveDefaultProperties( TQWidget *w, 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 ); } static void saveChangedProperties( TQWidget *w, int id ) @@ -512,7 +512,7 @@ bool EditorTabWidget::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; } @@ -521,7 +521,7 @@ bool EditorTabWidget::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++; } @@ -549,20 +549,20 @@ bool EditorTabWidget::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; } @@ -660,9 +660,9 @@ TQWidget *WidgetFactory::create( int id, TQWidget *tqparent, const char *name, b return 0; MetaDataBase::addEntry(TQT_TQOBJECT(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; @@ -1530,7 +1530,7 @@ bool WidgetFactory::hasSpecialEditor( int id ) return true; if (className == TQTEXTEDIT_OBJECT_NAME_STRING || className == TQMULTILINEEDIT_OBJECT_NAME_STRING) return true; - if (className.tqcontains("Table")) + if (className.contains("Table")) return true; return false; @@ -1544,7 +1544,7 @@ bool WidgetFactory::hasItems( int id ) return true; if (className.mid(1) == "ListBox" || className.mid(1) == "ListView" || className.mid(1) == "IconView" || className.mid(1) == "ComboBox" || - className.tqcontains("Table")) + className.contains("Table")) return true; return false; @@ -1648,7 +1648,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget return; } #ifndef TQT_NO_TABLE - if (className.tqcontains("Table")) + if (className.contains("Table")) { TableEditor *e = new TableEditor(tqparent, editWidget, fw); e->exec(); @@ -1662,14 +1662,14 @@ bool WidgetFactory::canResetProperty( TQObject *w, const TQString &propName ) { 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( TQObject *w, const TQString &propName ) { const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()-> - tqfindProperty( propName, true ), true ); + findProperty( propName, true ), true ); if (!p ) return false; return p->reset( w ); @@ -1696,13 +1696,13 @@ TQVariant WidgetFactory::defaultValue( TQObject *w, const TQString &propName ) return TQVariant( MainWindow::self->formWindow()->layoutDefaultSpacing() ); } - return *( *defaultProperties->tqfind( WidgetDatabase::idFromClassName( classNameOf( w ) ) ) ).tqfind( propName ); + return *( *defaultProperties->find( WidgetDatabase::idFromClassName( classNameOf( w ) ) ) ).find( propName ); } TQString WidgetFactory::defaultCurrentItem( TQObject *w, const TQString &propName ) { 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" ) { diff --git a/kommander/editor/widgetfactory.h b/kommander/editor/widgetfactory.h index 9ad4ce6c..178c3172 100644 --- a/kommander/editor/widgetfactory.h +++ b/kommander/editor/widgetfactory.h @@ -208,7 +208,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); } void reject() {} diff --git a/kommander/editor/workspace.cpp b/kommander/editor/workspace.cpp index ecccce3d..971add70 100644 --- a/kommander/editor/workspace.cpp +++ b/kommander/editor/workspace.cpp @@ -755,7 +755,7 @@ void Workspace::bufferChosen( const TQString &buffer ) bufferEdit->setText( "" ); #ifndef KOMMANDER - if ( MainWindow::self->projectFileNames().tqcontains( buffer ) ) { + if ( MainWindow::self->projectFileNames().contains( buffer ) ) { MainWindow::self->setCurrentProjectByFilename( buffer ); return; } diff --git a/kommander/examples/current/editor-poc.kmdr b/kommander/examples/current/editor-poc.kmdr index 4c678ca8..d5b19e99 100755 --- a/kommander/examples/current/editor-poc.kmdr +++ b/kommander/examples/current/editor-poc.kmdr @@ -73,7 +73,7 @@ _file["dirty"] = true</string> </property> <property name="associations" stdset="0"> <stringlist> - <string>@Input.text("Kommander Edit", "Text to tqfind", "")</string> + <string>@Input.text("Kommander Edit", "Text to find", "")</string> </stringlist> </property> </widget> @@ -179,16 +179,16 @@ while chrs < maxc do //debug("link test = "+str_mid(a, ch, 2)+" pos="+ch) if str_mid(a, ch, 2) == "<a" then inlink = true - lb = str_toint(str_tqfind(a, "\"", ch)+1) - le = str_toint(str_tqfind(a, "\"", lb)) + lb = str_toint(str_find(a, "\"", ch)+1) + le = str_toint(str_find(a, "\"", lb)) linkscript = str_mid(a, lb, le-lb) //debug("link data - "+lb+" "+le+" "+linkscript) elseif str_mid(a, ch, 3) == "<p>" then lc = lc + 1 cc = 0 endif - ck1 = str_toint(str_tqfind(a, ">", ch))+1 - ck2 = str_tqfind(a, "<", ck1) + ck1 = str_toint(str_find(a, ">", ch))+1 + ck2 = str_find(a, "<", ck1) if ck1 == -1 || ck2 == -1 then break endif diff --git a/kommander/examples/current/passvariables.kmdr b/kommander/examples/current/passvariables.kmdr index c8162eda..5a0406ae 100644 --- a/kommander/examples/current/passvariables.kmdr +++ b/kommander/examples/current/passvariables.kmdr @@ -124,7 +124,7 @@ LineEdit6.setText(ret)</string> <stringlist> <string>// test for PHP pt = exec("php --version") -if str_tqcontains(pt, "Zend") then +if str_contains(pt, "Zend") then php = ScriptObjectPHP.execute(LineEdit7.text,LineEdit1.text,LineEdit2.text) LineEdit4.setText(php) else diff --git a/kommander/examples/old/tidy.kmdr b/kommander/examples/old/tidy.kmdr index 26e05120..53623c53 100644 --- a/kommander/examples/old/tidy.kmdr +++ b/kommander/examples/old/tidy.kmdr @@ -1012,7 +1012,7 @@ escape-cdata Boolean y/n, yes/no, t/f, true/false, 1/0 language String - ncr Boolean y/n, yes/no, t/f, true/false, 1/0 output-bom AutoBool auto, y/n, yes/no, t/f, true/false, 1/0 -tqreplace-color Boolean y/n, yes/no, t/f, true/false, 1/0 +replace-color Boolean y/n, yes/no, t/f, true/false, 1/0 css-prefix Name CSS1 selector new-inline-tags Tag names tagX, tagY, ... new-blocklevel-tags Tag names tagX, tagY, ... diff --git a/kommander/examples/tutorial/calc.kmdr b/kommander/examples/tutorial/calc.kmdr index a476c254..2f17439e 100644 --- a/kommander/examples/tutorial/calc.kmdr +++ b/kommander/examples/tutorial/calc.kmdr @@ -194,7 +194,7 @@ <stringlist> <string>@ListBox1.insertItem(@expr(@LineEdit1.text), -1) @LineEdit1.clear -@LineEdit2.setText("Sum: @expr(@String.tqreplace(@ListBox1.text, "\n", "+"))") +@LineEdit2.setText("Sum: @expr(@String.replace(@ListBox1.text, "\n", "+"))") </string> </stringlist> </property> diff --git a/kommander/examples/tutorial/picview.kmdr b/kommander/examples/tutorial/picview.kmdr index 495edaaa..2c51a869 100644 --- a/kommander/examples/tutorial/picview.kmdr +++ b/kommander/examples/tutorial/picview.kmdr @@ -91,7 +91,7 @@ </size> </property> <property name="populationText"> - <string>@exec(cd @FileSelector1.text && tqfind * -name "*.jpg" -o -name "*.png" -o -name "*.gif" -o -name "*.bmp")</string> + <string>@exec(cd @FileSelector1.text && find * -name "*.jpg" -o -name "*.png" -o -name "*.gif" -o -name "*.bmp")</string> </property> <property name="associations" stdset="0"> <stringlist> diff --git a/kommander/examples/tutorial/progressbar.kmdr b/kommander/examples/tutorial/progressbar.kmdr index c5b929dc..fc3c327d 100644 --- a/kommander/examples/tutorial/progressbar.kmdr +++ b/kommander/examples/tutorial/progressbar.kmdr @@ -137,12 +137,12 @@ <property name="associations" stdset="0"> <stringlist> <string>@# set up a loop using loop variable named "file" -@forEach(file, @exec(cd @FileSelector1.text && tqfind * -maxdepth 0)) +@forEach(file, @exec(cd @FileSelector1.text && find * -maxdepth 0)) @# set the scale using the generated @[loopvar]_count @ProgressBar1.setMaximum(@file_count) @# show file name in statusbar @StatusBar1.setText(@file) - @TreeWidget1.insertItems(@exec(cd @FileSelector1.text && tqfind @file -name "*"), -1) + @TreeWidget1.insertItems(@exec(cd @FileSelector1.text && find @file -name "*"), -1) @# use the generated @[loopvar]_index to update progressbar @ProgressBar1.setText(@file_index) @end diff --git a/kommander/examples/tutorial/strings.kmdr b/kommander/examples/tutorial/strings.kmdr index ce0b469b..15cfe615 100644 --- a/kommander/examples/tutorial/strings.kmdr +++ b/kommander/examples/tutorial/strings.kmdr @@ -49,13 +49,13 @@ <b>Last 5 chars:</b> @String.right("@LineEdit1", 5)<br> <b>Chars from 6th to 10th:</b> @String.mid("@LineEdit1", 6, 5)<br> <b>Remove spaces:</b> @String.remove("@LineEdit1", " ")<br> -<b>Replace spaces with *</b>: @String.tqreplace("@LineEdit1", " ", *)<br> +<b>Replace spaces with *</b>: @String.replace("@LineEdit1", " ", *)<br> <b>Uppercase:</b> @String.upper("@LineEdit1")<br> <b>Lowercase:</b> @String.lower("@LineEdit1")<br> <b>Is a number?:</b> @Array.value(Bool, @String.isNumber("@LineEdit1"))<br> <b>Is empty?</b> @Array.value(Bool, @String.isEmpty("@LineEdit1"))<br> -<b>Contains "Kommander"?:</b> @String.tqcontains("@LineEdit1", "Kommander")<br> -<b>Position of "Kommander":</b> @String.tqfind("@LineEdit1", "Kommander")<br> +<b>Contains "Kommander"?:</b> @String.contains("@LineEdit1", "Kommander")<br> +<b>Position of "Kommander":</b> @String.find("@LineEdit1", "Kommander")<br> <b>Compare with "Kommander":</b> @execBegin if [ @String.compare("@LineEdit1", "Kommander") -lt 0 ];then diff --git a/kommander/examples/tutorial/tree.kmdr b/kommander/examples/tutorial/tree.kmdr index dc1bc996..0e5d76df 100644 --- a/kommander/examples/tutorial/tree.kmdr +++ b/kommander/examples/tutorial/tree.kmdr @@ -60,7 +60,7 @@ <property name="associations" stdset="0"> <stringlist> <string>@TreeWidget1.clear -@TreeWidget1.insertItems(@exec(cd @FileSelector1.text && tqfind * -name "*.kmdr"), -1)</string> +@TreeWidget1.insertItems(@exec(cd @FileSelector1.text && find * -name "*.kmdr"), -1)</string> </stringlist> </property> </widget> diff --git a/kommander/executor/instance.cpp b/kommander/executor/instance.cpp index d24e856a..88d7d7ec 100644 --- a/kommander/executor/instance.cpp +++ b/kommander/executor/instance.cpp @@ -67,7 +67,7 @@ void Instance::addCmdlineArguments(const TQStringList& args) TQStringList stdArgs; for (TQStringList::ConstIterator it = args.begin(); it != args.end(); ++it) { - int pos = (*it).tqfind('='); + int pos = (*it).find('='); if (pos != -1) m_textInstance->setGlobal((*it).left(pos), (*it).mid(pos+1)); else diff --git a/kommander/executor/main.cpp b/kommander/executor/main.cpp index d49dd373..00d7e509 100644 --- a/kommander/executor/main.cpp +++ b/kommander/executor/main.cpp @@ -71,7 +71,7 @@ int main(int argc, char *argv[]) { char buf[200]; TQString baseFile = args->url(0).fileName(); - int ext = baseFile.tqfindRev('.'); + int ext = baseFile.findRev('.'); if (ext != -1) baseFile = baseFile.left(ext); strcpy(buf, baseFile.latin1()); diff --git a/kommander/executor/register.cpp b/kommander/executor/register.cpp index 5a442326..db794e25 100644 --- a/kommander/executor/register.cpp +++ b/kommander/executor/register.cpp @@ -80,15 +80,15 @@ void Instance::registerSpecials() SpecialInformation::setCurrentObject("String"); SpecialInformation::insert("length", 1, 1, i18n( "Return number of chars in the string.") ); - SpecialInformation::insert("tqcontains", 2, 2, i18n( "Check if the string contains given substring.") ); - SpecialInformation::insert("tqfind", 2, 2, i18n( "Return position of a substring in the string, " + SpecialInformation::insert("contains", 2, 2, i18n( "Check if the string contains given substring.") ); + SpecialInformation::insert("find", 2, 2, i18n( "Return position of a substring in the string, " "or -1 if it isn't found.") ); SpecialInformation::insert("left", 2, 2, i18n( "Return first n chars of the string.") ); SpecialInformation::insert("right", 2, 2, i18n( "Return last n chars of the string.") ); SpecialInformation::insert("mid", 3, 3, i18n( "Return substring of the string, starting from " "given position.") ); SpecialInformation::insert("remove", 2, 2, i18n( "Replace all occurencies of given substring.") ); - SpecialInformation::insert("tqreplace", 3, 3, i18n( "Replace all occurencies of given substring " + SpecialInformation::insert("replace", 3, 3, i18n( "Replace all occurencies of given substring " "with given replacement.") ); SpecialInformation::insert("upper", 1, 1, i18n( "Convert the string to uppercase.") ); SpecialInformation::insert("lower", 1, 1, i18n( "Convert the string to lowercase.") ); diff --git a/kommander/factory/kommanderfactory.cpp b/kommander/factory/kommanderfactory.cpp index 504af6f9..5b1e12bc 100644 --- a/kommander/factory/kommanderfactory.cpp +++ b/kommander/factory/kommanderfactory.cpp @@ -150,7 +150,7 @@ TQWidget *KommanderFactory::create( TQIODevice *dev, TQObject *connector, TQWidg TQTextStream stream(dev); TQString content = stream.read(); if (content.startsWith("#!")) - content = content.mid(content.tqfind('\n')); + content = content.mid(content.find('\n')); if ( !doc.setContent( content ) ) { // qDebug( TQString("Parse error: ") + errMsg + TQString(" in line %d"), errLine ); return 0; @@ -233,7 +233,7 @@ TQWidget *KommanderFactory::create( TQIODevice *dev, TQObject *connector, TQWidg for ( TQDomElement n = eltSlots.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) if ( n.tagName() == "slot" ) { TQString s = n.firstChild().toText().data(); - widgetFactory->languageSlots.insert( s.left( s.tqfind( "(" ) ) , n.attribute( "language", "C++" ) ); + widgetFactory->languageSlots.insert( s.left( s.find( "(" ) ) , n.attribute( "language", "C++" ) ); } } @@ -257,7 +257,7 @@ TQWidget *KommanderFactory::create( TQIODevice *dev, TQObject *connector, TQWidg #ifndef TQT_NO_SQL TQMap<TQWidget*, SqlWidgetConnection>::Iterator cit = widgetFactory->sqlWidgetConnections.begin(); for( ; cit != widgetFactory->sqlWidgetConnections.end(); ++cit ) { - if ( widgetFactory->noDatabaseWidgets.tqfind( cit.key()->name() ) != widgetFactory->noDatabaseWidgets.end() ) + if ( widgetFactory->noDatabaseWidgets.find( cit.key()->name() ) != widgetFactory->noDatabaseWidgets.end() ) continue; if ( cit.key()->inherits( "QDesignerDataBrowser2" ) ) ( (QDesignerDataBrowser2*)cit.key() )->initPreview( (*cit).conn, (*cit).table, cit.key(), *(*cit).dbControls ); @@ -269,9 +269,9 @@ TQWidget *KommanderFactory::create( TQIODevice *dev, TQObject *connector, TQWidg TQDataTable *table = (TQDataTable*)widgetFactory->toplevel->child( it.key(), TQDATATABLE_OBJECT_NAME_STRING ); if ( !table ) continue; - if ( widgetFactory->noDatabaseWidgets.tqfind( table->name() ) != widgetFactory->noDatabaseWidgets.end() ) + if ( widgetFactory->noDatabaseWidgets.find( table->name() ) != widgetFactory->noDatabaseWidgets.end() ) continue; - TQValueList<Field> fieldMap = *widgetFactory->fieldMaps.tqfind( table ); + TQValueList<Field> fieldMap = *widgetFactory->fieldMaps.find( table ); TQString conn = (*it)[ 0 ]; TQSqlCursor* c = 0; TQSqlDatabase *db = 0; @@ -728,7 +728,7 @@ KommanderFactory::LayoutType KommanderFactory::layoutType( TQLayout *tqlayout ) void KommanderFactory::setProperty( TQObject* obj, const TQString &prop, const TQDomElement &e ) { - const TQMetaProperty *p = obj->tqmetaObject()->property( obj->tqmetaObject()->tqfindProperty( prop, true ), true ); + const TQMetaProperty *p = obj->tqmetaObject()->property( obj->tqmetaObject()->findProperty( prop, true ), true ); TQVariant defVariant; if ( e.tagName() == "font" ) { @@ -1101,14 +1101,14 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect TQStrList slotList = receiver->tqmetaObject()->slotNames( true ); // if this is a connection to a custom slot and we have a connector, try this as receiver - if ( slotList.tqfind( conn.slot ) == -1 && TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(toplevel) && connector ) { + if ( slotList.find( conn.slot ) == -1 && TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(toplevel) && connector ) { slotList = connector->tqmetaObject()->slotNames( true ); receiver = connector; } // avoid warnings - if ( signalList.tqfind( conn.signal ) == -1 || - slotList.tqfind( conn.slot ) == -1 ) { + if ( signalList.find( conn.signal ) == -1 || + slotList.find( conn.slot ) == -1 ) { n = n.nextSibling().toElement(); continue; } @@ -1117,11 +1117,11 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect EventFunction ef = eventMap[ conn.sender ]; ef.events.append( conn.signal ); ef.functions.append( TQStringList::split( ',', conn.slot ) ); - eventMap.tqreplace( conn.sender, ef ); + eventMap.replace( conn.sender, ef ); } } else if ( n.tagName() == "slot" ) { TQString s = n.firstChild().toText().data(); - languageSlots.insert( s.left( s.tqfind( "(" ) ) , n.attribute( "language" ) ); + languageSlots.insert( s.left( s.find( "(" ) ) , n.attribute( "language" ) ); } n = n.nextSibling().toElement(); } @@ -1206,8 +1206,8 @@ void KommanderFactory::createColumn( const TQDomElement &e, TQWidget *widget ) TQString txt; TQString field; TQValueList<Field> fieldMap; - if ( fieldMaps.tqfind( table ) != fieldMaps.end() ) { - fieldMap = *fieldMaps.tqfind( table ); + if ( fieldMaps.find( table ) != fieldMaps.end() ) { + fieldMap = *fieldMaps.find( table ); fieldMaps.remove( table ); } while ( !n.isNull() ) { diff --git a/kommander/kmdrtools/dcoptool-oldparser.kmdr b/kommander/kmdrtools/dcoptool-oldparser.kmdr index 26b2d0c2..a5c2f55e 100755 --- a/kommander/kmdrtools/dcoptool-oldparser.kmdr +++ b/kommander/kmdrtools/dcoptool-oldparser.kmdr @@ -105,14 +105,14 @@ append(QString,QString)") @setGlobal(KommanderMessage,"") @setGlobal(String,"length(QString) -tqcontains(QString,QString) -tqfind(QString,QString,int) -tqfindRev(QString,QString,int) +contains(QString,QString) +find(QString,QString,int) +findRev(QString,QString,int) left(QString,int) right(QString,int) mid(QString,int,int) remove(QString,QString) -tqreplace(QString,QString,QString) +replace(QString,QString,QString) upper(QString) lower(QString) compare(QString,QString) @@ -400,9 +400,9 @@ args(QString,QString,QString,QString)") <stringlist> <string>@switch(@String.mid(@dcopstr.selection, 1, 4)) @case(dcop) - @setGlobal("outstring","@dcopstr.selection @window.selection, @branch.selection, "@proto.selection", @String.mid(@wname.selection, 0, @String.tqfind(@wname.selection, " ", ))@param1@param2@param3@param4)") + @setGlobal("outstring","@dcopstr.selection @window.selection, @branch.selection, "@proto.selection", @String.mid(@wname.selection, 0, @String.find(@wname.selection, " ", ))@param1@param2@param3@param4)") @case(cop) - @setGlobal("outstring","@dcopstr.selection @window.selection @branch.selection @global(short) @String.mid(@wname.selection, 0, @String.tqfind(@wname.selection, " ", ))@param1@param2@param3@param4") + @setGlobal("outstring","@dcopstr.selection @window.selection @branch.selection @global(short) @String.mid(@wname.selection, 0, @String.find(@wname.selection, " ", ))@param1@param2@param3@param4") @case(*) @setGlobal("outstring","@dcopstr.selection - not found") @end @@ -1445,29 +1445,29 @@ fi @setGlobal(PARM4,"") @setGlobal(short,length) @setGlobal(DESC,"Returns number of chars in the string.") -@case(String::tqcontains(QString,QString)) +@case(String::contains(QString,QString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"string") @setGlobal(PARM2,"substring") @setGlobal(PARM3,"") @setGlobal(PARM4,"") - @setGlobal(short,tqcontains) + @setGlobal(short,contains) @setGlobal(DESC,"Checks if the the string contains the given substring.") -@case(String::tqfind(QString,QString,int)) +@case(String::find(QString,QString,int)) @setGlobal(enWidget,0) @setGlobal(PARM1,"string") @setGlobal(PARM2,"sought") @setGlobal(PARM3,"index") @setGlobal(PARM4,"") - @setGlobal(short,tqfind) + @setGlobal(short,find) @setGlobal(DESC,"Returns the position of a substring in the string, or -1 if it is not found.") -@case(String::tqfindRev(QString,QString,int)) +@case(String::findRev(QString,QString,int)) @setGlobal(enWidget,0) @setGlobal(PARM1,"string") @setGlobal(PARM2,"sought") @setGlobal(PARM3,"index") @setGlobal(PARM4,"") - @setGlobal(short,tqfindRev) + @setGlobal(short,findRev) @setGlobal(DESC,"Returns the position of a substring in the string, or -1 if it is not found. String is searched backwards") @case(String::left(QString,int)) @setGlobal(enWidget,0) @@ -1501,13 +1501,13 @@ fi @setGlobal(PARM4,"") @setGlobal(short,remove) @setGlobal(DESC,"Removes all occurrences of given substring.") -@case(String::tqreplace(QString,QString,QString)) +@case(String::replace(QString,QString,QString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"string") @setGlobal(PARM2,"substring") @setGlobal(PARM3,"replacement") @setGlobal(PARM4,"") - @setGlobal(short,tqreplace) + @setGlobal(short,replace) @setGlobal(DESC,"Replaces all occurrences of the given substring with the given replacement.") @case(String::upper(QString)) @setGlobal(enWidget,0) @@ -1879,7 +1879,7 @@ setEditable(QString,bool)") <property name="associations" stdset="0"> <stringlist> <string>@##### put the following in @wfilter checked ######### -@setGlobal(start,@expr(@String.tqfind("@wname.selection", " ")+2)) +@setGlobal(start,@expr(@String.find("@wname.selection", " ")+2)) @setGlobal(stop,@expr(@String.length("@wname.selection")-1)) @setGlobal(length,@expr(@global(stop)-@global(start))) @setGlobal(teststr, @String.lower(@String.mid("@wname.selection", @global(start), @global(length)))) diff --git a/kommander/plugin/specialinformation.cpp b/kommander/plugin/specialinformation.cpp index 75faf9e0..a653dfd6 100644 --- a/kommander/plugin/specialinformation.cpp +++ b/kommander/plugin/specialinformation.cpp @@ -22,8 +22,8 @@ SpecialFunction::SpecialFunction(const TQString& name, const TQString& descripti int minArgs, int maxArgs) { m_parserTypes = AllParsers; - int lbracket = name.tqfind('('); - int rbracket = name.tqfind(')'); + int lbracket = name.find('('); + int rbracket = name.find(')'); m_function = (lbracket != -1) ? name.left(lbracket) : name; m_description = description; if (lbracket != -1 && rbracket != -1) @@ -44,8 +44,8 @@ SpecialFunction::SpecialFunction(ParserType p, const TQString& name, const TQStr int minArgs, int maxArgs) { m_parserTypes = p; - int lbracket = name.tqfind('('); - int rbracket = name.tqfind(')'); + int lbracket = name.find('('); + int rbracket = name.find(')'); m_function = (lbracket != -1) ? name.left(lbracket) : name; m_description = description; if (lbracket != -1 && rbracket != -1) @@ -107,9 +107,9 @@ int SpecialFunction::argumentCount() const int SpecialInformation::function(int group, const TQString& fname) { TQString f = fname.lower(); - if (m_functions.tqcontains(group) && m_functions[group].tqcontains(f)) + if (m_functions.contains(group) && m_functions[group].contains(f)) return m_functions[group][f]; - else if (m_aliases.tqcontains(group) && m_aliases[group].tqcontains(f)) + else if (m_aliases.contains(group) && m_aliases[group].contains(f)) return m_aliases[group][f]; return -1; } @@ -122,14 +122,14 @@ SpecialFunction SpecialInformation::functionObject(const TQString& gname, const int SpecialInformation::group(const TQString& gname) { - if (m_groups.tqcontains(gname)) + if (m_groups.contains(gname)) return m_groups[gname]; return -1; } bool SpecialInformation::isValid(int gname, int fname) { - return m_specials.tqcontains(gname) && m_specials[gname].tqcontains(fname); + return m_specials.contains(gname) && m_specials[gname].contains(fname); } bool SpecialInformation::isValid(const TQString& gname, const TQString& fname) @@ -139,7 +139,7 @@ bool SpecialInformation::isValid(const TQString& gname, const TQString& fname) bool SpecialInformation::isValid(int gname, int fname, SpecialFunction::ParserType p) { - return m_specials.tqcontains(gname) && m_specials[gname].tqcontains(fname) + return m_specials.contains(gname) && m_specials[gname].contains(fname) && m_specials[gname][fname].isSupported(p); } @@ -198,9 +198,9 @@ bool SpecialInformation::insert(int id, const TQString& function, const TQString { if (isValid(m_defaultGroup, id)) /* function already defined */ return false; - if (m_functions[m_defaultGroup].tqcontains(function.lower())) + if (m_functions[m_defaultGroup].contains(function.lower())) return false; /* function name already in use */ - if (m_aliases[m_defaultGroup].tqcontains(function.lower())) + if (m_aliases[m_defaultGroup].contains(function.lower())) return false; /* function name already in use */ SpecialFunction sf(pType, function, description, minArgs, maxArgs); m_specials[m_defaultGroup][id] = sf; @@ -224,9 +224,9 @@ bool SpecialInformation::insertAlias(int id, const TQString& alias) { if (!isValid(m_defaultGroup, id)) /* function doesn't exists */ return false; - if (m_functions[m_defaultGroup].tqcontains(alias.lower())) + if (m_functions[m_defaultGroup].contains(alias.lower())) return false; - if (m_aliases[m_defaultGroup].tqcontains(alias.lower())) + if (m_aliases[m_defaultGroup].contains(alias.lower())) return false; m_aliases[m_defaultGroup][alias] = id; return true; @@ -248,7 +248,7 @@ void SpecialInformation::insertGroup(int id, const TQString& name, const TQStrin TQString SpecialInformation::parserGroupName(const TQString& name) { - if (m_parserGroups.tqcontains(name)) + if (m_parserGroups.contains(name)) return m_parserGroups[name]; else return name; @@ -524,11 +524,11 @@ void SpecialInformation::registerSpecials() insertGroup(Group::String, "String", "str"); insert(String::length, "length(TQString string)", i18n("Returns number of chars in the string."), 1); - insert(String::tqcontains, "tqcontains(TQString string, TQString substring)", + insert(String::contains, "contains(TQString string, TQString substring)", i18n("Checks if the the string contains the given substring."), 2); - insert(String::tqfind, "tqfind(TQString string, TQString sought, int index)", + insert(String::find, "find(TQString string, TQString sought, int index)", i18n("Returns the position of a substring in the string, or -1 if it is not found."), 2); - insert(String::tqfindRev, "tqfindRev(TQString string, TQString sought, int index)", + insert(String::findRev, "findRev(TQString string, TQString sought, int index)", i18n("Returns the position of a substring in the string, or -1 if it is not found. String is searched backwards"), 2); insertInternal(String::count, "count(TQString String, TQString substring)", i18n("Returns the count of a given substring in the given string."), 2); @@ -540,7 +540,7 @@ void SpecialInformation::registerSpecials() i18n("Returns <i>n</i> chars of the string, starting from <i>start</i>."), 3); insert(String::remove, "remove(TQString string, TQString substring)", i18n("Removes all occurrences of given substring."), 2); - insert(String::tqreplace, "tqreplace(TQString string, TQString substring, TQString replacement)", + insert(String::replace, "replace(TQString string, TQString substring, TQString replacement)", i18n("Replaces all occurrences of the given substring with the given replacement."), 3); insert(String::upper, "upper(TQString string)", i18n("Converts the string to uppercase."), 1); diff --git a/kommander/plugin/specials.h b/kommander/plugin/specials.h index e6e9cf94..793f44dc 100644 --- a/kommander/plugin/specials.h +++ b/kommander/plugin/specials.h @@ -55,7 +55,7 @@ namespace Matrix namespace String { - enum {length, tqcontains, tqfind, tqfindRev, left, right, mid, remove, tqreplace, upper, lower, + enum {length, contains, find, findRev, left, right, mid, remove, replace, upper, lower, compare, isEmpty, isNumber, section, args, toInt, toDouble, round, sort, trim, padLeft, padRight, count}; } diff --git a/kommander/pluginmanager/pluginmanager.cpp b/kommander/pluginmanager/pluginmanager.cpp index 2bfbab89..79da4d81 100644 --- a/kommander/pluginmanager/pluginmanager.cpp +++ b/kommander/pluginmanager/pluginmanager.cpp @@ -47,7 +47,7 @@ bool PluginManager::add(const TQString& plugin, bool) TQString plugName= libraryName(plugin); if (plugName.isNull()) return false; - if (m_list->tqcontains(plugName)) + if (m_list->contains(plugName)) return false; m_list->append(plugName); return true; @@ -55,7 +55,7 @@ bool PluginManager::add(const TQString& plugin, bool) bool PluginManager::remove(const TQString& plugin) { - if (!m_list->tqcontains(plugin)) + if (!m_list->contains(plugin)) return false; m_list->remove(plugin); return true; diff --git a/kommander/widget/expression.cpp b/kommander/widget/expression.cpp index 350646e1..d29d94e8 100644 --- a/kommander/widget/expression.cpp +++ b/kommander/widget/expression.cpp @@ -57,7 +57,7 @@ Expression& Expression::operator=(const TQString& s) m_parts.append(TQVariant(s.mid(start, i - start).toDouble())); else m_parts.append(TQVariant(s.mid(start, i - start).toInt())); - } else if (single.tqcontains(s[i])) + } else if (single.contains(s[i])) m_parts.append(TQVariant(TQString(s[i++]))); else if (s[i] == '\"') { diff --git a/kommander/widget/functionlib.cpp b/kommander/widget/functionlib.cpp index 90a8ef28..da699bd2 100644 --- a/kommander/widget/functionlib.cpp +++ b/kommander/widget/functionlib.cpp @@ -52,7 +52,7 @@ static ParseNode f_stringLength(Parser*, const ParameterList& params) static ParseNode f_stringContains(Parser*, const ParameterList& params) { - return params[0].toString().tqcontains(params[1].toString()); + return params[0].toString().contains(params[1].toString()); } static ParseNode f_stringCompare(Parser*, const ParameterList& params) @@ -71,12 +71,12 @@ static ParseNode f_stringCompare(Parser*, const ParameterList& params) static ParseNode f_stringFind(Parser*, const ParameterList& params) { - return params[0].toString().tqfind(params[1].toString(), params.count() == 3 ? params[2].toInt() : 0); + return params[0].toString().find(params[1].toString(), params.count() == 3 ? params[2].toInt() : 0); } static ParseNode f_stringFindRev(Parser*, const ParameterList& params) { - return params[0].toString().tqfindRev(params[1].toString(), + return params[0].toString().findRev(params[1].toString(), params.count() == 3 ? params[2].toInt() : params[0].toString().length()); } @@ -102,7 +102,7 @@ static ParseNode f_stringRemove(Parser*, const ParameterList& params) static ParseNode f_stringReplace(Parser*, const ParameterList& params) { - return params[0].toString().tqreplace(params[1].toString(), params[2].toString()); + return params[0].toString().replace(params[1].toString(), params[2].toString()); } static ParseNode f_stringLower(Parser*, const ParameterList& params) @@ -354,7 +354,7 @@ static ParseNode f_dcop(Parser*, const ParameterList& params) else if (*it == "bool") byteDataStream << (bool)params[i++].toInt(); else if (*it == TQSTRINGLIST_OBJECT_NAME_STRING) - if (params[i].toString().tqfind('\n') != -1) + if (params[i].toString().find('\n') != -1) byteDataStream << TQStringList::split("\n", params[i++].toString(), true); else byteDataStream << TQStringList::split("\\n", params[i++].toString(), true); @@ -648,7 +648,7 @@ static ParseNode f_arrayIndexedRemoveElements(Parser* P, const ParameterList& pa return ParseNode(); //out of index range for (int i = 0; i < count; i++) { - if (keys.tqcontains(TQString::number(i)) != 1) + if (keys.contains(TQString::number(i)) != 1) return ParseNode(); //array is not indexed } for (int i = key; i <= key + num; i++) @@ -910,15 +910,15 @@ static ParseNode f_write_setting(Parser* parser, const ParameterList& params) void ParserData::registerStandardFunctions() { registerFunction("str_length", Function(&f_stringLength, ValueInt, ValueString)); - registerFunction("str_tqcontains", Function(&f_stringContains, ValueInt, ValueString, ValueString)); + registerFunction("str_contains", Function(&f_stringContains, ValueInt, ValueString, ValueString)); registerFunction("str_compare", Function(&f_stringCompare, ValueInt, ValueString, ValueString)); - registerFunction("str_tqfind", Function(&f_stringFind, ValueInt, ValueString, ValueString, ValueInt, 2)); + registerFunction("str_find", Function(&f_stringFind, ValueInt, ValueString, ValueString, ValueInt, 2)); registerFunction("str_findrev", Function(&f_stringFindRev, ValueInt, ValueString, ValueString, ValueInt, 2)); registerFunction("str_left", Function(&f_stringLeft, ValueString, ValueString, ValueInt)); registerFunction("str_right", Function(&f_stringRight, ValueString, ValueString, ValueInt)); registerFunction("str_mid", Function(&f_stringMid, ValueString, ValueString, ValueInt, ValueInt, 2)); registerFunction("str_remove", Function(&f_stringRemove, ValueString, ValueString, ValueString)); - registerFunction("str_tqreplace", Function(&f_stringReplace, ValueString, ValueString, ValueString, ValueString)); + registerFunction("str_replace", Function(&f_stringReplace, ValueString, ValueString, ValueString, ValueString)); registerFunction("str_lower", Function(&f_stringLower, ValueString, ValueString)); registerFunction("str_upper", Function(&f_stringUpper, ValueString, ValueString)); registerFunction("str_section", Function(&f_stringSection, ValueString, ValueString, ValueString, ValueInt, ValueInt, 3)); diff --git a/kommander/widget/invokeclass.cpp b/kommander/widget/invokeclass.cpp index ec08dfff..a82a5305 100644 --- a/kommander/widget/invokeclass.cpp +++ b/kommander/widget/invokeclass.cpp @@ -23,7 +23,7 @@ InvokeClass::InvokeClass(TQObject *tqparent):TQObject(tqparent) void InvokeClass::invokeSlot(TQObject *object, const TQString& slot, TQStringList args) { TQString invokeName = slot; - invokeName = invokeName.mid(invokeName.tqfind('(')); + invokeName = invokeName.mid(invokeName.find('(')); invokeName.prepend(TQString::number(TQSIGNAL_CODE) + "invoke"); TQString slotName = TQString::number(TQSLOT_CODE) + slot; connect(this, invokeName.ascii(), object, slotName.ascii()); @@ -33,7 +33,7 @@ void InvokeClass::invokeSlot(TQObject *object, const TQString& slot, TQStringLis else { TQString slotArgStr = slot.section(TQRegExp("\\(|\\)"), 1); - uint argNum = slotArgStr.tqcontains(',') + 1; + uint argNum = slotArgStr.contains(',') + 1; for (uint i = args.count(); i < argNum; i++) args << ""; //poor man's invokeMetaObject diff --git a/kommander/widget/kommanderfunctions.cpp b/kommander/widget/kommanderfunctions.cpp index 0ddcb951..701b5e01 100644 --- a/kommander/widget/kommanderfunctions.cpp +++ b/kommander/widget/kommanderfunctions.cpp @@ -114,7 +114,7 @@ TQString KommanderWidget::evalFunction(const TQString& function, const TQStringL TQString KommanderWidget::evalExecBlock(const TQStringList& args, const TQString& s, int& pos) { - int f = s.tqfind("@execEnd", pos); + int f = s.find("@execEnd", pos); if (f == -1) { printError(i18n("Unterminated @execBegin ... @execEnd block.")); @@ -131,7 +131,7 @@ TQString KommanderWidget::evalExecBlock(const TQStringList& args, const TQString TQString KommanderWidget::evalForEachBlock(const TQStringList& args, const TQString& s, int& pos) { - int f = s.tqfind("@end", pos); + int f = s.find("@end", pos); //FIXME: better detection of block boundaries if (f == -1) { @@ -157,7 +157,7 @@ TQString KommanderWidget::evalForEachBlock(const TQStringList& args, const TQStr TQString KommanderWidget::evalForBlock(const TQStringList& args, const TQString& s, int& pos) { - int f = s.tqfind("@end", pos); + int f = s.find("@end", pos); //FIXME: better detection of block boundaries if (f == -1) { @@ -193,7 +193,7 @@ TQString KommanderWidget::evalForBlock(const TQStringList& args, const TQString& TQString KommanderWidget::evalIfBlock(const TQStringList& args, const TQString& s, int& pos) { - int f = s.tqfind("@endif", pos); + int f = s.find("@endif", pos); //FIXME: better detection of block boundaries; add error message if (f == -1) { @@ -214,7 +214,7 @@ TQString KommanderWidget::evalIfBlock(const TQStringList& args, const TQString& TQString KommanderWidget::evalSwitchBlock(const TQStringList& args, const TQString& s, int& pos) { - int f = s.tqfind("@end", pos); + int f = s.find("@end", pos); //FIXME: better detection of block boundaries; add error message if (f == -1) { diff --git a/kommander/widget/kommanderwidget.cpp b/kommander/widget/kommanderwidget.cpp index 6c9540be..793be627 100644 --- a/kommander/widget/kommanderwidget.cpp +++ b/kommander/widget/kommanderwidget.cpp @@ -74,7 +74,7 @@ TQStringList KommanderWidget::associatedText() const bool KommanderWidget::hasAssociatedText() { - int index = states().tqfindIndex(currentState()); + int index = states().findIndex(currentState()); if (index == -1 || m_associatedText[index].isEmpty()) return false; return true; @@ -113,7 +113,7 @@ void KommanderWidget::setDisplayStates(const TQStringList& a_displayStates) TQString KommanderWidget::evalAssociatedText() // expands and returns associated text as a string { - int index = ( states().tqfindIndex( currentState()) ); + int index = ( states().findIndex( currentState()) ); if (index == -1) { printError(i18n("Invalid state for associated text.")); @@ -143,7 +143,7 @@ TQString KommanderWidget::evalAssociatedText(const TQString& a_text) int pos = 0, baseTextLength = a_text.length(); while (pos < baseTextLength) { - int ident = a_text.tqfind(ESCCHAR, pos); + int ident = a_text.find(ESCCHAR, pos); if (ident == -1) { evalText += a_text.mid(pos); break; @@ -164,7 +164,7 @@ TQString KommanderWidget::evalAssociatedText(const TQString& a_text) if (identifier.isEmpty()) { if (pos < baseTextLength && a_text[pos] == '#') { // comment - int newpos = a_text.tqfind('\n', pos+1); + int newpos = a_text.find('\n', pos+1); if (newpos == -1) newpos = a_text.length(); if (pos > 1 && a_text[pos-2] == '\n') @@ -260,7 +260,7 @@ TQString KommanderWidget::DCOPQuery(const TQStringList& a_query) // parse function arguments TQString function = a_query[2], pTypes; function.remove(' '); - int start = function.tqfind('('); + int start = function.find('('); bool ok = false; if (start != -1) pTypes = parseBrackets(function, start, ok); @@ -296,7 +296,7 @@ TQString KommanderWidget::DCOPQuery(const TQStringList& a_query) else if (argTypes[i] == "bool") byteDataStream << (bool)(a_query[i+3] != "false" && a_query[i+3] != "false" && a_query[i+3] != "0"); else if (argTypes[i] == TQSTRINGLIST_OBJECT_NAME_STRING) - if (a_query[i+3].tqfind('\n') != -1) + if (a_query[i+3].find('\n') != -1) byteDataStream << TQStringList::split("\n", a_query[i+3], true); else byteDataStream << TQStringList::split("\\n", a_query[i+3], true); @@ -616,7 +616,7 @@ int KommanderWidget::parseBlockBoundary(const TQString& s, int from, const TQStr int shortest = -1; for (uint i=0; i<args.count(); i++) { - int match = s.tqfind(args[i], from); + int match = s.find(args[i], from); if (shortest > match || shortest == -1) shortest = match; } @@ -632,7 +632,7 @@ TQString KommanderWidget::substituteVariable(TQString text, TQString variable, T int newpos, pos = 0; while (true) { - newpos = text.tqfind(var, pos); + newpos = text.find(var, pos); if (newpos != -1) { newtext += text.mid(pos, newpos-pos); diff --git a/kommander/widget/myprocess.cpp b/kommander/widget/myprocess.cpp index 4914a95a..90d2caf0 100644 --- a/kommander/widget/myprocess.cpp +++ b/kommander/widget/myprocess.cpp @@ -74,7 +74,7 @@ TQString MyProcess::run(const TQString& a_command, const TQString& a_shell) // Look for shell if (at.startsWith("#!")) { - int eol = at.tqfind("\n"); + int eol = at.find("\n"); if (eol == -1) eol = at.length(); shellName = at.mid(2, eol-1).stripWhiteSpace(); diff --git a/kommander/widget/parser.cpp b/kommander/widget/parser.cpp index 07ffb88c..848507bb 100644 --- a/kommander/widget/parser.cpp +++ b/kommander/widget/parser.cpp @@ -24,7 +24,7 @@ using namespace Parse; TQString unescape(TQString s) { - return s.tqreplace("\\\"", "\"").tqreplace("\\t", "\t").tqreplace("\\n", "\n").tqreplace("\\\\", "\\"); + return s.replace("\\\"", "\"").replace("\\t", "\t").replace("\\n", "\n").replace("\\\\", "\\"); } Parser::Parser(ParserData* pData) : m_data(pData), m_start(0), m_error(TQString()), m_errorPosition(0), @@ -814,9 +814,9 @@ void Parser::setVariable(const TQString& name, ParseNode value) ParseNode Parser::variable(const TQString& name) const { if (isGlobal(name)) - return m_globalVariables.tqcontains(name) ? m_globalVariables[name] : ParseNode(); + return m_globalVariables.contains(name) ? m_globalVariables[name] : ParseNode(); else - return m_variables.tqcontains(name) ? m_variables[name] : ParseNode(); + return m_variables.contains(name) ? m_variables[name] : ParseNode(); } bool Parser::isGlobal(const TQString& name) const @@ -826,7 +826,7 @@ bool Parser::isGlobal(const TQString& name) const bool Parser::isVariable(const TQString& name) const { - return m_variables.tqcontains(name) || m_globalVariables.tqcontains(name); + return m_variables.contains(name) || m_globalVariables.contains(name); } void Parser::unsetVariable(const TQString& key) @@ -847,7 +847,7 @@ const TQMap<TQString, ParseNode>& Parser::array(const TQString& name) const bool Parser::isArray(const TQString& name) const { - return m_arrays.tqcontains(name) || m_globalArrays.tqcontains(name); + return m_arrays.contains(name) || m_globalArrays.contains(name); } void Parser::setArray(const TQString& name, const TQString& key, ParseNode value) @@ -881,9 +881,9 @@ ParseNode Parser::arrayValue(const TQString& name, const TQString& key) const if (!isArray(name)) return ParseNode(); if (isGlobal(name)) - return m_globalArrays[name].tqcontains(key) ? m_globalArrays[name][key] : ParseNode(); + return m_globalArrays[name].contains(key) ? m_globalArrays[name][key] : ParseNode(); else - return m_arrays[name].tqcontains(key) ? m_arrays[name][key] : ParseNode(); + return m_arrays[name].contains(key) ? m_arrays[name][key] : ParseNode(); } diff --git a/kommander/widget/parserdata.cpp b/kommander/widget/parserdata.cpp index b5346fd4..274d7220 100644 --- a/kommander/widget/parserdata.cpp +++ b/kommander/widget/parserdata.cpp @@ -19,7 +19,7 @@ using namespace Parse; KeywordGroup ParserData::keywordGroup(Keyword k) const { - if (m_groups.tqcontains(k)) + if (m_groups.contains(k)) return m_groups[k]; else return GroupMisc; @@ -28,7 +28,7 @@ KeywordGroup ParserData::keywordGroup(Keyword k) const Keyword ParserData::stringToKeyword(const TQString& s) const { TQString k = s.lower(); - if (m_keywords.tqcontains(k)) + if (m_keywords.contains(k)) return m_keywords[k]; else return Variable; @@ -116,7 +116,7 @@ ParserData::ParserData() bool ParserData::isFunction(const TQString& name) const { - return m_functions.tqcontains(name.lower()); + return m_functions.contains(name.lower()); } const Function& ParserData::function(const TQString& name) const diff --git a/kommander/widgets/buttongroup.cpp b/kommander/widgets/buttongroup.cpp index 6b0feef3..e0c8b6ed 100644 --- a/kommander/widgets/buttongroup.cpp +++ b/kommander/widgets/buttongroup.cpp @@ -120,8 +120,8 @@ TQString ButtonGroup::handleDCOP(int function, const TQStringList& args) { TQString text; for (int i = 0; i < count(); i++) - if (dynamic_cast<KommanderWidget*>(tqfind(i))) - text += (dynamic_cast<KommanderWidget*>(tqfind(i)))->evalAssociatedText(); + if (dynamic_cast<KommanderWidget*>(find(i))) + text += (dynamic_cast<KommanderWidget*>(find(i)))->evalAssociatedText(); return text; } case DCOP::checked: diff --git a/kommander/widgets/fileselector.cpp b/kommander/widgets/fileselector.cpp index f6806e5b..ce4b93e0 100644 --- a/kommander/widgets/fileselector.cpp +++ b/kommander/widgets/fileselector.cpp @@ -222,7 +222,7 @@ TQString FileSelector::handleDCOP(int function, const TQStringList& args) return m_lineEdit->selectedText(); case DCOP::setSelection: { - int f = m_lineEdit->text().tqfind(args[0]); + int f = m_lineEdit->text().find(args[0]); if (f != -1) m_lineEdit->setSelection(f, args[0].length()); break; diff --git a/kommander/widgets/listbox.cpp b/kommander/widgets/listbox.cpp index 1135a540..ad0cbafa 100644 --- a/kommander/widgets/listbox.cpp +++ b/kommander/widgets/listbox.cpp @@ -125,7 +125,7 @@ TQString ListBox::handleDCOP(int function, const TQStringList& args) } case DCOP::setSelection: { - TQListBoxItem* found = tqfindItem(args[0], TQt::ExactMatch); + TQListBoxItem* found = findItem(args[0], TQt::ExactMatch); if (found) setCurrentItem(index(found)); break; @@ -162,14 +162,14 @@ TQString ListBox::handleDCOP(int function, const TQStringList& args) return TQString(); } case DCOP::addUniqueItem: - if (!tqfindItem(args[0], TQt::ExactMatch)) + if (!findItem(args[0], TQt::ExactMatch)) insertItem(args[0]); break; case DCOP::findItem: { - TQListBoxItem* found = tqfindItem(args[0], TQt::ExactMatch); - if (!found) found = tqfindItem(args[0], TQt::BeginsWith); - if (!found) found = tqfindItem(args[0], TQt::Contains); + TQListBoxItem* found = findItem(args[0], TQt::ExactMatch); + if (!found) found = findItem(args[0], TQt::BeginsWith); + if (!found) found = findItem(args[0], TQt::Contains); if (found) return TQString::number(index(found)); else return TQString::number(-1); diff --git a/kommander/widgets/richtexteditor.cpp b/kommander/widgets/richtexteditor.cpp index fb3c7697..5c6c530c 100644 --- a/kommander/widgets/richtexteditor.cpp +++ b/kommander/widgets/richtexteditor.cpp @@ -180,7 +180,7 @@ void RichTextEditor::textItalic(bool a_isOn) void RichTextEditor::textAlign(int a_id) { - TQToolButton *b = (TQToolButton *)m_alignGroup->tqfind(a_id); + TQToolButton *b = (TQToolButton *)m_alignGroup->find(a_id); if(b == m_buttonTextLeft) m_textedit->tqsetAlignment(TQt::AlignLeft); else if(b == m_buttonTextCenter) diff --git a/kommander/widgets/scriptobject.cpp b/kommander/widgets/scriptobject.cpp index 472bb98c..ddc7d32a 100644 --- a/kommander/widgets/scriptobject.cpp +++ b/kommander/widgets/scriptobject.cpp @@ -93,7 +93,7 @@ void ScriptObject::populate() TQString ScriptObject::executeProcess(bool blocking) { - int index = ( states().tqfindIndex( currentState()) ); + int index = ( states().findIndex( currentState()) ); if (index == -1) { printError(i18n("Invalid state for associated text.")); diff --git a/kommander/widgets/textedit.cpp b/kommander/widgets/textedit.cpp index 1ca2e167..dbdb59d7 100644 --- a/kommander/widgets/textedit.cpp +++ b/kommander/widgets/textedit.cpp @@ -200,8 +200,8 @@ TQString TextEdit::handleDCOP(int function, const TQStringList& args) { // int para = args[3].toInt(); // int idx = args[4].toInt(); -// return TQString::number(TQTextEdit::tqfind(args[0], args[1].toUInt(), false, args[2].toUInt(), para, idx )); - return TQString::number(TQTextEdit::tqfind(args[0], args[1].toUInt(), false )); +// return TQString::number(TQTextEdit::find(args[0], args[1].toUInt(), false, args[2].toUInt(), para, idx )); + return TQString::number(TQTextEdit::find(args[0], args[1].toUInt(), false )); break; } case TE_VAsuperScript: diff --git a/kommander/widgets/treewidget.cpp b/kommander/widgets/treewidget.cpp index e04fe41d..d9f6b0c8 100644 --- a/kommander/widgets/treewidget.cpp +++ b/kommander/widgets/treewidget.cpp @@ -129,7 +129,7 @@ void TreeWidget::addItemFromString(const TQString& s) TQListViewItem* TreeWidget::itemFromString(TQListViewItem* tqparent, const TQString& s) { TQStringList elements; - if (s.tqcontains("\t")) + if (s.contains("\t")) elements = TQStringList::split("\t", s, true); else elements = TQStringList::split("\\t", s, true); @@ -368,14 +368,14 @@ TQString TreeWidget::handleDCOP(int function, const TQStringList& args) } case DCOP::setSelection: if (selectionModeExt() == Single || selectionModeExt() == NoSelection) - setCurrentItem(tqfindItem(args[0], 0)); + setCurrentItem(findItem(args[0], 0)); else { clearSelection(); TQStringList items(TQStringList::split("\n", args[0])); for (TQStringList::ConstIterator it = items.begin(); it != items.end(); ++it) { - TQListViewItem* item = tqfindItem(*it, 0); + TQListViewItem* item = findItem(*it, 0); if (item) { item->setSelected(true); @@ -405,17 +405,17 @@ TQString TreeWidget::handleDCOP(int function, const TQStringList& args) break; case DCOP::findItem: if (!args[1]) - return TQString::number(itemToIndexSafe(tqfindItem(args[0], 0))); + return TQString::number(itemToIndexSafe(findItem(args[0], 0))); else { if (args[2].toUInt() && args[3].toUInt()) - return TQString::number(itemToIndexSafe(tqfindItem(args[0], args[1].toInt()))); + return TQString::number(itemToIndexSafe(findItem(args[0], args[1].toInt()))); else if (args[2].toUInt()) - return TQString::number(itemToIndexSafe(tqfindItem(args[0], args[1].toInt(), TQt::CaseSensitive | TQt::Contains))); + return TQString::number(itemToIndexSafe(findItem(args[0], args[1].toInt(), TQt::CaseSensitive | TQt::Contains))); else if (args[3].toUInt()) - return TQString::number(itemToIndexSafe(tqfindItem(args[0], args[1].toInt(), TQt::ExactMatch))); + return TQString::number(itemToIndexSafe(findItem(args[0], args[1].toInt(), TQt::ExactMatch))); else - return TQString::number(itemToIndexSafe(tqfindItem(args[0], args[1].toInt(), TQt::Contains))); + return TQString::number(itemToIndexSafe(findItem(args[0], args[1].toInt(), TQt::Contains))); } break; case DCOP::item: |