diff options
Diffstat (limited to 'tqtinterface/qt4/src/styles/tqcommonstyle.cpp')
| -rw-r--r-- | tqtinterface/qt4/src/styles/tqcommonstyle.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tqtinterface/qt4/src/styles/tqcommonstyle.cpp b/tqtinterface/qt4/src/styles/tqcommonstyle.cpp index c69fea7..252a1ff 100644 --- a/tqtinterface/qt4/src/styles/tqcommonstyle.cpp +++ b/tqtinterface/qt4/src/styles/tqcommonstyle.cpp @@ -1187,7 +1187,7 @@ TQRect TQCommonStyle::subRect(SubRect r, const TQWidget *widget) const TQDialogButtons::Help }; for(unsigned int i = 0, cnt = 0; i < (sizeof(btns)/sizeof(btns[0])); i++) { if(dbtns->isButtonVisible(btns[i])) { - TQSize szH = dbtns->tqsizeHint(btns[i]); + TQSize szH = dbtns->sizeHint(btns[i]); int mwidth = TQMAX(bwidth, szH.width()), mheight = TQMAX(bheight, szH.height()); if(dbtns->orientation() == Qt::Horizontal) { start -= mwidth; @@ -2458,7 +2458,7 @@ int TQCommonStyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const /*! \reimp */ -TQSize TQCommonStyle::tqsizeFromContents(ContentsType contents, +TQSize TQCommonStyle::sizeFromContents(ContentsType contents, const TQWidget *widget, const TQSize &contentsSize, const TQStyleOption& opt ) const @@ -2467,7 +2467,7 @@ TQSize TQCommonStyle::tqsizeFromContents(ContentsType contents, #if defined(TQT_CHECK_STATE) if (! widget) { - qWarning("TQCommonStyle::tqsizeFromContents: widget parameter cannot be zero!"); + qWarning("TQCommonStyle::sizeFromContents: widget parameter cannot be zero!"); return sz; } #endif @@ -2492,7 +2492,7 @@ TQSize TQCommonStyle::tqsizeFromContents(ContentsType contents, TQDialogButtons::Help }; for(unsigned int i = 0, cnt = 0; i < (sizeof(btns)/sizeof(btns[0])); i++) { if(dbtns->isButtonVisible(btns[i])) { - TQSize szH = dbtns->tqsizeHint(btns[i]); + TQSize szH = dbtns->sizeHint(btns[i]); int mwidth = TQMAX(bwidth, szH.width()), mheight = TQMAX(bheight, szH.height()); if(dbtns->orientation() == Qt::Horizontal) h = TQMAX(h, mheight); @@ -2587,8 +2587,8 @@ TQSize TQCommonStyle::tqsizeFromContents(ContentsType contents, int w = sz.width(), h = sz.height(); if (mi->custom()) { - w = mi->custom()->tqsizeHint().width(); - h = mi->custom()->tqsizeHint().height(); + w = mi->custom()->sizeHint().width(); + h = mi->custom()->sizeHint().height(); if (! mi->custom()->fullSpan()) h += 8; } else if ( mi->widget() ) { |