1 files changed, 20 insertions, 20 deletions

diff --git a/kio/misc/kntlm/kntlm.h b/kio/misc/kntlm/kntlm.h
index 23f00aa2a..9be4ea357 100644
--- a/kio/misc/kntlm/kntlm.h
+++ b/kio/misc/kntlm/kntlm.h
@@ -33,7 +33,7 @@
  * can be used for various servers which implements NTLM type authentication.
  * A comprehensive description of the NTLM authentication protocol can be found
  * at http://davenport.sourceforge.net/ntlm.html
- * The class also tqcontains methods to create the LanManager and NT (MD4) hashes
+ * The class also contains methods to create the LanManager and NT (MD4) hashes
  * of a password. 
  * This class doesn't maintain any state information, so all methods are static.
  */
@@ -70,9 +70,9 @@ public:
 
   typedef struct
   {
-    TQ_UINT16 len;
-    TQ_UINT16 maxlen;
-    TQ_UINT32 offset;
+    Q_UINT16 len;
+    Q_UINT16 maxlen;
+    Q_UINT32 offset;
   } SecBuf;
 
   /**
@@ -81,8 +81,8 @@ public:
   typedef struct
   {
     char signature[8]; /* "NTLMSSP\0" */
-    TQ_UINT32 msgType; /* 1 */
-    TQ_UINT32 flags;
+    Q_UINT32 msgType; /* 1 */
+    Q_UINT32 flags;
     SecBuf domain;
     SecBuf workstation;
   } Negotiate;
@@ -93,11 +93,11 @@ public:
   typedef struct
   {
     char signature[8];
-    TQ_UINT32 msgType; /* 2 */
+    Q_UINT32 msgType; /* 2 */
     SecBuf targetName;
-    TQ_UINT32 flags;
-    TQ_UINT8 challengeData[8];
-    TQ_UINT32 context[2];
+    Q_UINT32 flags;
+    Q_UINT8 challengeData[8];
+    Q_UINT32 context[2];
     SecBuf targetInfo;
   } Challenge;
 
@@ -107,23 +107,23 @@ public:
   typedef struct
   {
     char signature[8];
-    TQ_UINT32 msgType; /* 3 */
+    Q_UINT32 msgType; /* 3 */
     SecBuf lmResponse;
     SecBuf ntResponse;
     SecBuf domain;
     SecBuf user;
     SecBuf workstation;
     SecBuf sessionKey;
-    TQ_UINT32 flags;
+    Q_UINT32 flags;
   } Auth;
   
   typedef struct
   {
-    TQ_UINT32 signature;
-    TQ_UINT32 reserved;
-    TQ_UINT64 timestamp;
-    TQ_UINT8  challenge[8];
-    TQ_UINT8  unknown[4];
+    Q_UINT32 signature;
+    Q_UINT32 reserved;
+    Q_UINT64 timestamp;
+    Q_UINT8  challenge[8];
+    Q_UINT8  unknown[4];
     //Target info block - variable length
   } Blob;
 
@@ -139,7 +139,7 @@ public:
    */
   static bool getNegotiate( TQByteArray &negotiate, const TQString &domain = TQString::null, 
     const TQString &workstation = TQString::null,
-    TQ_UINT32 flags = Negotiate_Unicode | Request_Target | Negotiate_NTLM );
+    Q_UINT32 flags = Negotiate_Unicode | Request_Target | Negotiate_NTLM );
   /**
    * Creates the type 3 message which should be sent to the server after 
    * the challenge (type 2) received.
@@ -212,7 +212,7 @@ public:
   /**
    * Extracts a string field from an NTLM structure.
    */
-  static TQString getString( const TQByteArray &buf, const SecBuf &secbuf, bool tqunicode );
+  static TQString getString( const TQByteArray &buf, const SecBuf &secbuf, bool unicode );
   /**
    * Extracts a byte array from an NTLM structure.
    */
@@ -226,7 +226,7 @@ private:
   static TQString UnicodeLE2TQString( const TQChar* data, uint len );
 
   static void addBuf( TQByteArray &buf, SecBuf &secbuf, TQByteArray &data );
-  static void addString( TQByteArray &buf, SecBuf &secbuf, const TQString &str, bool tqunicode = false );
+  static void addString( TQByteArray &buf, SecBuf &secbuf, const TQString &str, bool unicode = false );
   static void convertKey( unsigned char *key_56, void* ks );
 };