Fix remnant QMIN/QMAX to TQMIN/TQMAX.

7 files changed, 20 insertions, 20 deletions

diff --git a/tdeio/tdefile/kurlbar.cpp b/tdeio/tdefile/kurlbar.cpp
index 88b050db4..6eb823e00 100644
--- a/tdeio/tdefile/kurlbar.cpp
+++ b/tdeio/tdefile/kurlbar.cpp
@@ -209,7 +209,7 @@ void KURLBarItem::paint( TQPainter *p )
         // ### mostly cut & paste of TQListBoxPixmap::paint() until Qt 3.1
         // (where it will properly use pixmap() instead of the internal pixmap)
         const TQPixmap *pm = pixmap();
-        int yPos = QMAX( 0, (height(box) - pm->height())/2 );
+        int yPos = TQMAX( 0, (height(box) - pm->height())/2 );
 
         p->drawPixmap( margin, yPos, *pm );
         if ( !text().isEmpty() ) {
@@ -245,7 +245,7 @@ void KURLBarItem::paint( TQPainter *p )
 
         if ( !pm->isNull() ) {
             int x = (w - pm->width()) / 2;
-            x = QMAX( x, margin );
+            x = TQMAX( x, margin );
             p->drawPixmap( x, y, *pm );
         }
 
@@ -256,7 +256,7 @@ void KURLBarItem::paint( TQPainter *p )
             int stringWidth = box->width() - (margin * 2);
             TQString visibleText = KStringHandler::rPixelSqueeze( text(), fm, stringWidth );
             int x = (w - fm.width( visibleText )) / 2;
-            x = QMAX( x, margin );
+            x = TQMAX( x, margin );
 
             if ( isCurrent() || isSelected() ) {
                 p->setPen( box->colorGroup().highlight().dark(115) );
@@ -281,14 +281,14 @@ TQSize KURLBarItem::sizeHint() const
         hmin = TQListBoxPixmap::height( lb ) + KDialog::spacingHint() * 2;
     }
     else {
-        wmin = QMAX(lb->fontMetrics().width(text()), pixmap()->width()) + KDialog::spacingHint() * 2;
+        wmin = TQMAX(lb->fontMetrics().width(text()), pixmap()->width()) + KDialog::spacingHint() * 2;
         hmin = lb->fontMetrics().lineSpacing() + pixmap()->height() + KDialog::spacingHint() * 2;
     }
 
     if ( lb->isVertical() )
-        wmin = QMIN( wmin, lb->viewport()->sizeHint().width() );
+        wmin = TQMIN( wmin, lb->viewport()->sizeHint().width() );
     else
-        hmin = QMIN( hmin, lb->viewport()->sizeHint().height() );
+        hmin = TQMIN( hmin, lb->viewport()->sizeHint().height() );
 
     return TQSize( wmin, hmin );
 }
@@ -296,7 +296,7 @@ TQSize KURLBarItem::sizeHint() const
 int KURLBarItem::width( const TQListBox *lb ) const
 {
     if ( static_cast<const KURLBarListBox *>( lb )->isVertical() )
-        return QMAX( sizeHint().width(), lb->viewport()->width() );
+        return TQMAX( sizeHint().width(), lb->viewport()->width() );
     else
         return sizeHint().width();
 }
@@ -306,7 +306,7 @@ int KURLBarItem::height( const TQListBox *lb ) const
     if ( static_cast<const KURLBarListBox *>( lb )->isVertical() )
         return sizeHint().height();
     else
-        return QMAX( sizeHint().height(), lb->viewport()->height() );
+        return TQMAX( sizeHint().height(), lb->viewport()->height() );
 }
 
 bool KURLBarItem::isPersistent() const
@@ -489,12 +489,12 @@ TQSize KURLBar::sizeHint() const
         TQSize sh = item->sizeHint();
 
         if ( vertical ) {
-            w = QMAX( w, sh.width() );
+            w = TQMAX( w, sh.width() );
             h += sh.height();
         }
         else {
             w += sh.width();
-            h = QMAX( h, sh.height() );
+            h = TQMAX( h, sh.height() );
         }
     }
 
diff --git a/tdeio/tdefile/tdefilemetainfowidget.cpp b/tdeio/tdefile/tdefilemetainfowidget.cpp
index 50fef856b..4590ee381 100644
--- a/tdeio/tdefile/tdefilemetainfowidget.cpp
+++ b/tdeio/tdefile/tdefilemetainfowidget.cpp
@@ -207,7 +207,7 @@ TQWidget* KFileMetaInfoWidget::makeIntWidget()
 
     // make sure that an uint cannot be set to a value < 0
     if (m_item.type() == TQVariant::UInt)
-        sb->setMinValue(QMAX(sb->minValue(), 0));
+        sb->setMinValue(TQMAX(sb->minValue(), 0));
 
     connect(sb, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged(int)));
     return sb;
