Merge branch 'stable' into dev

Change-Id: Icff019d74ae04c628a80f66aa478e4db40fae464

1 files changed, 4 insertions, 5 deletions

diff --git a/examples/network/torrent/peerwireclient.h b/examples/network/torrent/peerwireclient.h
index 7cd08d90cb..35e4cc6ffb 100644
--- a/examples/network/torrent/peerwireclient.h
+++ b/examples/network/torrent/peerwireclient.h
@@ -118,6 +118,10 @@ public:
 
     void setReadBufferSize(qint64 size);
 
+    void connectToHost(const QHostAddress &address,
+                       quint16 port, OpenMode openMode = ReadWrite);
+    void diconnectFromHost();
+
 signals:
     void infoHashReceived(const QByteArray &infoHash);
     void readyToTransfer();
@@ -133,11 +137,6 @@ signals:
 
     void bytesReceived(qint64 size);
 
-protected slots:
-    void connectToHostImplementation(const QString &hostName,
-                                     quint16 port, OpenMode openMode = ReadWrite);
-    void diconnectFromHostImplementation();
-
 protected:
     void timerEvent(QTimerEvent *event);