internal macros ( not intended for application code ) moved from

QskGlobal.h to QskInternalMacros.h
uwerat · Jan 3, 2025 · 33a4825 · 33a4825
1 parent 06b0783
commit 33a4825
Show file tree

Hide file tree

Showing 47 changed files with 85 additions and 21 deletions.
diff --git a/playground/gradients/GradientQuickShape.cpp b/playground/gradients/GradientQuickShape.cpp
@@ -8,6 +8,7 @@
 #include <QskGradient.h>
 #include <QskGradientDirection.h>
 #include <QskBoxRenderer.h>
+#include <QskInternalMacros.h>
 
 QSK_QT_PRIVATE_BEGIN
 

diff --git a/playground/images/Image.cpp b/playground/images/Image.cpp
@@ -4,6 +4,7 @@
  *****************************************************************************/
 
 #include "Image.h"
+#include <QskInternalMacros.h>
 
 QSK_QT_PRIVATE_BEGIN
 #include <private/qquickimage_p_p.h>

diff --git a/playground/images/Image.h b/playground/images/Image.h
@@ -5,7 +5,8 @@
 
 #pragma once
 
-#include "QskGlobal.h"
+#include <QskGlobal.h>
+#include <QskInternalMacros.h>
 
 QSK_QT_PRIVATE_BEGIN
 

diff --git a/playground/shadows/ArcShadowNode.cpp b/playground/shadows/ArcShadowNode.cpp
@@ -4,6 +4,7 @@
  *****************************************************************************/
 
 #include "ArcShadowNode.h"
+#include <QskInternalMacros.h>
 
 #include <qcolor.h>
 #include <qsgmaterial.h>

diff --git a/qmlexport/QskQml.cpp b/qmlexport/QskQml.cpp
@@ -59,9 +59,13 @@
 #include <QskWindow.h>
 
 #if QT_VERSION < QT_VERSION_CHECK( 6, 2, 0 )
+
+#include <QskInternalMacros.h>
+
 QSK_QT_PRIVATE_BEGIN
-        #include <private/qqmlmetatype_p.h>
+    #include <private/qqmlmetatype_p.h>
 QSK_QT_PRIVATE_END
+
 #endif
 
 #if QT_VERSION < QT_VERSION_CHECK( 6, 5, 0 )

diff --git a/qmlexport/QskShortcutQml.cpp b/qmlexport/QskShortcutQml.cpp
@@ -9,6 +9,8 @@
 #include <qquickitem.h>
 #include <qquickwindow.h>
 
+#include <QskInternalMacros.h>
+
 QSK_QT_PRIVATE_BEGIN
 #include <QtGui/private/qguiapplication_p.h>
 QSK_QT_PRIVATE_END

diff --git 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
@@ -4,6 +4,7 @@
  *****************************************************************************/
 
 #include "QskFunctions.h"
+#include "QskInternalMacros.h"
 
 #include <qfont.h>
 #include <qfontmetrics.h>

diff --git a/src/common/QskGlobal.h b/src/common/QskGlobal.h
@@ -6,7 +6,6 @@
 #ifndef QSK_GLOBAL_H
 #define QSK_GLOBAL_H
 
-#include <qcompilerdetection.h>
 #include <qglobal.h>
 
 #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
@@ -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 <qcompilerdetection.h>
+
+#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
@@ -4,6 +4,7 @@
  *****************************************************************************/
 
 #include "QskMetaFunction.h"
+#include "QskInternalMacros.h"
 
 #include <qcoreapplication.h>
 #include <qobject.h>

diff --git a/src/common/QskMetaInvokable.cpp b/src/common/QskMetaInvokable.cpp
@@ -5,6 +5,7 @@
 
 #include "QskMetaInvokable.h"
 #include "QskMetaFunction.h"
+#include "QskInternalMacros.h"
 
 #include <qmetaobject.h>
 #include <qobject.h>

diff --git a/src/common/QskObjectCounter.cpp b/src/common/QskObjectCounter.cpp
@@ -4,6 +4,7 @@
  *****************************************************************************/
 
 #include "QskObjectCounter.h"
