1 files changed, 13 insertions, 13 deletions

diff --git a/tqtinterface/qt4/tools/designer/uic/object.cpp b/tqtinterface/qt4/tools/designer/uic/object.cpp
index 1ce89b8..77ca635 100644
--- a/tqtinterface/qt4/tools/designer/uic/object.cpp
+++ b/tqtinterface/qt4/tools/designer/uic/object.cpp
@@ -105,7 +105,7 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla
     int numColumns = 0;
     int numRows = 0;
 
-    if ( layouts.tqcontains( e.tagName() ) )
+    if ( layouts.contains( e.tagName() ) )
 	return createLayoutImpl( e, parentClass, tqparent, tqlayout );
 
     objClass = getClassName( e );
@@ -137,7 +137,7 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla
 	    // the tqlayout widget is not necessary, hide it by creating its child in the tqparent
 	    TQString result;
 	    for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) {
-		if (tags.tqcontains( n.tagName() ) )
+		if (tags.contains( n.tagName() ) )
 		    result = createObjectImpl( n, parentClass, tqparent, tqlayout );
 	    }
 	    return result;
@@ -227,28 +227,28 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla
 	    TQString call;
 	    TQString value;
 
-	    if ( objClass.tqcontains( "ListBox" ) ) {
+	    if ( objClass.contains( "ListBox" ) ) {
 		call = createListBoxItemImpl( n, objName );
 		if ( !call.isEmpty() ) {
 		    if ( numItems == 0 )
 			trout << indent << objName << "->clear();" << endl;
 		    trout << indent << call << endl;
 		}
-	    } else if ( objClass.tqcontains( "ComboBox" ) ) {
+	    } else if ( objClass.contains( "ComboBox" ) ) {
 		call = createListBoxItemImpl( n, objName, &value );
 		if ( !call.isEmpty() ) {
 		    if ( numItems == 0 )
 			trout << indent << objName << "->clear();" << endl;
 		    trout << indent << call << endl;
 		}
-	    } else if ( objClass.tqcontains( "IconView" ) ) {
+	    } else if ( objClass.contains( "IconView" ) ) {
 		call = createIconViewItemImpl( n, objName );
 		if ( !call.isEmpty() ) {
 		    if ( numItems == 0 )
 			trout << indent << objName << "->clear();" << endl;
 		    trout << indent << call << endl;
 		}
-	    } else if ( objClass.tqcontains( "ListView" ) ) {
+	    } else if ( objClass.contains( "ListView" ) ) {
 		call = createListViewItemImpl( n, objName, TQString() );
 		if ( !call.isEmpty() ) {
 		    if ( numItems == 0 )
@@ -262,7 +262,7 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla
 	    TQString call;
 	    TQString value;
 
-	    if ( objClass.tqcontains( "ListView" ) ) {
+	    if ( objClass.contains( "ListView" ) ) {
 		call = createListViewColumnImpl( n, objName, &value );
 		if ( !call.isEmpty() ) {
 		    out << call;
@@ -288,7 +288,7 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla
 
     if ( objClass == "TQTabWidget" ) {
 	for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) {
-	    if ( tags.tqcontains( n.tagName()  ) ) {
+	    if ( tags.contains( n.tagName()  ) ) {
 		TQString page = createObjectImpl( n, objClass, objName );
 		TQString comment;
 		TQString label = DomTool::readAttribute( n, "title", "", comment ).toString();
@@ -299,7 +299,7 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla
 	}
     } else if ( objClass == "TQWidgetStack" ) {
 	for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) {
-	    if ( tags.tqcontains( n.tagName()  ) ) {
+	    if ( tags.contains( n.tagName()  ) ) {
 		TQString page = createObjectImpl( n, objClass, objName );
 		int id = DomTool::readAttribute( n, "id", "" ).toInt();
 		out << indent << objName << "->addWidget( " << page << ", " << id << " );" << endl;
@@ -307,7 +307,7 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla
 	}
     } else if ( objClass == "TQToolBox" ) {
 	for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) {
-	    if ( tags.tqcontains( n.tagName()  ) ) {
+	    if ( tags.contains( n.tagName()  ) ) {
 		TQString page = createObjectImpl( n, objClass, objName );
 		TQString comment;
 		TQString label = DomTool::readAttribute( n, "label", "", comment ).toString();
@@ -328,7 +328,7 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla
 	     if ( iface2 ) {
 		 bool supportsPages = iface2->supportsPages( objClass );
 		 for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) {
-		     if ( tags.tqcontains( n.tagName()  ) ) {
+		     if ( tags.contains( n.tagName()  ) ) {
 			 if ( supportsPages ) {
 			     TQString page = createObjectImpl( n, objClass, objName );
 			     TQString comment;
@@ -345,7 +345,7 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla
 	 } else {
 #endif
 	     for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) {
-		 if ( tags.tqcontains( n.tagName() ) )
+		 if ( tags.contains( n.tagName() ) )
 		     createObjectImpl( n, objClass, objName );
 	     }
 #ifdef TQT_CONTAINER_CUSTOM_WIDGETS
@@ -582,7 +582,7 @@ TQString Uic::setObjectProperty( const TQString& objClass, const TQString& obj,
 	v = "int( ";
 	TQStringList::Iterator it = lst.begin();
 	while ( it != lst.end() ) {
-	    if (((*it).tqfind("Align", 0, TRUE) == 0)
+	    if (((*it).find("Align", 0, TRUE) == 0)
 		|| ((*it) == "WordBreak")) {
 		v += "TQt::" + *it;
 	    }