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

diff --git a/kopete/protocols/irc/ircprotocol.h b/kopete/protocols/irc/ircprotocol.h
index 0151f900..61a810fd 100644
--- a/kopete/protocols/irc/ircprotocol.h
+++ b/kopete/protocols/irc/ircprotocol.h
@@ -56,7 +56,7 @@ class IRCProtocolHandler : public Kopete::MimeTypeHandler
 		void handleURL( const KURL &url ) const;
 };
 
-static const TQString CHAT_VIEW( TQString::fromLatin1("kopete_chatwindow") );
+static const TQString CHAT_VIEW( TQString::tqfromLatin1("kopete_chatwindow") );
 
 /**
  * @author Nick Betcher <nbetcher@kde.org>
@@ -64,9 +64,10 @@ static const TQString CHAT_VIEW( TQString::fromLatin1("kopete_chatwindow") );
 class IRCProtocol : public Kopete::Protocol
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	enum IRCStatus
+	enum IRCtqStatus
 	{
 		Offline        = 1,                 //! An offline user.
 		Connecting     = 2,                 //! User that is connecting.
@@ -81,11 +82,11 @@ public:
 		OnlineServer   = 32768              //! This server is online.
 	};
 
-	IRCProtocol( TQObject *parent, const char *name, const TQStringList &args );
+	IRCProtocol( TQObject *tqparent, const char *name, const TQStringList &args );
 	~IRCProtocol();
 
 	/** Kopete::Protocol reimplementation */
-	virtual AddContactPage *createAddContactWidget(TQWidget *parent, Kopete::Account *account);
+	virtual AddContactPage *createAddContactWidget(TQWidget *tqparent, Kopete::Account *account);
 
 	/**
 	 * Deserialize contact data
@@ -93,7 +94,7 @@ public:
 	virtual Kopete::Contact *deserializeContact( Kopete::MetaContact *metaContact,
 		const TQMap<TQString, TQString> &serializedData, const TQMap<TQString, TQString> &addressBookData );
 
-	virtual KopeteEditAccountWidget* createEditAccountWidget(Kopete::Account *account, TQWidget *parent);
+	virtual KopeteEditAccountWidget* createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent);
 
 	virtual Kopete::Account* createNewAccount(const TQString &accountId);
 
@@ -104,7 +105,7 @@ public:
 	/**
 	 * Maps the given IRC status to Kopete::OnlineStatus.
 	 */
-	const Kopete::OnlineStatus statusLookup( IRCStatus status ) const;
+	const Kopete::OnlineStatus statusLookup( IRCtqStatus status ) const;
 
 	const Kopete::OnlineStatus m_ServerStatusOnline;
 	const Kopete::OnlineStatus m_ServerStatusOffline;
@@ -145,7 +146,7 @@ public:
 	TQDict<IRCNetwork> &networks(){ return m_networks; }
 	void addNetwork( IRCNetwork *network );
 
-	void editNetworks( const TQString &networkName = TQString::null );
+	void editNetworks( const TQString &networkName = TQString() );
 
 signals:
 	void networkConfigUpdated( const TQString &selectedNetwork );