diff options
Diffstat (limited to 'tqtinterface/qt4/tools/designer/uic/object.cpp')
| -rw-r--r-- | tqtinterface/qt4/tools/designer/uic/object.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tqtinterface/qt4/tools/designer/uic/object.cpp b/tqtinterface/qt4/tools/designer/uic/object.cpp index 77ca635..1a7ed9c 100644 --- a/tqtinterface/qt4/tools/designer/uic/object.cpp +++ b/tqtinterface/qt4/tools/designer/uic/object.cpp @@ -92,12 +92,12 @@ static bool createdCentralWidget = FALSE; TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentClass, const TQString& par, const TQString& tqlayout ) { - TQString tqparent( par ); - if ( tqparent == "this" && isMainWindow ) { + TQString parent( par ); + if ( parent == "this" && isMainWindow ) { if ( !createdCentralWidget ) out << indent << "setCentralWidget( new TQWidget( this, \"qt_central_widget\" ) );" << endl; createdCentralWidget = TRUE; - tqparent = "centralWidget()"; + parent = "centralWidget()"; } TQDomElement n; TQString objClass, objName; @@ -106,7 +106,7 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla int numRows = 0; if ( layouts.contains( e.tagName() ) ) - return createLayoutImpl( e, parentClass, tqparent, tqlayout ); + return createLayoutImpl( e, parentClass, parent, tqlayout ); objClass = getClassName( e ); if ( objClass.isEmpty() ) @@ -132,13 +132,13 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla if ( tqlayout.isEmpty() ) { // register the object and unify its name objName = registerObject( objName ); - out << " TQWidget* " << objName << " = new TQWidget( " << tqparent << ", \"" << definedName << "\" );" << endl; + out << " TQWidget* " << objName << " = new TQWidget( " << parent << ", \"" << definedName << "\" );" << endl; } else { - // the tqlayout widget is not necessary, hide it by creating its child in the tqparent + // the tqlayout widget is not necessary, hide it by creating its child in the parent TQString result; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if (tags.contains( n.tagName() ) ) - result = createObjectImpl( n, parentClass, tqparent, tqlayout ); + result = createObjectImpl( n, parentClass, parent, tqlayout ); } return result; } @@ -148,7 +148,7 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla out << " "; if ( isTmpObject ) out << objClass << "* "; - out << objName << " = new " << createObjectInstance( objClass, tqparent, objName ) << ";" << endl; + out << objName << " = new " << createObjectInstance( objClass, parent, objName ) << ";" << endl; } if ( objClass == "TQAxWidget" ) { @@ -197,7 +197,7 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla } if ( prop == "buttonGroupId" ) { if ( parentClass == "TQButtonGroup" ) - out << indent << tqparent << "->insert( " << objName << ", " << value << " );" << endl; + out << indent << parent << "->insert( " << objName << ", " << value << " );" << endl; continue; } if ( prop == "frameworkCode" ) |