migrate to the <module/file> include pattern

Signed-off-by: Yuhang Zhao <2546789017@qq.com>
2023-01-18 14:27:10 +08:00 · 2023-01-18 14:27:10 +08:00 · 7534a4631c
parent 378aa7db12
commit 7534a4631c
37 changed files with 68 additions and 62 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -65,6 +65,6 @@ jobs:
        run: |
          mkdir ci-test-build
          cd ci-test-build
-          cmake -DCMAKE_C_COMPILER=${{ matrix.CC }} -DCMAKE_CXX_COMPILER=${{ matrix.CXX }} -DCMAKE_INSTALL_PREFIX=../ci-test-install -DCMAKE_BUILD_TYPE=Release -DFRAMELESSHELPER_EXAMPLES_DEPLOYQT=OFF ${{ matrix.lib_type_flag }} -GNinja ..
+          cmake -DCMAKE_C_COMPILER=${{ matrix.CC }} -DCMAKE_CXX_COMPILER=${{ matrix.CXX }} -DCMAKE_INSTALL_PREFIX=../ci-test-install -DCMAKE_BUILD_TYPE=Release -DFRAMELESSHELPER_BUILD_EXAMPLES=ON ${{ matrix.lib_type_flag }} -GNinja ..
          cmake --build . --target all --config Release --parallel
          cmake --install . --config Release --strip
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -34,8 +34,8 @@ project(FramelessHelper
 option(FRAMELESSHELPER_BUILD_STATIC "Build FramelessHelper as a static library." OFF)
 option(FRAMELESSHELPER_BUILD_WIDGETS "Build FramelessHelper's Widgets module." ON)
 option(FRAMELESSHELPER_BUILD_QUICK "Build FramelessHelper's Quick module." ON)
-option(FRAMELESSHELPER_BUILD_EXAMPLES "Build FramelessHelper demo applications." ON)
-option(FRAMELESSHELPER_EXAMPLES_DEPLOYQT "Deploy the Qt framework after building the demo projects." ON)
+option(FRAMELESSHELPER_BUILD_EXAMPLES "Build FramelessHelper demo applications." OFF)
+option(FRAMELESSHELPER_EXAMPLES_DEPLOYQT "Deploy the Qt framework after building the demo projects." OFF)
 option(FRAMELESSHELPER_NO_DEBUG_OUTPUT "Suppress the debug messages from FramelessHelper." OFF)
 option(FRAMELESSHELPER_NO_BUNDLE_RESOURCE "Do not bundle any resources within FramelessHelper." OFF)
 option(FRAMELESSHELPER_NO_PRIVATE "Do not use any private functionalities from Qt." OFF)
--- a/examples/dialog/dialog.cpp
+++ b/examples/dialog/dialog.cpp
@ -10,10 +10,10 @@
 #include <QtWidgets/qboxlayout.h>
 #include <QtWidgets/qfileiconprovider.h>
 #include <QtWidgets/qmessagebox.h>
-#include <StandardTitleBar>
-#include <FramelessWidgetsHelper>
-#include <StandardSystemButton>
-#include <private/framelesswidgetshelper_p.h>
+#include <FramelessHelper/Widgets/standardtitlebar.h>
+#include <FramelessHelper/Widgets/framelesswidgetshelper.h>
+#include <FramelessHelper/Widgets/standardsystembutton.h>
+#include <FramelessHelper/Widgets/private/framelesswidgetshelper_p.h>
 #include "../shared/settings.h"

 extern template void Settings::set<QRect>(const QString &, const QString &, const QRect &);
--- a/examples/dialog/dialog.h
+++ b/examples/dialog/dialog.h
@ -3,7 +3,7 @@

 #pragma once

-#include <FramelessDialog>
+#include <FramelessHelper/Widgets/framelessdialog.h>

 QT_BEGIN_NAMESPACE
 class QCheckBox;
--- a/examples/dialog/main.cpp
+++ b/examples/dialog/main.cpp
@ -23,7 +23,7 @@
 */

 #include <QtWidgets/qapplication.h>
-#include <framelessconfig_p.h>
+#include <FramelessHelper/Core/private/framelessconfig_p.h>
 #include <clocale>
 #include "dialog.h"
 #include "../shared/log.h"
--- a/examples/mainwindow/main.cpp
+++ b/examples/mainwindow/main.cpp
@ -23,7 +23,7 @@
 */

 #include <QtWidgets/qapplication.h>
-#include <framelessconfig_p.h>
+#include <FramelessHelper/Core/private/framelessconfig_p.h>
 #include <clocale>
 #include "mainwindow.h"
 #include "../shared/log.h"
--- a/examples/mainwindow/mainwindow.cpp
+++ b/examples/mainwindow/mainwindow.cpp
@ -26,10 +26,10 @@
 #include "ui_mainwindow.h"
 #include <QtWidgets/qboxlayout.h>
 #include <QtWidgets/qfileiconprovider.h>
-#include <Utils>
-#include <StandardTitleBar>
-#include <StandardSystemButton>
-#include <FramelessWidgetsHelper>
+#include <FramelessHelper/Core/utils.h>
+#include <FramelessHelper/Widgets/standardtitlebar.h>
+#include <FramelessHelper/Widgets/standardsystembutton.h>
+#include <FramelessHelper/Widgets/framelesswidgetshelper.h>
 #include "../shared/settings.h"
 #include "../widget/widget.h"
 #include "../dialog/dialog.h"
--- a/examples/mainwindow/mainwindow.h
+++ b/examples/mainwindow/mainwindow.h
@ -24,7 +24,7 @@

 #pragma once

-#include <FramelessMainWindow>
+#include <FramelessHelper/Widgets/framelessmainwindow.h>

 FRAMELESSHELPER_BEGIN_NAMESPACE
 class StandardTitleBar;
--- a/examples/openglwidget/main.cpp
+++ b/examples/openglwidget/main.cpp
@ -52,7 +52,7 @@
 #include <QApplication>
 #include <QSurfaceFormat>
 #include <QOpenGLContext>
-#include <framelessconfig_p.h>
+#include <FramelessHelper/Core/private/framelessconfig_p.h>
 #include <clocale>
 #include "mainwindow.h"
 #include "../shared/log.h"
--- a/examples/openglwidget/mainwindow.cpp
+++ b/examples/openglwidget/mainwindow.cpp
@ -26,9 +26,9 @@
 #include "glwidget.h"
 #include <QtWidgets/qboxlayout.h>
 #include <QtWidgets/qfileiconprovider.h>
-#include <FramelessWidgetsHelper>
-#include <StandardTitleBar>
-#include <StandardSystemButton>
+#include <FramelessHelper/Widgets/framelesswidgetshelper.h>
+#include <FramelessHelper/Widgets/standardtitlebar.h>
+#include <FramelessHelper/Widgets/standardsystembutton.h>
 #include "../shared/settings.h"

 extern template void Settings::set<QRect>(const QString &, const QString &, const QRect &);
--- a/examples/openglwidget/mainwindow.h
+++ b/examples/openglwidget/mainwindow.h
@ -24,7 +24,7 @@

 #pragma once

-#include <FramelessWidget>
+#include <FramelessHelper/Widgets/framelesswidget.h>

 FRAMELESSHELPER_BEGIN_NAMESPACE
 class StandardTitleBar;
--- a/examples/quick/main.cpp
+++ b/examples/quick/main.cpp
@ -30,8 +30,8 @@
 #include <QtQml/qqmlapplicationengine.h>
 #include <QtQml/qqmlcontext.h>
 #include <QtQuick/qquickwindow.h>
-#include <framelessquickmodule.h>
-#include <framelessconfig_p.h>
+#include <FramelessHelper/Quick/framelessquickmodule.h>
+#include <FramelessHelper/Core/private/framelessconfig_p.h>
 #include <clocale>
 #include "quicksettings.h"
 #if QMLTC_ENABLED
--- a/examples/quick/quicksettings.h
+++ b/examples/quick/quicksettings.h
@ -25,7 +25,7 @@
 #pragma once

 #include <QtGui/qwindow.h>
-#include <framelesshelperquick_global.h>
+#include <FramelessHelper/Quick/framelesshelperquick_global.h>

 class QuickSettings : public QObject
 {
--- a/examples/widget/main.cpp
+++ b/examples/widget/main.cpp
@ -23,7 +23,7 @@
 */

 #include <QtWidgets/qapplication.h>
-#include <framelessconfig_p.h>
+#include <FramelessHelper/Core/private/framelessconfig_p.h>
 #include <clocale>
 #include "widget.h"
 #include "../shared/log.h"
--- a/examples/widget/widget.cpp
+++ b/examples/widget/widget.cpp
@ -32,11 +32,11 @@
 #include <QtWidgets/qlabel.h>
 #include <QtWidgets/qboxlayout.h>
 #include <QtWidgets/qfileiconprovider.h>
-#include <FramelessManager>
-#include <Utils>
-#include <FramelessWidgetsHelper>
-#include <StandardTitleBar>
-#include <StandardSystemButton>
+#include <FramelessHelper/Core/framelessmanager.h>
+#include <FramelessHelper/Core/utils.h>
+#include <FramelessHelper/Widgets/framelesswidgetshelper.h>
+#include <FramelessHelper/Widgets/standardtitlebar.h>
+#include <FramelessHelper/Widgets/standardsystembutton.h>
 #include "../shared/settings.h"

 extern template void Settings::set<QRect>(const QString &, const QString &, const QRect &);
--- a/examples/widget/widget.h
+++ b/examples/widget/widget.h
@ -24,7 +24,7 @@

 #pragma once

-#include <FramelessWidget>
+#include <FramelessHelper/Widgets/framelesswidget.h>

 QT_BEGIN_NAMESPACE
 class QLabel;
--- a/include/FramelessHelper/Quick/framelesshelperquick_global.h
+++ b/include/FramelessHelper/Quick/framelesshelperquick_global.h
@ -24,7 +24,7 @@

 #pragma once

-#include <framelesshelpercore_global.h>
+#include <FramelessHelper/Core/framelesshelpercore_global.h>
 #include <QtQml/qqml.h>
 #if __has_include(<QtQml/qqmlregistration.h>)
 #  include <QtQml/qqmlregistration.h>
--- a/include/FramelessHelper/Quick/quickchromepalette.h
+++ b/include/FramelessHelper/Quick/quickchromepalette.h
@ -25,7 +25,7 @@
 #pragma once

 #include "framelesshelperquick_global.h"
-#include <chromepalette.h>
+#include <FramelessHelper/Core/chromepalette.h>
 #include <QtQml/qqmlparserstatus.h>

 FRAMELESSHELPER_BEGIN_NAMESPACE
--- a/include/FramelessHelper/Widgets/framelesshelperwidgets_global.h
+++ b/include/FramelessHelper/Widgets/framelesshelperwidgets_global.h
@ -24,7 +24,7 @@

 #pragma once

-#include <framelesshelpercore_global.h>
+#include <FramelessHelper/Core/framelesshelpercore_global.h>

 #ifndef FRAMELESSHELPER_WIDGETS_API
 #  ifdef FRAMELESSHELPER_WIDGETS_STATIC
--- a/include/FramelessHelper/Widgets/standardtitlebar.h
+++ b/include/FramelessHelper/Widgets/standardtitlebar.h
@ -26,7 +26,7 @@

 #include "framelesshelperwidgets_global.h"
 #include "standardsystembutton.h"
-#include <chromepalette.h>
+#include <FramelessHelper/Core/chromepalette.h>
 #include <QtWidgets/qwidget.h>

 FRAMELESSHELPER_BEGIN_NAMESPACE
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@ -238,9 +238,11 @@ else()
 endif()

 target_include_directories(${SUB_PROJ_NAME} PUBLIC
+    "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${INCLUDE_PREFIX}/../..>"
    "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${INCLUDE_PREFIX}>"
    "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${INCLUDE_PREFIX}/private>"
    "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>"
+    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${SUB_PROJ_PATH}>"
    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${SUB_PROJ_PATH}/private>"
 )
--- a/src/quick/CMakeLists.txt
+++ b/src/quick/CMakeLists.txt
@ -196,8 +196,10 @@ target_link_libraries(${SUB_PROJ_NAME} PUBLIC
 )

 target_include_directories(${SUB_PROJ_NAME} PUBLIC
+    "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${INCLUDE_PREFIX}/../..>"
    "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${INCLUDE_PREFIX}>"
    "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${INCLUDE_PREFIX}/private>"
+    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${SUB_PROJ_PATH}>"
    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${SUB_PROJ_PATH}/private>"
 )
--- a/src/quick/framelessquickapplicationwindow.cpp
+++ b/src/quick/framelessquickapplicationwindow.cpp
@ -30,7 +30,7 @@
 #include "quickwindowborder.h"
 #include <QtQuick/private/qquickitem_p.h>
 #ifdef Q_OS_WINDOWS
-#  include <framelesshelper_windows.h>
+#  include <FramelessHelper/Core/framelesshelper_windows.h>
 #endif // Q_OS_WINDOWS

 FRAMELESSHELPER_BEGIN_NAMESPACE
--- a/src/quick/framelessquickhelper.cpp
+++ b/src/quick/framelessquickhelper.cpp
@ -38,11 +38,11 @@
 #  include <QtQuickTemplates2/private/qquickabstractbutton_p.h>
 #  include <QtQuickTemplates2/private/qquickabstractbutton_p_p.h>
 #endif // FRAMELESSHELPER_QUICK_NO_PRIVATE
-#include <framelessmanager.h>
-#include <framelessconfig_p.h>
-#include <utils.h>
+#include <FramelessHelper/Core/framelessmanager.h>
+#include <FramelessHelper/Core/private/framelessconfig_p.h>
+#include <FramelessHelper/Core/utils.h>
 #ifdef Q_OS_WINDOWS
-#  include <winverhelper_p.h>
+#  include <FramelessHelper/Core/private/winverhelper_p.h>
 #endif // Q_OS_WINDOWS

 #ifndef QWINDOWSIZE_MAX
--- a/src/quick/framelessquickutils.cpp
+++ b/src/quick/framelessquickutils.cpp
@ -23,10 +23,10 @@
 */

 #include "framelessquickutils.h"
-#include <framelessmanager.h>
-#include <utils.h>
+#include <FramelessHelper/Core/framelessmanager.h>
+#include <FramelessHelper/Core/utils.h>
 #ifdef Q_OS_WINDOWS
-#  include <winverhelper_p.h>
+#  include <FramelessHelper/Core/private/winverhelper_p.h>
 #endif // Q_OS_WINDOWS

 FRAMELESSHELPER_BEGIN_NAMESPACE
--- a/src/quick/framelessquickwindow.cpp
+++ b/src/quick/framelessquickwindow.cpp
@ -30,7 +30,7 @@
 #include "quickwindowborder.h"
 #include <QtQuick/private/qquickitem_p.h>
 #ifdef Q_OS_WINDOWS
-#  include <framelesshelper_windows.h>
+#  include <FramelessHelper/Core/framelesshelper_windows.h>
 #endif // Q_OS_WINDOWS

 FRAMELESSHELPER_BEGIN_NAMESPACE
--- a/src/quick/quickmicamaterial.cpp
+++ b/src/quick/quickmicamaterial.cpp
@ -24,7 +24,7 @@

 #include "quickmicamaterial.h"
 #include "quickmicamaterial_p.h"
-#include <micamaterial.h>
+#include <FramelessHelper/Core/micamaterial.h>
 #include <QtCore/qmutex.h>
 #include <QtGui/qscreen.h>
 #include <QtGui/qpainter.h>
--- a/src/quick/quickstandardsystembutton.cpp
+++ b/src/quick/quickstandardsystembutton.cpp
@ -26,8 +26,8 @@

 #include "quickstandardsystembutton_p.h"
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
-#include <framelessmanager_p.h>
-#include <utils.h>
+#include <FramelessHelper/Core/private/framelessmanager_p.h>
+#include <FramelessHelper/Core/utils.h>
 #include <QtQuick/qquickwindow.h>
 #include <QtQuick/private/qquickitem_p.h>
 #include <QtQuick/private/qquickanchors_p.h>
--- a/src/quick/quickwindowborder.cpp
+++ b/src/quick/quickwindowborder.cpp
@ -24,7 +24,7 @@

 #include "quickwindowborder.h"
 #include "quickwindowborder_p.h"
-#include <windowborderpainter.h>
+#include <FramelessHelper/Core/windowborderpainter.h>
 #include <QtQuick/qquickwindow.h>
 #ifndef FRAMELESSHELPER_QUICK_NO_PRIVATE
 #  include <QtQuick/private/qquickitem_p.h>
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@ -126,8 +126,10 @@ target_link_libraries(${SUB_PROJ_NAME} PUBLIC
 )

 target_include_directories(${SUB_PROJ_NAME} PUBLIC
+    "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${INCLUDE_PREFIX}/../..>"
    "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${INCLUDE_PREFIX}>"
    "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${INCLUDE_PREFIX}/private>"
+    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${SUB_PROJ_PATH}>"
    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${SUB_PROJ_PATH}/private>"
 )
--- a/src/widgets/framelessdialog.cpp
+++ b/src/widgets/framelessdialog.cpp
@ -26,7 +26,7 @@
 #include "framelessdialog_p.h"
 #include "framelesswidgetshelper.h"
 #include "widgetssharedhelper_p.h"
-#include <utils.h>
+#include <FramelessHelper/Core/utils.h>

 FRAMELESSHELPER_BEGIN_NAMESPACE

--- a/src/widgets/framelessmainwindow.cpp
+++ b/src/widgets/framelessmainwindow.cpp
@ -26,7 +26,7 @@
 #include "framelessmainwindow_p.h"
 #include "framelesswidgetshelper.h"
 #include "widgetssharedhelper_p.h"
-#include <utils.h>
+#include <FramelessHelper/Core/utils.h>

 FRAMELESSHELPER_BEGIN_NAMESPACE

--- a/src/widgets/framelesswidget.cpp
+++ b/src/widgets/framelesswidget.cpp
@ -26,7 +26,7 @@
 #include "framelesswidget_p.h"
 #include "framelesswidgetshelper.h"
 #include "widgetssharedhelper_p.h"
-#include <utils.h>
+#include <FramelessHelper/Core/utils.h>

 FRAMELESSHELPER_BEGIN_NAMESPACE

--- a/src/widgets/framelesswidgetshelper.cpp
+++ b/src/widgets/framelesswidgetshelper.cpp
@ -37,9 +37,9 @@
 #include <QtGui/qwindow.h>
 #include <QtGui/qpalette.h>
 #include <QtWidgets/qwidget.h>
-#include <framelessmanager.h>
-#include <framelessconfig_p.h>
-#include <utils.h>
+#include <FramelessHelper/Core/framelessmanager.h>
+#include <FramelessHelper/Core/private/framelessconfig_p.h>
+#include <FramelessHelper/Core/utils.h>

 #ifndef QWIDGETSIZE_MAX
 #  define QWIDGETSIZE_MAX ((1 << 24) - 1)
--- a/src/widgets/standardsystembutton.cpp
+++ b/src/widgets/standardsystembutton.cpp
@ -27,8 +27,8 @@
 #include <QtGui/qpainter.h>
 #include <QtGui/qevent.h>
 #include <QtWidgets/qtooltip.h>
-#include <framelessmanager_p.h>
-#include <utils.h>
+#include <FramelessHelper/Core/private/framelessmanager_p.h>
+#include <FramelessHelper/Core/utils.h>

 FRAMELESSHELPER_BEGIN_NAMESPACE

--- a/src/widgets/standardtitlebar.cpp
+++ b/src/widgets/standardtitlebar.cpp
@ -26,7 +26,7 @@
 #include "standardtitlebar_p.h"
 #include "standardsystembutton.h"
 #include "framelesswidgetshelper.h"
-#include "utils.h"
+#include <FramelessHelper/Core/utils.h>
 #include <QtCore/qcoreevent.h>
 #include <QtCore/qtimer.h>
 #include <QtGui/qpainter.h>
--- a/src/widgets/widgetssharedhelper.cpp
+++ b/src/widgets/widgetssharedhelper.cpp
@ -28,13 +28,13 @@
 #include <QtGui/qpainter.h>
 #include <QtGui/qwindow.h>
 #include <QtWidgets/qwidget.h>
-#include <framelessconfig_p.h>
-#include <micamaterial.h>
-#include <micamaterial_p.h>
-#include <utils.h>
-#include <windowborderpainter.h>
+#include <FramelessHelper/Core/private/framelessconfig_p.h>
+#include <FramelessHelper/Core/micamaterial.h>
+#include <FramelessHelper/Core/private/micamaterial_p.h>
+#include <FramelessHelper/Core/utils.h>
+#include <FramelessHelper/Core/windowborderpainter.h>
 #ifdef Q_OS_WINDOWS
-#  include <winverhelper_p.h>
+#  include <FramelessHelper/Core/private/winverhelper_p.h>
 #endif // Q_OS_WINDOWS

 FRAMELESSHELPER_BEGIN_NAMESPACE