Fix remnant QMIN/QMAX to TQMIN/TQMAX.

22 files changed, 94 insertions, 94 deletions

diff --git a/tdeui/kcombobox.cpp b/tdeui/kcombobox.cpp
index cfef5fd5b..d6d3d0f46 100644
--- a/tdeui/kcombobox.cpp
+++ b/tdeui/kcombobox.cpp
@@ -500,7 +500,7 @@ void KHistoryCombo::addToHistory( const TQString& item )
 
     const int last = count() - 1; // last valid index
     const int mc = maxCount();
-    const int stopAt = QMAX(mc, 0);
+    const int stopAt = TQMAX(mc, 0);
 
     for (int rmIndex = last; rmIndex >= stopAt; --rmIndex) {
         // remove the last item, as long as we are longer than maxCount()
diff --git a/tdeui/kdatepicker.cpp b/tdeui/kdatepicker.cpp
index 99f1ce4af..53538b5fe 100644
--- a/tdeui/kdatepicker.cpp
+++ b/tdeui/kdatepicker.cpp
@@ -371,7 +371,7 @@ KDatePicker::selectMonthClicked()
   int day = calendar->day(date);
   // ----- construct a valid date in this month:
   calendar->setYMD(date, calendar->year(date), month, 1);
-  date = TQT_TQDATE_OBJECT(date.addDays(QMIN(day, calendar->daysInMonth(date)) - 1));
+  date = TQT_TQDATE_OBJECT(date.addDays(TQMIN(day, calendar->daysInMonth(date)) - 1));
   // ----- set this month
   setDate(date);
 }
@@ -406,9 +406,9 @@ KDatePicker::selectYearClicked()
       day=calendar->day(date);
       // ----- construct a valid date in this month:
       //date.setYMD(year, date.month(), 1);
-      //date.setYMD(year, date.month(), QMIN(day, date.daysInMonth()));
+      //date.setYMD(year, date.month(), TQMIN(day, date.daysInMonth()));
       calendar->setYMD(date, year, calendar->month(date),
-                       QMIN(day, calendar->daysInMonth(date)));
+                       TQMIN(day, calendar->daysInMonth(date)));
       // ----- set this month
       setDate(date);
     } else {
@@ -503,8 +503,8 @@ KDatePicker::setFontSize(int s)
          TDEGlobal::locale()->calendar()->year(table->getDate()), false);
       if (str.isNull()) break;
       r=metrics.boundingRect(str);
-      maxMonthRect.setWidth(QMAX(r.width(), maxMonthRect.width()));
-      maxMonthRect.setHeight(QMAX(r.height(),  maxMonthRect.height()));
+      maxMonthRect.setWidth(TQMAX(r.width(), maxMonthRect.width()));
+      maxMonthRect.setHeight(TQMAX(r.height(),  maxMonthRect.height()));
     }
 
   TQSize metricBound = style().tqsizeFromContents(TQStyle::CT_ToolButton,
diff --git a/tdeui/kdatetbl.cpp b/tdeui/kdatetbl.cpp
index 56edf9a5c..e2facec33 100644
--- a/tdeui/kdatetbl.cpp
+++ b/tdeui/kdatetbl.cpp
@@ -435,13 +435,13 @@ KDateTable::setFontSize(int size)
     {
       rect=metrics.boundingRect(TDEGlobal::locale()->calendar()
                                 ->weekDayName(count+1, true));
-      maxCell.setWidth(QMAX(maxCell.width(), rect.width()));
-      maxCell.setHeight(QMAX(maxCell.height(), rect.height()));
+      maxCell.setWidth(TQMAX(maxCell.width(), rect.width()));
+      maxCell.setHeight(TQMAX(maxCell.height(), rect.height()));
     }
   // ----- compare with a real wide number and add some space:
   rect=metrics.boundingRect(TQString::fromLatin1("88"));
-  maxCell.setWidth(QMAX(maxCell.width()+2, rect.width()));
-  maxCell.setHeight(QMAX(maxCell.height()+4, rect.height()));
+  maxCell.setWidth(TQMAX(maxCell.width()+2, rect.width()));
+  maxCell.setHeight(TQMAX(maxCell.height()+4, rect.height()));
 }
 
 void
diff --git a/tdeui/kdatewidget.cpp b/tdeui/kdatewidget.cpp
index e9185a9c1..2fc9dda0a 100644
--- a/tdeui/kdatewidget.cpp
+++ b/tdeui/kdatewidget.cpp
@@ -157,15 +157,15 @@ void KDateWidget::slotDateChanged( )
   int y,m,day;
 
   y = d->m_year->value();
-  y = QMIN(QMAX(y, calendar->minValidYear()), calendar->maxValidYear());
+  y = TQMIN(TQMAX(y, calendar->minValidYear()), calendar->maxValidYear());
 
   calendar->setYMD(date, y, 1, 1);
   m = d->m_month->currentItem()+1;
