From f23ac51572704e84e12b2765ad0c372c68b96a0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8ger=20Hanseg=C3=A5rd?= <joger.hansegard@qt.io>
Date: Sat, 13 May 2023 09:02:39 +0200
Subject: Rename file qwindowsiuptr_p.h to qcomptr_p.h

For consistency, rename the file that now contains the QComPtr class. We
also rename the include guard accordingly. This is a follow-up change
after renaming the QWindowsIUPtr class to QComPtr to ensure consistent
naming.

Task-number: QTBUG-113460
Pick-to: 6.5
Change-Id: I5f234a20faabbe65840a32e93fa039ad48cf06ef
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
---
 src/multimedia/CMakeLists.txt                      |  4 +-
 src/multimedia/windows/qcomptr_p.h                 | 58 ++++++++++++++++++++++
 src/multimedia/windows/qwindowsaudiodevice_p.h     |  2 +-
 src/multimedia/windows/qwindowsaudiosink_p.h       |  2 +-
 src/multimedia/windows/qwindowsaudioutils_p.h      |  2 +-
 src/multimedia/windows/qwindowsiupointer_p.h       | 58 ----------------------
 src/multimedia/windows/qwindowsmediadevices_p.h    |  2 +-
 src/multimedia/windows/qwindowsresampler_p.h       |  2 +-
 .../multimedia/ffmpeg/qffmpeghwaccel_d3d11.cpp     |  2 +-
 .../ffmpeg/qffmpegscreencapture_dxgi_p.h           |  2 +-
 src/plugins/multimedia/ffmpeg/qwindowscamera_p.h   |  2 +-
 .../windows/decoder/mfaudiodecodercontrol_p.h      |  2 +-
 .../windows/decoder/mfdecodersourcereader_p.h      |  2 +-
 .../multimedia/windows/evr/evrd3dpresentengine_p.h |  2 +-
 .../mediacapture/qwindowsmediadevicereader.cpp     |  2 +-
 .../multimedia/windows/qwindowsformatinfo.cpp      |  2 +-
 .../multimedia/windows/qwindowsvideodevices.cpp    |  2 +-
 17 files changed, 74 insertions(+), 74 deletions(-)
 create mode 100644 src/multimedia/windows/qcomptr_p.h
 delete mode 100644 src/multimedia/windows/qwindowsiupointer_p.h

diff --git a/src/multimedia/CMakeLists.txt b/src/multimedia/CMakeLists.txt
index 7e46c7ff9..089d88c8e 100644
--- a/src/multimedia/CMakeLists.txt
+++ b/src/multimedia/CMakeLists.txt
@@ -213,7 +213,7 @@ qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_wmf
         windows/qwindowsresampler.cpp windows/qwindowsresampler_p.h
         windows/qwindowsmultimediautils.cpp windows/qwindowsmultimediautils_p.h
         windows/qwindowsmfdefs.cpp windows/qwindowsmfdefs_p.h
-        windows/qwindowsiupointer_p.h
+        windows/qcomptr_p.h
     INCLUDE_DIRECTORIES
         windows
     LIBRARIES
@@ -234,7 +234,7 @@ qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_wmf AND MINGW
         windows/qwindowsresampler.cpp windows/qwindowsresampler_p.h
         windows/qwindowsmultimediautils.cpp windows/qwindowsmultimediautils_p.h
         windows/qwindowsmfdefs.cpp windows/qwindowsmfdefs_p.h
