diff options
Diffstat (limited to 'kommander/editor/command.cpp')
| -rw-r--r-- | kommander/editor/command.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kommander/editor/command.cpp b/kommander/editor/command.cpp index c1b8db31..7e295285 100644 --- a/kommander/editor/command.cpp +++ b/kommander/editor/command.cpp @@ -263,8 +263,8 @@ void InsertCommand::execute() widget->move( tqgeometry.topLeft() ); widget->adjustSize(); } else { - TQSize s = tqgeometry.size().expandedTo( widget->tqminimumSize() ); - s = s.expandedTo( widget->tqminimumSizeHint() ); + TQSize s = tqgeometry.size().expandedTo( widget->minimumSize() ); + s = s.expandedTo( widget->minimumSizeHint() ); TQRect r( tqgeometry.topLeft(), s ); widget->setGeometry( r ); } @@ -461,7 +461,7 @@ bool SetPropertyCommand::canMerge( Command *c ) { SetPropertyCommand *cmd = (SetPropertyCommand*)c; const TQMetaProperty *p = - widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( propName, true ), true ); + widget->metaObject()->property( widget->metaObject()->findProperty( propName, true ), true ); if ( !p ) { if ( propName == "toolTip" || propName == "whatsThis" ) return true; @@ -532,16 +532,16 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString ¤ editor->propertyList()->setCurrentProperty( propName ); const TQMetaProperty *p = - widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( propName, true ), true ); + widget->metaObject()->property( widget->metaObject()->findProperty( propName, true ), true ); if ( !p ) { if ( propName == "hAlign" ) { - p = widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( "tqalignment", true ), true ); + p = widget->metaObject()->property( widget->metaObject()->findProperty( "tqalignment", true ), true ); int align = widget->property( "tqalignment" ).toInt(); align &= ~( AlignHorizontal_Mask ); align |= p->keyToValue( currentItemText ); widget->setProperty( "tqalignment", TQVariant( align ) ); } else if ( propName == "vAlign" ) { - p = widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( "tqalignment", true ), true ); + p = widget->metaObject()->property( widget->metaObject()->findProperty( "tqalignment", true ), true ); int align = widget->property( "tqalignment" ).toInt(); align &= ~( AlignVertical_Mask ); align |= p->keyToValue( currentItemText ); |