From 07b6965cbac26077a27faf4071487d9a25fb3aa0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 17 Jul 2011 19:19:26 -0500 Subject: Revert "Rename tqsize* to size*" This reverts commit e33879600503bacc0b4ef090f7f79ab80bb6b0da. --- .../tqtinterface/qt4/src/widgets/tqpushbutton.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'experimental/tqtinterface/qt4/src/widgets/tqpushbutton.cpp') diff --git a/experimental/tqtinterface/qt4/src/widgets/tqpushbutton.cpp b/experimental/tqtinterface/qt4/src/widgets/tqpushbutton.cpp index d1047b45d..e8583ff00 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqpushbutton.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqpushbutton.cpp @@ -402,7 +402,7 @@ void TQPushButton::setDefault( bool enable ) /*! \reimp */ -TQSize TQPushButton::sizeHint() const +TQSize TQPushButton::tqsizeHint() const { constPolish(); @@ -437,7 +437,7 @@ TQSize TQPushButton::sizeHint() const h = TQMAX(h, sz.height()); } - return (tqstyle().sizeFromContents(TQStyle::CT_PushButton, this, TQSize(w, h)). + return (tqstyle().tqsizeFromContents(TQStyle::CT_PushButton, this, TQSize(w, h)). expandedTo(TQApplication::globalStrut())); } @@ -712,24 +712,24 @@ void TQPushButton::popupPressed() #endif if ( horizontal ) { if ( topLeft ) { - if ( mapToGlobal( TQPoint( 0, rect().bottom() ) ).y() + popup->sizeHint().height() <= tqApp->desktop()->height() ) + if ( mapToGlobal( TQPoint( 0, rect().bottom() ) ).y() + popup->tqsizeHint().height() <= tqApp->desktop()->height() ) popup->exec( mapToGlobal( rect().bottomLeft() ) ); else - popup->exec( mapToGlobal( rect().topLeft() - TQPoint( 0, popup->sizeHint().height() ) ) ); + popup->exec( mapToGlobal( rect().topLeft() - TQPoint( 0, popup->tqsizeHint().height() ) ) ); } else { - TQSize sz( popup->sizeHint() ); + TQSize sz( popup->tqsizeHint() ); TQPoint p = mapToGlobal( rect().topLeft() ); p.ry() -= sz.height(); popup->exec( p ); } } else { if ( topLeft ) { - if ( mapToGlobal( TQPoint( rect().right(), 0 ) ).x() + popup->sizeHint().width() <= tqApp->desktop()->width() ) + if ( mapToGlobal( TQPoint( rect().right(), 0 ) ).x() + popup->tqsizeHint().width() <= tqApp->desktop()->width() ) popup->exec( mapToGlobal( rect().topRight() ) ); else - popup->exec( mapToGlobal( rect().topLeft() - TQPoint( popup->sizeHint().width(), 0 ) ) ); + popup->exec( mapToGlobal( rect().topLeft() - TQPoint( popup->tqsizeHint().width(), 0 ) ) ); } else { - TQSize sz( popup->sizeHint() ); + TQSize sz( popup->tqsizeHint() ); TQPoint p = mapToGlobal( rect().topLeft() ); p.rx() -= sz.width(); popup->exec( p ); -- cgit v1.2.1