1 files changed, 18 insertions, 18 deletions

diff --git a/kommander/editor/resource.cpp b/kommander/editor/resource.cpp
index 93f6cc9b..c5450658 100644
--- a/kommander/editor/resource.cpp
+++ b/kommander/editor/resource.cpp
@@ -404,10 +404,10 @@ bool Resource::load( FormFile *ff, TQIODevice* dev )
 	if ( formwindow->tqlayout() )
 	    formwindow->tqlayout()->activate();
 	if ( hadGeometry )
-	    formwindow->resize( formwindow->size().expandedTo( formwindow->tqminimumSize().
-							       expandedTo( formwindow->tqminimumSizeHint() ) ) );
+	    formwindow->resize( formwindow->size().expandedTo( formwindow->minimumSize().
+							       expandedTo( formwindow->minimumSizeHint() ) ) );
 	else
-	    formwindow->resize( formwindow->size().expandedTo( formwindow->tqsizeHint() ) );
+	    formwindow->resize( formwindow->size().expandedTo( formwindow->sizeHint() ) );
     }
 
     return true;
@@ -984,8 +984,8 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent )
     changed = MetaDataBase::changedProperties( w );
     if ( w->isWidgetType() ) {
 	if ( w->inherits( "Spacer" ) ) {
-	    if ( !changed.contains( "tqsizeHint" ) )
-		changed << "tqsizeHint";
+	    if ( !changed.contains( "sizeHint" ) )
+		changed << "sizeHint";
 	    if ( !changed.contains( "geometry" ) )
 		changed << "geometry";
 	}
@@ -1006,15 +1006,15 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent )
     bool inLayout = TQT_BASE_OBJECT(w) != TQT_BASE_OBJECT(formwindow->mainContainer()) && !copying && w->isWidgetType() && ( (TQWidget*)w )->parentWidget() &&
 		    WidgetFactory::layoutType( ( (TQWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout;
 
-    TQStrList lst = w->tqmetaObject()->propertyNames( !w->inherits( "Spacer" ) );
+    TQStrList lst = w->metaObject()->propertyNames( !w->inherits( "Spacer" ) );
     for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
-	if ( changed.find( TQString::tqfromLatin1( it.current() ) ) == changed.end() )
+	if ( changed.find( TQString::fromLatin1( it.current() ) ) == changed.end() )
 	    continue;
-	if ( saved.find( TQString::tqfromLatin1( it.current() ) ) != saved.end() )
+	if ( saved.find( TQString::fromLatin1( it.current() ) ) != saved.end() )
 	    continue;
-	saved << TQString::tqfromLatin1( it.current() );
-	const TQMetaProperty* p = w->tqmetaObject()->
-				 property( w->tqmetaObject()->findProperty( it.current(), true ), true );
+	saved << TQString::fromLatin1( it.current() );
+	const TQMetaProperty* p = w->metaObject()->
+				 property( w->metaObject()->findProperty( it.current(), true ), true );
 	if ( !p || !p->stored( w ) || ( inLayout && qstrcmp( p->name(), "geometry" ) == 0 ) )
 	    continue;
 	if ( w->inherits( TQLABEL_OBJECT_NAME_STRING ) && qstrcmp( p->name(), "pixmap" ) == 0 &&
@@ -1066,7 +1066,7 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent )
 
 void Resource::saveSetProperty( TQObject *w, const TQString &name, TQVariant::Type, TQTextStream &ts, int indent )
 {
-    const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( name, true ), true );
+    const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->findProperty( name, true ), true );
     TQStrList l( p->valueToKeys( w->property( name ).toInt() ) );
     TQString v;
     for ( uint i = 0; i < l.count(); ++i ) {
@@ -1079,7 +1079,7 @@ void Resource::saveSetProperty( TQObject *w, const TQString &name, TQVariant::Ty
 
 void Resource::saveEnumProperty( TQObject *w, const TQString &name, TQVariant::Type, TQTextStream &ts, int indent )
 {
-    const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( name, true ), true );
+    const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->findProperty( name, true ), true );
     ts << makeIndent( indent ) << "<enum>" << p->valueToKey( w->property( name ).toInt() ) << "</enum>" << endl;
 }
 
@@ -1644,7 +1644,7 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLay
 */
 void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQDomElement &e )
 {
-    const TQMetaProperty *p = obj->tqmetaObject()->property( obj->tqmetaObject()->findProperty( prop, true ), true );
+    const TQMetaProperty *p = obj->metaObject()->property( obj->metaObject()->findProperty( prop, true ), true );
 
     if ( !obj->inherits( TQLAYOUT_OBJECT_NAME_STRING )  ) {// no layouts in metadatabase... (RS)
 	if ( obj->inherits( "CustomWidget" ) ) {
@@ -2090,8 +2090,8 @@ void Resource::saveCustomWidgets( TQTextStream &ts, int indent )
 	   << "\">" << w->includeFile << "</header>" << endl;
 	ts << makeIndent( indent ) << "<sizehint>" << endl;
 	indent++;
-	ts << makeIndent( indent ) << "<width>" << w->tqsizeHint.width() << "</width>" << endl;
-	ts << makeIndent( indent ) << "<height>" << w->tqsizeHint.height() << "</height>" << endl;
+	ts << makeIndent( indent ) << "<width>" << w->sizeHint.width() << "</width>" << endl;
+	ts << makeIndent( indent ) << "<height>" << w->sizeHint.height() << "</height>" << endl;
 	indent--;
 	ts << makeIndent( indent ) << "</sizehint>" << endl;
 	ts << makeIndent( indent ) << "<container>" << (int)w->isContainer << "</container>" << endl;
@@ -2147,9 +2147,9 @@ void Resource::loadCustomWidgets( const TQDomElement &e, Resource *r )
 		    TQDomElement n3 = n2.firstChild().toElement();
 		    while ( !n3.isNull() ) {
 			if ( n3.tagName() == "width" )
-			    w->tqsizeHint.setWidth( n3.firstChild().toText().data().toInt() );
+			    w->sizeHint.setWidth( n3.firstChild().toText().data().toInt() );
 			else if ( n3.tagName() == "height" )
-			    w->tqsizeHint.setHeight( n3.firstChild().toText().data().toInt() );
+			    w->sizeHint.setHeight( n3.firstChild().toText().data().toInt() );
 			n3 = n3.nextSibling().toElement();
 		    }
 		} else if ( n2.tagName() == "sizepolicy" ) {