rename the following methods:

tqfind find
tqreplace replace
tqcontains contains

2 files changed, 20 insertions, 20 deletions

diff --git a/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.cpp b/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.cpp
index 57ea838..ef46eea 100644
--- a/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.cpp
+++ b/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.cpp
@@ -184,7 +184,7 @@ static TQImage loadImageData( const TQString& format, ulong len, TQByteArray dat
 	dataTmp[3] = ( len & 0x000000ff );
 	TQByteArray baunzip = tqUncompress( dataTmp );
 	len = baunzip.size();
-	img.loadFromData( (const uchar*)baunzip.data(), len, format.left(format.tqfind('.')) );
+	img.loadFromData( (const uchar*)baunzip.data(), len, format.left(format.find('.')) );
     } else {
 	img.loadFromData( (const uchar*)data.data(), data.size(), format );
     }
@@ -362,7 +362,7 @@ TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidge
 #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() ) !=
+	    if ( widgetFactory->noDatabaseWidgets.find( cit.key()->name() ) !=
 		 widgetFactory->noDatabaseWidgets.end() )
 		continue;
 	    if ( cit.key()->inherits( "TQDesignerDataBrowser2" ) )
@@ -378,10 +378,10 @@ TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidge
 	    TQDataTable *table = (TQDataTable*)widgetFactory->toplevel->child( it.key(), "TQDataTable" );
 	    if ( !table )
 		continue;
-	    if ( widgetFactory->noDatabaseWidgets.tqfind( table->name() ) !=
+	    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;
@@ -1370,7 +1370,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in,
     return toplevel;
 }
 
-/*! Installs a widget factory \a factory, which normally tqcontains
+/*! Installs a widget factory \a factory, which normally contains
   additional widgets that can then be created using a TQWidgetFactory.
   See createWidget() for further details.
 */
@@ -1545,7 +1545,7 @@ TQWidget *TQWidgetFactory::createWidget( const TQString &className, TQWidget *tq
     if ( iface ) {
 	TQWidget *w = iface->create( className, tqparent, name );
 	if ( w ) {
-	    d->customWidgets.tqreplace( className.latin1(), new bool(TRUE) );
+	    d->customWidgets.replace( className.latin1(), new bool(TRUE) );
 	    return w;
 	}
     }
@@ -1575,7 +1575,7 @@ otherwise returns FALSE. */
 bool TQWidgetFactory::supportsWidget( const TQString &widget )
 {
     setupWidgetListAndMap();
-    return ( availableWidgetMap->tqfind( widget ) != availableWidgetMap->end() );
+    return ( availableWidgetMap->find( widget ) != availableWidgetMap->end() );
 }
 
 TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget *tqparent,
@@ -1638,7 +1638,7 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget
     }
 #ifdef TQT_CONTAINER_CUSTOM_WIDGETS
     TQString parentClassName = tqparent ? tqparent->className() : 0;
-    bool isPlugin = tqparent ? !!d->customWidgets.tqfind( tqparent->className() ) : FALSE;
+    bool isPlugin = tqparent ? !!d->customWidgets.find( tqparent->className() ) : FALSE;
     if ( isPlugin )
 	qWarning( "####### loading custom container widgets without page support not implemented!" );
     // ### TODO loading for custom container widgets without pages
@@ -1819,7 +1819,7 @@ TQWidgetFactory::LayoutType TQWidgetFactory::layoutType( TQLayout *tqlayout ) co
 void TQWidgetFactory::setProperty( TQObject* obj, const TQString &prop,
 				  TQVariant value )
 {
-    int offset = obj->tqmetaObject()->tqfindProperty( prop, TRUE );
+    int offset = obj->tqmetaObject()->findProperty( prop, TRUE );
 
     if ( offset != -1 ) {
 	if ( prop == "geometry" && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(toplevel) ) {
@@ -2092,7 +2092,7 @@ void TQWidgetFactory::loadConnections( const TQDomElement &e, TQObject *connecto
 			}
 		    }
 		    if ( !conn.sender )
-			conn.sender = tqfindAction( name );
+			conn.sender = findAction( name );
 		} else if ( n2.tagName() == "signal" ) {
 		    conn.signal = n2.firstChild().toText().data();
 		} else if ( n2.tagName() == "receiver" ) {
@@ -2135,7 +2135,7 @@ void TQWidgetFactory::loadConnections( const TQDomElement &e, TQObject *connecto
 		delete l;
 	    }
 	    if ( !sender )
-		sender = tqfindAction( conn.sender->name() );
+		sender = findAction( conn.sender->name() );
 
 	    if ( qstrcmp( conn.receiver->name(), toplevel->name() ) == 0 ) {
 		receiver = TQT_TQOBJECT(toplevel);
@@ -2159,14 +2159,14 @@ void TQWidgetFactory::loadConnections( const TQDomElement &e, TQObject *connecto
 	    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;
 	    }
@@ -2235,8 +2235,8 @@ void TQWidgetFactory::createTableColumnOrRow( TQTable *table, const TQString& tx
     }
 
     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 );
     }
 
@@ -2487,7 +2487,7 @@ void TQWidgetFactory::loadToolBars( const TQDomElement &e )
 	    TQDomElement n2 = n.firstChild().toElement();
 	    while ( !n2.isNull() ) {
 		if ( n2.tagName() == "action" ) {
-		    TQAction *a = tqfindAction( n2.attribute( "name" ) );
+		    TQAction *a = findAction( n2.attribute( "name" ) );
 		    if ( a )
 			a->addTo( tb );
 		} else if ( n2.tagName() == "separator" ) {
@@ -2530,7 +2530,7 @@ void TQWidgetFactory::loadPopupMenu( TQPopupMenu *p, const TQDomElement &e )
     TQDomElement n = e.firstChild().toElement();
     while ( !n.isNull() ) {
 	if ( n.tagName() == "action" || n.tagName() == "actiongroup" ) {
-	    TQAction *a = tqfindAction( n.attribute( "name" ) );
+	    TQAction *a = findAction( n.attribute( "name" ) );
 	    TQDomElement n2 = n.nextSibling().toElement();
 	    if ( n2.tagName() == "item") { // load submenu
 		TQPopupMenu *popup = new TQPopupMenu( mw );
@@ -2563,7 +2563,7 @@ void TQWidgetFactory::loadFunctions( const TQDomElement & )
 {
 }
 
-TQAction *TQWidgetFactory::tqfindAction( const TQString &name )
+TQAction *TQWidgetFactory::findAction( const TQString &name )
 {
     for ( TQAction *a = actionList.first(); a; a = actionList.next() ) {
 	if ( TQString( a->name() ) == name )
diff --git a/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.h b/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.h
index 06227a2..0ce05e9 100644
--- a/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.h
+++ b/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.h
@@ -103,7 +103,7 @@ private:
     void loadMenuBar( const TQDomElement &e );
     void loadPopupMenu( TQPopupMenu *p, const TQDomElement &e );
     void loadFunctions( const TQDomElement &e );
-    TQAction *tqfindAction( const TQString &name );
+    TQAction *findAction( const TQString &name );
     void loadExtraSource();
     TQString translate( const char *sourceText, const char *comment = "" );
     TQString translate( const TQString& sourceText, const TQString& comment = TQString() );