diff options
Diffstat (limited to 'tqtinterface/qt4/src/styles/tqmotifstyle.cpp')
| -rw-r--r-- | tqtinterface/qt4/src/styles/tqmotifstyle.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tqtinterface/qt4/src/styles/tqmotifstyle.cpp b/tqtinterface/qt4/src/styles/tqmotifstyle.cpp index 62edca7..257c0ad 100644 --- a/tqtinterface/qt4/src/styles/tqmotifstyle.cpp +++ b/tqtinterface/qt4/src/styles/tqmotifstyle.cpp @@ -1730,7 +1730,7 @@ TQRect TQMotifStyle::querySubControlMetrics( TQ_ComplexControl control, /*!\reimp */ -TQSize TQMotifStyle::sizeFromContents( ContentsType contents, +TQSize TQMotifStyle::tqsizeFromContents( ContentsType contents, const TQWidget *widget, const TQSize &contentsSize, const TQStyleOption& opt ) const @@ -1742,7 +1742,7 @@ TQSize TQMotifStyle::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); if ((button->isDefault() || button->autoDefault()) && sz.width() < 80 && ! button->pixmap()) sz.setWidth(80); @@ -1763,8 +1763,8 @@ TQSize TQMotifStyle::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*motifItemVMargin + 2*motifItemFrame; } else if ( mi->widget() ) { @@ -1802,7 +1802,7 @@ TQSize TQMotifStyle::sizeFromContents( ContentsType contents, } default: - sz = TQCommonStyle::sizeFromContents( contents, widget, contentsSize, opt ); + sz = TQCommonStyle::tqsizeFromContents( contents, widget, contentsSize, opt ); break; } |