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

diff --git a/kopete/protocols/yahoo/yahooaccount.h b/kopete/protocols/yahoo/yahooaccount.h
index 5332794f..4269a6cd 100644
--- a/kopete/protocols/yahoo/yahooaccount.h
+++ b/kopete/protocols/yahoo/yahooaccount.h
@@ -21,7 +21,7 @@
 #ifndef YAHOOACCOUNT_H
 #define YAHOOACCOUNT_H
 
-// Qt
+// TQt
 #include <tqobject.h>
 #include <tqmap.h>
 #include <tqpixmap.h>
@@ -64,12 +64,13 @@ namespace KIO{
 class YahooAccount : public Kopete::PasswordedAccount
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
 
 	enum SignalConnectionType { MakeConnections, DeleteConnections };
 
-	YahooAccount(YahooProtocol *parent,const TQString& accountID, const char *name = 0);
+	YahooAccount(YahooProtocol *tqparent,const TQString& accountID, const char *name = 0);
 	~YahooAccount();
 
 	/*
@@ -92,7 +93,7 @@ public:
 	/**
 	 * Returns true if contact @p id is on the server-side contact list
 	 */
-	bool isOnServer(const TQString &id) { return IDs.contains(id); }
+	bool isOnServer(const TQString &id) { return IDs.tqcontains(id); }
 
 	/**
 	 * Returns true if we have the server-side contact list
@@ -135,7 +136,7 @@ public slots:
 	virtual void disconnect();
 
 	/** Reimplemented from Kopete::Account */
-	void setOnlineStatus( const Kopete::OnlineStatus&, const TQString &reason = TQString::null);
+	void setOnlineStatus( const Kopete::OnlineStatus&, const TQString &reason = TQString());
 
 signals:
 	/**
@@ -152,7 +153,7 @@ protected:
 	/**
 	 * Adds our Yahoo contact to a metacontact
 	 */
-	virtual bool createContact(const TQString &contactId,  Kopete::MetaContact *parentContact);
+	virtual bool createContact(const TQString &contactId,  Kopete::MetaContact *tqparentContact);
 
 	virtual bool createChatContact( const TQString &nick );
 
@@ -175,7 +176,7 @@ protected slots:
 	void slotJoinChatRoom();
 	void slotChatCategorySelected( const Yahoo::ChatCategory &category );
 
-	void slotGoStatus(int status, const TQString &awayMessage = TQString());
+	void slotGotqStatus(int status, const TQString &awayMessage = TQString());
 	void slotLoginResponse(int succ, const TQString &url);
 	void slotDisconnected();
 	void slotLoginFailed();
@@ -191,7 +192,7 @@ protected slots:
 	void slotGotIgnore(const TQStringList &);
 	void slotGotIdentities(const TQStringList &);
 	void slotStatusChanged(const TQString &who, int stat, const TQString &msg, int away, int idle, int pictureChecksum);
-	void slotStealthStatusChanged(const TQString &who, Yahoo::StealthStatus state);
+	void slotStealthStatusChanged(const TQString &who, Yahoo::StealthtqStatus state);
 	void slotGotIm(const TQString &who, const TQString &msg, long tm, int stat);
 	void slotGotBuzz(const TQString &who, long tm);
 	void slotGotConfInvite(const TQString &who, const TQString &room, const TQString &msg, const TQStringList &members);
@@ -261,7 +262,7 @@ private:
 	 * internal (to the plugin) controls/flags
 	 * This should be kept in sync with server - if a buddy is removed, this should be changed accordingly.
 	 */
-	TQMap<TQString, QPair<TQString, TQString> > IDs;
+	TQMap<TQString, TQPair<TQString, TQString> > IDs;
 
 	/**
 	 * Conferences list, maped by room name (id)