diff options
Diffstat (limited to 'tqtinterface/qt4/tools/designer/designer/resource.cpp')
-rw-r--r-- | tqtinterface/qt4/tools/designer/designer/resource.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tqtinterface/qt4/tools/designer/designer/resource.cpp b/tqtinterface/qt4/tools/designer/designer/resource.cpp index 2978c10..053c155 100644 --- a/tqtinterface/qt4/tools/designer/designer/resource.cpp +++ b/tqtinterface/qt4/tools/designer/designer/resource.cpp @@ -629,7 +629,7 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject ) formwindow->resize( formwindow->size().expandedTo( formwindow->tqminimumSize(). expandedTo( formwindow->tqminimumSizeHint() ) ) ); else - formwindow->resize( formwindow->size().expandedTo( formwindow->sizeHint() ) ); + formwindow->resize( formwindow->size().expandedTo( formwindow->tqsizeHint() ) ); } return TRUE; @@ -1424,8 +1424,8 @@ void Resource::saveObjectProperties( TQT_BASE_OBJECT_NAME *bobj, TQTextStream &t changed = MetaDataBase::changedProperties( w ); if ( w->isWidgetType() ) { if ( ::tqqt_cast<Spacer*>(w) ) { - if ( !changed.tqcontains( "sizeHint" ) ) - changed << "sizeHint"; + if ( !changed.tqcontains( "tqsizeHint" ) ) + changed << "tqsizeHint"; if ( !changed.tqcontains( "geometry" ) ) changed << "geometry"; } else { @@ -2630,8 +2630,8 @@ void Resource::saveCustomWidgets( TQTextStream &ts, int indent ) << "\">" << w->includeFile << "</header>" << endl; ts << makeIndent( indent ) << "<sizehint>" << endl; indent++; - ts << makeIndent( indent ) << "<width>" << w->sizeHint.width() << "</width>" << endl; - ts << makeIndent( indent ) << "<height>" << w->sizeHint.height() << "</height>" << endl; + ts << makeIndent( indent ) << "<width>" << w->tqsizeHint.width() << "</width>" << endl; + ts << makeIndent( indent ) << "<height>" << w->tqsizeHint.height() << "</height>" << endl; indent--; ts << makeIndent( indent ) << "</sizehint>" << endl; ts << makeIndent( indent ) << "<container>" << (int)w->isContainer << "</container>" << endl; @@ -2687,9 +2687,9 @@ void Resource::loadCustomWidgets( const TQDomElement &e, Resource *r ) TQDomElement n3 = n2.firstChild().toElement(); while ( !n3.isNull() ) { if ( n3.tagName() == "width" ) - w->sizeHint.setWidth( n3.firstChild().toText().data().toInt() ); + w->tqsizeHint.setWidth( n3.firstChild().toText().data().toInt() ); else if ( n3.tagName() == "height" ) - w->sizeHint.setHeight( n3.firstChild().toText().data().toInt() ); + w->tqsizeHint.setHeight( n3.firstChild().toText().data().toInt() ); n3 = n3.nextSibling().toElement(); } } else if ( n2.tagName() == "sizepolicy" ) { |