-        windows/qwindowsiupointer_p.h
+        windows/qcomptr_p.h
 )
 
 qt_internal_extend_target(Multimedia CONDITION WASM
diff --git a/src/multimedia/windows/qcomptr_p.h b/src/multimedia/windows/qcomptr_p.h
new file mode 100644
index 000000000..fd63c4a32
--- /dev/null
+++ b/src/multimedia/windows/qcomptr_p.h
@@ -0,0 +1,58 @@
+// Copyright (C) 2021 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+#ifndef QCOMPTR_P_H
+#define QCOMPTR_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+template <class T>
+class QComPtr
+{
+public:
+    explicit QComPtr(T *ptr) : m_ptr(ptr) {}
+    QComPtr() : m_ptr(nullptr) {}
+    QComPtr(const QComPtr<T> &uiPtr) : m_ptr(uiPtr.m_ptr) { if (m_ptr) m_ptr->AddRef(); }
+    QComPtr(QComPtr<T> &&uiPtr) : m_ptr(uiPtr.m_ptr) { uiPtr.m_ptr = nullptr; }
+    ~QComPtr() { if (m_ptr) m_ptr->Release(); }
+
+    QComPtr& operator=(const QComPtr<T> &rhs) {
+        if (this != &rhs) {
+            if (m_ptr)
+                m_ptr->Release();
+            m_ptr = rhs.m_ptr;
+            m_ptr->AddRef();
+        }
+        return *this;
+    }
+
+    QComPtr& operator=(QComPtr<T> &&rhs) noexcept {
+        if (m_ptr)
+            m_ptr->Release();
+        m_ptr = rhs.m_ptr;
+        rhs.m_ptr = nullptr;
+        return *this;
+    }
+
+    explicit operator bool() const { return m_ptr != nullptr; }
+    T *operator->() const { return m_ptr; }
+
+    T **address() { Q_ASSERT(m_ptr == nullptr); return &m_ptr; }
+    void reset(T *ptr = nullptr) { if (m_ptr) m_ptr->Release(); m_ptr = ptr; }
+    T *release() { T *ptr = m_ptr; m_ptr = nullptr; return ptr; }
+    T *get() const { return m_ptr; }
+
+private:
+    T *m_ptr;
+};
+
+#endif
diff --git a/src/multimedia/windows/qwindowsaudiodevice_p.h b/src/multimedia/windows/qwindowsaudiodevice_p.h
index b981a0ed6..12ee0e58e 100644
--- a/src/multimedia/windows/qwindowsaudiodevice_p.h
+++ b/src/multimedia/windows/qwindowsaudiodevice_p.h
@@ -24,7 +24,7 @@
 #include <QtMultimedia/qaudiodevice.h>
 #include <private/qaudiosystem_p.h>
 #include <private/qaudiodevice_p.h>
-#include <qwindowsiupointer_p.h>
+#include <qcomptr_p.h>
 
 struct IMMDevice;
 
diff --git a/src/multimedia/windows/qwindowsaudiosink_p.h b/src/multimedia/windows/qwindowsaudiosink_p.h
index c1ca2e81c..95bc05e11 100644
--- a/src/multimedia/windows/qwindowsaudiosink_p.h
+++ b/src/multimedia/windows/qwindowsaudiosink_p.h
@@ -27,7 +27,7 @@
 #include <QtMultimedia/qaudio.h>
 #include <QtMultimedia/qaudiodevice.h>
 #include <private/qaudiosystem_p.h>
-#include <qwindowsiupointer_p.h>
+#include <qcomptr_p.h>
 #include <qwindowsresampler_p.h>
 
 #include <audioclient.h>
diff --git a/src/multimedia/windows/qwindowsaudioutils_p.h b/src/multimedia/windows/qwindowsaudioutils_p.h
index 5254ef704..379a8b762 100644
--- a/src/multimedia/windows/qwindowsaudioutils_p.h
+++ b/src/multimedia/windows/qwindowsaudioutils_p.h
@@ -17,7 +17,7 @@
 
 #include <qaudioformat.h>
 #include <QtCore/qt_windows.h>
-#include <private/qwindowsiupointer_p.h>
+#include <private/qcomptr_p.h>
 #include <mmreg.h>
 
 #include <optional>
diff --git a/src/multimedia/windows/qwindowsiupointer_p.h b/src/multimedia/windows/qwindowsiupointer_p.h
deleted file mode 100644
index 1fff76e2c..000000000
--- a/src/multimedia/windows/qwindowsiupointer_p.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (C) 2021 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-#ifndef QWINDOWSIUPOINTER_H
-#define QWINDOWSIUPOINTER_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-template <class T>
-class QComPtr
-{
-public:
-    explicit QComPtr(T *ptr) : m_ptr(ptr) {}
-    QComPtr() : m_ptr(nullptr) {}
-    QComPtr(const QComPtr<T> &uiPtr) : m_ptr(uiPtr.m_ptr) { if (m_ptr) m_ptr->AddRef(); }
-    QComPtr(QComPtr<T> &&uiPtr) : m_ptr(uiPtr.m_ptr) { uiPtr.m_ptr = nullptr; }
-    ~QComPtr() { if (m_ptr) m_ptr->Release(); }
-
-    QComPtr& operator=(const QComPtr<T> &rhs) {
-        if (this != &rhs) {
-            if (m_ptr)
-                m_ptr->Release();
-            m_ptr = rhs.m_ptr;
-            m_ptr->AddRef();
-        }
-        return *this;
-    }
-
-    QComPtr& operator=(QComPtr<T> &&rhs) noexcept {
-        if (m_ptr)
-            m_ptr->Release();
-        m_ptr = rhs.m_ptr;
-        rhs.m_ptr = nullptr;
-        return *this;
-    }
-
-    explicit operator bool() const { return m_ptr != nullptr; }
-    T *operator->() const { return m_ptr; }
-
-    T **address() { Q_ASSERT(m_ptr == nullptr); return &m_ptr; }
-    void reset(T *ptr = nullptr) { if (m_ptr) m_ptr->Release(); m_ptr = ptr; }
-    T *release() { T *ptr = m_ptr; m_ptr = nullptr; return ptr; }
-    T *get() const { return m_ptr; }
-
-private:
-    T *m_ptr;
-};
-
-#endif
diff --git a/src/multimedia/windows/qwindowsmediadevices_p.h b/src/multimedia/windows/qwindowsmediadevices_p.h
index 154f29c6e..4aa1e6577 100644
--- a/src/multimedia/windows/qwindowsmediadevices_p.h
+++ b/src/multimedia/windows/qwindowsmediadevices_p.h
@@ -16,7 +16,7 @@
 //
 
 #include <private/qplatformmediadevices_p.h>
-#include <private/qwindowsiupointer_p.h>
+#include <private/qcomptr_p.h>
 
 #include <qaudiodevice.h>
 
diff --git a/src/multimedia/windows/qwindowsresampler_p.h b/src/multimedia/windows/qwindowsresampler_p.h
index a59cc5f2e..351c4259c 100644
--- a/src/multimedia/windows/qwindowsresampler_p.h
+++ b/src/multimedia/windows/qwindowsresampler_p.h
@@ -19,7 +19,7 @@
 #include <qbytearray.h>
 #include <qbytearrayview.h>
 #include <qaudioformat.h>
-#include <private/qwindowsiupointer_p.h>
+#include <private/qcomptr_p.h>
 #include <qt_windows.h>
 #include <mftransform.h>
 
diff --git a/src/plugins/multimedia/ffmpeg/qffmpeghwaccel_d3d11.cpp b/src/plugins/multimedia/ffmpeg/qffmpeghwaccel_d3d11.cpp
index 99180e5a6..44cd4e0c8 100644
--- a/src/plugins/multimedia/ffmpeg/qffmpeghwaccel_d3d11.cpp
+++ b/src/plugins/multimedia/ffmpeg/qffmpeghwaccel_d3d11.cpp
@@ -8,7 +8,7 @@
 
 
 #include <private/qvideotexturehelper_p.h>
-#include <private/qwindowsiupointer_p.h>
+#include <private/qcomptr_p.h>
 #include <private/qrhi_p.h>
 #include <private/qrhid3d11_p.h>
 
diff --git a/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi_p.h b/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi_p.h
index 4c9c75a07..2d38bc9be 100644
--- a/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi_p.h
+++ b/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi_p.h
@@ -18,7 +18,7 @@
 
 #include "qvideoframeformat.h"
 #include "qffmpegscreencapturebase_p.h"
-#include <private/qwindowsiupointer_p.h>
+#include <private/qcomptr_p.h>
 #include <private/qplatformscreencapture_p.h>
 #include <memory>
 
diff --git a/src/plugins/multimedia/ffmpeg/qwindowscamera_p.h b/src/plugins/multimedia/ffmpeg/qwindowscamera_p.h
index f08511b8d..80c05ff59 100644
--- a/src/plugins/multimedia/ffmpeg/qwindowscamera_p.h
+++ b/src/plugins/multimedia/ffmpeg/qwindowscamera_p.h
@@ -16,7 +16,7 @@
 //
 
 #include <private/qplatformcamera_p.h>
-#include <private/qwindowsiupointer_p.h>
+#include <private/qcomptr_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/multimedia/windows/decoder/mfaudiodecodercontrol_p.h b/src/plugins/multimedia/windows/decoder/mfaudiodecodercontrol_p.h
index 3e3a405a3..1912af175 100644
--- a/src/plugins/multimedia/windows/decoder/mfaudiodecodercontrol_p.h
+++ b/src/plugins/multimedia/windows/decoder/mfaudiodecodercontrol_p.h
@@ -18,7 +18,7 @@
 #include "mfdecodersourcereader_p.h"
 #include <private/qplatformaudiodecoder_p.h>
 #include <sourceresolver_p.h>
-#include <private/qwindowsiupointer_p.h>
+#include <private/qcomptr_p.h>
 #include <private/qwindowsresampler_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/multimedia/windows/decoder/mfdecodersourcereader_p.h b/src/plugins/multimedia/windows/decoder/mfdecodersourcereader_p.h
index d964ff482..43ebbd222 100644
--- a/src/plugins/multimedia/windows/decoder/mfdecodersourcereader_p.h
+++ b/src/plugins/multimedia/windows/decoder/mfdecodersourcereader_p.h
@@ -21,7 +21,7 @@
 
 #include <QtCore/qobject.h>
 #include "qaudioformat.h"
-#include <private/qwindowsiupointer_p.h>
+#include <private/qcomptr_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/multimedia/windows/evr/evrd3dpresentengine_p.h b/src/plugins/multimedia/windows/evr/evrd3dpresentengine_p.h
index 82a5f7112..3459c7b5c 100644
--- a/src/plugins/multimedia/windows/evr/evrd3dpresentengine_p.h
+++ b/src/plugins/multimedia/windows/evr/evrd3dpresentengine_p.h
@@ -18,7 +18,7 @@
 #include <QMutex>
 #include <QSize>
 #include <QVideoFrameFormat>
-#include <private/qwindowsiupointer_p.h>
+#include <private/qcomptr_p.h>
 #include <qpointer.h>
 
 #include <d3d9.h>
diff --git a/src/plugins/multimedia/windows/mediacapture/qwindowsmediadevicereader.cpp b/src/plugins/multimedia/windows/mediacapture/qwindowsmediadevicereader.cpp
index e52ebf204..d01fb24ae 100644
--- a/src/plugins/multimedia/windows/mediacapture/qwindowsmediadevicereader.cpp
+++ b/src/plugins/multimedia/windows/mediacapture/qwindowsmediadevicereader.cpp
@@ -9,7 +9,7 @@
 #include <qaudiodevice.h>
 #include <private/qmemoryvideobuffer_p.h>
 #include <private/qwindowsmfdefs_p.h>
-#include <private/qwindowsiupointer_p.h>
+#include <private/qcomptr_p.h>
 #include <QtCore/qdebug.h>
 
 #include <mmdeviceapi.h>
diff --git a/src/plugins/multimedia/windows/qwindowsformatinfo.cpp b/src/plugins/multimedia/windows/qwindowsformatinfo.cpp
index 509967285..28f89c97b 100644
--- a/src/plugins/multimedia/windows/qwindowsformatinfo.cpp
+++ b/src/plugins/multimedia/windows/qwindowsformatinfo.cpp
@@ -5,7 +5,7 @@
 
 #include <mfapi.h>
 #include <mftransform.h>
-#include <private/qwindowsiupointer_p.h>
+#include <private/qcomptr_p.h>
 #include <private/qwindowsmultimediautils_p.h>
 
 #include <QtCore/qlist.h>
diff --git a/src/plugins/multimedia/windows/qwindowsvideodevices.cpp b/src/plugins/multimedia/windows/qwindowsvideodevices.cpp
index 78fe92ff2..72a0312bc 100644
--- a/src/plugins/multimedia/windows/qwindowsvideodevices.cpp
+++ b/src/plugins/multimedia/windows/qwindowsvideodevices.cpp
@@ -6,7 +6,7 @@
 #include <private/qcameradevice_p.h>
 #include <private/qwindowsmfdefs_p.h>
 #include <private/qwindowsmultimediautils_p.h>
-#include <private/qwindowsiupointer_p.h>
+#include <private/qcomptr_p.h>
 
 #include <dbt.h>
 
-- 
cgit v1.2.1