1 files changed, 21 insertions, 21 deletions

diff --git a/tqtinterface/qt4/tools/designer/designer/formfile.cpp b/tqtinterface/qt4/tools/designer/designer/formfile.cpp
index 3701d02..6b706a9 100644
--- a/tqtinterface/qt4/tools/designer/designer/formfile.cpp
+++ b/tqtinterface/qt4/tools/designer/designer/formfile.cpp
@@ -53,17 +53,17 @@
 static TQString make_func_pretty( const TQString &s )
 {
     TQString res = s;
-    if ( res.tqfind( ")" ) - res.tqfind( "(" ) == 1 )
+    if ( res.find( ")" ) - res.find( "(" ) == 1 )
 	return res;
-    res.tqreplace( "(", "( " );
-    res.tqreplace( ")", " )" );
-    res.tqreplace( "&", " &" );
-    res.tqreplace( "*", " *" );
-    res.tqreplace( ",", ", " );
-    res.tqreplace( ":", " : " );
+    res.replace( "(", "( " );
+    res.replace( ")", " )" );
+    res.replace( "&", " &" );
+    res.replace( "*", " *" );
+    res.replace( ",", ", " );
+    res.replace( ":", " : " );
     res = res.simplifyWhiteSpace();
-    res.tqreplace( " : : ", "::" );
-    res.tqreplace( ">>", "> >" );
+    res.replace( " : : ", "::" );
+    res.replace( ">>", "> >" );
     return res;
 }
 
@@ -113,7 +113,7 @@ void FormFile::setFileName( const TQString &fn )
 	return;
     if ( fn.isEmpty() ) {
 	fileNameTemp = TRUE;
-	if ( filename.tqfind( "unnamed" ) != 0 )
+	if ( filename.find( "unnamed" ) != 0 )
 	    filename = createUnnamedFileName();
 	return;
     } else {
@@ -267,7 +267,7 @@ bool FormFile::saveAs( bool ignoreModified )
     TQString f = pro->makeAbsolute( fileName() );
     if ( fileNameTemp && formWindow() ) {
 	f = TQString( formWindow()->name() ).lower();
-	f.tqreplace( "::", "_" );
+	f.replace( "::", "_" );
 	f = pro->makeAbsolute( f + ".ui" );
     }
     bool saved = FALSE;
@@ -767,7 +767,7 @@ void FormFile::removeFunctionCode( MetaDataBase::Function function )
 	    int line = 0;
 	    int start = 0;
 	    while ( line < (*fit).start - 1 ) {
-		start = sourceCode.tqfind( '\n', start );
+		start = sourceCode.find( '\n', start );
 		if ( start == -1 )
 		    return;
 		start++;
@@ -777,7 +777,7 @@ void FormFile::removeFunctionCode( MetaDataBase::Function function )
 	        return;
 	    int end = start;
 	    while ( line < (*fit).end + 1 ) {
-		end = sourceCode.tqfind( '\n', end );
+		end = sourceCode.find( '\n', end );
 		if ( end == -1 ) {
 		    if ( line <= (*fit).end )
 			end = sourceCode.length() - 1;
@@ -799,7 +799,7 @@ void FormFile::functionNameChanged( const TQString &oldName, const TQString &new
 {
     if ( !cod.isEmpty() ) {
 	TQString funcStart = TQString( formWindow()->name() ) + TQString( "::" );
-	int i = cod.tqfind( funcStart + oldName );
+	int i = cod.find( funcStart + oldName );
 	if ( i != -1 ) {
 	    cod.remove( i + funcStart.length(), oldName.length() );
 	    cod.insert( i + funcStart.length(), newName );
@@ -813,7 +813,7 @@ void FormFile::functionRetTypeChanged( const TQString &fuName, const TQString &o
 	TQString oldFunct = oldType + " " + TQString( formWindow()->name() ) + "::" + fuName;
 	TQString newFunct = newType + " " + TQString( formWindow()->name() ) + "::" + fuName;
 
-	int i = cod.tqfind( oldFunct );
+	int i = cod.find( oldFunct );
 	if ( i != -1 ) {
 	    cod.remove( i, oldFunct.length() );
 	    cod.insert( i, newFunct );
@@ -838,7 +838,7 @@ TQString FormFile::formName() const
 	while ( !ts.eof() ) {
 	    line = ts.readLine();
 	    if ( !className.isEmpty() ) {
-		int end = line.tqfind( "</class>" );
+		int end = line.find( "</class>" );
 		if ( end == -1 ) {
 		    className += line;
 		} else {
@@ -848,8 +848,8 @@ TQString FormFile::formName() const
 		continue;
 	    }
 	    int start;
-	    if ( ( start = line.tqfind( "<class>" ) ) != -1 ) {
-		int end = line.tqfind( "</class>" );
+	    if ( ( start = line.find( "<class>" ) ) != -1 ) {
+		int end = line.find( "</class>" );
 		if ( end == -1 ) {
 		    className = line.mid( start + 7 );
 		} else {
@@ -872,10 +872,10 @@ void FormFile::formWindowChangedSomehow()
 
 bool FormFile::checkFileName( bool allowBreak )
 {
-    FormFile *ff = pro->tqfindFormFile( filename, this );
+    FormFile *ff = pro->findFormFile( filename, this );
     if ( ff )
 	TQMessageBox::warning( MainWindow::self, tr( "Invalid Filename" ),
-			      tr( "The project already tqcontains a form with a\n"
+			      tr( "The project already contains a form with a\n"
 				  "filename of '%1'. Please choose a new filename." ).arg( filename ) );
     if (!formWindow()) // We are starting up
         return FALSE;
@@ -892,7 +892,7 @@ bool FormFile::checkFileName( bool allowBreak )
 		return FALSE;
 	}
 	filename = pro->makeRelative( fn );
-	ff = pro->tqfindFormFile( filename, this );
+	ff = pro->findFormFile( filename, this );
      }
     return TRUE;
 }