misc: general cleanup

wangwenx190 · Oct 21, 2023 · 78fc505 · 78fc505
1 parent c7f4868
commit 78fc505
Show file tree

Hide file tree

Showing 45 changed files with 155 additions and 34 deletions.
diff --git a/examples/dialog/CMakeLists.txt b/examples/dialog/CMakeLists.txt
@@ -74,6 +74,7 @@ if(WIN32)
             PATH "${__manifest_path}"
             ID "org.wangwenx190.demo.Dialog"
             VERSION "${PROJECT_VERSION}"
+            DESCRIPTION "FramelessHelper Demo Application: Dialog"
             VISTA_COMPAT
             WIN7_COMPAT
             WIN8_COMPAT
@@ -103,6 +104,31 @@ setup_gui_app(
     BUNDLE_VERSION_SHORT "1.0"
 )
 
+setup_target_rpaths(TARGETS ${DEMO_NAME})
+
+setup_qt_stuff(TARGETS ${DEMO_NAME})
+
+set(__extra_flags "")
+if(NOT FRAMELESSHELPER_NO_PERMISSIVE_CHECKS)
+    list(APPEND __extra_flags PERMISSIVE)
+endif()
+if(FRAMELESSHELPER_ENABLE_SPECTRE)
+    list(APPEND __extra_flags SPECTRE)
+endif()
+if(FRAMELESSHELPER_ENABLE_EHCONTGUARD)
+    list(APPEND __extra_flags EHCONTGUARD)
+endif()
+if(FRAMELESSHELPER_ENABLE_INTELCET)
+    list(APPEND __extra_flags INTELCET)
+endif()
+if(FRAMELESSHELPER_ENABLE_CFGUARD)
+    list(APPEND __extra_flags CFGUARD)
+endif()
+if(FRAMELESSHELPER_FORCE_LTO)
+    list(APPEND __extra_flags FORCE_LTO)
+endif()
+setup_compile_params(TARGETS ${DEMO_NAME} ${__extra_flags})
+
 if(FRAMELESSHELPER_EXAMPLES_DEPLOYQT)
     set(__extra_flags)
     if(FRAMELESSHELPER_NO_INSTALL)

