diff options
Diffstat (limited to 'tqtinterface/qt4/src/widgets')
78 files changed, 289 insertions, 289 deletions
diff --git a/tqtinterface/qt4/src/widgets/tqbutton.cpp b/tqtinterface/qt4/src/widgets/tqbutton.cpp index c667fec..f0f06bc 100644 --- a/tqtinterface/qt4/src/widgets/tqbutton.cpp +++ b/tqtinterface/qt4/src/widgets/tqbutton.cpp @@ -213,7 +213,7 @@ TQTimer *TQButton::timer() To subclass TQButton, you must reimplement at least drawButton() (to draw the button's outline) and drawButtonLabel() (to draw its text or pixmap). It is generally advisable to reimplement - tqsizeHint() as well, and sometimes hitButton() (to determine + sizeHint() as well, and sometimes hitButton() (to determine whether a button press is within the button). To reduce flickering, TQButton::paintEvent() sets up a pixmap that diff --git a/tqtinterface/qt4/src/widgets/tqcheckbox.cpp b/tqtinterface/qt4/src/widgets/tqcheckbox.cpp index 37e8eac..0b139bf 100644 --- a/tqtinterface/qt4/src/widgets/tqcheckbox.cpp +++ b/tqtinterface/qt4/src/widgets/tqcheckbox.cpp @@ -170,16 +170,16 @@ bool TQCheckBox::isTristate() const /*!\reimp */ -TQSize TQCheckBox::tqsizeHint() const +TQSize TQCheckBox::sizeHint() const { - // NB: TQRadioButton::tqsizeHint() is similar + // NB: TQRadioButton::sizeHint() is similar constPolish(); TQPainter p(this); TQSize sz = tqstyle().tqitemRect(&p, TQRect(0, 0, 1, 1), TQt::ShowPrefix, FALSE, pixmap(), text()).size(); - return (tqstyle().tqsizeFromContents(TQStyle::CT_CheckBox, this, sz). + return (tqstyle().sizeFromContents(TQStyle::CT_CheckBox, this, sz). expandedTo(TQApplication::globalStrut())); } @@ -316,7 +316,7 @@ void TQCheckBox::resizeEvent( TQResizeEvent *e ) TQPainter p(this); TQSize isz = tqstyle().tqitemRect(&p, TQRect(0, 0, 1, 1), TQt::ShowPrefix, FALSE, pixmap(), text()).size(); - TQSize wsz = (tqstyle().tqsizeFromContents(TQStyle::CT_CheckBox, this, isz). + TQSize wsz = (tqstyle().sizeFromContents(TQStyle::CT_CheckBox, this, isz). expandedTo(TQApplication::globalStrut())); update(wsz.width(), isz.width(), 0, wsz.height()); diff --git a/tqtinterface/qt4/src/widgets/tqcheckbox.h b/tqtinterface/qt4/src/widgets/tqcheckbox.h index 3f0e21b..0e06a1a 100644 --- a/tqtinterface/qt4/src/widgets/tqcheckbox.h +++ b/tqtinterface/qt4/src/widgets/tqcheckbox.h @@ -66,7 +66,7 @@ public: void setTristate(bool y=TRUE); bool isTristate() const; - TQSize tqsizeHint() const; + TQSize sizeHint() const; public Q_SLOTS: void setChecked( bool check ); diff --git a/tqtinterface/qt4/src/widgets/tqcombobox.cpp b/tqtinterface/qt4/src/widgets/tqcombobox.cpp index d152da2..cf28437 100644 --- a/tqtinterface/qt4/src/widgets/tqcombobox.cpp +++ b/tqtinterface/qt4/src/widgets/tqcombobox.cpp @@ -367,13 +367,13 @@ public: TQComboBoxPopupItem(TQListBoxItem *i) : TQCustomMenuItem(), li(i), sc(0, 0) { } virtual bool fullSpan() const { return TRUE; } virtual void paint( TQPainter*, const TQColorGroup&, bool, bool, int, int, int, int); - virtual TQSize tqsizeHint() { if (sc.isNull()) sc = TQSize(li->width(li->listBox()), TQMAX(25, li->height(li->listBox()))); return sc; } + virtual TQSize sizeHint() { if (sc.isNull()) sc = TQSize(li->width(li->listBox()), TQMAX(25, li->height(li->listBox()))); return sc; } }; void TQComboBoxPopupItem::paint( TQPainter* p, const TQColorGroup&, bool, bool, int x, int y, int, int) { p->save(); - p->translate(x, y + ((tqsizeHint().height() / 2) - (li->height(li->listBox()) / 2))); + p->translate(x, y + ((sizeHint().height() / 2) - (li->height(li->listBox()) / 2))); li->paint(p); p->restore(); } @@ -419,7 +419,7 @@ public: TQLineEdit * ed; // /bin/ed rules! TQTimer *completionTimer; - TQSize tqsizeHint; + TQSize sizeHint; private: bool usingLBox; @@ -1077,10 +1077,10 @@ void TQComboBox::setAutoResize( bool enable ) the contents change dynamically. To tqinvalidate the cached value call setFont(). */ -TQSize TQComboBox::tqsizeHint() const +TQSize TQComboBox::sizeHint() const { - if ( isVisible() && d->tqsizeHint.isValid() ) - return d->tqsizeHint; + if ( isVisible() && d->sizeHint.isValid() ) + return d->sizeHint; constPolish(); int i, w; @@ -1090,7 +1090,7 @@ TQSize TQComboBox::tqsizeHint() const int maxH = TQMAX( fm.lineSpacing(), 14 ) + 2; if ( !d->usingListBox() ) { - w = d->popup()->tqsizeHint().width() - 2* d->popup()->frameWidth(); + w = d->popup()->sizeHint().width() - 2* d->popup()->frameWidth(); if ( w > maxW ) maxW = w; } else { @@ -1101,11 +1101,11 @@ TQSize TQComboBox::tqsizeHint() const } } - d->tqsizeHint = (tqstyle().tqsizeFromContents(TQStyle::CT_ComboBox, this, + d->sizeHint = (tqstyle().sizeFromContents(TQStyle::CT_ComboBox, this, TQSize(maxW, maxH)). expandedTo(TQApplication::globalStrut())); - return d->tqsizeHint; + return d->sizeHint; } @@ -1185,7 +1185,7 @@ void TQComboBox::setPalette( const TQPalette &palette ) void TQComboBox::setFont( const TQFont &font ) { - d->tqsizeHint = TQSize(); // tqinvalidate size hint + d->sizeHint = TQSize(); // tqinvalidate size hint TQWidget::setFont( font ); if ( d->usingListBox() ) d->listBox()->setFont( font ); @@ -1519,7 +1519,7 @@ static int listHeight( TQListBox *l, int sl ) if ( l->count() > 0 ) return TQMIN( l->count(), (uint)sl) * l->item( 0 )->height(l); else - return l->tqsizeHint().height(); + return l->sizeHint().height(); } @@ -1569,7 +1569,7 @@ void TQComboBox::popup() lb->triggerUpdate( TRUE ); lb->installEventFilter( this ); d->mouseWasInsidePopup = FALSE; - int w = lb->variableWidth() ? lb->tqsizeHint().width() : width(); + int w = lb->variableWidth() ? lb->sizeHint().width() : width(); int h = listHeight( lb, d->sizeLimit ) + 2; TQRect screen = TQApplication::desktop()->availableGeometry( this ); @@ -2204,7 +2204,7 @@ bool TQComboBox::autoCompletion() const */ void TQComboBox::styleChange( TQStyle& s ) { - d->tqsizeHint = TQSize(); // tqinvalidate size hint... + d->sizeHint = TQSize(); // tqinvalidate size hint... if ( d->ed ) d->updateLinedGeometry(); TQWidget::styleChange( s ); diff --git a/tqtinterface/qt4/src/widgets/tqcombobox.h b/tqtinterface/qt4/src/widgets/tqcombobox.h index bfee192..b563240 100644 --- a/tqtinterface/qt4/src/widgets/tqcombobox.h +++ b/tqtinterface/qt4/src/widgets/tqcombobox.h @@ -106,7 +106,7 @@ public: bool autoResize() const; virtual void setAutoResize( bool ); - TQSize tqsizeHint() const; + TQSize sizeHint() const; void setPalette( const TQPalette & ); void setFont( const TQFont & ); diff --git a/tqtinterface/qt4/src/widgets/tqdatetimeedit.cpp b/tqtinterface/qt4/src/widgets/tqdatetimeedit.cpp index 4aaea53..acbc092 100644 --- a/tqtinterface/qt4/src/widgets/tqdatetimeedit.cpp +++ b/tqtinterface/qt4/src/widgets/tqdatetimeedit.cpp @@ -1093,7 +1093,7 @@ void TQDateEdit::resizeEvent( TQResizeEvent * ) /*! \reimp */ -TQSize TQDateEdit::tqsizeHint() const +TQSize TQDateEdit::sizeHint() const { constPolish(); TQFontMetrics fm( font() ); @@ -1109,7 +1109,7 @@ TQSize TQDateEdit::tqsizeHint() const */ TQSize TQDateEdit::tqminimumSizeHint() const { - return tqsizeHint(); + return sizeHint(); } @@ -2550,7 +2550,7 @@ void TQTimeEdit::resizeEvent( TQResizeEvent * ) /*! \reimp */ -TQSize TQTimeEdit::tqsizeHint() const +TQSize TQTimeEdit::sizeHint() const { constPolish(); TQFontMetrics fm( font() ); @@ -2572,7 +2572,7 @@ TQSize TQTimeEdit::tqsizeHint() const */ TQSize TQTimeEdit::tqminimumSizeHint() const { - return tqsizeHint(); + return sizeHint(); } /*! @@ -2694,8 +2694,8 @@ TQDateTimeEdit::~TQDateTimeEdit() void TQDateTimeEdit::resizeEvent( TQResizeEvent * ) { - int dw = de->tqsizeHint().width(); - int tw = te->tqsizeHint().width(); + int dw = de->sizeHint().width(); + int tw = te->sizeHint().width(); int w = width(); int h = height(); int extra = w - ( dw + tw ); @@ -2742,11 +2742,11 @@ void TQDateTimeEdit::init() /*! \reimp */ -TQSize TQDateTimeEdit::tqsizeHint() const +TQSize TQDateTimeEdit::sizeHint() const { constPolish(); - TQSize dsh = de->tqsizeHint(); - TQSize tsh = te->tqsizeHint(); + TQSize dsh = de->sizeHint(); + TQSize tsh = te->sizeHint(); return TQSize( dsh.width() + tsh.width(), TQMAX( dsh.height(), tsh.height() ) ); } diff --git a/tqtinterface/qt4/src/widgets/tqdatetimeedit.h b/tqtinterface/qt4/src/widgets/tqdatetimeedit.h index ab59358..b4a6e93 100644 --- a/tqtinterface/qt4/src/widgets/tqdatetimeedit.h +++ b/tqtinterface/qt4/src/widgets/tqdatetimeedit.h @@ -93,7 +93,7 @@ public: enum Order { DMY, MDY, YMD, YDM }; - TQSize tqsizeHint() const; + TQSize sizeHint() const; TQSize tqminimumSizeHint() const; public Q_SLOTS: @@ -180,7 +180,7 @@ public: TQTimeEdit( const QTime& time, QWidget* tqparent=0, const char* name=0 ); ~TQTimeEdit(); - TQSize tqsizeHint() const; + TQSize sizeHint() const; TQSize tqminimumSizeHint() const; public Q_SLOTS: @@ -255,7 +255,7 @@ public: const char* name=0 ); ~TQDateTimeEdit(); - TQSize tqsizeHint() const; + TQSize sizeHint() const; TQSize tqminimumSizeHint() const; public Q_SLOTS: diff --git a/tqtinterface/qt4/src/widgets/tqdial.cpp b/tqtinterface/qt4/src/widgets/tqdial.cpp index 5b9601b..efde0a8 100644 --- a/tqtinterface/qt4/src/widgets/tqdial.cpp +++ b/tqtinterface/qt4/src/widgets/tqdial.cpp @@ -773,7 +773,7 @@ TQSize TQDial::tqminimumSizeHint() const \reimp */ -TQSize TQDial::tqsizeHint() const +TQSize TQDial::sizeHint() const { return TQSize( 100, 100 ).expandedTo( TQApplication::globalStrut() ); } diff --git a/tqtinterface/qt4/src/widgets/tqdial.h b/tqtinterface/qt4/src/widgets/tqdial.h index d7cfcad..3b36e6d 100644 --- a/tqtinterface/qt4/src/widgets/tqdial.h +++ b/tqtinterface/qt4/src/widgets/tqdial.h @@ -83,7 +83,7 @@ public: bool notchesVisible() const; - TQSize tqsizeHint() const; + TQSize sizeHint() const; TQSize tqminimumSizeHint() const; int minValue() const; diff --git a/tqtinterface/qt4/src/widgets/tqdialogbuttons.cpp b/tqtinterface/qt4/src/widgets/tqdialogbuttons.cpp index cabc7e8..f70e3bd 100644 --- a/tqtinterface/qt4/src/widgets/tqdialogbuttons.cpp +++ b/tqtinterface/qt4/src/widgets/tqdialogbuttons.cpp @@ -422,18 +422,18 @@ TQDialogButtons::layoutButtons() } TQSize -TQDialogButtons::tqsizeHint() const +TQDialogButtons::sizeHint() const { constPolish(); TQSize s; if(d->custom) - s = d->custom->tqsizeHint(); - return (tqstyle().tqsizeFromContents(TQStyle::CT_DialogButtons, this, s. + s = d->custom->sizeHint(); + return (tqstyle().sizeFromContents(TQStyle::CT_DialogButtons, this, s. expandedTo(TQApplication::globalStrut()))); } TQSize -TQDialogButtons::tqsizeHint(TQDialogButtons::Button button) const +TQDialogButtons::sizeHint(TQDialogButtons::Button button) const { TQWidget *w = NULL; if(d->visible & button) { @@ -445,12 +445,12 @@ TQDialogButtons::tqsizeHint(TQDialogButtons::Button button) const w = d->buttons[button]; } } - return w->tqsizeHint(); + return w->sizeHint(); } TQSize TQDialogButtons::tqminimumSizeHint() const { - return tqsizeHint(); + return sizeHint(); } #endif diff --git a/tqtinterface/qt4/src/widgets/tqdialogbuttons_p.h b/tqtinterface/qt4/src/widgets/tqdialogbuttons_p.h index 4262ec1..eed5bbc 100644 --- a/tqtinterface/qt4/src/widgets/tqdialogbuttons_p.h +++ b/tqtinterface/qt4/src/widgets/tqdialogbuttons_p.h @@ -85,9 +85,9 @@ public: void setOrientation(Qt::Orientation); Qt::Orientation orientation() const; - virtual TQSize tqsizeHint(Button) const; + virtual TQSize sizeHint(Button) const; TQSize tqminimumSizeHint() const; - TQSize tqsizeHint() const; + TQSize sizeHint() const; protected: void layoutButtons(); diff --git a/tqtinterface/qt4/src/widgets/tqdockarea.cpp b/tqtinterface/qt4/src/widgets/tqdockarea.cpp index 5aed489..f9cf2fc 100644 --- a/tqtinterface/qt4/src/widgets/tqdockarea.cpp +++ b/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() ); diff --git a/tqtinterface/qt4/src/widgets/tqdockarea.h b/tqtinterface/qt4/src/widgets/tqdockarea.h index 34c2a50..08f700a 100644 --- a/tqtinterface/qt4/src/widgets/tqdockarea.h +++ b/tqtinterface/qt4/src/widgets/tqdockarea.h @@ -75,7 +75,7 @@ public: bool hasHeightForWidth() const; int heightForWidth( int ) const; int widthForHeight( int ) const; - TQSize tqsizeHint() const; + TQSize sizeHint() const; TQSize tqminimumSize() const; TQLayoutIterator iterator(); TQ_SPExpandData expandingDirections() const { return (Qt::Orientations)TQSizePolicy::NoDirection; } // [FIXME] Is this redefinition cast to Qt::Orientations correct? diff --git a/tqtinterface/qt4/src/widgets/tqdockwindow.cpp b/tqtinterface/qt4/src/widgets/tqdockwindow.cpp index e6e6f55..6809828 100644 --- a/tqtinterface/qt4/src/widgets/tqdockwindow.cpp +++ b/tqtinterface/qt4/src/widgets/tqdockwindow.cpp @@ -80,7 +80,7 @@ public: void setOrientation( Orientation o ); Orientation orientation() const { return orient; } - TQSize tqsizeHint() const; + TQSize sizeHint() const; protected: void paintEvent( TQPaintEvent * ); @@ -109,10 +109,10 @@ TQDockWindowResizeHandle::TQDockWindowResizeHandle( Orientation o, TQWidget *tqp setOrientation( o ); } -TQSize TQDockWindowResizeHandle::tqsizeHint() const +TQSize TQDockWindowResizeHandle::sizeHint() const { int sw = 2 * tqstyle().tqpixelMetric(TQStyle::PM_SplitterWidth, this) / 3; - return (tqstyle().tqsizeFromContents(TQStyle::CT_DockWindow, this, TQSize(sw, sw)). + return (tqstyle().sizeFromContents(TQStyle::CT_DockWindow, this, TQSize(sw, sw)). expandedTo(TQApplication::globalStrut())); } @@ -320,7 +320,7 @@ public: TQSize tqminimumSizeHint() const; TQSize tqminimumSize() const { return tqminimumSizeHint(); } - TQSize tqsizeHint() const { return tqminimumSize(); } + TQSize sizeHint() const { return tqminimumSize(); } TQSizePolicy sizePolicy() const; void setOpaqueMoving( bool b ) { opaque = b; } @@ -1148,7 +1148,7 @@ void TQDockWindow::swapRect( TQRect &r, Orientation o, const TQPoint &offset, TQ TQBoxLayout *bl = boxLayout()->createTmpCopy(); bl->setDirection( o == Qt::Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ); bl->activate(); - r.setSize( bl->tqsizeHint() ); + r.setSize( bl->sizeHint() ); bl->data = 0; delete bl; bool reverse = TQApplication::reverseLayout(); @@ -1808,9 +1808,9 @@ TQBoxLayout *TQDockWindow::boxLayout() /*! \reimp */ -TQSize TQDockWindow::tqsizeHint() const +TQSize TQDockWindow::sizeHint() const { - TQSize sh( TQFrame::tqsizeHint() ); + TQSize sh( TQFrame::sizeHint() ); if ( place() == InDock ) sh = sh.expandedTo( fixedExtent() ); sh = sh.expandedTo( TQSize( 16, 16 ) ); diff --git a/tqtinterface/qt4/src/widgets/tqdockwindow.h b/tqtinterface/qt4/src/widgets/tqdockwindow.h index 6906fd9..242d124 100644 --- a/tqtinterface/qt4/src/widgets/tqdockwindow.h +++ b/tqtinterface/qt4/src/widgets/tqdockwindow.h @@ -133,7 +133,7 @@ public: Orientation orientation() const; - TQSize tqsizeHint() const; + TQSize sizeHint() const; TQSize tqminimumSize() const; TQSize tqminimumSizeHint() const; diff --git a/tqtinterface/qt4/src/widgets/tqeffects.cpp b/tqtinterface/qt4/src/widgets/tqeffects.cpp index 0ac6a24..cb8527f 100644 --- a/tqtinterface/qt4/src/widgets/tqeffects.cpp +++ b/tqtinterface/qt4/src/widgets/tqeffects.cpp @@ -395,8 +395,8 @@ TQRollEffect::TQRollEffect( TQWidget* w, WFlags f, DirFlags orient ) totalWidth = widget->width(); totalHeight = widget->height(); } else { - totalWidth = widget->tqsizeHint().width(); - totalHeight = widget->tqsizeHint().height(); + totalWidth = widget->sizeHint().width(); + totalHeight = widget->sizeHint().height(); } currentHeight = totalHeight; diff --git a/tqtinterface/qt4/src/widgets/tqframe.cpp b/tqtinterface/qt4/src/widgets/tqframe.cpp index f49b30c..4bce9b1 100644 --- a/tqtinterface/qt4/src/widgets/tqframe.cpp +++ b/tqtinterface/qt4/src/widgets/tqframe.cpp @@ -476,18 +476,18 @@ TQRect TQFrame::contentsRect() const /*!\reimp */ -TQSize TQFrame::tqsizeHint() const +TQSize TQFrame::sizeHint() const { // Returns a size hint for the frame - for HLine and VLine // tqshapes, this is stretchable one way and 3 pixels wide the - // other. For other tqshapes, TQWidget::tqsizeHint() is used. + // other. For other tqshapes, TQWidget::sizeHint() is used. switch (fstyle & MShape) { case HLine: return TQSize(-1,3); case VLine: return TQSize(3,-1); default: - return TQWidget::tqsizeHint(); + return TQWidget::sizeHint(); } } diff --git a/tqtinterface/qt4/src/widgets/tqframe.h b/tqtinterface/qt4/src/widgets/tqframe.h index 8d289d2..bc68c24 100644 --- a/tqtinterface/qt4/src/widgets/tqframe.h +++ b/tqtinterface/qt4/src/widgets/tqframe.h @@ -74,7 +74,7 @@ public: bool lineShapesOk() const { return TRUE; } #endif - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; enum Shape { NoFrame = 0, // no frame Box = 0x0001, // rectangular box diff --git a/tqtinterface/qt4/src/widgets/tqgrid.cpp b/tqtinterface/qt4/src/widgets/tqgrid.cpp index 06c6a88..68bbc6c 100644 --- a/tqtinterface/qt4/src/widgets/tqgrid.cpp +++ b/tqtinterface/qt4/src/widgets/tqgrid.cpp @@ -52,7 +52,7 @@ The number of rows \e or columns is defined in the constructor. All the grid's tqchildren will be placed and sized in accordance - with their tqsizeHint() and sizePolicy(). + with their sizeHint() and sizePolicy(). Use setMargin() to add space around the grid itself, and setSpacing() to add space between the widgets. @@ -128,10 +128,10 @@ void TQGrid::frameChanged() \reimp */ -TQSize TQGrid::tqsizeHint() const +TQSize TQGrid::sizeHint() const { TQWidget *mThis = (TQWidget*)this; TQApplication::sendPostedEvents( mThis, TQEvent::ChildInserted ); - return TQFrame::tqsizeHint(); + return TQFrame::sizeHint(); } #endif diff --git a/tqtinterface/qt4/src/widgets/tqgrid.h b/tqtinterface/qt4/src/widgets/tqgrid.h index 98ee826..8489136 100644 --- a/tqtinterface/qt4/src/widgets/tqgrid.h +++ b/tqtinterface/qt4/src/widgets/tqgrid.h @@ -55,7 +55,7 @@ public: WFlags f = 0 ); void setSpacing( int ); - TQSize tqsizeHint() const; + TQSize sizeHint() const; #ifndef TQT_NO_COMPAT typedef Qt::Orientation Direction; diff --git a/tqtinterface/qt4/src/widgets/tqgroupbox.cpp b/tqtinterface/qt4/src/widgets/tqgroupbox.cpp index f9c341e..fd07192 100644 --- a/tqtinterface/qt4/src/widgets/tqgroupbox.cpp +++ b/tqtinterface/qt4/src/widgets/tqgroupbox.cpp @@ -213,8 +213,8 @@ void TQGroupBox::setTextSpacer() int fh = fm.height(); if ( isCheckable() ) { #ifndef TQT_NO_CHECKBOX - fh = d->checkbox->tqsizeHint().height() + 2; - w = d->checkbox->tqsizeHint().width() + 2*fm.width( "xx" ); + fh = d->checkbox->sizeHint().height() + 2; + w = d->checkbox->sizeHint().width() + 2*fm.width( "xx" ); #endif } else { fh = fm.height(); @@ -766,14 +766,14 @@ void TQGroupBox::fontChange( const TQFont & oldFont ) \reimp */ -TQSize TQGroupBox::tqsizeHint() const +TQSize TQGroupBox::sizeHint() const { TQFontMetrics fm( font() ); int tw, th; if ( isCheckable() ) { #ifndef TQT_NO_CHECKBOX - tw = d->checkbox->tqsizeHint().width() + 2*fm.width( "xx" ); - th = d->checkbox->tqsizeHint().height() + fm.width( TQChar(' ') ); + tw = d->checkbox->sizeHint().width() + 2*fm.width( "xx" ); + th = d->checkbox->sizeHint().height() + fm.width( TQChar(' ') ); #endif } else { tw = fm.width( title() ) + 2 * fm.width( "xx" ); @@ -782,7 +782,7 @@ TQSize TQGroupBox::tqsizeHint() const TQSize s; if ( tqlayout() ) { - s = TQFrame::tqsizeHint(); + s = TQFrame::sizeHint(); return s.expandedTo( TQSize( tw, 0 ) ); } else { TQRect r = tqchildrenRect(); @@ -960,7 +960,7 @@ void TQGroupBox::setEnabled(bool on) void TQGroupBox::updateCheckBoxGeometry() { if ( d->checkbox ) { - TQSize cbSize = d->checkbox->tqsizeHint(); + TQSize cbSize = d->checkbox->sizeHint(); TQRect cbRect( 0, 0, cbSize.width(), cbSize.height() ); int marg = bFlat ? 2 : 8; diff --git a/tqtinterface/qt4/src/widgets/tqgroupbox.h b/tqtinterface/qt4/src/widgets/tqgroupbox.h index d73403e..3737ad7 100644 --- a/tqtinterface/qt4/src/widgets/tqgroupbox.h +++ b/tqtinterface/qt4/src/widgets/tqgroupbox.h @@ -99,7 +99,7 @@ public: void setInsideSpacing( int s ); void addSpace( int ); - TQSize tqsizeHint() const; + TQSize sizeHint() const; bool isFlat() const; void setFlat( bool b ); diff --git a/tqtinterface/qt4/src/widgets/tqhbox.cpp b/tqtinterface/qt4/src/widgets/tqhbox.cpp index d25956d..2f33310 100644 --- a/tqtinterface/qt4/src/widgets/tqhbox.cpp +++ b/tqtinterface/qt4/src/widgets/tqhbox.cpp @@ -51,7 +51,7 @@ \ingroup appearance All the horizontal box's child widgets will be placed alongside - each other and sized according to their tqsizeHint()s. + each other and sized according to their sizeHint()s. Use setMargin() to add space around the edges, and use setSpacing() to add space between the widgets. Use @@ -123,11 +123,11 @@ void TQHBox::setSpacing( int space ) \reimp */ -TQSize TQHBox::tqsizeHint() const +TQSize TQHBox::sizeHint() const { TQWidget *mThis = (TQWidget*)this; TQApplication::sendPostedEvents( mThis, TQEvent::ChildInserted ); - return TQFrame::tqsizeHint(); + return TQFrame::sizeHint(); } /*! diff --git a/tqtinterface/qt4/src/widgets/tqhbox.h b/tqtinterface/qt4/src/widgets/tqhbox.h index e669eb0..c67638b 100644 --- a/tqtinterface/qt4/src/widgets/tqhbox.h +++ b/tqtinterface/qt4/src/widgets/tqhbox.h @@ -57,7 +57,7 @@ public: void setSpacing( int ); bool setStretchFactor( TQWidget*, int stretch ); - TQSize tqsizeHint() const; + TQSize sizeHint() const; protected: TQHBox( bool horizontal, TQWidget* tqparent, const char* name, WFlags f = 0 ); diff --git a/tqtinterface/qt4/src/widgets/tqheader.cpp b/tqtinterface/qt4/src/widgets/tqheader.cpp index 67fb7f0..bc49be3 100644 --- a/tqtinterface/qt4/src/widgets/tqheader.cpp +++ b/tqtinterface/qt4/src/widgets/tqheader.cpp @@ -1224,7 +1224,7 @@ void TQHeader::setIsATableHeader( bool b ) } /*! \reimp */ -TQSize TQHeader::tqsizeHint() const +TQSize TQHeader::sizeHint() const { int width; int height; @@ -1255,7 +1255,7 @@ TQSize TQHeader::tqsizeHint() const for ( int i = 0; i < count(); i++ ) height += d->sizes[i]; } - return (tqstyle().tqsizeFromContents(TQStyle::CT_Header, this, + return (tqstyle().sizeFromContents(TQStyle::CT_Header, this, TQSize(width, height)).expandedTo(TQApplication::globalStrut())); } diff --git a/tqtinterface/qt4/src/widgets/tqheader.h b/tqtinterface/qt4/src/widgets/tqheader.h index ab0f371..9456a2b 100644 --- a/tqtinterface/qt4/src/widgets/tqheader.h +++ b/tqtinterface/qt4/src/widgets/tqheader.h @@ -112,7 +112,7 @@ public: int offset() const; - TQSize tqsizeHint() const; + TQSize sizeHint() const; int mapToSection( int index ) const; int mapToIndex( int section ) const; diff --git a/tqtinterface/qt4/src/widgets/tqlabel.cpp b/tqtinterface/qt4/src/widgets/tqlabel.cpp index b29d599..0b529f0 100644 --- a/tqtinterface/qt4/src/widgets/tqlabel.cpp +++ b/tqtinterface/qt4/src/widgets/tqlabel.cpp @@ -272,7 +272,7 @@ void TQLabel::setText( const TQString &text ) { if ( ltext == text ) return; - TQSize osh = tqsizeHint(); + TQSize osh = sizeHint(); #ifndef TQT_NO_RICHTEXT bool hadRichtext = doc != 0; #endif @@ -338,7 +338,7 @@ void TQLabel::clear() */ void TQLabel::setPixmap( const TQPixmap &pixmap ) { - TQSize osh = tqsizeHint(); + TQSize osh = sizeHint(); if ( !lpixmap || lpixmap->serialNumber() != pixmap.serialNumber() ) { clearContents(); @@ -363,7 +363,7 @@ void TQLabel::setPixmap( const TQPixmap &pixmap ) void TQLabel::setPicture( const TQPicture &picture ) { - TQSize osh = tqsizeHint(); + TQSize osh = sizeHint(); clearContents(); lpicture = new TQPicture( picture ); @@ -439,7 +439,7 @@ void TQLabel::tqsetAlignment( int tqalignment ) { if ( tqalignment == align ) return; - TQSize osh = tqsizeHint(); + TQSize osh = sizeHint(); #ifndef TQT_NO_ACCEL if ( lbuddy ) align = tqalignment | TQt::ShowPrefix; @@ -508,7 +508,7 @@ void TQLabel::setIndent( int indent ) Auto-resizing is disabled by default. - \sa autoResize(), adjustSize(), tqsizeHint() + \sa autoResize(), adjustSize(), sizeHint() */ void TQLabel::setAutoResize( bool enable ) @@ -524,7 +524,7 @@ void TQLabel::setAutoResize( bool enable ) /*! Returns the size that will be used if the width of the label is \a - w. If \a w is -1, the tqsizeHint() is returned. + w. If \a w is -1, the sizeHint() is returned. */ TQSize TQLabel::sizeForWidth( int w ) const @@ -620,7 +620,7 @@ int TQLabel::heightForWidth( int w ) const /*!\reimp */ -TQSize TQLabel::tqsizeHint() const +TQSize TQLabel::sizeHint() const { if ( d->valid_hints != frameWidth() ) (void) TQLabel::tqminimumSizeHint(); @@ -654,9 +654,9 @@ TQSize TQLabel::tqminimumSizeHint() const if ( d->sh.height() < sz.height() ) sz.rheight() = d->sh.height(); } - if ( tqsizePolicy().horData() == TQSizePolicy::Ignored ) + if ( sizePolicy().horData() == TQSizePolicy::Ignored ) sz.rwidth() = -1; - if ( tqsizePolicy().verData() == TQSizePolicy::Ignored ) + if ( sizePolicy().verData() == TQSizePolicy::Ignored ) sz.rheight() = -1; d->msh = sz; return sz; @@ -854,12 +854,12 @@ void TQLabel::drawContents( TQPainter *p ) void TQLabel::updateLabel( TQSize oldSizeHint ) { d->valid_hints = -1; - TQSizePolicy policy = tqsizePolicy(); + TQSizePolicy policy = sizePolicy(); bool wordBreak = align & TQt::WordBreak; policy.setHeightForWidth( wordBreak ); - if ( policy != tqsizePolicy() ) + if ( policy != sizePolicy() ) tqsetSizePolicy( policy ); - if ( tqsizeHint() != oldSizeHint ) + if ( sizeHint() != oldSizeHint ) updateGeometry(); if ( autoresize ) { adjustSize(); @@ -1026,7 +1026,7 @@ void TQLabel::movieResized( const TQSize& size ) void TQLabel::setMovie( const TQMovie& movie ) { - TQSize osh = tqsizeHint(); + TQSize osh = sizeHint(); clearContents(); lmovie = new TQMovie( movie ); diff --git a/tqtinterface/qt4/src/widgets/tqlabel.h b/tqtinterface/qt4/src/widgets/tqlabel.h index 654648e..cd0bba7 100644 --- a/tqtinterface/qt4/src/widgets/tqlabel.h +++ b/tqtinterface/qt4/src/widgets/tqlabel.h @@ -95,7 +95,7 @@ public: bool hasScaledContents() const; void setScaledContents( bool ); #endif - TQSize tqsizeHint() const; + TQSize sizeHint() const; TQSize tqminimumSizeHint() const; #ifndef TQT_NO_ACCEL virtual void setBuddy( TQWidget * ); diff --git a/tqtinterface/qt4/src/widgets/tqlcdnumber.cpp b/tqtinterface/qt4/src/widgets/tqlcdnumber.cpp index 16f225b..c20f6ce 100644 --- a/tqtinterface/qt4/src/widgets/tqlcdnumber.cpp +++ b/tqtinterface/qt4/src/widgets/tqlcdnumber.cpp @@ -1162,7 +1162,7 @@ TQLCDNumber::SegmentStyle TQLCDNumber::segmentStyle() const /*!\reimp */ -TQSize TQLCDNumber::tqsizeHint() const +TQSize TQLCDNumber::sizeHint() const { return TQSize( 10 + 9 * (numDigits() + (smallDecimalPoint() ? 0 : 1)), 23 ); } diff --git a/tqtinterface/qt4/src/widgets/tqlcdnumber.h b/tqtinterface/qt4/src/widgets/tqlcdnumber.h index e954305..0ae3b26 100644 --- a/tqtinterface/qt4/src/widgets/tqlcdnumber.h +++ b/tqtinterface/qt4/src/widgets/tqlcdnumber.h @@ -89,7 +89,7 @@ public: double value() const; int intValue() const; - TQSize tqsizeHint() const; + TQSize sizeHint() const; public Q_SLOTS: void display( const TQString &str ); diff --git a/tqtinterface/qt4/src/widgets/tqlineedit.cpp b/tqtinterface/qt4/src/widgets/tqlineedit.cpp index 2d41152..c7b08ef 100644 --- a/tqtinterface/qt4/src/widgets/tqlineedit.cpp +++ b/tqtinterface/qt4/src/widgets/tqlineedit.cpp @@ -640,14 +640,14 @@ void TQLineEdit::setValidator( const TQValidator *v ) 20 characters. */ -TQSize TQLineEdit::tqsizeHint() const +TQSize TQLineEdit::sizeHint() const { constPolish(); TQFontMetrics fm( font() ); int h = TQMAX(fm.lineSpacing(), 14) + 2*innerMargin; int w = fm.width( 'x' ) * 17; // "some" int m = frameWidth() * 2; - return (tqstyle().tqsizeFromContents(TQStyle::CT_LineEdit, this, + return (tqstyle().sizeFromContents(TQStyle::CT_LineEdit, this, TQSize( w + m, h + m ). expandedTo(TQApplication::globalStrut()))); } diff --git a/tqtinterface/qt4/src/widgets/tqlineedit.h b/tqtinterface/qt4/src/widgets/tqlineedit.h index a8c3242..9791e0b 100644 --- a/tqtinterface/qt4/src/widgets/tqlineedit.h +++ b/tqtinterface/qt4/src/widgets/tqlineedit.h @@ -102,7 +102,7 @@ public: const TQValidator * validator() const; - TQSize tqsizeHint() const; + TQSize sizeHint() const; TQSize tqminimumSizeHint() const; int cursorPosition() const; diff --git a/tqtinterface/qt4/src/widgets/tqlistbox.cpp b/tqtinterface/qt4/src/widgets/tqlistbox.cpp index b829780..b785f06 100644 --- a/tqtinterface/qt4/src/widgets/tqlistbox.cpp +++ b/tqtinterface/qt4/src/widgets/tqlistbox.cpp @@ -3074,7 +3074,7 @@ void TQListBox::emitChangedSignal( bool ) /*! \reimp */ -TQSize TQListBox::tqsizeHint() const +TQSize TQListBox::sizeHint() const { if ( cachedSizeHint().isValid() ) return cachedSizeHint(); diff --git a/tqtinterface/qt4/src/widgets/tqlistbox.h b/tqtinterface/qt4/src/widgets/tqlistbox.h index 936c69a..22447eb 100644 --- a/tqtinterface/qt4/src/widgets/tqlistbox.h +++ b/tqtinterface/qt4/src/widgets/tqlistbox.h @@ -136,7 +136,7 @@ public: bool isSelected( const TQListBoxItem * ) const; TQListBoxItem* selectedItem() const; - TQSize tqsizeHint() const; + TQSize sizeHint() const; TQSize tqminimumSizeHint() const; TQListBoxItem *item( int index ) const; diff --git a/tqtinterface/qt4/src/widgets/tqlistview.cpp b/tqtinterface/qt4/src/widgets/tqlistview.cpp index bd706e9..655859f 100644 --- a/tqtinterface/qt4/src/widgets/tqlistview.cpp +++ b/tqtinterface/qt4/src/widgets/tqlistview.cpp @@ -3249,7 +3249,7 @@ void TQListView::clear() delete c; c = n; } - resizeContents( d->h->tqsizeHint().width(), contentsHeight() ); + resizeContents( d->h->sizeHint().width(), contentsHeight() ); delete d->r; d->r = 0; TQListViewPrivate::Root * r = new TQListViewPrivate::Root( this ); @@ -3640,7 +3640,7 @@ void TQListView::updateGeometries() if ( d->h->isHidden() ) { setMargins( 0, 0, 0, 0 ); } else { - TQSize hs( d->h->tqsizeHint() ); + TQSize hs( d->h->sizeHint() ); setMargins( 0, hs.height(), 0, 0 ); d->h->setGeometry( viewport()->x(), viewport()->y()-hs.height(), visibleWidth(), hs.height() ); @@ -6844,7 +6844,7 @@ void TQCheckListItem::paintFocus( TQPainter *p, const TQColorGroup & cg, /*! \reimp */ -TQSize TQListView::tqsizeHint() const +TQSize TQListView::sizeHint() const { if ( cachedSizeHint().isValid() ) return cachedSizeHint(); @@ -6855,7 +6855,7 @@ TQSize TQListView::tqsizeHint() const // force the column widths to sanity, if possible buildDrawableList(); - TQSize s( d->h->tqsizeHint() ); + TQSize s( d->h->sizeHint() ); if ( verticalScrollBar()->isVisible() ) s.setWidth( s.width() + tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent) ); s += TQSize(frameWidth()*2,frameWidth()*2); diff --git a/tqtinterface/qt4/src/widgets/tqlistview.h b/tqtinterface/qt4/src/widgets/tqlistview.h index 11d2110..a61419b 100644 --- a/tqtinterface/qt4/src/widgets/tqlistview.h +++ b/tqtinterface/qt4/src/widgets/tqlistview.h @@ -341,7 +341,7 @@ public: virtual bool eventFilter( TQObject * o, TQEvent * ); - TQSize tqsizeHint() const; + TQSize sizeHint() const; TQSize tqminimumSizeHint() const; virtual void setShowSortIndicator( bool show ); diff --git a/tqtinterface/qt4/src/widgets/tqmainwindow.cpp b/tqtinterface/qt4/src/widgets/tqmainwindow.cpp index 1921297..e05de63 100644 --- a/tqtinterface/qt4/src/widgets/tqmainwindow.cpp +++ b/tqtinterface/qt4/src/widgets/tqmainwindow.cpp @@ -140,7 +140,7 @@ public: void setRightDock( TQDockArea *r ); void setCentralWidget( TQWidget *w ); bool hasHeightForWidth() const { return FALSE; } - TQSize tqsizeHint() const; + TQSize sizeHint() const; TQSize tqminimumSize() const; TQLayoutIterator iterator(); TQ_SPExpandData expandingDirections() const { return (Qt::Orientations)TQSizePolicy::BothDirections; } @@ -189,23 +189,23 @@ TQLayoutItem* TQMainWindowLayout::takeAt(int index) { return 0; } -TQSize TQMainWindowLayout::tqsizeHint() const +TQSize TQMainWindowLayout::sizeHint() const { int w = 0; int h = 0; if ( left ) { - w += left->tqsizeHint().width(); - h = TQMAX( h, left->tqsizeHint().height() ); + w += left->sizeHint().width(); + h = TQMAX( h, left->sizeHint().height() ); } if ( right ) { - w += right->tqsizeHint().width(); - h = TQMAX( h, right->tqsizeHint().height() ); + w += right->sizeHint().width(); + h = TQMAX( h, right->sizeHint().height() ); } if ( central ) { - w += central->tqsizeHint().width(); + w += central->sizeHint().width(); int diff = extraPixels(); - h = TQMAX( h, central->tqsizeHint().height() + diff ); + h = TQMAX( h, central->sizeHint().height() + diff ); } return TQSize( w, h ); @@ -1566,7 +1566,7 @@ void TQMainWindow::hide() /*! \reimp */ -TQSize TQMainWindow::tqsizeHint() const +TQSize TQMainWindow::sizeHint() const { TQMainWindow* that = (TQMainWindow*) this; // Workaround: because d->tll get's deleted in diff --git a/tqtinterface/qt4/src/widgets/tqmainwindow.h b/tqtinterface/qt4/src/widgets/tqmainwindow.h index 6cbcc02..c376b44 100644 --- a/tqtinterface/qt4/src/widgets/tqmainwindow.h +++ b/tqtinterface/qt4/src/widgets/tqmainwindow.h @@ -98,7 +98,7 @@ public: void show(); void hide(); - TQSize tqsizeHint() const; + TQSize sizeHint() const; TQSize tqminimumSizeHint() const; bool rightJustification() const; diff --git a/tqtinterface/qt4/src/widgets/tqmenubar.cpp b/tqtinterface/qt4/src/widgets/tqmenubar.cpp index aadb3ee..a0751f4 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->tqsizeHint().width(); + pos.rx() -= popup->sizeHint().width(); } - int ph = popup->tqsizeHint().height(); + int ph = popup->sizeHint().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->tqsizeHint().width(); + t.rx() -= popup->sizeHint().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()->tqsizeHint().expandedTo( TQApplication::globalStrut() ).width()+2; - h = mi->widget()->tqsizeHint().expandedTo( TQApplication::globalStrut() ).height()+2; + w = mi->widget()->sizeHint().expandedTo( TQApplication::globalStrut() ).width()+2; + h = mi->widget()->sizeHint().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()->tqsizeHint() ); + TQRect r ( TQPoint(0,0), mi->widget()->sizeHint() ); r.moveCenter( irects[i].center() ); mi->widget()->setGeometry( r ); if( mi->widget()->isHidden() ) @@ -1598,7 +1598,7 @@ void TQMenuBar::focusOutEvent( TQFocusEvent * ) \reimp */ -TQSize TQMenuBar::tqsizeHint() const +TQSize TQMenuBar::sizeHint() const { int h = height(); if ( badSize ) @@ -1609,7 +1609,7 @@ TQSize TQMenuBar::tqsizeHint() const s.setWidth( s.width() + irects[ i ].width() + 2 ); } s.setHeight( h ); - return (tqstyle().tqsizeFromContents(TQStyle::CT_MenuBar, this, s. + return (tqstyle().sizeFromContents(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 tqsizeHint(); + return sizeHint(); #endif return TQFrame::tqminimumSize(); } diff --git a/tqtinterface/qt4/src/widgets/tqmenubar.h b/tqtinterface/qt4/src/widgets/tqmenubar.h index 6b32031..618b8ed 100644 --- a/tqtinterface/qt4/src/widgets/tqmenubar.h +++ b/tqtinterface/qt4/src/widgets/tqmenubar.h @@ -81,7 +81,7 @@ public: bool customWhatsThis() const; - TQSize tqsizeHint() const; + TQSize sizeHint() const; TQSize tqminimumSize() const; TQSize tqminimumSizeHint() const; diff --git a/tqtinterface/qt4/src/widgets/tqmenudata.cpp b/tqtinterface/qt4/src/widgets/tqmenudata.cpp index 2f0fd80..cb2932f 100644 --- a/tqtinterface/qt4/src/widgets/tqmenudata.cpp +++ b/tqtinterface/qt4/src/widgets/tqmenudata.cpp @@ -1471,7 +1471,7 @@ TQString TQMenuData::whatsThis( int id ) const \ingroup misc A custom menu item is a menu item that is defined by two pure - virtual functions, paint() and tqsizeHint(). The size hint tells the + virtual functions, paint() and sizeHint(). The size hint tells the menu how much space it needs to reserve for this item, and paint is called whenever the item needs painting. @@ -1575,7 +1575,7 @@ bool TQCustomMenuItem::isSeparator() const /*! - \fn TQSize TQCustomMenuItem::tqsizeHint(); + \fn TQSize TQCustomMenuItem::sizeHint(); Returns the item's size hint. */ diff --git a/tqtinterface/qt4/src/widgets/tqmenudata.h b/tqtinterface/qt4/src/widgets/tqmenudata.h index 96128c0..95fb7eb 100644 --- a/tqtinterface/qt4/src/widgets/tqmenudata.h +++ b/tqtinterface/qt4/src/widgets/tqmenudata.h @@ -133,7 +133,7 @@ public: virtual void setFont( const TQFont& font ); virtual void paint( TQPainter* p, const TQColorGroup& cg, bool act, bool enabled, int x, int y, int w, int h ) = 0; - virtual TQSize tqsizeHint() = 0; + virtual TQSize sizeHint() = 0; }; diff --git a/tqtinterface/qt4/src/widgets/tqpopupmenu.cpp b/tqtinterface/qt4/src/widgets/tqpopupmenu.cpp index bbfdb60..d9a9f58 100644 --- a/tqtinterface/qt4/src/widgets/tqpopupmenu.cpp +++ b/tqtinterface/qt4/src/widgets/tqpopupmenu.cpp @@ -483,7 +483,7 @@ void TQPopupMenu::frameChanged() you cannot rely on the popup menu's current size(). For performance reasons, the popup adapts its size only when necessary, so in many cases, the size before and after the show is - different. Instead, use tqsizeHint(). It calculates the proper size + different. Instead, use sizeHint(). It calculates the proper size depending on the menu's current contents. */ @@ -613,7 +613,7 @@ void TQPopupMenu::popup( const TQPoint &pos, int indexAtPoint ) register TQMenuItem *mi = NULL; TQMenuItemListIt it(*mitems); for(int tmp_y = 0; tmp_y < off_top && (mi=it.current()); ) { - TQSize sz = tqstyle().tqsizeFromContents(TQStyle::CT_PopupMenuItem, this, + TQSize sz = tqstyle().sizeFromContents(TQStyle::CT_PopupMenuItem, this, TQSize(0, itemHeight( mi )), TQStyleOption(mi,maxPMWidth,0)); tmp_y += sz.height(); @@ -940,7 +940,7 @@ int TQPopupMenu::itemAtPos( const TQPoint &pos, bool ignoreSeparator ) const } int itemh = itemHeight( mi ); - sz = tqstyle().tqsizeFromContents(TQStyle::CT_PopupMenuItem, this, + sz = tqstyle().sizeFromContents(TQStyle::CT_PopupMenuItem, this, TQSize(0, itemh), TQStyleOption(mi,maxPMWidth)); sz = sz.expandedTo(TQSize(itemw, sz.height())); @@ -999,7 +999,7 @@ TQRect TQPopupMenu::itemGeometry( int index ) } int itemh = itemHeight( mi ); - sz = tqstyle().tqsizeFromContents(TQStyle::CT_PopupMenuItem, this, + sz = tqstyle().sizeFromContents(TQStyle::CT_PopupMenuItem, this, TQSize(0, itemh), TQStyleOption(mi,maxPMWidth)); sz = sz.expandedTo(TQSize(itemw, sz.height())); @@ -1086,7 +1086,7 @@ TQSize TQPopupMenu::updateSize(bool force_update, bool do_resize) int itemHeight = TQPopupMenu::itemHeight( mi ); if ( mi->widget() ) { - TQSize s( mi->widget()->tqsizeHint() ); + TQSize s( mi->widget()->sizeHint() ); s = s.expandedTo( mi->widget()->tqminimumSize() ); mi->widget()->resize( s ); if ( s.width() > maxWidgetWidth ) @@ -1097,9 +1097,9 @@ TQSize TQPopupMenu::updateSize(bool force_update, bool do_resize) if ( mi->custom() ) { if ( mi->custom()->fullSpan() ) { maxWidgetWidth = TQMAX( maxWidgetWidth, - mi->custom()->tqsizeHint().width() ); + mi->custom()->sizeHint().width() ); } else { - TQSize s ( mi->custom()->tqsizeHint() ); + TQSize s ( mi->custom()->sizeHint() ); w += s.width(); } } @@ -1125,14 +1125,14 @@ TQSize TQPopupMenu::updateSize(bool force_update, bool do_resize) w += mi->pixmap()->width(); } else { if ( mi->custom() ) { - TQSize s ( mi->custom()->tqsizeHint() ); + TQSize s ( mi->custom()->sizeHint() ); w += s.width(); } else { w = itemHeight = 2; } } - TQSize sz = tqstyle().tqsizeFromContents(TQStyle::CT_PopupMenuItem, this, + TQSize sz = tqstyle().sizeFromContents(TQStyle::CT_PopupMenuItem, this, TQSize(w, itemHeight), TQStyleOption(mi,maxPMWidth)); @@ -1202,7 +1202,7 @@ TQSize TQPopupMenu::updateSize(bool force_update, bool do_resize) int itemh = itemHeight( mi ); - sz = tqstyle().tqsizeFromContents(TQStyle::CT_PopupMenuItem, this, + sz = tqstyle().sizeFromContents(TQStyle::CT_PopupMenuItem, this, TQSize(0, itemh), TQStyleOption(mi,maxPMWidth)); sz = sz.expandedTo(TQSize(itemw, sz.height())); itemw = sz.width(); @@ -1439,7 +1439,7 @@ int TQPopupMenu::itemHeight( TQMenuItem *mi ) const if ( mi->widget() ) return mi->widget()->height(); if ( mi->custom() && mi->custom()->fullSpan() ) - return mi->custom()->tqsizeHint().height(); + return mi->custom()->sizeHint().height(); TQFontMetrics fm(fontMetrics()); int h = 0; @@ -1454,7 +1454,7 @@ int TQPopupMenu::itemHeight( TQMenuItem *mi ) const h = TQMAX(h, mi->iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).height()); if ( mi->custom() ) - h = TQMAX(h, mi->custom()->tqsizeHint().height()); + h = TQMAX(h, mi->custom()->sizeHint().height()); return h; } @@ -1536,7 +1536,7 @@ void TQPopupMenu::drawContents( TQPainter* p ) continue; } int itemh = itemHeight( mi ); - sz = tqstyle().tqsizeFromContents(TQStyle::CT_PopupMenuItem, this, + sz = tqstyle().sizeFromContents(TQStyle::CT_PopupMenuItem, this, TQSize(0, itemh), TQStyleOption(mi,maxPMWidth,0) ); @@ -2157,7 +2157,7 @@ void TQPopupMenu::keyPressEvent( TQKeyEvent *e ) for(int i = 0, y = ((d->scroll.scrollable & TQPopupMenuPrivate::Scroll::ScrollUp) ? sh : 0); it.current(); i++, ++it) { if(i >= d->scroll.topScrollableIndex) { int itemh = itemHeight(it.current()); - TQSize sz = tqstyle().tqsizeFromContents(TQStyle::CT_PopupMenuItem, this, + TQSize sz = tqstyle().sizeFromContents(TQStyle::CT_PopupMenuItem, this, TQSize(0, itemh), TQStyleOption(it.current(),maxPMWidth,0)); y += sz.height(); @@ -2235,7 +2235,7 @@ void TQPopupMenu::enabledChange( bool ) This functions returns the number of columns necessary. - \sa tqsizeHint() + \sa sizeHint() */ int TQPopupMenu::columns() const { @@ -2278,7 +2278,7 @@ void TQPopupMenu::subScrollTimer() { for(int i = 0, y = contentsRect().y() + sh; it.current(); i++, ++it) { if(i >= d->scroll.topScrollableIndex) { int itemh = itemHeight(it.current()); - TQSize sz = tqstyle().tqsizeFromContents(TQStyle::CT_PopupMenuItem, this, TQSize(0, itemh), + TQSize sz = tqstyle().sizeFromContents(TQStyle::CT_PopupMenuItem, this, TQSize(0, itemh), TQStyleOption(it.current(),maxPMWidth,0)); y += sz.height(); if(y > contentsRect().height() - sh) { @@ -2328,7 +2328,7 @@ void TQPopupMenu::subMenuTimer() { TQRect r( itemGeometry( actItem ) ); TQPoint p; - TQSize ps = popup->tqsizeHint(); + TQSize ps = popup->sizeHint(); if( TQApplication::reverseLayout() ) { p = TQPoint( r.left() + motifArrowHMargin - ps.width(), r.top() + motifArrowVMargin ); p = mapToGlobal( p ); @@ -2440,10 +2440,10 @@ void TQPopupMenu::updateRow( int row ) you cannot rely on the popup menu's current size(). For performance reasons, the popup adapts its size only when necessary. So in many cases, the size before and after the show is - different. Instead, use tqsizeHint(). It calculates the proper size + different. Instead, use sizeHint(). It calculates the proper size depending on the menu's current contents. - \sa popup(), tqsizeHint() + \sa popup(), sizeHint() */ int TQPopupMenu::exec( const TQPoint & pos, int indexAtPoint ) @@ -2564,11 +2564,11 @@ void TQPopupMenu::setActiveItem( int i ) /*! \reimp */ -TQSize TQPopupMenu::tqsizeHint() const +TQSize TQPopupMenu::sizeHint() const { constPolish(); TQPopupMenu* that = (TQPopupMenu*) this; - //We do not need a resize here, just the tqsizeHint.. + //We do not need a resize here, just the sizeHint.. return that->updateSize(FALSE, FALSE).expandedTo( TQApplication::globalStrut() ); } @@ -2674,7 +2674,7 @@ public: return TRUE; } - TQSize tqsizeHint() + TQSize sizeHint() { return TQSize( 20, 6 ); } @@ -2834,7 +2834,7 @@ TQPopupMenu::updateScrollerState() while ( (mi=it.current()) ) { ++it; int myheight = contentsRect().height(); - TQSize sz = tqstyle().tqsizeFromContents(TQStyle::CT_PopupMenuItem, this, + TQSize sz = tqstyle().sizeFromContents(TQStyle::CT_PopupMenuItem, this, TQSize(0, itemHeight( mi )), TQStyleOption(mi,maxPMWidth)); if(y + sz.height() >= myheight) { diff --git a/tqtinterface/qt4/src/widgets/tqpopupmenu.h b/tqtinterface/qt4/src/widgets/tqpopupmenu.h index 0dd00b5..34b208b 100644 --- a/tqtinterface/qt4/src/widgets/tqpopupmenu.h +++ b/tqtinterface/qt4/src/widgets/tqpopupmenu.h @@ -72,7 +72,7 @@ public: int exec( const TQPoint & pos, int indexAtPoint = 0 ); // modal virtual void setActiveItem( int ); - TQSize tqsizeHint() const; + TQSize sizeHint() const; int idAt( int index ) const { return TQMenuData::idAt( index ); } int idAt( const TQPoint& pos ) const; diff --git a/tqtinterface/qt4/src/widgets/tqprogressbar.cpp b/tqtinterface/qt4/src/widgets/tqprogressbar.cpp index e00d12d..8c6e8ca 100644 --- a/tqtinterface/qt4/src/widgets/tqprogressbar.cpp +++ b/tqtinterface/qt4/src/widgets/tqprogressbar.cpp @@ -229,12 +229,12 @@ void TQProgressBar::setProgress( int progress, int totalSteps ) /*! \reimp */ -TQSize TQProgressBar::tqsizeHint() const +TQSize TQProgressBar::sizeHint() const { constPolish(); TQFontMetrics fm = fontMetrics(); int cw = tqstyle().tqpixelMetric(TQStyle::PM_ProgressBarChunkWidth, this); - return tqstyle().tqsizeFromContents(TQStyle::CT_ProgressBar, this, + return tqstyle().sizeFromContents(TQStyle::CT_ProgressBar, this, TQSize( cw * 7 + fm.width( '0' ) * 4, fm.height() + 8)); } @@ -245,7 +245,7 @@ TQSize TQProgressBar::tqsizeHint() const */ TQSize TQProgressBar::tqminimumSizeHint() const { - return tqsizeHint(); + return sizeHint(); } /*! diff --git a/tqtinterface/qt4/src/widgets/tqprogressbar.h b/tqtinterface/qt4/src/widgets/tqprogressbar.h index 7b9d191..93f484e 100644 --- a/tqtinterface/qt4/src/widgets/tqprogressbar.h +++ b/tqtinterface/qt4/src/widgets/tqprogressbar.h @@ -70,7 +70,7 @@ public: int progress() const; const TQString &progressString() const; - TQSize tqsizeHint() const; + TQSize sizeHint() const; TQSize tqminimumSizeHint() const; void setCenterIndicator( bool on ); diff --git a/tqtinterface/qt4/src/widgets/tqpushbutton.cpp b/tqtinterface/qt4/src/widgets/tqpushbutton.cpp index e8583ff..d1047b4 100644 --- a/tqtinterface/qt4/src/widgets/tqpushbutton.cpp +++ b/tqtinterface/qt4/src/widgets/tqpushbutton.cpp @@ -402,7 +402,7 @@ void TQPushButton::setDefault( bool enable ) /*! \reimp */ -TQSize TQPushButton::tqsizeHint() const +TQSize TQPushButton::sizeHint() const { constPolish(); @@ -437,7 +437,7 @@ TQSize TQPushButton::tqsizeHint() const h = TQMAX(h, sz.height()); } - return (tqstyle().tqsizeFromContents(TQStyle::CT_PushButton, this, TQSize(w, h)). + return (tqstyle().sizeFromContents(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->tqsizeHint().height() <= tqApp->desktop()->height() ) + if ( mapToGlobal( TQPoint( 0, rect().bottom() ) ).y() + popup->sizeHint().height() <= tqApp->desktop()->height() ) popup->exec( mapToGlobal( rect().bottomLeft() ) ); else - popup->exec( mapToGlobal( rect().topLeft() - TQPoint( 0, popup->tqsizeHint().height() ) ) ); + popup->exec( mapToGlobal( rect().topLeft() - TQPoint( 0, popup->sizeHint().height() ) ) ); } else { - TQSize sz( popup->tqsizeHint() ); + TQSize sz( popup->sizeHint() ); TQPoint p = mapToGlobal( rect().topLeft() ); p.ry() -= sz.height(); popup->exec( p ); } } else { if ( topLeft ) { - if ( mapToGlobal( TQPoint( rect().right(), 0 ) ).x() + popup->tqsizeHint().width() <= tqApp->desktop()->width() ) + if ( mapToGlobal( TQPoint( rect().right(), 0 ) ).x() + popup->sizeHint().width() <= tqApp->desktop()->width() ) popup->exec( mapToGlobal( rect().topRight() ) ); else - popup->exec( mapToGlobal( rect().topLeft() - TQPoint( popup->tqsizeHint().width(), 0 ) ) ); + popup->exec( mapToGlobal( rect().topLeft() - TQPoint( popup->sizeHint().width(), 0 ) ) ); } else { - TQSize sz( popup->tqsizeHint() ); + TQSize sz( popup->sizeHint() ); TQPoint p = mapToGlobal( rect().topLeft() ); p.rx() -= sz.width(); popup->exec( p ); diff --git a/tqtinterface/qt4/src/widgets/tqpushbutton.h b/tqtinterface/qt4/src/widgets/tqpushbutton.h index 92a375d..6cbcb05 100644 --- a/tqtinterface/qt4/src/widgets/tqpushbutton.h +++ b/tqtinterface/qt4/src/widgets/tqpushbutton.h @@ -72,7 +72,7 @@ public: #endif ~TQPushButton(); - TQSize tqsizeHint() const; + TQSize sizeHint() const; void move( int x, int y ); void move( const TQPoint &p ); diff --git a/tqtinterface/qt4/src/widgets/tqradiobutton.cpp b/tqtinterface/qt4/src/widgets/tqradiobutton.cpp index 69bdedb..0ddddf8 100644 --- a/tqtinterface/qt4/src/widgets/tqradiobutton.cpp +++ b/tqtinterface/qt4/src/widgets/tqradiobutton.cpp @@ -156,17 +156,17 @@ void TQRadioButton::setChecked( bool check ) /*! \reimp */ -TQSize TQRadioButton::tqsizeHint() const +TQSize TQRadioButton::sizeHint() const { // Any more complex, and we will use tqstyle().tqitemRect() - // NB: TQCheckBox::tqsizeHint() is similar + // NB: TQCheckBox::sizeHint() is similar constPolish(); TQPainter p(this); TQSize sz = tqstyle().tqitemRect(&p, TQRect(0, 0, 1, 1), TQt::ShowPrefix, FALSE, pixmap(), text()).size(); - return (tqstyle().tqsizeFromContents(TQStyle::CT_RadioButton, this, sz). + return (tqstyle().sizeFromContents(TQStyle::CT_RadioButton, this, sz). expandedTo(TQApplication::globalStrut())); } @@ -321,7 +321,7 @@ void TQRadioButton::resizeEvent( TQResizeEvent* e ) TQPainter p(this); TQSize isz = tqstyle().tqitemRect(&p, TQRect(0, 0, 1, 1), TQt::ShowPrefix, FALSE, pixmap(), text()).size(); - TQSize wsz = (tqstyle().tqsizeFromContents(TQStyle::CT_RadioButton, this, isz). + TQSize wsz = (tqstyle().sizeFromContents(TQStyle::CT_RadioButton, this, isz). expandedTo(TQApplication::globalStrut())); update(wsz.width(), isz.width(), 0, wsz.height()); diff --git a/tqtinterface/qt4/src/widgets/tqradiobutton.h b/tqtinterface/qt4/src/widgets/tqradiobutton.h index 50f9927..e496006 100644 --- a/tqtinterface/qt4/src/widgets/tqradiobutton.h +++ b/tqtinterface/qt4/src/widgets/tqradiobutton.h @@ -60,7 +60,7 @@ public: bool isChecked() const; - TQSize tqsizeHint() const; + TQSize sizeHint() const; public Q_SLOTS: virtual void setChecked( bool check ); diff --git a/tqtinterface/qt4/src/widgets/tqscrollbar.cpp b/tqtinterface/qt4/src/widgets/tqscrollbar.cpp index 09d1575..af9ab56 100644 --- a/tqtinterface/qt4/src/widgets/tqscrollbar.cpp +++ b/tqtinterface/qt4/src/widgets/tqscrollbar.cpp @@ -319,7 +319,7 @@ void TQScrollBar::setOrientation( Qt::Orientation orientation ) if ( orientation == orient ) return; if ( !testWState( TQt::WState_OwnSizePolicy ) ) { - TQSizePolicy sp = tqsizePolicy(); + TQSizePolicy sp = sizePolicy(); sp.transpose(); tqsetSizePolicy( sp ); clearWState( TQt::WState_OwnSizePolicy ); @@ -371,7 +371,7 @@ void TQScrollBar::setPalette( const TQPalette &p ) /*! \reimp */ -TQSize TQScrollBar::tqsizeHint() const +TQSize TQScrollBar::sizeHint() const { constPolish(); int sbextent = tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent, this); diff --git a/tqtinterface/qt4/src/widgets/tqscrollbar.h b/tqtinterface/qt4/src/widgets/tqscrollbar.h index cf48a05..44d47e1 100644 --- a/tqtinterface/qt4/src/widgets/tqscrollbar.h +++ b/tqtinterface/qt4/src/widgets/tqscrollbar.h @@ -77,7 +77,7 @@ public: bool draggingSlider() const; virtual void setPalette( const TQPalette & ); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; virtual void tqsetSizePolicy( TQSizePolicy sp ); void tqsetSizePolicy( TQSizePolicy::SizeType hor, TQSizePolicy::SizeType ver, bool hfw = FALSE ); diff --git a/tqtinterface/qt4/src/widgets/tqscrollview.cpp b/tqtinterface/qt4/src/widgets/tqscrollview.cpp index 49c5b4d..1c43180 100644 --- a/tqtinterface/qt4/src/widgets/tqscrollview.cpp +++ b/tqtinterface/qt4/src/widgets/tqscrollview.cpp @@ -176,7 +176,7 @@ public: bool anyVisibleChildren(); void autoMove(TQScrollView* sv); void autoResize(TQScrollView* sv); - void autoRetqsizeHint(TQScrollView* sv); + void autoResizeHint(TQScrollView* sv); void viewportResized( int w, int h ); TQScrollBar* hbar; @@ -314,19 +314,19 @@ void TQScrollViewData::autoResize(TQScrollView* sv) } } -void TQScrollViewData::autoRetqsizeHint(TQScrollView* sv) +void TQScrollViewData::autoResizeHint(TQScrollView* sv) { if ( policy == TQScrollView::AutoOne ) { TQSVChildRec* r = tqchildren.first(); if (r) { - TQSize s = r->child->tqsizeHint(); + TQSize s = r->child->sizeHint(); if ( s.isValid() ) r->child->resize(s); } } else if ( policy == TQScrollView::AutoOneFit ) { TQSVChildRec* r = tqchildren.first(); if (r) { - TQSize sh = r->child->tqsizeHint(); + TQSize sh = r->child->sizeHint(); sh = sh.boundedTo( r->child->tqmaximumSize() ); sv->resizeContents( sh.width(), sh.height() ); } @@ -338,7 +338,7 @@ void TQScrollViewData::viewportResized( int w, int h ) if ( policy == TQScrollView::AutoOneFit ) { TQSVChildRec* r = tqchildren.first(); if (r) { - TQSize sh = r->child->tqsizeHint(); + TQSize sh = r->child->sizeHint(); sh = sh.boundedTo( r->child->tqmaximumSize() ); r->child->resize( TQMAX(w,sh.width()), TQMAX(h,sh.height()) ); } @@ -562,12 +562,12 @@ void TQScrollViewData::viewportResized( int w, int h ) the size of that widget. Otherwise the behavior is undefined. \value AutoOneFit if there is only one child widget the contents stays - the size of that widget's tqsizeHint(). If the scrollview is resized - larger than the child's tqsizeHint(), the child will be resized to + the size of that widget's sizeHint(). If the scrollview is resized + larger than the child's sizeHint(), the child will be resized to fit. If there is more than one child, the behavior is undefined. */ -//#### The widget will be resized to its tqsizeHint() when a LayoutHint event +//#### The widget will be resized to its sizeHint() when a LayoutHint event //#### is received /*! @@ -794,8 +794,8 @@ TQSize TQScrollView::viewportSize( int x, int y ) const bool needh, needv; bool showh, showv; - int hsbExt = horizontalScrollBar()->tqsizeHint().height(); - int vsbExt = verticalScrollBar()->tqsizeHint().width(); + int hsbExt = horizontalScrollBar()->sizeHint().height(); + int vsbExt = verticalScrollBar()->sizeHint().width(); if ( d->policy != AutoOne || d->anyVisibleChildren() ) { // Do we definitely need the scrollbar? @@ -865,8 +865,8 @@ void TQScrollView::updateScrollBars() bool showv; bool showc = FALSE; - int hsbExt = horizontalScrollBar()->tqsizeHint().height(); - int vsbExt = verticalScrollBar()->tqsizeHint().width(); + int hsbExt = horizontalScrollBar()->sizeHint().height(); + int vsbExt = verticalScrollBar()->sizeHint().width(); TQSize oldVisibleSize( visibleWidth(), visibleHeight() ); @@ -1401,7 +1401,7 @@ void TQScrollView::addChild(TQWidget* child, int x, int y) if (r) { r->moveTo(this,x,y,d->clipped_viewport); if ( d->policy > Manual ) { - d->autoRetqsizeHint(this); + d->autoResizeHint(this); d->autoResize(this); // #### better to just deal with this one widget! } return; @@ -1422,7 +1422,7 @@ void TQScrollView::addChild(TQWidget* child, int x, int y) d->addChildRec(child,x,y)->hideOrShow(this, d->clipped_viewport); if ( d->policy > Manual ) { - d->autoRetqsizeHint(this); + d->autoResizeHint(this); d->autoResize(this); // #### better to just deal with this one widget! } } @@ -1551,7 +1551,7 @@ bool TQScrollView::eventFilter( TQObject *obj, TQEvent *e ) removeChild((TQWidget*)((TQChildEvent*)e)->child()); break; case TQEvent::LayoutHint: - d->autoRetqsizeHint(this); + d->autoResizeHint(this); break; default: break; @@ -2688,7 +2688,7 @@ void TQScrollView::viewportToContents( int vx, int vy, int& x, int& y ) const /*! \reimp */ -TQSize TQScrollView::tqsizeHint() const +TQSize TQScrollView::sizeHint() const { if ( d->use_cached_size_hint && d->cachedSizeHint.isValid() ) return d->cachedSizeHint; @@ -2700,7 +2700,7 @@ TQSize TQScrollView::tqsizeHint() const if ( d->policy > Manual ) { TQSVChildRec *r = d->tqchildren.first(); if ( r ) { - TQSize cs = r->child->tqsizeHint(); + TQSize cs = r->child->sizeHint(); if ( cs.isValid() ) sz += cs.boundedTo( r->child->tqmaximumSize() ); else @@ -2710,9 +2710,9 @@ TQSize TQScrollView::tqsizeHint() const sz += TQSize( d->contentsWidth(), contentsHeight() ); } if (d->vMode == AlwaysOn) - sz.setWidth(sz.width() + d->vbar->tqsizeHint().width()); + sz.setWidth(sz.width() + d->vbar->sizeHint().width()); if (d->hMode == AlwaysOn) - sz.setHeight(sz.height() + d->hbar->tqsizeHint().height()); + sz.setHeight(sz.height() + d->hbar->sizeHint().height()); return sz.expandedTo( TQSize(12 * h, 8 * h) ) .boundedTo( TQSize(36 * h, 24 * h) ); } diff --git a/tqtinterface/qt4/src/widgets/tqscrollview.h b/tqtinterface/qt4/src/widgets/tqscrollview.h index caa86bb..f881c0e 100644 --- a/tqtinterface/qt4/src/widgets/tqscrollview.h +++ b/tqtinterface/qt4/src/widgets/tqscrollview.h @@ -135,7 +135,7 @@ public: bool hasStaticBackground() const; TQSize viewportSize( int, int ) const; - TQSize tqsizeHint() const; + TQSize sizeHint() const; TQSize tqminimumSizeHint() const; void removeChild(TQObject* child); diff --git a/tqtinterface/qt4/src/widgets/tqslider.cpp b/tqtinterface/qt4/src/widgets/tqslider.cpp index 9d3ece2..d8a3ffa 100644 --- a/tqtinterface/qt4/src/widgets/tqslider.cpp +++ b/tqtinterface/qt4/src/widgets/tqslider.cpp @@ -729,7 +729,7 @@ int TQSlider::goodPart( const TQPoint &p ) const /*! \reimp */ -TQSize TQSlider::tqsizeHint() const +TQSize TQSlider::sizeHint() const { constPolish(); const int length = 84, tickSpace = 5; @@ -743,7 +743,7 @@ TQSize TQSlider::tqsizeHint() const w = length; h = thick; } - return (tqstyle().tqsizeFromContents(TQStyle::CT_Slider, this, + return (tqstyle().sizeFromContents(TQStyle::CT_Slider, this, TQSize(w, h)).expandedTo(TQApplication::globalStrut())); } @@ -755,7 +755,7 @@ TQSize TQSlider::tqsizeHint() const TQSize TQSlider::tqminimumSizeHint() const { - TQSize s = tqsizeHint(); + TQSize s = sizeHint(); int length = tqstyle().tqpixelMetric(TQStyle::PM_SliderLength, this); if ( orient == Qt::Horizontal ) s.setWidth( length ); @@ -780,7 +780,7 @@ void TQSlider::tqsetSizePolicy( TQSizePolicy sp ) TQSizePolicy TQSlider::sizePolicy() const { // ### 4.0 remove this reimplementation - return TQWidget::tqsizePolicy(); + return TQWidget::sizePolicy(); } /*! diff --git a/tqtinterface/qt4/src/widgets/tqslider.h b/tqtinterface/qt4/src/widgets/tqslider.h index ac6177d..a759782 100644 --- a/tqtinterface/qt4/src/widgets/tqslider.h +++ b/tqtinterface/qt4/src/widgets/tqslider.h @@ -85,7 +85,7 @@ public: int sliderStart() const; TQRect sliderRect() const; - TQSize tqsizeHint() const; + TQSize sizeHint() const; void tqsetSizePolicy( TQSizePolicy sp ); void tqsetSizePolicy( TQSizePolicy::SizeType hor, TQSizePolicy::SizeType ver, bool hfw = FALSE ); diff --git a/tqtinterface/qt4/src/widgets/tqspinbox.cpp b/tqtinterface/qt4/src/widgets/tqspinbox.cpp index 579d93b..f284d2c 100644 --- a/tqtinterface/qt4/src/widgets/tqspinbox.cpp +++ b/tqtinterface/qt4/src/widgets/tqspinbox.cpp @@ -496,10 +496,10 @@ bool TQSpinBox::wrapping() const /*! \reimp */ -TQSize TQSpinBox::tqsizeHint() const +TQSize TQSpinBox::sizeHint() const { constPolish(); - TQSize sz = vi->tqsizeHint(); + TQSize sz = vi->sizeHint(); int h = sz.height(); TQFontMetrics fm( font() ); int w = 35; @@ -513,7 +513,7 @@ TQSize TQSpinBox::tqsizeHint() const s = specialValueText(); w = TQMAX( w, fm.width( s ) + wx ); } - return tqstyle().tqsizeFromContents(TQStyle::CT_SpinBox, this, + return tqstyle().sizeFromContents(TQStyle::CT_SpinBox, this, TQSize( w + d->controls->downRect().width(), h + tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) * 2). expandedTo( TQApplication::globalStrut() )); diff --git a/tqtinterface/qt4/src/widgets/tqspinbox.h b/tqtinterface/qt4/src/widgets/tqspinbox.h index 2e18cef..2be3150 100644 --- a/tqtinterface/qt4/src/widgets/tqspinbox.h +++ b/tqtinterface/qt4/src/widgets/tqspinbox.h @@ -94,7 +94,7 @@ public: virtual void setValidator( const TQValidator* v ); const TQValidator * validator() const; - TQSize tqsizeHint() const; + TQSize sizeHint() const; TQSize tqminimumSizeHint() const; int minValue() const; diff --git a/tqtinterface/qt4/src/widgets/tqsplitter.cpp b/tqtinterface/qt4/src/widgets/tqsplitter.cpp index 2750a45..78b9f90 100644 --- a/tqtinterface/qt4/src/widgets/tqsplitter.cpp +++ b/tqtinterface/qt4/src/widgets/tqsplitter.cpp @@ -63,7 +63,7 @@ public: bool opaque() const { return s->opaqueResize(); } - TQSize tqsizeHint() const; + TQSize sizeHint() const; int id() const { return myId; } // d->list.at(id())->wid == this void setId( int i ) { myId = i; } @@ -126,10 +126,10 @@ TQSplitterHandle::TQSplitterHandle( Qt::Orientation o, TQSplitter *tqparent, setOrientation( o ); } -TQSize TQSplitterHandle::tqsizeHint() const +TQSize TQSplitterHandle::sizeHint() const { int hw = s->handleWidth(); - return parentWidget()->tqstyle().tqsizeFromContents( TQStyle::CT_Splitter, s, + return parentWidget()->tqstyle().sizeFromContents( TQStyle::CT_Splitter, s, TQSize(hw, hw) ) .expandedTo( TQApplication::globalStrut() ); } @@ -197,7 +197,7 @@ public: TQCOORD TQSplitterLayoutStruct::getSizer( Qt::Orientation orient ) { if ( sizer == -1 ) { - TQSize s = wid->tqsizeHint(); + TQSize s = wid->sizeHint(); if ( !s.isValid() || wid->testWState(WState_Resized) ) s = wid->size(); sizer = ( orient == Qt::Horizontal ) ? s.width() : s.height(); @@ -339,7 +339,7 @@ void TQSplitter::setOrientation( Qt::Orientation o ) return; if ( !testWState( TQt::WState_OwnSizePolicy ) ) { - TQSizePolicy sp = tqsizePolicy(); + TQSizePolicy sp = sizePolicy(); sp.transpose(); tqsetSizePolicy( sp ); clearWState( TQt::WState_OwnSizePolicy ); @@ -435,7 +435,7 @@ TQSplitterLayoutStruct *TQSplitter::addWidget( TQWidget *w, bool prepend ) s->wid = newHandle; newHandle->setId( d->list.count() ); s->isHandle = TRUE; - s->sizer = pick( newHandle->tqsizeHint() ); + s->sizer = pick( newHandle->sizeHint() ); if ( prepend ) d->list.prepend( s ); else @@ -852,14 +852,14 @@ void TQSplitter::doResize() if ( s->wid->isHidden() || isCollapsed(s->wid) ) { a[i].tqmaximumSize = 0; } else if ( s->isHandle ) { - a[i].tqsizeHint = a[i].tqminimumSize = a[i].tqmaximumSize = s->sizer; + a[i].sizeHint = a[i].tqminimumSize = a[i].tqmaximumSize = s->sizer; a[i].empty = FALSE; } else { int mode = s->resizeMode; int stretch = 1; if ( mode == DefaultResizeMode ) { - TQSizePolicy p = s->wid->tqsizePolicy(); + TQSizePolicy p = s->wid->sizePolicy(); int sizePolicyStretch = pick( TQSize(p.horStretch(), p.verStretch()) ); if ( sizePolicyStretch > 0 ) { @@ -890,11 +890,11 @@ void TQSplitter::doResize() stretch *= s->getSizer( orient ); // TQMIN(): ad hoc work-around for tqlayout engine limitation a[i].stretch = TQMIN( stretch, 8192 ); - a[i].tqsizeHint = a[i].tqminimumSize; + a[i].sizeHint = a[i].tqminimumSize; } else if ( mode == KeepSize ) { - a[i].tqsizeHint = s->getSizer( orient ); + a[i].sizeHint = s->getSizer( orient ); } else { // mode == FollowSizeHint - a[i].tqsizeHint = pick( s->wid->tqsizeHint() ); + a[i].sizeHint = pick( s->wid->sizeHint() ); } } } @@ -1109,7 +1109,7 @@ void TQSplitter::recalcId() /*! \reimp */ -TQSize TQSplitter::tqsizeHint() const +TQSize TQSplitter::sizeHint() const { constPolish(); int l = 0; @@ -1121,7 +1121,7 @@ TQSize TQSplitter::tqsizeHint() const while( (o = it.current()) != 0 ) { ++it; if ( o->isWidgetType() && !((TQWidget*)o)->isHidden() ) { - TQSize s = ((TQWidget*)o)->tqsizeHint(); + TQSize s = ((TQWidget*)o)->sizeHint(); if ( s.isValid() ) { l += pick( s ); t = TQMAX( t, trans( s ) ); diff --git a/tqtinterface/qt4/src/widgets/tqsplitter.h b/tqtinterface/qt4/src/widgets/tqsplitter.h index b9d536d..3fc1f48 100644 --- a/tqtinterface/qt4/src/widgets/tqsplitter.h +++ b/tqtinterface/qt4/src/widgets/tqsplitter.h @@ -87,7 +87,7 @@ public: void moveToLast( TQWidget * ); void refresh() { recalc( TRUE ); } - TQSize tqsizeHint() const; + TQSize sizeHint() const; TQSize tqminimumSizeHint() const; TQValueList<int> sizes() const; diff --git a/tqtinterface/qt4/src/widgets/tqstatusbar.cpp b/tqtinterface/qt4/src/widgets/tqstatusbar.cpp index 6dbe4a4..75bbee8 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 "tqsizegrip.h" +#include "sizegrip.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->tqsizeHint().height(), + int itemH = TQMIN(item->w->sizeHint().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->tqsizeHint().height(), + int itemH = TQMIN(item->w->sizeHint().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->tqsizeHint().height() ); + maxH = TQMAX( maxH, d->resizer->sizeHint().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->tqsizeHint().height(), + int itemH = TQMIN(item->w->sizeHint().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->tqsizeHint().height() ); + maxH = TQMAX( maxH, d->resizer->sizeHint().height() ); #endif if ( maxH != d->savedStrut ) diff --git a/tqtinterface/qt4/src/widgets/tqtabbar.cpp b/tqtinterface/qt4/src/widgets/tqtabbar.cpp index dd31f44..83329be 100644 --- a/tqtinterface/qt4/src/widgets/tqtabbar.cpp +++ b/tqtinterface/qt4/src/widgets/tqtabbar.cpp @@ -547,7 +547,7 @@ bool TQTabBar::isTabEnabled( int id ) const /*! \reimp */ -TQSize TQTabBar::tqsizeHint() const +TQSize TQTabBar::sizeHint() const { TQSize sz(0, 0); if ( TQTab * t = l->first() ) { @@ -566,8 +566,8 @@ TQSize TQTabBar::tqsizeHint() const TQSize TQTabBar::tqminimumSizeHint() const { if(tqstyle().tqstyleHint( TQStyle::SH_TabBar_PreferNoArrows, this )) - return tqsizeHint(); - return TQSize( d->rightB->tqsizeHint().width() * 2 + 75, tqsizeHint().height() ); + return sizeHint(); + return TQSize( d->rightB->sizeHint().width() * 2 + 75, sizeHint().height() ); } /*! @@ -576,7 +576,7 @@ TQSize TQTabBar::tqminimumSizeHint() const This virtual function may be reimplemented to change the look of TQTabBar. If you decide to reimplement it, you may also need to - reimplement tqsizeHint(). + reimplement sizeHint(). */ void TQTabBar::paint( TQPainter * p, TQTab * t, bool selected ) const @@ -1107,7 +1107,7 @@ void TQTabBar::layoutTabs() h = TQMAX( h, TQApplication::globalStrut().height() ); h += vframe; - t->r = TQRect(TQPoint(x, 0), tqstyle().tqsizeFromContents(TQStyle::CT_TabBarTab, this, + t->r = TQRect(TQPoint(x, 0), tqstyle().sizeFromContents(TQStyle::CT_TabBarTab, this, TQSize( TQMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), h ), TQStyleOption(t) )); x += t->r.width() - overlap; @@ -1129,7 +1129,7 @@ void TQTabBar::layoutTabs() t->r.setHeight( r.height() ); } - if ( tqsizeHint() != oldSh ) + if ( sizeHint() != oldSh ) updateGeometry(); emit layoutChanged(); diff --git a/tqtinterface/qt4/src/widgets/tqtabbar.h b/tqtinterface/qt4/src/widgets/tqtabbar.h index 1b0fa76..89c9b9e 100644 --- a/tqtinterface/qt4/src/widgets/tqtabbar.h +++ b/tqtinterface/qt4/src/widgets/tqtabbar.h @@ -115,7 +115,7 @@ public: bool isTabEnabled( int ) const; - TQSize tqsizeHint() const; + TQSize sizeHint() const; TQSize tqminimumSizeHint() const; int currentTab() const; diff --git a/tqtinterface/qt4/src/widgets/tqtabwidget.cpp b/tqtinterface/qt4/src/widgets/tqtabwidget.cpp index 5fab113..a08e9a2 100644 --- a/tqtinterface/qt4/src/widgets/tqtabwidget.cpp +++ b/tqtinterface/qt4/src/widgets/tqtabwidget.cpp @@ -681,10 +681,10 @@ void TQTabWidget::setUpLayout( bool onlyCheck ) TQSize t( 0, d->stack->frameWidth() ); if ( d->tabs->isVisibleTo(this) ) - t = d->tabs->tqsizeHint(); + t = d->tabs->sizeHint(); int lcw = 0; if ( d->leftCornerWidget && d->leftCornerWidget->isVisible() ) { - TQSize sz = d->leftCornerWidget->tqsizeHint(); + TQSize sz = d->leftCornerWidget->sizeHint(); d->leftCornerWidget->resize(sz); lcw = sz.width(); if ( t.height() > lcw ) @@ -692,7 +692,7 @@ void TQTabWidget::setUpLayout( bool onlyCheck ) } int rcw = 0; if ( d->rightCornerWidget && d->rightCornerWidget->isVisible() ) { - TQSize sz = d->rightCornerWidget->tqsizeHint(); + TQSize sz = d->rightCornerWidget->sizeHint(); d->rightCornerWidget->resize(sz); rcw = sz.width(); if ( t.height() > rcw ) @@ -760,20 +760,20 @@ void TQTabWidget::setUpLayout( bool onlyCheck ) /*! \reimp */ -TQSize TQTabWidget::tqsizeHint() const +TQSize TQTabWidget::sizeHint() const { TQSize lc(0, 0), rc(0, 0); if (d->leftCornerWidget) - lc = d->leftCornerWidget->tqsizeHint(); + lc = d->leftCornerWidget->sizeHint(); if(d->rightCornerWidget) - rc = d->rightCornerWidget->tqsizeHint(); + rc = d->rightCornerWidget->sizeHint(); if ( !d->dirty ) { TQTabWidget *that = (TQTabWidget*)this; that->setUpLayout( TRUE ); } - TQSize s( d->stack->tqsizeHint() ); - TQSize t( d->tabs->tqsizeHint() ); + TQSize s( d->stack->sizeHint() ); + TQSize t( d->tabs->sizeHint() ); if(!tqstyle().tqstyleHint(TQStyle::SH_TabBar_PreferNoArrows, d->tabs)) t = t.boundedTo( TQSize(200,200) ); else @@ -781,7 +781,7 @@ TQSize TQTabWidget::tqsizeHint() const TQSize sz( TQMAX( s.width(), t.width() + rc.width() + lc.width() ), s.height() + (TQMAX( rc.height(), TQMAX(lc.height(), t.height()))) + ( d->tabBase->isVisible() ? d->tabBase->height() : 0 ) ); - return tqstyle().tqsizeFromContents(TQStyle::CT_TabWidget, this, sz).expandedTo(TQApplication::globalStrut()); + return tqstyle().sizeFromContents(TQStyle::CT_TabWidget, this, sz).expandedTo(TQApplication::globalStrut()); } @@ -807,7 +807,7 @@ TQSize TQTabWidget::tqminimumSizeHint() const TQSize sz( TQMAX( s.width(), t.width() + rc.width() + lc.width() ), s.height() + (TQMAX( rc.height(), TQMAX(lc.height(), t.height()))) + ( d->tabBase->isVisible() ? d->tabBase->height() : 0 ) ); - return tqstyle().tqsizeFromContents(TQStyle::CT_TabWidget, this, sz).expandedTo(TQApplication::globalStrut()); + return tqstyle().sizeFromContents(TQStyle::CT_TabWidget, this, sz).expandedTo(TQApplication::globalStrut()); } /*! diff --git a/tqtinterface/qt4/src/widgets/tqtabwidget.h b/tqtinterface/qt4/src/widgets/tqtabwidget.h index eb11988..5774160 100644 --- a/tqtinterface/qt4/src/widgets/tqtabwidget.h +++ b/tqtinterface/qt4/src/widgets/tqtabwidget.h @@ -107,7 +107,7 @@ public: int currentPageIndex() const; int indexOf( TQWidget * ) const; - TQSize tqsizeHint() const; + TQSize sizeHint() const; TQSize tqminimumSizeHint() const; enum TabPosition { Top, Bottom }; diff --git a/tqtinterface/qt4/src/widgets/tqtextedit.cpp b/tqtinterface/qt4/src/widgets/tqtextedit.cpp index 62c1d5f..90573bd 100644 --- a/tqtinterface/qt4/src/widgets/tqtextedit.cpp +++ b/tqtinterface/qt4/src/widgets/tqtextedit.cpp @@ -5446,9 +5446,9 @@ void TQTextEdit::setTabStopWidth( int ts ) \reimp */ -TQSize TQTextEdit::tqsizeHint() const +TQSize TQTextEdit::sizeHint() const { - // cf. TQScrollView::tqsizeHint() + // cf. TQScrollView::sizeHint() constPolish(); int f = 2 * frameWidth(); int h = fontMetrics().height(); diff --git a/tqtinterface/qt4/src/widgets/tqtextedit.h b/tqtinterface/qt4/src/widgets/tqtextedit.h index c78371e..48e0134 100644 --- a/tqtinterface/qt4/src/widgets/tqtextedit.h +++ b/tqtinterface/qt4/src/widgets/tqtextedit.h @@ -269,7 +269,7 @@ public: TQString anchorAt( const TQPoint& pos ); TQString anchorAt( const TQPoint& pos, Qt::AnchorAttribute a ); - TQSize tqsizeHint() const; + TQSize sizeHint() const; bool isReadOnly() const { return readonly; } diff --git a/tqtinterface/qt4/src/widgets/tqtitlebar.cpp b/tqtinterface/qt4/src/widgets/tqtitlebar.cpp index ed7cd51..d9551f6 100644 --- a/tqtinterface/qt4/src/widgets/tqtitlebar.cpp +++ b/tqtinterface/qt4/src/widgets/tqtitlebar.cpp @@ -660,7 +660,7 @@ bool TQTitleBar::autoRaise() const return d->autoraise; } -TQSize TQTitleBar::tqsizeHint() const +TQSize TQTitleBar::sizeHint() const { constPolish(); TQRect menur = tqstyle().querySubControlMetrics(TQStyle::CC_TitleBar, this, diff --git a/tqtinterface/qt4/src/widgets/tqtitlebar_p.h b/tqtinterface/qt4/src/widgets/tqtitlebar_p.h index 44cac81..15e7ad8 100644 --- a/tqtinterface/qt4/src/widgets/tqtitlebar_p.h +++ b/tqtinterface/qt4/src/widgets/tqtitlebar_p.h @@ -89,7 +89,7 @@ public: TQWidget *window() const; - TQSize tqsizeHint() const; + TQSize sizeHint() const; #ifdef TQT_NO_WIDGET_TOPEXTRA // We provide one, since titlebar is useless otherwise. diff --git a/tqtinterface/qt4/src/widgets/tqtoolbar.cpp b/tqtinterface/qt4/src/widgets/tqtoolbar.cpp index 0701c6a..3def167 100644 --- a/tqtinterface/qt4/src/widgets/tqtoolbar.cpp +++ b/tqtinterface/qt4/src/widgets/tqtoolbar.cpp @@ -106,7 +106,7 @@ class TQToolBarSeparator : public TQWidget public: TQToolBarSeparator( Qt::Orientation, TQToolBar *tqparent, const char* name=0 ); - TQSize tqsizeHint() const; + TQSize sizeHint() const; Qt::Orientation orientation() const { return orient; } public Q_SLOTS: void setOrientation( Qt::Orientation ); @@ -188,7 +188,7 @@ void TQToolBarSeparator::styleChange( TQStyle& ) setOrientation( orient ); } -TQSize TQToolBarSeparator::tqsizeHint() const +TQSize TQToolBarSeparator::sizeHint() const { int extent = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowSeparatorExtent, this ); @@ -698,7 +698,7 @@ void TQToolBar::createPopup() cp->setItemChecked( i, TRUE ); if ( !maxItems ) { if ( cp->count() == 10 ) { - int h = cp->tqsizeHint().height(); + int h = cp->sizeHint().height(); maxItems = TQApplication::desktop()->height() * 10 / h; } } else if ( cp->count() >= maxItems - 1 ) { @@ -734,9 +734,9 @@ void TQToolBar::checkForExtension( const TQSize &sz ) bool tooSmall; if ( orientation() == Qt::Horizontal ) - tooSmall = sz.width() < tqsizeHint().width(); + tooSmall = sz.width() < sizeHint().width(); else - tooSmall = sz.height() < tqsizeHint().height(); + tooSmall = sz.height() < sizeHint().height(); if ( tooSmall ) { createPopup(); diff --git a/tqtinterface/qt4/src/widgets/tqtoolbox.cpp b/tqtinterface/qt4/src/widgets/tqtoolbox.cpp index 5950b1c..2a710b7 100644 --- a/tqtinterface/qt4/src/widgets/tqtoolbox.cpp +++ b/tqtinterface/qt4/src/widgets/tqtoolbox.cpp @@ -132,7 +132,7 @@ void TQToolBoxPrivate::updateTabs() } } -TQSize TQToolBoxButton::tqsizeHint() const +TQSize TQToolBoxButton::sizeHint() const { TQSize iconSize(8, 8); if ( !icon.isNull() ) diff --git a/tqtinterface/qt4/src/widgets/tqtoolbox.h b/tqtinterface/qt4/src/widgets/tqtoolbox.h index 0ca8c38..d418b3c 100644 --- a/tqtinterface/qt4/src/widgets/tqtoolbox.h +++ b/tqtinterface/qt4/src/widgets/tqtoolbox.h @@ -145,7 +145,7 @@ public: inline void setIconSet( const TQIconSet &is ) { icon = is; update(); } inline TQIconSet iconSet() const { return icon; } - TQSize tqsizeHint() const; + TQSize sizeHint() const; TQSize tqminimumSizeHint() const; protected: 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 ) ); } } } diff --git a/tqtinterface/qt4/src/widgets/tqtoolbutton.h b/tqtinterface/qt4/src/widgets/tqtoolbutton.h index 3cdb9c0..0788a05 100644 --- a/tqtinterface/qt4/src/widgets/tqtoolbutton.h +++ b/tqtinterface/qt4/src/widgets/tqtoolbutton.h @@ -92,7 +92,7 @@ public: TQToolButton( TQt::ArrowType type, TQWidget *tqparent, const char* name=0 ); ~TQToolButton(); - TQSize tqsizeHint() const; + TQSize sizeHint() const; TQSize tqminimumSizeHint() const; #ifndef TQT_NO_COMPAT diff --git a/tqtinterface/qt4/src/widgets/tqvbox.cpp b/tqtinterface/qt4/src/widgets/tqvbox.cpp index fbfba79..a47d561 100644 --- a/tqtinterface/qt4/src/widgets/tqvbox.cpp +++ b/tqtinterface/qt4/src/widgets/tqvbox.cpp @@ -52,7 +52,7 @@ \ingroup organizers All its child widgets will be placed vertically and sized - according to their tqsizeHint()s. + according to their sizeHint()s. \img qvbox-m.png TQVBox diff --git a/tqtinterface/qt4/src/widgets/tqwidgetresizehandler.cpp b/tqtinterface/qt4/src/widgets/tqwidgetresizehandler.cpp index b9b576a..9310260 100644 --- a/tqtinterface/qt4/src/widgets/tqwidgetresizehandler.cpp +++ b/tqtinterface/qt4/src/widgets/tqwidgetresizehandler.cpp @@ -44,7 +44,7 @@ #include "tqframe.h" #include "tqapplication.h" #include "tqcursor.h" -#include "tqsizegrip.h" +#include "sizegrip.h" #if defined(TQ_WS_WIN) #include "tqt_windows.h" #endif diff --git a/tqtinterface/qt4/src/widgets/tqwidgetstack.cpp b/tqtinterface/qt4/src/widgets/tqwidgetstack.cpp index 4bf824e..cca8e9b 100644 --- a/tqtinterface/qt4/src/widgets/tqwidgetstack.cpp +++ b/tqtinterface/qt4/src/widgets/tqwidgetstack.cpp @@ -492,7 +492,7 @@ void TQWidgetStack::resizeEvent(TQResizeEvent * e) \reimp */ -TQSize TQWidgetStack::tqsizeHint() const +TQSize TQWidgetStack::sizeHint() const { constPolish(); @@ -503,10 +503,10 @@ TQSize TQWidgetStack::tqsizeHint() const while ((w = it.current()) != 0) { ++it; - TQSize sh = w->tqsizeHint(); - if (w->tqsizePolicy().horData() == QSizePolicy::Ignored) + TQSize sh = w->sizeHint(); + if (w->sizePolicy().horData() == QSizePolicy::Ignored) sh.rwidth() = 0; - if (w->tqsizePolicy().verData() == QSizePolicy::Ignored) + if (w->sizePolicy().verData() == QSizePolicy::Ignored) sh.rheight() = 0; #ifndef QT_NO_LAYOUT size = size.expandedTo(sh).expandedTo(tqSmartMinSize(w)); @@ -534,9 +534,9 @@ TQSize TQWidgetStack::tqminimumSizeHint() const while ((w = it.current()) != 0) { ++it; TQSize sh = w->tqminimumSizeHint(); - if (w->tqsizePolicy().horData() == QSizePolicy::Ignored) + if (w->sizePolicy().horData() == QSizePolicy::Ignored) sh.rwidth() = 0; - if (w->tqsizePolicy().verData() == QSizePolicy::Ignored) + if (w->sizePolicy().verData() == QSizePolicy::Ignored) sh.rheight() = 0; #ifndef QT_NO_LAYOUT size = size.expandedTo(sh).expandedTo(w->minimumSize()); @@ -1114,7 +1114,7 @@ void TQWidgetStack::resizeEvent( TQResizeEvent * e ) \reimp */ -TQSize TQWidgetStack::tqsizeHint() const +TQSize TQWidgetStack::sizeHint() const { constPolish(); @@ -1125,10 +1125,10 @@ TQSize TQWidgetStack::tqsizeHint() const while ( (w = it.current()) != 0 ) { ++it; - TQSize sh = w->tqsizeHint(); - if ( w->tqsizePolicy().horData() == TQSizePolicy::Ignored ) + TQSize sh = w->sizeHint(); + if ( w->sizePolicy().horData() == TQSizePolicy::Ignored ) sh.rwidth() = 0; - if ( w->tqsizePolicy().verData() == TQSizePolicy::Ignored ) + if ( w->sizePolicy().verData() == TQSizePolicy::Ignored ) sh.rheight() = 0; #ifndef TQT_NO_LAYOUT size = size.expandedTo( sh ).expandedTo( tqSmartMinSize(w) ); @@ -1156,9 +1156,9 @@ TQSize TQWidgetStack::tqminimumSizeHint() const while ( (w = it.current()) != 0 ) { ++it; TQSize sh = w->tqminimumSizeHint(); - if ( w->tqsizePolicy().horData() == TQSizePolicy::Ignored ) + if ( w->sizePolicy().horData() == TQSizePolicy::Ignored ) sh.rwidth() = 0; - if ( w->tqsizePolicy().verData() == TQSizePolicy::Ignored ) + if ( w->sizePolicy().verData() == TQSizePolicy::Ignored ) sh.rheight() = 0; #ifndef TQT_NO_LAYOUT size = size.expandedTo( sh ).expandedTo( w->tqminimumSize() ); diff --git a/tqtinterface/qt4/src/widgets/tqwidgetstack.h b/tqtinterface/qt4/src/widgets/tqwidgetstack.h index 5c0acfd..b0e0159 100644 --- a/tqtinterface/qt4/src/widgets/tqwidgetstack.h +++ b/tqtinterface/qt4/src/widgets/tqwidgetstack.h @@ -71,7 +71,7 @@ public: int addWidget(TQWidget *, int = -1); void removeWidget(TQWidget *); - TQSize tqsizeHint() const; + TQSize sizeHint() const; TQSize tqminimumSizeHint() const; void setVisible(bool visible); @@ -186,7 +186,7 @@ public: int addWidget( TQWidget *, int = -1 ); void removeWidget( TQWidget * ); - TQSize tqsizeHint() const; + TQSize sizeHint() const; TQSize tqminimumSizeHint() const; void show(); |