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, 5 insertions, 4 deletions

diff --git a/kopete/protocols/irc/ircchannelcontact.h b/kopete/protocols/irc/ircchannelcontact.h
index 0febd30b..67fa46c9 100644
--- a/kopete/protocols/irc/ircchannelcontact.h
+++ b/kopete/protocols/irc/ircchannelcontact.h
@@ -47,6 +47,7 @@ class IRCChannelContact
 	friend class IRCSignalMapper;
 
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
 	IRCChannelContact(IRCContactManager *, const TQString &channel, Kopete::MetaContact *metac);
@@ -95,19 +96,19 @@ public:
 	void newAction(const TQString &from, const TQString &action);
 
 public slots:
-	void updateStatus();
+	void updatetqStatus();
 
 	/**
 	 * Sets the topic of this channel
 	 * @param topic The topic you want set
 	 */
-	void setTopic( const TQString &topic = TQString::null );
+	void setTopic( const TQString &topic = TQString() );
 
 	/**
 	 * Sets or unsets a mode on this channel
 	 * @param mode The full text of the mode change you want performed
 	 */
-	void setMode( const TQString &mode = TQString::null );
+	void setMode( const TQString &mode = TQString() );
 
 	void part();
 	void partAction();
@@ -127,7 +128,7 @@ private slots:
 	void slotUpdateInfo();
 	void slotHomepage();
 	void slotChannelListed(const TQString &channel, uint members, const TQString &topic);
-	void slotOnlineStatusChanged(Kopete::Contact *c, const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldStatus);
+	void slotOnlineStatusChanged(Kopete::Contact *c, const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldtqStatus);
 
 private:
 	KAction *actionJoin;