Fix remnant QMIN/QMAX to TQMIN/TQMAX.

59 files changed, 177 insertions, 177 deletions

diff --git a/kate/app/katefilelist.cpp b/kate/app/katefilelist.cpp
index 05763e988..98857b3c3 100644
--- a/kate/app/katefilelist.cpp
+++ b/kate/app/katefilelist.cpp
@@ -588,7 +588,7 @@ void KateFileListItem::paintCell( TQPainter *painter, const TQColorGroup & cg, i
         int v = hc-m_viewhistpos;
         int e = ec-m_edithistpos+1;
         e = e*e;
-        int n = QMAX(v + e, 1);
+        int n = TQMAX(v + e, 1);
         shade.setRgb(
             ((shade.red()*v) + (eshade.red()*e))/n,
             ((shade.green()*v) + (eshade.green()*e))/n,
diff --git a/kate/app/katefileselector.cpp b/kate/app/katefileselector.cpp
index 06cd0c3c3..c4b107912 100644
--- a/kate/app/katefileselector.cpp
+++ b/kate/app/katefileselector.cpp
@@ -488,7 +488,7 @@ bool KateFileSelector::eventFilter( TQObject* o, TQEvent *e )
   TQListBox *lb = cmbPath->listBox();
   if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(lb) && e->type() == TQEvent::Show ) {
     int add = lb->height() < lb->contentsHeight() ? lb->verticalScrollBar()->width() : 0;
-    int w = QMIN( mainwin->width(), lb->contentsWidth() + add );
+    int w = TQMIN( mainwin->width(), lb->contentsWidth() + add );
     lb->resize( w, lb->height() );
     // TODO - move the listbox to a suitable place if nessecary
     // TODO - decide if it is worth caching the size while untill the contents
diff --git a/kcontrol/background/bgmonitor.cpp b/kcontrol/background/bgmonitor.cpp
index b9283360a..c05e70e5f 100644
--- a/kcontrol/background/bgmonitor.cpp
+++ b/kcontrol/background/bgmonitor.cpp
@@ -100,7 +100,7 @@ void BGMonitorArrangement::updateArrangement()
     
     TQRect expandedOverallGeometry = expandToPreview(overallGeometry);
     
-    double scale = QMIN(
+    double scale = TQMIN(
                 double(width()) / double(expandedOverallGeometry.width()),
                 double(height()) / double(expandedOverallGeometry.height())
                        );
diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp
index 08cb3055f..f6db68f70 100644
--- a/kcontrol/background/bgrender.cpp
+++ b/kcontrol/background/bgrender.cpp
@@ -218,8 +218,8 @@ int KBackgroundRenderer::doBackground(bool quit)
 	int w = m_Background.width();
 	int h = m_Background.height();
 	if ((w > m_Size.width()) || (h > m_Size.height())) {
-	    w = QMIN(w, m_Size.width());
-	    h = QMIN(h, m_Size.height());
+	    w = TQMIN(w, m_Size.width());
+	    h = TQMIN(h, m_Size.height());
 	    m_Background = m_Background.copy(0, 0, w, h);
 	}
 	KImageEffect::flatten(m_Background, colorA(), colorB(), 0);
@@ -645,7 +645,7 @@ void KBackgroundRenderer::fullWallpaperBlend()
         for (int y = m_WallpaperRect.top(); y < m_WallpaperRect.bottom(); y += wh) {
 	    for (int x = m_WallpaperRect.left(); x < m_WallpaperRect.right(); x += ww) {
 		blend(m_Image, TQRect(x, y, ww, wh), m_Wallpaper,
-			TQPoint(-QMIN(x, 0), -QMIN(y, 0)), blendFactor);
+			TQPoint(-TQMIN(x, 0), -TQMIN(y, 0)), blendFactor);
 	    }
 	}
     }
diff --git a/kcontrol/background/bgwallpaper.cpp b/kcontrol/background/bgwallpaper.cpp
index 460c9c56c..5e43caa4d 100644
--- a/kcontrol/background/bgwallpaper.cpp
+++ b/kcontrol/background/bgwallpaper.cpp
@@ -107,7 +107,7 @@ BGMultiWallpaperDialog::BGMultiWallpaperDialog(KBackgroundSettings *settings,
    dlg->m_spinInterval->setSuffix(i18n(" min"));
 
    // Load
-   dlg->m_spinInterval->setValue(QMAX(1,m_pSettings->wallpaperChangeInterval()));
+   dlg->m_spinInterval->setValue(TQMAX(1,m_pSettings->wallpaperChangeInterval()));
 
    dlg->m_listImages->insertStringList(m_pSettings->wallpaperList());
 
diff --git a/kcontrol/clock/dtime.cpp b/kcontrol/clock/dtime.cpp
index d469b1ff9..a492c9deb 100644
--- a/kcontrol/clock/dtime.cpp
+++ b/kcontrol/clock/dtime.cpp
@@ -381,7 +381,7 @@ void Kclock::paintEvent( TQPaintEvent * )
 
   TQPointArray pts;
   TQPoint cp = rect().center();
-  int d = QMIN(width(),height());
+  int d = TQMIN(width(),height());
   TQColor hands =  colorGroup().dark();
   TQColor shadow =  colorGroup().text();
   paint.setPen( shadow );
diff --git a/kcontrol/joystick/joywidget.cpp b/kcontrol/joystick/joywidget.cpp
index 8e1ff5586..67ea30eeb 100644
--- a/kcontrol/joystick/joywidget.cpp
+++ b/kcontrol/joystick/joywidget.cpp
@@ -87,7 +87,7 @@ JoyWidget::JoyWidget(TQWidget *parent, const char *name)
 
   // calculate the column width we need
   TQFontMetrics fm(font());
-  int colWidth = QMAX(fm.width(PRESSED), fm.width("-32767")) + 10;  // -32767 largest string
+  int colWidth = TQMAX(fm.width(PRESSED), fm.width("-32767")) + 10;  // -32767 largest string
 
   new TQLabel(i18n("Buttons:"), vboxMid);
   buttonTbl = new TQTable(0, 1, vboxMid);
@@ -282,7 +282,7 @@ void JoyWidget::showDeviceProps(JoyDevice *joy)
   idle->start(0);
 
   // make both tables use the same space for header; this looks nicer
-  buttonTbl->setLeftMargin(QMAX(buttonTbl->verticalHeader()->width(),
+  buttonTbl->setLeftMargin(TQMAX(buttonTbl->verticalHeader()->width(),
                                   axesTbl->verticalHeader()->width()));
   axesTbl->setLeftMargin(buttonTbl->verticalHeader()->width());
 }
diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp
index 17b8ae8e0..21824d2bf 100644
--- a/kcontrol/kcontrol/main.cpp
+++ b/kcontrol/kcontrol/main.cpp
@@ -78,9 +78,9 @@ KControlApp::KControlApp()
   if (fontSize == 0)
     fontSize = (toplevel->fontInfo().pixelSize() * 72) / pdm.logicalDpiX();
   int x = config->readNumEntry(TQString::fromLatin1("InitialWidth %1").arg(desk.width()), 
-			       QMIN( desk.width(), 368 + (6*pdm.logicalDpiX()*fontSize)/12 ) );
+			       TQMIN( desk.width(), 368 + (6*pdm.logicalDpiX()*fontSize)/12 ) );
   int y = config->readNumEntry(TQString::fromLatin1("InitialHeight %1").arg(desk.height()), 
-			       QMIN( desk.height(), 312 + (4*pdm.logicalDpiX()*fontSize)/12 ) );
+			       TQMIN( desk.height(), 312 + (4*pdm.logicalDpiX()*fontSize)/12 ) );
   toplevel->resize(x,y);
 }
 
