rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 10 insertions, 10 deletions

diff --git a/kdevdesigner/designer/popupmenueditor.cpp b/kdevdesigner/designer/popupmenueditor.cpp
index c5dcd8bf..78fe0aca 100644
--- a/kdevdesigner/designer/popupmenueditor.cpp
+++ b/kdevdesigner/designer/popupmenueditor.cpp
@@ -228,7 +228,7 @@ bool PopupMenuEditorItem::eventFilter( TQObject * o, TQEvent * event )
 	TQChildEvent * ce = ( TQChildEvent * ) event;
 	TQObject * c = TQT_TQOBJECT(ce->child());
 	TQAction * action = ::tqqt_cast<TQAction*>( c );
-	if ( s->tqfind( action ) != -1 ) // avoid duplicates
+	if ( s->find( action ) != -1 ) // avoid duplicates
 	    return FALSE;
 	TQActionGroup * actionGroup = ::tqqt_cast<TQActionGroup*>( c );
 	if ( actionGroup )
@@ -242,7 +242,7 @@ bool PopupMenuEditorItem::eventFilter( TQObject * o, TQEvent * event )
 void PopupMenuEditorItem::selfDestruct()
 {
     hideMenu();
-    int i = m->tqfind( s );
+    int i = m->find( s );
     if ( i != -1 && i < m->count() )
 	m->remove( i ); // remove this item
     a = 0; // the selfDestruct call was caused by the deletion of the action
@@ -374,7 +374,7 @@ void PopupMenuEditor::insert( TQActionGroup * actionGroup, int index )
     delete l;
 }
 
-int PopupMenuEditor::tqfind( const TQAction * action )
+int PopupMenuEditor::find( const TQAction * action )
 {
     PopupMenuEditorItem * i = itemList.first();
     while ( i ) {
@@ -385,7 +385,7 @@ int PopupMenuEditor::tqfind( const TQAction * action )
     return -1;
 }
 
-int PopupMenuEditor::tqfind( PopupMenuEditor * menu )
+int PopupMenuEditor::find( PopupMenuEditor * menu )
 {
     PopupMenuEditorItem * i = itemList.first();
     while ( i ) {
@@ -414,8 +414,8 @@ void PopupMenuEditor::exchange( int a, int b )
 	 ia == &addItem || ia == &addSeparator ||
 	 ib == &addItem || ib == &addSeparator )
 	return; // do nothing
-    itemList.tqreplace( b, ia );
-    itemList.tqreplace( a, ib );
+    itemList.replace( b, ia );
+    itemList.replace( a, ib );
 }
 
 void PopupMenuEditor::cut( int index )
@@ -786,7 +786,7 @@ void PopupMenuEditor::mouseMoveEvent( TQMouseEvent * e )
 	    // If the item is dropped in the same list,
 	    //  we will have two instances of the same pointer
 	    // in the list. We use node instead.
-	    int idx = itemList.tqfind( draggedItem );
+	    int idx = itemList.find( draggedItem );
 	    TQLNode * node = itemList.currentNode();
 
 	    d->dragCopy(); // dragevents and stuff happens
@@ -1229,7 +1229,7 @@ void PopupMenuEditor::dropInPlace( PopupMenuEditorItem * i, int y )
 	idx++;
 	n = itemList.next();
     }
-    int same = itemList.tqfindRef( i );
+    int same = itemList.findRef( i );
     AddActionToPopupCommand * cmd = new AddActionToPopupCommand( i18n( "Drop Item" ), formWnd, this, i, idx );
     formWnd->commandHistory()->addCommand( cmd );
     cmd->execute();
@@ -1410,7 +1410,7 @@ void PopupMenuEditor::leaveEditMode( TQKeyEvent * e )
 	// new item was created
 	TQAction * a = formWnd->mainWindow()->actioneditor()->newActionEx();
 	TQString actionText = lineEdit->text();
-	actionText.tqreplace("&&", "&");
+	actionText.replace("&&", "&");
 	TQString menuText = lineEdit->text();
 	a->setText( actionText );
 	a->setMenuText( menuText );
@@ -1451,7 +1451,7 @@ TQString PopupMenuEditor::constructName( PopupMenuEditorItem *item )
     TQWidget *e = parentEditor();
     PopupMenuEditor *p = ::tqqt_cast<PopupMenuEditor*>(e);
     if ( p ) {
-	int idx = p->tqfind( item->m );
+	int idx = p->find( item->m );
 	PopupMenuEditorItem * i = ( idx > -1 ? p->at( idx ) : 0 );
 	s = ( i ? TQString( i->action()->name() ).remove( "Action" ) : TQString( "" ) );
     } else {