Fix incorrect conversion

1 files changed, 81 insertions, 81 deletions

diff --git a/qtruby/rubylib/designer/rbuic/object.cpp b/qtruby/rubylib/designer/rbuic/object.cpp
index bb1422b1..512da9ed 100644
--- a/qtruby/rubylib/designer/rbuic/object.cpp
+++ b/qtruby/rubylib/designer/rbuic/object.cpp
@@ -41,15 +41,15 @@
 
   \sa createObjectImpl()
  */
-void Uic::createObjectDecl( const TTQDomElement& e )
+void Uic::createObjectDecl( const TQDomElement& e )
 {
     if ( e.tagName() == "vbox" || e.tagName() == "hbox" || e.tagName() == "grid" ) {
 	out << indent << registerObject(getLayoutName(e) ) << endl;
     } else {
-	TTQString objClass = getClassName( e );
+	TQString objClass = getClassName( e );
 	if ( objClass.isEmpty() )
 	    return;
-	TTQString objName = getObjectName( e );
+	TQString objName = getObjectName( e );
 	if ( objName.isEmpty() )
 	    return;
 	// ignore TQLayoutWidgets
@@ -68,15 +68,15 @@ void Uic::createObjectDecl( const TTQDomElement& e )
   Children are not traversed recursively.
 
  */
-void Uic::createAttrDecl( const TTQDomElement& e )
+void Uic::createAttrDecl( const TQDomElement& e )
 {
     if ( e.tagName() == "vbox" || e.tagName() == "hbox" || e.tagName() == "grid" ) {
 //	out << indent << registerObject(getLayoutName(e) ) << endl;
     } else {
-	TTQString objClass = getClassName( e );
+	TQString objClass = getClassName( e );
 	if ( objClass.isEmpty() )
 	    return;
-	TTQString objName = getObjectName( e );
+	TQString objName = getObjectName( e );
 	if ( objName.isEmpty() )
 	    return;
 	// ignore TQLayoutWidgets
@@ -84,11 +84,11 @@ void Uic::createAttrDecl( const TTQDomElement& e )
 	    return;
         // register the object and unify its name
 	objName = registerObject( objName );
-	TTQString attr(objName);
-	attr.replace(TTQChar('@'), "attr_reader :");
+	TQString attr(objName);
+	attr.replace(TQChar('@'), "attr_reader :");
 	
 	out << indent << attr << endl;
-        TTQDomElement n = getObjectProperty( e, "font");
+        TQDomElement n = getObjectProperty( e, "font");
 //	if ( !n.isNull() )
 //            out << indent << objName + "_font" << endl;
     }
@@ -107,17 +107,17 @@ void Uic::createAttrDecl( const TTQDomElement& e )
 
 static bool createdCentralWidget = false;
 
-TTQString Uic::createObjectImpl( const TTQDomElement &e, const TTQString& parentClass, const TTQString& par, const TTQString& layout )
+TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentClass, const TQString& par, const TQString& layout )
 {
-    TTQString parent( par );
+    TQString parent( par );
     if ( parent == "self" && isMainWindow ) {
 	if ( !createdCentralWidget )
 	    out << indent << "setCentralWidget(TQt::Widget.new(self, \"qt_central_widget\"))" << endl;
 	createdCentralWidget = true;
 	parent = "centralWidget()";
     }
-    TTQDomElement n;
-    TTQString objClass, objName, fullObjName;
+    TQDomElement n;
+    TQString objClass, objName, fullObjName;
     int numItems = 0;
     int numColumns = 0;
     int numRows = 0;
@@ -130,7 +130,7 @@ TTQString Uic::createObjectImpl( const TTQDomElement &e, const TTQString& parent
 	return objName;
     objName = getObjectName( e );
 
-    TTQString definedName = objName;
+    TQString definedName = objName;
     bool isTmpObject = objName.isEmpty() || objClass == "TQt::LayoutWidget";
     if ( isTmpObject ) {
 	if ( objClass[0] == 'Q' )
@@ -148,10 +148,10 @@ TTQString Uic::createObjectImpl( const TTQDomElement &e, const TTQString& parent
 	if ( layout.isEmpty() ) {
 	    // register the object and unify its name
 	    objName = registerObject( objName );
-	    out << indent << (isTmpObject ? TTQString::fromLatin1("") : TTQString::null) << objName << " = TQt::Widget.new(" << parent << ", '" << objName << "')" << endl;
+	    out << indent << (isTmpObject ? TQString::fromLatin1("") : TQString::null) << objName << " = TQt::Widget.new(" << parent << ", '" << objName << "')" << endl;
 	} else {
 	    // the layout widget is not necessary, hide it by creating its child in the parent
-	    TTQString result;
+	    TQString result;
 	    for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) {
 		if (tags.contains( n.tagName() ) )
 		    result = createObjectImpl( n, parentClass, parent, layout );
@@ -175,7 +175,7 @@ TTQString Uic::createObjectImpl( const TTQDomElement &e, const TTQString& parent
 	fullObjName = objName;
 
     if ( objClass == "TQt::AxWidget" ) {
-	TTQString controlId;
+	TQString controlId;
 	for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) {
 	    if ( n.tagName() == "property" && n.attribute( "name" ) == "control" ) {
 		controlId = n.firstChild().toElement().text();
@@ -193,10 +193,10 @@ TTQString Uic::createObjectImpl( const TTQDomElement &e, const TTQString& parent
 	    bool stdset = stdsetdef;
 	    if ( n.hasAttribute( "stdset" ) )
 		stdset = toBool( n.attribute( "stdset" ) );
-	    TTQString prop = n.attribute("name");
+	    TQString prop = n.attribute("name");
 	    if ( prop == "database" )
 		continue;
-	    TTQString value = setObjectProperty( objClass, objName, prop, n.firstChild().toElement(), stdset );
+	    TQString value = setObjectProperty( objClass, objName, prop, n.firstChild().toElement(), stdset );
 	    if ( value.isEmpty() )
 		continue;
 	    if ( prop == "name" )
@@ -226,10 +226,10 @@ TTQString Uic::createObjectImpl( const TTQDomElement &e, const TTQString& parent
 	    if ( prop == "frameworkCode" )
 		continue;
 	    if ( objClass == "TQt::MultiLineEdit" &&
-		 TTQRegExp("echoMode|hMargin|maxLength|maxLines|undoEnabled").exactMatch(prop) )
+		 TQRegExp("echoMode|hMargin|maxLength|maxLines|undoEnabled").exactMatch(prop) )
 		continue;
 		
-	    TTQString call = fullObjName + ".";
+	    TQString call = fullObjName + ".";
 		if (! call.startsWith("@")) {
 			call.prepend("@");
 		}
@@ -249,8 +249,8 @@ TTQString Uic::createObjectImpl( const TTQDomElement &e, const TTQString& parent
 		out << indent << call << endl;
 	    }
 	} else if ( n.tagName() == "item" ) {
-	    TTQString call;
-	    TTQString value;
+	    TQString call;
+	    TQString value;
 
 	    if ( objClass.mid( 4 ) == "ListBox" ) {
 		call = createListBoxItemImpl( n, fullObjName, &value );
@@ -274,7 +274,7 @@ TTQString Uic::createObjectImpl( const TTQDomElement &e, const TTQString& parent
 		    trout << indent << call << endl;
 		}
 	    } else if ( objClass.mid( 4 ) == "ListView" ) {
-		call = createListViewItemImpl( n, fullObjName, TTQString::null );
+		call = createListViewItemImpl( n, fullObjName, TQString::null );
 		if ( !call.isEmpty() ) {
 		    if ( numItems == 0 )
 			trout << indent << fullObjName << ".clear()" << endl;
@@ -284,8 +284,8 @@ TTQString Uic::createObjectImpl( const TTQDomElement &e, const TTQString& parent
 	    if ( !call.isEmpty() )
 		numItems++;
 	} else if ( n.tagName() == "column" || n.tagName() == "row" ) {
-	    TTQString call;
-	    TTQString value;
+	    TQString call;
+	    TQString value;
 
 	    if ( objClass.mid( 4 ) == "ListView" ) {
 		call = createListViewColumnImpl( n, fullObjName, &value );
@@ -314,9 +314,9 @@ TTQString Uic::createObjectImpl( const TTQDomElement &e, const TTQString& parent
     if ( objClass == "TQt::TabWidget" ) {
 	for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) {
 	    if ( tags.contains( n.tagName()  ) ) {
-		TTQString page = createObjectImpl( n, objClass, fullObjName );
-		TTQString comment;
-		TTQString label = DomTool::readAttribute( n, "title", "", comment ).toString();
+		TQString page = createObjectImpl( n, objClass, fullObjName );
+		TQString comment;
+		TQString label = DomTool::readAttribute( n, "title", "", comment ).toString();
 		out << indent << fullObjName << ".insertTab(" << page << ", " << trcall( label ) << ")" << endl;
 		trout << indent << fullObjName << ".changeTab( " << page << ", "
 		      << trcall( label, comment ) << " )" << endl;
@@ -325,7 +325,7 @@ TTQString Uic::createObjectImpl( const TTQDomElement &e, const TTQString& parent
     } else if ( objClass == "TQt::WidgetStack" ) {
 	for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) {
 	    if ( tags.contains( n.tagName()  ) ) {
-		TTQString page = createObjectImpl( n, objClass, objName );
+		TQString page = createObjectImpl( n, objClass, objName );
 		int id = DomTool::readAttribute( n, "id", "" ).toInt();
 		out << indent << fullObjName << ".addWidget( " << page << ", " << id << " )" << endl;
 	    }
@@ -333,9 +333,9 @@ TTQString Uic::createObjectImpl( const TTQDomElement &e, const TTQString& parent
     } else if ( objClass == "TQt::ToolBox" ) {
 	for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) {
 		if ( tags.contains( n.tagName()  ) ) {
-		TTQString page = createObjectImpl( n, objClass, objName );
-		TTQString comment;
-		TTQString label = DomTool::readAttribute( n, "label", comment ).toString();
+		TQString page = createObjectImpl( n, objClass, objName );
+		TQString comment;
+		TQString label = DomTool::readAttribute( n, "label", comment ).toString();
 		out << indent << fullObjName << ".addItem( " << page << ", \"\" )" << endl;
 		trout << indent << fullObjName << ".setItemLabel( " << fullObjName 
 		      << ".indexOf(" << page << "), " << trcall( label, comment ) 
@@ -364,13 +364,13 @@ TTQString Uic::createObjectImpl( const TTQDomElement &e, const TTQString& parent
   application font or palette change handlers in createFormImpl().
 
  */
-void Uic::createExclusiveProperty( const TTQDomElement & e, const TTQString& exclusiveProp )
+void Uic::createExclusiveProperty( const TQDomElement & e, const TQString& exclusiveProp )
 {
-    TTQDomElement n;
-    TTQString objClass = getClassName( e );
+    TQDomElement n;
+    TQString objClass = getClassName( e );
     if ( objClass.isEmpty() )
 	return;
-    TTQString objName = getObjectName( e );
+    TQString objName = getObjectName( e );
     if ( objClass.isEmpty() )
 	return;
     for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) {
@@ -378,10 +378,10 @@ void Uic::createExclusiveProperty( const TTQDomElement & e, const TTQString& exc
 	    bool stdset = stdsetdef;
 	    if ( n.hasAttribute( "stdset" ) )
 		stdset = toBool( n.attribute( "stdset" ) );
-	    TTQString prop = n.attribute("name");
+	    TQString prop = n.attribute("name");
 	    if ( prop != exclusiveProp )
 		continue;
-	    TTQString value = setObjectProperty( objClass, objName, prop, n.firstChild().toElement(), stdset );
+	    TQString value = setObjectProperty( objClass, objName, prop, n.firstChild().toElement(), stdset );
 	    if ( value.isEmpty() )
 		continue;
 	    out << indent << indent << objName << ".setProperty(\"" << prop << "\", TQt::Variant.new(" << value << "))" << endl;
@@ -394,11 +394,11 @@ void Uic::createExclusiveProperty( const TTQDomElement & e, const TTQString& exc
   Resource::saveProperty() and DomTool::elementToVariant. If you
   change one, change all.
  */
-TTQString Uic::setObjectProperty( const TTQString& objClass, const TTQString& obj, const TTQString &prop, const TTQDomElement &e, bool stdset )
+TQString Uic::setObjectProperty( const TQString& objClass, const TQString& obj, const TQString &prop, const TQDomElement &e, bool stdset )
 {
-    TTQString v;
+    TQString v;
     if ( e.tagName() == "rect" ) {
-	TTQDomElement n3 = e.firstChild().toElement();
+	TQDomElement n3 = e.firstChild().toElement();
 	int x = 0, y = 0, w = 0, h = 0;
 	while ( !n3.isNull() ) {
 	    if ( n3.tagName() == "x" )
@@ -415,7 +415,7 @@ TTQString Uic::setObjectProperty( const TTQString& objClass, const TTQString& ob
 	v = v.arg(x).arg(y).arg(w).arg(h);
 
     } else if ( e.tagName() == "point" ) {
-	TTQDomElement n3 = e.firstChild().toElement();
+	TQDomElement n3 = e.firstChild().toElement();
 	int x = 0, y = 0;
 	while ( !n3.isNull() ) {
 	    if ( n3.tagName() == "x" )
@@ -427,7 +427,7 @@ TTQString Uic::setObjectProperty( const TTQString& objClass, const TTQString& ob
 	v = "TQt::Point.new(%1, %2)";
 	v = v.arg(x).arg(y);
     } else if ( e.tagName() == "size" ) {
-	TTQDomElement n3 = e.firstChild().toElement();
+	TQDomElement n3 = e.firstChild().toElement();
 	int w = 0, h = 0;
 	while ( !n3.isNull() ) {
 	    if ( n3.tagName() == "width" )
@@ -439,7 +439,7 @@ TTQString Uic::setObjectProperty( const TTQString& objClass, const TTQString& ob
 	v = "TQt::Size.new(%1, %2)";
 	v = v.arg(w).arg(h);
     } else if ( e.tagName() == "color" ) {
-	TTQDomElement n3 = e.firstChild().toElement();
+	TQDomElement n3 = e.firstChild().toElement();
 	int r= 0, g = 0, b = 0;
 	while ( !n3.isNull() ) {
 	    if ( n3.tagName() == "red" )
@@ -453,8 +453,8 @@ TTQString Uic::setObjectProperty( const TTQString& objClass, const TTQString& ob
 	v = "TQt::Color.new(%1, %2, %3)";
 	v = v.arg(r).arg(g).arg(b);
     } else if ( e.tagName() == "font" ) {
-	TTQDomElement n3 = e.firstChild().toElement();
-	TTQString fontname;
+	TQDomElement n3 = e.firstChild().toElement();
+	TQString fontname;
 	if ( !obj.isEmpty() ) {
 	    fontname = obj + "_font";
 	    out << indent << fontname << " = TQt::Font.new(" << obj << ".font())" << endl;
@@ -487,8 +487,8 @@ TTQString Uic::setObjectProperty( const TTQString& objClass, const TTQString& ob
 	    v = fontname;
 	}
     } else if ( e.tagName() == "string" ) {
-	TTQString txt = e.firstChild().toText().data();
-	TTQString com = getComment( e.parentNode() );
+	TQString txt = e.firstChild().toText().data();
+	TQString com = getComment( e.parentNode() );
 
 	if ( prop == "toolTip" && objClass != "TQt::Action" && objClass != "TQt::ActionGroup" ) {
 	    if ( !obj.isEmpty() )
@@ -511,7 +511,7 @@ TTQString Uic::setObjectProperty( const TTQString& objClass, const TTQString& ob
 	    v = "\"%1\"";
 	    v = v.arg( e.firstChild().toText().data() );
     } else if ( e.tagName() == "number" ) {
-        // FIXME: hack. QtRuby needs a TTQKeySequence to build an accel
+        // FIXME: hack. QtRuby needs a TQKeySequence to build an accel
 	if( e.parentNode().toElement().attribute("name") == "accel" )
             v = "TQt::KeySequence.new(%1)";
 	else
@@ -528,15 +528,15 @@ TTQString Uic::setObjectProperty( const TTQString& objClass, const TTQString& ob
         if( !externPixmaps )
         	v.prepend( '@' );
 	if ( !pixmapLoaderFunction.isEmpty() ) {
-	    v.prepend( pixmapLoaderFunction + "(" + TTQString( externPixmaps ? "\"" : "" ) );
-	    v.append( TTQString( externPixmaps ? "\"" : "" ) + ")" );
+	    v.prepend( pixmapLoaderFunction + "(" + TQString( externPixmaps ? "\"" : "" ) );
+	    v.append( TQString( externPixmaps ? "\"" : "" ) + ")" );
 	}
     } else if ( e.tagName() == "iconset" ) {
 	v = "TQt::IconSet.new(%1)";
-	TTQString s = e.firstChild().toText().data();
+	TQString s = e.firstChild().toText().data();
 	if ( !pixmapLoaderFunction.isEmpty() ) {
-	    s.prepend( pixmapLoaderFunction + "(" + TTQString( externPixmaps ? "\"" : "" ) );
-	    s.append( TTQString( externPixmaps ? "\"" : "" ) + ")" );
+	    s.prepend( pixmapLoaderFunction + "(" + TQString( externPixmaps ? "\"" : "" ) );
+	    s.append( TQString( externPixmaps ? "\"" : "" ) + ")" );
 	} else {
 		s.prepend("@");
 	}
@@ -545,22 +545,22 @@ TTQString Uic::setObjectProperty( const TTQString& objClass, const TTQString& ob
 	v = e.firstChild().toText().data() + ".convertToImage()";
     } else if ( e.tagName() == "enum" ) {
 	v = "%1::%2";
-	TTQString oc = objClass;
-	TTQString ev = e.firstChild().toText().data();
-	if ( oc == "TQt::ListView" && ev == "Manual" ) // #### workaround, rename TTQListView::Manual of WithMode enum in 3.0
+	TQString oc = objClass;
+	TQString ev = e.firstChild().toText().data();
+	if ( oc == "TQt::ListView" && ev == "Manual" ) // #### workaround, rename TQListView::Manual of WithMode enum in 3.0
 	    oc = "TQt::ScrollView";
 	v = v.arg( oc ).arg( ev );
     } else if ( e.tagName() == "set" ) {
-	TTQString keys( e.firstChild().toText().data() );
-	TTQStringList lst = TTQStringList::split( '|', keys );
+	TQString keys( e.firstChild().toText().data() );
+	TQStringList lst = TQStringList::split( '|', keys );
 	v = "";
 #if defined(Q_CC_EDG)
 	// workaround for EDG bug reproduced with MIPSpro C++ 7.3.?
 	// and KAI C++ 4.0e that will be fixed in KAI C++ 4.0f
-	TTQStringList::Iterator it = lst.begin();
+	TQStringList::Iterator it = lst.begin();
 	for ( ; it != lst.end(); ++it ) {
 #else
-	for ( TTQStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) {
+	for ( TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) {
 #endif
 	    v += objClass + "::" + *it;
 	    if ( it != lst.fromLast() )
@@ -568,30 +568,30 @@ TTQString Uic::setObjectProperty( const TTQString& objClass, const TTQString& ob
 	}
         v += "";
     } else if ( e.tagName() == "sizepolicy" ) {
-	TTQDomElement n3 = e.firstChild().toElement();
-	TTQSizePolicy sp;
+	TQDomElement n3 = e.firstChild().toElement();
+	TQSizePolicy sp;
 	while ( !n3.isNull() ) {
 	    if ( n3.tagName() == "hsizetype" )
-		sp.setHorData( (TTQSizePolicy::SizeType)n3.firstChild().toText().data().toInt() );
+		sp.setHorData( (TQSizePolicy::SizeType)n3.firstChild().toText().data().toInt() );
 	    else if ( n3.tagName() == "vsizetype" )
-		sp.setVerData( (TTQSizePolicy::SizeType)n3.firstChild().toText().data().toInt() );
+		sp.setVerData( (TQSizePolicy::SizeType)n3.firstChild().toText().data().toInt() );
 	    else if ( n3.tagName() == "horstretch" )
 		sp.setHorStretch( n3.firstChild().toText().data().toInt() );
 	    else if ( n3.tagName() == "verstretch" )
 		sp.setVerStretch( n3.firstChild().toText().data().toInt() );
 	    n3 = n3.nextSibling().toElement();
 	}
-	TTQString tmp = (obj.isEmpty() ? TTQString::fromLatin1("self") : obj) + ".";
+	TQString tmp = (obj.isEmpty() ? TQString::fromLatin1("self") : obj) + ".";
 	v = "TQt::SizePolicy.new(%1, %2, %3, %4, " + tmp + "sizePolicy().hasHeightForWidth())";
 	v = v.arg( (int)sp.horData() ).arg( (int)sp.verData() ).arg( sp.horStretch() ).arg( sp.verStretch() );
     } else if ( e.tagName() == "palette" ) {
-	TTQPalette pal;
+	TQPalette pal;
 	bool no_pixmaps = e.elementsByTagName( "pixmap" ).count() == 0;
-	TTQDomElement n;
+	TQDomElement n;
 	if ( no_pixmaps ) {
 	    n = e.firstChild().toElement();
 	    while ( !n.isNull() ) {
-		TTQColorGroup cg;
+		TQColorGroup cg;
 		if ( n.tagName() == "active" ) {
 		    cg = loadColorGroup( n );
 		    pal.setActive( cg );
@@ -605,17 +605,17 @@ TTQString Uic::setObjectProperty( const TTQString& objClass, const TTQString& ob
 		n = n.nextSibling().toElement();
 	    }
 	}
-	if ( no_pixmaps && pal == TTQPalette( pal.active().button(), pal.active().background() ) ) {
+	if ( no_pixmaps && pal == TQPalette( pal.active().button(), pal.active().background() ) ) {
 	    v = "TQt::Palette.new(TQt::Color.new(%1,%2,%3), TQt::Color.new(%1,%2,%3))";
 	    v = v.arg( pal.active().button().red() ).arg( pal.active().button().green() ).arg( pal.active().button().blue() );
 	    v = v.arg( pal.active().background().red() ).arg( pal.active().background().green() ).arg( pal.active().background().blue() );
 	} else {
-	    TTQString palette = "pal";
+	    TQString palette = "pal";
 	    if ( !pal_used ) {
 		out << indent << palette << " = TQt::Palette.new()" << endl;
 		pal_used = true;
 	    }
-	    TTQString cg = "cg";
+	    TQString cg = "cg";
 	    if ( !cg_used ) {
 		out << indent << cg << " = TQt::ColorGroup.new()" << endl;
 		cg_used = true;
@@ -643,7 +643,7 @@ TTQString Uic::setObjectProperty( const TTQString& objClass, const TTQString& ob
 	v = "TQt::Cursor.new(%1)";
 	v = v.arg( e.firstChild().toText().data() );
     } else if ( e.tagName() == "date" ) {
-	TTQDomElement n3 = e.firstChild().toElement();
+	TQDomElement n3 = e.firstChild().toElement();
 	int y, m, d;
 	y = m = d = 0;
 	while ( !n3.isNull() ) {
@@ -658,7 +658,7 @@ TTQString Uic::setObjectProperty( const TTQString& objClass, const TTQString& ob
 	v = "TQt::Date.new(%1,%2,%3)";
 	v = v.arg(y).arg(m).arg(d);
     } else if ( e.tagName() == "time" ) {
-	TTQDomElement n3 = e.firstChild().toElement();
+	TQDomElement n3 = e.firstChild().toElement();
 	int h, m, s;
 	h = m = s = 0;
 	while ( !n3.isNull() ) {
@@ -673,7 +673,7 @@ TTQString Uic::setObjectProperty( const TTQString& objClass, const TTQString& ob
 	v = "TQt::Time.new(%1, %2, %3)";
 	v = v.arg(h).arg(m).arg(s);
     } else if ( e.tagName() == "datetime" ) {
-	TTQDomElement n3 = e.firstChild().toElement();
+	TQDomElement n3 = e.firstChild().toElement();
 	int h, mi, s, y, mo, d;
 	h = mi = s = y = mo = d = 0;
 	while ( !n3.isNull() ) {
@@ -694,9 +694,9 @@ TTQString Uic::setObjectProperty( const TTQString& objClass, const TTQString& ob
 	v = "TQt::DateTime.new(TQt::Date.new(%1, %2, %3), TQt::Time.new(%4, %5, %6))";
 	v = v.arg(y).arg(mo).arg(d).arg(h).arg(mi).arg(s);
     } else if ( e.tagName() == "stringlist" ) {
-	TTQStringList l;
-	TTQDomElement n3 = e.firstChild().toElement();
-	TTQString listname;
+	TQStringList l;
+	TQDomElement n3 = e.firstChild().toElement();
+	TQString listname;
 	if ( !obj.isEmpty() ) {
 	    listname = obj + "_strlist";
 	    out << indent << listname << " = [";
@@ -736,9 +736,9 @@ TTQString Uic::setObjectProperty( const TTQString& objClass, const TTQString& ob
 
 /*! Extracts a named object property from \a e.
  */
-TTQDomElement Uic::getObjectProperty( const TTQDomElement& e, const TTQString& name )
+TQDomElement Uic::getObjectProperty( const TQDomElement& e, const TQString& name )
 {
-    TTQDomElement n;
+    TQDomElement n;
     for ( n = e.firstChild().toElement();
 	  !n.isNull();
 	  n = n.nextSibling().toElement() ) {