diff --git a/kcontrol/kcontrol/moduletreeview.cpp b/kcontrol/kcontrol/moduletreeview.cpp
index 501d69349..fd0bda8aa 100644
--- a/kcontrol/kcontrol/moduletreeview.cpp
+++ b/kcontrol/kcontrol/moduletreeview.cpp
@@ -166,7 +166,7 @@ void ModuleTreeView::expandItem(TQListViewItem *item, TQPtrList<TQListViewItem>
 {
   while (item)
     {
-      setOpen(item, parentList-.contains(item));
+      setOpen(item, parentList->contains(item));
 
           if (item->childCount() != 0)
                 expandItem(item->firstChild(), parentList);
diff --git a/kcontrol/tdeio/ksaveioconfig.cpp b/kcontrol/tdeio/ksaveioconfig.cpp
index 8ab676ada..2e1942f72 100644
--- a/kcontrol/tdeio/ksaveioconfig.cpp
+++ b/kcontrol/tdeio/ksaveioconfig.cpp
@@ -83,7 +83,7 @@ void KSaveIOConfig::setReadTimeout( int _timeout )
 {
   TDEConfig* cfg = config ();
   cfg->setGroup( TQString() );
-  cfg->writeEntry("ReadTimeout", QMAX(MIN_TIMEOUT_VALUE,_timeout));
+  cfg->writeEntry("ReadTimeout", TQMAX(MIN_TIMEOUT_VALUE,_timeout));
   cfg->sync();
 }
 
@@ -91,7 +91,7 @@ void KSaveIOConfig::setConnectTimeout( int _timeout )
 {
   TDEConfig* cfg = config ();
   cfg->setGroup( TQString() );
-  cfg->writeEntry("ConnectTimeout", QMAX(MIN_TIMEOUT_VALUE,_timeout));
+  cfg->writeEntry("ConnectTimeout", TQMAX(MIN_TIMEOUT_VALUE,_timeout));
   cfg->sync();
 }
 
@@ -99,7 +99,7 @@ void KSaveIOConfig::setProxyConnectTimeout( int _timeout )
 {
   TDEConfig* cfg = config ();
   cfg->setGroup( TQString() );
-  cfg->writeEntry("ProxyConnectTimeout", QMAX(MIN_TIMEOUT_VALUE,_timeout));
+  cfg->writeEntry("ProxyConnectTimeout", TQMAX(MIN_TIMEOUT_VALUE,_timeout));
   cfg->sync();
 }
 
@@ -107,7 +107,7 @@ void KSaveIOConfig::setResponseTimeout( int _timeout )
 {
   TDEConfig* cfg = config ();
   cfg->setGroup( TQString() );
-  cfg->writeEntry("ResponseTimeout", QMAX(MIN_TIMEOUT_VALUE,_timeout));
+  cfg->writeEntry("ResponseTimeout", TQMAX(MIN_TIMEOUT_VALUE,_timeout));
   cfg->sync();
 }
 
diff --git a/kdebugdialog/kabstractdebugdialog.cpp b/kdebugdialog/kabstractdebugdialog.cpp
index 9d01e6689..10c0c2a00 100644
--- a/kdebugdialog/kabstractdebugdialog.cpp
+++ b/kdebugdialog/kabstractdebugdialog.cpp
@@ -55,9 +55,9 @@ void KAbstractDebugDialog::buildButtons( TQVBoxLayout * topLayout )
   int w1 = pHelpButton->sizeHint().width();
   int w2 = pOKButton->sizeHint().width();
   int w3 = pCancelButton->sizeHint().width();
-  int w4 = QMAX( w1, QMAX( w2, w3 ) );
+  int w4 = TQMAX( w1, TQMAX( w2, w3 ) );
   int w5 = pApplyButton->sizeHint().width();
-  w4 = QMAX(w4, w5);
+  w4 = TQMAX(w4, w5);
 
   pHelpButton->setFixedWidth( w4 );
   pOKButton->setFixedWidth( w4 );
diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc
index 593290d86..f757d70b9 100644
--- a/kdesktop/kdiconview.cc
+++ b/kdesktop/kdiconview.cc
@@ -494,7 +494,7 @@ void KDIconView::setAutoAlign( bool b )
     if ( b ) {
         // set maxItemWidth to ensure sane initial icon layout before the auto align code is fully activated
         int sz = iconSize() ? iconSize() : TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop );
-        setMaxItemWidth( QMAX( QMAX( sz, previewIconSize( iconSize() ) ), KonqFMSettings::settings()->iconTextWidth() ) );
+        setMaxItemWidth( TQMAX( TQMAX( sz, previewIconSize( iconSize() ) ), KonqFMSettings::settings()->iconTextWidth() ) );
         setFont( font() );  // Force calcRect()
 
         if (!KRootWm::self()->startup) {
@@ -509,7 +509,7 @@ void KDIconView::setAutoAlign( bool b )
     else {
         // change maxItemWidth, because when grid-align was active, it changed this for the grid
         int sz = iconSize() ? iconSize() : TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop );
-        setMaxItemWidth( QMAX( QMAX( sz, previewIconSize( iconSize() ) ), KonqFMSettings::settings()->iconTextWidth() ) );
+        setMaxItemWidth( TQMAX( TQMAX( sz, previewIconSize( iconSize() ) ), KonqFMSettings::settings()->iconTextWidth() ) );
         setFont( font() );  // Force calcRect()
 
         disconnect( this, TQT_SIGNAL( iconMoved() ),
@@ -2001,8 +2001,8 @@ TQPoint KDIconView::findPlaceForIcon( int column, int row, const TQRect &current
     int dx = gridXValue(), dy = 0;
     TQIconViewItem *item = firstItem();
     for ( ; item; item = item->nextItem() ) {
-        dx = QMAX( dx, item->width() );
-        dy = QMAX( dy, item->height() );
+        dx = TQMAX( dx, item->width() );
+        dy = TQMAX( dy, item->height() );
     }
 
     dx += spacing();
@@ -2016,7 +2016,7 @@ TQPoint KDIconView::findPlaceForIcon( int column, int row, const TQRect &current
             delta++;
             res = findPlaceForIconCol(column + (delta / 2) * (-2 * (delta % 2) + 1),
                                       dx, dy, currentIconArea);
-            if (delta / 2 > QMAX(max_cols - column, column))
+            if (delta / 2 > TQMAX(max_cols - column, column))
                 return res;
         } while (res.isNull());
         return res;
@@ -2030,7 +2030,7 @@ TQPoint KDIconView::findPlaceForIcon( int column, int row, const TQRect &current
             delta++;
             res = findPlaceForIconRow(row + (delta / 2) * (-2 * (delta % 2) + 1),
                                       dx, dy, currentIconArea);
-            if (delta / 2 > QMAX(max_rows - row, row))
+            if (delta / 2 > TQMAX(max_rows - row, row))
                 return res;
         } while (res.isNull());
         return res;
diff --git a/kfind/kfwin.cpp b/kfind/kfwin.cpp
index 7364aeb73..3eb10e1b4 100644
--- a/kfind/kfwin.cpp
+++ b/kfind/kfwin.cpp
@@ -370,20 +370,20 @@ void KfindWindow::resetColumns(bool init)
    TQFontMetrics fm = fontMetrics();
   if (init)
   {
-    setColumnWidth(2, QMAX(fm.width(columnText(2)), fm.width("0000000")) + 15);
+    setColumnWidth(2, TQMAX(fm.width(columnText(2)), fm.width("0000000")) + 15);
     TQString sampleDate =
       TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime());
-    setColumnWidth(3, QMAX(fm.width(columnText(3)), fm.width(sampleDate)) + 15);
-    setColumnWidth(4, QMAX(fm.width(columnText(4)), fm.width(i18n(perm[RO]))) + 15);
-    setColumnWidth(5, QMAX(fm.width(columnText(5)), fm.width("some text")) + 15);
+    setColumnWidth(3, TQMAX(fm.width(columnText(3)), fm.width(sampleDate)) + 15);
+    setColumnWidth(4, TQMAX(fm.width(columnText(4)), fm.width(i18n(perm[RO]))) + 15);
+    setColumnWidth(5, TQMAX(fm.width(columnText(5)), fm.width("some text")) + 15);
   }
 
   int free_space = visibleWidth() -
     columnWidth(2) - columnWidth(3) - columnWidth(4) - columnWidth(5);
 
-//  int name_w = QMIN((int)(free_space*0.5), 150);
+//  int name_w = TQMIN((int)(free_space*0.5), 150);
 //  int dir_w = free_space - name_w;
-  int name_w = QMAX((int)(free_space*0.5), fm.width("some long filename"));
+  int name_w = TQMAX((int)(free_space*0.5), fm.width("some long filename"));
   int dir_w = name_w;
 
   setColumnWidth(0, name_w);
diff --git a/khotkeys/shared/voicesignature.cpp b/khotkeys/shared/voicesignature.cpp
index c5d6efb53..4a1e12880 100644
--- a/khotkeys/shared/voicesignature.cpp
+++ b/khotkeys/shared/voicesignature.cpp
@@ -374,7 +374,7 @@ float VoiceSignature::diff(const VoiceSignature &s1, const VoiceSignature &s2)
 			d+= d1*d1;//*pond[x][y];
 		}
 		d=sqrt(d);
-		g[i][j]=QMIN(QMIN( g[i-1][j]+d, g[i][j-1]+d )  ,  g[i-1][j-1]+d+d  );
+		g[i][j]=TQMIN(TQMIN( g[i-1][j]+d, g[i][j-1]+d )  ,  g[i-1][j-1]+d+d  );
 	}
 
 	return g[I][J]/(I+J);	
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));
         }
     }
 
