Enable compilation with TQt for Qt4 3.4.0 TP2

This should not break compatibility with TQt for Qt3; if it does please fix it ASAP!


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

5 files changed, 16 insertions, 16 deletions

diff --git a/kioslave/thumbnail/cursorcreator.cpp b/kioslave/thumbnail/cursorcreator.cpp
index d77629acf..a8f6a2eb9 100644
--- a/kioslave/thumbnail/cursorcreator.cpp
+++ b/kioslave/thumbnail/cursorcreator.cpp
@@ -48,14 +48,14 @@ bool CursorCreator::create( const TQString &path, int width, int height, TQImage
 	img.setAlphaBuffer( true );
 
 	// Convert the image to non-premultiplied alpha
-	Q_UINT32 *pixels = reinterpret_cast<Q_UINT32 *>( img.bits() );
+	TQ_UINT32 *pixels = reinterpret_cast<TQ_UINT32 *>( img.bits() );
 	for ( int i = 0; i < (img.width() * img.height()); i++ ) {
-		float alpha = qAlpha( pixels[i] ) / 255.0;
+		float alpha = tqAlpha( pixels[i] ) / 255.0;
 		if ( alpha > 0.0 && alpha < 1.0 )
-			pixels[i] = qRgba( int( qRed(pixels[i]) / alpha ),
-			                   int( qGreen(pixels[i]) / alpha ),
-			                   int( qBlue(pixels[i]) / alpha ),
-			                   qAlpha(pixels[i]) );
+			pixels[i] = tqRgba( int( tqRed(pixels[i]) / alpha ),
+			                   int( tqGreen(pixels[i]) / alpha ),
+			                   int( tqBlue(pixels[i]) / alpha ),
+			                   tqAlpha(pixels[i]) );
 	}
 
 	// Create a deep copy of the image so the image data is preserved
diff --git a/kioslave/thumbnail/exrcreator.cpp b/kioslave/thumbnail/exrcreator.cpp
index 633ad5095..d0edbd38e 100644
--- a/kioslave/thumbnail/exrcreator.cpp
+++ b/kioslave/thumbnail/exrcreator.cpp
@@ -50,7 +50,7 @@ bool EXRCreator::create(const TQString &path, int, int, TQImage &img)
 	for ( unsigned int y=0; y < preview.height(); y++ ) {
 	    for ( unsigned int x=0; x < preview.width(); x++ ) {
 		const Imf::PreviewRgba &q = preview.pixels()[x+(y*preview.width())];
-		qpreview.setPixel( x, y, qRgba(q.r, q.g, q.b, q.a) );
+		qpreview.setPixel( x, y, tqRgba(q.r, q.g, q.b, q.a) );
 	    }
 	}
 	img = qpreview;
diff --git a/kioslave/thumbnail/htmlcreator.cpp b/kioslave/thumbnail/htmlcreator.cpp
index c9ddf0204..43aec5f39 100644
--- a/kioslave/thumbnail/htmlcreator.cpp
+++ b/kioslave/thumbnail/htmlcreator.cpp
@@ -63,7 +63,7 @@ bool HTMLCreator::create(const TQString &path, int width, int height, TQImage &i
 
     int t = startTimer(5000);
 
-    qApp->enter_loop();
+    tqApp->enter_loop();
 
     killTimer(t);
 
@@ -101,12 +101,12 @@ bool HTMLCreator::create(const TQString &path, int width, int height, TQImage &i
 
 void HTMLCreator::timerEvent(TQTimerEvent *)
 {
-    qApp->exit_loop();
+    tqApp->exit_loop();
 }
 
 void HTMLCreator::slotCompleted()
 {
-    qApp->exit_loop();
+    tqApp->exit_loop();
 }
 
 ThumbCreator::Flags HTMLCreator::flags() const
diff --git a/kioslave/thumbnail/textcreator.cpp b/kioslave/thumbnail/textcreator.cpp
index 31f4c4254..db39e9652 100644
--- a/kioslave/thumbnail/textcreator.cpp
+++ b/kioslave/thumbnail/textcreator.cpp
@@ -148,7 +148,7 @@ bool TextCreator::create(const TQString &path, int width, int height, TQImage &i
                     // physical newline in the file if we don't come from one
                     if ( !newLine )
                     {
-                        int pos = text.find( '\n', i );
+                        int pos = text.tqfind( '\n', i );
                         if ( pos == -1 )
 			    break;
                         i = pos + 1;
@@ -174,7 +174,7 @@ bool TextCreator::create(const TQString &path, int width, int height, TQImage &i
                 rect = m_splitter->coordinates( ch );
                 if ( !rect.isEmpty() )
                 {
-                    bitBlt( &m_pixmap, TQPoint(x,y), fontPixmap, rect, Qt::CopyROP );
+                    bitBlt( &m_pixmap, TQPoint(x,y), fontPixmap, rect, TQt::CopyROP );
                 }
 
                 x += xOffset; // next character
diff --git a/kioslave/thumbnail/thumbnail.cpp b/kioslave/thumbnail/thumbnail.cpp
index 272e34eed..55ac3c80b 100644
--- a/kioslave/thumbnail/thumbnail.cpp
+++ b/kioslave/thumbnail/thumbnail.cpp
@@ -298,9 +298,9 @@ void ThumbnailProtocol::get(const KURL &url)
     {
         double imgRatio = (double)img.height() / (double)img.width();
         if (imgRatio > (double)m_height / (double)m_width)
-            img = img.smoothScale( int(QMAX((double)m_height / imgRatio, 1)), m_height);
+            img = img.smoothScale( int(TQMAX((double)m_height / imgRatio, 1)), m_height);
         else
-            img = img.smoothScale(m_width, int(QMAX((double)m_width * imgRatio, 1)));
+            img = img.smoothScale(m_width, int(TQMAX((double)m_width * imgRatio, 1)));
     }
 
 // ### FIXME
@@ -322,7 +322,7 @@ void ThumbnailProtocol::get(const KURL &url)
         p.drawLine( 0, 0, 0, y2 );
         p.end();
 
-        const TQBitmap *mask = pix.mask();
+        const TQBitmap *mask = pix.tqmask();
         if ( mask ) // need to update it so we can see the frame
         {
             TQBitmap bitmap( *mask );
@@ -417,7 +417,7 @@ void ThumbnailProtocol::get(const KURL &url)
 
 const TQImage& ThumbnailProtocol::getIcon()
 {
-    TQImage* icon = m_iconDict.find(m_mimeType);
+    TQImage* icon = m_iconDict.tqfind(m_mimeType);
     if ( !icon ) // generate it!
     {
         icon = new TQImage( KMimeType::mimeType(m_mimeType)->pixmap( KIcon::Desktop, m_iconSize ).convertToImage() );