TQt4 port kdenetwork

This enables compilation under both Qt3 and Qt4


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

1 files changed, 6 insertions, 6 deletions

diff --git a/kopete/libkopete/kopetepicture.cpp b/kopete/libkopete/kopetepicture.cpp
index 05468c21..809923d2 100644
--- a/kopete/libkopete/kopetepicture.cpp
+++ b/kopete/libkopete/kopetepicture.cpp
@@ -120,7 +120,7 @@ TQString Picture::path()
 		KMD5 context(tempArray);
 		// Save the image to a file.
 		localPhotoPath = context.hexDigest() + ".png";
-		localPhotoPath = locateLocal( "appdata", TQString::fromUtf8("metacontactpicturecache/%1").arg( localPhotoPath) );
+		localPhotoPath = locateLocal( "appdata", TQString::fromUtf8("metacontactpicturecache/%1").tqarg( localPhotoPath) );
 		if( image().save(localPhotoPath, "PNG") )
 		{
 			d->picturePath = localPhotoPath;
@@ -145,8 +145,8 @@ bool Picture::isNull()
 void Picture::clear()
 {
 	detach();
-	d->pictureBase64 = TQString::null;
-	d->picturePath = TQString::null;
+	d->pictureBase64 = TQString();
+	d->picturePath = TQString();
 	d->pictureImage = TQImage();
 }
 
@@ -157,8 +157,8 @@ void Picture::setPicture(const TQImage &image)
 	d->pictureImage = image;
 
 	// Clear the path and base64, it will call the update of then when "getted"
-	d->picturePath= TQString::null;
-	d->pictureBase64 = TQString::null;
+	d->picturePath= TQString();
+	d->pictureBase64 = TQString();
 }
 
 void Picture::setPicture(const TQString &path)
@@ -168,7 +168,7 @@ void Picture::setPicture(const TQString &path)
 	
 	// Clear the image and base64, it will call the update of then when "getted"
 	d->pictureImage = TQImage();
-	d->pictureBase64 = TQString::null;
+	d->pictureBase64 = TQString();
 }
 
 void Picture::setPicture(const KABC::Picture &picture)