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, 12 insertions, 12 deletions

diff --git a/kopete/protocols/oscar/liboscar/ssimodifytask.cpp b/kopete/protocols/oscar/liboscar/ssimodifytask.cpp
index b4194b5e..23164bc0 100644
--- a/kopete/protocols/oscar/liboscar/ssimodifytask.cpp
+++ b/kopete/protocols/oscar/liboscar/ssimodifytask.cpp
@@ -28,9 +28,9 @@
 #include "transfer.h"
 
 
-SSIModifyTask::SSIModifyTask( Task* parent, bool staticTask ) : Task( parent )
+SSIModifyTask::SSIModifyTask( Task* tqparent, bool staticTask ) : Task( tqparent )
 {
-	m_ssiManager = parent->client()->ssiManager();
+	m_ssiManager = tqparent->client()->ssiManager();
 	m_static = staticTask;
 	m_opType = NoType;
 	m_opSubject = NoSubject;
@@ -254,23 +254,23 @@ void SSIModifyTask::handleSSIAck()
 			break;
 		case 0x0002:
 			kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "Item to modify not found in list" << endl;
-			setSuccess( 0, TQString::null );
+			setSuccess( 0, TQString() );
 			break;
 		case 0x0003:
 			kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "Item already exists in SSI" << endl;
-			setSuccess( 0, TQString::null );
+			setSuccess( 0, TQString() );
 			break;
 		case 0x000A:
 			kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "Error adding item ( invalid id, already in list, invalid data )" << endl;
-			setSuccess( 0, TQString::null );
+			setSuccess( 0, TQString() );
 			break;
 		case 0x000C:
 			kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "Can't add item. Limit exceeded." << endl;
-			setSuccess( 0, TQString::null );
+			setSuccess( 0, TQString() );
 			break;
 		case 0x000D:
 			kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "Can't add ICQ item to AIM list ( and vice versa )" << endl;
-			setSuccess( 0, TQString::null );
+			setSuccess( 0, TQString() );
 			break;
 		case 0x000E:
 			{
@@ -283,7 +283,7 @@ void SSIModifyTask::handleSSIAck()
 			}
 		default:
 			kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "Unknown acknowledgement code" << endl;
-			setSuccess( 0, TQString::null );
+			setSuccess( 0, TQString() );
 			break;
 		}
 	};
@@ -466,7 +466,7 @@ void SSIModifyTask::updateSSIManager()
 			kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "and adding " << m_newItem.name() << " to SSI manager" << endl;
 			m_ssiManager->newItem( m_newItem );
 		}
-		setSuccess( 0, TQString::null );
+		setSuccess( 0, TQString() );
 		return;
 	}
 
@@ -479,7 +479,7 @@ void SSIModifyTask::updateSSIManager()
 			m_ssiManager->removeContact( m_oldItem.name() );
 		else if ( m_opSubject == NoSubject )
 			m_ssiManager->removeItem( m_oldItem );
-		setSuccess( 0, TQString::null );
+		setSuccess( 0, TQString() );
 		return;
 	}
 
@@ -492,11 +492,11 @@ void SSIModifyTask::updateSSIManager()
 			m_ssiManager->newContact( m_newItem );
 		else if ( m_opSubject == NoSubject )
 			m_ssiManager->newItem( m_newItem );
-		setSuccess( 0, TQString::null );
+		setSuccess( 0, TQString() );
 		return;
 	}
 
-	setSuccess( 0, TQString::null );
+	setSuccess( 0, TQString() );
 }
 
 void SSIModifyTask::freeIdOnError()