diff options
-rw-r--r-- | src/libs/installer/remoteclient.cpp | 2 | ||||
-rw-r--r-- | src/libs/installer/remoteclient.h | 9 | ||||
-rw-r--r-- | src/libs/installer/remoteclient_p.h | 3 | ||||
-rw-r--r-- | src/libs/installer/remoteobject.cpp | 1 | ||||
-rw-r--r-- | src/libs/installer/remoteserver.h | 4 | ||||
-rw-r--r-- | src/libs/installer/remoteserver_p.h | 1 | ||||
-rw-r--r-- | src/sdk/main.cpp | 1 | ||||
-rw-r--r-- | tests/auto/installer/clientserver/tst_clientserver.cpp | 6 |
8 files changed, 7 insertions, 20 deletions
diff --git a/src/libs/installer/remoteclient.cpp b/src/libs/installer/remoteclient.cpp index 71fd055c3..1c518ed16 100644 --- a/src/libs/installer/remoteclient.cpp +++ b/src/libs/installer/remoteclient.cpp @@ -58,7 +58,7 @@ quint16 RemoteClient::port() const return d->m_port; } -QHostAddress RemoteClient::address() const +QString RemoteClient::address() const { Q_D(const RemoteClient); return d->m_address; diff --git a/src/libs/installer/remoteclient.h b/src/libs/installer/remoteclient.h index 8ba8a0649..f2c268626 100644 --- a/src/libs/installer/remoteclient.h +++ b/src/libs/installer/remoteclient.h @@ -40,11 +40,6 @@ #include <QScopedPointer> -QT_BEGIN_NAMESPACE -class QHostAddress; -class QStringList; -QT_END_NAMESPACE - namespace QInstaller { class RemoteClientPrivate; @@ -59,10 +54,10 @@ public: void init(quint16 port, const QString &key, Protocol::Mode mode, Protocol::StartAs startAs); void shutdown(); - void init(quint16 port, const QHostAddress &address, Protocol::Mode mode); + void init(quint16 port, const QString &address, Protocol::Mode mode); quint16 port() const; - QHostAddress address() const; + QString address() const; QString authorizationKey() const; bool isActive() const; diff --git a/src/libs/installer/remoteclient_p.h b/src/libs/installer/remoteclient_p.h index 5afc32ff5..103b60d08 100644 --- a/src/libs/installer/remoteclient_p.h +++ b/src/libs/installer/remoteclient_p.h @@ -45,7 +45,6 @@ #include <QCoreApplication> #include <QElapsedTimer> -#include <QHostAddress> #include <QMutex> #include <QThread> @@ -187,7 +186,7 @@ public: private: RemoteClient *q_ptr; QMutex m_mutex; - QHostAddress m_address; + QString m_address; quint16 m_port; Protocol::StartAs m_startServerAs; bool m_serverStarted; diff --git a/src/libs/installer/remoteobject.cpp b/src/libs/installer/remoteobject.cpp index 6872ed22c..e295694b6 100644 --- a/src/libs/installer/remoteobject.cpp +++ b/src/libs/installer/remoteobject.cpp @@ -39,7 +39,6 @@ #include <QCoreApplication> #include <QElapsedTimer> -#include <QHostAddress> #include <QThread> namespace QInstaller { diff --git a/src/libs/installer/remoteserver.h b/src/libs/installer/remoteserver.h index 9a4fbdd34..40d484d65 100644 --- a/src/libs/installer/remoteserver.h +++ b/src/libs/installer/remoteserver.h @@ -40,10 +40,6 @@ #include <QObject> -QT_BEGIN_NAMESPACE -class QHostAddress; -QT_END_NAMESPACE - namespace QInstaller { class RemoteServerPrivate; diff --git a/src/libs/installer/remoteserver_p.h b/src/libs/installer/remoteserver_p.h index 326606b98..e210feb1e 100644 --- a/src/libs/installer/remoteserver_p.h +++ b/src/libs/installer/remoteserver_p.h @@ -39,6 +39,7 @@ #include "remoteserver.h" #include "remoteserverconnection.h" +#include <QHostAddress> #include <QPointer> #include <QTcpServer> #include <QTimer> diff --git a/src/sdk/main.cpp b/src/sdk/main.cpp index e67ee6662..dcd904fb9 100644 --- a/src/sdk/main.cpp +++ b/src/sdk/main.cpp @@ -46,7 +46,6 @@ #include <QCommandLineParser> #include <QDateTime> -#include <QHostAddress> #include <QNetworkProxyFactory> #include <iostream> diff --git a/tests/auto/installer/clientserver/tst_clientserver.cpp b/tests/auto/installer/clientserver/tst_clientserver.cpp index 1c135c0b5..a0652bcdd 100644 --- a/tests/auto/installer/clientserver/tst_clientserver.cpp +++ b/tests/auto/installer/clientserver/tst_clientserver.cpp @@ -39,7 +39,6 @@ #include <remotefileengine.h> #include <remoteserver.h> -#include <QHostAddress> #include <QSettings> #include <QTcpSocket> #include <QTemporaryFile> @@ -66,8 +65,7 @@ private slots: server.start(); QTcpSocket socket; - socket.connectToHost(QHostAddress(QLatin1String(Protocol::DefaultHostAddress)), - Protocol::DefaultPort); + socket.connectToHost(QLatin1String(Protocol::DefaultHostAddress), Protocol::DefaultPort); QVERIFY2(socket.waitForConnected(), "Could not connect to server."); QCOMPARE(socket.state() == QAbstractSocket::ConnectedState, true); @@ -103,7 +101,7 @@ private slots: server.start(); QTcpSocket socket; - socket.connectToHost(QHostAddress(QLatin1String(Protocol::DefaultHostAddress)), port); + socket.connectToHost(QLatin1String(Protocol::DefaultHostAddress), port); QVERIFY2(socket.waitForConnected(), "Could not connect to server."); QCOMPARE(socket.state() == QAbstractSocket::ConnectedState, true); |