Fix remnant QMIN/QMAX to TQMIN/TQMAX.

9 files changed, 59 insertions, 59 deletions

diff --git a/tdestyles/highcolor/highcolor.cpp b/tdestyles/highcolor/highcolor.cpp
index 4fccff059..353fee30d 100644
--- a/tdestyles/highcolor/highcolor.cpp
+++ b/tdestyles/highcolor/highcolor.cpp
@@ -1347,7 +1347,7 @@ void HighColorStyle::drawControl( TQ_ControlElement element,
 			r.rect( &x, &y, &w, &h );
 
 			if ( checkable )
-				checkcol = QMAX( checkcol, 20 );
+				checkcol = TQMAX( checkcol, 20 );
 
 			// Are we a menu item separator?
 			if ( mi->isSeparator() ) {
@@ -1872,7 +1872,7 @@ int HighColorStyle::styleHint(StyleHint sh, const TQStyleControlElementData &ceD
 				bool checkable = (elementFlags & CEF_IsCheckable);
 
 				if ( checkable )
-					checkcol = QMAX( checkcol, 20 );
+					checkcol = TQMAX( checkcol, 20 );
 			
 				ret = checkcol;
 			}
@@ -1950,17 +1950,17 @@ TQSize HighColorStyle::sizeFromContents( ContentsType contents,
 			}
 			else {
 				if ( mi->pixmap() )
-					h = QMAX( h, mi->pixmap()->height() + 2*itemFrame );
+					h = TQMAX( h, mi->pixmap()->height() + 2*itemFrame );
 				else {
 					// Ensure that the minimum height for text-only menu items
 					// is the same as the icon size used by KDE.
-					h = QMAX( h, 16 + 2*itemFrame );
-					h = QMAX( h, popup->fontMetrics().height()
+					h = TQMAX( h, 16 + 2*itemFrame );
+					h = TQMAX( h, popup->fontMetrics().height()
 							+ 2*itemVMargin + 2*itemFrame );
 				}
 					
 				if ( mi->iconSet() )
-					h = QMAX( h, mi->iconSet()->pixmap(
+					h = TQMAX( h, mi->iconSet()->pixmap(
 								TQIconSet::Small, TQIconSet::Normal).height() +
 								2 * itemFrame );
 			}
diff --git a/tdestyles/highcontrast/highcontrast.cpp b/tdestyles/highcontrast/highcontrast.cpp
index af021a91a..9156e670f 100644
--- a/tdestyles/highcontrast/highcontrast.cpp
+++ b/tdestyles/highcontrast/highcontrast.cpp
@@ -1039,7 +1039,7 @@ void HighContrastStyle::drawControl (TQ_ControlElement element,
 			r.rect( &x, &y, &w, &h );
 
 			if ( checkable )
-				checkcol = QMAX( checkcol, 20 );
+				checkcol = TQMAX( checkcol, 20 );
 
 			// Are we a menu item separator?
 			if ( mi->isSeparator() ) {
@@ -1381,7 +1381,7 @@ void HighContrastStyle::drawComplexControl (TQ_ComplexControl control,
 
 					// paint stuff in the magical area
 					TQListView* v = item->listView();
-					int lh = QMAX( p->fontMetrics().height() + 2 * v->itemMargin(),
+					int lh = TQMAX( p->fontMetrics().height() + 2 * v->itemMargin(),
 								   TQApplication::globalStrut().height() );
 					if ( lh % 2 > 0 )
 						lh++;
@@ -1395,7 +1395,7 @@ void HighContrastStyle::drawComplexControl (TQ_ComplexControl control,
 						if ( (child->isExpandable() || child->childCount()) &&
 							 (child->height() > 0) )
 						{
-							int h = QMIN(lh, 24) - 4*basicLineWidth;
+							int h = TQMIN(lh, 24) - 4*basicLineWidth;
 							if (h < 10) 
 								h = 10;
 							else 
@@ -1776,17 +1776,17 @@ TQSize HighContrastStyle::sizeFromContents( ContentsType contents,
 			}
 			else {
 				if ( mi->pixmap() )
-					h = QMAX( h, mi->pixmap()->height() + 2*itemFrame );
+					h = TQMAX( h, mi->pixmap()->height() + 2*itemFrame );
 				else {
 					// Ensure that the minimum height for text-only menu items
 					// is the same as the icon size used by KDE.
-					h = QMAX( h, 16 + 2*itemFrame );
-					h = QMAX( h, popup->fontMetrics().height()
+					h = TQMAX( h, 16 + 2*itemFrame );
+					h = TQMAX( h, popup->fontMetrics().height()
 							+ 2*itemVMargin + 2*itemFrame );
 				}
 
 				if ( mi->iconSet() && ! mi->iconSet()->isNull() )
-					h = QMAX( h, mi->iconSet()->pixmap(
+					h = TQMAX( h, mi->iconSet()->pixmap(
 								TQIconSet::Small, TQIconSet::Normal).height() +
 								2 * itemFrame );
 			}
@@ -1850,7 +1850,7 @@ int HighContrastStyle::styleHint(StyleHint sh, const TQStyleControlElementData &
 				bool checkable = (elementFlags & CEF_IsCheckable);
 			
 				if ( checkable )
-					checkcol = QMAX( checkcol, 20 );
+					checkcol = TQMAX( checkcol, 20 );
 			
 				ret = checkcol;
 			}
diff --git a/tdestyles/keramik/keramik.cpp b/tdestyles/keramik/keramik.cpp
index fa1848203..759f3d7da 100644
--- a/tdestyles/keramik/keramik.cpp
+++ b/tdestyles/keramik/keramik.cpp
@@ -1660,7 +1660,7 @@ void KeramikStyle::drawControl( TQ_ControlElement element,
 			bool etchtext   = styleHint( SH_EtchDisabledText, ceData, elementFlags );
 			bool reverse    = TQApplication::reverseLayout();
 			if ( checkable )
-				checkcol = QMAX( checkcol, 20 );
+				checkcol = TQMAX( checkcol, 20 );
 
 			// Draw the menu item background
 			if ( active )
@@ -1862,9 +1862,9 @@ void KeramikStyle::drawControl( TQ_ControlElement element,
 			// Draw progress bar
 			if (progress > 0 || steps == 0) {
 				double pg = (steps == 0) ? 0.1 : progress / steps;
-				int width = QMIN(cr.width(), (int)(pg * cr.width()));
+				int width = TQMIN(cr.width(), (int)(pg * cr.width()));
 				if (steps == 0)
-					width = QMIN(width,20); //Don't cross squares
+					width = TQMIN(width,20); //Don't cross squares
 
 				if (steps == 0) { //Busy indicator
 
@@ -2484,7 +2484,7 @@ TQSize KeramikStyle::sizeFromContents( ContentsType contents,
 
 			//For some reason kcontrol no longer does this...
 			//if ( (elementFlags & CEF_IsDefault) || (elementFlags & CEF_AutoDefault) )
-			//            w = QMAX( w, 40 );
+			//            w = TQMAX( w, 40 );
 
 			return TQSize( w + 30, h + 5 ); //MX: No longer blank space -- can make a bit smaller
 		}
@@ -2535,17 +2535,17 @@ TQSize KeramikStyle::sizeFromContents( ContentsType contents,
 			}
 			else {
 				if ( mi->pixmap() )
-					h = QMAX( h, mi->pixmap()->height() + 2*itemFrame );
+					h = TQMAX( h, mi->pixmap()->height() + 2*itemFrame );
 				else {
 					// Ensure that the minimum height for text-only menu items
 					// is the same as the icon size used by KDE.
-					h = QMAX( h, 16 + 2*itemFrame );
-					h = QMAX( h, popup->fontMetrics().height()
+					h = TQMAX( h, 16 + 2*itemFrame );
+					h = TQMAX( h, popup->fontMetrics().height()
 							+ 2*itemVMargin + 2*itemFrame );
 				}
 
 				if ( mi->iconSet() )
-					h = QMAX( h, mi->iconSet()->pixmap(
+					h = TQMAX( h, mi->iconSet()->pixmap(
 								TQIconSet::Small, TQIconSet::Normal).height() +
 								2 * itemFrame );
 			}
@@ -2643,7 +2643,7 @@ TQRect KeramikStyle::querySubControlMetrics( TQ_ComplexControl control,
 					def.addCoords( 4, -4, -6, 4 );
 					
 					if ((def.width() - suggestedWidth < -12) && (def.width() < 80))
-						def.setWidth(QMIN(80, suggestedWidth - 10));
+						def.setWidth(TQMIN(80, suggestedWidth - 10));
 
 					return def;
 				}
@@ -2723,11 +2723,11 @@ TQRect KeramikStyle::querySubControlMetrics( TQ_ComplexControl control,
 			//Shrink the metrics if the widget is too small
 			//to fit our normal values for them.
 			if (horizontal)
-				handleSize = QMIN(handleSize, ceData.rect.height());
+				handleSize = TQMIN(handleSize, ceData.rect.height());
 			else
-				handleSize = QMIN(handleSize, ceData.rect.width());
+				handleSize = TQMIN(handleSize, ceData.rect.width());
 
-			size = QMIN(size, handleSize);
+			size = TQMIN(size, handleSize);
 
 			switch ( subcontrol )
 			{
@@ -2984,7 +2984,7 @@ int KeramikStyle::styleHint(StyleHint sh, const TQStyleControlElementData &ceDat
 				bool checkable = (elementFlags & CEF_IsCheckable);
 
 				if ( checkable )
-					checkcol = QMAX( checkcol, 20 );
+					checkcol = TQMAX( checkcol, 20 );
 			
 				ret = checkcol;
 			}
diff --git a/tdestyles/klegacy/klegacystyle.cpp b/tdestyles/klegacy/klegacystyle.cpp
index a169de874..162719955 100644
--- a/tdestyles/klegacy/klegacystyle.cpp
+++ b/tdestyles/klegacy/klegacystyle.cpp
@@ -2414,7 +2414,7 @@ void KLegacyStyle::drawPopupMenuItem(TQPainter *p, bool checkable, int maxpmw, i
     TQColorGroup itemg = (! enabled) ? pal.disabled() : pal.active();
 
     if (checkable)
-	maxpmw = QMAX(maxpmw, 15);
+	maxpmw = TQMAX(maxpmw, 15);
 
     int checkcol = maxpmw;
 
diff --git a/tdestyles/kthemestyle/kthemestyle.cpp b/tdestyles/kthemestyle/kthemestyle.cpp
index 27f9ca325..f09482ccc 100644
--- a/tdestyles/kthemestyle/kthemestyle.cpp
+++ b/tdestyles/kthemestyle/kthemestyle.cpp
@@ -277,13 +277,13 @@ TQSize KThemeStyle::sizeFromContents( ContentsType contents,
                 else
                 {
                     if ( mi->pixmap() )
-                        h = QMAX( h, mi->pixmap() ->height() + 2 * itemFrame );
+                        h = TQMAX( h, mi->pixmap() ->height() + 2 * itemFrame );
                     else
-                        h = QMAX( h, popup->fontMetrics().height()
+                        h = TQMAX( h, popup->fontMetrics().height()
                                   + 2 * itemVMargin + 2 * itemFrame );
 
                     if ( mi->iconSet() )
-                        h = QMAX( h, mi->iconSet() ->pixmap(
+                        h = TQMAX( h, mi->iconSet() ->pixmap(
                                       TQIconSet::Small, TQIconSet::Normal ).height() +
                                   2 * itemFrame );
                 }
@@ -1512,7 +1512,7 @@ void KThemeStyle::drawControl( ControlElement element,
 
 
                 if ( checkable )
-                    checkcol = QMAX( checkcol, 20 );
+                    checkcol = TQMAX( checkcol, 20 );
 
                 // Are we a menu item separator?
                 if ( separator )
@@ -1753,7 +1753,7 @@ void KThemeStyle::drawControl( ControlElement element,
                 if (progress > 0 || steps == 0)
                 {
                         double pg = (steps == 0) ? 0.1 : progress / steps;
-                        int width = QMIN(cr.width(), (int)(pg * cr.width()));
+                        int width = TQMIN(cr.width(), (int)(pg * cr.width()));
                         if (steps == 0)
                         { //Busy indicator
 
@@ -2274,7 +2274,7 @@ int KThemeStyle::styleHint( StyleHint sh, const TQStyleControlElementData &ceDat
             bool checkable = (elementFlags & CEF_IsCheckable);
 
             if ( checkable )
-                    checkcol = QMAX( checkcol, 20 );
+                    checkcol = TQMAX( checkcol, 20 );
 
             return checkcol;
             break;
@@ -2432,7 +2432,7 @@ int KThemeStyle::popupMenuItemHeight( bool /*checkable*/, TQMenuItem *mi,
                                       const TQFontMetrics &fm )
 {
     int h2, h = 0;
-    int offset = QMAX( decoWidth( MenuItemDown ), decoWidth( MenuItem ) ) + 4;
+    int offset = TQMAX( decoWidth( MenuItemDown ), decoWidth( MenuItem ) ) + 4;
 
     if ( mi->isSeparator() )
         return ( 2 );
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;
 	}
diff --git a/tdestyles/plastik/plastik.cpp b/tdestyles/plastik/plastik.cpp
index e7b6acd7f..8a4c92a38 100644
--- a/tdestyles/plastik/plastik.cpp
+++ b/tdestyles/plastik/plastik.cpp
@@ -1544,7 +1544,7 @@ void PlastikStyle::drawPrimitive(TQ_PrimitiveElement pe,
         case PE_SpinWidgetMinus: {
             p->setPen( cg.buttonText() );
 
-            int l = QMIN( w-2, h-2 );
+            int l = TQMIN( w-2, h-2 );
             // make the length even so that we get a nice symmetric plus...
             if(l%2 != 0)
                 --l;
@@ -2527,7 +2527,7 @@ void PlastikStyle::drawControl(TQ_ControlElement element,
             bool etchtext   = styleHint( SH_EtchDisabledText, ceData, elementFlags );
             bool reverse    = TQApplication::reverseLayout();
             if ( checkable )
-                checkcol = QMAX( checkcol, 20 );
+                checkcol = TQMAX( checkcol, 20 );
 
             // Draw the menu item background
             if (active) {
@@ -3228,9 +3228,9 @@ TQRect PlastikStyle::querySubControlMetrics(TQ_ComplexControl control,
 
             TQSize bs;
             if(heightDividable) {
-                bs.setHeight(QMAX(8, (r.height()-2)/2));
+                bs.setHeight(TQMAX(8, (r.height()-2)/2));
             } else {
-                bs.setHeight(QMAX(8, (r.height()-2-1)/2));
+                bs.setHeight(TQMAX(8, (r.height()-2-1)/2));
             }
             bs.setWidth(15);
 
@@ -3408,14 +3408,14 @@ TQSize PlastikStyle::sizeFromContents(ContentsType t,
                 h = 2;
             } else {
                 if (mi->pixmap()) {
-                    h = QMAX(h, mi->pixmap()->height() + 2);
+                    h = TQMAX(h, mi->pixmap()->height() + 2);
                 } else {
-                    h = QMAX(h, 16 + 2 );
-                    h = QMAX(h, popup->fontMetrics().height() + 4 );
+                    h = TQMAX(h, 16 + 2 );
+                    h = TQMAX(h, popup->fontMetrics().height() + 4 );
                 }
 
                 if (mi->iconSet()) {
-                    h = QMAX(h, mi->iconSet()->pixmap(TQIconSet::Small, TQIconSet::Normal).height() + 2);
+                    h = TQMAX(h, mi->iconSet()->pixmap(TQIconSet::Small, TQIconSet::Normal).height() + 2);
                 }
             }
 
@@ -3483,7 +3483,7 @@ int PlastikStyle::styleHint( TQ_StyleHint stylehint,
 		bool checkable = (elementFlags & CEF_IsCheckable);
 	
 		if ( checkable )
-                	checkcol = QMAX( checkcol, 20 );
+                	checkcol = TQMAX( checkcol, 20 );
 	
 		return checkcol;
 	}
diff --git a/tdestyles/web/webstyle.cpp b/tdestyles/web/webstyle.cpp
index b3b461954..073a46368 100644
--- a/tdestyles/web/webstyle.cpp
+++ b/tdestyles/web/webstyle.cpp
@@ -1673,16 +1673,16 @@ WebStyle::popupMenuItemHeight(bool, TQMenuItem * i, const TQFontMetrics & fm)
 
   if (0 != i->iconSet())
   {
-    h = QMAX
+    h = TQMAX
       (
        i->iconSet()->pixmap(TQIconSet::Small, TQIconSet::Normal).height(),
        h
       );
   }
 
-  h = QMAX(fm.height() + 4, h);
+  h = TQMAX(fm.height() + 4, h);
 
-  h = QMAX(18, h);
+  h = TQMAX(18, h);
 
   return h;