From 9445f97b426e97c6ce46de18fba4030da45d56df Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:36:38 -0600 Subject: Rename old tq methods that no longer need a unique name --- kommander/factory/kommanderfactory.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'kommander/factory/kommanderfactory.cpp') diff --git a/kommander/factory/kommanderfactory.cpp b/kommander/factory/kommanderfactory.cpp index 0247a814..7820c848 100644 --- a/kommander/factory/kommanderfactory.cpp +++ b/kommander/factory/kommanderfactory.cpp @@ -647,15 +647,15 @@ TQLayout *KommanderFactory::createLayout( TQWidget *widget, TQLayout* tqlayout, switch ( type ) { case HBox: l = new TQHBoxLayout( gb->tqlayout() ); - l->tqsetAlignment( TQt::AlignTop ); + l->setAlignment( TQt::AlignTop ); return l; case VBox: l = new TQVBoxLayout( gb->tqlayout(), spacing ); - l->tqsetAlignment( TQt::AlignTop ); + l->setAlignment( TQt::AlignTop ); return l; case Grid: l = new TQGridLayout( gb->tqlayout() ); - l->tqsetAlignment( TQt::AlignTop ); + l->setAlignment( TQt::AlignTop ); return l; default: return 0; @@ -728,7 +728,7 @@ KommanderFactory::LayoutType KommanderFactory::layoutType( TQLayout *tqlayout ) void KommanderFactory::setProperty( 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 ); TQVariant defVariant; if ( e.tagName() == "font" ) { @@ -872,7 +872,7 @@ void KommanderFactory::createSpacer( const TQDomElement &e, TQLayout *tqlayout ) sizeType = TQSizePolicy::MinimumExpanding; else if ( n.firstChild().firstChild().toText().data() == "Expanding" ) sizeType = TQSizePolicy::Expanding; - } else if ( prop == "tqsizeHint" ) { + } else if ( prop == "sizeHint" ) { w = n.firstChild().firstChild().firstChild().toText().data().toInt(); h = n.firstChild().firstChild().nextSibling().firstChild().toText().data().toInt(); } @@ -1097,12 +1097,12 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect TQString s2 = "1""%1"; s2 = s2.tqarg( conn.slot.data() ); - TQStrList signalList = sender->tqmetaObject()->signalNames( true ); - TQStrList slotList = receiver->tqmetaObject()->slotNames( true ); + TQStrList signalList = sender->metaObject()->signalNames( true ); + TQStrList slotList = receiver->metaObject()->slotNames( true ); // if this is a connection to a custom slot and we have a connector, try this as receiver if ( slotList.find( conn.slot ) == -1 && TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(toplevel) && connector ) { - slotList = connector->tqmetaObject()->slotNames( true ); + slotList = connector->metaObject()->slotNames( true ); receiver = connector; } -- cgit v1.2.1