1 files changed, 18 insertions, 18 deletions

diff --git a/tqtinterface/qt4/tools/designer/plugins/glade/glade2ui.cpp b/tqtinterface/qt4/tools/designer/plugins/glade/glade2ui.cpp
index 4571cf5..88375b0 100644
--- a/tqtinterface/qt4/tools/designer/plugins/glade/glade2ui.cpp
+++ b/tqtinterface/qt4/tools/designer/plugins/glade/glade2ui.cpp
@@ -236,11 +236,11 @@ static AttributeMap attribute( const TQString& name, const TQString& val )
 static TQString entitize( const TQString& str )
 {
     TQString t = str;
-    t.tqreplace( '&', TQString("&") );
-    t.tqreplace( '>', TQString(">") );
-    t.tqreplace( '<', TQString("&lt;") );
-    t.tqreplace( '"', TQString("&quot;") );
-    t.tqreplace( '\'', TQString("&apos;") );
+    t.replace( '&', TQString("&amp;") );
+    t.replace( '>', TQString("&gt;") );
+    t.replace( '<', TQString("&lt;") );
+    t.replace( '"', TQString("&quot;") );
+    t.replace( '\'', TQString("&apos;") );
     return t;
 }
 
@@ -446,9 +446,9 @@ void Glade2Ui::emitAttribute( const TQString& prop, const TQVariant& val,
 static TQString accelerate( const TQString& gtkLabel )
 {
     TQString qtLabel = gtkLabel;
-    qtLabel.tqreplace( '&', TQString("&&") );
+    qtLabel.replace( '&', TQString("&&") );
     // close but not quite right
-    qtLabel.tqreplace( TQChar('_'), TQChar('&') );
+    qtLabel.replace( TQChar('_'), TQChar('&') );
     return qtLabel;
 }
 
@@ -456,7 +456,7 @@ static TQString decelerate( const TQString& gtkLabel )
 {
     TQString qtLabel = gtkLabel;
     // ditto
-    qtLabel.tqreplace( '_', TQString() );
+    qtLabel.replace( '_', TQString() );
     return qtLabel;
 }
 
@@ -591,17 +591,17 @@ int Glade2Ui::matchAccelOnActivate( const TQDomElement& accel )
 
     if ( key.length() == 5 ) {
 	flags = key[4].upper().latin1();
-    } else if ( yyKeyMap.tqcontains(key.mid(4)) ) {
+    } else if ( yyKeyMap.contains(key.mid(4)) ) {
 	flags = yyKeyMap[key.mid(4)];
     } else {
 	return 0;
     }
 
-    if ( modifiers.tqcontains(TQString("_CONTROL_")) )
+    if ( modifiers.contains(TQString("_CONTROL_")) )
 	flags |= TQt::CTRL;
-    if ( modifiers.tqcontains(TQString("_SHIFT_")) )
+    if ( modifiers.contains(TQString("_SHIFT_")) )
 	flags |= TQt::SHIFT;
-    if ( modifiers.tqcontains(TQString("_MOD1_")) )
+    if ( modifiers.contains(TQString("_MOD1_")) )
 	flags |= TQt::ALT;
     return flags;
 }
@@ -838,9 +838,9 @@ void Glade2Ui::emitPushButton( const TQString& text, const TQString& name )
 		 attribute(TQString("class"), TQString("TQPushButton")) );
     emitProperty( TQString("name"), name.latin1() );
     emitProperty( TQString("text"), text );
-    if ( name.tqcontains(TQString("ok")) > 0 ) {
+    if ( name.contains(TQString("ok")) > 0 ) {
 	emitProperty( TQString("default"), TQVariant(TRUE, 0) );
-    } else if ( name.tqcontains(TQString("help")) > 0 ) {
+    } else if ( name.contains(TQString("help")) > 0 ) {
 	emitProperty( TQString("accel"), (int) TQt::Key_F1 );
     }
     emitClosing( TQString("widget") );
@@ -1662,7 +1662,7 @@ TQString Glade2Ui::emitWidget( const TQDomElement& widget, bool layouted,
 		      button label.
 		    */
 		    label = getTextValue( n );
-		    int k = label.tqfindRev( TQChar('_') );
+		    int k = label.findRev( TQChar('_') );
 		    if ( k != -1 )
 			label = label.mid( k + 1 );
 		    if ( !label.isEmpty() && label != TQString("OK") )
@@ -1880,7 +1880,7 @@ TQString Glade2Ui::emitWidget( const TQDomElement& widget, bool layouted,
 			      gtk2qtSelectionMode(selectionMode),
 			      TQString("enum") );
 	    if ( !shadowType.endsWith(TQString("_NONE")) ) {
-		TQString tqshape = shadowType.tqcontains( TQString("_ETCHED_") ) > 0 ?
+		TQString tqshape = shadowType.contains( TQString("_ETCHED_") ) > 0 ?
 				TQString( "Box" ) : TQString( "WinPanel" );
 		TQString shadow = shadowType.endsWith( TQString("_IN") ) ?
 				 TQString( "Sunken" ) : TQString( "Raised" );
@@ -2106,7 +2106,7 @@ TQStringList Glade2Ui::convertGladeFile( const TQString& fileName )
 		char *data = new char[maxLength];
 
 		TQString dir = yyFileName;
-		dir.truncate( dir.tqfindRev(TQChar('/')) + 1 );
+		dir.truncate( dir.findRev(TQChar('/')) + 1 );
 		dir += yyPixmapDirectory;
 
 		emitOpening( TQString("images") );
@@ -2173,7 +2173,7 @@ TQStringList Glade2Ui::convertGladeFile( const TQString& fileName )
 	    emitFooter();
 
 	    TQString outFileName = fileName;
-	    int k = outFileName.tqfindRev( "." );
+	    int k = outFileName.findRev( "." );
 	    if ( k != -1 )
 		outFileName.truncate( k );
 	    if ( widgetNo != 0 )