-  m = QMIN(QMAX(m,1), calendar->monthsInYear(date));
+  m = TQMIN(TQMAX(m,1), calendar->monthsInYear(date));
 
   calendar->setYMD(date, y, m, 1);
   day = d->m_day->value();
-  day = QMIN(QMAX(day,1), calendar->daysInMonth(date));
+  day = TQMIN(TQMAX(day,1), calendar->daysInMonth(date));
 
   calendar->setYMD(date, y, m, day);
   setDate(date);
diff --git a/tdeui/kdialog.cpp b/tdeui/kdialog.cpp
index 6d66d8efd..d4eb568a3 100644
--- a/tdeui/kdialog.cpp
+++ b/tdeui/kdialog.cpp
@@ -223,11 +223,11 @@ bool KDialog::avoidArea( TQWidget *w, const TQRect& area, int screen )
   avoid.rRight() += 10;
   avoid.rBottom() += 10;
 
-  if ( QMAX( fg.top(), avoid.top() ) <= QMIN( fg.bottom(), avoid.bottom() ) )
+  if ( TQMAX( fg.top(), avoid.top() ) <= TQMIN( fg.bottom(), avoid.bottom() ) )
   {
     // We need to move the widget up or down
-    int spaceAbove = QMAX(0, avoid.top() - scr.top());
-    int spaceBelow = QMAX(0, scr.bottom() - avoid.bottom());
+    int spaceAbove = TQMAX(0, avoid.top() - scr.top());
+    int spaceBelow = TQMAX(0, scr.bottom() - avoid.bottom());
     if ( spaceAbove > spaceBelow ) // where's the biggest side?
       if ( fg.height() <= spaceAbove ) // big enough?
         fg.setY( avoid.top() - fg.height() );
@@ -240,11 +240,11 @@ bool KDialog::avoidArea( TQWidget *w, const TQRect& area, int screen )
         return false;
   }
 
-  if ( QMAX( fg.left(), avoid.left() ) <= QMIN( fg.right(), avoid.right() ) )
+  if ( TQMAX( fg.left(), avoid.left() ) <= TQMIN( fg.right(), avoid.right() ) )
   {
     // We need to move the widget left or right
-    int spaceLeft = QMAX(0, avoid.left() - scr.left());
-    int spaceRight = QMAX(0, scr.right() - avoid.right());
+    int spaceLeft = TQMAX(0, avoid.left() - scr.left());
+    int spaceRight = TQMAX(0, scr.right() - avoid.right());
     if ( spaceLeft > spaceRight ) // where's the biggest side?
       if ( fg.width() <= spaceLeft ) // big enough?
         fg.setX( avoid.left() - fg.width() );
diff --git a/tdeui/kdialogbase.cpp b/tdeui/kdialogbase.cpp
index 890f79179..e426df1a4 100644
--- a/tdeui/kdialogbase.cpp
+++ b/tdeui/kdialogbase.cpp
@@ -456,7 +456,7 @@ TQSize KDialogBase::minimumSizeHint() const
   {
     s2 = mUrlHelp->minimumSize() + zeroByS;
   }
-  s1.rwidth()   = QMAX( s1.rwidth(), s2.rwidth() );
+  s1.rwidth()   = TQMAX( s1.rwidth(), s2.rwidth() );
   s1.rheight() += s2.rheight();
 
   //
@@ -480,7 +480,7 @@ TQSize KDialogBase::minimumSizeHint() const
   {
     s2 = TQSize( 100, 100+s );
   }
-  s1.rwidth()  = QMAX( s1.rwidth(), s2.rwidth() );
+  s1.rwidth()  = TQMAX( s1.rwidth(), s2.rwidth() );
   s1.rheight() += s2.rheight();
 
   if (d->detailsWidget && d->bDetails)
@@ -488,7 +488,7 @@ TQSize KDialogBase::minimumSizeHint() const
     s2 = d->detailsWidget->sizeHint() + zeroByS;
     s2 = s2.expandedTo( d->detailsWidget->minimumSize() );
     s2 = s2.expandedTo( d->detailsWidget->minimumSizeHint() );
-    s1.rwidth()  = QMAX( s1.rwidth(), s2.rwidth() );
+    s1.rwidth()  = TQMAX( s1.rwidth(), s2.rwidth() );
     s1.rheight() += s2.rheight();
   }
 
@@ -508,13 +508,13 @@ TQSize KDialogBase::minimumSizeHint() const
     s2 = d->mButton.box->minimumSize();
     if( mButtonOrientation == Qt::Horizontal )
     {
-      s1.rwidth()   = QMAX( s1.rwidth(), s2.rwidth() );
+      s1.rwidth()   = TQMAX( s1.rwidth(), s2.rwidth() );
       s1.rheight() += s2.rheight();
     }
     else
     {
       s1.rwidth() += s2.rwidth();
-      s1.rheight() = QMAX( s1.rheight(), s2.rheight() );
+      s1.rheight() = TQMAX( s1.rheight(), s2.rheight() );
     }
   }
 
