Mentalflow
/
framelesshelper
forked from github_mirror/framelesshelper
1
0
Fork 0
Code Pull Requests Activity

migrate to the <module/file> include pattern 

Signed-off-by: Yuhang Zhao <2546789017@qq.com>
This commit is contained in:
Yuhang Zhao 2023-01-18 14:27:10 +08:00
parent 378aa7db12
commit 7534a4631c
37 changed files with 68 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View File

@ -65,6 +65,6 @@ jobs:
run: | run: |
mkdir ci-test-build mkdir ci-test-build
cd 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 --build . --target all --config Release --parallel
cmake --install . --config Release --strip cmake --install . --config Release --strip

4
CMakeLists.txt
View File

@ -34,8 +34,8 @@ project(FramelessHelper
option(FRAMELESSHELPER_BUILD_STATIC "Build FramelessHelper as a static library." OFF) option(FRAMELESSHELPER_BUILD_STATIC "Build FramelessHelper as a static library." OFF)
option(FRAMELESSHELPER_BUILD_WIDGETS "Build FramelessHelper's Widgets module." ON) option(FRAMELESSHELPER_BUILD_WIDGETS "Build FramelessHelper's Widgets module." ON)
option(FRAMELESSHELPER_BUILD_QUICK "Build FramelessHelper's Quick module." ON) option(FRAMELESSHELPER_BUILD_QUICK "Build FramelessHelper's Quick module." ON)
option(FRAMELESSHELPER_BUILD_EXAMPLES "Build FramelessHelper demo applications." ON) option(FRAMELESSHELPER_BUILD_EXAMPLES "Build FramelessHelper demo applications." OFF)
option(FRAMELESSHELPER_EXAMPLES_DEPLOYQT "Deploy the Qt framework after building the demo projects." ON) 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_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_BUNDLE_RESOURCE "Do not bundle any resources within FramelessHelper." OFF)
option(FRAMELESSHELPER_NO_PRIVATE "Do not use any private functionalities from Qt." OFF) option(FRAMELESSHELPER_NO_PRIVATE "Do not use any private functionalities from Qt." OFF)

8
examples/dialog/dialog.cpp
View File

@ -10,10 +10,10 @@
#include <QtWidgets/qboxlayout.h> #include <QtWidgets/qboxlayout.h>
#include <QtWidgets/qfileiconprovider.h> #include <QtWidgets/qfileiconprovider.h>
#include <QtWidgets/qmessagebox.h> #include <QtWidgets/qmessagebox.h>
#include <StandardTitleBar> #include <FramelessHelper/Widgets/standardtitlebar.h>
#include <FramelessWidgetsHelper> #include <FramelessHelper/Widgets/framelesswidgetshelper.h>
#include <StandardSystemButton> #include <FramelessHelper/Widgets/standardsystembutton.h>
#include <private/framelesswidgetshelper_p.h> #include <FramelessHelper/Widgets/private/framelesswidgetshelper_p.h>
#include "../shared/settings.h" #include "../shared/settings.h"
extern template void Settings::set<QRect>(const QString &, const QString &, const QRect &); extern template void Settings::set<QRect>(const QString &, const QString &, const QRect &);

2
examples/dialog/dialog.h
View File

@ -3,7 +3,7 @@
#pragma once #pragma once
#include <FramelessDialog> #include <FramelessHelper/Widgets/framelessdialog.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QCheckBox; class QCheckBox;

2
examples/dialog/main.cpp
View File

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

2
examples/mainwindow/main.cpp
View File

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

8
examples/mainwindow/mainwindow.cpp
View File

@ -26,10 +26,10 @@
#include "ui_mainwindow.h" #include "ui_mainwindow.h"
#include <QtWidgets/qboxlayout.h> #include <QtWidgets/qboxlayout.h>
#include <QtWidgets/qfileiconprovider.h> #include <QtWidgets/qfileiconprovider.h>
#include <Utils> #include <FramelessHelper/Core/utils.h>
#include <StandardTitleBar> #include <FramelessHelper/Widgets/standardtitlebar.h>
#include <StandardSystemButton> #include <FramelessHelper/Widgets/standardsystembutton.h>
#include <FramelessWidgetsHelper> #include <FramelessHelper/Widgets/framelesswidgetshelper.h>
#include "../shared/settings.h" #include "../shared/settings.h"
#include "../widget/widget.h" #include "../widget/widget.h"
#include "../dialog/dialog.h" #include "../dialog/dialog.h"

2
examples/mainwindow/mainwindow.h
View File

@ -24,7 +24,7 @@
#pragma once #pragma once
#include <FramelessMainWindow> #include <FramelessHelper/Widgets/framelessmainwindow.h>
FRAMELESSHELPER_BEGIN_NAMESPACE FRAMELESSHELPER_BEGIN_NAMESPACE
class StandardTitleBar; class StandardTitleBar;

2
examples/openglwidget/main.cpp
View File

@ -52,7 +52,7 @@
#include <QApplication> #include <QApplication>
#include <QSurfaceFormat> #include <QSurfaceFormat>
#include <QOpenGLContext> #include <QOpenGLContext>
#include <framelessconfig_p.h> #include <FramelessHelper/Core/private/framelessconfig_p.h>
#include <clocale> #include <clocale>
#include "mainwindow.h" #include "mainwindow.h"
#include "../shared/log.h" #include "../shared/log.h"

6
examples/openglwidget/mainwindow.cpp
View File

@ -26,9 +26,9 @@
#include "glwidget.h" #include "glwidget.h"
#include <QtWidgets/qboxlayout.h> #include <QtWidgets/qboxlayout.h>
#include <QtWidgets/qfileiconprovider.h> #include <QtWidgets/qfileiconprovider.h>
#include <FramelessWidgetsHelper> #include <FramelessHelper/Widgets/framelesswidgetshelper.h>
#include <StandardTitleBar> #include <FramelessHelper/Widgets/standardtitlebar.h>
#include <StandardSystemButton> #include <FramelessHelper/Widgets/standardsystembutton.h>
#include "../shared/settings.h" #include "../shared/settings.h"
extern template void Settings::set<QRect>(const QString &, const QString &, const QRect &); extern template void Settings::set<QRect>(const QString &, const QString &, const QRect &);

2
examples/openglwidget/mainwindow.h
View File

@ -24,7 +24,7 @@
#pragma once #pragma once
#include <FramelessWidget> #include <FramelessHelper/Widgets/framelesswidget.h>
FRAMELESSHELPER_BEGIN_NAMESPACE FRAMELESSHELPER_BEGIN_NAMESPACE
class StandardTitleBar; class StandardTitleBar;

4
examples/quick/main.cpp
View File

@ -30,8 +30,8 @@
#include <QtQml/qqmlapplicationengine.h> #include <QtQml/qqmlapplicationengine.h>
#include <QtQml/qqmlcontext.h> #include <QtQml/qqmlcontext.h>
#include <QtQuick/qquickwindow.h> #include <QtQuick/qquickwindow.h>
#include <framelessquickmodule.h> #include <FramelessHelper/Quick/framelessquickmodule.h>
#include <framelessconfig_p.h> #include <FramelessHelper/Core/private/framelessconfig_p.h>
#include <clocale> #include <clocale>
#include "quicksettings.h" #include "quicksettings.h"
#if QMLTC_ENABLED #if QMLTC_ENABLED

2
examples/quick/quicksettings.h
View File

@ -25,7 +25,7 @@
#pragma once #pragma once
#include <QtGui/qwindow.h> #include <QtGui/qwindow.h>
#include <framelesshelperquick_global.h> #include <FramelessHelper/Quick/framelesshelperquick_global.h>
class QuickSettings : public QObject class QuickSettings : public QObject
{ {

2
examples/widget/main.cpp
View File

@ -23,7 +23,7 @@
*/ */
#include <QtWidgets/qapplication.h> #include <QtWidgets/qapplication.h>
#include <framelessconfig_p.h> #include <FramelessHelper/Core/private/framelessconfig_p.h>
#include <clocale> #include <clocale>
#include "widget.h" #include "widget.h"
#include "../shared/log.h" #include "../shared/log.h"

10
examples/widget/widget.cpp
View File

@ -32,11 +32,11 @@
#include <QtWidgets/qlabel.h> #include <QtWidgets/qlabel.h>
#include <QtWidgets/qboxlayout.h> #include <QtWidgets/qboxlayout.h>
#include <QtWidgets/qfileiconprovider.h> #include <QtWidgets/qfileiconprovider.h>
#include <FramelessManager> #include <FramelessHelper/Core/framelessmanager.h>
#include <Utils> #include <FramelessHelper/Core/utils.h>
#include <FramelessWidgetsHelper> #include <FramelessHelper/Widgets/framelesswidgetshelper.h>
#include <StandardTitleBar> #include <FramelessHelper/Widgets/standardtitlebar.h>
#include <StandardSystemButton> #include <FramelessHelper/Widgets/standardsystembutton.h>
#include "../shared/settings.h" #include "../shared/settings.h"
extern template void Settings::set<QRect>(const QString &, const QString &, const QRect &); extern template void Settings::set<QRect>(const QString &, const QString &, const QRect &);

2
examples/widget/widget.h
View File

@ -24,7 +24,7 @@
#pragma once #pragma once
#include <FramelessWidget> #include <FramelessHelper/Widgets/framelesswidget.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QLabel; class QLabel;

2
include/FramelessHelper/Quick/framelesshelperquick_global.h
View File

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

2
include/FramelessHelper/Quick/quickchromepalette.h
View File

@ -25,7 +25,7 @@
#pragma once #pragma once
#include "framelesshelperquick_global.h" #include "framelesshelperquick_global.h"
#include <chromepalette.h> #include <FramelessHelper/Core/chromepalette.h>
#include <QtQml/qqmlparserstatus.h> #include <QtQml/qqmlparserstatus.h>
FRAMELESSHELPER_BEGIN_NAMESPACE FRAMELESSHELPER_BEGIN_NAMESPACE

2
include/FramelessHelper/Widgets/framelesshelperwidgets_global.h
View File

@ -24,7 +24,7 @@
#pragma once #pragma once
#include <framelesshelpercore_global.h> #include <FramelessHelper/Core/framelesshelpercore_global.h>
#ifndef FRAMELESSHELPER_WIDGETS_API #ifndef FRAMELESSHELPER_WIDGETS_API
# ifdef FRAMELESSHELPER_WIDGETS_STATIC # ifdef FRAMELESSHELPER_WIDGETS_STATIC

2
include/FramelessHelper/Widgets/standardtitlebar.h
View File

@ -26,7 +26,7 @@
#include "framelesshelperwidgets_global.h" #include "framelesshelperwidgets_global.h"
#include "standardsystembutton.h" #include "standardsystembutton.h"
#include <chromepalette.h> #include <FramelessHelper/Core/chromepalette.h>
#include <QtWidgets/qwidget.h> #include <QtWidgets/qwidget.h>
FRAMELESSHELPER_BEGIN_NAMESPACE FRAMELESSHELPER_BEGIN_NAMESPACE

2
src/core/CMakeLists.txt
View File

@ -238,9 +238,11 @@ else()
endif() endif()
target_include_directories(${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}>"
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${INCLUDE_PREFIX}/private>" "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${INCLUDE_PREFIX}/private>"
"$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>" "$<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}>"
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${SUB_PROJ_PATH}/private>" "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${SUB_PROJ_PATH}/private>"
) )

2
src/quick/CMakeLists.txt
View File

@ -196,8 +196,10 @@ target_link_libraries(${SUB_PROJ_NAME} PUBLIC
) )
target_include_directories(${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}>"
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${INCLUDE_PREFIX}/private>" "$<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}>"
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${SUB_PROJ_PATH}/private>" "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${SUB_PROJ_PATH}/private>"
) )

2
src/quick/framelessquickapplicationwindow.cpp
View File

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

8
src/quick/framelessquickhelper.cpp
View File

@ -38,11 +38,11 @@
# include <QtQuickTemplates2/private/qquickabstractbutton_p.h> # include <QtQuickTemplates2/private/qquickabstractbutton_p.h>
# include <QtQuickTemplates2/private/qquickabstractbutton_p_p.h> # include <QtQuickTemplates2/private/qquickabstractbutton_p_p.h>
#endif // FRAMELESSHELPER_QUICK_NO_PRIVATE #endif // FRAMELESSHELPER_QUICK_NO_PRIVATE
#include <framelessmanager.h> #include <FramelessHelper/Core/framelessmanager.h>
#include <framelessconfig_p.h> #include <FramelessHelper/Core/private/framelessconfig_p.h>
#include <utils.h> #include <FramelessHelper/Core/utils.h>
#ifdef Q_OS_WINDOWS #ifdef Q_OS_WINDOWS
# include <winverhelper_p.h> # include <FramelessHelper/Core/private/winverhelper_p.h>
#endif // Q_OS_WINDOWS #endif // Q_OS_WINDOWS
#ifndef QWINDOWSIZE_MAX #ifndef QWINDOWSIZE_MAX

6
src/quick/framelessquickutils.cpp
View File

@ -23,10 +23,10 @@
*/ */
#include "framelessquickutils.h" #include "framelessquickutils.h"
#include <framelessmanager.h> #include <FramelessHelper/Core/framelessmanager.h>
#include <utils.h> #include <FramelessHelper/Core/utils.h>
#ifdef Q_OS_WINDOWS #ifdef Q_OS_WINDOWS
# include <winverhelper_p.h> # include <FramelessHelper/Core/private/winverhelper_p.h>
#endif // Q_OS_WINDOWS #endif // Q_OS_WINDOWS
FRAMELESSHELPER_BEGIN_NAMESPACE FRAMELESSHELPER_BEGIN_NAMESPACE

2
src/quick/framelessquickwindow.cpp
View File

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

2
src/quick/quickmicamaterial.cpp
View File

@ -24,7 +24,7 @@
#include "quickmicamaterial.h" #include "quickmicamaterial.h"
#include "quickmicamaterial_p.h" #include "quickmicamaterial_p.h"
#include <micamaterial.h> #include <FramelessHelper/Core/micamaterial.h>
#include <QtCore/qmutex.h> #include <QtCore/qmutex.h>
#include <QtGui/qscreen.h> #include <QtGui/qscreen.h>
#include <QtGui/qpainter.h> #include <QtGui/qpainter.h>

4
src/quick/quickstandardsystembutton.cpp
View File

@ -26,8 +26,8 @@
#include "quickstandardsystembutton_p.h" #include "quickstandardsystembutton_p.h"
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
#include <framelessmanager_p.h> #include <FramelessHelper/Core/private/framelessmanager_p.h>
#include <utils.h> #include <FramelessHelper/Core/utils.h>
#include <QtQuick/qquickwindow.h> #include <QtQuick/qquickwindow.h>
#include <QtQuick/private/qquickitem_p.h> #include <QtQuick/private/qquickitem_p.h>
#include <QtQuick/private/qquickanchors_p.h> #include <QtQuick/private/qquickanchors_p.h>

2
src/quick/quickwindowborder.cpp
View File

@ -24,7 +24,7 @@
#include "quickwindowborder.h" #include "quickwindowborder.h"
#include "quickwindowborder_p.h" #include "quickwindowborder_p.h"
#include <windowborderpainter.h> #include <FramelessHelper/Core/windowborderpainter.h>
#include <QtQuick/qquickwindow.h> #include <QtQuick/qquickwindow.h>
#ifndef FRAMELESSHELPER_QUICK_NO_PRIVATE #ifndef FRAMELESSHELPER_QUICK_NO_PRIVATE
# include <QtQuick/private/qquickitem_p.h> # include <QtQuick/private/qquickitem_p.h>

2
src/widgets/CMakeLists.txt
View File

@ -126,8 +126,10 @@ target_link_libraries(${SUB_PROJ_NAME} PUBLIC
) )
target_include_directories(${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}>"
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${INCLUDE_PREFIX}/private>" "$<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}>"
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${SUB_PROJ_PATH}/private>" "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${SUB_PROJ_PATH}/private>"
) )

2
src/widgets/framelessdialog.cpp
View File

@ -26,7 +26,7 @@
#include "framelessdialog_p.h" #include "framelessdialog_p.h"
#include "framelesswidgetshelper.h" #include "framelesswidgetshelper.h"
#include "widgetssharedhelper_p.h" #include "widgetssharedhelper_p.h"
#include <utils.h> #include <FramelessHelper/Core/utils.h>
FRAMELESSHELPER_BEGIN_NAMESPACE FRAMELESSHELPER_BEGIN_NAMESPACE

2
src/widgets/framelessmainwindow.cpp
View File

@ -26,7 +26,7 @@
#include "framelessmainwindow_p.h" #include "framelessmainwindow_p.h"
#include "framelesswidgetshelper.h" #include "framelesswidgetshelper.h"
#include "widgetssharedhelper_p.h" #include "widgetssharedhelper_p.h"
#include <utils.h> #include <FramelessHelper/Core/utils.h>
FRAMELESSHELPER_BEGIN_NAMESPACE FRAMELESSHELPER_BEGIN_NAMESPACE

2
src/widgets/framelesswidget.cpp
View File

@ -26,7 +26,7 @@
#include "framelesswidget_p.h" #include "framelesswidget_p.h"
#include "framelesswidgetshelper.h" #include "framelesswidgetshelper.h"
#include "widgetssharedhelper_p.h" #include "widgetssharedhelper_p.h"
#include <utils.h> #include <FramelessHelper/Core/utils.h>
FRAMELESSHELPER_BEGIN_NAMESPACE FRAMELESSHELPER_BEGIN_NAMESPACE

6
src/widgets/framelesswidgetshelper.cpp
View File

@ -37,9 +37,9 @@
#include <QtGui/qwindow.h> #include <QtGui/qwindow.h>
#include <QtGui/qpalette.h> #include <QtGui/qpalette.h>
#include <QtWidgets/qwidget.h> #include <QtWidgets/qwidget.h>
#include <framelessmanager.h> #include <FramelessHelper/Core/framelessmanager.h>
#include <framelessconfig_p.h> #include <FramelessHelper/Core/private/framelessconfig_p.h>
#include <utils.h> #include <FramelessHelper/Core/utils.h>
#ifndef QWIDGETSIZE_MAX #ifndef QWIDGETSIZE_MAX
# define QWIDGETSIZE_MAX ((1 << 24) - 1) # define QWIDGETSIZE_MAX ((1 << 24) - 1)

4
src/widgets/standardsystembutton.cpp
View File

@ -27,8 +27,8 @@
#include <QtGui/qpainter.h> #include <QtGui/qpainter.h>
#include <QtGui/qevent.h> #include <QtGui/qevent.h>
#include <QtWidgets/qtooltip.h> #include <QtWidgets/qtooltip.h>
#include <framelessmanager_p.h> #include <FramelessHelper/Core/private/framelessmanager_p.h>
#include <utils.h> #include <FramelessHelper/Core/utils.h>
FRAMELESSHELPER_BEGIN_NAMESPACE FRAMELESSHELPER_BEGIN_NAMESPACE

2
src/widgets/standardtitlebar.cpp
View File

@ -26,7 +26,7 @@
#include "standardtitlebar_p.h" #include "standardtitlebar_p.h"
#include "standardsystembutton.h" #include "standardsystembutton.h"
#include "framelesswidgetshelper.h" #include "framelesswidgetshelper.h"
#include "utils.h" #include <FramelessHelper/Core/utils.h>
#include <QtCore/qcoreevent.h> #include <QtCore/qcoreevent.h>
#include <QtCore/qtimer.h> #include <QtCore/qtimer.h>
#include <QtGui/qpainter.h> #include <QtGui/qpainter.h>

12
src/widgets/widgetssharedhelper.cpp
View File

@ -28,13 +28,13 @@
#include <QtGui/qpainter.h> #include <QtGui/qpainter.h>
#include <QtGui/qwindow.h> #include <QtGui/qwindow.h>
#include <QtWidgets/qwidget.h> #include <QtWidgets/qwidget.h>
#include <framelessconfig_p.h> #include <FramelessHelper/Core/private/framelessconfig_p.h>
#include <micamaterial.h> #include <FramelessHelper/Core/micamaterial.h>
#include <micamaterial_p.h> #include <FramelessHelper/Core/private/micamaterial_p.h>
#include <utils.h> #include <FramelessHelper/Core/utils.h>
#include <windowborderpainter.h> #include <FramelessHelper/Core/windowborderpainter.h>
#ifdef Q_OS_WINDOWS #ifdef Q_OS_WINDOWS
# include <winverhelper_p.h> # include <FramelessHelper/Core/private/winverhelper_p.h>
#endif // Q_OS_WINDOWS #endif // Q_OS_WINDOWS
FRAMELESSHELPER_BEGIN_NAMESPACE FRAMELESSHELPER_BEGIN_NAMESPACE