diff options
Diffstat (limited to 'experimental/tqtinterface/qt4/src/widgets/tqdockarea.cpp')
| -rw-r--r-- | experimental/tqtinterface/qt4/src/widgets/tqdockarea.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/experimental/tqtinterface/qt4/src/widgets/tqdockarea.cpp b/experimental/tqtinterface/qt4/src/widgets/tqdockarea.cpp index 5aed4893d..f9cf2fc99 100644 --- a/experimental/tqtinterface/qt4/src/widgets/tqdockarea.cpp +++ b/experimental/tqtinterface/qt4/src/widgets/tqdockarea.cpp @@ -120,7 +120,7 @@ TQLayoutIterator TQDockAreaLayout::iterator() return 0; } -TQSize TQDockAreaLayout::tqsizeHint() const +TQSize TQDockAreaLayout::sizeHint() const { if ( !dockWindows || !dockWindows->first() ) return TQSize( 0, 0 ); @@ -215,9 +215,9 @@ static int space_left( const TQRect &r, int pos, Qt::Orientation o ) static int dock_extent( TQDockWindow *w, Qt::Orientation o, int maxsize ) { if ( o == Qt::Horizontal ) - return TQMIN( maxsize, TQMAX( w->tqsizeHint().width(), w->fixedExtent().width() ) ); + return TQMIN( maxsize, TQMAX( w->sizeHint().width(), w->fixedExtent().width() ) ); else - return TQMIN( maxsize, TQMAX( w->tqsizeHint().height(), w->fixedExtent().height() ) ); + return TQMIN( maxsize, TQMAX( w->sizeHint().height(), w->fixedExtent().height() ) ); } static int dock_strut( TQDockWindow *w, Qt::Orientation o ) @@ -226,12 +226,12 @@ static int dock_strut( TQDockWindow *w, Qt::Orientation o ) int wid; if ( ( wid = w->fixedExtent().width() ) != -1 ) return TQMAX( wid, TQMAX( w->tqminimumSize().width(), w->tqminimumSizeHint().width() ) ); - return TQMAX( w->tqsizeHint().width(), TQMAX( w->tqminimumSize().width(), w->tqminimumSizeHint().width() ) ); + return TQMAX( w->sizeHint().width(), TQMAX( w->tqminimumSize().width(), w->tqminimumSizeHint().width() ) ); } else { int hei; if ( ( hei = w->fixedExtent().height() ) != -1 ) return TQMAX( hei, TQMAX( w->tqminimumSizeHint().height(), w->tqminimumSize().height() ) ); - return TQMAX( w->tqsizeHint().height(), TQMAX( w->tqminimumSizeHint().height(), w->tqminimumSize().height() ) ); + return TQMAX( w->sizeHint().height(), TQMAX( w->tqminimumSizeHint().height(), w->tqminimumSize().height() ) ); } } @@ -261,14 +261,14 @@ static void shrink_extend( TQDockWindow *dw, int &dockExtend, int /*spaceLeft*/, if ( !tb ) mw = dw->minimumWidth(); else - mw = dw->tqsizeHint().width(); + mw = dw->sizeHint().width(); dockExtend = mw; } else { int mh = 0; if ( !tb ) mh = dw->minimumHeight(); else - mh = dw->tqsizeHint().height(); + mh = dw->sizeHint().height(); dockExtend = mh; } } @@ -886,9 +886,9 @@ void TQDockArea::moveDockWindow( TQDockWindow *w, const TQPoint &p, const TQRect if ( mse != -10 && w->isResizeEnabled() ) { if ( orientation() != Qt::Horizontal ) - w->setFixedExtentWidth( TQMIN( TQMAX( w->minimumWidth(), mse ), w->tqsizeHint().width() ) ); + w->setFixedExtentWidth( TQMIN( TQMAX( w->minimumWidth(), mse ), w->sizeHint().width() ) ); else - w->setFixedExtentHeight( TQMIN( TQMAX( w->minimumHeight(), mse ), w->tqsizeHint().height() ) ); + w->setFixedExtentHeight( TQMIN( TQMAX( w->minimumHeight(), mse ), w->sizeHint().height() ) ); } updateLayout(); @@ -1171,13 +1171,13 @@ int TQDockArea::maxSpace( int hint, TQDockWindow *dw ) if ( !tb ) min = TQMAX( w->tqminimumSize().width(), w->tqminimumSizeHint().width() ); else - min = w->tqsizeHint().width(); + min = w->sizeHint().width(); } else { w->setFixedExtentHeight( -1 ); if ( !tb ) min = TQMAX( w->tqminimumSize().height(), w->tqminimumSizeHint().height() ); else - min = w->tqsizeHint().height(); + min = w->sizeHint().height(); } int diff = hint - ( orientation() == Qt::Horizontal ? dw->width() : dw->height() ); |