diff --git a/examples/dialog/dialog.h b/examples/dialog/dialog.h
@@ -25,7 +25,7 @@ FRAMELESSHELPER_END_NAMESPACE
 class Dialog : public FRAMELESSHELPER_PREPEND_NAMESPACE(FramelessDialog)
 {
     Q_OBJECT
-    Q_DISABLE_COPY_MOVE(Dialog)
+    Q_DISABLE_COPY(Dialog)
 
 public:
     explicit Dialog(QWidget *parent = nullptr);

diff --git a/examples/mainwindow/CMakeLists.txt b/examples/mainwindow/CMakeLists.txt
@@ -79,6 +79,7 @@ if(WIN32)
             PATH "${__manifest_path}"
             ID "org.wangwenx190.demo.MainWindow"
             VERSION "${PROJECT_VERSION}"
+            DESCRIPTION "FramelessHelper Demo Application: MainWindow"
             VISTA_COMPAT
             WIN7_COMPAT
             WIN8_COMPAT
@@ -108,6 +109,31 @@ setup_gui_app(
     BUNDLE_VERSION_SHORT "1.0"
 )
 
+setup_target_rpaths(TARGETS ${DEMO_NAME})
+
+setup_qt_stuff(TARGETS ${DEMO_NAME})
+
+set(__extra_flags "")
+if(NOT FRAMELESSHELPER_NO_PERMISSIVE_CHECKS)
+    list(APPEND __extra_flags PERMISSIVE)
+endif()
+if(FRAMELESSHELPER_ENABLE_SPECTRE)
+    list(APPEND __extra_flags SPECTRE)
+endif()
+if(FRAMELESSHELPER_ENABLE_EHCONTGUARD)
+    list(APPEND __extra_flags EHCONTGUARD)
+endif()
+if(FRAMELESSHELPER_ENABLE_INTELCET)
+    list(APPEND __extra_flags INTELCET)
+endif()
+if(FRAMELESSHELPER_ENABLE_CFGUARD)
+    list(APPEND __extra_flags CFGUARD)
+endif()
+if(FRAMELESSHELPER_FORCE_LTO)
+    list(APPEND __extra_flags FORCE_LTO)
+endif()
+setup_compile_params(TARGETS ${DEMO_NAME} ${__extra_flags})
+
 if(FRAMELESSHELPER_EXAMPLES_DEPLOYQT)
     set(__extra_flags)
     if(FRAMELESSHELPER_NO_INSTALL)

diff --git a/examples/mainwindow/mainwindow.h b/examples/mainwindow/mainwindow.h
@@ -42,7 +42,7 @@ class MainWindow;
 class MainWindow : public FRAMELESSHELPER_PREPEND_NAMESPACE(FramelessMainWindow)
 {
     Q_OBJECT
-    Q_DISABLE_COPY_MOVE(MainWindow)
+    Q_DISABLE_COPY(MainWindow)
 
 public:
     explicit MainWindow(QWidget *parent = nullptr, const Qt::WindowFlags flags = {});

diff --git a/examples/openglwidget/mainwindow.h b/examples/openglwidget/mainwindow.h
@@ -35,7 +35,7 @@ class GLWidget;
 class MainWindow : public FRAMELESSHELPER_PREPEND_NAMESPACE(FramelessWidget)
 {
     Q_OBJECT
-    Q_DISABLE_COPY_MOVE(MainWindow)
+    Q_DISABLE_COPY(MainWindow)
 
 public:
     explicit MainWindow(QWidget *parent = nullptr);

diff --git a/examples/quick/CMakeLists.txt b/examples/quick/CMakeLists.txt
@@ -74,6 +74,7 @@ if(WIN32)
             PATH "${__manifest_path}"
             ID "org.wangwenx190.demo.Quick"
             VERSION "${PROJECT_VERSION}"
+            DESCRIPTION "FramelessHelper Demo Application: Quick"
             VISTA_COMPAT
             WIN7_COMPAT
             WIN8_COMPAT
@@ -135,6 +136,31 @@ setup_gui_app(
     BUNDLE_VERSION_SHORT "1.0"
 )
 
+setup_target_rpaths(TARGETS ${DEMO_NAME})
+
+setup_qt_stuff(TARGETS ${DEMO_NAME})
+
+set(__extra_flags "")
+if(NOT FRAMELESSHELPER_NO_PERMISSIVE_CHECKS)
+    list(APPEND __extra_flags PERMISSIVE)
+endif()
+if(FRAMELESSHELPER_ENABLE_SPECTRE)
+    list(APPEND __extra_flags SPECTRE)
+endif()
+if(FRAMELESSHELPER_ENABLE_EHCONTGUARD)
+    list(APPEND __extra_flags EHCONTGUARD)
+endif()
+if(FRAMELESSHELPER_ENABLE_INTELCET)
+    list(APPEND __extra_flags INTELCET)
+endif()
+if(FRAMELESSHELPER_ENABLE_CFGUARD)
+    list(APPEND __extra_flags CFGUARD)
+endif()
+if(FRAMELESSHELPER_FORCE_LTO)
+    list(APPEND __extra_flags FORCE_LTO)
+endif()
+setup_compile_params(TARGETS ${DEMO_NAME} ${__extra_flags})
+
 if(FRAMELESSHELPER_EXAMPLES_DEPLOYQT)
     set(__extra_flags)
     if(FRAMELESSHELPER_NO_INSTALL)

diff --git a/examples/quick/quicksettings.h b/examples/quick/quicksettings.h
@@ -36,7 +36,7 @@ class QuickSettings : public QObject
 #ifdef QML_SINGLETON
     QML_SINGLETON
 #endif
-    Q_DISABLE_COPY_MOVE(QuickSettings)
+    Q_DISABLE_COPY(QuickSettings)
 
 public:
     explicit QuickSettings(QObject *parent = nullptr);

diff --git a/examples/widget/CMakeLists.txt b/examples/widget/CMakeLists.txt
@@ -74,6 +74,7 @@ if(WIN32)
             PATH "${__manifest_path}"
             ID "org.wangwenx190.demo.Widget"
             VERSION "${PROJECT_VERSION}"
+            DESCRIPTION "FramelessHelper Demo Application: Widget"
             VISTA_COMPAT
             WIN7_COMPAT
             WIN8_COMPAT
@@ -103,6 +104,31 @@ setup_gui_app(
     BUNDLE_VERSION_SHORT "1.0"
 )
 
+setup_target_rpaths(TARGETS ${DEMO_NAME})
+
+setup_qt_stuff(TARGETS ${DEMO_NAME})
+
+set(__extra_flags "")
+if(NOT FRAMELESSHELPER_NO_PERMISSIVE_CHECKS)
+    list(APPEND __extra_flags PERMISSIVE)
+endif()
+if(FRAMELESSHELPER_ENABLE_SPECTRE)
+    list(APPEND __extra_flags SPECTRE)
+endif()
+if(FRAMELESSHELPER_ENABLE_EHCONTGUARD)
+    list(APPEND __extra_flags EHCONTGUARD)
+endif()
+if(FRAMELESSHELPER_ENABLE_INTELCET)
+    list(APPEND __extra_flags INTELCET)
+endif()
+if(FRAMELESSHELPER_ENABLE_CFGUARD)
+    list(APPEND __extra_flags CFGUARD)
+endif()
+if(FRAMELESSHELPER_FORCE_LTO)
+    list(APPEND __extra_flags FORCE_LTO)
+endif()
+setup_compile_params(TARGETS ${DEMO_NAME} ${__extra_flags})
+
 if(FRAMELESSHELPER_EXAMPLES_DEPLOYQT)
     set(__extra_flags)
     if(FRAMELESSHELPER_NO_INSTALL)

diff --git a/examples/widget/widget.h b/examples/widget/widget.h
@@ -42,7 +42,7 @@ FRAMELESSHELPER_END_NAMESPACE
 class Widget : public FRAMELESSHELPER_PREPEND_NAMESPACE(FramelessWidget)
 {
     Q_OBJECT
-    Q_DISABLE_COPY_MOVE(Widget)
+    Q_DISABLE_COPY(Widget)
 
 public:
     explicit Widget(QWidget *parent = nullptr);

diff --git a/include/FramelessHelper/Core/chromepalette.h b/include/FramelessHelper/Core/chromepalette.h
@@ -25,6 +25,7 @@
 #pragma once
 
 #include <FramelessHelper/Core/framelesshelpercore_global.h>
+#include <memory>
 
 #if FRAMELESSHELPER_CONFIG(titlebar)
 

diff --git a/include/FramelessHelper/Core/framelesshelper_qt.h b/include/FramelessHelper/Core/framelesshelper_qt.h
@@ -25,6 +25,7 @@
 #pragma once
 
 #include <FramelessHelper/Core/framelesshelpercore_global.h>
+#include <memory>
 
 #if !FRAMELESSHELPER_CONFIG(native_impl)
 

diff --git a/include/FramelessHelper/Core/framelesshelpercore_global.h b/include/FramelessHelper/Core/framelesshelpercore_global.h
@@ -268,7 +268,7 @@ QT_END_NAMESPACE
 #  define FRAMELESSHELPER_CLASS_DPTR(Class) \
   private: \
       Q_DECLARE_PRIVATE(Class) \
-      const QScopedPointer<Class##Private> d_ptr;
+      const std::unique_ptr<Class##Private> d_ptr;
 #endif
 
 #ifndef FRAMELESSHELPER_CLASS_QPTR

diff --git a/include/FramelessHelper/Core/framelessmanager.h b/include/FramelessHelper/Core/framelessmanager.h
@@ -25,6 +25,7 @@
 #pragma once
 
 #include <FramelessHelper/Core/framelesshelpercore_global.h>
+#include <memory>
 
 FRAMELESSHELPER_BEGIN_NAMESPACE
 

diff --git a/include/FramelessHelper/Core/micamaterial.h b/include/FramelessHelper/Core/micamaterial.h
@@ -25,6 +25,7 @@
 #pragma once
 
 #include <FramelessHelper/Core/framelesshelpercore_global.h>
+#include <memory>
 
 #if FRAMELESSHELPER_CONFIG(mica_material)
 

diff --git a/include/FramelessHelper/Core/private/registrykey_p.h b/include/FramelessHelper/Core/private/registrykey_p.h
@@ -27,6 +27,7 @@
 #include <FramelessHelper/Core/framelesshelpercore_global.h>
 #include <QtCore/qvariant.h>
 #include <optional>
+#include <memory>
 
 #ifdef Q_OS_WINDOWS
 
@@ -86,9 +87,9 @@ class FRAMELESSHELPER_CORE_API RegistryKey : public QObject
     Global::RegistryRootKey m_rootKey = Global::RegistryRootKey::CurrentUser;
     QString m_subKey = {};
 #if REGISTRYKEY_QWINREGISTRYKEY
-    QScopedPointer<QWinRegistryKey> m_registryKey;
+    std::unique_ptr<QWinRegistryKey> m_registryKey;
 #else
-    QScopedPointer<QSettings> m_settings;
+    std::unique_ptr<QSettings> m_settings;
 #endif
 };
 

diff --git a/include/FramelessHelper/Core/windowborderpainter.h b/include/FramelessHelper/Core/windowborderpainter.h
@@ -25,6 +25,7 @@
 #pragma once
 
 #include <FramelessHelper/Core/framelesshelpercore_global.h>
+#include <memory>
 
 #if FRAMELESSHELPER_CONFIG(border_painter)
 

diff --git a/include/FramelessHelper/Quick/framelessquickhelper.h b/include/FramelessHelper/Quick/framelessquickhelper.h
@@ -27,6 +27,7 @@
 #include <FramelessHelper/Quick/framelesshelperquick_global.h>
 #include <QtQuick/qquickitem.h>
 #include <QtQuick/qquickwindow.h>
+#include <memory>
 
 FRAMELESSHELPER_BEGIN_NAMESPACE
 

diff --git a/include/FramelessHelper/Quick/private/framelessquickapplicationwindow_p.h b/include/FramelessHelper/Quick/private/framelessquickapplicationwindow_p.h
@@ -25,6 +25,7 @@
 #pragma once
 
 #include <FramelessHelper/Quick/framelesshelperquick_global.h>
+#include <memory>
 
 #if (FRAMELESSHELPER_CONFIG(private_qt) && FRAMELESSHELPER_CONFIG(window) && (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)))
 

diff --git a/include/FramelessHelper/Quick/private/framelessquickwindow_p.h b/include/FramelessHelper/Quick/private/framelessquickwindow_p.h
@@ -25,6 +25,7 @@
 #pragma once
 
 #include <FramelessHelper/Quick/framelesshelperquick_global.h>
+#include <memory>
 
 #if (FRAMELESSHELPER_CONFIG(private_qt) && FRAMELESSHELPER_CONFIG(window))
 

diff --git a/include/FramelessHelper/Quick/quickmicamaterial.h b/include/FramelessHelper/Quick/quickmicamaterial.h
@@ -26,6 +26,7 @@
 
 #include <FramelessHelper/Quick/framelesshelperquick_global.h>
 #include <QtQuick/qquickpainteditem.h>
+#include <memory>
 
 #if FRAMELESSHELPER_CONFIG(mica_material)
 

diff --git a/include/FramelessHelper/Quick/quickwindowborder.h b/include/FramelessHelper/Quick/quickwindowborder.h
@@ -26,6 +26,7 @@
 
 #include <FramelessHelper/Quick/framelesshelperquick_global.h>
 #include <QtQuick/qquickpainteditem.h>
+#include <memory>
 
 #if FRAMELESSHELPER_CONFIG(border_painter)
 

diff --git a/include/FramelessHelper/Widgets/framelessdialog.h b/include/FramelessHelper/Widgets/framelessdialog.h
@@ -26,6 +26,7 @@
 
 #include <FramelessHelper/Widgets/framelesshelperwidgets_global.h>
 #include <QtWidgets/qdialog.h>
+#include <memory>
 
 #if FRAMELESSHELPER_CONFIG(window)
 

diff --git a/include/FramelessHelper/Widgets/framelessmainwindow.h b/include/FramelessHelper/Widgets/framelessmainwindow.h
@@ -26,6 +26,7 @@
 
 #include <FramelessHelper/Widgets/framelesshelperwidgets_global.h>
 #include <QtWidgets/qmainwindow.h>
+#include <memory>
 
 #if FRAMELESSHELPER_CONFIG(window)
 

diff --git a/include/FramelessHelper/Widgets/framelesswidget.h b/include/FramelessHelper/Widgets/framelesswidget.h
@@ -26,6 +26,7 @@
 
 #include <FramelessHelper/Widgets/framelesshelperwidgets_global.h>
 #include <QtWidgets/qwidget.h>
+#include <memory>
 
 #if FRAMELESSHELPER_CONFIG(window)
 

diff --git a/include/FramelessHelper/Widgets/framelesswidgetshelper.h b/include/FramelessHelper/Widgets/framelesswidgetshelper.h
@@ -26,6 +26,7 @@
 
 #include <FramelessHelper/Widgets/framelesshelperwidgets_global.h>
 #include <QtWidgets/qwidget.h>
+#include <memory>
 
 FRAMELESSHELPER_BEGIN_NAMESPACE
 

diff --git a/include/FramelessHelper/Widgets/standardsystembutton.h b/include/FramelessHelper/Widgets/standardsystembutton.h
@@ -26,6 +26,7 @@
 
 #include <FramelessHelper/Widgets/framelesshelperwidgets_global.h>
 #include <QtWidgets/qpushbutton.h>
+#include <memory>
 
 #if FRAMELESSHELPER_CONFIG(system_button)
 

diff --git a/include/FramelessHelper/Widgets/standardtitlebar.h b/include/FramelessHelper/Widgets/standardtitlebar.h
@@ -25,6 +25,7 @@
 #pragma once
 
 #include <FramelessHelper/Widgets/framelesshelperwidgets_global.h>
+#include <memory>
 
 #if FRAMELESSHELPER_CONFIG(titlebar)
 

diff --git a/src/core/chromepalette.cpp b/src/core/chromepalette.cpp
@@ -133,7 +133,7 @@ void ChromePalettePrivate::refresh()
 }
 
 ChromePalette::ChromePalette(QObject *parent) :
-    QObject(parent), d_ptr(new ChromePalettePrivate(this))
+    QObject(parent), d_ptr(std::make_unique<ChromePalettePrivate>(this))
 {
 }
 

diff --git a/src/core/framelesshelper_qt.cpp b/src/core/framelesshelper_qt.cpp
@@ -103,7 +103,7 @@ FramelessHelperQtPrivate::FramelessHelperQtPrivate(FramelessHelperQt *q) : q_ptr
 
 FramelessHelperQtPrivate::~FramelessHelperQtPrivate() = default;
 
-FramelessHelperQt::FramelessHelperQt(QObject *parent) : QObject(parent), d_ptr(new FramelessHelperQtPrivate(this))
+FramelessHelperQt::FramelessHelperQt(QObject *parent) : QObject(parent), d_ptr(std::make_unique<FramelessHelperQtPrivate>(this))
 {
 }
 

diff --git a/src/core/framelessmanager.cpp b/src/core/framelessmanager.cpp
@@ -428,7 +428,7 @@ void FramelessManagerPrivate::initialize()
 }
 
 FramelessManager::FramelessManager(QObject *parent) :
-    QObject(parent), d_ptr(new FramelessManagerPrivate(this))
+    QObject(parent), d_ptr(std::make_unique<FramelessManagerPrivate>(this))
 {
 }
 

diff --git a/src/core/micamaterial.cpp b/src/core/micamaterial.cpp
@@ -830,7 +830,7 @@ QRect MicaMaterialPrivate::mapToWallpaper(const QRect &rect) const
 }
 
 MicaMaterial::MicaMaterial(QObject *parent)
-    : QObject(parent), d_ptr(new MicaMaterialPrivate(this))
+    : QObject(parent), d_ptr(std::make_unique<MicaMaterialPrivate>(this))
 {
 }