From 1ac6334c0e67afb0cb0676c4214f3ee0501e07d2 Mon Sep 17 00:00:00 2001
From: Uwe Rathmann <Uwe.Rathmann@tigertal.de>
Date: Wed, 5 Apr 2023 09:56:28 +0200
Subject: [PATCH] avoidable private includes removed

---
 src/common/QskObjectCounter.cpp    | 19 +++++++++++++++----
 src/controls/QskQuickItem.cpp      |  2 ++
 src/controls/QskScrollArea.cpp     |  2 --
 src/controls/QskSkinlet.cpp        |  6 +-----
 src/graphic/QskGraphic.cpp         |  1 -
 src/nodes/QskGradientMaterial.cpp  |  5 -----
 src/nodes/QskPlainTextRenderer.cpp |  2 --
 7 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/common/QskObjectCounter.cpp b/src/common/QskObjectCounter.cpp
index b6f8b585..9527026f 100644
--- a/src/common/QskObjectCounter.cpp
+++ b/src/common/QskObjectCounter.cpp
@@ -7,11 +7,11 @@
 
 #include <qdebug.h>
 #include <qset.h>
+#include <qobject.h>
+#include <qcoreapplication.h>
 
 QSK_QT_PRIVATE_BEGIN
 #include <private/qhooks_p.h>
-#include <private/qobject_p.h>
-#include <private/qquickitem_p.h>
 QSK_QT_PRIVATE_END
 
 #define QSK_OBJECT_INFO 0
@@ -20,10 +20,19 @@ QSK_QT_PRIVATE_END
 #include <qset.h>
 #endif
 
+#if QT_VERSION < QT_VERSION_CHECK( 6, 4, 0 )
+
+QSK_QT_PRIVATE_BEGIN
+#include <private/qquickitem_p.h>
+QSK_QT_PRIVATE_END
+
+#endif
+
 static inline bool qskIsItem( const QObject* object )
 {
-    QObjectPrivate* o_p = QObjectPrivate::get( const_cast< QObject* >( object ) );
-
+#if QT_VERSION >= QT_VERSION_CHECK( 6, 4, 0 )
+    return object->isQuickItemType();
+#else
     /*
         The addObject hook is called from the constructor of QObject,
         where we don't have the derived class constructed yet.
@@ -31,7 +40,9 @@ static inline bool qskIsItem( const QObject* object )
         RTTI being enabled. TODO ...
      */
 
+    auto o_p = QObjectPrivate::get( const_cast< QObject* >( object ) );
     return dynamic_cast< QQuickItemPrivate* >( o_p ) != nullptr;
+#endif
 }
 
 namespace
diff --git a/src/controls/QskQuickItem.cpp b/src/controls/QskQuickItem.cpp
index 195d0f2e..21a11764 100644
--- a/src/controls/QskQuickItem.cpp
+++ b/src/controls/QskQuickItem.cpp
@@ -26,7 +26,9 @@ QSK_QT_PRIVATE_BEGIN
     #endif
 #endif
 
+#if defined( QT_DEBUG )
 #include <private/qquickpositioners_p.h>
+#endif
 
 QSK_QT_PRIVATE_END
 
diff --git a/src/controls/QskScrollArea.cpp b/src/controls/QskScrollArea.cpp
index b5438f16..520ff011 100644
--- a/src/controls/QskScrollArea.cpp
+++ b/src/controls/QskScrollArea.cpp
@@ -11,10 +11,8 @@
 #include "QskSGNode.h"
 
 QSK_QT_PRIVATE_BEGIN
-#include <private/qquickclipnode_p.h>
 #include <private/qquickitem_p.h>
 #include <private/qquickitemchangelistener_p.h>
-#include <private/qquickwindow_p.h>
 QSK_QT_PRIVATE_END
 
 static inline bool qskNeedsScrollBars(
diff --git a/src/controls/QskSkinlet.cpp b/src/controls/QskSkinlet.cpp
index d3446d94..028492e2 100644
--- a/src/controls/QskSkinlet.cpp
+++ b/src/controls/QskSkinlet.cpp
@@ -32,13 +32,9 @@
 #include <qquickwindow.h>
 #include <qsgsimplerectnode.h>
 
-QSK_QT_PRIVATE_BEGIN
-#include <private/qquickitem_p.h>
-QSK_QT_PRIVATE_END
-
 static inline QRectF qskSceneAlignedRect( const QQuickItem* item, const QRectF& rect )
 {
-    const auto transform = QQuickItemPrivate::get( item )->itemToWindowTransform();
+    const auto transform = item->itemTransform( nullptr, nullptr );
     if ( transform.type() > QTransform::TxTranslate )
         return rect;
 
diff --git a/src/graphic/QskGraphic.cpp b/src/graphic/QskGraphic.cpp
index e7454038..b11b7e31 100644
--- a/src/graphic/QskGraphic.cpp
+++ b/src/graphic/QskGraphic.cpp
@@ -19,7 +19,6 @@
 
 QSK_QT_PRIVATE_BEGIN
 #include <private/qpainter_p.h>
-#include <private/qpaintengineex_p.h>
 QSK_QT_PRIVATE_END
 
 static inline qreal qskDevicePixelRatio()
diff --git a/src/nodes/QskGradientMaterial.cpp b/src/nodes/QskGradientMaterial.cpp
index 9d9e3b66..c36e9292 100644
--- a/src/nodes/QskGradientMaterial.cpp
+++ b/src/nodes/QskGradientMaterial.cpp
@@ -11,11 +11,6 @@
 
 #include <qsgtexture.h>
 
-QSK_QT_PRIVATE_BEGIN
-#include <private/qrhi_p.h>
-#include <private/qdrawhelper_p.h>
-QSK_QT_PRIVATE_END
-
 #include <cmath>
 
 // RHI shaders are supported by Qt 5.15 and Qt 6.x
diff --git a/src/nodes/QskPlainTextRenderer.cpp b/src/nodes/QskPlainTextRenderer.cpp
index 92b80bd1..5c39cd37 100644
--- a/src/nodes/QskPlainTextRenderer.cpp
+++ b/src/nodes/QskPlainTextRenderer.cpp
@@ -12,8 +12,6 @@
 #include <qsgnode.h>
 
 QSK_QT_PRIVATE_BEGIN
-#include <private/qsgadaptationlayer_p.h>
-#include <private/qsgcontext_p.h>
 #include <private/qquickitem_p.h>
 QSK_QT_PRIVATE_END