diff --git a/tdeui/keditlistbox.cpp b/tdeui/keditlistbox.cpp
index 6f22b091a..bd7bb76b5 100644
--- a/tdeui/keditlistbox.cpp
+++ b/tdeui/keditlistbox.cpp
@@ -308,7 +308,7 @@ void KEditListBox::removeItem()
 
         m_listBox->removeItem( selected );
         if ( count() > 0 )
-            m_listBox->setSelected( QMIN( selected, count() - 1 ), true );
+            m_listBox->setSelected( TQMIN( selected, count() - 1 ), true );
 
         emit changed();
 	emit removed( removedText );
diff --git a/tdeui/kiconview.cpp b/tdeui/kiconview.cpp
index 31de273c7..1699a6919 100644
--- a/tdeui/kiconview.cpp
+++ b/tdeui/kiconview.cpp
@@ -191,8 +191,8 @@ void TDEIconView::slotAutoSelect()
       TQRect r;
       TQRect redraw;
       if ( previousItem )
-	r = TQRect( QMIN( previousItem->x(), m_pCurrentItem->x() ),
-		   QMIN( previousItem->y(), m_pCurrentItem->y() ),
+	r = TQRect( TQMIN( previousItem->x(), m_pCurrentItem->x() ),
+		   TQMIN( previousItem->y(), m_pCurrentItem->y() ),
 		   0, 0 );
       else
 	r = TQRect( 0, 0, 0, 0 );
@@ -555,10 +555,10 @@ void TDEIconViewItem::calcRect( const TQString& text_ )
     // Should not be higher than pixmap if text is alongside icons
     if ( view->itemTextPos() != TQIconView::Bottom ) {
         if ( d && !d->m_pixmapSize.isNull() )
-            height = QMIN( d->m_pixmapSize.height() + 2, height );
+            height = TQMIN( d->m_pixmapSize.height() + 2, height );
         else
-            height = QMIN( itemIconRect.height(), height );
-        height = QMAX( height, fm->height() );
+            height = TQMIN( itemIconRect.height(), height );
+        height = TQMAX( height, fm->height() );
     }
 
     // Calculate the word-wrap
@@ -566,7 +566,7 @@ void TDEIconViewItem::calcRect( const TQString& text_ )
     m_wordWrap = KWordWrap::formatText( *fm, outerRect, 0, t );
     r = m_wordWrap->boundingRect();
 
-    int realWidth = QMAX( QMIN( r.width() + 4, tw ), fm->width( "X" ) );
+    int realWidth = TQMAX( TQMIN( r.width() + 4, tw ), fm->width( "X" ) );
     if (drawRoundedRect == true) {
       itemTextRect.setWidth( realWidth + 2);
     }
@@ -580,7 +580,7 @@ void TDEIconViewItem::calcRect( const TQString& text_ )
         // If the pixmap size has been specified, use it
         if ( d && !d->m_pixmapSize.isNull() )
         {
-            w = QMAX( itemTextRect.width(), d->m_pixmapSize.width() + 2 );
+            w = TQMAX( itemTextRect.width(), d->m_pixmapSize.width() + 2 );
             h = itemTextRect.height() + d->m_pixmapSize.height() + 2 + 1;
 #if 0 // FIXME 
             // Waiting for the qt bug to be solved, the pixmapRect must
@@ -589,14 +589,14 @@ void TDEIconViewItem::calcRect( const TQString& text_ )
 #endif
         }
         else {
-            w = QMAX( itemTextRect.width(), itemIconRect.width() );
+            w = TQMAX( itemTextRect.width(), itemIconRect.width() );
             h = itemTextRect.height() + itemIconRect.height() + 1;
         }
 
         itemRect.setWidth( w );
         itemRect.setHeight( h );
-        int width = QMAX( w, TQApplication::globalStrut().width() ); // see TQIconViewItem::width()
-        int height = QMAX( h, TQApplication::globalStrut().height() ); // see TQIconViewItem::height()
+        int width = TQMAX( w, TQApplication::globalStrut().width() ); // see TQIconViewItem::width()
+        int height = TQMAX( h, TQApplication::globalStrut().height() ); // see TQIconViewItem::height()
         itemTextRect = TQRect( ( width - itemTextRect.width() ) / 2, height - itemTextRect.height(),
                               itemTextRect.width(), itemTextRect.height() );
         itemIconRect = TQRect( ( width - itemIconRect.width() ) / 2, y,
@@ -605,7 +605,7 @@ void TDEIconViewItem::calcRect( const TQString& text_ )
     else {
         // If the pixmap size has been specified, use it
         if ( d && !d->m_pixmapSize.isNull() ) {
-            h = QMAX( itemTextRect.height(), d->m_pixmapSize.height() + 2 );
+            h = TQMAX( itemTextRect.height(), d->m_pixmapSize.height() + 2 );
 #if 0 // FIXME 
             // Waiting for the qt bug to be solved, the pixmapRect must
             // stay on the top...
@@ -613,14 +613,14 @@ void TDEIconViewItem::calcRect( const TQString& text_ )
 #endif
         }
         else {
-            h = QMAX( itemTextRect.height(), itemIconRect.height() );
+            h = TQMAX( itemTextRect.height(), itemIconRect.height() );
         }
         w = itemTextRect.width() + itemIconRect.width() + 1;
 
         itemRect.setWidth( w );
         itemRect.setHeight( h );
-        int width = QMAX( w, TQApplication::globalStrut().width() ); // see TQIconViewItem::width()
-        int height = QMAX( h, TQApplication::globalStrut().height() ); // see TQIconViewItem::height()
+        int width = TQMAX( w, TQApplication::globalStrut().width() ); // see TQIconViewItem::width()
+        int height = TQMAX( h, TQApplication::globalStrut().height() ); // see TQIconViewItem::height()
 
         itemTextRect = TQRect( width - itemTextRect.width(), ( height - itemTextRect.height() ) / 2,
                               itemTextRect.width(), itemTextRect.height() );
@@ -629,7 +629,7 @@ void TDEIconViewItem::calcRect( const TQString& text_ )
                                   itemIconRect.width(), itemIconRect.height() );
         }
         else { // icon smaller than text -> place in top or center with first line
-	    itemIconRect = TQRect( 0, QMAX(( fm->height() - itemIconRect.height() ) / 2 + y, 0),
+	    itemIconRect = TQRect( 0, TQMAX(( fm->height() - itemIconRect.height() ) / 2 + y, 0),
                                   itemIconRect.width(), itemIconRect.height() );
         }
         if ( ( itemIconRect.height() <= 20 ) && ( itemTextRect.height() < itemIconRect.height() ) ) {
diff --git a/tdeui/kjanuswidget.cpp b/tdeui/kjanuswidget.cpp
index c3a8838e9..513ae2d8a 100644
--- a/tdeui/kjanuswidget.cpp
+++ b/tdeui/kjanuswidget.cpp
@@ -789,9 +789,9 @@ TQSize KJanusWidget::minimumSizeHint() const
     // Select the tallest item. It has only effect in IconList mode
     //
     int h1 = s1.rheight() + s3.rheight() + s4.height();
-    int h2 = QMAX( h1, s2.rheight() );
+    int h2 = TQMAX( h1, s2.rheight() );
 
-    return TQSize( s1.width()+s2.width()+QMAX(s3.width(),s4.width()), h2 );
+    return TQSize( s1.width()+s2.width()+TQMAX(s3.width(),s4.width()), h2 );
   }
   else if( mFace == Tabbed )
   {
@@ -968,7 +968,7 @@ void KJanusWidget::IconListBox::updateWidth()
     for( TQListBoxItem *i = item(0); i; i = i->next() )
     {
       int w = ((IconListItem *)i)->width(this);
-      maxWidth = QMAX( w, maxWidth );
+      maxWidth = TQMAX( w, maxWidth );
     }
 
     for( TQListBoxItem *i = item(0); i; i = i->next() )
@@ -1063,7 +1063,7 @@ KJanusWidget::IconListItem::IconListItem( TQListBox *listbox, const TQPixmap &pi
 
 int KJanusWidget::IconListItem::expandMinimumWidth( int width )
 {
-  mMinimumWidth = QMAX( mMinimumWidth, width );
+  mMinimumWidth = TQMAX( mMinimumWidth, width );
   return mMinimumWidth;
 }
 
@@ -1178,8 +1178,8 @@ int KJanusWidget::IconListItem::width( const TQListBox *lb ) const
 {
   int wt = lb->fontMetrics().boundingRect( 0, 0, 0, 0, Qt::AlignCenter, text() ).width() + 10;
   int wp = mPixmap.width() + 10;
-  int w  = QMAX( wt, wp );
-  return QMAX( w, mMinimumWidth );
+  int w  = TQMAX( wt, wp );
+  return TQMAX( w, mMinimumWidth );
 }
 
 
diff --git a/tdeui/knuminput.cpp b/tdeui/knuminput.cpp
index 40f87da29..f39d07443 100644
--- a/tdeui/knuminput.cpp
+++ b/tdeui/knuminput.cpp
@@ -152,16 +152,16 @@ void KNumInput::layout(bool deep)
     KNumInput* p = this;
     while(p) {
         p->doLayout();
-        w1 = QMAX(w1, p->m_colw1);
-        w2 = QMAX(w2, p->m_colw2);
+        w1 = TQMAX(w1, p->m_colw1);
+        w2 = TQMAX(w2, p->m_colw2);
         p = p->m_prev;
     }
 
     p = m_next;
     while(p) {
         p->doLayout();
-        w1 = QMAX(w1, p->m_colw1);
-        w2 = QMAX(w2, p->m_colw2);
+        w1 = TQMAX(w1, p->m_colw1);
+        w2 = TQMAX(w2, p->m_colw2);
         p = p->m_next;
     }
 
@@ -425,20 +425,20 @@ TQSize KIntNumInput::minimumSizeHint() const
     int w;
     int h;
 
-    h = 2 + QMAX(m_sizeSpin.height(), m_sizeSlider.height());
+    h = 2 + TQMAX(m_sizeSpin.height(), m_sizeSlider.height());
 
     // if in extra row, then count it here
     if(m_label && (m_alignment & (AlignBottom|AlignTop)))
         h += 4 + m_sizeLabel.height();
     else
         // label is in the same row as the other widgets
-        h = QMAX(h, m_sizeLabel.height() + 2);
+        h = TQMAX(h, m_sizeLabel.height() + 2);
 
     w = m_slider ? m_slider->sizeHint().width() + 8 : 0;
     w += m_colw1 + m_colw2;
 
     if(m_alignment & (AlignTop|AlignBottom))
-        w = QMAX(w, m_sizeLabel.width() + 4);
+        w = TQMAX(w, m_sizeLabel.width() + 4);
 
     return TQSize(w, h);
 }
@@ -467,7 +467,7 @@ void KIntNumInput::resizeEvent(TQResizeEvent* e)
 
     if (tqApp->reverseLayout())
     {
-        m_spin->setGeometry(w, h, m_slider ? m_colw2 : QMAX(m_colw2, e->size().width() - w), m_sizeSpin.height());
+        m_spin->setGeometry(w, h, m_slider ? m_colw2 : TQMAX(m_colw2, e->size().width() - w), m_sizeSpin.height());
         w += m_colw2 + 8;
 
         if(m_slider)
@@ -478,7 +478,7 @@ void KIntNumInput::resizeEvent(TQResizeEvent* e)
         m_spin->setGeometry(w + m_slider->size().width() + KDialog::spacingHint(), h, m_colw2, m_sizeSpin.height());
     }
     else {
-        m_spin->setGeometry(w, h, QMAX(m_colw2, e->size().width() - w), m_sizeSpin.height());
+        m_spin->setGeometry(w, h, TQMAX(m_colw2, e->size().width() - w), m_sizeSpin.height());
     }
 
     h += m_sizeSpin.height() + 2;
@@ -666,20 +666,20 @@ TQSize KDoubleNumInput::minimumSizeHint() const
     int w;
     int h;
 
-    h = 2 + QMAX(m_sizeEdit.height(), m_sizeSlider.height());
+    h = 2 + TQMAX(m_sizeEdit.height(), m_sizeSlider.height());
 
     // if in extra row, then count it here
     if(m_label && (m_alignment & (AlignBottom|AlignTop)))
         h += 4 + m_sizeLabel.height();
     else
         // label is in the same row as the other widgets
-	h = QMAX(h, m_sizeLabel.height() + 2);
+	h = TQMAX(h, m_sizeLabel.height() + 2);
 
     w = m_slider ? m_slider->sizeHint().width() + 8 : 0;
     w += m_colw1 + m_colw2;
 
     if(m_alignment & (AlignTop|AlignBottom))
-        w = QMAX(w, m_sizeLabel.width() + 4);
+        w = TQMAX(w, m_sizeLabel.width() + 4);
 
     return TQSize(w, h);
 }
diff --git a/tdeui/kscrollview.cpp b/tdeui/kscrollview.cpp
index 40cbb8ee4..cf37c4403 100644
--- a/tdeui/kscrollview.cpp
+++ b/tdeui/kscrollview.cpp
@@ -177,7 +177,7 @@ void KScrollView::wheelEvent( TQWheelEvent *e )
 {
     int pageStep = verticalScrollBar()->pageStep();
     int lineStep = verticalScrollBar()->lineStep();
-    int step = QMIN( TQApplication::wheelScrollLines()*lineStep, pageStep );
+    int step = TQMIN( TQApplication::wheelScrollLines()*lineStep, pageStep );
     if ( ( e->state() & ControlButton ) || ( e->state() & ShiftButton ) )
         step = pageStep;
 
diff --git a/tdeui/ksharedpixmap.cpp b/tdeui/ksharedpixmap.cpp
index d9b6a6954..65e8dc508 100644
--- a/tdeui/ksharedpixmap.cpp
+++ b/tdeui/ksharedpixmap.cpp
@@ -199,9 +199,9 @@ bool TDESharedPixmap::x11Event(XEvent *event)
     }
 
     unsigned w = d->rect.width(), h = d->rect.height();
-    unsigned tw = QMIN(width, w), th = QMIN(height, h);
+    unsigned tw = TQMIN(width, w), th = TQMIN(height, h);
     unsigned xa = d->rect.x() % width, ya = d->rect.y() % height;
-    unsigned t1w = QMIN(width-xa,tw), t1h = QMIN(height-ya,th);
+    unsigned t1w = TQMIN(width-xa,tw), t1h = TQMIN(height-ya,th);
 
     TQPixmap::resize( tw+origin.x(), th+origin.y() );
 
diff --git a/tdeui/ksyntaxhighlighter.cpp b/tdeui/ksyntaxhighlighter.cpp
index 94606ca06..9e63fc929 100644
--- a/tdeui/ksyntaxhighlighter.cpp
+++ b/tdeui/ksyntaxhighlighter.cpp
@@ -293,7 +293,7 @@ KDictSpellingHighlighter::KDictSpellingHighlighter( TQTextEdit *textEdit,
     TDEConfig *config = TDEGlobal::config();
     TDEConfigGroupSaver cs( config, "KSpell" );
     d->disablePercentage = config->readNumEntry( "KSpell_AsYouTypeDisablePercentage", 42 );
-    d->disablePercentage = QMIN( d->disablePercentage, 101 );
+    d->disablePercentage = TQMIN( d->disablePercentage, 101 );
     d->disableWordCount = config->readNumEntry( "KSpell_AsYouTypeDisableWordCount", 100 );
 
     textEdit->installEventFilter( this );
diff --git a/tdeui/ktabwidget.cpp b/tdeui/ktabwidget.cpp
index 4e043ed09..f1f507609 100644
--- a/tdeui/ktabwidget.cpp
+++ b/tdeui/ktabwidget.cpp
@@ -188,7 +188,7 @@ unsigned int KTabWidget::tabBarWidthForMaxChars( uint maxLength )
         if ( tab->iconSet() )
           iw = tab->iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).width() + 4;
         x += ( tabBar()->style().tqsizeFromContents( TQStyle::CT_TabBarTab, this,
-                   TQSize( QMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ),
+                   TQSize( TQMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ),
                    TQStyleOption( tab ) ) ).width();
     }
     return x;
@@ -265,9 +265,9 @@ void KTabWidget::resizeTabs( int changeTabIndex )
 
         int tabBarHeight = tabBar()->sizeHint().height();
         if ( cornerWidget( TopLeft ) && cornerWidget( TopLeft )->isVisible() )
-            lcw = QMAX( cornerWidget( TopLeft )->width(), tabBarHeight );
+            lcw = TQMAX( cornerWidget( TopLeft )->width(), tabBarHeight );
         if ( cornerWidget( TopRight ) && cornerWidget( TopRight )->isVisible() )
-            rcw = QMAX( cornerWidget( TopRight )->width(), tabBarHeight );
+            rcw = TQMAX( cornerWidget( TopRight )->width(), tabBarHeight );
 
         uint maxTabBarWidth = width() - lcw - rcw;
 
diff --git a/tdeui/kurllabel.cpp b/tdeui/kurllabel.cpp
index 749b4f5b5..539984466 100644
--- a/tdeui/kurllabel.cpp
+++ b/tdeui/kurllabel.cpp
@@ -410,14 +410,14 @@ TQRect KURLLabel::activeRect() const
   int hAlign = TQApplication::horizontalAlignment( alignment() );
   int indentX = (hAlign && indent()>0) ? indent() : 0;
   TQFontMetrics fm(font());
-  r.setWidth( QMIN(fm.width(text()), r.width()));
+  r.setWidth( TQMIN(fm.width(text()), r.width()));
   if ( hAlign & AlignLeft )
       r.moveLeft(r.left() + indentX);
   if ( hAlign & AlignCenter )
       r.moveLeft((contentsRect().width()-r.width())/2+margin());
   if ( hAlign & AlignRight )
       r.moveLeft(contentsRect().width()-r.width()-indentX+margin());
-  int add = QMIN(3, margin());
+  int add = TQMIN(3, margin());
   r = TQRect(r.left()-add, r.top()-add, r.width()+2*add, r.height()+2*add);
   return r;
 }
