diff options
Diffstat (limited to 'tqtinterface/qt4/src/styles/tqwindowsstyle.cpp')
| -rw-r--r-- | tqtinterface/qt4/src/styles/tqwindowsstyle.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tqtinterface/qt4/src/styles/tqwindowsstyle.cpp b/tqtinterface/qt4/src/styles/tqwindowsstyle.cpp index c766c2d..aa65a5b 100644 --- a/tqtinterface/qt4/src/styles/tqwindowsstyle.cpp +++ b/tqtinterface/qt4/src/styles/tqwindowsstyle.cpp @@ -1169,7 +1169,7 @@ int TQWindowsStyle::tqpixelMetric(PixelMetric metric, const TQWidget *widget) co /*! \reimp */ -TQSize TQWindowsStyle::sizeFromContents( ContentsType contents, +TQSize TQWindowsStyle::tqsizeFromContents( ContentsType contents, const TQWidget *widget, const TQSize &contentsSize, const TQStyleOption& opt ) const @@ -1181,7 +1181,7 @@ TQSize TQWindowsStyle::sizeFromContents( ContentsType contents, { #ifndef TQT_NO_PUSHBUTTON const TQPushButton *button = (const TQPushButton *) widget; - sz = TQCommonStyle::sizeFromContents(contents, widget, contentsSize, opt); + sz = TQCommonStyle::tqsizeFromContents(contents, widget, contentsSize, opt); int w = sz.width(), h = sz.height(); int defwidth = 0; @@ -1211,8 +1211,8 @@ TQSize TQWindowsStyle::sizeFromContents( ContentsType contents, int w = sz.width(), h = sz.height(); if (mi->custom()) { - w = mi->custom()->sizeHint().width(); - h = mi->custom()->sizeHint().height(); + w = mi->custom()->tqsizeHint().width(); + h = mi->custom()->tqsizeHint().height(); if (! mi->custom()->fullSpan()) h += 2*windowsItemVMargin + 2*windowsItemFrame; } else if ( mi->widget() ) { @@ -1261,7 +1261,7 @@ TQSize TQWindowsStyle::sizeFromContents( ContentsType contents, } default: - sz = TQCommonStyle::sizeFromContents(contents, widget, sz, opt); + sz = TQCommonStyle::tqsizeFromContents(contents, widget, sz, opt); break; } |