Revert automated changes

Sorry guys, they are just not ready for prime time
Work will continue as always


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

5 files changed, 14 insertions, 14 deletions

diff --git a/kioslave/thumbnail/cursorcreator.cpp b/kioslave/thumbnail/cursorcreator.cpp
index a8f6a2eb9..d77629acf 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
-	TQ_UINT32 *pixels = reinterpret_cast<TQ_UINT32 *>( img.bits() );
+	Q_UINT32 *pixels = reinterpret_cast<Q_UINT32 *>( img.bits() );
 	for ( int i = 0; i < (img.width() * img.height()); i++ ) {
-		float alpha = tqAlpha( pixels[i] ) / 255.0;
+		float alpha = qAlpha( pixels[i] ) / 255.0;
 		if ( alpha > 0.0 && alpha < 1.0 )
-			pixels[i] = tqRgba( int( tqRed(pixels[i]) / alpha ),
-			                   int( tqGreen(pixels[i]) / alpha ),
-			                   int( tqBlue(pixels[i]) / alpha ),
-			                   tqAlpha(pixels[i]) );
+			pixels[i] = qRgba( int( qRed(pixels[i]) / alpha ),
+			                   int( qGreen(pixels[i]) / alpha ),
+			                   int( qBlue(pixels[i]) / alpha ),
+			                   qAlpha(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 d0edbd38e..633ad5095 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, tqRgba(q.r, q.g, q.b, q.a) );
+		qpreview.setPixel( x, y, qRgba(q.r, q.g, q.b, q.a) );
 	    }
 	}
 	img = qpreview;
diff --git a/kioslave/thumbnail/htmlcreator.cpp b/kioslave/thumbnail/htmlcreator.cpp
index 43aec5f39..c9ddf0204 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);
 
-    tqApp->enter_loop();
+    qApp->enter_loop();
 
     killTimer(t);
 
@@ -101,12 +101,12 @@ bool HTMLCreator::create(const TQString &path, int width, int height, TQImage &i
 
 void HTMLCreator::timerEvent(TQTimerEvent *)
 {
-    tqApp->exit_loop();
+    qApp->exit_loop();
 }
 
 void HTMLCreator::slotCompleted()
 {
-    tqApp->exit_loop();
+    qApp->exit_loop();
 }
 
 ThumbCreator::Flags HTMLCreator::flags() const
diff --git a/kioslave/thumbnail/textcreator.cpp b/kioslave/thumbnail/textcreator.cpp
index a2c713c87..31f4c4254 100644
--- a/kioslave/thumbnail/textcreator.cpp
+++ b/kioslave/thumbnail/textcreator.cpp
@@ -52,7 +52,7 @@ TextCreator::~TextCreator()
 bool TextCreator::create(const TQString &path, int width, int height, TQImage &img)
 {
     // Filter out unwanted mimetypes
-    KMimeType::Ptr mimeType = KMimeType::tqfindByPath( path );
+    KMimeType::Ptr mimeType = KMimeType::findByPath( path );
     if ( mimeType->is( "text/rtf" ) )
         return false;
 
diff --git a/kioslave/thumbnail/thumbnail.cpp b/kioslave/thumbnail/thumbnail.cpp
index 29a1ae565..272e34eed 100644
--- a/kioslave/thumbnail/thumbnail.cpp
+++ b/kioslave/thumbnail/thumbnail.cpp
@@ -322,10 +322,10 @@ void ThumbnailProtocol::get(const KURL &url)
         p.drawLine( 0, 0, 0, y2 );
         p.end();
 
-        const TQBitmap *tqmask = pix.tqmask();
-        if ( tqmask ) // need to update it so we can see the frame
+        const TQBitmap *mask = pix.mask();
+        if ( mask ) // need to update it so we can see the frame
         {
-            TQBitmap bitmap( *tqmask );
+            TQBitmap bitmap( *mask );
             TQPainter painter;
             painter.begin( &bitmap );
             painter.drawLine( x2, 0, x2, y2 );