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, 14 insertions, 13 deletions

diff --git a/kopete/libkopete/ui/kopetestdaction.h b/kopete/libkopete/ui/kopetestdaction.h
index bd323943..06bb40eb 100644
--- a/kopete/libkopete/ui/kopetestdaction.h
+++ b/kopete/libkopete/ui/kopetestdaction.h
@@ -35,64 +35,64 @@ public:
 	 * Standard action to start a chat
 	 */
 	static KAction *chat( const TQObject *recvr, const char *slot,
-		TQObject* parent, const char *name = 0 );
+		TQObject* tqparent, const char *name = 0 );
 	/**
 	 * Standard action to send a single message
 	 */
 	static KAction *sendMessage(const TQObject *recvr, const char *slot,
-		TQObject* parent, const char *name = 0);
+		TQObject* tqparent, const char *name = 0);
 	/**
 	 * Standard action to open a user info dialog
 	 */
 	static KAction *contactInfo(const TQObject *recvr, const char *slot,
-		TQObject* parent, const char *name = 0);
+		TQObject* tqparent, const char *name = 0);
 	/**
 	 * Standard action to open a history dialog or something similar
 	 */
 	static KAction *viewHistory(const TQObject *recvr, const char *slot,
-		TQObject* parent, const char *name = 0);
+		TQObject* tqparent, const char *name = 0);
 	/**
 	 * Standard action to initiate sending a file to a contact
 	 */
 	static KAction *sendFile(const TQObject *recvr, const char *slot,
-		TQObject* parent, const char *name = 0);
+		TQObject* tqparent, const char *name = 0);
 	/**
 	 * Standard action to change a contacts @ref Kopete::MetaContact
 	 */
 	static KAction *changeMetaContact(const TQObject *recvr, const char *slot,
-		TQObject* parent, const char *name = 0);
+		TQObject* tqparent, const char *name = 0);
 	/**
 	 * Standard action to add a group
 	 */
 	static KAction *addGroup(const TQObject *recvr, const char *slot,
-		TQObject* parent, const char *name = 0);
+		TQObject* tqparent, const char *name = 0);
 	/**
 	 * Standard action to delete a contact
 	 */
 	static KAction *deleteContact(const TQObject *recvr, const char *slot,
-		TQObject* parent, const char *name = 0);
+		TQObject* tqparent, const char *name = 0);
 	/**
 	 * Standard action to change a contact alias/nickname in your contactlist
 	 */
 	static KAction *changeAlias(const TQObject *recvr, const char *slot,
-		TQObject* parent, const char *name = 0);
+		TQObject* tqparent, const char *name = 0);
 	/**
 	 * Standard action to block a contact
 	 */
 	static KAction *blockContact(const TQObject *recvr, const char *slot,
-		TQObject* parent, const char *name = 0);
+		TQObject* tqparent, const char *name = 0);
 	/**
 	 * Standard action to unblock a contact
 	 */
 	static KAction *unblockContact(const TQObject *recvr, const char *slot,
-		TQObject* parent, const char *name = 0);
+		TQObject* tqparent, const char *name = 0);
 
 	/**
 	 * Return an action to change the Kopete preferences.
 	 *
 	 * The object has no signal/slot, the prefs are automatically shown
 	 */
-	static KAction *preferences(KActionCollection *parent, const char *name = 0);
+	static KAction *preferences(KActionCollection *tqparent, const char *name = 0);
 };
 
 
@@ -104,9 +104,10 @@ namespace KSettings
 class KOPETE_EXPORT KopetePreferencesAction : public KAction
 {
 	  Q_OBJECT
+  TQ_OBJECT
 
 	  public:
-			 KopetePreferencesAction( KActionCollection *parent, const char *name = 0 );
+			 KopetePreferencesAction( KActionCollection *tqparent, const char *name = 0 );
 			 ~KopetePreferencesAction();
 
 	  protected slots: