diff options
author | Piotr Srebrny <piotr.srebrny@qt.io> | 2022-06-10 08:55:13 +0200 |
---|---|---|
committer | Piotr Srebrny <piotr.srebrny@qt.io> | 2022-08-05 16:06:07 +0000 |
commit | 83143b0a25089d8c7840efff52058f05ef870605 (patch) | |
tree | 3d630b08bf9201d7ead9675ddf6b2f1f030d3ffb | |
parent | 1b59dd3fe7d8e3ce4f32d65dd1d5d7aefc1bf5b9 (diff) | |
download | qtmultimedia-83143b0a25089d8c7840efff52058f05ef870605.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.
Pick-to: 6.3
Change-Id: I35869e950b13d96aaefb1d0cce9bccf03b14b621
Reviewed-by: Lars Knoll <lars.knoll@gmail.com>
-rw-r--r-- | src/multimedia/windows/qwindowsiupointer_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/multimedia/windows/qwindowsiupointer_p.h b/src/multimedia/windows/qwindowsiupointer_p.h index a96d70989..0cf73660b 100644 --- a/src/multimedia/windows/qwindowsiupointer_p.h +++ b/src/multimedia/windows/qwindowsiupointer_p.h @@ -19,7 +19,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(); } |