From 33d3ec06354d07cbb6164eb1c8adbd89c9ecefdd 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/tqstatusbar.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tqtinterface/qt4/src/widgets/tqstatusbar.cpp') diff --git a/tqtinterface/qt4/src/widgets/tqstatusbar.cpp b/tqtinterface/qt4/src/widgets/tqstatusbar.cpp index 75bbee8..6dbe4a4 100644 --- a/tqtinterface/qt4/src/widgets/tqstatusbar.cpp +++ b/tqtinterface/qt4/src/widgets/tqstatusbar.cpp @@ -47,7 +47,7 @@ #include "tqtimer.h" #include "tqdrawutil.h" #include "tqstyle.h" -#include "sizegrip.h" +#include "tqsizegrip.h" /*! \class TQStatusBar tqstatusbar.h @@ -312,7 +312,7 @@ void TQStatusBar::reformat() TQStatusBarPrivate::SBItem* item = d->items.first(); while ( item && !item->p ) { l->addWidget( item->w, item->s ); - int itemH = TQMIN(item->w->sizeHint().height(), + int itemH = TQMIN(item->w->tqsizeHint().height(), item->w->maximumHeight()); maxH = TQMAX( maxH, itemH ); item = d->items.next(); @@ -322,7 +322,7 @@ void TQStatusBar::reformat() while ( item ) { l->addWidget( item->w, item->s ); - int itemH = TQMIN(item->w->sizeHint().height(), + int itemH = TQMIN(item->w->tqsizeHint().height(), item->w->maximumHeight()); maxH = TQMAX( maxH, itemH ); item = d->items.next(); @@ -330,7 +330,7 @@ void TQStatusBar::reformat() l->addSpacing( 4 ); #ifndef TQT_NO_SIZEGRIP if ( d->resizer ) { - maxH = TQMAX( maxH, d->resizer->sizeHint().height() ); + maxH = TQMAX( maxH, d->resizer->tqsizeHint().height() ); d->box->addSpacing( 1 ); d->box->addWidget( d->resizer, 0, Qt::AlignBottom ); } @@ -496,7 +496,7 @@ bool TQStatusBar::event( TQEvent *e ) TQStatusBarPrivate::SBItem* item = d->items.first(); while ( item ) { - int itemH = TQMIN(item->w->sizeHint().height(), + int itemH = TQMIN(item->w->tqsizeHint().height(), item->w->maximumHeight()); maxH = TQMAX( maxH, itemH ); item = d->items.next(); @@ -504,7 +504,7 @@ bool TQStatusBar::event( TQEvent *e ) #ifndef TQT_NO_SIZEGRIP if ( d->resizer ) - maxH = TQMAX( maxH, d->resizer->sizeHint().height() ); + maxH = TQMAX( maxH, d->resizer->tqsizeHint().height() ); #endif if ( maxH != d->savedStrut ) -- cgit v1.2.1