From e324e2fbba8a9f4bdc1d8d966c123af63b84d6f6 Mon Sep 17 00:00:00 2001
From: Darrell Anderson <humanreadable@yahoo.com>
Date: Thu, 28 Nov 2013 14:38:05 -0600
Subject: [PATCH] Fix remnant QMIN/QMAX to TQMIN/TQMAX.

---
 .../files/0046-qiconview-no-useless-scrollbar.diff   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/libs/qt-x11-free/files/0046-qiconview-no-useless-scrollbar.diff b/libs/qt-x11-free/files/0046-qiconview-no-useless-scrollbar.diff
index 461ab5b..5d31d05 100644
--- a/libs/qt-x11-free/files/0046-qiconview-no-useless-scrollbar.diff
+++ b/libs/qt-x11-free/files/0046-qiconview-no-useless-scrollbar.diff
@@ -64,10 +64,10 @@ diff -u -3 -p -r1.54 qiconview.cpp
  	}
  	item->dirty = FALSE;
      } else {
--	QRegion r( QRect( 0, 0, QMAX( contentsWidth(), visibleWidth() ),
--			  QMAX( contentsHeight(), visibleHeight() ) ) );
-+	QRegion r( QRect( 0, 0, QMAX( contentsWidth(), visibleWidthSB() ),
-+			  QMAX( contentsHeight(), visibleHeightSB() ) ) );
+-	QRegion r( QRect( 0, 0, TQMAX( contentsWidth(), visibleWidth() ),
+-			  TQMAX( contentsHeight(), visibleHeight() ) ) );
++	QRegion r( QRect( 0, 0, TQMAX( contentsWidth(), visibleWidthSB() ),
++			  TQMAX( contentsHeight(), visibleHeightSB() ) ) );
 
  	QIconViewItem *i = d->firstItem;
  	int y = -1;
@@ -118,7 +118,7 @@ diff -u -3 -p -r1.54 qiconview.cpp
 +
 +    int offset = verticalScrollBar()->isVisible() ? 0
 +        : style().pixelMetric( QStyle::PM_ScrollBarExtent, verticalScrollBar() );
-+    return QMAX( 0, visibleWidth() - offset );
++    return TQMAX( 0, visibleWidth() - offset );
 +}
 +
 +int QIconView::visibleHeightSB() const
@@ -128,7 +128,7 @@ diff -u -3 -p -r1.54 qiconview.cpp
 +
 +    int offset = horizontalScrollBar()->isVisible() ? 0
 +        : style().pixelMetric( QStyle::PM_ScrollBarExtent, horizontalScrollBar() );
-+    return QMAX( 0, visibleHeight() - offset );
++    return TQMAX( 0, visibleHeight() - offset );
 +}
 +
  #endif // QT_NO_ICONVIEW