From 02e6a65b07e9aea827e5082d68b7e3304f5da21f Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Tue, 1 May 2018 12:41:20 +0200 Subject: [PATCH] code moved from QskControl to QskQuick --- src/controls/QskControl.cpp | 1 + src/controls/QskControl.h | 21 --------------------- src/controls/QskFocusIndicator.cpp | 1 + src/controls/QskPopup.cpp | 1 + src/controls/QskScrollArea.cpp | 1 + src/controls/QskScrollViewSkinlet.cpp | 1 + src/controls/QskShortcutMap.cpp | 1 + src/controls/QskSubWindow.cpp | 1 + src/controls/QskTextInput.cpp | 1 + src/controls/QskWindow.cpp | 1 + src/inputpanel/QskInputContext.cpp | 11 ++++++----- src/layouts/QskIndexedLayoutBox.cpp | 2 ++ src/layouts/QskLayoutItem.cpp | 3 +-- support/SkinnyShortcut.cpp | 1 + 14 files changed, 19 insertions(+), 28 deletions(-) diff --git a/src/controls/QskControl.cpp b/src/controls/QskControl.cpp index 600c38cb..a80906ea 100644 --- a/src/controls/QskControl.cpp +++ b/src/controls/QskControl.cpp @@ -4,6 +4,7 @@ *****************************************************************************/ #include "QskControl.h" +#include "QskQuick.h" #include "QskAspect.h" #include "QskSetup.h" #include "QskSkinlet.h" diff --git a/src/controls/QskControl.h b/src/controls/QskControl.h index 4c68781f..39ef6712 100644 --- a/src/controls/QskControl.h +++ b/src/controls/QskControl.h @@ -249,27 +249,6 @@ inline QSizeF QskControl::sizeHint() const return effectiveConstraint( Qt::PreferredSize ); } -QSK_EXPORT bool qskIsItemComplete( const QQuickItem* item ); -QSK_EXPORT bool qskIsAncestorOf( const QQuickItem* item, const QQuickItem* child ); -QSK_EXPORT bool qskIsTransparentForPositioner( const QQuickItem* ); -QSK_EXPORT bool qskIsTabFence( const QQuickItem* ); -QSK_EXPORT bool qskIsShortcutScope( const QQuickItem* ); - -QSK_EXPORT QRectF qskItemRect( const QQuickItem* ); -QSK_EXPORT QRectF qskItemGeometry( const QQuickItem* ); -QSK_EXPORT void qskSetItemGeometry( QQuickItem*, const QRectF& ); - -QSK_EXPORT QQuickItem* qskNearestFocusScope( const QQuickItem* ); -QSK_EXPORT void qskForceActiveFocus( QQuickItem*, Qt::FocusReason ); - -QSK_EXPORT QList< QQuickItem* > qskPaintOrderChildItems( const QQuickItem* ); - -QSK_EXPORT void qskUpdateInputMethod( const QQuickItem*, Qt::InputMethodQueries ); -QSK_EXPORT QQuickItem* qskInputContextItem(); - -QSK_EXPORT const QSGNode* qskItemNode( const QQuickItem* ); -QSK_EXPORT const QSGNode* qskPaintNode( const QQuickItem* ); - Q_DECLARE_OPERATORS_FOR_FLAGS( QskControl::Flags ) Q_DECLARE_METATYPE( QskControl::Flags ) diff --git a/src/controls/QskFocusIndicator.cpp b/src/controls/QskFocusIndicator.cpp index a827c59d..3f3b13ad 100644 --- a/src/controls/QskFocusIndicator.cpp +++ b/src/controls/QskFocusIndicator.cpp @@ -4,6 +4,7 @@ *****************************************************************************/ #include "QskFocusIndicator.h" +#include "QskQuick.h" #include "QskBoxNode.h" #include "QskAspect.h" #include "QskEvent.h" diff --git a/src/controls/QskPopup.cpp b/src/controls/QskPopup.cpp index 284406c8..3ff5a196 100644 --- a/src/controls/QskPopup.cpp +++ b/src/controls/QskPopup.cpp @@ -4,6 +4,7 @@ *****************************************************************************/ #include "QskPopup.h" +#include "QskQuick.h" #include "QskAspect.h" #include #include diff --git a/src/controls/QskScrollArea.cpp b/src/controls/QskScrollArea.cpp index b35636cd..6969075a 100644 --- a/src/controls/QskScrollArea.cpp +++ b/src/controls/QskScrollArea.cpp @@ -4,6 +4,7 @@ *****************************************************************************/ #include "QskScrollArea.h" +#include "QskQuick.h" #include "QskScrollViewSkinlet.h" #include "QskLayoutConstraint.h" #include "QskEvent.h" diff --git a/src/controls/QskScrollViewSkinlet.cpp b/src/controls/QskScrollViewSkinlet.cpp index 48729de6..a252cc7d 100644 --- a/src/controls/QskScrollViewSkinlet.cpp +++ b/src/controls/QskScrollViewSkinlet.cpp @@ -5,6 +5,7 @@ #include "QskScrollViewSkinlet.h" #include "QskScrollView.h" +#include "QskQuick.h" #include "QskAspect.h" #include "QskFunctions.h" diff --git a/src/controls/QskShortcutMap.cpp b/src/controls/QskShortcutMap.cpp index 695a6bef..643e9e1a 100644 --- a/src/controls/QskShortcutMap.cpp +++ b/src/controls/QskShortcutMap.cpp @@ -5,6 +5,7 @@ #include "QskShortcutMap.h" #include "QskControl.h" +#include "QskQuick.h" #include "QskMetaInvokable.h" #include diff --git a/src/controls/QskSubWindow.cpp b/src/controls/QskSubWindow.cpp index 0960ab4e..19bae25a 100644 --- a/src/controls/QskSubWindow.cpp +++ b/src/controls/QskSubWindow.cpp @@ -4,6 +4,7 @@ *****************************************************************************/ #include "QskSubWindow.h" +#include "QskQuick.h" #include "QskAspect.h" #include "QskSkin.h" #include "QskFunctions.h" diff --git a/src/controls/QskTextInput.cpp b/src/controls/QskTextInput.cpp index 49e9c952..d4f69503 100644 --- a/src/controls/QskTextInput.cpp +++ b/src/controls/QskTextInput.cpp @@ -4,6 +4,7 @@ *****************************************************************************/ #include "QskTextInput.h" +#include "QskQuick.h" // VS2012+ disable keyword macroizing unless _ALLOW_KEYWORD_MACROS is set #ifdef _MSC_VER diff --git a/src/controls/QskWindow.cpp b/src/controls/QskWindow.cpp index ec13b6fb..45c28508 100644 --- a/src/controls/QskWindow.cpp +++ b/src/controls/QskWindow.cpp @@ -5,6 +5,7 @@ #include "QskWindow.h" #include "QskControl.h" +#include "QskQuick.h" #include "QskAspect.h" #include "QskSetup.h" #include "QskSkin.h" diff --git a/src/inputpanel/QskInputContext.cpp b/src/inputpanel/QskInputContext.cpp index 51b080fa..4d4e01e3 100644 --- a/src/inputpanel/QskInputContext.cpp +++ b/src/inputpanel/QskInputContext.cpp @@ -9,11 +9,12 @@ #include "QskInputPanel.h" #include "QskInputEngine.h" -#include -#include -#include -#include -#include +#include "QskLinearBox.h" +#include "QskDialog.h" +#include "QskPopup.h" +#include "QskWindow.h" +#include "QskEvent.h" +#include "QskQuick.h" #include #include diff --git a/src/layouts/QskIndexedLayoutBox.cpp b/src/layouts/QskIndexedLayoutBox.cpp index 85c33888..a6db264f 100644 --- a/src/layouts/QskIndexedLayoutBox.cpp +++ b/src/layouts/QskIndexedLayoutBox.cpp @@ -4,8 +4,10 @@ *****************************************************************************/ #include "QskIndexedLayoutBox.h" +#include "QskQuick.h" #include "QskLayoutEngine.h" #include "QskLayoutItem.h" + #include class QskIndexedLayoutBox::PrivateData diff --git a/src/layouts/QskLayoutItem.cpp b/src/layouts/QskLayoutItem.cpp index 8fba1204..a37a1a46 100644 --- a/src/layouts/QskLayoutItem.cpp +++ b/src/layouts/QskLayoutItem.cpp @@ -5,10 +5,9 @@ #include "QskLayoutItem.h" #include "QskControl.h" +#include "QskQuick.h" #include "QskLayoutConstraint.h" -#include - QskLayoutItem::QskLayoutItem( QQuickItem* item, int row, int column, int rowSpan, int columnSpan ): Inherited( row, column, qMax( rowSpan, 1 ), qMax( columnSpan, 1 ), Qt::Alignment() ), diff --git a/support/SkinnyShortcut.cpp b/support/SkinnyShortcut.cpp index a4bf4eec..029d6779 100644 --- a/support/SkinnyShortcut.cpp +++ b/support/SkinnyShortcut.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include #include