summaryrefslogtreecommitdiffstats
path: root/tqtinterface/qt4/src/widgets/tqtoolbutton.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tqtinterface/qt4/src/widgets/tqtoolbutton.cpp')
-rw-r--r--tqtinterface/qt4/src/widgets/tqtoolbutton.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/tqtinterface/qt4/src/widgets/tqtoolbutton.cpp b/tqtinterface/qt4/src/widgets/tqtoolbutton.cpp
index 2cfd962..d71110a 100644
--- a/tqtinterface/qt4/src/widgets/tqtoolbutton.cpp
+++ b/tqtinterface/qt4/src/widgets/tqtoolbutton.cpp
@@ -309,7 +309,7 @@ void TQToolButton::setToggleButton( bool enable )
/*!
\reimp
*/
-TQSize TQToolButton::tqsizeHint() const
+TQSize TQToolButton::sizeHint() const
{
constPolish();
@@ -356,7 +356,7 @@ TQSize TQToolButton::tqsizeHint() const
if ( popup() && ! popupDelay() )
w += tqstyle().tqpixelMetric(TQStyle::PM_MenuButtonIndicator, this);
#endif
- return (tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)).
+ return (tqstyle().sizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)).
expandedTo(TQApplication::globalStrut()));
}
@@ -365,7 +365,7 @@ TQSize TQToolButton::tqsizeHint() const
*/
TQSize TQToolButton::tqminimumSizeHint() const
{
- return tqsizeHint();
+ return sizeHint();
}
/*!
@@ -918,32 +918,32 @@ void TQToolButton::popupTimerDone()
TQRect screen = tqApp->desktop()->availableGeometry( this );
if ( horizontal ) {
if ( TQApplication::reverseLayout() ) {
- if ( mapToGlobal( TQPoint( 0, rect().bottom() ) ).y() + d->popup->tqsizeHint().height() <= screen.height() ) {
+ if ( mapToGlobal( TQPoint( 0, rect().bottom() ) ).y() + d->popup->sizeHint().height() <= screen.height() ) {
p = mapToGlobal( rect().bottomRight() );
} else {
- p = mapToGlobal( rect().topRight() - TQPoint( 0, d->popup->tqsizeHint().height() ) );
+ p = mapToGlobal( rect().topRight() - TQPoint( 0, d->popup->sizeHint().height() ) );
}
- p.rx() -= d->popup->tqsizeHint().width();
+ p.rx() -= d->popup->sizeHint().width();
} else {
- if ( mapToGlobal( TQPoint( 0, rect().bottom() ) ).y() + d->popup->tqsizeHint().height() <= screen.height() ) {
+ if ( mapToGlobal( TQPoint( 0, rect().bottom() ) ).y() + d->popup->sizeHint().height() <= screen.height() ) {
p = mapToGlobal( rect().bottomLeft() );
} else {
- p = mapToGlobal( rect().topLeft() - TQPoint( 0, d->popup->tqsizeHint().height() ) );
+ p = mapToGlobal( rect().topLeft() - TQPoint( 0, d->popup->sizeHint().height() ) );
}
}
} else {
if ( TQApplication::reverseLayout() ) {
- if ( mapToGlobal( TQPoint( rect().left(), 0 ) ).x() - d->popup->tqsizeHint().width() <= screen.x() ) {
+ if ( mapToGlobal( TQPoint( rect().left(), 0 ) ).x() - d->popup->sizeHint().width() <= screen.x() ) {
p = mapToGlobal( rect().topRight() );
} else {
p = mapToGlobal( rect().topLeft() );
- p.rx() -= d->popup->tqsizeHint().width();
+ p.rx() -= d->popup->sizeHint().width();
}
} else {
- if ( mapToGlobal( TQPoint( rect().right(), 0 ) ).x() + d->popup->tqsizeHint().width() <= screen.width() ) {
+ if ( mapToGlobal( TQPoint( rect().right(), 0 ) ).x() + d->popup->sizeHint().width() <= screen.width() ) {
p = mapToGlobal( rect().topRight() );
} else {
- p = mapToGlobal( rect().topLeft() - TQPoint( d->popup->tqsizeHint().width(), 0 ) );
+ p = mapToGlobal( rect().topLeft() - TQPoint( d->popup->sizeHint().width(), 0 ) );
}
}
}