7 files changed, 16 insertions, 16 deletions
diff --git a/tools/assistant/helpdialogimpl.cpp b/tools/assistant/helpdialogimpl.cpp
index abce3ae84..00ab8cdc4 100644
--- a/tools/assistant/helpdialogimpl.cpp
+++ b/tools/assistant/helpdialogimpl.cpp
@@ -333,7 +333,7 @@ void HelpDialog::loadIndexFile()
     editIndex->setEnabled(FALSE);
 
     TQDataStream ds( &indexFile );
-    Q_UINT32 fileAges;
+    TQ_UINT32 fileAges;
     ds >> fileAges;
     if ( fileAges != getFileAges() ) {
 	indexFile.close();
@@ -376,12 +376,12 @@ void HelpDialog::loadIndexFile()
     editIndex->setEnabled(TRUE);
 }
 
-Q_UINT32 HelpDialog::getFileAges()
+TQ_UINT32 HelpDialog::getFileAges()
 {
     TQStringList addDocuFiles = Config::configuration()->docFiles();
     TQStringList::const_iterator i = addDocuFiles.begin();
 
-    Q_UINT32 fileAges = 0;
+    TQ_UINT32 fileAges = 0;
     for( ; i != addDocuFiles.end(); ++i ) {
 	TQFileInfo fi( *i );
 	if ( fi.exists() )
@@ -406,7 +406,7 @@ void HelpDialog::buildKeywordDB()
     processEvents();
 
     TQValueList<IndexKeyword> lst;
-    Q_UINT32 fileAges = 0;
+    TQ_UINT32 fileAges = 0;
     for( i = addDocuFiles.begin(); i != addDocuFiles.end(); i++ ){
 	TQFile file( *i );
 	if ( !file.exists() ) {
@@ -497,7 +497,7 @@ void HelpDialog::getAllContents()
     }
 
     TQDataStream ds( &contentFile );
-    Q_UINT32 fileAges;
+    TQ_UINT32 fileAges;
     ds >> fileAges;
     if ( fileAges != getFileAges() ) {
 	contentFile.close();
@@ -520,7 +520,7 @@ void HelpDialog::buildContentDict()
 {
     TQStringList docuFiles = Config::configuration()->docFiles();
 
-    Q_UINT32 fileAges = 0;
+    TQ_UINT32 fileAges = 0;
     for( TQStringList::iterator it = docuFiles.begin(); it != docuFiles.end(); it++ ) {
 	TQFile file( *it );
 	if ( !file.exists() ) {
diff --git a/tools/assistant/helpdialogimpl.h b/tools/assistant/helpdialogimpl.h
index ecb3bf3e2..08db2fc20 100644
--- a/tools/assistant/helpdialogimpl.h
+++ b/tools/assistant/helpdialogimpl.h
@@ -144,7 +144,7 @@ private:
     typedef TQValueList<ContentItem> ContentList;
     void removeOldCacheFiles();
     void buildKeywordDB();
-    Q_UINT32 getFileAges();
+    TQ_UINT32 getFileAges();
     void showIndexTopic();
     void showBookmarkTopic();
     void setupTitleMap();
diff --git a/tools/assistant/index.cpp b/tools/assistant/index.cpp
index 785f27bc6..7a3428920 100644
--- a/tools/assistant/index.cpp
+++ b/tools/assistant/index.cpp
@@ -59,8 +59,8 @@ TQDataStream &operator>>( TQDataStream &s, Document &l )
 
 TQDataStream &operator<<( TQDataStream &s, const Document &l )
 {
-    s << (Q_INT16)l.docNumber;
-    s << (Q_INT16)l.frequency;
+    s << (TQ_INT16)l.docNumber;
+    s << (TQ_INT16)l.frequency;
     return s;
 }
 
diff --git a/tools/assistant/index.h b/tools/assistant/index.h
index 2bd32f20e..b8a421730 100644
--- a/tools/assistant/index.h
+++ b/tools/assistant/index.h
@@ -54,8 +54,8 @@ struct Document {
     bool operator>( const Document &doc ) const {
 	return frequency < doc.frequency;
     }
-    Q_INT16 docNumber;
-    Q_INT16 frequency;
+    TQ_INT16 docNumber;
+    TQ_INT16 frequency;
 };
 
 TQDataStream &operator>>( TQDataStream &s, Document &l );
diff --git a/tools/assistant/lib/ntqassistantclient.h b/tools/assistant/lib/ntqassistantclient.h
index a30c72b0e..9adf7830a 100644
--- a/tools/assistant/lib/ntqassistantclient.h
+++ b/tools/assistant/lib/ntqassistantclient.h
@@ -72,7 +72,7 @@ private slots:
 private:
     TQSocket *socket;
     TQProcess *proc;
-    Q_UINT16 port;
+    TQ_UINT16 port;
     TQString host, assistantCommand, pageBuffer;
     bool opened;
 };
diff --git a/tools/assistant/lib/qassistantclient.cpp b/tools/assistant/lib/qassistantclient.cpp
index b0fc0df39..4db090fb3 100644
--- a/tools/assistant/lib/qassistantclient.cpp
+++ b/tools/assistant/lib/qassistantclient.cpp
@@ -230,7 +230,7 @@ void TQAssistantClient::openAssistant()
 void TQAssistantClient::readPort()
 {
     TQString p = proc->readLineStdout();
-    Q_UINT16 port = p.toUShort();
+    TQ_UINT16 port = p.toUShort();
     if ( port == 0 ) {
 	emit error( tr( "Cannot connect to TQt Assistant." ) );
 	return;
diff --git a/tools/assistant/main.cpp b/tools/assistant/main.cpp
index 8954709cd..ce8ffd2db 100644
--- a/tools/assistant/main.cpp
+++ b/tools/assistant/main.cpp
@@ -78,14 +78,14 @@ class AssistantServer : public TQServerSocket
 public:
     AssistantServer( TQObject* parent = 0 );
     void newConnection( int socket );
-    Q_UINT16 getPort() const;
+    TQ_UINT16 getPort() const;
 
 signals:
     void showLinkRequest( const TQString& );
     void newConnect();
 
 private:
-    Q_UINT16 p;
+    TQ_UINT16 p;
 };
 
 
@@ -127,7 +127,7 @@ AssistantServer::AssistantServer( TQObject *parent )
     p = port();
 }
 
-Q_UINT16 AssistantServer::getPort() const
+TQ_UINT16 AssistantServer::getPort() const
 {
     return p;
 }