Fix incorrect conversion

1 files changed, 99 insertions, 99 deletions

diff --git a/qtruby/rubylib/designer/rbuic/form.cpp b/qtruby/rubylib/designer/rbuic/form.cpp
index eb9d6ee7..bbb0c7f6 100644
--- a/qtruby/rubylib/designer/rbuic/form.cpp
+++ b/qtruby/rubylib/designer/rbuic/form.cpp
@@ -42,7 +42,7 @@
 
 #include <zlib.h>
 
-static TTQByteArray unzipXPM( TTQString data, ulong& length )
+static TQByteArray unzipXPM( TQString data, ulong& length )
 {
     const int lengthOffset = 4;
     int baSize = data.length() / 2 + lengthOffset;
@@ -68,13 +68,13 @@ static TTQByteArray unzipXPM( TTQString data, ulong& length )
     ba[1] = ( length & 0x00ff0000 ) >> 16;
     ba[2] = ( length & 0x0000ff00 ) >> 8;
     ba[3] = ( length & 0x000000ff );
-    TTQByteArray baunzip = qUncompress( ba, baSize );
+    TQByteArray baunzip = qUncompress( ba, baSize );
     delete[] ba;
     return baunzip;
 }
 
-static TTQString imageDataName(TTQString name) {
-	TTQString result = name + "_data";
+static TQString imageDataName(TQString name) {
+	TQString result = name + "_data";
 	result.replace("@", "@@");
 	return result;
 }
@@ -84,15 +84,15 @@ static TTQString imageDataName(TTQString name) {
 
   \sa createFormDecl(), createObjectImpl()
  */
-void Uic::createFormImpl( const TTQDomElement &e )
+void Uic::createFormImpl( const TQDomElement &e )
 {
-    TTQDomElement n;
-    TTQDomNodeList nl;
+    TQDomElement n;
+    TQDomNodeList nl;
     int i;
-    TTQString objClass = getClassName( e );
+    TQString objClass = getClassName( e );
     if ( objClass.isEmpty() )
 	return;
-    TTQString objName = getObjectName( e );
+    TQString objName = getObjectName( e );
 	
 	if (hasKDEwidget) {
     	out << indent << "retquire 'Korundum'" << endl << endl;
@@ -101,16 +101,16 @@ void Uic::createFormImpl( const TTQDomElement &e )
 	}
 
     // generate local and local includes retquired
-    TTQStringList globalIncludes, localIncludes;
-    TTQStringList::Iterator it;
-    TTQStringList sqlClasses;
+    TQStringList globalIncludes, localIncludes;
+    TQStringList::Iterator it;
+    TQStringList sqlClasses;
 
-    TTQMap<TTQString, CustomInclude> customWidgetIncludes;
-    TTQMap<TTQString, TTQString> functionImpls;
+    TQMap<TQString, CustomInclude> customWidgetIncludes;
+    TQMap<TQString, TQString> functionImpls;
 
     // find additional slots
-    TTQStringList extraSlots;
-    TTQStringList extraSlotTypes;
+    TQStringList extraSlots;
+    TQStringList extraSlotTypes;
     nl = e.parentNode().toElement().elementsByTagName( "slot" );
     for ( i = 0; i < (int) nl.length(); i++ ) {
 	n = nl.item(i).toElement();
@@ -119,7 +119,7 @@ void Uic::createFormImpl( const TTQDomElement &e )
 	    continue;
 	if ( n.attribute( "language", "C++" ) != "C++" )
 	    continue;
-	TTQString slotName = n.firstChild().toText().data().stripWhiteSpace();
+	TQString slotName = n.firstChild().toText().data().stripWhiteSpace();
 	if ( slotName.endsWith( ";" ) )
 	    slotName = slotName.left( slotName.length() - 1 );
 
@@ -128,7 +128,7 @@ void Uic::createFormImpl( const TTQDomElement &e )
     }
 
     // find signals
-    TTQStringList extraSignals;
+    TQStringList extraSignals;
     nl = e.parentNode().toElement().elementsByTagName( "signal" );
     for ( i = 0; i < (int) nl.length(); i++ ) {
 	n = nl.item(i).toElement();
@@ -137,19 +137,19 @@ void Uic::createFormImpl( const TTQDomElement &e )
 	    continue;
 	if ( n.attribute( "language", "C++" ) != "C++" )
 	    continue;
-	TTQString sigName = n.firstChild().toText().data().stripWhiteSpace();
+	TQString sigName = n.firstChild().toText().data().stripWhiteSpace();
 	if ( sigName.endsWith( ";" ) )
 	    sigName = sigName.left( sigName.length() - 1 );
 	extraSignals += sigName;
     }
 
     //find additional functions
-    TTQStringList extraFunctions;
+    TQStringList extraFunctions;
     for ( n = e; !n.isNull(); n = n.nextSibling().toElement() ) {
         if ( n.tagName() == "functions" ) { // compatibility
-            for ( TTQDomElement n2 = n.firstChild().toElement(); !n2.isNull(); n2 = n2.nextSibling().toElement() ) {
+            for ( TQDomElement n2 = n.firstChild().toElement(); !n2.isNull(); n2 = n2.nextSibling().toElement() ) {
                 if ( n2.tagName() == "function" ) {
-                    TTQString fname;
+                    TQString fname;
                     if( !n2.attribute("name").isNull() )
                     {
                         fname = n2.attribute( "name" );
@@ -165,11 +165,11 @@ void Uic::createFormImpl( const TTQDomElement &e )
                 }
             }
         } else if ( n.tagName() == "customwidgets" ) {
-	    TTQDomElement n2 = n.firstChild().toElement();
+	    TQDomElement n2 = n.firstChild().toElement();
 	    while ( !n2.isNull() ) {
 		if ( n2.tagName() == "customwidget" ) {
-		    TTQDomElement n3 = n2.firstChild().toElement();
-		    TTQString cl, header;
+		    TQDomElement n3 = n2.firstChild().toElement();
+		    TQString cl, header;
 		    WidgetDatabaseRecord *r = new WidgetDatabaseRecord;
 		    while ( !n3.isNull() ) {
 			if ( n3.tagName() == "class" ) {
@@ -253,7 +253,7 @@ void Uic::createFormImpl( const TTQDomElement &e )
     ++indent;
 
     // additional attributes (from Designer)
-    TTQStringList publicVars, protectedVars, privateVars;
+    TQStringList publicVars, protectedVars, privateVars;
     nl = e.parentNode().toElement().elementsByTagName( "variable" );
     for ( i = 0; i < (int)nl.length(); i++ ) {
         n = nl.item( i ).toElement();
@@ -261,8 +261,8 @@ void Uic::createFormImpl( const TTQDomElement &e )
         // Someday it should be uncommented.
         //if ( n.parentNode().toElement().tagName() != "variables" )
         //    continue;
-        TTQString access = n.attribute( "access", "protected" );
-        TTQString var = n.firstChild().toText().data().stripWhiteSpace();
+        TQString access = n.attribute( "access", "protected" );
+        TQString var = n.firstChild().toText().data().stripWhiteSpace();
         if ( var.endsWith( ";" ) )
             var.truncate(var.length() - 1);
         if ( access == "public" )
@@ -288,10 +288,10 @@ void Uic::createFormImpl( const TTQDomElement &e )
     // additional includes (local or global ) and forward declaractions
     nl = e.parentNode().toElement().elementsByTagName( "include" );
     for ( i = 0; i < (int) nl.length(); i++ ) {
-	TTQDomElement n2 = nl.item(i).toElement();
-	TTQString s = n2.firstChild().toText().data();
+	TQDomElement n2 = nl.item(i).toElement();
+	TQString s = n2.firstChild().toText().data();
 	if ( n2.attribute( "location" ) != "local" ) {
-	    if ( s.right( 5 ) == ".ui.h" && !TTQFile::exists( s ) )
+	    if ( s.right( 5 ) == ".ui.h" && !TQFile::exists( s ) )
 		continue;
 	    if ( n2.attribute( "impldecl", "in implementation" ) != "in implementation" )
 		continue;
@@ -301,10 +301,10 @@ void Uic::createFormImpl( const TTQDomElement &e )
 
     // do the local includes afterwards, since global includes have priority on clashes
     for ( i = 0; i < (int) nl.length(); i++ ) {
-	TTQDomElement n2 = nl.item(i).toElement();
-	TTQString s = n2.firstChild().toText().data();
+	TQDomElement n2 = nl.item(i).toElement();
+	TQString s = n2.firstChild().toText().data();
 	if ( n2.attribute( "location" ) == "local" &&!globalIncludes.contains( s ) ) {
-	    if ( s.right( 5 ) == ".ui.h" && !TTQFile::exists( s ) )
+	    if ( s.right( 5 ) == ".ui.h" && !TQFile::exists( s ) )
 		continue;
 	    if ( n2.attribute( "impldecl", "in implementation" ) != "in implementation" )
 		continue;
@@ -315,8 +315,8 @@ void Uic::createFormImpl( const TTQDomElement &e )
     // additional custom widget headers
     nl = e.parentNode().toElement().elementsByTagName( "header" );
     for ( i = 0; i < (int) nl.length(); i++ ) {
-	TTQDomElement n2 = nl.item(i).toElement();
-	TTQString s = n2.firstChild().toText().data();
+	TQDomElement n2 = nl.item(i).toElement();
+	TQString s = n2.firstChild().toText().data();
 	if ( n2.attribute( "location" ) != "local" )
 	    globalIncludes += s;
 	else
@@ -325,17 +325,17 @@ void Uic::createFormImpl( const TTQDomElement &e )
 
 
     // grab slots/funcs defined in ui.h files
-    for(TTQStringList::Iterator it = localIncludes.begin(); it != localIncludes.end(); ++it)
+    for(TQStringList::Iterator it = localIncludes.begin(); it != localIncludes.end(); ++it)
     {
         if((*it).right( 5 ) == ".ui.h")
         {
-            TTQFile f((*it));
+            TQFile f((*it));
             if( f.open( IO_ReadOnly ) )
             {
-                TTQRegExp re("^def\\s+([a-zA-Z0-9_]+)\\s.*$");
-                TTQRegExp re2("^end\\s*$");
-                TTQTextStream t( &f );
-                TTQString s, s2, s3;
+                TQRegExp re("^def\\s+([a-zA-Z0-9_]+)\\s.*$");
+                TQRegExp re2("^end\\s*$");
+                TQTextStream t( &f );
+                TQString s, s2, s3;
                 while ( !t.eof() )
                 {
                     s = t.readLine();
@@ -366,7 +366,7 @@ void Uic::createFormImpl( const TTQDomElement &e )
     for ( it = tags.begin(); it != tags.end(); ++it ) {
 	nl = e.parentNode().toElement().elementsByTagName( *it );
 	for ( i = 1; i < (int) nl.length(); i++ ) { // start at 1, 0 is the toplevel widget
-	    TTQString name = getClassName( nl.item(i).toElement() );
+	    TQString name = getClassName( nl.item(i).toElement() );
 	    if ( name == "Spacer" ) {
 		globalIncludes += "tqlayout.h";
 		globalIncludes += "tqapplication.h";
@@ -375,8 +375,8 @@ void Uic::createFormImpl( const TTQDomElement &e )
 	    if ( name.mid( 4 ) == "ListView" )
 		globalIncludes += "tqheader.h";
 	    if ( name != objClass ) {
-		int wid = WidgetDatabase::idFromClassName( name.replace( TTQRegExp("^TQt::"), "Q" ) );
-		TTQMap<TTQString, CustomInclude>::Iterator it = customWidgetIncludes.find( name );
+		int wid = WidgetDatabase::idFromClassName( name.replace( TQRegExp("^TQt::"), "Q" ) );
+		TQMap<TQString, CustomInclude>::Iterator it = customWidgetIncludes.find( name );
 		if ( it == customWidgetIncludes.end() )
 		    globalIncludes += WidgetDatabase::includeFile( wid );
 	    }
@@ -417,22 +417,22 @@ void Uic::createFormImpl( const TTQDomElement &e )
     out << endl;
 
     // find out what images are retquired
-    TTQStringList retquiredImages;
+    TQStringList retquiredImages;
     static const char *imgTags[] = { "pixmap", "iconset", 0 };
     for ( i = 0; imgTags[i] != 0; i++ ) {
        nl = e.parentNode().toElement().elementsByTagName( imgTags[i] );
        for ( int j = 0; j < (int) nl.length(); j++ ) {
-           TTQString img = "@";
+           TQString img = "@";
            retquiredImages += (img + nl.item(j).firstChild().toText().data());
 		}
     }
 
     // register the object and unify its name
-	TTQString loadFunction(objName);
+	TQString loadFunction(objName);
     objName = registerObject( objName );
 
-    TTQStringList images;
-    TTQStringList xpmImages;
+    TQStringList images;
+    TQStringList xpmImages;
     if ( pixmapLoaderFunction.isEmpty() && !externPixmaps )
     {
 	// create images
@@ -443,19 +443,19 @@ void Uic::createFormImpl( const TTQDomElement &e )
 		nl = n.elementsByTagName( "image" );
 		for ( i = 0; i < (int) nl.length(); i++ )
                 {
-		    TTQString img = registerObject(  nl.item(i).toElement().attribute( "name" ) );
+		    TQString img = registerObject(  nl.item(i).toElement().attribute( "name" ) );
 		    if ( !retquiredImages.contains( img ) )
 			continue;
-		    TTQDomElement tmp = nl.item(i).firstChild().toElement();
+		    TQDomElement tmp = nl.item(i).firstChild().toElement();
 		    if ( tmp.tagName() != "data" )
 			continue;
-		    TTQString format = tmp.attribute("format", "PNG" );
-		    TTQString data = tmp.firstChild().toText().data();
+		    TQString format = tmp.attribute("format", "PNG" );
+		    TQString data = tmp.firstChild().toText().data();
 		    if ( format == "XPM.GZ" )
                     {
 			xpmImages += img;
 			ulong length = tmp.attribute("length").toULong();
-			TTQByteArray baunzip = unzipXPM( data, length );
+			TQByteArray baunzip = unzipXPM( data, length );
 			// shouldn't we test the initial `length' against the
 			// resulting `length' to catch corrupt UIC files?
 			int a = 0;
@@ -484,13 +484,13 @@ void Uic::createFormImpl( const TTQDomElement &e )
 			++indent;
  			int a ;
 			for ( a = 0; a < (int) (data.length()/2)-1; a++ ) {
-			    out << "0x" << TTQString(data[2*a]) << TTQString(data[2*a+1]) << ",";
+			    out << "0x" << TQString(data[2*a]) << TQString(data[2*a+1]) << ",";
 			    if ( a % 12 == 11 )
 				out << endl << "    ";
 			    else
 				out << " ";
 			}
-			out << "0x" << TTQString(data[2*a]) << TTQString(data[2*a+1]) << " ].pack \"C*\"" << endl;
+			out << "0x" << TQString(data[2*a]) << TQString(data[2*a+1]) << " ].pack \"C*\"" << endl;
 			--indent;
                         out << endl;
 		    }
@@ -548,7 +548,7 @@ void Uic::createFormImpl( const TTQDomElement &e )
 
     // create pixmaps for all images
     if ( !images.isEmpty() ) {
-	TTQStringList::Iterator it;
+	TQStringList::Iterator it;
 	for ( it = images.begin(); it != images.end(); ++it ) {
 	    out << indent << (*it) << " = TQt::Pixmap.new()" << endl;
 	    out << indent << (*it) << ".loadFromData(" << imageDataName(*it) << ", " << imageDataName(*it) << ".length, \"PNG\")" << endl;
@@ -567,21 +567,21 @@ void Uic::createFormImpl( const TTQDomElement &e )
 	out << indent << "statusBar()" << endl;
 
     // set the properties
-   TTQSize geometry( 0, 0 );
+   TQSize geometry( 0, 0 );
     
 	for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) {
 	if ( n.tagName() == "property" ) {
 	    bool stdset = stdsetdef;
 	    if ( n.hasAttribute( "stdset" ) )
 		stdset = toBool( n.attribute( "stdset" ) );
-	    TTQString prop = n.attribute("name");
-	    TTQDomElement n2 = n.firstChild().toElement();
-	    TTQString value = setObjectProperty( objClass, TTQString::null, prop, n2, stdset );
+	    TQString prop = n.attribute("name");
+	    TQDomElement n2 = n.firstChild().toElement();
+	    TQString value = setObjectProperty( objClass, TQString::null, prop, n2, stdset );
 	    if ( value.isEmpty() )
 		continue;
 		
 	    if ( prop == "geometry" && n2.tagName() == "rect") {
-		TTQDomElement n3 = n2.firstChild().toElement();
+		TQDomElement n3 = n2.firstChild().toElement();
 		while ( !n3.isNull() ) {
 		    if ( n3.tagName() == "width" )
 			geometry.setWidth( n3.firstChild().toText().data().toInt() );
@@ -590,7 +590,7 @@ void Uic::createFormImpl( const TTQDomElement &e )
 		    n3 = n3.nextSibling().toElement();
 		}
 	    } else {
-		TTQString call;
+		TQString call;
 		if ( stdset ) {
 		    call = mkStdSet( prop ) + "(" + value + ")";
 		} else {
@@ -620,12 +620,12 @@ void Uic::createFormImpl( const TTQDomElement &e )
         {
 	    if ( tags.contains( n.tagName()  ) )
             {
-		TTQString page = createObjectImpl( n, objClass, "self" );
-		TTQString comment;
-		TTQString label = DomTool::readAttribute( n, "title", "", comment ).toString();
+		TQString page = createObjectImpl( n, objClass, "self" );
+		TQString comment;
+		TQString label = DomTool::readAttribute( n, "title", "", comment ).toString();
 		out << indent << "addPage(" << page << ", "<< trcall( label ) << ")" << endl;
 		trout << indent << "setTitle( " << page << ", " << trcall( label, comment ) << " )" << endl;
-		TTQVariant def( false, 0 );
+		TQVariant def( false, 0 );
 		if ( DomTool::hasAttribute( n, "backEnabled" ) )
 		    out << indent << "setBackEnabled(" << page << "," << mkBool( DomTool::readAttribute( n, "backEnabled", def).toBool() ) << ");" << endl;
 		if ( DomTool::hasAttribute( n, "nextEnabled" ) )
@@ -661,13 +661,13 @@ void Uic::createFormImpl( const TTQDomElement &e )
     nl = e.parentNode().toElement().elementsByTagName( "widget" );
     for ( i = 1; i < (int) nl.length(); i++ ) { // start at 1, 0 is the toplevel widget
 	n = nl.item(i).toElement();
-	TTQString s = getClassName( n );
+	TQString s = getClassName( n );
 	if ( s == "TQt::DataBrowser" || s == "TQt::DataView" ) {
-	    TTQString objName = getObjectName( n );
-	    TTQString tab = getDatabaseInfo( n, "table" );
-	    TTQString con = getDatabaseInfo( n, "connection" );
+	    TQString objName = getObjectName( n );
+	    TQString tab = getDatabaseInfo( n, "table" );
+	    TQString con = getDatabaseInfo( n, "connection" );
 	    out << indent << objName << "Form = TQt::SqlForm.new(self, \"" << objName << "Form\")" << endl;
-	    TTQDomElement n2;
+	    TQDomElement n2;
 	    for ( n2 = n.firstChild().toElement(); !n2.isNull(); n2 = n2.nextSibling().toElement() )
 		createFormImpl( n2, objName, con, tab );
 	    out << indent << objName << ".setForm(" << objName << "Form)" << endl;
@@ -724,8 +724,8 @@ void Uic::createFormImpl( const TTQDomElement &e )
 	    out << endl;
 	    nl = n.elementsByTagName( "connection" );
 	    for ( i = 0; i < (int) nl.length(); i++ ) {
-		TTQString sender, receiver, signal, slot;
-		for ( TTQDomElement n2 = nl.item(i).firstChild().toElement(); !n2.isNull(); n2 = n2.nextSibling().toElement() ) {
+		TQString sender, receiver, signal, slot;
+		for ( TQDomElement n2 = nl.item(i).firstChild().toElement(); !n2.isNull(); n2 = n2.nextSibling().toElement() ) {
 		    if ( n2.tagName() == "sender" )
 			sender = n2.firstChild().toText().data();
 		    else if ( n2.tagName() == "receiver" )
@@ -756,11 +756,11 @@ void Uic::createFormImpl( const TTQDomElement &e )
 	} else if ( n.tagName()  == "tabstops" ) {
 	    // setup tab order
 	    out << endl;
-	    TTQString lastName;
-	    TTQDomElement n2 = n.firstChild().toElement();
+	    TQString lastName;
+	    TQDomElement n2 = n.firstChild().toElement();
 	    while ( !n2.isNull() ) {
 		if ( n2.tagName() == "tabstop" ) {
-		    TTQString name = n2.firstChild().toText().data();
+		    TQString name = n2.firstChild().toText().data();
 		    name = registeredName( name );
 		    if ( !lastName.isEmpty() )
 			out << indent << "setTabOrder(" << lastName << ", " << name << ")" << endl;
@@ -774,7 +774,7 @@ void Uic::createFormImpl( const TTQDomElement &e )
 // QtRuby - FIXME: what the heck is this ?
     // buddies
     bool firstBuddy = true;
-    for ( TTQValueList<Buddy>::Iterator buddy = buddies.begin(); buddy != buddies.end(); ++buddy ) {
+    for ( TQValueList<Buddy>::Iterator buddy = buddies.begin(); buddy != buddies.end(); ++buddy ) {
 	if ( isObjectRegistered( (*buddy).buddy ) ) {
 	    if ( firstBuddy ) {
 		out << endl;
@@ -803,7 +803,7 @@ void Uic::createFormImpl( const TTQDomElement &e )
     for ( i = 0; i < (int) nl.length(); i++ ) {
 	if ( !DomTool::propertiesOfType( nl.item(i).toElement() , "font" ).isEmpty() )
 	    needFontEventHandler = true;
-	TTQString s = getClassName( nl.item(i).toElement() );
+	TQString s = getClassName( nl.item(i).toElement() );
 	if ( s == "TQt::DataTable" || s == "TQt::DataBrowser" ) {
 	    if ( !isFrameworkCodeGenerated( nl.item(i).toElement() ) )
 		 continue;
@@ -832,7 +832,7 @@ void Uic::createFormImpl( const TTQDomElement &e )
 	    out << "    if ev.type() == TQt::Event::ApplicationFontChange " << endl;
 	    for ( i = 0; i < (int) nl.length(); i++ ) {
 		n = nl.item(i).toElement();
-		TTQStringList list = DomTool::propertiesOfType( n, "font" );
+		TQStringList list = DomTool::propertiesOfType( n, "font" );
 		for ( it = list.begin(); it != list.end(); ++it )
 		    createExclusiveProperty( n, *it );
 	    }
@@ -854,12 +854,12 @@ void Uic::createFormImpl( const TTQDomElement &e )
 	++indent;
 	if ( needSqlTableEventHandler ) {
 	    for ( i = 0; i < (int) nl.length(); i++ ) {
-		TTQString s = getClassName( nl.item(i).toElement() );
+		TQString s = getClassName( nl.item(i).toElement() );
 		if ( s == "TQt::DataTable" ) {
 		    n = nl.item(i).toElement();
-		    TTQString c = TTQString("@") + getObjectName( n );
-		    TTQString conn = getDatabaseInfo( n, "connection" );
-		    TTQString tab = getDatabaseInfo( n, "table" );
+		    TQString c = TQString("@") + getObjectName( n );
+		    TQString conn = getDatabaseInfo( n, "connection" );
+		    TQString tab = getDatabaseInfo( n, "table" );
 		    if ( !( conn.isEmpty() || tab.isEmpty() ) ) {
 			out << indent << "if " << "!" << c << ".nil?" << endl;
 			++indent;
@@ -894,12 +894,12 @@ void Uic::createFormImpl( const TTQDomElement &e )
 	if ( needSqlDataBrowserEventHandler ) {
 	    nl = e.elementsByTagName( "widget" );
 	    for ( i = 0; i < (int) nl.length(); i++ ) {
-		TTQString s = getClassName( nl.item(i).toElement() );
+		TQString s = getClassName( nl.item(i).toElement() );
 		if ( s == "TQt::DataBrowser" ) {
-		    TTQString obj = getObjectName( nl.item(i).toElement() );
-		    TTQString tab = getDatabaseInfo( nl.item(i).toElement(),
+		    TQString obj = getObjectName( nl.item(i).toElement() );
+		    TQString tab = getDatabaseInfo( nl.item(i).toElement(),
 						   "table" );
-		    TTQString conn = getDatabaseInfo( nl.item(i).toElement(),
+		    TQString conn = getDatabaseInfo( nl.item(i).toElement(),
 						    "connection" );
 		    if ( !(tab).isEmpty() ) {
 			out << indent << "if " << obj << endl;
@@ -942,11 +942,11 @@ void Uic::createFormImpl( const TTQDomElement &e )
 	    int astart = (*it).find('(');
 	    out << indent << "def " << (*it).left(astart) << "(*k)" << endl;
 	    bool createWarning = true;
-	    TTQString fname = Parser::cleanArgs( *it );
-	    TTQMap<TTQString, TTQString>::Iterator fit = functionImpls.find( fname );
+	    TQString fname = Parser::cleanArgs( *it );
+	    TQMap<TQString, TQString>::Iterator fit = functionImpls.find( fname );
 	    if ( fit != functionImpls.end() ) {
 		int begin = (*fit).find( "{" );
-		TTQString body = (*fit).mid( begin + 1, (*fit).findRev( "}" ) - begin - 1 );
+		TQString body = (*fit).mid( begin + 1, (*fit).findRev( "}" ) - begin - 1 );
 		createWarning = body.simplifyWhiteSpace().isEmpty();
 		if ( !createWarning )
 		    out << body << endl;
@@ -967,11 +967,11 @@ void Uic::createFormImpl( const TTQDomElement &e )
 	    out << endl;
 	    int astart = (*it).find('(');
 	    out << indent << "def " << (*it).left(astart) << "(*k)" << endl;
-	    TTQString fname = Parser::cleanArgs( *it );
-	    TTQMap<TTQString, TTQString>::Iterator fit = functionImpls.find( fname );
+	    TQString fname = Parser::cleanArgs( *it );
+	    TQMap<TQString, TQString>::Iterator fit = functionImpls.find( fname );
 	    if ( fit != functionImpls.end() ) {
 		int begin = (*fit).find( "{" );
-		TTQString body = (*fit).mid( begin + 1, (*fit).findRev( "}" ) - begin - 1 );
+		TQString body = (*fit).mid( begin + 1, (*fit).findRev( "}" ) - begin - 1 );
 		body.simplifyWhiteSpace().isEmpty();
 		out << body << endl;
 	    }
@@ -992,17 +992,17 @@ void Uic::createFormImpl( const TTQDomElement &e )
   Traverses recursively over all children.
  */
 
-void Uic::createFormImpl( const TTQDomElement& e, const TTQString& form, const TTQString& connection, const TTQString& table )
+void Uic::createFormImpl( const TQDomElement& e, const TQString& form, const TQString& connection, const TQString& table )
 {
     if ( e.tagName() == "widget" &&
 	 e.attribute( "class" ) != "TQt::DataTable" ) {
-	TTQString field = getDatabaseInfo( e, "field" );
+	TQString field = getDatabaseInfo( e, "field" );
 	if ( !field.isEmpty() ) {
 	    if ( isWidgetInTable( e, connection, table ) )
 		out << indent << form << "Form.insert(" << getObjectName( e ) << ", " << fixString( field ) << ")" << endl;
 	}
     }
-    TTQDomElement n;
+    TQDomElement n;
     for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) {
 	createFormImpl( n, form, connection, table );
     }
@@ -1011,7 +1011,7 @@ void Uic::createFormImpl( const TTQDomElement& e, const TTQString& form, const T
 
 // Generate a QtRuby signal/slot definition.
 
-void Uic::rubySlot(TTQStringList::Iterator &it)
+void Uic::rubySlot(TQStringList::Iterator &it)
 {
     out << indent << "'" << (*it) << "'";
 }