summaryrefslogtreecommitdiffstats
path: root/tdestyles/light
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2013-11-28 13:28:01 -0600
committerDarrell Anderson <humanreadable@yahoo.com>2013-11-28 13:28:01 -0600
commit72849e2a6f973af3eeaa573a66635e37cc427bb0 (patch)
tree2d3beea645819ba70a32c19a092a874f4e89c399 /tdestyles/light
parentb46a7c35c167304acc48675b979ca8b32bc3d293 (diff)
downloadtdelibs-72849e2a6f973af3eeaa573a66635e37cc427bb0.tar.gz
tdelibs-72849e2a6f973af3eeaa573a66635e37cc427bb0.zip
Fix remnant QMIN/QMAX to TQMIN/TQMAX.
Diffstat (limited to 'tdestyles/light')
-rw-r--r--tdestyles/light/lightstyle-v2.cpp12
-rw-r--r--tdestyles/light/lightstyle-v3.cpp12
2 files changed, 12 insertions, 12 deletions
diff --git a/tdestyles/light/lightstyle-v2.cpp b/tdestyles/light/lightstyle-v2.cpp
index 0d343f778..35b7cc813 100644
--- a/tdestyles/light/lightstyle-v2.cpp
+++ b/tdestyles/light/lightstyle-v2.cpp
@@ -838,7 +838,7 @@ void LightStyleV2::drawControl( TQ_ControlElement control,
if ( !mi )
break;
- maxpmw = QMAX(maxpmw, 16);
+ maxpmw = TQMAX(maxpmw, 16);
TQRect cr, ir, tr, sr;
// check column
@@ -1579,11 +1579,11 @@ TQSize LightStyleV2::sizeFromContents( ContentsType contents,
if (h < 16)
h = 16;
if (mi->pixmap())
- h = QMAX(h, mi->pixmap()->height());
+ h = TQMAX(h, mi->pixmap()->height());
else if (! mi->text().isNull())
- h = QMAX(h, TQFontMetrics(ceData.font).height() + 2);
+ h = TQMAX(h, TQFontMetrics(ceData.font).height() + 2);
if (mi->iconSet() != 0)
- h = QMAX(h, mi->iconSet()->pixmap(TQIconSet::Small,
+ h = TQMAX(h, mi->iconSet()->pixmap(TQIconSet::Small,
TQIconSet::Normal).height());
h += 2;
}
@@ -1591,7 +1591,7 @@ TQSize LightStyleV2::sizeFromContents( ContentsType contents,
// check | 4 pixels | item | 8 pixels | accel | 4 pixels | check
// check is at least 16x16
- maxpmw = QMAX(maxpmw, 16);
+ maxpmw = TQMAX(maxpmw, 16);
w += (maxpmw * 2) + 8;
if (! mi->text().isNull() && mi->text().find('\t') >= 0)
@@ -1654,7 +1654,7 @@ int LightStyleV2::styleHint( TQ_StyleHint stylehint,
case SH_MenuIndicatorColumnWidth:
{
int maxpmw = option.maxIconWidth();
- maxpmw = QMAX(maxpmw, 16);
+ maxpmw = TQMAX(maxpmw, 16);
ret = maxpmw;
}
diff --git a/tdestyles/light/lightstyle-v3.cpp b/tdestyles/light/lightstyle-v3.cpp
index 735bd3169..92b0d04da 100644
--- a/tdestyles/light/lightstyle-v3.cpp
+++ b/tdestyles/light/lightstyle-v3.cpp
@@ -958,7 +958,7 @@ void LightStyleV3::drawControl( TQ_ControlElement control,
if ( !mi )
break;
- maxpmw = QMAX(maxpmw, 16);
+ maxpmw = TQMAX(maxpmw, 16);
TQRect cr, ir, tr, sr;
// check column
@@ -1807,11 +1807,11 @@ TQSize LightStyleV3::sizeFromContents( ContentsType contents,
if (h < 16)
h = 16;
if (mi->pixmap())
- h = QMAX(h, mi->pixmap()->height());
+ h = TQMAX(h, mi->pixmap()->height());
else if (! mi->text().isNull())
- h = QMAX(h, TQFontMetrics(ceData.font).height() + 2);
+ h = TQMAX(h, TQFontMetrics(ceData.font).height() + 2);
if (mi->iconSet() != 0)
- h = QMAX(h, mi->iconSet()->pixmap(TQIconSet::Small,
+ h = TQMAX(h, mi->iconSet()->pixmap(TQIconSet::Small,
TQIconSet::Normal).height());
h += 2;
}
@@ -1819,7 +1819,7 @@ TQSize LightStyleV3::sizeFromContents( ContentsType contents,
// check | 4 pixels | item | 8 pixels | accel | 4 pixels | check
// check is at least 16x16
- maxpmw = QMAX(maxpmw, 16);
+ maxpmw = TQMAX(maxpmw, 16);
w += (maxpmw * 2) + 8;
if (! mi->text().isNull() && mi->text().find('\t') >= 0)
@@ -1887,7 +1887,7 @@ int LightStyleV3::styleHint( TQ_StyleHint stylehint,
case SH_MenuIndicatorColumnWidth:
{
int maxpmw = option.maxIconWidth();
- maxpmw = QMAX(maxpmw, 16);
+ maxpmw = TQMAX(maxpmw, 16);
ret = maxpmw;
}