Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3

1 files changed, 3 insertions, 3 deletions

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;
 }