diff options
Diffstat (limited to 'experimental/tqtinterface/qt4/src/styles')
9 files changed, 24 insertions, 24 deletions
diff --git a/experimental/tqtinterface/qt4/src/styles/tqcommonstyle.cpp b/experimental/tqtinterface/qt4/src/styles/tqcommonstyle.cpp index c69fea7f2..252a1ff79 100644 --- a/experimental/tqtinterface/qt4/src/styles/tqcommonstyle.cpp +++ b/experimental/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() ) { diff --git a/experimental/tqtinterface/qt4/src/styles/tqcommonstyle.h b/experimental/tqtinterface/qt4/src/styles/tqcommonstyle.h index ef01d8958..d9e7244d4 100644 --- a/experimental/tqtinterface/qt4/src/styles/tqcommonstyle.h +++ b/experimental/tqtinterface/qt4/src/styles/tqcommonstyle.h @@ -127,7 +127,7 @@ public: int tqpixelMetric( PixelMetric m, const TQWidget *widget = 0 ) const; - TQSize tqsizeFromContents( ContentsType s, + TQSize sizeFromContents( ContentsType s, const TQWidget *widget, const TQSize &contentsSize, const TQStyleOption& = TQStyleOption::Default ) const; diff --git a/experimental/tqtinterface/qt4/src/styles/tqcompactstyle.cpp b/experimental/tqtinterface/qt4/src/styles/tqcompactstyle.cpp index 44cd711b4..9d5001152 100644 --- a/experimental/tqtinterface/qt4/src/styles/tqcompactstyle.cpp +++ b/experimental/tqtinterface/qt4/src/styles/tqcompactstyle.cpp @@ -129,7 +129,7 @@ static int popupMenuItemHeight( bool /*checkable*/, TQMenuItem* mi, const TQFont h = TQMAX( h, mi->iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).height() + 2*motifItemFrame ); } if ( mi->custom() ) - h = TQMAX( h, mi->custom()->tqsizeHint().height() + 2*motifItemVMargin + 2*motifItemFrame ) - 1; + h = TQMAX( h, mi->custom()->sizeHint().height() + 2*motifItemVMargin + 2*motifItemFrame ) - 1; return h; } diff --git a/experimental/tqtinterface/qt4/src/styles/tqmotifstyle.cpp b/experimental/tqtinterface/qt4/src/styles/tqmotifstyle.cpp index 257c0ad81..62edca778 100644 --- a/experimental/tqtinterface/qt4/src/styles/tqmotifstyle.cpp +++ b/experimental/tqtinterface/qt4/src/styles/tqmotifstyle.cpp @@ -1730,7 +1730,7 @@ TQRect TQMotifStyle::querySubControlMetrics( TQ_ComplexControl control, /*!\reimp */ -TQSize TQMotifStyle::tqsizeFromContents( ContentsType contents, +TQSize TQMotifStyle::sizeFromContents( ContentsType contents, const TQWidget *widget, const TQSize &contentsSize, const TQStyleOption& opt ) const @@ -1742,7 +1742,7 @@ TQSize TQMotifStyle::tqsizeFromContents( ContentsType contents, { #ifndef TQT_NO_PUSHBUTTON const TQPushButton *button = (const TQPushButton *) widget; - sz = TQCommonStyle::tqsizeFromContents(contents, widget, contentsSize, opt); + sz = TQCommonStyle::sizeFromContents(contents, widget, contentsSize, opt); if ((button->isDefault() || button->autoDefault()) && sz.width() < 80 && ! button->pixmap()) sz.setWidth(80); @@ -1763,8 +1763,8 @@ TQSize TQMotifStyle::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 += 2*motifItemVMargin + 2*motifItemFrame; } else if ( mi->widget() ) { @@ -1802,7 +1802,7 @@ TQSize TQMotifStyle::tqsizeFromContents( ContentsType contents, } default: - sz = TQCommonStyle::tqsizeFromContents( contents, widget, contentsSize, opt ); + sz = TQCommonStyle::sizeFromContents( contents, widget, contentsSize, opt ); break; } diff --git a/experimental/tqtinterface/qt4/src/styles/tqmotifstyle.h b/experimental/tqtinterface/qt4/src/styles/tqmotifstyle.h index f5d6a52b4..be7abf96e 100644 --- a/experimental/tqtinterface/qt4/src/styles/tqmotifstyle.h +++ b/experimental/tqtinterface/qt4/src/styles/tqmotifstyle.h @@ -109,7 +109,7 @@ public: int tqpixelMetric( PixelMetric metric, const TQWidget *widget = 0 ) const; - TQSize tqsizeFromContents( ContentsType contents, + TQSize sizeFromContents( ContentsType contents, const TQWidget *widget, const TQSize &contentsSize, const TQStyleOption& = TQStyleOption::Default ) const; diff --git a/experimental/tqtinterface/qt4/src/styles/tqsgistyle.cpp b/experimental/tqtinterface/qt4/src/styles/tqsgistyle.cpp index 6b8a17bf3..24c778730 100644 --- a/experimental/tqtinterface/qt4/src/styles/tqsgistyle.cpp +++ b/experimental/tqtinterface/qt4/src/styles/tqsgistyle.cpp @@ -1365,7 +1365,7 @@ void TQSGIStyle::tqdrawComplexControl( TQ_ComplexControl control, /*!\reimp */ -TQSize TQSGIStyle::tqsizeFromContents( ContentsType contents, +TQSize TQSGIStyle::sizeFromContents( ContentsType contents, const TQWidget *widget, const TQSize &contentsSize, const TQStyleOption& opt ) const @@ -1380,7 +1380,7 @@ TQSize TQSGIStyle::tqsizeFromContents( ContentsType contents, break; TQMenuItem *mi = opt.menuItem(); - sz = TQMotifStyle::tqsizeFromContents( contents, widget, contentsSize, + sz = TQMotifStyle::sizeFromContents( contents, widget, contentsSize, opt ); // SGI checkmark items needs a bit more room const TQPopupMenu *popup = (TQPopupMenu *) widget; @@ -1397,7 +1397,7 @@ TQSize TQSGIStyle::tqsizeFromContents( ContentsType contents, break; default: - sz = TQMotifStyle::tqsizeFromContents( contents, widget, contentsSize, opt ); + sz = TQMotifStyle::sizeFromContents( contents, widget, contentsSize, opt ); break; } diff --git a/experimental/tqtinterface/qt4/src/styles/tqsgistyle.h b/experimental/tqtinterface/qt4/src/styles/tqsgistyle.h index 5ae9889d0..38e203a2e 100644 --- a/experimental/tqtinterface/qt4/src/styles/tqsgistyle.h +++ b/experimental/tqtinterface/qt4/src/styles/tqsgistyle.h @@ -103,7 +103,7 @@ public: int tqpixelMetric( PixelMetric metric, const TQWidget *widget = 0 ) const; - TQSize tqsizeFromContents( ContentsType contents, + TQSize sizeFromContents( ContentsType contents, const TQWidget *widget, const TQSize &contentsSize, const TQStyleOption& = TQStyleOption::Default ) const; diff --git a/experimental/tqtinterface/qt4/src/styles/tqwindowsstyle.cpp b/experimental/tqtinterface/qt4/src/styles/tqwindowsstyle.cpp index aa65a5b94..c766c2d53 100644 --- a/experimental/tqtinterface/qt4/src/styles/tqwindowsstyle.cpp +++ b/experimental/tqtinterface/qt4/src/styles/tqwindowsstyle.cpp @@ -1169,7 +1169,7 @@ int TQWindowsStyle::tqpixelMetric(PixelMetric metric, const TQWidget *widget) co /*! \reimp */ -TQSize TQWindowsStyle::tqsizeFromContents( ContentsType contents, +TQSize TQWindowsStyle::sizeFromContents( ContentsType contents, const TQWidget *widget, const TQSize &contentsSize, const TQStyleOption& opt ) const @@ -1181,7 +1181,7 @@ TQSize TQWindowsStyle::tqsizeFromContents( ContentsType contents, { #ifndef TQT_NO_PUSHBUTTON const TQPushButton *button = (const TQPushButton *) widget; - sz = TQCommonStyle::tqsizeFromContents(contents, widget, contentsSize, opt); + sz = TQCommonStyle::sizeFromContents(contents, widget, contentsSize, opt); int w = sz.width(), h = sz.height(); int defwidth = 0; @@ -1211,8 +1211,8 @@ TQSize TQWindowsStyle::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 += 2*windowsItemVMargin + 2*windowsItemFrame; } else if ( mi->widget() ) { @@ -1261,7 +1261,7 @@ TQSize TQWindowsStyle::tqsizeFromContents( ContentsType contents, } default: - sz = TQCommonStyle::tqsizeFromContents(contents, widget, sz, opt); + sz = TQCommonStyle::sizeFromContents(contents, widget, sz, opt); break; } diff --git a/experimental/tqtinterface/qt4/src/styles/tqwindowsstyle.h b/experimental/tqtinterface/qt4/src/styles/tqwindowsstyle.h index a5a6fe9a3..e1aed6c18 100644 --- a/experimental/tqtinterface/qt4/src/styles/tqwindowsstyle.h +++ b/experimental/tqtinterface/qt4/src/styles/tqwindowsstyle.h @@ -104,7 +104,7 @@ public: int tqpixelMetric( PixelMetric metric, const TQWidget *widget = 0 ) const; - TQSize tqsizeFromContents( ContentsType contents, + TQSize sizeFromContents( ContentsType contents, const TQWidget *widget, const TQSize &contentsSize, const TQStyleOption& = TQStyleOption::Default ) const; |