summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-06-19 20:30:19 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-06-19 20:30:19 -0500
commitea7531c73c5d0d904177e4f46aaea4381ffaa8af (patch)
treeeeb34f30c736f40e8c2caa0d18714f2b9a5bd79f
parent1fcb8ace14d2e3ee6a64c9612199afdc2f752253 (diff)
parent2356bc27fe84083df50c0636bfa5d0fe89c24fd9 (diff)
downloadtqca-r14.0.0.tar.gz
tqca-r14.0.0.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqcar14.0.5r14.0.4r14.0.3r14.0.2r14.0.1r14.0.0
-rw-r--r--src/qca.cpp4
-rw-r--r--src/qcaprovider.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/qca.cpp b/src/qca.cpp
index 7db8379..b54671e 100644
--- a/src/qca.cpp
+++ b/src/qca.cpp
@@ -1227,13 +1227,13 @@ void SASL::setExternalSSF(int x)
d->ext_ssf = x;
}
-void SASL::setLocalAddr(const TQHostAddress &addr, Q_UINT16 port)
+void SASL::setLocalAddr(const TQHostAddress &addr, TQ_UINT16 port)
{
d->localAddr = addr;
d->localPort = port;
}
-void SASL::setRemoteAddr(const TQHostAddress &addr, Q_UINT16 port)
+void SASL::setRemoteAddr(const TQHostAddress &addr, TQ_UINT16 port)
{
d->remoteAddr = addr;
d->remotePort = port;
diff --git a/src/qcaprovider.h b/src/qcaprovider.h
index 1b8277b..198b606 100644
--- a/src/qcaprovider.h
+++ b/src/qcaprovider.h
@@ -141,7 +141,7 @@ public:
struct TQCA_SASLHostPort
{
TQHostAddress addr;
- Q_UINT16 port;
+ TQ_UINT16 port;
};
struct TQCA_SASLNeedParams