diff options
Diffstat (limited to 'tqtinterface/qt4/src/widgets/tqmenubar.cpp')
| -rw-r--r-- | tqtinterface/qt4/src/widgets/tqmenubar.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tqtinterface/qt4/src/widgets/tqmenubar.cpp b/tqtinterface/qt4/src/widgets/tqmenubar.cpp index a0751f4..aadb3ee 100644 --- a/tqtinterface/qt4/src/widgets/tqmenubar.cpp +++ b/tqtinterface/qt4/src/widgets/tqmenubar.cpp @@ -734,17 +734,17 @@ void TQMenuBar::openActPopup() TQPoint pos = r.bottomLeft() + TQPoint(0,yoffset); if( reverse ) { pos = r.bottomRight() + TQPoint(0,yoffset); - pos.rx() -= popup->sizeHint().width(); + pos.rx() -= popup->tqsizeHint().width(); } - int ph = popup->sizeHint().height(); + int ph = popup->tqsizeHint().height(); pos = mapToGlobal(pos); int sh = TQApplication::desktop()->height(); if ( defaultup || (pos.y() + ph > sh) ) { TQPoint t = mapToGlobal( r.topLeft() ); if( reverse ) { t = mapToGlobal( r.topRight() ); - t.rx() -= popup->sizeHint().width(); + t.rx() -= popup->tqsizeHint().width(); } t.ry() -= (TQCOORD)ph; if ( !defaultup || t.y() >= 0 ) @@ -940,8 +940,8 @@ int TQMenuBar::calculateRects( int max_width ) if ( mi->widget()->parentWidget() != this ) { mi->widget()->reparent( this, TQPoint(0,0) ); } - w = mi->widget()->sizeHint().expandedTo( TQApplication::globalStrut() ).width()+2; - h = mi->widget()->sizeHint().expandedTo( TQApplication::globalStrut() ).height()+2; + w = mi->widget()->tqsizeHint().expandedTo( TQApplication::globalStrut() ).width()+2; + h = mi->widget()->tqsizeHint().expandedTo( TQApplication::globalStrut() ).height()+2; if ( i && separator < 0 ) separator = i; } else if ( mi->pixmap() ) { // pixmap item @@ -1031,7 +1031,7 @@ int TQMenuBar::calculateRects( int max_width ) irects[i].setHeight( max_item_height ); TQMenuItem *mi = mitems->at(i); if ( mi->widget() ) { - TQRect r ( TQPoint(0,0), mi->widget()->sizeHint() ); + TQRect r ( TQPoint(0,0), mi->widget()->tqsizeHint() ); r.moveCenter( irects[i].center() ); mi->widget()->setGeometry( r ); if( mi->widget()->isHidden() ) @@ -1598,7 +1598,7 @@ void TQMenuBar::focusOutEvent( TQFocusEvent * ) \reimp */ -TQSize TQMenuBar::sizeHint() const +TQSize TQMenuBar::tqsizeHint() const { int h = height(); if ( badSize ) @@ -1609,7 +1609,7 @@ TQSize TQMenuBar::sizeHint() const s.setWidth( s.width() + irects[ i ].width() + 2 ); } s.setHeight( h ); - return (tqstyle().sizeFromContents(TQStyle::CT_MenuBar, this, s. + return (tqstyle().tqsizeFromContents(TQStyle::CT_MenuBar, this, s. expandedTo(TQApplication::globalStrut()))); } @@ -1622,7 +1622,7 @@ TQSize TQMenuBar::tqminimumSize() const #ifndef TQT_NO_TOOLBAR TQToolBar *tb = ::tqqt_cast<TQToolBar*>(tqparent()); if ( tb ) - return sizeHint(); + return tqsizeHint(); #endif return TQFrame::tqminimumSize(); } |