diff --git a/klipper/popupproxy.cpp b/klipper/popupproxy.cpp
index 4811e8f98..1c427834a 100644
--- a/klipper/popupproxy.cpp
+++ b/klipper/popupproxy.cpp
@@ -135,7 +135,7 @@ int PopupProxy::insertFromSpill( int index ) {
     int count = 0;
     int remainingHeight = m_menu_height - proxy_for_menu->sizeHint().height();
     // Force at least one item to be inserted.
-    remainingHeight = QMAX( remainingHeight, 0 );
+    remainingHeight = TQMAX( remainingHeight, 0 );
     for ( const HistoryItem* item = spillPointer.current();
           item && remainingHeight >= 0;
           nextItemNumber++, item = ++spillPointer )
diff --git a/kmenuedit/menufile.cpp b/kmenuedit/menufile.cpp
index 1109d6b7a..2322cc31d 100644
--- a/kmenuedit/menufile.cpp
+++ b/kmenuedit/menufile.cpp
@@ -399,7 +399,7 @@ void MenuFile::moveMenu(const TQString &oldMenu, const TQString &newMenu)
    TQStringList oldMenuParts = TQStringList::split('/', oldMenu);
    TQStringList newMenuParts = TQStringList::split('/', newMenu);
    TQString commonMenuName;
-   uint max = QMIN(oldMenuParts.count(), newMenuParts.count());
+   uint max = TQMIN(oldMenuParts.count(), newMenuParts.count());
    uint i = 0;
    for(; i < max; i++)
    {
diff --git a/konqueror/konq_combo.cc b/konqueror/konq_combo.cc
index e1bd27173..17075a529 100644
--- a/konqueror/konq_combo.cc
+++ b/konqueror/konq_combo.cc
@@ -749,15 +749,15 @@ int KonqComboListBoxPixmap::height( const TQListBox* lb ) const
     if ( text().isEmpty() )
         h = pm.height();
     else
-        h = QMAX( pm.height(), lb->fontMetrics().lineSpacing() + 2 );
-    return QMAX( h, TQApplication::globalStrut().height() );
+        h = TQMAX( pm.height(), lb->fontMetrics().lineSpacing() + 2 );
+    return TQMAX( h, TQApplication::globalStrut().height() );
 }
 
 int KonqComboListBoxPixmap::width( const TQListBox* lb ) const
 {
     if ( text().isEmpty() )
-        return QMAX( pm.width() + 6, TQApplication::globalStrut().width() );
-    return QMAX( pm.width() + lb->fontMetrics().width( text() ) + 6,
+        return TQMAX( pm.width() + 6, TQApplication::globalStrut().width() );
+    return TQMAX( pm.width() + lb->fontMetrics().width( text() ) + 6,
                  TQApplication::globalStrut().width() );
 }
 
diff --git a/konsole/konsole/TEScreen.cpp b/konsole/konsole/TEScreen.cpp
index 2c6f9f42d..9bd62ff4d 100644
--- a/konsole/konsole/TEScreen.cpp
+++ b/konsole/konsole/TEScreen.cpp
@@ -141,8 +141,8 @@ void TEScreen::cursorUp(int n)
 {
   if (n == 0) n = 1; // Default
   int stop = cuY < tmargin ? 0 : tmargin;
-  cuX = QMIN(columns-1,cuX); // nowrap!
-  cuY = QMAX(stop,cuY-n);
+  cuX = TQMIN(columns-1,cuX); // nowrap!
+  cuY = TQMAX(stop,cuY-n);
 }
 
 /*!
@@ -156,8 +156,8 @@ void TEScreen::cursorDown(int n)
 {
   if (n == 0) n = 1; // Default
   int stop = cuY > bmargin ? lines-1 : bmargin;
-  cuX = QMIN(columns-1,cuX); // nowrap!
-  cuY = QMIN(stop,cuY+n);
+  cuX = TQMIN(columns-1,cuX); // nowrap!
+  cuY = TQMIN(stop,cuY+n);
 }
 
 /*!
@@ -170,8 +170,8 @@ void TEScreen::cursorLeft(int n)
 //=CUB
 {
   if (n == 0) n = 1; // Default
-  cuX = QMIN(columns-1,cuX); // nowrap!
-  cuX = QMAX(0,cuX-n);
+  cuX = TQMIN(columns-1,cuX); // nowrap!
+  cuX = TQMAX(0,cuX-n);
 }
 
 /*!
@@ -184,7 +184,7 @@ void TEScreen::cursorRight(int n)
 //=CUF
 {
   if (n == 0) n = 1; // Default
-  cuX = QMIN(columns-1,cuX+n);
+  cuX = TQMIN(columns-1,cuX+n);
 }
 
 /*!
@@ -268,7 +268,7 @@ void TEScreen::NextLine()
 void TEScreen::eraseChars(int n)
 {
   if (n == 0) n = 1; // Default
-  int p = QMAX(0,QMIN(cuX+n-1,columns-1));
+  int p = TQMAX(0,TQMIN(cuX+n-1,columns-1));
   clearImage(loc(cuX,cuY),loc(p,cuY),' ');
 }
 
@@ -281,7 +281,7 @@ void TEScreen::deleteChars(int n)
 {
   if (n == 0) n = 1; // Default
   if (n > columns) n = columns - 1;
-  int p = QMAX(0,QMIN(cuX+n,columns-1));
+  int p = TQMAX(0,TQMIN(cuX+n,columns-1));
   moveImage(loc(cuX,cuY),loc(p,cuY),loc(columns-1,cuY));
   clearImage(loc(columns-n,cuY),loc(columns-1,cuY),' ');
 }
@@ -294,8 +294,8 @@ void TEScreen::deleteChars(int n)
 void TEScreen::insertChars(int n)
 {
   if (n == 0) n = 1; // Default
-  int p = QMAX(0,QMIN(columns-1-n,columns-1));
-  int q = QMAX(0,QMIN(cuX+n,columns-1));
+  int p = TQMAX(0,TQMIN(columns-1-n,columns-1));
+  int q = TQMAX(0,TQMIN(cuX+n,columns-1));
   moveImage(loc(q,cuY),loc(cuX,cuY),loc(p,cuY));
   clearImage(loc(cuX,cuY),loc(q-1,cuY),' ');
 }
@@ -382,8 +382,8 @@ void TEScreen::saveCursor()
 
 void TEScreen::restoreCursor()
 {
-  cuX     = QMIN(sa_cuX,columns-1);
-  cuY     = QMIN(sa_cuY,lines-1);
+  cuX     = TQMIN(sa_cuX,columns-1);
+  cuY     = TQMIN(sa_cuY,lines-1);
   cu_re   = sa_cu_re;
   cu_fg   = sa_cu_fg;
   cu_bg   = sa_cu_bg;
@@ -436,8 +436,8 @@ void TEScreen::resizeImage(int new_lines, int new_columns)
     }
     newwrapped[y]=false;
   }
-  int cpy_lines   = QMIN(new_lines,  lines);
-  int cpy_columns = QMIN(new_columns,columns);
+  int cpy_lines   = TQMIN(new_lines,  lines);
+  int cpy_columns = TQMIN(new_columns,columns);
   // copy to new image
   for (int y = 0; y < cpy_lines; y++) {
     for (int x = 0; x < cpy_columns; x++)
@@ -454,8 +454,8 @@ void TEScreen::resizeImage(int new_lines, int new_columns)
   line_wrapped = newwrapped;
   lines = new_lines;
   columns = new_columns;
-  cuX = QMIN(cuX,columns-1);
-  cuY = QMIN(cuY,lines-1);
+  cuX = TQMIN(cuX,columns-1);
+  cuY = TQMIN(cuY,lines-1);
 
   // FIXME: try to keep values, evtl.
   tmargin=0;
@@ -546,7 +546,7 @@ ca* TEScreen::getCookedImage()
 //  kdDebug(1211) << "InGetCookedImage" << endl;
   for (y = 0; (y < lines) && (y < (hist->getLines()-histCursor)); y++)
   {
-    int len = QMIN(columns,hist->getLineLen(y+histCursor));
+    int len = TQMIN(columns,hist->getLineLen(y+histCursor));
     int yp  = y*columns;
 
 //    kdDebug(1211) << "InGetCookedImage - In first For.  Y =" << y << "histCursor = " << histCursor << endl;
@@ -648,7 +648,7 @@ void TEScreen::clear()
 
 void TEScreen::BackSpace()
 {
-  cuX = QMAX(0,cuX-1);
+  cuX = TQMAX(0,cuX-1);
   if (BS_CLEARS) image[loc(cuX,cuY)].c = ' ';
 }
 
@@ -841,7 +841,7 @@ void TEScreen::setCursorX(int x)
 {
   if (x == 0) x = 1; // Default
   x -= 1; // Adjust
-  cuX = QMAX(0,QMIN(columns-1, x));
+  cuX = TQMAX(0,TQMIN(columns-1, x));
 }
 
 /*! Set the cursor to y-th line. */
@@ -850,7 +850,7 @@ void TEScreen::setCursorY(int y)
 {
   if (y == 0) y = 1; // Default
   y -= 1; // Adjust
-  cuY = QMAX(0,QMIN(lines  -1, y + (getMode(MODE_Origin) ? tmargin : 0) ));
+  cuY = TQMAX(0,TQMIN(lines  -1, y + (getMode(MODE_Origin) ? tmargin : 0) ));
 }
 
 /*! set cursor to the `left upper' corner of the screen (1,1).
diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp
index 927f9ff4a..75545a1e0 100644
--- a/konsole/konsole/TEWidget.cpp
+++ b/konsole/konsole/TEWidget.cpp
@@ -642,10 +642,10 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect,
           TQ_UINT8 dalpha = 255 - salpha;
 
           int a, r, g, b;
-          a = QMIN( (tqAlpha (col) * salpha) / 255 + (tqAlpha (blend_color) * dalpha) / 255, 255 );
-          r = QMIN( (tqRed   (col) * salpha) / 255 + (tqRed   (blend_color) * dalpha) / 255, 255 );
-          g = QMIN( (tqGreen (col) * salpha) / 255 + (tqGreen (blend_color) * dalpha) / 255, 255 );
-          b = QMIN( (tqBlue  (col) * salpha) / 255 + (tqBlue  (blend_color) * dalpha) / 255, 255 );
+          a = TQMIN( (tqAlpha (col) * salpha) / 255 + (tqAlpha (blend_color) * dalpha) / 255, 255 );
+          r = TQMIN( (tqRed   (col) * salpha) / 255 + (tqRed   (blend_color) * dalpha) / 255, 255 );
+          g = TQMIN( (tqGreen (col) * salpha) / 255 + (tqGreen (blend_color) * dalpha) / 255, 255 );
+          b = TQMIN( (tqBlue  (col) * salpha) / 255 + (tqBlue  (blend_color) * dalpha) / 255, 255 );
 
           col = a << 24 | r << 16 | g << 8 | b;
           int pixel = a << 24 | (r * a / 255) << 16 | (g * a / 255) << 8 | (b * a / 255);
@@ -1211,8 +1211,8 @@ void TEWidget::updateImageSize()
   int oldcol = columns;
   makeImage();
   // we copy the old image to reduce flicker
-  int lins = QMIN(oldlin,lines);
-  int cols = QMIN(oldcol,columns);
+  int lins = TQMIN(oldlin,lines);
+  int cols = TQMIN(oldcol,columns);
   if (oldimg)
   {
     for (int lin = 0; lin < lins; lin++)
diff --git a/konsole/konsole/TEmuVt102.cpp b/konsole/konsole/TEmuVt102.cpp
index 7a1704590..c460693cd 100644
--- a/konsole/konsole/TEmuVt102.cpp
+++ b/konsole/konsole/TEmuVt102.cpp
@@ -242,14 +242,14 @@ void TEmuVt102::addDigit(int dig)
 
 void TEmuVt102::addArgument()
 {
-  argc = QMIN(argc+1,MAXARGS-1);
+  argc = TQMIN(argc+1,MAXARGS-1);
   argv[argc] = 0;
 }
 
 void TEmuVt102::pushToToken(int cc)
 {
   pbuf[ppos] = cc;
-  ppos = QMIN(ppos+1,MAXPBUF-1);
+  ppos = TQMIN(ppos+1,MAXPBUF-1);
 }
 
 // Character Classes used while decoding
diff --git a/konsole/konsole/session.cpp b/konsole/konsole/session.cpp
index 17692f51c..8ecf469af 100644
--- a/konsole/konsole/session.cpp
+++ b/konsole/konsole/session.cpp
@@ -283,8 +283,8 @@ void TESession::notifySessionState(int state)
 void TESession::onContentSizeChange(int height, int width)
 {
   // ensure that image is at least one line high by one column wide
-  const int columns = QMAX( width/font_w , 1 );
-  const int lines = QMAX( height/font_h , 1 );
+  const int columns = TQMAX( width/font_w , 1 );
+  const int lines = TQMAX( height/font_h , 1 );
 
   em->onImageSizeChange( lines , columns );
   sh->setSize( lines , columns );
diff --git a/ksplashml/main.cpp b/ksplashml/main.cpp
index 790e0e5d6..b36c6a2bd 100644
--- a/ksplashml/main.cpp
+++ b/ksplashml/main.cpp
@@ -64,7 +64,7 @@ int main( int argc, char **argv )
   KSplash wndMain("ksplash");
   if ( arg->isSet( "steps" ) )
   {
-    int steps = QMAX( arg->getOption( "steps" ).toInt(), 0 );
+    int steps = TQMAX( arg->getOption( "steps" ).toInt(), 0 );
     if ( steps )
       wndMain.setStartupItemCount( steps );
   }
diff --git a/ksplashml/themeengine/default/themelegacy.cpp b/ksplashml/themeengine/default/themelegacy.cpp
index bd56f968b..7cebc5a33 100644
--- a/ksplashml/themeengine/default/themelegacy.cpp
+++ b/ksplashml/themeengine/default/themelegacy.cpp
@@ -163,7 +163,7 @@ void ThemeDefault::_initUi()
       mProgressBar->setBackgroundOrigin( TQWidget::ParentOrigin );
       mProgressBar->setPaletteBackgroundPixmap( blimage );
 
-      bottom_label->setFixedWidth( QMAX(blimage.width(),tlimage.width()) );
+      bottom_label->setFixedWidth( TQMAX(blimage.width(),tlimage.width()) );
       bottom_label->setFixedHeight( mLabel->sizeHint().height()+4 );
 
       // 3 pixels of whitespace between the label and the progressbar.
diff --git a/ksplashml/themeengine/standard/wndicon.cpp b/ksplashml/themeengine/standard/wndicon.cpp
index 030456f4e..856547895 100644
--- a/ksplashml/themeengine/standard/wndicon.cpp
+++ b/ksplashml/themeengine/standard/wndicon.cpp
@@ -122,7 +122,7 @@ TQPoint WndIcon::determinePosition()
     nSlot = ( DW / wid );
     while( x > nSlot )
     {
-      x = QMAX(0,x-nSlot);
+      x = TQMAX(0,x-nSlot);
       y++;
     }
     X = (3) + ((x - 1) * wid);
@@ -134,7 +134,7 @@ TQPoint WndIcon::determinePosition()
     nSlot = ( DW / wid );
     while( x > nSlot )
     {
-      x = QMAX(0,x-nSlot);
+      x = TQMAX(0,x-nSlot);
       y++;
     }
     X = (3) + ((x - 1) * wid);
@@ -146,7 +146,7 @@ TQPoint WndIcon::determinePosition()
     nSlot = ( DW / wid );
     while( x > nSlot )
     {
-      x = QMAX(0,x-nSlot);
+      x = TQMAX(0,x-nSlot);
       y++;
     }
     X = (DW - 3) - (( x ) * wid );
@@ -158,7 +158,7 @@ TQPoint WndIcon::determinePosition()
     nSlot = ( DW / wid );
     while( x > nSlot )
     {
-      x = QMAX(0,x-nSlot);
+      x = TQMAX(0,x-nSlot);
       y++;
     }
     X = (DW - 3) - (( x ) * wid );
@@ -170,7 +170,7 @@ TQPoint WndIcon::determinePosition()
     nSlot = ( DH / wid );
     while( x > nSlot )
     {
-      x = QMAX(0,x-nSlot);
+      x = TQMAX(0,x-nSlot);
       y++;
     }
     X = (3) + (( y - 1 ) * wid );
@@ -182,7 +182,7 @@ TQPoint WndIcon::determinePosition()
     nSlot = ( DH / wid );
     while( x > nSlot )
     {
-      x = QMAX(0,x-nSlot);
+      x = TQMAX(0,x-nSlot);
       y++;
     }
     X = (DW - 3) - (( y ) * wid );
@@ -194,7 +194,7 @@ TQPoint WndIcon::determinePosition()
     nSlot = ( DH / wid );
     while( x > nSlot )
     {
-      x = QMAX(0,x-nSlot);
+      x = TQMAX(0,x-nSlot);
       y++;
     }
     X = (3) + (( y - 1 ) * wid );
@@ -206,7 +206,7 @@ TQPoint WndIcon::determinePosition()
     nSlot = ( DH / wid );
     while( x > nSlot )
     {
-      x = QMAX(0,x-nSlot);
+      x = TQMAX(0,x-nSlot);
       y++;
     }
     X = (DW - 3) - (( y ) * wid );
diff --git a/ksplashml/themeengine/standard/wndstatus.cpp b/ksplashml/themeengine/standard/wndstatus.cpp
index b3a2e69f9..9eb8be9a0 100644
--- a/ksplashml/themeengine/standard/wndstatus.cpp
+++ b/ksplashml/themeengine/standard/wndstatus.cpp
@@ -72,7 +72,7 @@ WndStatus::WndStatus( TQPalette /*pal*/,
   TQWidget *widg = new TQWidget( this );
   setStretchFactor(widg,50);
 
-  setFixedSize( rect.width(), QMAX(m_progress->height(),m_label->height()) );
+  setFixedSize( rect.width(), TQMAX(m_progress->height(),m_label->height()) );
 
   if ( atTop )
     move( rect.topLeft() );
diff --git a/libkonq/konq_iconviewwidget.cc b/libkonq/konq_iconviewwidget.cc
index a2d0c6188..78ba9abef 100644
--- a/libkonq/konq_iconviewwidget.cc
+++ b/libkonq/konq_iconviewwidget.cc
@@ -639,7 +639,7 @@ void KonqIconViewWidget::setIcons( int size, const TQStringList& stopImagePrevie
         int realSize = size ? size : TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop );
         // choose spacing depending on font, but min 5 (due to KFileIVI  move limit)
         setSpacing( ( m_bDesktop || ( realSize > TDEIcon::SizeSmall ) ) ?
-                    QMAX( 5, TQFontMetrics(font()).width('n') ) : 0 );
+                    TQMAX( 5, TQFontMetrics(font()).width('n') ) : 0 );
     }
 
     if ( sizeChanged || previewSizeChanged || !stopImagePreviewFor.isEmpty() )
