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

12 years ago · ea7531c73c
parent 1fcb8ace14 2356bc27fe
commit ea7531c73c
2 changed files with 3 additions and 3 deletions
--- 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;
--- 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