diff --git a/tdeui/kwordwrap.cpp b/tdeui/kwordwrap.cpp
index d104b421a..de031c966 100644
--- a/tdeui/kwordwrap.cpp
+++ b/tdeui/kwordwrap.cpp
@@ -103,7 +103,7 @@ KWordWrap* KWordWrap::formatText( TQFontMetrics &fm, const TQRect & r, int /*fla
             kw->m_breakPositions.append( breakAt );
             int thisLineWidth = lastBreak == -1 ? x + ww : lineWidth;
             kw->m_lineWidths.append( thisLineWidth );
-            textwidth = QMAX( textwidth, thisLineWidth );
+            textwidth = TQMAX( textwidth, thisLineWidth );
             x = 0;
             y += height;
             wasBreakable = true;
@@ -124,7 +124,7 @@ KWordWrap* KWordWrap::formatText( TQFontMetrics &fm, const TQRect & r, int /*fla
         wasBreakable = isBreakable;
         wasParens = isParens;
     }
-    textwidth = QMAX( textwidth, x );
+    textwidth = TQMAX( textwidth, x );
     kw->m_lineWidths.append( x );
     y += height;
     //kdDebug() << "KWordWrap::formatText boundingRect:" << r.x() << "," << r.y() << " " << textwidth << "x" << y << endl;
@@ -135,7 +135,7 @@ KWordWrap* KWordWrap::formatText( TQFontMetrics &fm, const TQRect & r, int /*fla
     {
         while ( realY > r.height() )
             realY -= height;
-        realY = QMAX( realY, 0 );
+        realY = TQMAX( realY, 0 );
     }
     kw->m_boundingRect.setRect( 0, 0, textwidth, realY );
     return kw;
diff --git a/tdeui/tdeaboutdialog.cpp b/tdeui/tdeaboutdialog.cpp
index 895247161..d0ab3dc3d 100644
--- a/tdeui/tdeaboutdialog.cpp
+++ b/tdeui/tdeaboutdialog.cpp
@@ -1105,7 +1105,7 @@ TDEAboutContributor::sizeHint()
   TQRect rect;
   // ----- first calculate name and email width:
   maxx=name->sizeHint().width();
-  maxx=QMAX(maxx, email->sizeHint().width()+WORKTEXT_IDENTATION);
+  maxx=TQMAX(maxx, email->sizeHint().width()+WORKTEXT_IDENTATION);
   // ----- now determine "work" text rectangle:
   if(!work.isEmpty()) // save time
     {
@@ -1116,7 +1116,7 @@ TDEAboutContributor::sizeHint()
   {
     maxx=WorkTextWidth+WORKTEXT_IDENTATION;
   }
-  maxx=QMAX(maxx, url->sizeHint().width()+WORKTEXT_IDENTATION);
+  maxx=TQMAX(maxx, url->sizeHint().width()+WORKTEXT_IDENTATION);
   // -----
   maxy=2*(name->sizeHint().height()+Grid); // need a space above the KURLLabels
   maxy+=/* email */ name->sizeHint().height();
@@ -1193,8 +1193,8 @@ TQSize TDEAboutContributor::sizeHint( void )
   int m = frameWidth();
 
   int w = name->sizeHint().width();
-  w = QMAX( w, email->sizeHint().width()+s);
-  w = QMAX( w, url->sizeHint().width()+s);
+  w = TQMAX( w, email->sizeHint().width()+s);
+  w = TQMAX( w, url->sizeHint().width()+s);
 
   if( work.isEmpty() == false )
   {
@@ -1203,9 +1203,9 @@ TQSize TDEAboutContributor::sizeHint( void )
       (0, 0, WorkTextWidth, 32000, WordBreak | AlignLeft, work);
     if( w < r.width() )
     {
-      w = QMAX( w, WorkTextWidth+s );
+      w = TQMAX( w, WorkTextWidth+s );
     }
-    h += QMAX( fontMetrics().lineSpacing(), r.height() ) + s;
+    h += TQMAX( fontMetrics().lineSpacing(), r.height() ) + s;
   }
   return( TQSize( w + 2*m, h + 2*m ) );
 
@@ -1216,8 +1216,8 @@ TQSize TDEAboutContributor::sizeHint( void )
   int h = ls * 3 + s * 2;
   int w = name->sizeHint().width();
 
-  w = QMAX( w, email->sizeHint().width()+WORKTEXT_IDENTATION);
-  w = QMAX( w, url->sizeHint().width()+WORKTEXT_IDENTATION);
+  w = TQMAX( w, email->sizeHint().width()+WORKTEXT_IDENTATION);
+  w = TQMAX( w, url->sizeHint().width()+WORKTEXT_IDENTATION);
   if( work.isEmpty() == false )
   {
     const int WorkTextWidth=200;
@@ -1226,7 +1226,7 @@ TQSize TDEAboutContributor::sizeHint( void )
       (0, 0, WorkTextWidth, 32000, WordBreak | AlignLeft, work);
     if( w < r.width() )
     {
-      w = QMAX( w, WorkTextWidth + WORKTEXT_IDENTATION );
+      w = TQMAX( w, WorkTextWidth + WORKTEXT_IDENTATION );
     }
     h += r.height() + s;
   }
@@ -1361,15 +1361,15 @@ TDEAboutWidget::adjust()
   logo->adjustSize();
   cy=version->sizeHint().height()+Grid;
   cx=logo->width();
-  tempx=QMAX(total_size.width(), maintWidth);
+  tempx=TQMAX(total_size.width(), maintWidth);
   cx+=Grid+tempx;
-  cx=QMAX(cx, version->sizeHint().width());
-  cy+=QMAX(logo->height(),
+  cx=TQMAX(cx, version->sizeHint().width());
+  cy+=TQMAX(logo->height(),
 	   total_size.height()+(showMaintainer ? Grid+maintHeight : 0));
   // -----
   if(!contributors.isEmpty())
     {
-      cx=QMAX(cx, cont->sizeHint().width());
+      cx=TQMAX(cx, cont->sizeHint().width());
       cy+=cont->sizeHint().height()+Grid;
       TQPtrListIterator<TDEAboutContributor> _pos(contributors);
       TDEAboutContributor* currEntry;
@@ -1472,7 +1472,7 @@ TDEAboutWidget::resizeEvent(TQResizeEvent*)
   maintainer->setGeometry
     (tempx, _y+author->height()+Grid, cx, maintainer->sizeHint().height());
 
-  _y+=QMAX(logo->height(),
+  _y+=TQMAX(logo->height(),
 	  author->height()+(showMaintainer ? Grid+maintainer->height() : 0));
   // -----
   if(!contributors.isEmpty())
diff --git a/tdeui/tdecompletionbox.cpp b/tdeui/tdecompletionbox.cpp
index 96c9c1794..a8a2bd237 100644
--- a/tdeui/tdecompletionbox.cpp
+++ b/tdeui/tdecompletionbox.cpp
@@ -333,10 +333,10 @@ TQRect TDECompletionBox::calculateGeometry() const
 {
     int x = 0, y = 0;
     int ih = itemHeight();
-    int h = QMIN( 15 * ih, (int) count() * ih ) + 2*frameWidth();
+    int h = TQMIN( 15 * ih, (int) count() * ih ) + 2*frameWidth();
 
     int w = (d->m_parent) ? d->m_parent->width() : TDEListBox::minimumSizeHint().width();
-    w = QMAX( TDEListBox::minimumSizeHint().width(), w );
+    w = TQMAX( TDEListBox::minimumSizeHint().width(), w );
 
     //If we're inside a combox, Qt by default makes the dropdown
     // as wide as the combo, and gives the style a chance
@@ -348,7 +348,7 @@ TQRect TDECompletionBox::calculateGeometry() const
         const TQComboBox* cb = static_cast<const TQComboBox*>(TQT_TQWIDGET_CONST(combo));
 
         //Expand to the combo width
-        w = QMAX( w, cb->width() );
+        w = TQMAX( w, cb->width() );
 
         TQPoint parentCorner = d->m_parent->mapToGlobal(TQPoint(0, 0));
         TQPoint comboCorner  = cb->mapToGlobal(TQPoint(0, 0));
diff --git a/tdeui/tdefontdialog.cpp b/tdeui/tdefontdialog.cpp
index 75f4599e0..fcd50b16e 100644
--- a/tdeui/tdefontdialog.cpp
+++ b/tdeui/tdefontdialog.cpp
@@ -62,7 +62,7 @@ static int minimumListWidth( const TQListBox *list )
   for( uint i=0; i<list->count(); i++ )
   {
     int itemWidth = list->item(i)->width(list);
-    w = QMAX(w,itemWidth);
+    w = TQMAX(w,itemWidth);
   }
   if( w == 0 ) { w = 40; }
   w += list->frameWidth() * 2;
diff --git a/tdeui/tdemainwindow.cpp b/tdeui/tdemainwindow.cpp
index a5dde30e3..51d873bd0 100644
--- a/tdeui/tdemainwindow.cpp
+++ b/tdeui/tdemainwindow.cpp
@@ -292,10 +292,10 @@ void TDEMainWindow::parseGeometry(bool parsewidth)
             w = width();
         if ( !(m & HeightValue) )
             h = height();
-         w = QMIN(w,maxSize.width());
-         h = QMIN(h,maxSize.height());
-         w = QMAX(w,minSize.width());
-         h = QMAX(h,minSize.height());
+         w = TQMIN(w,maxSize.width());
+         h = TQMIN(h,maxSize.height());
+         w = TQMAX(w,minSize.width());
+         h = TQMAX(h,minSize.height());
          resize(w, h);
     } else {
         if ( parsewidth && !(m & XValue) )
diff --git a/tdeui/tdepopupmenu.cpp b/tdeui/tdepopupmenu.cpp
index 46d5c758f..3fd8a90e2 100644
--- a/tdeui/tdepopupmenu.cpp
+++ b/tdeui/tdepopupmenu.cpp
@@ -82,7 +82,7 @@ void TDEPopupTitle::calcSize()
     TQFont f = font();
     f.setBold(true);
     int w = miniicon.width()+TQFontMetrics(f).width(titleStr);
-    int h = QMAX( fontMetrics().height(), miniicon.height() );
+    int h = TQMAX( fontMetrics().height(), miniicon.height() );
     setMinimumSize( w+16, h+8 );
 }
 
diff --git a/tdeui/tdespell.cpp b/tdeui/tdespell.cpp
index d764fa89d..e5d21d45b 100644
--- a/tdeui/tdespell.cpp
+++ b/tdeui/tdespell.cpp
@@ -1219,7 +1219,7 @@ void KSpell::dialog( const TQString & word, TQStringList & sugg, const char *_sl
   // the RichText display and highlight the possibly wrong word
   TQString marker( "_MARKER_" );
   tmpBuf.replace( lastpos, word.length(), marker );
-  TQString context = tmpBuf.mid(QMAX(lastpos-18,0), 2*18+marker.length());
+  TQString context = tmpBuf.mid(TQMAX(lastpos-18,0), 2*18+marker.length());
   context.replace( '\n',TQString::fromLatin1(" "));
   context.replace( '<', TQString::fromLatin1("&lt;") );
   context.replace( '>', TQString::fromLatin1("&gt;") );