summaryrefslogtreecommitdiffstats
path: root/tqtinterface/qt4/src/styles/tqmotifstyle.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-07-17 18:20:57 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-07-17 18:20:57 -0500
commitafe922f3d9f62716f4e559fb1e374c04afd3db63 (patch)
tree9a671bad1056ab07f627f5e8fa774da7002e7b15 /tqtinterface/qt4/src/styles/tqmotifstyle.cpp
parent656b2d3e1c0a8d10f19300480f6e797a65381d1e (diff)
downloadexperimental-afe922f3d9f62716f4e559fb1e374c04afd3db63.tar.gz
experimental-afe922f3d9f62716f4e559fb1e374c04afd3db63.zip
Rename tqsize* to size*
Diffstat (limited to 'tqtinterface/qt4/src/styles/tqmotifstyle.cpp')
-rw-r--r--tqtinterface/qt4/src/styles/tqmotifstyle.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/tqtinterface/qt4/src/styles/tqmotifstyle.cpp b/tqtinterface/qt4/src/styles/tqmotifstyle.cpp
index 257c0ad..62edca7 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::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;
}