Fix kdelibs FTBFS on native TQt3

36 files changed, 155 insertions, 155 deletions

diff --git a/dcop/client/dcop.cpp b/dcop/client/dcop.cpp
index 4086d75b3..0eafb5055 100644
--- a/dcop/client/dcop.cpp
+++ b/dcop/client/dcop.cpp
@@ -672,7 +672,7 @@ int runDCOP( QCStringList args, UserList users, Session session,
 	    if( !success )
 	    {
 		cerr_ << "ERROR: Couldn't attach to DCOP server!" << endl;
-		retval = QMAX( retval, 1 );
+		retval = TQMAX( retval, 1 );
 		if( users.isEmpty() )
 		    break;
 		else
@@ -725,7 +725,7 @@ int runDCOP( QCStringList args, UserList users, Session session,
 			if( !buf.isNull() )
 			{
 			    int res = callFunction( app, objid, function, params );
-			    retval = QMAX( retval, res );
+			    retval = TQMAX( retval, res );
 			}
 		    }
 		}
@@ -734,7 +734,7 @@ int runDCOP( QCStringList args, UserList users, Session session,
 		    // Just call function
 //		    cout_ << "call " << app << ", " << objid << ", " << function << ", (params)" << endl;
 		    int res = callFunction( app, objid, function, params );
-		    retval = QMAX( retval, res );
+		    retval = TQMAX( retval, res );
 		}
 		break;
 	    }
diff --git a/dcop/dcopclient.cpp b/dcop/dcopclient.cpp
index 6a2bb3c98..ae1b85f9f 100644
--- a/dcop/dcopclient.cpp
+++ b/dcop/dcopclient.cpp
@@ -782,7 +782,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
                 emit attachFailed(TQString::tqfromLatin1( "Could not read network connection list.\n" )+TQFile::decodeName(fName));
                 return false;
             }
-            int size = QMIN( (qint64)1024, f.size() ); // protection against a huge file
+            int size = TQMIN( (qint64)1024, f.size() ); // protection against a huge file
             TQCString contents( size+1 );
             if ( f.readBlock( contents.data(), size ) != size )
             {
diff --git a/kimgio/rgb.h b/kimgio/rgb.h
index 4bcc3191a..3666be2bd 100644
--- a/kimgio/rgb.h
+++ b/kimgio/rgb.h
@@ -76,7 +76,7 @@ private:
 
 	TQ_UINT32		*m_starttab;
 	TQ_UINT32		*m_lengthtab;
-	QByteArray		m_data;
+	TQByteArray		m_data;
 	TQByteArray::Iterator	m_pos;
 	RLEMap			m_rlemap;
 	TQPtrVector<RLEData>	m_rlevector;
diff --git a/kmdi/kmdichildarea.cpp b/kmdi/kmdichildarea.cpp
index 491afc06b..b65f69435 100644
--- a/kmdi/kmdichildarea.cpp
+++ b/kmdi/kmdichildarea.cpp
@@ -194,7 +194,7 @@ void KMdiChildArea::setTopChild( KMdiChildFrm* child, bool /* bSetFocus */ )
 		m_pZ->append( child );
 		
 		int nChildAreaMinW = 0, nChildAreaMinH = 0;
-		int nChildAreaMaxW = QWIDGETSIZE_MAX, nChildAreaMaxH = QWIDGETSIZE_MAX;
+		int nChildAreaMaxW = TQWIDGETSIZE_MAX, nChildAreaMaxH = TQWIDGETSIZE_MAX;
 		if ( topChildMaximized && child->m_pClient )
 		{
 			//the former top child is maximized, so maximize the new one
diff --git a/kmdi/kmdichildfrm.cpp b/kmdi/kmdichildfrm.cpp
index 8221082b5..1345493c6 100644
--- a/kmdi/kmdichildfrm.cpp
+++ b/kmdi/kmdichildfrm.cpp
@@ -323,8 +323,8 @@ void KMdiChildFrm::resizeWindow( int resizeCorner, int xPos, int yPos )
 	// Calculate the minimum width & height
 	int minWidth = 0;
 	int minHeight = 0;
-	int maxWidth = QWIDGETSIZE_MAX;
-	int maxHeight = QWIDGETSIZE_MAX;
+	int maxWidth = TQWIDGETSIZE_MAX;
+	int maxHeight = TQWIDGETSIZE_MAX;
 	
 	// it could be the client forces the childframe to enlarge its minimum size
 	if ( m_pClient )
@@ -562,7 +562,7 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
 				{
 					m_pClient->tqlayout() ->setResizeMode( m_oldLayoutResizeMode );
 				}
-				setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX );
+				setMaximumSize( TQWIDGETSIZE_MAX, TQWIDGETSIZE_MAX );
 				// reset to maximize-captionbar
 				m_pMaximize->setPixmap( *m_pRestoreButtonPixmap );
 				m_pMinimize->setPixmap( *m_pMinButtonPixmap );
@@ -582,7 +582,7 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
 				m_pClient->m_stateChanged = true;
 				m_state = state;
 				// client min / max size / layout behavior don't change
-				setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX );
+				setMaximumSize( TQWIDGETSIZE_MAX, TQWIDGETSIZE_MAX );
 				m_pMaximize->setPixmap( *m_pRestoreButtonPixmap );
 				int nFrameWidth = KMDI_CHILDFRM_DOUBLE_BORDER;
 				int nFrameHeight = KMDI_CHILDFRM_DOUBLE_BORDER + KMDI_CHILDFRM_SEPARATOR +
@@ -664,7 +664,7 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
 	else
 	{
 		m_pManager->setMinimumSize( 0, 0 );
-		m_pManager->setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX );
+		m_pManager->setMaximumSize( TQWIDGETSIZE_MAX, TQWIDGETSIZE_MAX );
 	}
 }
 
@@ -782,7 +782,7 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize )
 		TQSize mincs = w->tqminimumSize();
 		TQSize maxcs = w->tqmaximumSize();
 		w->setMinimumSize( 0, 0 );
-		w->setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX );
+		w->setMaximumSize( TQWIDGETSIZE_MAX, TQWIDGETSIZE_MAX );
 
 		// min/max sizes, flags, DND get lost. :-(
 		w->reparent( this, 0, pnt2, w->isVisible() );
diff --git a/kmdi/kmdichildview.cpp b/kmdi/kmdichildview.cpp
index 7b626d027..cda168fb8 100644
--- a/kmdi/kmdichildview.cpp
+++ b/kmdi/kmdichildview.cpp
@@ -729,12 +729,12 @@ void KMdiChildView::setMaximumSize( int maxw, int maxh )
 	if ( mdiParent() && mdiParent()->state() == KMdiChildFrm::Normal )
 	{
 		int w = maxw + KMDI_CHILDFRM_DOUBLE_BORDER;
-		if ( w > QWIDGETSIZE_MAX )
-			w = QWIDGETSIZE_MAX;
+		if ( w > TQWIDGETSIZE_MAX )
+			w = TQWIDGETSIZE_MAX;
 
 		int h = maxh + KMDI_CHILDFRM_DOUBLE_BORDER + KMDI_CHILDFRM_SEPARATOR + mdiParent() ->captionHeight();
-		if ( h > QWIDGETSIZE_MAX )
-			h = QWIDGETSIZE_MAX;
+		if ( h > TQWIDGETSIZE_MAX )
+			h = TQWIDGETSIZE_MAX;
 
 		mdiParent()->setMaximumSize( w, h );
 	}
diff --git a/kstyles/asteroid/asteroid.cpp b/kstyles/asteroid/asteroid.cpp
index 76a5c0d6c..35e6f3b7a 100644
--- a/kstyles/asteroid/asteroid.cpp
+++ b/kstyles/asteroid/asteroid.cpp
@@ -355,7 +355,7 @@ void AsteroidStyle::tqdrawPrimitive(TQ_PrimitiveElement pe,
 
 		case PE_Splitter:
 		{
-			QPen oldPen = p->pen();
+			TQPen oldPen = p->pen();
 			p->setPen(cg.background());
 			p->drawRect(r);
 			p->setPen( cg.light() );
diff --git a/kstyles/keramik/keramik.cpp b/kstyles/keramik/keramik.cpp
index b18cdc192..c29aaa90e 100644
--- a/kstyles/keramik/keramik.cpp
+++ b/kstyles/keramik/keramik.cpp
@@ -956,7 +956,7 @@ void KeramikStyle::tqdrawPrimitive( TQ_PrimitiveElement pe,
 			if (kickerMode)
 			{
 				if (p->device() && p->device()->devType() == TQInternal::Widget &&
-											 TQCString(static_cast<TQWidget*>(static_cast<QWidget*>(static_cast<QPaintDevice*>(p->tqdevice())))->className()) == "FittsLawFrame" )
+											 TQCString(TQT_TQWIDGET(static_cast<TQPaintDevice*>(p->tqdevice()))->className()) == "FittsLawFrame" )
 				{
 					int x2 = x + r.width() - 1;
 					int y2 = y + r.height() - 1;
diff --git a/kstyles/kthemestyle/kthemebase.cpp b/kstyles/kthemestyle/kthemebase.cpp
index a4da66736..772dd41bc 100644
--- a/kstyles/kthemestyle/kthemebase.cpp
+++ b/kstyles/kthemestyle/kthemebase.cpp
@@ -231,7 +231,7 @@ union kthemeKey{
     unsigned int cacheKey;
 };
 
-#define KDE_TQBITMAP_TO_TQPAINTDEVICE(x) static_cast<const TQPaintDevice*>(static_cast<const QPaintDevice*>(static_cast<const QPixmap*>(static_cast<const QBitmap*>(x))))
+#define KDE_TQBITMAP_TO_TQPAINTDEVICE(x) TQT_TQPAINTDEVICE_CONST(static_cast<const TQPixmap*>(static_cast<const TQBitmap*>(x)))
 
 void KThemeBase::generateBorderPix( int i )
 {
diff --git a/kstyles/kthemestyle/kthemebase.h b/kstyles/kthemestyle/kthemebase.h
index 92ecd3929..96faf57d5 100644
--- a/kstyles/kthemestyle/kthemebase.h
+++ b/kstyles/kthemestyle/kthemebase.h
@@ -575,7 +575,7 @@ protected:
     virtual int tqstyleHint( StyleHint sh,
                            const TQWidget *widget = 0,
                            const TQStyleOption& opt = TQStyleOption::Default,
-                           QStyleHintReturn* returnData = 0 ) const
+                           TQStyleHintReturn* returnData = 0 ) const
     {
         return KStyle::tqstyleHint( sh,
                                   widget,
diff --git a/kstyles/kthemestyle/kthemestyle.cpp b/kstyles/kthemestyle/kthemestyle.cpp
index d986b0147..859165211 100644
--- a/kstyles/kthemestyle/kthemestyle.cpp
+++ b/kstyles/kthemestyle/kthemestyle.cpp
@@ -2185,7 +2185,7 @@ void KThemeStyle::drawBaseMask( TQPainter *p, int x, int y, int w, int h,
         p->fillRect( x, y, w, h, fillBrush );
 }
 
-int KThemeStyle::tqstyleHint( StyleHint sh, const TQWidget *w, const TQStyleOption &opt, QStyleHintReturn *shr ) const
+int KThemeStyle::tqstyleHint( StyleHint sh, const TQWidget *w, const TQStyleOption &opt, TQStyleHintReturn *shr ) const
 {
     switch ( sh )
     {
diff --git a/kstyles/kthemestyle/kthemestyle.h b/kstyles/kthemestyle/kthemestyle.h
index 0eba9dacc..4fbde91b1 100644
--- a/kstyles/kthemestyle/kthemestyle.h
+++ b/kstyles/kthemestyle/kthemestyle.h
@@ -122,7 +122,7 @@ public:
     virtual int tqstyleHint( StyleHint sh,
                            const TQWidget *widget = 0,
                            const TQStyleOption& = TQStyleOption::Default,
-                           QStyleHintReturn* returnData = 0 ) const;
+                           TQStyleHintReturn* returnData = 0 ) const;
 
     virtual TQSize tqsizeFromContents( ContentsType contents,
                                     const TQWidget *widget,
diff --git a/kstyles/plastik/plastik.cpp b/kstyles/plastik/plastik.cpp
index 1c6f5cd6a..4dd8f9cd1 100644
--- a/kstyles/plastik/plastik.cpp
+++ b/kstyles/plastik/plastik.cpp
@@ -886,7 +886,7 @@ void PlastikStyle::renderPanel(TQPainter *p,
 
     if (kickerMode &&
             p->tqdevice() && p->tqdevice()->devType() == TQInternal::Widget &&
-            TQCString(static_cast<TQWidget*>(static_cast<QWidget*>(static_cast<QPaintDevice*>(p->tqdevice())))->className()) == "FittsLawFrame") {
+            TQCString(TQT_TQWIDGET(static_cast<TQPaintDevice*>(p->tqdevice()))->className()) == "FittsLawFrame") {
     //  Stolen wholesale from Keramik. I don't like it, but oh well.
         if (sunken) {
             const TQCOORD corners[] = { x2, y, x2, y2, x, y2, x, y };
@@ -1819,7 +1819,7 @@ void PlastikStyle::tqdrawPrimitive(TQ_PrimitiveElement pe,
     // --------------
         case PE_Splitter: {
             // highlight on mouse over
-            TQColor color = (static_cast<QPaintDevice*>(static_cast<QWidget*>(hoverWidget)) == static_cast<QPaintDevice*>(p->tqdevice()))?TQColor(cg.background().light(100+_contrast)):cg.background();
+            TQColor color = (static_cast<TQPaintDevice*>(static_cast<TQWidget*>(hoverWidget)) == static_cast<TQPaintDevice*>(p->tqdevice()))?TQColor(cg.background().light(100+_contrast)):cg.background();
             p->fillRect(r, color);
             if (w > h) {
                 if (h > 4) {
diff --git a/kunittest/tester.cpp b/kunittest/tester.cpp
index ea8159421..55f9d541d 100644
--- a/kunittest/tester.cpp
+++ b/kunittest/tester.cpp
@@ -40,7 +40,7 @@ namespace KUnitTest
 
     void SlotTester::invokeMember(const TQString &str)
     {
-        TQString slotname = TQString::number(QSLOT_CODE) + str;
+        TQString slotname = TQString::number(TQSLOT_CODE) + str;
         connect(this, TQT_SIGNAL(invoke()), this, slotname.ascii());
         emit invoke();
         disconnect(this, TQT_SIGNAL(invoke()), this, slotname.ascii());
diff --git a/tdecore/kapplication.cpp b/tdecore/kapplication.cpp
index b56f683ea..5338cfccd 100644
--- a/tdecore/kapplication.cpp
+++ b/tdecore/kapplication.cpp
@@ -1774,7 +1774,7 @@ KApplication::~KApplication()
 
 
 #ifdef Q_WS_X11
-class KAppX11HackWidget: public QWidget
+class KAppX11HackWidget: public TQWidget
 {
 public:
     bool publicx11Event( XEvent * e) { return x11Event( e ); }
@@ -2786,14 +2786,14 @@ void KApplication::invokeMailer(const TQString &_to, const TQString &_cc, const
        // put the whole address lists into RFC2047 encoded blobs; technically
        // this isn't correct, but KMail understands it nonetheless
        to = TQString( "=?utf8?b?%1?=" )
-            .arg( QString(KCodecs::base64Encode( _to.utf8(), false )) );
+            .arg( TQString(KCodecs::base64Encode( _to.utf8(), false )) );
      }
      if ( !_cc.isEmpty() )
        cc = TQString( "=?utf8?b?%1?=" )
-            .arg( QString(KCodecs::base64Encode( _cc.utf8(), false )) );
+            .arg( TQString(KCodecs::base64Encode( _cc.utf8(), false )) );
      if ( !_bcc.isEmpty() )
        bcc = TQString( "=?utf8?b?%1?=" )
-             .arg( QString(KCodecs::base64Encode( _bcc.utf8(), false )) );
+             .arg( TQString(KCodecs::base64Encode( _bcc.utf8(), false )) );
    } else {
      to = _to;
      cc = _cc;
diff --git a/tdecore/kurl.cpp b/tdecore/kurl.cpp
index 52c8a807a..f6c3fd19b 100644
--- a/tdecore/kurl.cpp
+++ b/tdecore/kurl.cpp
@@ -112,7 +112,7 @@ static TQString encode( const TQString& segment, int encoding_offset, int encodi
 
     }
     else
-      new_segment[ new_length++ ] = (QChar)local[i];
+      new_segment[ new_length++ ] = (TQChar)local[i];
   }
 
   TQString result = TQString(new_segment, new_length);
@@ -183,7 +183,7 @@ static TQString lazy_encode( const TQString& segment, bool encodeAt=true )
         (character == '?') || // Start of query delimiter
         ((character == '@') && encodeAt) || // Username delimiter
         (character == '#') || // Start of reference delimiter
-        ((character == 32) && (i+1 == old_length || segment[i+1] == (QChar)' '))) // A trailing space
+        ((character == 32) && (i+1 == old_length || segment[i+1] == (TQChar)' '))) // A trailing space
     {
       new_segment[ new_length++ ] = '%';
 
@@ -657,7 +657,7 @@ void KURL::parse( const TQString& _url, int encoding_hint )
         goto NodeErr;
     if (alpha && buf[pos]==':' && (len==2 || (len>2 && (buf[pos+1]=='/' || buf[pos+1]=='\\'))))
 #else
-    if ( x == (QChar)'/' )
+    if ( x == (TQChar)'/' )
 #endif
     {
 	// A slash means we immediately proceed to parse it as a file URL.
@@ -673,9 +673,9 @@ void KURL::parse( const TQString& _url, int encoding_hint )
     // '.' is not currently accepted, because current KURL may be confused.
     // Proceed with :// :/ or :
     while( pos < len && (isalpha((int)buf[pos]) || isdigit((int)buf[pos]) ||
-			 buf[pos] == (QChar)'+' || buf[pos] == (QChar)'-')) pos++;
+			 buf[pos] == (TQChar)'+' || buf[pos] == (TQChar)'-')) pos++;
 
-    if (pos < len && buf[pos] == (QChar)':' )
+    if (pos < len && buf[pos] == (TQChar)':' )
     {
 	m_strProtocol = TQString( orig, pos ).lower();
 	if ( m_iUriMode == Auto )
@@ -715,10 +715,10 @@ void KURL::parseRawURI( const TQString& _url, int encoding_hint )
     // '.' is not currently accepted, because current KURL may be confused.
     // Proceed with :
     while( pos < len && (isalpha((int)buf[pos]) || isdigit((int)buf[pos]) ||
-			 buf[pos] == (QChar)'+' || buf[pos] == (QChar)'-')) pos++;
+			 buf[pos] == (TQChar)'+' || buf[pos] == (TQChar)'-')) pos++;
 
     // Note that m_strProtocol is already set here, so we just skip over the protocol.
-    if (pos < len && buf[pos] == (QChar)':' )
+    if (pos < len && buf[pos] == (TQChar)':' )
 	pos++;
     else { // can't happen, the caller checked all this already
 	reset();
@@ -776,9 +776,9 @@ void KURL::parseURL( const TQString& _url, int encoding_hint )
   const bool alpha = isalpha((int)x);
   if (alpha && len<2)
     goto NodeErr;
-  if (alpha && buf[pos]==(QChar)':' && (len==2 || (len>2 && (buf[pos+1]==(QChar)'/' || buf[pos+1]==(QChar)'\\'))))
+  if (alpha && buf[pos]==(TQChar)':' && (len==2 || (len>2 && (buf[pos+1]==(TQChar)'/' || buf[pos+1]==(TQChar)'\\'))))
 #else
-  if ( x == (QChar)'/' )
+  if ( x == (TQChar)'/' )
 #endif
     goto Node9;
   if ( !isalpha( (int)x ) )
@@ -788,14 +788,14 @@ void KURL::parseURL( const TQString& _url, int encoding_hint )
   // '.' is not currently accepted, because current KURL may be confused.
   // Proceed with :// :/ or :
   while( pos < len && (isalpha((int)buf[pos]) || isdigit((int)buf[pos]) ||
-          buf[pos] == (QChar)'+' || buf[pos] == (QChar)'-')) pos++;
+          buf[pos] == (TQChar)'+' || buf[pos] == (TQChar)'-')) pos++;
 
   // Note that m_strProtocol is already set here, so we just skip over the protocol.
-  if ( pos+2 < len && buf[pos] == (QChar)':' && buf[pos+1] == (QChar)'/' && buf[pos+2] == (QChar)'/' )
+  if ( pos+2 < len && buf[pos] == (TQChar)':' && buf[pos+1] == (TQChar)'/' && buf[pos+2] == (TQChar)'/' )
     {
       pos += 3;
     }
-  else if (pos+1 < len && buf[pos] == (QChar)':' ) // Need to always compare length()-1 otherwise KURL passes "http:" as legal!!
+  else if (pos+1 < len && buf[pos] == (TQChar)':' ) // Need to always compare length()-1 otherwise KURL passes "http:" as legal!!
     {
       pos++;
       start = pos;
@@ -810,13 +810,13 @@ void KURL::parseURL( const TQString& _url, int encoding_hint )
   start = pos;
 
   // Node 4: Accept any amount of characters.
-  if (buf[pos] == (QChar)'[')     // An IPv6 host follows.
+  if (buf[pos] == (TQChar)'[')     // An IPv6 host follows.
       goto Node8;
   // Terminate on / or @ or ? or # or " or ; or <
   x = buf[pos];
-  while( (x != (QChar)':') && (x != (QChar)'@') && (x != (QChar)'/') && (x != (QChar)'?') && (x != (QChar)'#') )
+  while( (x != (TQChar)':') && (x != (TQChar)'@') && (x != (TQChar)'/') && (x != (TQChar)'?') && (x != (TQChar)'#') )
   {
-     if ((x == (QChar)'\"') || (x == (QChar)';') || (x == (QChar)'<'))
+     if ((x == (TQChar)'\"') || (x == (TQChar)';') || (x == (TQChar)'<'))
         badHostName = true;
      if (++pos == len)
         break;
@@ -830,13 +830,13 @@ void KURL::parseURL( const TQString& _url, int encoding_hint )
       setHost(decode(TQString( buf + start, pos - start ), encoding_hint));
       goto NodeOk;
     }
-  if ( x == (QChar)'@' )
+  if ( x == (TQChar)'@' )
     {
       m_strUser = decode(TQString( buf + start, pos - start ), encoding_hint);
       pos++;
       goto Node7;
     }
-  else if ( (x == (QChar)'/') || (x == (QChar)'?') || (x == (QChar)'#'))
+  else if ( (x == (TQChar)'/') || (x == (TQChar)'?') || (x == (TQChar)'#'))
     {
       if (badHostName)
          goto NodeErr;
@@ -845,7 +845,7 @@ void KURL::parseURL( const TQString& _url, int encoding_hint )
       start = pos;
       goto Node9;
     }
-  else if ( x != (QChar)':' )
+  else if ( x != (TQChar)':' )
     goto NodeErr;
   m_strUser = decode(TQString( buf + start, pos - start ), encoding_hint);
   pos++;
@@ -857,13 +857,13 @@ void KURL::parseURL( const TQString& _url, int encoding_hint )
 
   // Node 6: Read everything until @, /, ? or #
   while( (pos < len) &&
-		(buf[pos] != (QChar)'@') &&
-		(buf[pos] != (QChar)'/') &&
-		(buf[pos] != (QChar)'?') &&
-		(buf[pos] != (QChar)'#')) pos++;
+		(buf[pos] != (TQChar)'@') &&
+		(buf[pos] != (TQChar)'/') &&
+		(buf[pos] != (TQChar)'?') &&
+		(buf[pos] != (TQChar)'#')) pos++;
   // If we now have a '@' the ':' seperates user and password.
   // Otherwise it seperates host and port.
-  if ( (pos == len) || (buf[pos] != (QChar)'@') )
+  if ( (pos == len) || (buf[pos] != (TQChar)'@') )
     {
       // Ok the : was used to separate host and port
       if (badHostName)
@@ -877,10 +877,10 @@ void KURL::parseURL( const TQString& _url, int encoding_hint )
         goto NodeOk;
       // there is more after the digits
       pos -= strlen(endptr);
-      if ((buf[pos] != (QChar)'@') &&
-          (buf[pos] != (QChar)'/') &&
-          (buf[pos] != (QChar)'?') &&
-          (buf[pos] != (QChar)'#'))
+      if ((buf[pos] != (TQChar)'@') &&
+          (buf[pos] != (TQChar)'/') &&
+          (buf[pos] != (TQChar)'?') &&
+          (buf[pos] != (TQChar)'#'))
         goto NodeErr;
 
       start = pos;
@@ -895,7 +895,7 @@ void KURL::parseURL( const TQString& _url, int encoding_hint )
     goto NodeErr;
 
  Node8:
-  if (buf[pos] == (QChar)'[')
+  if (buf[pos] == (TQChar)'[')
   {
     // IPv6 address
     start = ++pos; // Skip '['
@@ -908,9 +908,9 @@ void KURL::parseURL( const TQString& _url, int encoding_hint )
     // Node 8a: Read everything until ] or terminate
     badHostName = false;
     x = buf[pos];
-    while( (x != (QChar)']') )
+    while( (x != (TQChar)']') )
     {
-       if ((x == (QChar)'\"') || (x == (QChar)';') || (x == (QChar)'<'))
+       if ((x == (TQChar)'\"') || (x == (TQChar)';') || (x == (TQChar)'<'))
           badHostName = true;
        if (++pos == len)
        {
@@ -934,9 +934,9 @@ void KURL::parseURL( const TQString& _url, int encoding_hint )
     // Node 8b: Read everything until / : or terminate
     badHostName = false;
     x = buf[pos];
-    while( (x != (QChar)':') && (x != (QChar)'@') && (x != (QChar)'/') && (x != (QChar)'?') && (x != (QChar)'#') )
+    while( (x != (TQChar)':') && (x != (TQChar)'@') && (x != (TQChar)'/') && (x != (TQChar)'?') && (x != (TQChar)'#') )
     {
-       if ((x == (QChar)'\"') || (x == (QChar)';') || (x == (QChar)'<'))
+       if ((x == (TQChar)'\"') || (x == (TQChar)';') || (x == (TQChar)'<'))
           badHostName = true;
        if (++pos == len)
           break;
@@ -952,12 +952,12 @@ void KURL::parseURL( const TQString& _url, int encoding_hint )
     setHost(decode(TQString( buf + start, pos - start ), encoding_hint));
   }
   x = buf[pos];
-  if ( x == (QChar)'/' || x == (QChar)'#' || x == (QChar)'?' )
+  if ( x == (TQChar)'/' || x == (TQChar)'#' || x == (TQChar)'?' )
     {
       start = pos;
       goto Node9;
     }
-  else if ( x != (QChar)':' )
+  else if ( x != (TQChar)':' )
     goto NodeErr;
   pos++;
 
@@ -978,7 +978,7 @@ void KURL::parseURL( const TQString& _url, int encoding_hint )
 
  Node9: // parse path until query or reference reached
 
-  while( pos < len && buf[pos] != (QChar)'#' && buf[pos]!=(QChar)'?' ) pos++;
+  while( pos < len && buf[pos] != (TQChar)'#' && buf[pos]!=(TQChar)'?' ) pos++;
 
   tmp = TQString( buf + start, pos - start );
   //kdDebug(126)<<" setting encoded path to:"<<tmp<<endl;
@@ -988,14 +988,14 @@ void KURL::parseURL( const TQString& _url, int encoding_hint )
       goto NodeOk;
 
  //Node10: // parse query or reference depending on what comes first
-  delim = (buf[pos++]==(QChar)'#'?(QChar)'?':(QChar)'#');
+  delim = (buf[pos++]==(TQChar)'#'?(TQChar)'?':(TQChar)'#');
 
   start = pos;
 
   while(pos < len && buf[pos]!=delim ) pos++;
 
   tmp = TQString(buf + start, pos - start);
-  if (delim==(QChar)'#')
+  if (delim==(TQChar)'#')
       _setQuery(tmp, encoding_hint);
   else
       m_strRef_encoded = tmp;
@@ -1005,7 +1005,7 @@ void KURL::parseURL( const TQString& _url, int encoding_hint )
 
  //Node11: // feed the rest into the remaining variable
   tmp = TQString( buf + pos + 1, len - pos - 1);
-  if (delim == (QChar)'#')
+  if (delim == (TQChar)'#')
       m_strRef_encoded = tmp;
   else
       _setQuery(tmp, encoding_hint);
@@ -1219,7 +1219,7 @@ void KURL::setFileName( const TQString& _txt )
 {
   m_strRef_encoded = TQString::null;
   int i = 0;
-  while( _txt[i] == (QChar)'/' ) ++i;
+  while( _txt[i] == (TQChar)'/' ) ++i;
   TQString tmp;
   if ( i )
     tmp = _txt.mid( i );
@@ -1271,7 +1271,7 @@ static TQString trailingSlash( int _trailing, const TQString &path )
   else if ( _trailing == 1 )
   {
     int len = result.length();
-    if ( (len == 0) || (result[ len - 1 ] != (QChar)'/') )
+    if ( (len == 0) || (result[ len - 1 ] != (TQChar)'/') )
       result += "/";
     return result;
   }
@@ -1280,7 +1280,7 @@ static TQString trailingSlash( int _trailing, const TQString &path )
     if ( result == "/" )
       return result;
     int len = result.length();
-    while (len > 1 && result[ len - 1 ] == (QChar)'/')
+    while (len > 1 && result[ len - 1 ] == (TQChar)'/')
     {
       len--;
     }
@@ -1749,14 +1749,14 @@ void KURL::addPath( const TQString& _txt )
   int i = 0;
   int len = m_strPath.length();
   // Add the trailing '/' if it is missing
-  if ( _txt[0] != (QChar)'/' && ( len == 0 || m_strPath[ len - 1 ] != (QChar)'/' ) )
+  if ( _txt[0] != (TQChar)'/' && ( len == 0 || m_strPath[ len - 1 ] != (TQChar)'/' ) )
     m_strPath += "/";
 
   // No double '/' characters
   i = 0;
-  if ( len != 0 && m_strPath[ len - 1 ] == (QChar)'/' )
+  if ( len != 0 && m_strPath[ len - 1 ] == (TQChar)'/' )
   {
-    while( _txt[i] == (QChar)'/' )
+    while( _txt[i] == (TQChar)'/' )
       ++i;
   }
 
@@ -1812,7 +1812,7 @@ bool KURL::cd( const TQString& _dir )
   }
 
   // absolute path ?
-  if ( _dir[0] == (QChar)'/' )
+  if ( _dir[0] == (TQChar)'/' )
   {
     m_strPath_encoded = TQString::null;
     m_strPath = _dir;
@@ -1822,7 +1822,7 @@ bool KURL::cd( const TQString& _dir )
   }
 
   // Users home directory on the local disk ?
-  if ( ( _dir[0] == (QChar)'~' ) && ( m_strProtocol == fileProt ))
+  if ( ( _dir[0] == (TQChar)'~' ) && ( m_strProtocol == fileProt ))
   {
     m_strPath_encoded = TQString::null;
     m_strPath = TQDir::homeDirPath();
@@ -2011,7 +2011,7 @@ void KURL::setDirectory( const TQString &dir)
 
 void KURL::setQuery( const TQString &_txt, int encoding_hint)
 {
-   if (_txt[0] == (QChar)'?')
+   if (_txt[0] == (TQChar)'?')
       _setQuery( _txt.length() > 1 ? _txt.mid(1) : "" /*empty, not null*/, encoding_hint );
    else
       _setQuery( _txt, encoding_hint );
@@ -2249,7 +2249,7 @@ KURL KURL::fromPathOrURL( const TQString& text )
 static TQString _relativePath(const TQString &base_dir, const TQString &path, bool &isParent)
 {
    TQString _base_dir(TQDir::cleanDirPath(base_dir));
-   TQString _path(TQDir::cleanDirPath(path.isEmpty() || (path[0] != (QChar)'/') ? _base_dir+"/"+path : path));
+   TQString _path(TQDir::cleanDirPath(path.isEmpty() || (path[0] != (TQChar)'/') ? _base_dir+"/"+path : path));
 
    if (_base_dir.isEmpty())
       return _path;
@@ -2262,7 +2262,7 @@ static TQString _relativePath(const TQString &base_dir, const TQString &path, bo
 
    // Find where they meet
    uint level = 0;
-   uint maxLevel = QMIN(list1.count(), list2.count());
+   uint maxLevel = TQMIN(list1.count(), list2.count());
    while((level < maxLevel) && (list1[level] == list2[level])) level++;
 
    TQString result;
@@ -2274,7 +2274,7 @@ static TQString _relativePath(const TQString &base_dir, const TQString &path, bo
    for(uint i = level; i < list2.count(); i++)
       result.append(list2[i]).append("/");
 
-   if ((level < list2.count()) && (path[path.length()-1] != (QChar)'/'))
+   if ((level < list2.count()) && (path[path.length()-1] != (TQChar)'/'))
       result.truncate(result.length()-1);
 
    isParent = (level == list1.count());
diff --git a/tdefx/kimageeffect.cpp b/tdefx/kimageeffect.cpp
index d2955403a..3f6aa5ccb 100644
--- a/tdefx/kimageeffect.cpp
+++ b/tdefx/kimageeffect.cpp
@@ -302,7 +302,7 @@ TQImage KImageEffect::gradient(const TQSize &size, const TQColor &ca,
             int h = (size.height()+1)>>1;
             for (y = 0; y < h; y++) {
                 unsigned int *sl1 = (unsigned int *)image.scanLine(y);
-                unsigned int *sl2 = (unsigned int *)image.scanLine(QMAX(size.height()-y-1, y));
+                unsigned int *sl2 = (unsigned int *)image.scanLine(TQMAX(size.height()-y-1, y));
 
                 int w = (size.width()+1)>>1;
                 int x2 = size.width()-1;
@@ -316,19 +316,19 @@ TQImage KImageEffect::gradient(const TQSize &size, const TQColor &ca,
                     }
                     if (eff == RectangleGradient) {
                         rgb = tqRgb(rcb - rSign *
-                                   QMAX(xtable[0][x], ytable[0][y]) * 2,
+                                   TQMAX(xtable[0][x], ytable[0][y]) * 2,
                                    gcb - gSign *
-                                   QMAX(xtable[1][x], ytable[1][y]) * 2,
+                                   TQMAX(xtable[1][x], ytable[1][y]) * 2,
                                    bcb - bSign *
-                                   QMAX(xtable[2][x], ytable[2][y]) * 2);
+                                   TQMAX(xtable[2][x], ytable[2][y]) * 2);
                     }
                     if (eff == PipeCrossGradient) {
                         rgb = tqRgb(rcb - rSign *
-                                   QMIN(xtable[0][x], ytable[0][y]) * 2,
+                                   TQMIN(xtable[0][x], ytable[0][y]) * 2,
                                    gcb - gSign *
-                                   QMIN(xtable[1][x], ytable[1][y]) * 2,
+                                   TQMIN(xtable[1][x], ytable[1][y]) * 2,
                                    bcb - bSign *
-                                   QMIN(xtable[2][x], ytable[2][y]) * 2);
+                                   TQMIN(xtable[2][x], ytable[2][y]) * 2);
                     }
                     if (eff == EllipticGradient) {
                         rgb = tqRgb(rcb - rSign *
@@ -565,20 +565,20 @@ TQImage KImageEffect::unbalancedGradient(const TQSize &size, const TQColor &ca,
                   else if (eff == RectangleGradient)
                   {
                       scanline[x] = tqRgb(rcb - rSign *
-                                         QMAX(xtable[0][x], ytable[0][y]) * 2,
+                                         TQMAX(xtable[0][x], ytable[0][y]) * 2,
                                          gcb - gSign *
-                                         QMAX(xtable[1][x], ytable[1][y]) * 2,
+                                         TQMAX(xtable[1][x], ytable[1][y]) * 2,
                                          bcb - bSign *
-                                         QMAX(xtable[2][x], ytable[2][y]) * 2);
+                                         TQMAX(xtable[2][x], ytable[2][y]) * 2);
                   }
                   else if (eff == PipeCrossGradient)
                   {
                       scanline[x] = tqRgb(rcb - rSign *
-                                         QMIN(xtable[0][x], ytable[0][y]) * 2,
+                                         TQMIN(xtable[0][x], ytable[0][y]) * 2,
                                          gcb - gSign *
-                                         QMIN(xtable[1][x], ytable[1][y]) * 2,
+                                         TQMIN(xtable[1][x], ytable[1][y]) * 2,
                                          bcb - bSign *
-                                         QMIN(xtable[2][x], ytable[2][y]) * 2);
+                                         TQMIN(xtable[2][x], ytable[2][y]) * 2);
                   }
                   else if (eff == EllipticGradient)
                   {
@@ -1666,7 +1666,7 @@ TQImage& KImageEffect::blend(TQImage &image, float initial_intensity,
                 yvar = var / image_height   * (image_height - y*2/unaffected -1);
 
                 if (eff == RectangleGradient)
-                    intensity = initial_intensity + QMAX(xvar, yvar);
+                    intensity = initial_intensity + TQMAX(xvar, yvar);
                 else
                     intensity = initial_intensity + sqrt(xvar * xvar + yvar * yvar);
                 if (intensity > 1) intensity = 1;
@@ -1710,7 +1710,7 @@ TQImage& KImageEffect::blend(TQImage &image, float initial_intensity,
                 yvar = var / image_height   * (image_height - y*2/unaffected -1);
 
                 if (eff == RectangleGradient)
-                    intensity = initial_intensity + QMAX(xvar, yvar);
+                    intensity = initial_intensity + TQMAX(xvar, yvar);
                 else
                     intensity = initial_intensity + sqrt(xvar * xvar + yvar * yvar);
                 if (intensity > 1) intensity = 1;
@@ -1974,7 +1974,7 @@ TQImage& KImageEffect::flatten(TQImage &img, const TQColor &ca,
     int b1 = ca.blue(); int b2 = cb.blue();
     int min = 0, max = 255;
 
-    QRgb col;
+    TQRgb col;
 
     // Get minimum and maximum greylevel.
     if (img.numColors()) {
@@ -1982,8 +1982,8 @@ TQImage& KImageEffect::flatten(TQImage &img, const TQColor &ca,
 	for (int i = 0; i < img.numColors(); i++) {
 	    col = img.color(i);
 	    int mean = (tqRed(col) + tqGreen(col) + tqBlue(col)) / 3;
-	    min = QMIN(min, mean);
-	    max = QMAX(max, mean);
+	    min = TQMIN(min, mean);
+	    max = TQMAX(max, mean);
 	}
     } else {
 	// truecolor
@@ -1991,8 +1991,8 @@ TQImage& KImageEffect::flatten(TQImage &img, const TQColor &ca,
 	    for (int x=0; x < img.width(); x++) {
 		col = img.pixel(x, y);
 		int mean = (tqRed(col) + tqGreen(col) + tqBlue(col)) / 3;
-		min = QMIN(min, mean);
-		max = QMAX(max, mean);
+		min = TQMIN(min, mean);
+		max = TQMAX(max, mean);
 	    }
     }
 
@@ -2070,7 +2070,7 @@ TQImage& KImageEffect::fade(TQImage &img, float val, const TQColor &color)
     int green = color.green();
     int blue = color.blue();
 
-    QRgb col;
+    TQRgb col;
     int r, g, b, cr, cg, cb;
 
     if (img.depth() <= 8) {
@@ -2096,7 +2096,7 @@ TQImage& KImageEffect::fade(TQImage &img, float val, const TQColor &color)
     } else {
 	// truecolor
         for (int y=0; y<img.height(); y++) {
-            QRgb *data = (QRgb *) img.scanLine(y);
+            TQRgb *data = (TQRgb *) img.scanLine(y);
             for (int x=0; x<img.width(); x++) {
                 col = *data;
                 cr = tqRed(col); cg = tqGreen(col); cb = tqBlue(col);
@@ -2490,15 +2490,15 @@ bool KImageEffect::blend(
 //  output.setAlphaBuffer(true); // I should do some benchmarks to see if
 	// this is worth the effort
 
-  register QRgb *i, *o, *b;
+  register TQRgb *i, *o, *b;
 
   register int a;
   register int j,k;
   for (j=0; j<ch; j++)
   {
-    b=reinterpret_cast<QRgb *>(&const_cast<TQImage&>(lower).scanLine(y+j) [ (x+cw) << 2 ]);
-    i=reinterpret_cast<QRgb *>(&const_cast<TQImage&>(upper).scanLine(cy+j)[ (cx+cw) << 2 ]);
-    o=reinterpret_cast<QRgb *>(&const_cast<TQImage&>(output).scanLine(j)  [ cw << 2 ]);
+    b=reinterpret_cast<TQRgb *>(&const_cast<TQImage&>(lower).scanLine(y+j) [ (x+cw) << 2 ]);
+    i=reinterpret_cast<TQRgb *>(&const_cast<TQImage&>(upper).scanLine(cy+j)[ (cx+cw) << 2 ]);
+    o=reinterpret_cast<TQRgb *>(&const_cast<TQImage&>(output).scanLine(j)  [ cw << 2 ]);
 
     k=cw-1;
     --b; --i; --o;
@@ -2598,15 +2598,15 @@ void KImageEffect::blendOnLower(const TQImage &upper, const TQPoint &upperOffset
 {
     // clip rect
     TQRect lr =  lowerRect & lower.rect();
-    lr.setWidth( QMIN(lr.width(), upper.width()-upperOffset.x()) );
-    lr.setHeight( QMIN(lr.height(), upper.height()-upperOffset.y()) );
+    lr.setWidth( TQMIN(lr.width(), upper.width()-upperOffset.x()) );
+    lr.setHeight( TQMIN(lr.height(), upper.height()-upperOffset.y()) );
     if ( !lr.isValid() ) return;
 
     // blend
     for (int y = 0; y < lr.height(); y++) {
         for (int x = 0; x < lr.width(); x++) {
-            QRgb *b = reinterpret_cast<QRgb*>(const_cast<TQImage&>(lower).scanLine(lr.y() + y)+ (lr.x() + x) * sizeof(QRgb));
-            QRgb *d = reinterpret_cast<QRgb*>(const_cast<TQImage&>(upper).scanLine(upperOffset.y() + y) + (upperOffset.x() + x) * sizeof(QRgb));
+            TQRgb *b = reinterpret_cast<TQRgb*>(const_cast<TQImage&>(lower).scanLine(lr.y() + y)+ (lr.x() + x) * sizeof(TQRgb));
+            TQRgb *d = reinterpret_cast<TQRgb*>(const_cast<TQImage&>(upper).scanLine(upperOffset.y() + y) + (upperOffset.x() + x) * sizeof(TQRgb));
             int a = tqAlpha(*d);
             *b = tqRgb(tqRed(*b) - (((tqRed(*b) - tqRed(*d)) * a) >> 8),
                       tqGreen(*b) - (((tqGreen(*b) - tqGreen(*d)) * a) >> 8),
@@ -2620,15 +2620,15 @@ void KImageEffect::blendOnLower(const TQImage &upper, const TQPoint &upperOffset
 {
     // clip rect
     TQRect lr =  lowerRect & lower.rect();
-    lr.setWidth( QMIN(lr.width(), upper.width()-upperOffset.x()) );
-    lr.setHeight( QMIN(lr.height(), upper.height()-upperOffset.y()) );
+    lr.setWidth( TQMIN(lr.width(), upper.width()-upperOffset.x()) );
+    lr.setHeight( TQMIN(lr.height(), upper.height()-upperOffset.y()) );
     if ( !lr.isValid() ) return;
 
     // blend
     for (int y = 0; y < lr.height(); y++) {
         for (int x = 0; x < lr.width(); x++) {
-            QRgb *b = reinterpret_cast<QRgb*>(const_cast<TQImage&>(lower).scanLine(lr.y() + y)+ (lr.x() + x) * sizeof(QRgb));
-            QRgb *d = reinterpret_cast<QRgb*>(const_cast<TQImage&>(upper).scanLine(upperOffset.y() + y) + (upperOffset.x() + x) * sizeof(QRgb));
+            TQRgb *b = reinterpret_cast<TQRgb*>(const_cast<TQImage&>(lower).scanLine(lr.y() + y)+ (lr.x() + x) * sizeof(TQRgb));
+            TQRgb *d = reinterpret_cast<TQRgb*>(const_cast<TQImage&>(upper).scanLine(upperOffset.y() + y) + (upperOffset.x() + x) * sizeof(TQRgb));
             int a = tqRound(opacity * tqAlpha(*d));
             *b = tqRgb(tqRed(*b) - (((tqRed(*b) - tqRed(*d)) * a) >> 8),
                       tqGreen(*b) - (((tqGreen(*b) - tqGreen(*d)) * a) >> 8),
@@ -2708,7 +2708,7 @@ void KImageEffect::blendOnLower(TQImage &upper, TQImage &lower,
     TQRect r = computeDestinationRect(lower.size(), disposition, upper);
     for (int y = r.top(); y<r.bottom(); y += upper.height())
         for (int x = r.left(); x<r.right(); x += upper.width())
-            blendOnLower(upper, TQPoint(-QMIN(x, 0), -QMIN(y, 0)),
+            blendOnLower(upper, TQPoint(-TQMIN(x, 0), -TQMIN(y, 0)),
                    lower, TQRect(x, y, upper.width(), upper.height()), opacity);
 }
 
@@ -2791,7 +2791,7 @@ TQImage KImageEffect::sample(TQImage &src, int w, int h)
     }
     else if(depth == 1) {
         int r = src.bitOrder() == TQImage::LittleEndian;
-        memcpy(dest.tqcolorTable(), src.tqcolorTable(), src.numColors()*sizeof(QRgb));
+        memcpy(dest.tqcolorTable(), src.tqcolorTable(), src.numColors()*sizeof(TQRgb));
         for(int y=0; y < h; ++y){
             unsigned char *destData = dest.scanLine(y);
             unsigned char *srcData = src.scanLine(y_offset[y]);
@@ -2806,7 +2806,7 @@ TQImage KImageEffect::sample(TQImage &src, int w, int h)
         }
     }
     else{ // PseudoClass source image
-        memcpy(dest.tqcolorTable(), src.tqcolorTable(), src.numColors()*sizeof(QRgb));
+        memcpy(dest.tqcolorTable(), src.tqcolorTable(), src.numColors()*sizeof(TQRgb));
         for(int y=0; y < h; ++y){
             unsigned char *destData = dest.scanLine(y);
             unsigned char *srcData = src.scanLine(y_offset[y]);
@@ -3469,8 +3469,8 @@ TQImage KImageEffect::spread(TQImage &src, unsigned int amount)
             for(x=0; x < src.width(); x++){
                 x_distance = x + ((rand() & (amount+1))-quantum);
                 y_distance = y + ((rand() & (amount+1))-quantum);
-                x_distance = QMIN(x_distance, src.width()-1);
-                y_distance = QMIN(y_distance, src.height()-1);
+                x_distance = TQMIN(x_distance, src.width()-1);
+                y_distance = TQMIN(y_distance, src.height()-1);
                 if(x_distance < 0)
                     x_distance = 0;
                 if(y_distance < 0)
@@ -3489,8 +3489,8 @@ TQImage KImageEffect::spread(TQImage &src, unsigned int amount)
             for(x=0; x < src.width(); x++){
                 x_distance = x + ((rand() & (amount+1))-quantum);
                 y_distance = y + ((rand() & (amount+1))-quantum);
-                x_distance = QMIN(x_distance, src.width()-1);
-                y_distance = QMIN(y_distance, src.height()-1);
+                x_distance = TQMIN(x_distance, src.width()-1);
+                y_distance = TQMIN(y_distance, src.height()-1);
                 if(x_distance < 0)
                     x_distance = 0;
                 if(y_distance < 0)
@@ -3516,7 +3516,7 @@ TQImage KImageEffect::swirl(TQImage &src, double degrees,
     // compute scaling factor
     x_center = src.width()/2.0;
     y_center = src.height()/2.0;
-    radius = QMAX(x_center,y_center);
+    radius = TQMAX(x_center,y_center);
     x_scale=1.0;
     y_scale=1.0;
     if(src.width() > src.height())
@@ -4515,7 +4515,7 @@ TQImage KImageEffect::shade(TQImage &src, bool color_shading, double azimuth,
     if(src.depth() > 8){ // DirectClass source image
         unsigned int *p, *s0, *s1, *s2;
         for(y=0; y < src.height(); ++y){
-            p = (unsigned int *)src.scanLine(QMIN(QMAX(y-1,0),src.height()-3));
+            p = (unsigned int *)src.scanLine(TQMIN(TQMAX(y-1,0),src.height()-3));
             q = (unsigned int *)dest.scanLine(y);
             // shade this row of pixels.
             *q++=(*(p+src.width()));
@@ -4568,7 +4568,7 @@ TQImage KImageEffect::shade(TQImage &src, bool color_shading, double azimuth,
         int scanLineIdx;
         unsigned int *cTable = (unsigned int *)src.tqcolorTable();
         for(y=0; y < src.height(); ++y){
-            scanLineIdx = QMIN(QMAX(y-1,0),src.height()-3);
+            scanLineIdx = TQMIN(TQMAX(y-1,0),src.height()-3);
             p = (unsigned char *)src.scanLine(scanLineIdx);
             q = (unsigned int *)dest.scanLine(y);
             // shade this row of pixels.
@@ -4811,7 +4811,7 @@ static void bumpmap_row( uint           *src,
             else {
                 shade = (int)( ndotl / sqrt(double(nx * nx + ny * ny + params->nz2)) );
 
-                shade = (int)( shade + QMAX(0.0, (255 * params->compensation - shade)) *
+                shade = (int)( shade + TQMAX(0.0, (255 * params->compensation - shade)) *
                                ambient / 255 );
 	    }
 	}
diff --git a/tdeprint/cups/imageposition.h b/tdeprint/cups/imageposition.h
index 6d6645365..5fbae48da 100644
--- a/tdeprint/cups/imageposition.h
+++ b/tdeprint/cups/imageposition.h
@@ -52,7 +52,7 @@ protected:
 
 private:
 	int	position_;
-	QPixmap	pix_;
+	TQPixmap	pix_;
 };
 
 #endif
diff --git a/tdeprint/cups/imagepreview.cpp b/tdeprint/cups/imagepreview.cpp
index 2290f6a96..fb27974da 100644
--- a/tdeprint/cups/imagepreview.cpp
+++ b/tdeprint/cups/imagepreview.cpp
@@ -58,9 +58,9 @@ void ImagePreview::paintEvent(TQPaintEvent*){
 	QImage	tmpImage = convertImage(image_,hue_,(bw_ ? 0 : saturation_),brightness_,gamma_);
 	int	x = (width()-tmpImage.width())/2, y = (height()-tmpImage.height())/2;
 
-	QPixmap	buffer(width(), height());
+	TQPixmap	buffer(width(), height());
 	buffer.fill(parentWidget(), 0, 0);
-	QPainter	p(&buffer);
+	TQPainter	p(&buffer);
 	p.drawImage(x,y,tmpImage);
 	p.end();
 
diff --git a/tdeprint/fooscanner.cpp b/tdeprint/fooscanner.cpp
index 3cdd4feb6..0cf15d2d1 100644
--- a/tdeprint/fooscanner.cpp
+++ b/tdeprint/fooscanner.cpp
@@ -446,7 +446,7 @@ char *yytext;
 
 #include <tqvariant.h>
 #include <tqiodevice.h>
-#define YYSTYPE QVariant
+#define YYSTYPE TQVariant
 #include "fooparser.cpp.h"
 
 #define yylval tdeprint_foomatic2lval
diff --git a/tdeprint/fooscanner.l b/tdeprint/fooscanner.l
index ddd5bb974..df8f6e778 100644
--- a/tdeprint/fooscanner.l
+++ b/tdeprint/fooscanner.l
@@ -20,7 +20,7 @@
 
 #include <qvariant.h>
 #include <qiodevice.h>
-#define YYSTYPE QVariant
+#define YYSTYPE TQVariant
 #include "fooparser.cpp.h"
 
 #define yylval tdeprint_foomatic2lval
@@ -37,7 +37,7 @@
 			result = 0; \
 	}
 
-QIODevice* tdeprint_foomatic2scanner_device = NULL;
+TQIODevice* tdeprint_foomatic2scanner_device = NULL;
 %}
 
 %option noyywrap
diff --git a/tdeprint/kmthreadjob.cpp b/tdeprint/kmthreadjob.cpp
index fcee4877f..309da96a9 100644
--- a/tdeprint/kmthreadjob.cpp
+++ b/tdeprint/kmthreadjob.cpp
@@ -76,7 +76,7 @@ bool KMThreadJob::loadJobs()
 			line = t.readLine().stripWhiteSpace();
 			if (line.isEmpty())
 				continue;
-			QStringList	ll = TQStringList::split(CHARSEP,line,true);
+			TQStringList	ll = TQStringList::split(CHARSEP,line,true);
 			if (ll.count() == 5)
 			{
 				KMJob	*job = new KMJob();
diff --git a/tdeprint/kmvirtualmanager.h b/tdeprint/kmvirtualmanager.h
index db6ea9a51..4916ab16e 100644
--- a/tdeprint/kmvirtualmanager.h
+++ b/tdeprint/kmvirtualmanager.h
@@ -65,7 +65,7 @@ protected:
 
 private:
 	KMManager		*m_manager;
-	QDateTime		m_checktime;
+	TQDateTime		m_checktime;
         TQString                 m_defaultprinter;
 };
 
diff --git a/tdeprint/kprintaction.cpp b/tdeprint/kprintaction.cpp
index e275ed559..a9e1b2bb8 100644
--- a/tdeprint/kprintaction.cpp
+++ b/tdeprint/kprintaction.cpp
@@ -35,7 +35,7 @@ public:
 	}
 
 	PrinterType	type;
-	QStringList	printers;
+	TQStringList	printers;
 	TQWidget *parentWidget;
 };
 
diff --git a/tdeprint/kprintdialog.cpp b/tdeprint/kprintdialog.cpp
index 5cb56819e..092884bde 100644
--- a/tdeprint/kprintdialog.cpp
+++ b/tdeprint/kprintdialog.cpp
@@ -858,7 +858,7 @@ void KPrintDialog::configChanged()
 
 void KPrintDialog::expandDialog(bool on)
 {
-	QSize	sz(size());
+	TQSize	sz(size());
 	bool	needResize(isVisible());
 
 	if (on)
diff --git a/tdeprint/management/kmiconview.cpp b/tdeprint/management/kmiconview.cpp
index 1fa5a6da9..905f4d248 100644
--- a/tdeprint/management/kmiconview.cpp
+++ b/tdeprint/management/kmiconview.cpp
@@ -38,7 +38,7 @@ void KMIconViewItem::paintItem(TQPainter *p, const TQColorGroup& cg)
 {
 	if (m_state != 0)
 	{
-		QFont	f(p->font());
+		TQFont	f(p->font());
 		if (m_state & 0x1) f.setBold(true);
 		if (m_state & 0x2) f.setItalic(true);
 		p->setFont(f);
@@ -48,17 +48,17 @@ void KMIconViewItem::paintItem(TQPainter *p, const TQColorGroup& cg)
 
 void KMIconViewItem::calcRect(const TQString&)
 {
-	QRect	ir(rect()), pr, tr;
+	TQRect	ir(rect()), pr, tr;
 
 	// pixmap rect
 	pr.setWidth(pixmap()->width());
 	pr.setHeight(pixmap()->height());
 
 	// text rect
-	QFont	f(iconView()->font());
+	TQFont	f(iconView()->font());
 	if (m_state & 0x1) f.setBold(true);
 	if (m_state & 0x2) f.setItalic(true);
-	QFontMetrics	fm(f);
+	TQFontMetrics	fm(f);
 	if (m_mode == TQIconView::Bottom)
 		tr = fm.boundingRect(0, 0, iconView()->maxItemWidth(), 0xFFFFFF, AlignHCenter|AlignTop|WordBreak|BreakAnywhere, text()+"X");
 	else
diff --git a/tdeprint/management/kmlistview.cpp b/tdeprint/management/kmlistview.cpp
index 72d6872cb..4332a8678 100644
--- a/tdeprint/management/kmlistview.cpp
+++ b/tdeprint/management/kmlistview.cpp
@@ -96,7 +96,7 @@ void KMListViewItem::paintCell(TQPainter *p, const TQColorGroup& cg, int c, int
 {
 	if (m_state != 0)
 	{
-		QFont	f(p->font());
+		TQFont	f(p->font());
 		if (m_state & 0x1) f.setBold(true);
 		if (m_state & 0x2) f.setItalic(true);
 		p->setFont(f);
diff --git a/tdeprint/management/sidepixmap.cpp b/tdeprint/management/sidepixmap.cpp
index 8824dd5fc..dc5dc901f 100644
--- a/tdeprint/management/sidepixmap.cpp
+++ b/tdeprint/management/sidepixmap.cpp
@@ -49,7 +49,7 @@ TQSize SidePixmap::tqsizeHint() const
 
 void SidePixmap::drawContents(TQPainter *p)
 {
-	QRect	r = contentsRect();
+	TQRect	r = contentsRect();
 	if (r.height() <= m_side.height())
 	{
 		// case where the main pixmap is enough, just center it
diff --git a/tdeprint/management/sidepixmap.h b/tdeprint/management/sidepixmap.h
index 54f7a1f5e..2d3916ff3 100644
--- a/tdeprint/management/sidepixmap.h
+++ b/tdeprint/management/sidepixmap.h
@@ -36,7 +36,7 @@ protected:
 	void drawContents(TQPainter*);
 
 private:
-	QPixmap	m_side, m_tileup, m_tiledown;
+	TQPixmap	m_side, m_tileup, m_tiledown;
 };
 
 #endif
diff --git a/tdeprint/treecombobox.cpp b/tdeprint/treecombobox.cpp
index 7a2adc8ef..45213f41c 100644
--- a/tdeprint/treecombobox.cpp
+++ b/tdeprint/treecombobox.cpp
@@ -93,15 +93,15 @@ void TreeListBoxItem::paint(TQPainter *p)
 		return;
 	}
 
-	const QPixmap	*pix = pixmap();
-	QRect	r = p->viewport();
+	const TQPixmap	*pix = pixmap();
+	TQRect	r = p->viewport();
 	int	h = height(listBox());
 	int	xo = (m_depth * stepSize() + 2);
 	int	yo = (pix ? (h-pix->height())/2 : 0);
 
 	if (m_depth > 0)
 	{
-		QPen	oldPen = p->pen();
+		TQPen	oldPen = p->pen();
 		p->setPen(listBox()->tqcolorGroup().mid());
 
 		TreeListBoxItem	*item = this;
diff --git a/tdeprint/util.cpp b/tdeprint/util.cpp
index b4025a087..b5d6e06d5 100644
--- a/tdeprint/util.cpp
+++ b/tdeprint/util.cpp
@@ -24,8 +24,8 @@ void urlToSmb(const KURL& url, TQString& work, TQString& server, TQString& print
 {
 	if (url.protocol() != "smb")
 		return;
-	QString	h = url.host();
-	QStringList	l = TQStringList::split('/', url.path(), false);
+	TQString	h = url.host();
+	TQStringList	l = TQStringList::split('/', url.path(), false);
 	if (l.count() > 1)
 	{
 		work = h;
diff --git a/tdeui/kcolordialog.cpp b/tdeui/kcolordialog.cpp
index a9b1c36ac..cb5b9906a 100644
--- a/tdeui/kcolordialog.cpp
+++ b/tdeui/kcolordialog.cpp
@@ -1221,7 +1221,7 @@ KColorDialog::setDefaultColor( const TQColor& col )
 
         d->l_right->addWidget( d->cbDefaultColor );
 
-        mainWidget()->setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX ); // cancel setFixedSize()
+        mainWidget()->setMaximumSize( TQWIDGETSIZE_MAX, TQWIDGETSIZE_MAX ); // cancel setFixedSize()
         d->tl_layout->activate();
         mainWidget()->setMinimumSize( mainWidget()->tqsizeHint() );
         disableResize();
diff --git a/tdeui/kmainwindow.cpp b/tdeui/kmainwindow.cpp
index 90d572bda..ffd16d0ef 100644
--- a/tdeui/kmainwindow.cpp
+++ b/tdeui/kmainwindow.cpp
@@ -90,7 +90,7 @@ public:
     ~KMWSessionManaged()
     {
     }
-    bool saveState( QSessionManager& )
+    bool saveState( TQSessionManager& )
     {
         KConfig* config = KApplication::kApplication()->sessionConfig();
         if ( KMainWindow::memberList->first() ){
@@ -110,7 +110,7 @@ public:
         return true;
     }
 
-    bool commitData( QSessionManager& sm )
+    bool commitData( TQSessionManager& sm )
     {
         // not really a fast method but the only compatible one
         if ( sm.allowsInteraction() ) {
diff --git a/tdeui/kmenubar.cpp b/tdeui/kmenubar.cpp
index 7febea06f..f5d464216 100644
--- a/tdeui/kmenubar.cpp
+++ b/tdeui/kmenubar.cpp
@@ -215,7 +215,7 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level)
       setLineWidth( d->lineWidth );
       setMargin( d->margin );
       setMinimumSize( 0, 0 );
-      setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX );
+      setMaximumSize( TQWIDGETSIZE_MAX, TQWIDGETSIZE_MAX );
       updateMenuBarSize();
       if ( parentWidget() )
           reparent( parentWidget(), TQPoint(0,0), !isHidden());
@@ -314,7 +314,7 @@ void KMenuBar::updateFallbackSize()
             d->fallback_mode = false;
             KWin::setStrut( winId(), 0, 0, 0, 0 );
             setMinimumSize( 0, 0 );
-            setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX );
+            setMaximumSize( TQWIDGETSIZE_MAX, TQWIDGETSIZE_MAX );
             updateMenuBarSize();
         }
 	return;
diff --git a/tdeui/kseparator.cpp b/tdeui/kseparator.cpp
index 1c1f43e96..29ca5e83a 100644
--- a/tdeui/kseparator.cpp
+++ b/tdeui/kseparator.cpp
@@ -81,8 +81,8 @@ int KSeparator::orientation() const
 
 void KSeparator::drawFrame(TQPainter *p)
 {
-   QPoint	p1, p2;
-   QRect	r     = frameRect();
+   TQPoint	p1, p2;
+   TQRect	r     = frameRect();
    const TQColorGroup & g = tqcolorGroup();
 
    if ( frameStyle() & HLine ) {
diff --git a/tdeui/qxembed.cpp b/tdeui/qxembed.cpp
index 03d9ca1d2..e81e58b3c 100644
--- a/tdeui/qxembed.cpp
+++ b/tdeui/qxembed.cpp
@@ -176,7 +176,7 @@ static XKeyEvent last_key_event;
 class QPublicWidget : public TQWidget
 {
 public:
-    QTLWExtra* topData() { return TQWidget::topData(); }
+    TQTLWExtra* topData() { return TQWidget::topData(); }
     TQFocusData *focusData(){ return TQWidget::focusData(); }
     bool focusNextPrev(bool b) { return focusNextPrevChild(b); }
 };
@@ -443,7 +443,7 @@ static int qxembed_x11_event_filter( XEvent* e)
             switch ( message) {
             case XEMBED_EMBEDDED_NOTIFY: {
                 // L0675: We just have been embedded into a XEMBED aware widget.
-                QTLWExtra *extra = ((QPublicWidget*)w->tqtopLevelWidget())->topData();
+                TQTLWExtra *extra = ((QPublicWidget*)w->tqtopLevelWidget())->topData();
                 extra->embedded = 1;
 #ifdef USE_QT4
                 // [FIXME]