Replaced various '#define' with actual strings - part 5

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

kopete/libkopete/avdevice/qvideostream.cpp

@@ -235,7 +235,7 @@ void QVideoStream::init()
         }
         
         d->xim = XCreateImage(_w->x11Display(),
-                              (Visual*)TQT_TQPAINTDEVICE(_w)->x11Visual(),
+                              (Visual*)_w->x11Visual(),
                               _w->x11Depth(),
                               ZPixmap, 0, 0,
                               _inputSize.width(),

kopete/libkopete/webcamwidget.cpp

@@ -73,7 +73,7 @@ void WebcamWidget::paintEvent( TQPaintEvent* event )
 	{
 		for (unsigned int i = 0; i < rects.count(); ++i)
 		{
-			bitBlt(TQT_TQPAINTDEVICE(this), rects[i].topLeft(), TQT_TQPAINTDEVICE(&mPixmap), rects[i], TQt::CopyROP, true);
+			bitBlt(this, rects[i].topLeft(), &mPixmap, rects[i], TQt::CopyROP, true);
 		}
 	}
 	else

kopete/protocols/jabber/jabbercapabilitiesmanager.cpp

@@ -646,7 +646,7 @@ void JabberCapabilitiesManager::saveInformation()
 	}
 
 	TQTextStream textStream;
-	textStream.setDevice(TQT_TQIODEVICE(&capsFile));
+	textStream.setDevice(&capsFile);
 	textStream.setEncoding(TQTextStream::UnicodeUTF8);
 	textStream << doc.toString();
 	textStream.unsetDevice();

kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_vcard.cpp

@@ -93,7 +93,7 @@ static TQString image2type(const TQByteArray &ba)
 {
 	TQBuffer buf(ba);
 	buf.open(IO_ReadOnly);
-	TQString format = TQImageIO::imageFormat( TQT_TQIODEVICE(&buf) );
+	TQString format = TQImageIO::imageFormat( &buf );
 
 	// TODO: add more formats
 	if ( format == "PNG" || format == "PsiPNG" )

kopete/protocols/oscar/aim/aimaccount.cpp

@@ -451,7 +451,7 @@ void AIMAccount::slotBuddyIconChanged()
 		iconFile.open( IO_ReadOnly );
 		
 		KMD5 iconHash;
-		iconHash.update( *TQT_TQIODEVICE(&iconFile) );
+		iconHash.update( iconFile );
 		kdDebug(OSCAR_AIM_DEBUG) << k_funcinfo  << "hash is :" << iconHash.hexDigest() << endl;
 			
 		//find old item, create updated item

kopete/protocols/oscar/icq/icqaccount.cpp

@@ -457,7 +457,7 @@ void ICQAccount::slotBuddyIconChanged()
 		iconFile.open( IO_ReadOnly );
 		
 		KMD5 iconHash;
-		iconHash.update( *TQT_TQIODEVICE(&iconFile) );
+		iconHash.update( iconFile );
 		kdDebug(14153) << k_funcinfo  << "hash is :" << iconHash.hexDigest() << endl;
 	
 		//find old item, create updated item

kopete/protocols/oscar/icq/icqcontact.cpp

@@ -503,7 +503,7 @@ bool ICQContact::cachedBuddyIcon( TQByteArray hash )
 		return false;
 	
 	KMD5 buddyIconHash;
-	buddyIconHash.update( *TQT_TQIODEVICE(&iconFile) );
+	buddyIconHash.update( iconFile );
 	iconFile.close();
 	
 	if ( memcmp( buddyIconHash.rawDigest(), hash.data(), 16 ) == 0 )

ksirc/KSTicker/ksticker.cpp

@@ -379,9 +379,9 @@ void KSTicker::resizeEvent( TQResizeEvent *e)
   TQT_TQOBJECT(this)->killTimers();
   TQPixmap *new_pic = new TQPixmap(width() + onechar, height());
   new_pic->fill(backgroundColor());
-  bitBlt(TQT_TQPAINTDEVICE(new_pic),
+  bitBlt(new_pic,
          new_pic->width() - pic->width(), 0,
-         TQT_TQPAINTDEVICE(pic), 0, 0,
+         pic, 0, 0,
          pic->width(), pic->height(),
          CopyROP, TRUE);
   delete pic;

tdefile-plugins/torrent/tdefile_torrent.cpp

@@ -396,7 +396,7 @@ bool KTorrentPlugin::writeInfo(const KFileMetaInfo &info) const
     if (!output.open(IO_WriteOnly | IO_Truncate))
         return false;
     
-    return m_dict->writeToDevice(*TQT_TQIODEVICE(&output));
+    return m_dict->writeToDevice(output);
 }
 
 #include "tdefile_torrent.moc"