summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Srebrny <piotr.srebrny@qt.io>2022-06-10 08:55:13 +0200
committerPiotr Srebrny <piotr.srebrny@qt.io>2022-08-16 13:51:24 +0200
commit31b89d7b029326ee54723a5827a48529b333514d (patch)
tree9a152a61ab05ff65c6b26b63666c64eae9968366
parent0057005dd0d9e0b2f4b276383eb6f5e6f0e43371 (diff)
downloadqtmultimedia-31b89d7b029326ee54723a5827a48529b333514d.tar.gz
Add implicit default constructor for nullptr
This patch simplifies use of QWindowsPointer when returning empty pointer. By providing implicit constructor for empty pointer we can avoid length QWindowsPointer<T>{} syntax when returing empty pointer instead we can write {}. It also simplifies default construction of objects with QWindowsPointer. Change-Id: I35869e950b13d96aaefb1d0cce9bccf03b14b621 Reviewed-by: Lars Knoll <lars.knoll@gmail.com> (cherry picked from commit 83143b0a25089d8c7840efff52058f05ef870605) Reviewed-by: Lars Knoll <lars@knoll.priv.no>
-rw-r--r--src/multimedia/platform/windows/common/qwindowsiupointer_p.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/multimedia/platform/windows/common/qwindowsiupointer_p.h b/src/multimedia/platform/windows/common/qwindowsiupointer_p.h
index 9e9cf6894..f1814d520 100644
--- a/src/multimedia/platform/windows/common/qwindowsiupointer_p.h
+++ b/src/multimedia/platform/windows/common/qwindowsiupointer_p.h
@@ -55,7 +55,8 @@ template <class T>
class QWindowsIUPointer
{
public:
- explicit QWindowsIUPointer(T *ptr = nullptr) : m_ptr(ptr) {}
+ explicit QWindowsIUPointer(T *ptr) : m_ptr(ptr) {}
+ QWindowsIUPointer() : m_ptr(nullptr) {}
QWindowsIUPointer(const QWindowsIUPointer<T> &uiPtr) : m_ptr(uiPtr.m_ptr) { if (m_ptr) m_ptr->AddRef(); }
QWindowsIUPointer(QWindowsIUPointer<T> &&uiPtr) : m_ptr(uiPtr.m_ptr) { uiPtr.m_ptr = nullptr; }
~QWindowsIUPointer() { if (m_ptr) m_ptr->Release(); }