diff options
Diffstat (limited to 'tools/designer/uic')
| -rw-r--r-- | tools/designer/uic/form.cpp | 6 | ||||
| -rw-r--r-- | tools/designer/uic/uic.cpp | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tools/designer/uic/form.cpp b/tools/designer/uic/form.cpp index a9c950cc6..5abe9c8e3 100644 --- a/tools/designer/uic/form.cpp +++ b/tools/designer/uic/form.cpp @@ -289,7 +289,7 @@ void Uic::createFormDecl( const TQDomElement &e ) for ( i = 1; i < (int) nl.length(); i++ ) { // begin at 1, 0 is the toplevel widget TQString s = getClassName( nl.item(i).toElement() ); if ( s == "TQLayoutWidget" ) - continue; // hide qlayoutwidgets + continue; // hide tqlayoutwidgets if ( s == "Line" ) s = "TQFrame"; if ( !(nofwd && customWidgets.contains(s)) ) @@ -803,7 +803,7 @@ void Uic::createFormImpl( const TQDomElement &e ) for ( i = 1; i < (int) nl.length(); i++ ) { // start at 1, 0 is the toplevel widget TQString name = getClassName( nl.item(i).toElement() ); if ( name == "Spacer" ) { - globalIncludes += "ntqlayout.h"; + globalIncludes += "tqlayout.h"; globalIncludes += "ntqapplication.h"; continue; } @@ -826,7 +826,7 @@ void Uic::createFormImpl( const TQDomElement &e ) out << "#include <" << *it << ">" << endl; } - out << "#include <ntqlayout.h>" << endl; + out << "#include <tqlayout.h>" << endl; out << "#include <tqtooltip.h>" << endl; out << "#include <tqwhatsthis.h>" << endl; if ( objClass == "TQMainWindow" ) { diff --git a/tools/designer/uic/uic.cpp b/tools/designer/uic/uic.cpp index b044649b0..bcd670290 100644 --- a/tools/designer/uic/uic.cpp +++ b/tools/designer/uic/uic.cpp @@ -811,11 +811,11 @@ TQString Uic::createLayoutImpl( const TQDomElement &e, const TQString& parentCla TQString objClass, objName; objClass = e.tagName(); - TQString qlayout = "TQVBoxLayout"; + TQString tqlayout = "TQVBoxLayout"; if ( objClass == "hbox" ) - qlayout = "TQHBoxLayout"; + tqlayout = "TQHBoxLayout"; else if ( objClass == "grid" ) - qlayout = "TQGridLayout"; + tqlayout = "TQGridLayout"; bool isGrid = e.tagName() == "grid" ; objName = registerObject( getLayoutName( e ) ); @@ -833,10 +833,10 @@ TQString Uic::createLayoutImpl( const TQDomElement &e, const TQString& parentCla out << indent << parent << "->setColumnLayout(0, TQt::Vertical );" << endl; out << indent << parent << "->layout()->setSpacing( " << spacing << " );" << endl; out << indent << parent << "->layout()->setMargin( " << margin << " );" << endl; - out << indent << objName << " = new " << qlayout << "( " << parent << "->layout() );" << endl; + out << indent << objName << " = new " << tqlayout << "( " << parent << "->layout() );" << endl; out << indent << objName << "->setAlignment( TQt::AlignTop );" << endl; } else { - out << indent << objName << " = new " << qlayout << "( "; + out << indent << objName << " = new " << tqlayout << "( "; if ( layout.isEmpty() ) out << parent; else { |