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

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 6d077d06067369f2060c1b011687941e84ece7c4)

7 files changed, 7 insertions, 7 deletions

diff --git a/kopete/libkopete/avdevice/qvideostream.cpp b/kopete/libkopete/avdevice/qvideostream.cpp
index 63de80c8..5c4693b8 100644
--- a/kopete/libkopete/avdevice/qvideostream.cpp
+++ b/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(),
diff --git a/kopete/libkopete/webcamwidget.cpp b/kopete/libkopete/webcamwidget.cpp
index 5940a0f1..efd005eb 100644
--- a/kopete/libkopete/webcamwidget.cpp
+++ b/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
diff --git a/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp b/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp
index deb62a1e..57292ad3 100644
--- a/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp
+++ b/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();
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_vcard.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_vcard.cpp
index 2f242bcb..ac7f5626 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_vcard.cpp
+++ b/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" )
diff --git a/kopete/protocols/oscar/aim/aimaccount.cpp b/kopete/protocols/oscar/aim/aimaccount.cpp
index 37ce6e61..82b9a29c 100644
--- a/kopete/protocols/oscar/aim/aimaccount.cpp
+++ b/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
diff --git a/kopete/protocols/oscar/icq/icqaccount.cpp b/kopete/protocols/oscar/icq/icqaccount.cpp
index 784c8183..f5c6b9ea 100644
--- a/kopete/protocols/oscar/icq/icqaccount.cpp
+++ b/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
diff --git a/kopete/protocols/oscar/icq/icqcontact.cpp b/kopete/protocols/oscar/icq/icqcontact.cpp
index dd651a11..01c0e43d 100644
--- a/kopete/protocols/oscar/icq/icqcontact.cpp
+++ b/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 )