diff --git a/tdeio/tdeio/dataprotocol.cpp b/tdeio/tdeio/dataprotocol.cpp
index 8478ea0cb..62ba52a6b 100644
--- a/tdeio/tdeio/dataprotocol.cpp
+++ b/tdeio/tdeio/dataprotocol.cpp
@@ -266,7 +266,7 @@ void DataProtocol::get(const KURL& url) {
   parseDataHeader(url,hdr);
 
   int size = (int)hdr.url.length();
-  int data_ofs = QMIN(hdr.data_offset,size);
+  int data_ofs = TQMIN(hdr.data_offset,size);
   // FIXME: string is copied, would be nice if we could have a reference only
   TQString url_data = hdr.url.mid(data_ofs);
   TQCString outData;
diff --git a/tdeio/tdeio/klimitediodevice.h b/tdeio/tdeio/klimitediodevice.h
index 602ba45a0..3dc6c80f3 100644
--- a/tdeio/tdeio/klimitediodevice.h
+++ b/tdeio/tdeio/klimitediodevice.h
@@ -92,7 +92,7 @@ public:
     virtual Offset at() const { return m_dev->at() - m_start; }
     virtual bool at( Offset pos ) {
         Q_ASSERT( pos <= m_length );
-        pos = QMIN( pos, m_length ); // Apply upper limit
+        pos = TQMIN( pos, m_length ); // Apply upper limit
         return m_dev->at( m_start + pos );
     }
     virtual bool atEnd() const { return m_dev->atEnd() || m_dev->at() >= m_start + m_length; }
diff --git a/tdeio/tdeio/ktar.cpp b/tdeio/tdeio/ktar.cpp
index cb5bba1fa..058d328b7 100644
--- a/tdeio/tdeio/ktar.cpp
+++ b/tdeio/tdeio/ktar.cpp
@@ -238,7 +238,7 @@ bool KTar::readLonglink(char *buffer,TQCString &longlink) {
   dummy = longlink.data();
   int offset = 0;
   while (size > 0) {
-    int chunksize = QMIN(size, 0x200);
+    int chunksize = TQMIN(size, 0x200);
     n = dev->readBlock( dummy + offset, chunksize );
     if (n == -1) return false;
     size -= chunksize;
@@ -744,7 +744,7 @@ void KTar::writeLonglink(char *buffer, const TQCString &name, char typeflag,
   device()->writeBlock( buffer, 0x200 );
   int offset = 0;
   while (namelen > 0) {
-    int chunksize = QMIN(namelen, 0x200);
+    int chunksize = TQMIN(namelen, 0x200);
     memcpy(buffer, name.data()+offset, chunksize);
     // write long name
     device()->writeBlock( buffer, 0x200 );
diff --git a/tdeio/tdeio/kzip.cpp b/tdeio/tdeio/kzip.cpp
index 85dcb76d1..23052ce51 100644
--- a/tdeio/tdeio/kzip.cpp
+++ b/tdeio/tdeio/kzip.cpp
@@ -492,7 +492,7 @@ kdDebug(7040) << "dev->at() now : " << dev->at() << endl;
             // skip rest of extra field in case it is too long
             unsigned int extraFieldEnd = dev->at() + extralen;
 	    pfi->extralen = extralen;
-	    int handledextralen = QMIN(extralen, (int)sizeof buffer);
+	    int handledextralen = TQMIN(extralen, (int)sizeof buffer);
 
 	    kdDebug(7040) << "handledextralen: " << handledextralen << endl;
 
diff --git a/tdeio/tdeio/tdeprotocolmanager.cpp b/tdeio/tdeio/tdeprotocolmanager.cpp
index 65ad393a3..04d0de5bb 100644
--- a/tdeio/tdeio/tdeprotocolmanager.cpp
+++ b/tdeio/tdeio/tdeprotocolmanager.cpp
@@ -114,7 +114,7 @@ int KProtocolManager::readTimeout()
   TDEConfig *cfg = config();
   cfg->setGroup( TQString::null );
   int val = cfg->readNumEntry( "ReadTimeout", DEFAULT_READ_TIMEOUT );
-  return QMAX(MIN_TIMEOUT_VALUE, val);
+  return TQMAX(MIN_TIMEOUT_VALUE, val);
 }
 
 int KProtocolManager::connectTimeout()
@@ -122,7 +122,7 @@ int KProtocolManager::connectTimeout()
   TDEConfig *cfg = config();
   cfg->setGroup( TQString::null );
   int val = cfg->readNumEntry( "ConnectTimeout", DEFAULT_CONNECT_TIMEOUT );
-  return QMAX(MIN_TIMEOUT_VALUE, val);
+  return TQMAX(MIN_TIMEOUT_VALUE, val);
 }
 
 int KProtocolManager::proxyConnectTimeout()
@@ -130,7 +130,7 @@ int KProtocolManager::proxyConnectTimeout()
   TDEConfig *cfg = config();
   cfg->setGroup( TQString::null );
   int val = cfg->readNumEntry( "ProxyConnectTimeout", DEFAULT_PROXY_CONNECT_TIMEOUT );
-  return QMAX(MIN_TIMEOUT_VALUE, val);
+  return TQMAX(MIN_TIMEOUT_VALUE, val);
 }
 
 int KProtocolManager::responseTimeout()
@@ -138,7 +138,7 @@ int KProtocolManager::responseTimeout()
   TDEConfig *cfg = config();
   cfg->setGroup( TQString::null );
   int val = cfg->readNumEntry( "ResponseTimeout", DEFAULT_RESPONSE_TIMEOUT );
-  return QMAX(MIN_TIMEOUT_VALUE, val);
+  return TQMAX(MIN_TIMEOUT_VALUE, val);
 }
 
 /*========================== PROXY SETTINGS =================================*/