+#include "QskInternalMacros.h"
 
 #include <qdebug.h>
 #include <qset.h>

diff --git a/src/common/QskPlatform.cpp b/src/common/QskPlatform.cpp
@@ -4,6 +4,7 @@
  *****************************************************************************/
 
 #include "QskPlatform.h"
+#include "QskInternalMacros.h"
 
 #include <qguiapplication.h>
 #include <qquickwindow.h>

diff --git a/src/common/QskRgbValue.cpp b/src/common/QskRgbValue.cpp
@@ -4,6 +4,7 @@
  *****************************************************************************/
 
 #include "QskRgbValue.h"
+#include "QskInternalMacros.h"
 
 #include <qeasingcurve.h>
 #include <qimage.h>

diff --git 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 <private/qquickitem_p.h>

diff --git a/src/controls/QskDrawer.cpp b/src/controls/QskDrawer.cpp
@@ -10,6 +10,7 @@
 
 #include "QskPanGestureRecognizer.h"
 #include "QskGesture.h"
+#include "QskInternalMacros.h"
 
 #include <qguiapplication.h>
 #include <qstylehints.h>

diff --git 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 <qpointer.h>
 #include <qquickwindow.h>

diff --git 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 <qcoreapplication.h>
 #include <qquickitem.h>

diff --git 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 <qpointer.h>
 

diff --git 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 <qglobalstatic.h>
 #include <qquickwindow.h>

diff --git 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 <private/qquickanchors_p.h>

diff --git 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 <private/qquickitem_p.h>

diff --git 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 <qvector.h>
 #include <qvariant.h>

diff --git 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 <qpa/qplatformintegration.h>
 

diff --git 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 <qquickitem.h>
 
 QSK_QT_PRIVATE_BEGIN

diff --git 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 <private/qquickitem_p.h>

diff --git 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 <private/qquickwindow_p.h>

diff --git 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 <qkeysequence.h>
 #include <qquickitem.h>

diff --git a/src/controls/QskSkin.cpp b/src/controls/QskSkin.cpp
@@ -106,6 +106,8 @@
 #include "QskStatusIndicator.h"
 #include "QskStatusIndicatorSkinlet.h"
 
+#include "QskInternalMacros.h"
+
 #include <qhash.h>
 
 static inline QskSkinlet* qskNewSkinlet( const QMetaObject* metaObject, QskSkin* skin )

diff --git 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 <private/qquicktextinput_p.h>

diff --git 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
@@ -10,6 +10,7 @@
 #include "QskSetup.h"
 #include "QskSkin.h"
 #include "QskSkinManager.h"
+#include "QskInternalMacros.h"
 
 #include <qmath.h>
 #include <qpointer.h>

diff --git 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 <qguiapplication.h>
 #include <qimage.h>

diff --git 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 <private/qquickitem_p.h>

diff --git a/src/nodes/QskBasicLinesNode.cpp b/src/nodes/QskBasicLinesNode.cpp
@@ -4,6 +4,7 @@
  *****************************************************************************/
 
 #include "QskBasicLinesNode.h"
+#include "QskInternalMacros.h"
 
 #include <qsgmaterial.h>
 #include <qsggeometry.h>

diff --git a/src/nodes/QskBoxShadowNode.cpp b/src/nodes/QskBoxShadowNode.cpp
@@ -5,6 +5,7 @@
 
 #include "QskBoxShadowNode.h"
 #include "QskBoxShapeMetrics.h"
+#include "QskInternalMacros.h"
 
 #include <qcolor.h>
 #include <qsgmaterialshader.h>

diff --git 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 <private/qrhi_p.h>

diff --git 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 <private/qsgnode_p.h>

diff --git 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 <qsgimagenode.h>
 #include <qquickwindow.h>

diff --git 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 <qfontmetrics.h>
 #include <qmath.h>

diff --git 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 <qglobalstatic.h>
 #include <qmutex.h>