diff options
| author | Jøger Hansegård <joger.hansegard@qt.io> | 2023-06-08 10:49:05 +0200 |
|---|---|---|
| committer | Jøger Hansegård <joger.hansegard@qt.io> | 2023-06-08 21:27:29 +0200 |
| commit | 8d8622f40f5f3e1053121cff58b3c1179a158297 (patch) | |
| tree | c3c81366e8c4275100415a955a3c8e181343b20d /src/multimedia/windows/qwindowsmediadevices.cpp | |
| parent | cf4097cfb3b0d5b8e13a5f7c11a9517236edb578 (diff) | |
Split QComPtr reset() function into a reset() and an attach() function
The name 'reset' does not specify well how ownership is handled when
reset to a new pointer value. A better name for this is 'attach', which
indicates that AddRef is not called.
'reset' now just resets the pointer to a default constructed state.
This is a step towards replacing QComPtr out with WRL::ComPtr which is used elsewhere in Qt.
Change-Id: Ic72beba8cf212669f5dfa2e01f36754ffb0ad94e
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
Reviewed-by: Pavel Dubsky <pavel.dubsky@qt.io>
(cherry picked from commit b9a3961ff5966af372acad83f9dcee7f082a21c7)
Diffstat (limited to 'src/multimedia/windows/qwindowsmediadevices.cpp')
| -rw-r--r-- | src/multimedia/windows/qwindowsmediadevices.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/windows/qwindowsmediadevices.cpp b/src/multimedia/windows/qwindowsmediadevices.cpp index cad49862a..d55b73761 100644 --- a/src/multimedia/windows/qwindowsmediadevices.cpp +++ b/src/multimedia/windows/qwindowsmediadevices.cpp @@ -179,7 +179,7 @@ QWindowsMediaDevices::QWindowsMediaDevices() } - m_notificationClient.reset(new CMMNotificationClient(this, m_deviceEnumerator, std::move(devState))); + m_notificationClient.attach(new CMMNotificationClient(this, m_deviceEnumerator, std::move(devState))); m_deviceEnumerator->RegisterEndpointNotificationCallback(m_notificationClient.get()); } else { |