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/gadu/gadupubdir.cpp b/kopete/protocols/gadu/gadupubdir.cpp
index 1c329cf0..8c33aef2 100644
--- a/kopete/protocols/gadu/gadupubdir.cpp
+++ b/kopete/protocols/gadu/gadupubdir.cpp
@@ -40,8 +40,8 @@
 #include <klistview.h>
 #include <klocale.h>
 
-GaduPublicDir::GaduPublicDir( GaduAccount* account, TQWidget* parent, const char* name )
-: KDialogBase( parent, name, false, TQString::null, User1|User2|User3|Cancel, User2 )
+GaduPublicDir::GaduPublicDir( GaduAccount* account, TQWidget* tqparent, const char* name )
+: KDialogBase( tqparent, name, false, TQString(), User1|User2|User3|Cancel, User2 )
 {
 	mAccount = account;
 	createWidget();
@@ -50,8 +50,8 @@ GaduPublicDir::GaduPublicDir( GaduAccount* account, TQWidget* parent, const char
 	show();
 }
 
-GaduPublicDir::GaduPublicDir( GaduAccount* account, int searchFor, TQWidget* parent, const char* name )
-: KDialogBase( parent, name, false, TQString::null, User1|User2|User3|Cancel, User2 )
+GaduPublicDir::GaduPublicDir( GaduAccount* account, int searchFor, TQWidget* tqparent, const char* name )
+: KDialogBase( tqparent, name, false, TQString(), User1|User2|User3|Cancel, User2 )
 {
 	ResLine rs;
 
@@ -80,7 +80,7 @@ GaduPublicDir::GaduPublicDir( GaduAccount* account, int searchFor, TQWidget* par
 	// now it is time to switch to Right Page(tm)
 	rs.uin = searchFor;
 	
-	fName	=  fSurname =  fNick = fCity = TQString::null;
+	fName	=  fSurname =  fNick = fCity = TQString();
 	fUin	= searchFor;
 	fGender	= fAgeFrom = fAgeTo = 0;
 	fOnlyOnline = false;
@@ -170,7 +170,7 @@ GaduPublicDir::initConnections()
 void
 GaduPublicDir::inputChanged( bool )
 {
-	inputChanged( TQString::null );
+	inputChanged( TQString() );
 }
 
 void
@@ -217,20 +217,20 @@ GaduPublicDir::validateData()
 		CHECK_INT( fAgeTo );
 	}
 	else {
-		fSurname = TQString::null;
+		fSurname = TQString();
 		CHECK_INT( fUin );
 	}
 	return false;
 }
 
 // Move to GaduProtocol someday
-QPixmap
-GaduPublicDir::iconForStatus( uint status )
+TQPixmap
+GaduPublicDir::iconFortqStatus( uint status )
 {
 	TQPixmap n;
 
 	if ( GaduProtocol::protocol() ) {
-		return GaduProtocol::protocol()->convertStatus( status ).protocolIcon();
+		return GaduProtocol::protocol()->converttqStatus( status ).protocolIcon();
 	}
 	return n;
 }
@@ -256,7 +256,7 @@ GaduPublicDir::slotSearchResult( const SearchResult& result, unsigned int )
 					(*r).city,
 					TQString::number( (*r).uin ).ascii()
 						);
-		sl->setPixmap( 0, iconForStatus( (*r).status ) );
+		sl->setPixmap( 0, iconFortqStatus( (*r).status ) );
 	}
 
 	// if not found anything, obviously we don't want to search for more
@@ -282,7 +282,7 @@ GaduPublicDir::slotNewSearch()
 	showButton( User1, false );
 	showButton( User3, false );
 	enableButton( User2, false );
- 	inputChanged( TQString::null );
+ 	inputChanged( TQString() );
  	mAccount->pubDirSearchClose();
 }