Allow StreamHost::host to contain a host name

4 files changed, 12 insertions, 12 deletions

diff --git a/src/base/QXmppByteStreamIq.cpp b/src/base/QXmppByteStreamIq.cpp
index 0e17cc48..c3926220 100644
--- a/src/base/QXmppByteStreamIq.cpp
+++ b/src/base/QXmppByteStreamIq.cpp
@@ -27,12 +27,12 @@
 #include "QXmppConstants.h"
 #include "QXmppUtils.h"
 
-QHostAddress QXmppByteStreamIq::StreamHost::host() const
+QString QXmppByteStreamIq::StreamHost::host() const
 {
     return m_host;
 }
 
-void QXmppByteStreamIq::StreamHost::setHost(const QHostAddress &host)
+void QXmppByteStreamIq::StreamHost::setHost(const QString &host)
 {
     m_host = host;
 }
@@ -139,7 +139,7 @@ void QXmppByteStreamIq::parseElementFromChild(const QDomElement &element)
     while (!hostElement.isNull())
     {
         StreamHost streamHost;
-        streamHost.setHost(QHostAddress(hostElement.attribute("host")));
+        streamHost.setHost(hostElement.attribute("host"));
         streamHost.setJid(hostElement.attribute("jid"));
         streamHost.setPort(hostElement.attribute("port").toInt());
         streamHost.setZeroconf(hostElement.attribute("zeroconf"));
@@ -165,7 +165,7 @@ void QXmppByteStreamIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
     foreach (const StreamHost& streamHost, m_streamHosts)
     {
         writer->writeStartElement("streamhost");
-        helperToXmlAddAttribute(writer, "host", streamHost.host().toString());
+        helperToXmlAddAttribute(writer, "host", streamHost.host());
         helperToXmlAddAttribute(writer, "jid", streamHost.jid());
         helperToXmlAddAttribute(writer, "port", QString::number(streamHost.port()));
         helperToXmlAddAttribute(writer, "zeroconf", streamHost.zeroconf());
diff --git a/src/base/QXmppByteStreamIq.h b/src/base/QXmppByteStreamIq.h
index 408cccfd..0054bfb1 100644
--- a/src/base/QXmppByteStreamIq.h
+++ b/src/base/QXmppByteStreamIq.h
@@ -43,8 +43,8 @@ public:
         QString jid() const;
         void setJid(const QString &jid);
 
-        QHostAddress host() const;
-        void setHost(const QHostAddress &host);
+        QString host() const;
+        void setHost(const QString &host);
 
         quint16 port() const;
         void setPort(quint16 port);
@@ -53,7 +53,7 @@ public:
         void setZeroconf(const QString &zeroconf);
 
     private:
-        QHostAddress m_host;
+        QString m_host;
         QString m_jid;
         quint16 m_port;
         QString m_zeroconf;
diff --git a/src/base/QXmppSocks.cpp b/src/base/QXmppSocks.cpp
index 331a221e..aa6d4b0d 100644
--- a/src/base/QXmppSocks.cpp
+++ b/src/base/QXmppSocks.cpp
@@ -102,9 +102,9 @@ static bool parseHostAndPort(const QByteArray buffer, quint8 &type, QByteArray &
     return true;
 }
 
-QXmppSocksClient::QXmppSocksClient(const QHostAddress &proxyAddress, quint16 proxyPort, QObject *parent)
+QXmppSocksClient::QXmppSocksClient(const QString &proxyHost, quint16 proxyPort, QObject *parent)
     : QTcpSocket(parent),
-    m_proxyAddress(proxyAddress),
+    m_proxyHost(proxyHost),
     m_proxyPort(proxyPort),
     m_step(ConnectState)
 {
@@ -116,7 +116,7 @@ void QXmppSocksClient::connectToHost(const QString &hostName, quint16 hostPort)
 {
     m_hostName = hostName;
     m_hostPort = hostPort;
-    QTcpSocket::connectToHost(m_proxyAddress, m_proxyPort);
+    QTcpSocket::connectToHost(m_proxyHost, m_proxyPort);
 }
 
 void QXmppSocksClient::slotConnected()
diff --git a/src/base/QXmppSocks.h b/src/base/QXmppSocks.h
index 42aea3c9..1a0f3f9b 100644
--- a/src/base/QXmppSocks.h
+++ b/src/base/QXmppSocks.h
@@ -36,7 +36,7 @@ class QXMPP_EXPORT QXmppSocksClient : public QTcpSocket
     Q_OBJECT
 
 public:
-    QXmppSocksClient(const QHostAddress &proxyAddress, quint16 proxyPort, QObject *parent=0);
+    QXmppSocksClient(const QString &proxyHost, quint16 proxyPort, QObject *parent=0);
     void connectToHost(const QString &hostName, quint16 hostPort);
 
 signals:
@@ -47,7 +47,7 @@ private slots:
     void slotReadyRead();
 
 private:
-    QHostAddress m_proxyAddress;
+    QString m_proxyHost;
     quint16 m_proxyPort;
     QString m_hostName;
     quint16 m_hostPort;