@@ -711,10 +711,10 @@ void KonqIconViewWidget::setItemTextPos( ItemTextPos pos )
 
     if ( m_bSetGridX )
         if ( pos == TQIconView::Bottom )
-            setGridX( QMAX( sz + 50, previewIconSize( sz ) + 13 ) );
+            setGridX( TQMAX( sz + 50, previewIconSize( sz ) + 13 ) );
         else
         {
-            setMaxItemWidth( QMAX( sz, previewIconSize( sz ) ) + m_pSettings->iconTextWidth() );
+            setMaxItemWidth( TQMAX( sz, previewIconSize( sz ) ) + m_pSettings->iconTextWidth() );
             setGridX( -1 );
         }
 
@@ -734,9 +734,9 @@ void KonqIconViewWidget::gridValues( int* x, int* y, int* dx, int* dy,
     // vertical  : top spacing(), <height>, bottom spacing()
     // The doubled space in y-direction gives a better visual separation and makes it clearer
     // to which item the text belongs
-    *dx = spacing() + QMAX( QMAX( iconSize, previewSize ), m_pSettings->iconTextWidth() );
+    *dx = spacing() + TQMAX( TQMAX( iconSize, previewSize ), m_pSettings->iconTextWidth() );
     int textHeight = iconTextHeight() * fontMetrics().height();
-    *dy = spacing() + QMAX( iconSize, previewSize ) + 2 + textHeight + spacing();
+    *dy = spacing() + TQMAX( iconSize, previewSize ) + 2 + textHeight + spacing();
 
     // Icon Area
     int w, h;
@@ -790,9 +790,9 @@ int KonqIconViewWidget::gridXValue() const
     int newGridX;
 
     if ( itemTextPos() == TQIconView::Bottom )
-        newGridX = QMAX( sz + 50, previewIconSize( sz ) + 13 );
+        newGridX = TQMAX( sz + 50, previewIconSize( sz ) + 13 );
     else
-        newGridX = QMAX( sz, previewIconSize( sz ) ) + m_pSettings->iconTextWidth();
+        newGridX = TQMAX( sz, previewIconSize( sz ) ) + m_pSettings->iconTextWidth();
 
     //kdDebug(1203) << "gridXValue: " << newGridX << " sz=" << sz << endl;
     return newGridX;
@@ -1488,7 +1488,7 @@ void KonqIconViewWidget::insertInGrid(TQIconViewItem *item)
     for (; i; i = i->nextItem() )
     {
         r = r.subtract(i->rect());
-        y = QMAX(y, i->y() + i->height());
+        y = TQMAX(y, i->y() + i->height());
     }
 
     TQMemArray<TQRect> rects = r.rects();
@@ -1586,8 +1586,8 @@ void KonqIconViewWidget::lineupIcons()
         int x = item->x() + item->width() / 2 - x0;
         int y = item->pixmapRect( false ).bottom() - iconSize / 2
                 - ( dy - ( iconSize + textHeight ) ) / 2 - y0;
-        int posX = QMIN( nx-1, QMAX( 0, x / dx ) );
-        int posY = QMIN( ny-1, QMAX( 0, y / dy ) );
+        int posX = TQMIN( nx-1, TQMAX( 0, x / dx ) );
+        int posY = TQMIN( ny-1, TQMAX( 0, y / dy ) );
 
         if ( !bins[posX][posY] )
             bins[posX][posY] = new Bin;
@@ -1646,7 +1646,7 @@ void KonqIconViewWidget::lineupIcons()
                 TQIconViewItem* movedItem;
                 Bin* items = bins[i][j];
 
-                int mini = QMIN( QMIN( tf, bf ), QMIN( lf, rf ) );
+                int mini = TQMIN( TQMIN( tf, bf ), TQMIN( lf, rf ) );
                 if ( tf == mini ) {
                     // move top item in (i,j) to (i,j-1)
                     Bin::iterator it = items->begin();
@@ -1717,7 +1717,7 @@ void KonqIconViewWidget::lineupIcons()
             if ( !bin->isEmpty() ) {
                 TQIconViewItem* item = bin->first();
                 int newX = x0 + i*dx + spacing() +
-                           QMAX(0, ( (dx-spacing()) - item->width() ) / 2);  // pixmap can be larger as iconsize
+                           TQMAX(0, ( (dx-spacing()) - item->width() ) / 2);  // pixmap can be larger as iconsize
                 // align all icons vertically to their text
                 int newY = y0 + j*dy + dy - spacing() - ( item->pixmapRect().bottom() + 2 + textHeight );
                 if ( item->x() != newX || item->y() != newY ) {
@@ -1770,7 +1770,7 @@ void KonqIconViewWidget::lineupIcons( TQIconView::Arrangement arrangement )
     TQIconViewItem* item;
     for ( item = firstItem(); item; item = item->nextItem() ) {
         int newX = x0 + nx*dx + spacing() +
-                   QMAX(0, ( (dx-spacing()) - item->width() ) / 2);  // icon can be larger as defined
+                   TQMAX(0, ( (dx-spacing()) - item->width() ) / 2);  // icon can be larger as defined
         // align all icons vertically to their text
         int newY = y0 + ny*dy + dy - spacing() - ( item->pixmapRect().bottom() + 2 + textHeight );
         if ( item->x() != newX || item->y() != newY ) {
diff --git a/nsplugins/viewer/kxt.cpp b/nsplugins/viewer/kxt.cpp
index e2ab625ed..2c374f2cd 100644
--- a/nsplugins/viewer/kxt.cpp
+++ b/nsplugins/viewer/kxt.cpp
@@ -281,7 +281,7 @@ static void np_do_timers( void*, void* )
     timeval *tm = qt_wait_timer();
 
     if (tm) {
-        int interval = QMIN(tm->tv_sec,INT_MAX/1000)*1000 + tm->tv_usec/1000;
+        int interval = TQMIN(tm->tv_sec,INT_MAX/1000)*1000 + tm->tv_usec/1000;
         np_set_timer( interval );
     }
     qxtapp->sendPostedEvents();
diff --git a/nsplugins/viewer/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp
index 8d41f9439..09e4f382c 100644
--- a/nsplugins/viewer/nsplugin.cpp
+++ b/nsplugins/viewer/nsplugin.cpp
@@ -1700,7 +1700,7 @@ int NSPluginStreamBase::process( const TQByteArray &data, int start )
 
       max = _instance->NPWriteReady(_stream);
       //kdDebug(1431) << "to_sent == " << to_sent << " and max = " << max << endl;
-      len = QMIN(max, to_sent);
+      len = TQMIN(max, to_sent);
 
       //kdDebug(1431) << "-> Feeding stream to plugin: offset=" << _pos << ", len=" << len << endl;
       sent = _instance->NPWrite( _stream, _pos, len, d );
diff --git a/tdeioslave/pop3/pop3.cc b/tdeioslave/pop3/pop3.cc
index 4f85c409c..7d5f914ad 100644
--- a/tdeioslave/pop3/pop3.cc
+++ b/tdeioslave/pop3/pop3.cc
@@ -230,7 +230,7 @@ POP3Protocol::Resp POP3Protocol::getResponse(char *r_buf, unsigned int r_len,
   if (strncmp(buf, "+OK", 3) == 0) {
     if (r_buf && r_len) {
       memcpy(r_buf, (buf[3] == ' ' ? buf + 4 : buf + 3),
-             QMIN(r_len, (buf[3] == ' ' ? recv_len - 4 : recv_len - 3)));
+             TQMIN(r_len, (buf[3] == ' ' ? recv_len - 4 : recv_len - 3)));
     }
 
     delete[]buf;
@@ -239,7 +239,7 @@ POP3Protocol::Resp POP3Protocol::getResponse(char *r_buf, unsigned int r_len,
   } else if (strncmp(buf, "-ERR", 4) == 0) {
     if (r_buf && r_len) {
       memcpy(r_buf, (buf[4] == ' ' ? buf + 5 : buf + 4),
-             QMIN(r_len, (buf[4] == ' ' ? recv_len - 5 : recv_len - 4)));
+             TQMIN(r_len, (buf[4] == ' ' ? recv_len - 5 : recv_len - 4)));
     }
 
     TQString command = TQString::fromLatin1(cmd);
@@ -256,8 +256,8 @@ POP3Protocol::Resp POP3Protocol::getResponse(char *r_buf, unsigned int r_len,
     return Err;
   } else if (strncmp(buf, "+ ", 2) == 0) {
     if (r_buf && r_len) {
-      memcpy(r_buf, buf + 2, QMIN(r_len, recv_len - 4));
-      r_buf[QMIN(r_len - 1, recv_len - 4)] = '\0';
+      memcpy(r_buf, buf + 2, TQMIN(r_len, recv_len - 4));
+      r_buf[TQMIN(r_len - 1, recv_len - 4)] = '\0';
     }
 
     delete[]buf;
@@ -267,7 +267,7 @@ POP3Protocol::Resp POP3Protocol::getResponse(char *r_buf, unsigned int r_len,
     POP3_DEBUG << "Invalid POP3 response received!" << endl;
 
     if (r_buf && r_len) {
-      memcpy(r_buf, buf, QMIN(r_len, recv_len));
+      memcpy(r_buf, buf, TQMIN(r_len, recv_len));
     }
 
     if (!buf || !*buf) {
diff --git a/tdeioslave/thumbnail/textcreator.cpp b/tdeioslave/thumbnail/textcreator.cpp
index 322c944a2..13f3ba83f 100644
--- a/tdeioslave/thumbnail/textcreator.cpp
+++ b/tdeioslave/thumbnail/textcreator.cpp
@@ -122,9 +122,9 @@ bool TextCreator::create(const TQString &path, int width, int height, TQImage &i
             TQRect rect;
 
             int rest = m_pixmap.width() - (numCharsPerLine * chSize.width());
-            xborder = QMAX( xborder, rest/2); // center horizontally
+            xborder = TQMAX( xborder, rest/2); // center horizontally
             rest = m_pixmap.height() - (numLines * chSize.height());
-            yborder = QMAX( yborder, rest/2); // center vertically
+            yborder = TQMAX( yborder, rest/2); // center vertically
             // end centering
 
             int x = xborder, y = yborder; // where to paint the characters
diff --git a/tdeioslave/thumbnail/thumbnail.cpp b/tdeioslave/thumbnail/thumbnail.cpp
index 0e6b24880..cc2eefbc3 100644
--- a/tdeioslave/thumbnail/thumbnail.cpp
+++ b/tdeioslave/thumbnail/thumbnail.cpp
@@ -348,9 +348,9 @@ void ThumbnailProtocol::get(const KURL &url)
         TQImage icon = getIcon();
 
         int x = img.width() - icon.width() - 4;
-        x = QMAX( x, 0 );
+        x = TQMAX( x, 0 );
         int y = img.height() - icon.height() - 6;
-        y = QMAX( y, 0 );
+        y = TQMAX( y, 0 );
         KImageEffect::blendOnLower( x, y, icon, img );
     }
 
diff --git a/tdesu/tdesud/repo.cpp b/tdesu/tdesud/repo.cpp
index e923d6411..296199438 100644
--- a/tdesu/tdesud/repo.cpp
+++ b/tdesu/tdesud/repo.cpp
@@ -34,7 +34,7 @@ void Repository::add(const TQCString &key, Data_entry &data)
         data.timeout = (unsigned) -1;
     else
         data.timeout += time(0L);
-    head_time = QMIN(head_time, data.timeout);
+    head_time = TQMIN(head_time, data.timeout);
     repo.insert(key, data);
 }
 
@@ -177,7 +177,7 @@ int Repository::expire()
 	if (t <= current)
 	    keys.push(it.key());
 	else
-	    head_time = QMIN(head_time, t);
+	    head_time = TQMIN(head_time, t);
     }
 
     int n = keys.count();
diff --git a/tdesu/tdesud/tdesud.cpp b/tdesu/tdesud/tdesud.cpp
index 92295445e..5e4f5122a 100644
--- a/tdesu/tdesud/tdesud.cpp
+++ b/tdesu/tdesud/tdesud.cpp
@@ -294,14 +294,14 @@ int main(int argc, char *argv[])
 
     // Make sure we exit when the display gets closed.
     int x11Fd = initXconnection();
-    maxfd = QMAX(maxfd, x11Fd);
+    maxfd = TQMAX(maxfd, x11Fd);
 
     repo = new Repository;
     TQPtrVector<ConnectionHandler> handler;
     handler.setAutoDelete(true);
 
     pipe(pipeOfDeath);
-    maxfd = QMAX(maxfd, pipeOfDeath[0]);
+    maxfd = TQMAX(maxfd, pipeOfDeath[0]);
 
     // Signal handlers 
     struct sigaction sa;
diff --git a/tdm/kfrontend/kgverify.cpp b/tdm/kfrontend/kgverify.cpp
index c78d20b9e..46b89e9c5 100644
--- a/tdm/kfrontend/kgverify.cpp
+++ b/tdm/kfrontend/kgverify.cpp
@@ -230,7 +230,7 @@ KGVerify::scheduleAutoLogin( bool initial )
 			timedLeft = _autoLoginDelay;
 			deadTicks = 0;
 		} else {
-			timedLeft = QMAX( _autoLoginDelay - TIMED_GREET_TO, MIN_TIMED_TO );
+			timedLeft = TQMAX( _autoLoginDelay - TIMED_GREET_TO, MIN_TIMED_TO );
 			deadTicks = DEAD_TIMED_TO;
 		}
 		updateStatus();
diff --git a/tdm/kfrontend/tdmclock.cpp b/tdm/kfrontend/tdmclock.cpp
index fa17456e2..f9a7122b8 100644
--- a/tdm/kfrontend/tdmclock.cpp
+++ b/tdm/kfrontend/tdmclock.cpp
@@ -115,7 +115,7 @@ void KdmClock::paintEvent( TQPaintEvent * )
 			             time.second() );
 		else
 			buf.sprintf( "%02d:%02d", time.hour(), time.minute() );
-		mFont.setPointSize( QMIN( (int)(width()/buf.length()*1.5),height() ) );
+		mFont.setPointSize( TQMIN( (int)(width()/buf.length()*1.5),height() ) );
 		paint.setFont( mFont );
 		paint.setPen( backgroundColor() );
 		paint.drawText( contentsRect(),AlignHCenter|AlignVCenter, buf,-1,0,0 );
@@ -123,7 +123,7 @@ void KdmClock::paintEvent( TQPaintEvent * )
 */
 		TQPointArray pts;
 		TQPoint cp = contentsRect().center() - TQPoint( 2,2 );
-		int d = QMIN( contentsRect().width()-15,contentsRect().height()-15 );
+		int d = TQMIN( contentsRect().width()-15,contentsRect().height()-15 );
 		paint.setPen( foregroundColor() );
 		paint.setBrush( foregroundColor() );
 
diff --git a/tdm/kfrontend/themer/tdmitem.cpp b/tdm/kfrontend/themer/tdmitem.cpp
index 006a77d49..f5eabdb56 100644
--- a/tdm/kfrontend/themer/tdmitem.cpp
+++ b/tdm/kfrontend/themer/tdmitem.cpp
@@ -362,7 +362,7 @@ KdmItem::paint( TQPainter *p, const TQRect &rect )
 
 	if (area.intersects( rect )) {
 		TQRect contentsRect = area.intersect( rect );
-		contentsRect.moveBy( QMIN( 0, -area.x() ), QMIN( 0, -area.y() ) );
+		contentsRect.moveBy( TQMIN( 0, -area.x() ), TQMIN( 0, -area.y() ) );
 		drawContents( p, contentsRect );
 	}
 
diff --git a/twin/client.cpp b/twin/client.cpp
index 957a0b3ba..a5b5e808b 100644
--- a/twin/client.cpp
+++ b/twin/client.cpp
@@ -889,7 +889,7 @@ void Client::setShade( ShadeMode mode )
 // FRAME       repaint( FALSE );
 //        bool wasStaticContents = testWFlags( WStaticContents );
 //        setWFlags( WStaticContents );
-        int step = QMAX( 4, QABS( h - s.height() ) / as )+1;
+        int step = TQMAX( 4, QABS( h - s.height() ) / as )+1;
         do 
             {
             h -= step;
@@ -919,7 +919,7 @@ void Client::setShade( ShadeMode mode )
         TQSize s( sizeForClientSize( clientSize()));
 // FRAME       bool wasStaticContents = testWFlags( WStaticContents );
 //        setWFlags( WStaticContents );
-        int step = QMAX( 4, QABS( h - s.height() ) / as )+1;
+        int step = TQMAX( 4, QABS( h - s.height() ) / as )+1;
         do 
             {
             h += step;
diff --git a/twin/clients/keramik/keramik.cpp b/twin/clients/keramik/keramik.cpp
index 02320d9ad..cdfd822c4 100644
--- a/twin/clients/keramik/keramik.cpp
+++ b/twin/clients/keramik/keramik.cpp
@@ -1279,7 +1279,7 @@ void KeramikClient::updateCaptionBuffer()
 	int tw = p.fontMetrics().width( caption() ) +
 		( clientHandler->showAppIcons() ? 16 + iconSpacing : 0 );
 
-	int xpos = QMAX( (captionRect.width() - tw) / 3, 8 );
+	int xpos = TQMAX( (captionRect.width() - tw) / 3, 8 );
 	TQRect tr = TQStyle::visualRect( TQRect(xpos, 1, captionRect.width() - xpos - 10,
 				captionRect.height() - 4), captionBuffer.rect() );
 
@@ -1348,7 +1348,7 @@ void KeramikClient::calculateCaptionRect()
 	if ( clientHandler->showAppIcons() )
 		cw += 16 + 4; // icon width + space
 
-	cw = QMIN( cw, titlebar->geometry().width() );
+	cw = TQMIN( cw, titlebar->geometry().width() );
 	captionRect = TQStyle::visualRect( TQRect(titlebar->geometry().x(), (largeCaption ? 0 : titleBaseY),
 				cw, clientHandler->titleBarHeight(largeCaption) ),
 				titlebar->geometry() );
@@ -1554,8 +1554,8 @@ void KeramikClient::paintEvent( TQPaintEvent *e )
 
 		// Space between the top left corner and the caption bubble
 		if ( updateRect.x() < captionRect.left() && updateRect.right() >= 15 ) {
-			int x1 = QMAX( 15, updateRect.x() );
-			int x2 = QMIN( captionRect.left(), updateRect.right() );
+			int x1 = TQMAX( 15, updateRect.x() );
+			int x2 = TQMIN( captionRect.left(), updateRect.right() );
 
 			p.drawTiledPixmap( x1, titleBaseY, x2 - x1 + 1, titleBarBaseHeight,
 					*clientHandler->tile( TitleCenter, active ) );
@@ -1572,8 +1572,8 @@ void KeramikClient::paintEvent( TQPaintEvent *e )
 
 		// Space between the caption bubble and the top right corner
 		if ( updateRect.right() > captionRect.right() && updateRect.x() < width() - 15 ) { // FRAME
-			int x1 = QMAX( captionRect.right() + 1, updateRect.x() );
-			int x2 = QMIN( width() - 15, updateRect.right() );
+			int x1 = TQMAX( captionRect.right() + 1, updateRect.x() );
+			int x2 = TQMIN( width() - 15, updateRect.right() );
 
 			p.drawTiledPixmap( x1, titleBaseY, x2 - x1 + 1, titleBarBaseHeight,
 					*clientHandler->tile( TitleCenter, active ) );
@@ -1590,8 +1590,8 @@ void KeramikClient::paintEvent( TQPaintEvent *e )
 	if ( updateRect.bottom() >= titleBarHeight &&
 			updateRect.top() < height() - grabBarHeight )
 	{
-		int top    = QMAX( titleBarHeight, updateRect.top() );
-		int bottom = QMIN( updateRect.bottom(), height() - grabBarHeight );
+		int top    = TQMAX( titleBarHeight, updateRect.top() );
+		int bottom = TQMIN( updateRect.bottom(), height() - grabBarHeight );
 
 		// Left border
 		if ( updateRect.x() < leftBorderWidth )
@@ -1614,8 +1614,8 @@ void KeramikClient::paintEvent( TQPaintEvent *e )
 
 		// Space between the left corner and the right corner
 		if ( updateRect.x() < width() - 9 ) {
-			int x1 = QMAX( 9, updateRect.x() );
-			int x2 = QMIN( width() - 9, updateRect.right() );
+			int x1 = TQMAX( 9, updateRect.x() );
+			int x2 = TQMIN( width() - 9, updateRect.right() );
 
 			p.drawTiledPixmap( x1, height() - grabBarHeight, x2 - x1 + 1,
 					grabBarHeight, *clientHandler->tile( GrabBarCenter, active ) );
diff --git a/twin/clients/plastik/plastik.cpp b/twin/clients/plastik/plastik.cpp
index 5e03b7a51..b5cdeb85b 100644
--- a/twin/clients/plastik/plastik.cpp
+++ b/twin/clients/plastik/plastik.cpp
@@ -171,7 +171,7 @@ void PlastikHandler::readConfig()
     TQFontMetrics fm(m_titleFont);  // active font = inactive font
     int titleHeightMin = config.readNumEntry("MinTitleHeight", 16);
     // The title should strech with bigger font sizes!
-    m_titleHeight = QMAX(titleHeightMin, fm.height() + 4); // 4 px for the shadow etc.
+    m_titleHeight = TQMAX(titleHeightMin, fm.height() + 4); // 4 px for the shadow etc.
     // have an even title/button size so the button icons are fully centered...
     if ( m_titleHeight%2 == 0)
         m_titleHeight++;
@@ -179,7 +179,7 @@ void PlastikHandler::readConfig()
     fm = TQFontMetrics(m_titleFontTool);  // active font = inactive font
     int titleHeightToolMin = config.readNumEntry("MinTitleHeightTool", 13);
     // The title should strech with bigger font sizes!
-    m_titleHeightTool = QMAX(titleHeightToolMin, fm.height() ); // don't care about the shadow etc.
+    m_titleHeightTool = TQMAX(titleHeightToolMin, fm.height() ); // don't care about the shadow etc.
     // have an even title/button size so the button icons are fully centered...
     if ( m_titleHeightTool%2 == 0)
         m_titleHeightTool++;
@@ -560,7 +560,7 @@ const TQBitmap &PlastikHandler::buttonBitmap(ButtonIcon type, const TQSize &size
     delete m_bitmaps[toolWindow][typeIndex];
     m_bitmaps[toolWindow][typeIndex] = 0;
 
-    TQBitmap bmp = IconEngine::icon(type /*icon*/, QMIN(w,h) );
+    TQBitmap bmp = IconEngine::icon(type /*icon*/, TQMIN(w,h) );
     TQBitmap *bitmap = new TQBitmap(bmp);
     m_bitmaps[toolWindow][typeIndex] = bitmap;
     return *bitmap;
diff --git a/twin/clients/plastik/plastikbutton.cpp b/twin/clients/plastik/plastikbutton.cpp
index 428c8e72c..3a097be15 100644
--- a/twin/clients/plastik/plastikbutton.cpp
+++ b/twin/clients/plastik/plastikbutton.cpp
@@ -531,7 +531,7 @@ TQBitmap IconEngine::icon(ButtonIcon icon, int size)
                 lw2 = 1;
             }
 
-            int h = QMAX( (r.width()/2), (lw1+2*lw2) );
+            int h = TQMAX( (r.width()/2), (lw1+2*lw2) );
 
             // horizontal bars
             drawObject(p, HorizontalLine, r.x(), r.y(), r.width(), lw1);
diff --git a/twin/clients/web/Web.cpp b/twin/clients/web/Web.cpp
index 53ec5a4df..496187d3b 100644
--- a/twin/clients/web/Web.cpp
+++ b/twin/clients/web/Web.cpp
@@ -179,7 +179,7 @@ WebClient::init()
     default:
       borderSize_ = 4;
   }
-  titleHeight_ = QMAX(QMAX(14, fm.height() + textVMargin * 2), borderSize_);
+  titleHeight_ = TQMAX(TQMAX(14, fm.height() + textVMargin * 2), borderSize_);
   if (0 != titleHeight_ % 2)
     titleHeight_ += 1;
 
@@ -202,7 +202,7 @@ WebClient::reset( unsigned long changed )
     // title height
     const int textVMargin   = 2;
     TQFontMetrics fm(options()->font(isActive(), isToolWindow()));
-    titleHeight_ = QMAX(QMAX(14, fm.height() + textVMargin * 2), borderSize_);
+    titleHeight_ = TQMAX(TQMAX(14, fm.height() + textVMargin * 2), borderSize_);
     if (0 != titleHeight_ % 2)
       titleHeight_ += 1;
 
diff --git a/twin/geometry.cpp b/twin/geometry.cpp
index 84f3fa25f..5c71e7c1f 100644
--- a/twin/geometry.cpp
+++ b/twin/geometry.cpp
@@ -717,10 +717,10 @@ void Client::keepInArea( TQRect area, bool partial )
     if( partial )
         {
         // increase the area so that can have only 100 pixels in the area
-        area.setLeft( QMIN( area.left() - width() + 100, area.left()));
-        area.setTop( QMIN( area.top() - height() + 100, area.top()));
-        area.setRight( QMAX( area.right() + width() - 100, area.right()));
-        area.setBottom( QMAX( area.bottom() + height() - 100, area.bottom()));
+        area.setLeft( TQMIN( area.left() - width() + 100, area.left()));
+        area.setTop( TQMIN( area.top() - height() + 100, area.top()));
+        area.setRight( TQMAX( area.right() + width() - 100, area.right()));
+        area.setBottom( TQMAX( area.bottom() + height() - 100, area.bottom()));
         }
     if ( geometry().right() > area.right() && width() < area.width() )
         move( area.right() - width(), y() );
@@ -1131,10 +1131,10 @@ TQSize Client::sizeForClientSize( const TQSize& wsize, Sizemode mode, bool nofra
         if( decominsize.height() > min_size.height())
                 min_size.setHeight( decominsize.height());
         }
-    w = QMIN( max_size.width(), w );
-    h = QMIN( max_size.height(), h );
-    w = QMAX( min_size.width(), w );
-    h = QMAX( min_size.height(), h );
+    w = TQMIN( max_size.width(), w );
+    h = TQMIN( max_size.height(), h );
+    w = TQMAX( min_size.width(), w );
+    h = TQMAX( min_size.height(), h );
 
     int w1 = w;
     int h1 = h;
@@ -1307,8 +1307,8 @@ void Client::getWmNormalHints()
         xSizeHint.max_width = xSizeHint.max_height = INT_MAX;
     else
         {
-        xSizeHint.max_width = QMAX( xSizeHint.max_width, 1 );
-        xSizeHint.max_height = QMAX( xSizeHint.max_height, 1 );
+        xSizeHint.max_width = TQMAX( xSizeHint.max_width, 1 );
+        xSizeHint.max_height = TQMAX( xSizeHint.max_height, 1 );
         }
     if( xSizeHint.flags & PResizeInc )
         {
diff --git a/twin/geometrytip.cpp b/twin/geometrytip.cpp
index 046f1d594..66ed01cf0 100644
--- a/twin/geometrytip.cpp
+++ b/twin/geometrytip.cpp
@@ -48,7 +48,7 @@ void GeometryTip::setGeometry( const TQRect& geom )
             }
         }
 
-    h = QMAX( h, 0 ); // in case of isShade() and PBaseSize
+    h = TQMAX( h, 0 ); // in case of isShade() and PBaseSize
     TQString pos;
     pos.sprintf( "%+d,%+d<br>(<b>%d&nbsp;x&nbsp;%d</b>)",
                      geom.x(), geom.y(), w, h );
diff --git a/twin/kcmtwin/twinoptions/windows.cpp b/twin/kcmtwin/twinoptions/windows.cpp
index 74b8d3140..38e72d953 100644
--- a/twin/kcmtwin/twinoptions/windows.cpp
+++ b/twin/kcmtwin/twinoptions/windows.cpp
@@ -192,7 +192,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * par
     connect(clickRaiseOn,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(clickRaiseOnTog(bool)));
     fLay->addWidget(clickRaiseOn);
 
-//     fLay->addColSpacing(0,QMAX(autoRaiseOn->sizeHint().width(),
+//     fLay->addColSpacing(0,TQMAX(autoRaiseOn->sizeHint().width(),
 //                                clickRaiseOn->sizeHint().width()) + 15);
 
     TQHBoxLayout* focusStealingLayout = new TQHBoxLayout(lay,KDialog::spacingHint());
diff --git a/twin/lib/kcommondecoration.cpp b/twin/lib/kcommondecoration.cpp
index 997845a5c..48db91040 100644
--- a/twin/lib/kcommondecoration.cpp
+++ b/twin/lib/kcommondecoration.cpp
@@ -524,8 +524,8 @@ void KCommonDecoration::resize( const TQSize& s )
 
 TQSize KCommonDecoration::minimumSize() const
 {
-    const int minWidth = QMAX(layoutMetric(LM_TitleEdgeLeft), layoutMetric(LM_BorderLeft))
-            +QMAX(layoutMetric(LM_TitleEdgeRight), layoutMetric(LM_BorderRight))
+    const int minWidth = TQMAX(layoutMetric(LM_TitleEdgeLeft), layoutMetric(LM_BorderLeft))
+            +TQMAX(layoutMetric(LM_TitleEdgeRight), layoutMetric(LM_BorderRight))
             +layoutMetric(LM_TitleBorderLeft)+layoutMetric(LM_TitleBorderRight);
     return TQSize(minWidth,
                  layoutMetric(LM_TitleEdgeTop)+layoutMetric(LM_TitleHeight)
diff --git a/twin/placement.cpp b/twin/placement.cpp
index 84be2e0b8..bea707d1f 100644
--- a/twin/placement.cpp
+++ b/twin/placement.cpp
@@ -188,8 +188,8 @@ void Placement::placeSmart(Client* c, const TQRect& area, Policy /*next*/ )
                     if((cxl < xr) && (cxr > xl) &&
                        (cyt < yb) && (cyb > yt)) 
                         {
-                        xl = QMAX(cxl, xl); xr = QMIN(cxr, xr);
-                        yt = QMAX(cyt, yt); yb = QMIN(cyb, yb);
+                        xl = TQMAX(cxl, xl); xr = TQMIN(cxr, xr);
+                        yt = TQMAX(cyt, yt); yb = TQMIN(cyb, yb);
                         if((*l)->keepAbove())
                             overlap += 16 * (xr - xl) * (yb - yt);
                         else if((*l)->keepBelow() && !(*l)->isDock()) // ignore KeepBelow windows
diff --git a/twin/rules.cpp b/twin/rules.cpp
index fb22b86e7..63fc0e37b 100644
--- a/twin/rules.cpp
+++ b/twin/rules.cpp
@@ -113,7 +113,7 @@ Rules::Rules( TDEConfig& cfg )
     readFromCfg( cfg );
     }
 
-static int limit0to4( int i ) { return QMAX( 0, QMIN( 4, i )); }
+static int limit0to4( int i ) { return TQMAX( 0, TQMIN( 4, i )); }
 
 void Rules::readFromCfg( TDEConfig& cfg )
     {
diff --git a/twin/tabbox.cpp b/twin/tabbox.cpp
index 3d75edef1..505af7abc 100644
--- a/twin/tabbox.cpp
+++ b/twin/tabbox.cpp
@@ -183,7 +183,7 @@ void TabBox::reset()
 
     // calculate height of 1 line
     // fontheight + 1 pixel above + 1 pixel below, or 32x32 icon + 2 pixel above + below
-    lineHeight = QMAX(fontMetrics().height() + 2, 32 + 4);
+    lineHeight = TQMAX(fontMetrics().height() + 2, 32 + 4);
 
     if ( mode() == WindowsMode )
         {
@@ -218,7 +218,7 @@ void TabBox::reset()
             {
             showMiniIcon = true;
             // fontheight + 1 pixel above + 1 pixel below, or 16x16 icon + 1 pixel above + below
-            lineHeight = QMAX(fontMetrics().height() + 2, 16 + 2);
+            lineHeight = TQMAX(fontMetrics().height() + 2, 16 + 2);
 
             h = clients.count() * lineHeight;
 
@@ -496,11 +496,11 @@ void TabBox::drawContents( TQPainter * )
         int wmax = 0;
         for ( int i = 1; i <= workspace()->numberOfDesktops(); i++ )
             {
-            wmax = QMAX(wmax, fontMetrics().width(workspace()->desktopName(i)));
+            wmax = TQMAX(wmax, fontMetrics().width(workspace()->desktopName(i)));
 
             // calculate max width of desktop-number text
             TQString num = TQString::number(i);
-            iconWidth = QMAX(iconWidth - 4, fm.boundingRect(num).width()) + 4;
+            iconWidth = TQMAX(iconWidth - 4, fm.boundingRect(num).width()) + 4;
             }
 
         // In DesktopMode, start at the current desktop