summaryrefslogtreecommitdiffstats
path: root/tools/assistant/lib
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-06-18 00:09:52 -0500
committerDarrell Anderson <humanreadable@yahoo.com>2012-06-18 00:09:52 -0500
commitd1096751ddb25cdef23919c17389fc268c31edaf (patch)
treeb910be3588cb706defc00c31aefa850bb2312784 /tools/assistant/lib
parentaf8fdcf1ca7bdbda6f0c1afecd8c2d8ffa23bebb (diff)
parent6dec101d43dcbd4195c47d54bd388db1a8d7230e (diff)
downloadtqt-d1096751ddb25cdef23919c17389fc268c31edaf.tar.gz
tqt-d1096751ddb25cdef23919c17389fc268c31edaf.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'tools/assistant/lib')
-rw-r--r--tools/assistant/lib/ntqassistantclient.h2
-rw-r--r--tools/assistant/lib/qassistantclient.cpp2
2 files changed, 2 insertions, 2 deletions
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;