Fix remnant QMIN/QMAX to TQMIN/TQMAX.

11 files changed, 26 insertions, 26 deletions

diff --git a/kicker/extensions/kasbar/kasbar.cpp b/kicker/extensions/kasbar/kasbar.cpp
index 2b7554118..87fc7c629 100644
--- a/kicker/extensions/kasbar/kasbar.cpp
+++ b/kicker/extensions/kasbar/kasbar.cpp
@@ -299,7 +299,7 @@ void KasBar::setMaxBoxes( int count )
 
 void KasBar::setBoxesPerLine( int count )
 {
-   boxesPerLine_ = QMIN( count, maxBoxes_ );
+   boxesPerLine_ = TQMIN( count, maxBoxes_ );
    updateLayout();
 }
 
diff --git a/kicker/extensions/kasbar/kasloaditem.cpp b/kicker/extensions/kasbar/kasloaditem.cpp
index 95cdfb81f..6169d09b1 100644
--- a/kicker/extensions/kasbar/kasloaditem.cpp
+++ b/kicker/extensions/kasbar/kasloaditem.cpp
@@ -70,7 +70,7 @@ void KasLoadItem::paint( TQPainter *p )
 {
     double val = valuesOne.last();
     double maxValue = 1.0;
-    double scaleVal = QMAX( val, valuesFive.last() );
+    double scaleVal = TQMAX( val, valuesFive.last() );
 
     if ( scaleVal >= maxValue )
 	maxValue = 2.0;
diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp
index 6e9bfbfeb..721df418e 100644
--- a/kicker/kicker/core/container_extension.cpp
+++ b/kicker/kicker/core/container_extension.cpp
@@ -1797,7 +1797,7 @@ TQSize ExtensionContainer::initialSize(KPanelExtension::Position p, TQRect workA
 
         if (m_settings.expandSize())
         {
-            height = QMAX(height, hint.height());
+            height = TQMAX(height, hint.height());
         }
     }
     else
@@ -1807,7 +1807,7 @@ TQSize ExtensionContainer::initialSize(KPanelExtension::Position p, TQRect workA
 
         if (m_settings.expandSize())
         {
-            width = QMAX( width, hint.width() );
+            width = TQMAX( width, hint.width() );
         }
     }
 
diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp
index b34847dbf..5b1eb5c8c 100644
--- a/kicker/kicker/core/containerarea.cpp
+++ b/kicker/kicker/core/containerarea.cpp
@@ -1611,8 +1611,8 @@ void ContainerArea::moveDragIndicator(int pos)
         {
             int newX = pos;
             _dragIndicator->resize(_dragIndicator->preferredSize());
-            newX = QMAX(newX, availableSpace.left());
-            newX = QMIN(newX,
+            newX = TQMAX(newX, availableSpace.left());
+            newX = TQMIN(newX,
                 availableSpace.right() + 1 - _dragIndicator->width() );
             _dragIndicator->move(newX, availableSpace.top());
         }
@@ -1629,8 +1629,8 @@ void ContainerArea::moveDragIndicator(int pos)
         {
             int newY = pos;
             _dragIndicator->resize(_dragIndicator->preferredSize());
-            newY = QMAX(newY, availableSpace.top());
-            newY = QMIN(newY,
+            newY = TQMAX(newY, availableSpace.top());
+            newY = TQMIN(newY,
                 availableSpace.bottom() + 1 - _dragIndicator->height() );
             _dragIndicator->move(availableSpace.left(), newY);
         }
diff --git a/kicker/kicker/core/extensionmanager.cpp b/kicker/kicker/core/extensionmanager.cpp
index 26b792271..796b98125 100644
--- a/kicker/kicker/core/extensionmanager.cpp
+++ b/kicker/kicker/core/extensionmanager.cpp
@@ -733,22 +733,22 @@ void ExtensionManager::reduceArea(TQRect &area, const ExtensionContainer *extens
     {
         case KPanelExtension::Left:
         {
-            area.setLeft(QMAX(area.left(), geom.right()));
+            area.setLeft(TQMAX(area.left(), geom.right()));
             break;
         }
         case KPanelExtension::Right:
         {
-            area.setRight(QMIN(area.right(), geom.left()));
+            area.setRight(TQMIN(area.right(), geom.left()));
             break;
         }
         case KPanelExtension::Top:
         {
-            area.setTop(QMAX(area.top(), geom.bottom()));
+            area.setTop(TQMAX(area.top(), geom.bottom()));
             break;
         }
         case KPanelExtension::Bottom:
         {
-            area.setBottom(QMIN(area.bottom(), geom.top()));
+            area.setBottom(TQMIN(area.bottom(), geom.top()));
             break;
         }
         default: ;  // ignore KPanelExtension::Floating ... at least for now
diff --git a/kicker/kicker/ui/addapplet.cpp b/kicker/kicker/ui/addapplet.cpp
index e707b9e3f..0db6bc352 100644
--- a/kicker/kicker/ui/addapplet.cpp
+++ b/kicker/kicker/ui/addapplet.cpp
@@ -292,7 +292,7 @@ void AddAppletDialog::resizeAppletView()
         m_appletBox->layout()->activate();
         w = v->visibleWidth();
         h = m_appletBox->layout()->minimumSize().height();
-        v->resizeContents(w, QMAX(h, v->visibleHeight()));
+        v->resizeContents(w, TQMAX(h, v->visibleHeight()));
         if (w == m_appletBox->width() && h == m_appletBox->height())
         break;
         m_appletBox->resize(w, h);
diff --git a/kicker/kicker/ui/addappletvisualfeedback.cpp b/kicker/kicker/ui/addappletvisualfeedback.cpp
index 587a0f2de..62ff12675 100644
--- a/kicker/kicker/ui/addappletvisualfeedback.cpp
+++ b/kicker/kicker/ui/addappletvisualfeedback.cpp
@@ -132,7 +132,7 @@ void AddAppletVisualFeedback::displayInternal()
     }
 
     int margin = KDialog::marginHint();
-    int height = QMAX(m_icon.height(), textRect.height()) + 2 * margin;
+    int height = TQMAX(m_icon.height(), textRect.height()) + 2 * margin;
     int textX = m_icon.isNull() ? margin : 2 + m_icon.width() + 2 * margin;
     int width = textX;
 
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index af4142007..a083872fc 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -175,7 +175,7 @@ static int used_size( TQLabel *label, int oldsize )
 {
     TQSimpleRichText st( label->text(), TDEGlobalSettings::toolBarFont() );
     st.setWidth( oldsize );
-    return QMAX( st.widthUsed(), oldsize );
+    return TQMAX( st.widthUsed(), oldsize );
 }
 
 KMenu::KMenu()
@@ -3206,14 +3206,14 @@ void KMenu::mouseMoveEvent ( TQMouseEvent * e )
     if ( hasMouseTracking() && m_isresizing ) {
         m_stacker->setMinimumSize( TQSize(0, 0) );
         m_stacker->setMaximumSize( TQSize(32000, 32000) );
-        int newWidth = QMAX( e->x() - x(), minimumSizeHint().width() );
+        int newWidth = TQMAX( e->x() - x(), minimumSizeHint().width() );
         if ( m_orientation == BottomUp ) {
-          int newHeight = QMAX( height() - e->y(), minimumSizeHint().height() + 10 );
+          int newHeight = TQMAX( height() - e->y(), minimumSizeHint().height() + 10 );
           int newY = y() + height() - newHeight;
           setGeometry( x(), newY, newWidth, newHeight);
         }
         else {
-          setGeometry( x(), y(), newWidth, QMAX( e->y(), minimumSizeHint().height() + 10 ));
+          setGeometry( x(), y(), newWidth, TQMAX( e->y(), minimumSizeHint().height() + 10 ));
         }
     }
 }
@@ -3392,9 +3392,9 @@ TQSize KMenu::minimumSizeHint() const
 {
     TQSize minsize;
     minsize.setWidth( minsize.width() + m_tabBar->minimumSizeHint().width()  );
-    minsize.setWidth( QMAX( minsize.width(),
+    minsize.setWidth( TQMAX( minsize.width(),
                             m_search->minimumSize().width() ) );
-    minsize.setWidth( QMAX( minsize.width(),
+    minsize.setWidth( TQMAX( minsize.width(),
                             m_search->minimumSize().width() ) );
 
     minsize.setHeight( minsize.height() +
diff --git a/kicker/kicker/ui/kickoff_bar.cpp b/kicker/kicker/ui/kickoff_bar.cpp
index 994300c0d..e6e66b441 100644
--- a/kicker/kicker/ui/kickoff_bar.cpp
+++ b/kicker/kicker/ui/kickoff_bar.cpp
@@ -171,10 +171,10 @@ TQSize KickoffTabBar::minimumSizeHint() const
         }
 
         // Final width for this tab
-        int w = QMAX(iw, fw) + hframe;
+        int w = TQMAX(iw, fw) + hframe;
 
-        mw = QMAX(mw, w);
-        mh = QMAX(mh, h);
+        mw = TQMAX(mw, w);
+        mh = TQMAX(mh, h);
     }
 
     s.setWidth(mw * count());
@@ -196,7 +196,7 @@ void KickoffTabBar::layoutTabs()
     for (int t = 0; t < count(); ++t) {
         TQTab* tab = tabAt(TQApplication::reverseLayout() ? count() - t - 1 : t);
 
-        int w = QMAX(st.width() / count(), parentWidget()->width() / count());
+        int w = TQMAX(st.width() / count(), parentWidget()->width() / count());
 
         TQRect r = tab->rect();
         tab->setRect(TQRect(TQPoint(x, 0), style().tqsizeFromContents(TQStyle::CT_TabBarTab, this,
diff --git a/kicker/libkicker/kickertip.cpp b/kicker/libkicker/kickertip.cpp
index 351b59084..0a6000f37 100644
--- a/kicker/libkicker/kickertip.cpp
+++ b/kicker/libkicker/kickertip.cpp
@@ -356,7 +356,7 @@ void KickerTip::displayInternal()
     }
 
     int margin = KDialog::marginHint();
-    int height = QMAX(m_icon.height(), textRect.height()) + 2 * margin;
+    int height = TQMAX(m_icon.height(), textRect.height()) + 2 * margin;
     int textX = m_icon.isNull() ? margin : 2 + m_icon.width() + 2 * margin;
     int width = textX + textRect.width() + margin;
     int textY = (height - textRect.height()) / 2;
diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp
index 0bd13ac7b..aaac124c2 100644
--- a/kicker/libkicker/panelbutton.cpp
+++ b/kicker/libkicker/panelbutton.cpp
@@ -292,7 +292,7 @@ int PanelButton::preferredDimension(int panelDim) const
         int newSize = preferredIconSize(panelDim);
         if (newSize > 0)
         {
-            return QMIN(panelDim, newSize + (KDialog::spacingHint() * 2));
+            return TQMIN(panelDim, newSize + (KDialog::spacingHint() * 2));
         }
     }