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

diff --git a/kopete/libkopete/kopetepassword.h b/kopete/libkopete/kopetepassword.h
index f2629234..3846d6d1 100644
--- a/kopete/libkopete/kopetepassword.h
+++ b/kopete/libkopete/kopetepassword.h
@@ -43,9 +43,10 @@ namespace Kopete
  * If the KWallet is active, passwords will be stored in it, otherwise, they
  * will be stored in the KConfig, in a slightly mangled form.
  */
-class KOPETE_EXPORT Password : public QObject
+class KOPETE_EXPORT Password : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
 	/**
@@ -127,10 +128,10 @@ public:
 	 * @param receiver The object to notify when the password request finishes
 	 * @param slot The slot on receiver to call at the end of the request. The signature
 	 *        of this function should be slot( const TQString &password ). password will
-	 *        be the password if successful, or TQString::null if failed.
+	 *        be the password if successful, or TQString() if failed.
 	 * @param image The icon to display in the dialog when asking for the password
 	 * @param prompt The message to display to the user, asking for a
-	 *        password. Can be any Qt RichText string.
+	 *        password. Can be any TQt RichText string.
 	 * @param source The source the password is taken from if a wrong or
 	 *        invalid password is entered or the password could not be found in the wallet
 	 */
@@ -163,7 +164,7 @@ public:
 
 	/**
 	 * When a password request succeeds, the password is cached. This function
-	 * returns the cached password, if there is one, or TQString::null if there
+	 * returns the cached password, if there is one, or TQString() if there
 	 * is not.
 	 */
 	TQString cachedValue();
@@ -171,13 +172,13 @@ public:
 public slots:
 	/**
 	 * Set the password for this account.
-	 * @param pass If set to TQString::null, the password is forgotten unless you
+	 * @param pass If set to TQString(), the password is forgotten unless you
 	 *	specified to allow blank passwords. Otherwise, sets the password to
 	 *	this value.
 	 *
 	 * Note: this function is asynchronous; changes will not be instant.
 	 */
-	void set( const TQString &pass = TQString::null );
+	void set( const TQString &pass = TQString() );
 
 	/**
 	 * Unconditionally clears the stored password
@@ -204,9 +205,10 @@ private:
  * @internal
  * @see KopetePassword
  */
-class KopetePasswordRequestBase : public virtual QObject
+class KopetePasswordRequestBase : public virtual TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 signals:
 	void requestFinished( const TQString &password );
 public slots: