diff --git a/playground/gradients/GradientQuickShape.cpp b/playground/gradients/GradientQuickShape.cpp index d71fd03c..38e35828 100644 --- a/playground/gradients/GradientQuickShape.cpp +++ b/playground/gradients/GradientQuickShape.cpp @@ -8,6 +8,7 @@ #include #include #include +#include QSK_QT_PRIVATE_BEGIN diff --git a/playground/images/Image.cpp b/playground/images/Image.cpp index af083d9e..82f1d09b 100644 --- a/playground/images/Image.cpp +++ b/playground/images/Image.cpp @@ -4,6 +4,7 @@ *****************************************************************************/ #include "Image.h" +#include QSK_QT_PRIVATE_BEGIN #include diff --git a/playground/images/Image.h b/playground/images/Image.h index 51be747a..454a3aea 100644 --- a/playground/images/Image.h +++ b/playground/images/Image.h @@ -5,7 +5,8 @@ #pragma once -#include "QskGlobal.h" +#include +#include QSK_QT_PRIVATE_BEGIN diff --git a/playground/shadows/ArcShadowNode.cpp b/playground/shadows/ArcShadowNode.cpp index c637a45c..5ff043ed 100644 --- a/playground/shadows/ArcShadowNode.cpp +++ b/playground/shadows/ArcShadowNode.cpp @@ -4,6 +4,7 @@ *****************************************************************************/ #include "ArcShadowNode.h" +#include #include #include diff --git a/qmlexport/QskQml.cpp b/qmlexport/QskQml.cpp index e1a251db..99726d52 100644 --- a/qmlexport/QskQml.cpp +++ b/qmlexport/QskQml.cpp @@ -59,9 +59,13 @@ #include #if QT_VERSION < QT_VERSION_CHECK( 6, 2, 0 ) + +#include + QSK_QT_PRIVATE_BEGIN - #include + #include QSK_QT_PRIVATE_END + #endif #if QT_VERSION < QT_VERSION_CHECK( 6, 5, 0 ) diff --git a/qmlexport/QskShortcutQml.cpp b/qmlexport/QskShortcutQml.cpp index 51600216..f887f38b 100644 --- a/qmlexport/QskShortcutQml.cpp +++ b/qmlexport/QskShortcutQml.cpp @@ -9,6 +9,8 @@ #include #include +#include + QSK_QT_PRIVATE_BEGIN #include QSK_QT_PRIVATE_END diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a8ed5d7f..9e0196a3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -71,6 +71,10 @@ list(APPEND SOURCES common/QskTickmarks.cpp ) +list(APPEND PRIVATE_HEADERS + common/QskInternalMacros.h +) + list(APPEND HEADERS graphic/QskColorFilter.h graphic/QskGraphic.h diff --git a/src/common/QskFunctions.cpp b/src/common/QskFunctions.cpp index 62adce3c..5e9ae4f9 100644 --- a/src/common/QskFunctions.cpp +++ b/src/common/QskFunctions.cpp @@ -4,6 +4,7 @@ *****************************************************************************/ #include "QskFunctions.h" +#include "QskInternalMacros.h" #include #include diff --git a/src/common/QskGlobal.h b/src/common/QskGlobal.h index de6dcd40..fc19dafe 100644 --- a/src/common/QskGlobal.h +++ b/src/common/QskGlobal.h @@ -6,7 +6,6 @@ #ifndef QSK_GLOBAL_H #define QSK_GLOBAL_H -#include #include #if QT_VERSION < QT_VERSION_CHECK( 5, 15, 0 ) @@ -32,24 +31,6 @@ #define QSK_EXPORT #endif -#define QSK_QT_PRIVATE_BEGIN \ - QT_WARNING_PUSH \ - QT_WARNING_DISABLE_GCC("-Wpragmas") \ - QT_WARNING_DISABLE_GCC("-Wpedantic") \ - QT_WARNING_DISABLE_GCC("-Wsuggest-override") \ - QT_WARNING_DISABLE_GCC("-Wsuggest-final-types") \ - QT_WARNING_DISABLE_GCC("-Wsuggest-final-methods") - -#define QSK_QT_PRIVATE_END \ - QT_WARNING_POP - -#define QSK_HIDDEN_EXTERNAL_BEGIN \ - QT_WARNING_PUSH \ - QT_WARNING_DISABLE_GCC("-Wmissing-declarations") - -#define QSK_HIDDEN_EXTERNAL_END \ - QT_WARNING_POP - #if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) using QskHashValue = uint; #else diff --git a/src/common/QskInternalMacros.h b/src/common/QskInternalMacros.h new file mode 100644 index 00000000..9960b151 --- /dev/null +++ b/src/common/QskInternalMacros.h @@ -0,0 +1,29 @@ +/****************************************************************************** + * QSkinny - Copyright (C) The authors + * SPDX-License-Identifier: BSD-3-Clause + *****************************************************************************/ + +#ifndef QSK_INTERNAL_MACROS_H +#define QSK_INTERNAL_MACROS_H + +#include + +#define QSK_QT_PRIVATE_BEGIN \ + QT_WARNING_PUSH \ + QT_WARNING_DISABLE_GCC("-Wpragmas") \ + QT_WARNING_DISABLE_GCC("-Wpedantic") \ + QT_WARNING_DISABLE_GCC("-Wsuggest-override") \ + QT_WARNING_DISABLE_GCC("-Wsuggest-final-types") \ + QT_WARNING_DISABLE_GCC("-Wsuggest-final-methods") + +#define QSK_QT_PRIVATE_END \ + QT_WARNING_POP + +#define QSK_HIDDEN_EXTERNAL_BEGIN \ + QT_WARNING_PUSH \ + QT_WARNING_DISABLE_GCC("-Wmissing-declarations") + +#define QSK_HIDDEN_EXTERNAL_END \ + QT_WARNING_POP + +#endif diff --git a/src/common/QskMetaFunction.cpp b/src/common/QskMetaFunction.cpp index 1e8991a6..437175f8 100644 --- a/src/common/QskMetaFunction.cpp +++ b/src/common/QskMetaFunction.cpp @@ -4,6 +4,7 @@ *****************************************************************************/ #include "QskMetaFunction.h" +#include "QskInternalMacros.h" #include #include diff --git a/src/common/QskMetaInvokable.cpp b/src/common/QskMetaInvokable.cpp index 31a6c0df..c9700e13 100644 --- a/src/common/QskMetaInvokable.cpp +++ b/src/common/QskMetaInvokable.cpp @@ -5,6 +5,7 @@ #include "QskMetaInvokable.h" #include "QskMetaFunction.h" +#include "QskInternalMacros.h" #include #include diff --git a/src/common/QskObjectCounter.cpp b/src/common/QskObjectCounter.cpp index e8a014cb..2d25dc8d 100644 --- a/src/common/QskObjectCounter.cpp +++ b/src/common/QskObjectCounter.cpp @@ -4,6 +4,7 @@ *****************************************************************************/ #include "QskObjectCounter.h" +#include "QskInternalMacros.h" #include #include diff --git a/src/common/QskPlatform.cpp b/src/common/QskPlatform.cpp index 935d8452..a8d98723 100644 --- a/src/common/QskPlatform.cpp +++ b/src/common/QskPlatform.cpp @@ -4,6 +4,7 @@ *****************************************************************************/ #include "QskPlatform.h" +#include "QskInternalMacros.h" #include #include diff --git a/src/common/QskRgbValue.cpp b/src/common/QskRgbValue.cpp index 66b354f0..374f7641 100644 --- a/src/common/QskRgbValue.cpp +++ b/src/common/QskRgbValue.cpp @@ -4,6 +4,7 @@ *****************************************************************************/ #include "QskRgbValue.h" +#include "QskInternalMacros.h" #include #include diff --git a/src/controls/QskDirtyItemFilter.cpp b/src/controls/QskDirtyItemFilter.cpp index f1189424..0fef3ce3 100644 --- a/src/controls/QskDirtyItemFilter.cpp +++ b/src/controls/QskDirtyItemFilter.cpp @@ -5,6 +5,7 @@ #include "QskDirtyItemFilter.h" #include "QskItem.h" +#include "QskInternalMacros.h" QSK_QT_PRIVATE_BEGIN #include diff --git a/src/controls/QskDrawer.cpp b/src/controls/QskDrawer.cpp index 459a8fba..38f41d38 100644 --- a/src/controls/QskDrawer.cpp +++ b/src/controls/QskDrawer.cpp @@ -10,6 +10,7 @@ #include "QskPanGestureRecognizer.h" #include "QskGesture.h" +#include "QskInternalMacros.h" #include #include diff --git a/src/controls/QskFocusIndicator.cpp b/src/controls/QskFocusIndicator.cpp index 2601cc1a..bfe4be49 100644 --- a/src/controls/QskFocusIndicator.cpp +++ b/src/controls/QskFocusIndicator.cpp @@ -8,6 +8,7 @@ #include "QskAnimationHint.h" #include "QskEvent.h" #include "QskQuick.h" +#include "QskInternalMacros.h" #include #include diff --git a/src/controls/QskGestureRecognizer.cpp b/src/controls/QskGestureRecognizer.cpp index 9afb4e64..a9655541 100644 --- a/src/controls/QskGestureRecognizer.cpp +++ b/src/controls/QskGestureRecognizer.cpp @@ -6,6 +6,7 @@ #include "QskGestureRecognizer.h" #include "QskEvent.h" #include "QskQuick.h" +#include "QskInternalMacros.h" #include #include diff --git a/src/controls/QskInputGrabber.cpp b/src/controls/QskInputGrabber.cpp index 187f5cc8..2bda46a2 100644 --- a/src/controls/QskInputGrabber.cpp +++ b/src/controls/QskInputGrabber.cpp @@ -6,6 +6,7 @@ #include "QskInputGrabber.h" #include "QskWindow.h" #include "QskEvent.h" +#include "QskInternalMacros.h" #include diff --git a/src/controls/QskItem.cpp b/src/controls/QskItem.cpp index fa2add84..ef1bca7c 100644 --- a/src/controls/QskItem.cpp +++ b/src/controls/QskItem.cpp @@ -11,6 +11,7 @@ #include "QskSkinManager.h" #include "QskSkin.h" #include "QskDirtyItemFilter.h" +#include "QskInternalMacros.h" #include #include diff --git a/src/controls/QskItemAnchors.cpp b/src/controls/QskItemAnchors.cpp index 796dfc45..3f2892e1 100644 --- a/src/controls/QskItemAnchors.cpp +++ b/src/controls/QskItemAnchors.cpp @@ -5,6 +5,7 @@ #include "QskItemAnchors.h" #include "QskMargins.h" +#include "QskInternalMacros.h" QSK_QT_PRIVATE_BEGIN #include diff --git a/src/controls/QskItemPrivate.h b/src/controls/QskItemPrivate.h index db5b0b96..f7a8d29e 100644 --- a/src/controls/QskItemPrivate.h +++ b/src/controls/QskItemPrivate.h @@ -8,6 +8,7 @@ #include "QskGlobal.h" #include "QskItem.h" +#include "QskInternalMacros.h" QSK_QT_PRIVATE_BEGIN #include diff --git a/src/controls/QskMenu.cpp b/src/controls/QskMenu.cpp index 9acf9219..83c8e08f 100644 --- a/src/controls/QskMenu.cpp +++ b/src/controls/QskMenu.cpp @@ -13,6 +13,7 @@ #include "QskSkinlet.h" #include "QskEvent.h" #include "QskPlatform.h" +#include "QskInternalMacros.h" #include #include diff --git a/src/controls/QskPopup.cpp b/src/controls/QskPopup.cpp index 41e0111c..13900e79 100644 --- a/src/controls/QskPopup.cpp +++ b/src/controls/QskPopup.cpp @@ -11,6 +11,7 @@ #include "QskEvent.h" #include "QskPlatform.h" #include "QskHintAnimator.h" +#include "QskInternalMacros.h" #include diff --git a/src/controls/QskQuick.cpp b/src/controls/QskQuick.cpp index 9b97db41..876ce864 100644 --- a/src/controls/QskQuick.cpp +++ b/src/controls/QskQuick.cpp @@ -8,6 +8,8 @@ #include "QskFunctions.h" #include "QskLayoutElement.h" #include "QskPlatform.h" +#include "QskInternalMacros.h" + #include QSK_QT_PRIVATE_BEGIN diff --git a/src/controls/QskScrollArea.cpp b/src/controls/QskScrollArea.cpp index 6f4602c7..42ea661b 100644 --- a/src/controls/QskScrollArea.cpp +++ b/src/controls/QskScrollArea.cpp @@ -9,6 +9,7 @@ #include "QskScrollViewSkinlet.h" #include "QskBoxBorderMetrics.h" #include "QskSGNode.h" +#include "QskInternalMacros.h" QSK_QT_PRIVATE_BEGIN #include diff --git a/src/controls/QskScrollBox.cpp b/src/controls/QskScrollBox.cpp index 65c78795..772893af 100644 --- a/src/controls/QskScrollBox.cpp +++ b/src/controls/QskScrollBox.cpp @@ -10,6 +10,7 @@ #include "QskGesture.h" #include "QskPanGestureRecognizer.h" #include "QskQuick.h" +#include "QskInternalMacros.h" QSK_QT_PRIVATE_BEGIN #include diff --git a/src/controls/QskShortcutMap.cpp b/src/controls/QskShortcutMap.cpp index 147924f6..7501be0e 100644 --- a/src/controls/QskShortcutMap.cpp +++ b/src/controls/QskShortcutMap.cpp @@ -6,6 +6,7 @@ #include "QskShortcutMap.h" #include "QskMetaInvokable.h" #include "QskQuick.h" +#include "QskInternalMacros.h" #include #include diff --git a/src/controls/QskSkin.cpp b/src/controls/QskSkin.cpp index c73ea2ce..2019fa11 100644 --- a/src/controls/QskSkin.cpp +++ b/src/controls/QskSkin.cpp @@ -106,6 +106,8 @@ #include "QskStatusIndicator.h" #include "QskStatusIndicatorSkinlet.h" +#include "QskInternalMacros.h" + #include static inline QskSkinlet* qskNewSkinlet( const QMetaObject* metaObject, QskSkin* skin ) diff --git a/src/controls/QskTextInput.cpp b/src/controls/QskTextInput.cpp index 28c0b74f..7ad34b39 100644 --- a/src/controls/QskTextInput.cpp +++ b/src/controls/QskTextInput.cpp @@ -7,6 +7,7 @@ #include "QskTextInputSkinlet.h" #include "QskFontRole.h" #include "QskQuick.h" +#include "QskInternalMacros.h" QSK_QT_PRIVATE_BEGIN #include diff --git a/src/controls/QskVariantAnimator.cpp b/src/controls/QskVariantAnimator.cpp index 1b2b986a..631fae2f 100644 --- a/src/controls/QskVariantAnimator.cpp +++ b/src/controls/QskVariantAnimator.cpp @@ -16,6 +16,7 @@ #include "QskMargins.h" #include "QskIntervalF.h" #include "QskTextColors.h" +#include "QskInternalMacros.h" // Even if we don't use the standard Qt animation system we // use its registry of interpolators: why adding our own ... diff --git a/src/controls/QskWindow.cpp b/src/controls/QskWindow.cpp index b811a38e..212bed61 100644 --- a/src/controls/QskWindow.cpp +++ b/src/controls/QskWindow.cpp @@ -10,6 +10,7 @@ #include "QskSetup.h" #include "QskSkin.h" #include "QskSkinManager.h" +#include "QskInternalMacros.h" #include #include diff --git a/src/graphic/QskGraphic.cpp b/src/graphic/QskGraphic.cpp index aed3f610..3093cf84 100644 --- a/src/graphic/QskGraphic.cpp +++ b/src/graphic/QskGraphic.cpp @@ -7,6 +7,7 @@ #include "QskColorFilter.h" #include "QskGraphicPaintEngine.h" #include "QskPainterCommand.h" +#include "QskInternalMacros.h" #include #include diff --git a/src/layouts/QskStackBoxAnimator.cpp b/src/layouts/QskStackBoxAnimator.cpp index bc1e43db..657c524f 100644 --- a/src/layouts/QskStackBoxAnimator.cpp +++ b/src/layouts/QskStackBoxAnimator.cpp @@ -8,6 +8,7 @@ #include "QskEvent.h" #include "QskQuick.h" #include "QskFunctions.h" +#include "QskInternalMacros.h" QSK_QT_PRIVATE_BEGIN #include diff --git a/src/nodes/QskBasicLinesNode.cpp b/src/nodes/QskBasicLinesNode.cpp index 292a5629..419c31d1 100644 --- a/src/nodes/QskBasicLinesNode.cpp +++ b/src/nodes/QskBasicLinesNode.cpp @@ -4,6 +4,7 @@ *****************************************************************************/ #include "QskBasicLinesNode.h" +#include "QskInternalMacros.h" #include #include diff --git a/src/nodes/QskBoxShadowNode.cpp b/src/nodes/QskBoxShadowNode.cpp index 50b42229..89d6d073 100644 --- a/src/nodes/QskBoxShadowNode.cpp +++ b/src/nodes/QskBoxShadowNode.cpp @@ -5,6 +5,7 @@ #include "QskBoxShadowNode.h" #include "QskBoxShapeMetrics.h" +#include "QskInternalMacros.h" #include #include diff --git a/src/nodes/QskColorRamp.cpp b/src/nodes/QskColorRamp.cpp index 2d0cc7d9..0f46badc 100644 --- a/src/nodes/QskColorRamp.cpp +++ b/src/nodes/QskColorRamp.cpp @@ -5,6 +5,7 @@ #include "QskColorRamp.h" #include "QskRgbValue.h" +#include "QskInternalMacros.h" QSK_QT_PRIVATE_BEGIN #include diff --git a/src/nodes/QskFillNodePrivate.h b/src/nodes/QskFillNodePrivate.h index 93b48a35..16b8dd72 100644 --- a/src/nodes/QskFillNodePrivate.h +++ b/src/nodes/QskFillNodePrivate.h @@ -7,6 +7,7 @@ #define QSK_FILL_NODE_PRIVATE_H #include "QskGlobal.h" +#include "QskInternalMacros.h" QSK_QT_PRIVATE_BEGIN #include diff --git a/src/nodes/QskPaintedNode.cpp b/src/nodes/QskPaintedNode.cpp index 129a580a..cfdcf6be 100644 --- a/src/nodes/QskPaintedNode.cpp +++ b/src/nodes/QskPaintedNode.cpp @@ -6,6 +6,7 @@ #include "QskPaintedNode.h" #include "QskSGNode.h" #include "QskTextureRenderer.h" +#include "QskInternalMacros.h" #include #include diff --git a/src/nodes/QskPlainTextRenderer.cpp b/src/nodes/QskPlainTextRenderer.cpp index 59322fa5..714e75d5 100644 --- a/src/nodes/QskPlainTextRenderer.cpp +++ b/src/nodes/QskPlainTextRenderer.cpp @@ -6,6 +6,7 @@ #include "QskPlainTextRenderer.h" #include "QskTextColors.h" #include "QskTextOptions.h" +#include "QskInternalMacros.h" #include #include diff --git a/src/nodes/QskRichTextRenderer.cpp b/src/nodes/QskRichTextRenderer.cpp index 35fcfdf6..469b0e34 100644 --- a/src/nodes/QskRichTextRenderer.cpp +++ b/src/nodes/QskRichTextRenderer.cpp @@ -6,6 +6,7 @@ #include "QskRichTextRenderer.h" #include "QskTextColors.h" #include "QskTextOptions.h" +#include "QskInternalMacros.h" #include #include diff --git a/src/nodes/QskSceneTexture.cpp b/src/nodes/QskSceneTexture.cpp index dc359993..1be84ab7 100644 --- a/src/nodes/QskSceneTexture.cpp +++ b/src/nodes/QskSceneTexture.cpp @@ -5,6 +5,7 @@ #include "QskSceneTexture.h" #include "QskTreeNode.h" +#include "QskInternalMacros.h" #include diff --git a/src/nodes/QskShapeNode.cpp b/src/nodes/QskShapeNode.cpp index fa83e67f..db1b8a05 100644 --- a/src/nodes/QskShapeNode.cpp +++ b/src/nodes/QskShapeNode.cpp @@ -8,6 +8,7 @@ #include "QskGradientDirection.h" #include "QskVertex.h" #include "QskFillNodePrivate.h" +#include "QskInternalMacros.h" QSK_QT_PRIVATE_BEGIN #include diff --git a/src/nodes/QskStippledLineRenderer.cpp b/src/nodes/QskStippledLineRenderer.cpp index a0a7da60..44118ebe 100644 --- a/src/nodes/QskStippledLineRenderer.cpp +++ b/src/nodes/QskStippledLineRenderer.cpp @@ -4,6 +4,7 @@ *****************************************************************************/ #include "QskStippledLineRenderer.h" +#include "QskInternalMacros.h" QSK_QT_PRIVATE_BEGIN #include diff --git a/src/nodes/QskStrokeNode.cpp b/src/nodes/QskStrokeNode.cpp index 19ceb0f8..f607ec1f 100644 --- a/src/nodes/QskStrokeNode.cpp +++ b/src/nodes/QskStrokeNode.cpp @@ -7,6 +7,7 @@ #include "QskVertex.h" #include "QskGradient.h" #include "QskRgbValue.h" +#include "QskInternalMacros.h" #include diff --git a/src/nodes/QskTextureRenderer.cpp b/src/nodes/QskTextureRenderer.cpp index 83796f7f..77ba70cd 100644 --- a/src/nodes/QskTextureRenderer.cpp +++ b/src/nodes/QskTextureRenderer.cpp @@ -5,6 +5,7 @@ #include "QskTextureRenderer.h" #include "QskQuick.h" +#include "QskInternalMacros.h" #include #include