diff options
| author | Oliver Wolff <oliver.wolff@theqtcompany.com> | 2016-04-11 13:32:24 +0200 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@theqtcompany.com> | 2016-04-13 10:17:10 +0000 |
| commit | 208f364a953146223fe5cb41ca44875f4c85cdd9 (patch) | |
| tree | 2593072d79360e6d270b94cd9464607309300a92 | |
| parent | b501fc3b3378526e35590d1733ba61c7c1562a75 (diff) | |
WinRT: Removed superfluous callback that handles completed binds
The callback was added as the functionality did not work as expected on
Windows 8. The behavior seems to have been fixed so that the callback
is no longer needed and can be removed.
Change-Id: I3def5750271e40eea1c6a88eed693f4da4ea44bb
Reviewed-by: Samuel Nevala <samuel.nevala@intopalo.com>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
| -rw-r--r-- | src/network/socket/qnativesocketengine_winrt.cpp | 7 | ||||
| -rw-r--r-- | src/network/socket/qnativesocketengine_winrt_p.h | 1 |
2 files changed, 0 insertions, 8 deletions
diff --git a/src/network/socket/qnativesocketengine_winrt.cpp b/src/network/socket/qnativesocketengine_winrt.cpp index c5281ee9c5..599f37929c 100644 --- a/src/network/socket/qnativesocketengine_winrt.cpp +++ b/src/network/socket/qnativesocketengine_winrt.cpp @@ -383,8 +383,6 @@ bool QNativeSocketEngine::bind(const QHostAddress &address, quint16 port) } RETURN_HR_IF_FAILED("QNativeSocketEngine::bind: Unable to bind socket"); - hr = op->put_Completed(Callback<IAsyncActionCompletedHandler>(d, &QNativeSocketEnginePrivate::handleBindCompleted).Get()); - RETURN_HR_IF_FAILED("QNativeSocketEngine::bind: Could not register bind callback"); hr = QWinRTFunctions::await(op); RETURN_HR_IF_FAILED("QNativeSocketEngine::bind: Could not wait for bind to finish"); return S_OK; @@ -1186,11 +1184,6 @@ bool QNativeSocketEnginePrivate::fetchConnectionParameters() return true; } -HRESULT QNativeSocketEnginePrivate::handleBindCompleted(IAsyncAction *, AsyncStatus) -{ - return S_OK; -} - HRESULT QNativeSocketEnginePrivate::handleClientConnection(IStreamSocketListener *listener, IStreamSocketListenerConnectionReceivedEventArgs *args) { Q_Q(QNativeSocketEngine); diff --git a/src/network/socket/qnativesocketengine_winrt_p.h b/src/network/socket/qnativesocketengine_winrt_p.h index 51793b278d..4a5bc81769 100644 --- a/src/network/socket/qnativesocketengine_winrt_p.h +++ b/src/network/socket/qnativesocketengine_winrt_p.h @@ -210,7 +210,6 @@ private: QAbstractSocket *sslSocket; EventRegistrationToken connectionToken; - HRESULT handleBindCompleted(ABI::Windows::Foundation::IAsyncAction *, ABI::Windows::Foundation::AsyncStatus); HRESULT handleNewDatagram(ABI::Windows::Networking::Sockets::IDatagramSocket *socket, ABI::Windows::Networking::Sockets::IDatagramSocketMessageReceivedEventArgs *args); HRESULT handleClientConnection(ABI::Windows::Networking::Sockets::IStreamSocketListener *tcpListener, |