From aaac57de9451e4efa9b17c2b7eb834c4256a9001 Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Thu, 19 Jul 2018 14:10:48 +0200 Subject: [PATCH] unused member removed --- examples/automotive/Speedometer.h | 1 - examples/gbenchmark/Benchmark.cpp | 1 + src/common/QskAspect.cpp | 9 ++++----- src/common/QskAspect.h | 3 ++- src/common/QskBoxBorderColors.cpp | 4 +++- src/common/QskBoxBorderColors.h | 5 ++--- src/common/QskBoxBorderMetrics.cpp | 4 +++- src/common/QskBoxBorderMetrics.h | 6 +++--- src/common/QskBoxShapeMetrics.cpp | 4 +++- src/common/QskBoxShapeMetrics.h | 7 +++---- src/common/QskCorner.cpp | 2 -- src/common/QskCorner.h | 4 ++-- src/common/QskFunctions.cpp | 6 +++--- src/common/QskFunctions.h | 4 ++-- src/common/QskGradient.cpp | 5 +++-- src/common/QskGradient.h | 6 +++--- src/common/QskMargins.cpp | 2 +- src/common/QskMargins.h | 6 +++--- src/common/QskMetaFunction.cpp | 8 ++++---- src/common/QskMetaFunction.h | 5 +++-- src/common/QskMetaFunction.hpp | 2 +- src/common/QskMetaInvokable.cpp | 13 +++++-------- src/common/QskMetaInvokable.h | 5 +++-- src/common/QskModule.cpp | 9 +++------ src/common/QskObjectCounter.cpp | 6 +++--- src/common/QskSizePolicy.cpp | 3 ++- src/common/QskSizePolicy.h | 2 +- src/common/QskTextColors.cpp | 5 +++-- src/common/QskTextColors.h | 4 ++-- src/common/QskTextOptions.cpp | 5 +++-- src/common/QskTextOptions.h | 4 ++-- src/controls/QskAbstractButton.cpp | 2 +- src/controls/QskAnimationHint.h | 4 ++-- src/controls/QskAnimator.cpp | 15 +++++++++------ src/controls/QskAnimator.h | 4 ++-- src/controls/QskControl.cpp | 10 ++++------ src/controls/QskControl.h | 4 ++-- src/controls/QskDirtyItemFilter.cpp | 3 --- src/controls/QskDirtyItemFilter.h | 4 ++-- src/controls/QskEvent.cpp | 3 ++- src/controls/QskEvent.h | 4 ++-- src/controls/QskFocusIndicator.cpp | 3 +-- src/controls/QskGesture.h | 4 ++-- src/controls/QskGestureRecognizer.cpp | 14 +++++++------- src/controls/QskGestureRecognizer.h | 3 ++- src/controls/QskGraphicLabel.cpp | 4 +--- src/controls/QskGraphicLabelSkinlet.cpp | 5 ++--- src/controls/QskHintAnimator.cpp | 7 ++----- src/controls/QskHintAnimator.h | 4 ++-- src/controls/QskInputGrabber.cpp | 4 ++-- src/controls/QskListViewSkinlet.cpp | 14 +++++--------- src/controls/QskObjectTree.cpp | 7 ++++--- src/controls/QskObjectTree.h | 2 +- src/controls/QskPageIndicator.cpp | 1 - src/controls/QskPanGestureRecognizer.cpp | 8 ++++---- src/controls/QskPopup.cpp | 2 -- src/controls/QskPushButton.cpp | 2 +- src/controls/QskPushButtonSkinlet.cpp | 4 ++-- src/controls/QskQuick.cpp | 1 + src/controls/QskQuick.h | 7 ++++++- src/controls/QskRangeControl.cpp | 1 - src/controls/QskRgbValue.h | 2 +- src/controls/QskScrollView.cpp | 2 -- src/controls/QskScrollViewSkinlet.cpp | 4 +--- src/controls/QskSetup.cpp | 8 +++----- src/controls/QskShortcut.cpp | 8 ++++++-- src/controls/QskShortcut.h | 7 ++++--- src/controls/QskShortcutMap.cpp | 9 +++++---- src/controls/QskShortcutMap.h | 2 +- src/controls/QskSimpleListBox.cpp | 3 ++- src/controls/QskSimpleListBox.h | 3 ++- src/controls/QskSkin.cpp | 7 ------- src/controls/QskSkin.h | 4 ++-- src/controls/QskSkinFactory.h | 2 +- src/controls/QskSkinHintTable.h | 5 ++--- src/controls/QskSkinManager.cpp | 16 ++++++++-------- src/controls/QskSkinManager.h | 2 +- src/controls/QskSkinTransition.cpp | 12 ++++++------ src/controls/QskSkinTransition.h | 1 - src/controls/QskSkinlet.cpp | 10 +++------- src/controls/QskSkinlet.h | 5 +++-- src/controls/QskSkinnable.cpp | 4 +--- src/controls/QskSkinnable.h | 3 +-- src/controls/QskSlider.cpp | 2 -- src/controls/QskStatusIndicator.cpp | 3 ++- src/controls/QskStatusIndicatorSkinlet.cpp | 4 +--- src/controls/QskSubWindow.cpp | 4 ---- src/controls/QskSubWindowArea.cpp | 2 +- src/controls/QskSubWindowSkinlet.cpp | 2 +- src/controls/QskTabButton.cpp | 4 ++-- src/controls/QskTabButtonSkinlet.cpp | 3 --- src/controls/QskTextLabel.cpp | 4 ++-- src/controls/QskVariantAnimator.cpp | 5 ++++- src/controls/QskVariantAnimator.h | 2 +- src/controls/QskWindow.cpp | 6 ++---- src/controls/QskWindow.h | 2 +- src/dialogs/QskDialog.cpp | 7 +++---- src/dialogs/QskDialog.h | 2 +- src/dialogs/QskDialogButtonBox.cpp | 7 +++++-- src/dialogs/QskDialogSubWindow.cpp | 5 +++-- src/dialogs/QskDialogWindow.cpp | 4 ++-- src/dialogs/QskInputSubWindow.cpp | 3 ++- src/graphic/QskColorFilter.cpp | 8 +++++--- src/graphic/QskColorFilter.h | 8 ++++---- src/graphic/QskGraphic.cpp | 15 +++++++-------- src/graphic/QskGraphic.h | 12 +++++++----- src/graphic/QskGraphicIO.cpp | 8 ++++---- src/graphic/QskGraphicImageProvider.h | 2 +- src/graphic/QskGraphicPaintEngine.h | 2 +- src/graphic/QskGraphicProvider.cpp | 8 +++----- src/graphic/QskGraphicProvider.h | 2 +- src/graphic/QskGraphicProviderMap.cpp | 8 +++----- src/graphic/QskGraphicProviderMap.h | 2 +- src/graphic/QskGraphicTextureFactory.cpp | 14 +++++++------- src/graphic/QskGraphicTextureFactory.h | 4 +--- src/graphic/QskPainterCommand.h | 10 ++++------ src/graphic/QskStandardSymbol.cpp | 2 +- src/graphic/QskStandardSymbol.h | 2 +- src/inputpanel/QskInputContext.cpp | 7 +++---- src/inputpanel/QskInputContext.h | 8 +++++--- src/inputpanel/QskInputPanel.cpp | 4 ++-- src/inputpanel/QskInputPanelBox.cpp | 5 ++--- src/inputpanel/QskInputPredictionBar.cpp | 4 ++-- src/inputpanel/QskTextPredictor.h | 2 +- src/inputpanel/QskVirtualKeyboard.cpp | 6 +++--- src/layouts/QskGridBox.cpp | 2 -- src/layouts/QskIndexedLayoutBox.cpp | 2 -- src/layouts/QskLayout.cpp | 4 ---- src/layouts/QskLayoutConstraint.cpp | 2 -- src/layouts/QskLayoutConstraint.h | 2 +- src/layouts/QskLayoutEngine.cpp | 1 - src/layouts/QskLayoutItem.h | 1 - src/layouts/QskLinearBox.cpp | 2 +- src/layouts/QskStackBox.cpp | 2 +- src/layouts/QskStackBoxAnimator.h | 2 +- src/nodes/QskBoxClipNode.h | 2 +- src/nodes/QskBoxNode.cpp | 6 +++--- src/nodes/QskBoxNode.h | 4 +--- src/nodes/QskBoxRenderer.h | 2 +- src/nodes/QskBoxRendererDEllipse.cpp | 2 +- src/nodes/QskBoxRendererEllipse.cpp | 4 ++-- src/nodes/QskBoxRendererRect.cpp | 3 --- src/nodes/QskPlainTextRenderer.cpp | 8 +++----- src/nodes/QskPlainTextRenderer.h | 2 +- src/nodes/QskRichTextRenderer.cpp | 12 +++++------- src/nodes/QskRichTextRenderer.h | 2 +- src/nodes/QskTextNode.cpp | 5 ++--- src/nodes/QskTextNode.h | 4 ++-- src/nodes/QskTextRenderer.cpp | 2 +- src/nodes/QskTextRenderer.h | 2 +- src/nodes/QskTextureNode.cpp | 16 +++++++--------- src/nodes/QskTextureNode.h | 4 ++-- src/nodes/QskVertex.cpp | 2 ++ src/nodes/QskVertex.h | 5 ++--- tools/svg2qvg/main.cpp | 3 ++- 155 files changed, 346 insertions(+), 397 deletions(-) diff --git a/examples/automotive/Speedometer.h b/examples/automotive/Speedometer.h index a3ee8051..55f71547 100644 --- a/examples/automotive/Speedometer.h +++ b/examples/automotive/Speedometer.h @@ -16,7 +16,6 @@ public: void setLabels( const QVector< QString >& labels ); private: - float m_labelsStep; QVector< QString > m_labels; }; diff --git a/examples/gbenchmark/Benchmark.cpp b/examples/gbenchmark/Benchmark.cpp index c7abc696..8a94e9ff 100644 --- a/examples/gbenchmark/Benchmark.cpp +++ b/examples/gbenchmark/Benchmark.cpp @@ -16,6 +16,7 @@ #include #include #include +#include bool Benchmark::run( const QString& dirName ) { diff --git a/src/common/QskAspect.cpp b/src/common/QskAspect.cpp index 4ec635a5..79a7be80 100644 --- a/src/common/QskAspect.cpp +++ b/src/common/QskAspect.cpp @@ -5,12 +5,11 @@ #include "QskAspect.h" -#include -#include -#include -#include +#include +#include +#include +#include -#include #include #include #include diff --git a/src/common/QskAspect.h b/src/common/QskAspect.h index dc091045..3091b9a9 100644 --- a/src/common/QskAspect.h +++ b/src/common/QskAspect.h @@ -7,7 +7,8 @@ #define QSK_ASPECT_H #include "QskFlags.h" -#include + +#include #include #ifdef Q_MOC_RUN diff --git a/src/common/QskBoxBorderColors.cpp b/src/common/QskBoxBorderColors.cpp index d4376545..76b7bd6d 100644 --- a/src/common/QskBoxBorderColors.cpp +++ b/src/common/QskBoxBorderColors.cpp @@ -7,7 +7,7 @@ #include "QskRgbValue.h" #include -#include +#include static void qskRegisterBoxBorderColors() { @@ -194,6 +194,8 @@ uint QskBoxBorderColors::hash( uint seed ) const #ifndef QT_NO_DEBUG_STREAM +#include + static inline void qskDebugColor( QDebug debug, const QColor& c ) { debug << '(' diff --git a/src/common/QskBoxBorderColors.h b/src/common/QskBoxBorderColors.h index 6da0b069..d1986379 100644 --- a/src/common/QskBoxBorderColors.h +++ b/src/common/QskBoxBorderColors.h @@ -8,10 +8,9 @@ #include "QskGlobal.h" #include "QskNamespace.h" -#include "QskRgbValue.h" -#include -#include +#include +#include class QDebug; diff --git a/src/common/QskBoxBorderMetrics.cpp b/src/common/QskBoxBorderMetrics.cpp index bdd96a34..3d68b90c 100644 --- a/src/common/QskBoxBorderMetrics.cpp +++ b/src/common/QskBoxBorderMetrics.cpp @@ -6,7 +6,7 @@ #include "QskBoxBorderMetrics.h" #include -#include +#include static void qskRegisterBoxBorderMetrics() { @@ -104,6 +104,8 @@ uint QskBoxBorderMetrics::hash( uint seed ) const #ifndef QT_NO_DEBUG_STREAM +#include + QDebug operator<<( QDebug debug, const QskBoxBorderMetrics& metrics ) { QDebugStateSaver saver( debug ); diff --git a/src/common/QskBoxBorderMetrics.h b/src/common/QskBoxBorderMetrics.h index 0c6ab370..78eb636e 100644 --- a/src/common/QskBoxBorderMetrics.h +++ b/src/common/QskBoxBorderMetrics.h @@ -9,9 +9,9 @@ #include "QskGlobal.h" #include "QskMargins.h" -#include -#include -#include +#include +#include +#include class QDebug; class QVariant; diff --git a/src/common/QskBoxShapeMetrics.cpp b/src/common/QskBoxShapeMetrics.cpp index e7728b16..b9f3aa78 100644 --- a/src/common/QskBoxShapeMetrics.cpp +++ b/src/common/QskBoxShapeMetrics.cpp @@ -6,7 +6,7 @@ #include "QskBoxShapeMetrics.h" #include -#include +#include static void qskRegisterBoxShapeMetrics() { @@ -210,6 +210,8 @@ uint QskBoxShapeMetrics::hash( uint seed ) const #ifndef QT_NO_DEBUG_STREAM +#include + QDebug operator<<( QDebug debug, const QskBoxShapeMetrics& metrics ) { QDebugStateSaver saver( debug ); diff --git a/src/common/QskBoxShapeMetrics.h b/src/common/QskBoxShapeMetrics.h index 36fc42b3..e36e2797 100644 --- a/src/common/QskBoxShapeMetrics.h +++ b/src/common/QskBoxShapeMetrics.h @@ -8,11 +8,10 @@ #include "QskGlobal.h" -#include -#include -#include +#include +#include +#include -class QDebug; class QVariant; class QMarginsF; diff --git a/src/common/QskCorner.cpp b/src/common/QskCorner.cpp index be4041d5..2b6e3bb8 100644 --- a/src/common/QskCorner.cpp +++ b/src/common/QskCorner.cpp @@ -4,8 +4,6 @@ *****************************************************************************/ #include "QskCorner.h" -#include -#include QskCorner::QskCorner() { diff --git a/src/common/QskCorner.h b/src/common/QskCorner.h index eef6a8d1..b63f0aef 100644 --- a/src/common/QskCorner.h +++ b/src/common/QskCorner.h @@ -9,8 +9,8 @@ #include "QskGlobal.h" #include "QskBoxShapeMetrics.h" -#include -#include +#include +#include class QDebug; class QSizeF; diff --git a/src/common/QskFunctions.cpp b/src/common/QskFunctions.cpp index 56f8492c..8050e7fe 100644 --- a/src/common/QskFunctions.cpp +++ b/src/common/QskFunctions.cpp @@ -1,8 +1,8 @@ #include "QskFunctions.h" -#include -#include -#include +#include +#include +#include template< class Rect, class Value > static inline Rect qskAlignedRect( const Rect& outerRect, diff --git a/src/common/QskFunctions.h b/src/common/QskFunctions.h index 37f20add..90cb3027 100644 --- a/src/common/QskFunctions.h +++ b/src/common/QskFunctions.h @@ -8,8 +8,8 @@ #include "QskGlobal.h" -#include -#include +#include +#include QSK_EXPORT qreal qskDpiScaled( qreal value ); diff --git a/src/common/QskGradient.cpp b/src/common/QskGradient.cpp index 23451781..3466ec7e 100644 --- a/src/common/QskGradient.cpp +++ b/src/common/QskGradient.cpp @@ -5,9 +5,8 @@ #include "QskGradient.h" #include "QskRgbValue.h" -#include -#include +#include #include static void qskRegisterGradient() @@ -471,6 +470,8 @@ QVariant QskGradient::interpolate( #ifndef QT_NO_DEBUG_STREAM +#include + QDebug operator<<( QDebug debug, const QskGradientStop& stop ) { debug << "GR:" << stop.position() << stop.color(); diff --git a/src/common/QskGradient.h b/src/common/QskGradient.h index 49f4c1a6..89097bc3 100644 --- a/src/common/QskGradient.h +++ b/src/common/QskGradient.h @@ -8,9 +8,9 @@ #include "QskGlobal.h" -#include -#include -#include +#include +#include +#include class QDebug; class QVariant; diff --git a/src/common/QskMargins.cpp b/src/common/QskMargins.cpp index e3f11877..e4305122 100644 --- a/src/common/QskMargins.cpp +++ b/src/common/QskMargins.cpp @@ -1,5 +1,5 @@ #include "QskMargins.h" -#include +#include static inline qreal qskInterpolated( qreal from, qreal to, qreal ratio ) { diff --git a/src/common/QskMargins.h b/src/common/QskMargins.h index 87d69dc7..685af889 100644 --- a/src/common/QskMargins.h +++ b/src/common/QskMargins.h @@ -8,9 +8,9 @@ #include "QskGlobal.h" -#include -#include -#include +#include +#include +#include class QVariant; diff --git a/src/common/QskMetaFunction.cpp b/src/common/QskMetaFunction.cpp index dd1fbf5d..217e2885 100644 --- a/src/common/QskMetaFunction.cpp +++ b/src/common/QskMetaFunction.cpp @@ -6,10 +6,10 @@ #include "QskGlobal.h" #include "QskMetaFunction.h" -#include -#include -#include -#include +#include +#include +#include +#include QSK_QT_PRIVATE_BEGIN #include diff --git a/src/common/QskMetaFunction.h b/src/common/QskMetaFunction.h index f59d7873..065d07e5 100644 --- a/src/common/QskMetaFunction.h +++ b/src/common/QskMetaFunction.h @@ -7,8 +7,9 @@ #define QSK_META_FUNCTION_H 1 #include "QskGlobal.h" -#include -#include + +#include +#include namespace QskMetaFunctionTraits { diff --git a/src/common/QskMetaFunction.hpp b/src/common/QskMetaFunction.hpp index 4f8429f1..a5ea735d 100644 --- a/src/common/QskMetaFunction.hpp +++ b/src/common/QskMetaFunction.hpp @@ -7,7 +7,7 @@ #define QSK_META_FUNCTION_HPP 1 #include "QskGlobal.h" -#include +#include class QskMetaFunction::FunctionCall : public QtPrivate::QSlotObjectBase { diff --git a/src/common/QskMetaInvokable.cpp b/src/common/QskMetaInvokable.cpp index 80761313..2a541749 100644 --- a/src/common/QskMetaInvokable.cpp +++ b/src/common/QskMetaInvokable.cpp @@ -6,15 +6,12 @@ #include "QskMetaInvokable.h" #include "QskMetaFunction.h" -#include -#include +#include +#include -#include -#include - -#include -#include -#include +#include +#include +#include QSK_QT_PRIVATE_BEGIN #include diff --git a/src/common/QskMetaInvokable.h b/src/common/QskMetaInvokable.h index 63f06b84..d770e269 100644 --- a/src/common/QskMetaInvokable.h +++ b/src/common/QskMetaInvokable.h @@ -8,14 +8,15 @@ #include "QskGlobal.h" -#include -#include +#include +#include class QskMetaFunction; struct QMetaObject; class QMetaMethod; class QMetaProperty; class QObject; +class QByteArray; class QSK_EXPORT QskMetaInvokable { diff --git a/src/common/QskModule.cpp b/src/common/QskModule.cpp index 72f48b91..e11136fc 100644 --- a/src/common/QskModule.cpp +++ b/src/common/QskModule.cpp @@ -43,17 +43,14 @@ #include "QskSelectionWindow.h" #include "QskWindow.h" -#include -#include -#include -#include -#include +#include +#include +#include QSK_QT_PRIVATE_BEGIN #include #include #include -#include QSK_QT_PRIVATE_END #define QSK_MODULE_NAME "Skinny" diff --git a/src/common/QskObjectCounter.cpp b/src/common/QskObjectCounter.cpp index 3d8e3d29..87de8ef7 100644 --- a/src/common/QskObjectCounter.cpp +++ b/src/common/QskObjectCounter.cpp @@ -4,9 +4,9 @@ *****************************************************************************/ #include "QskObjectCounter.h" -#include -#include -#include + +#include +#include QSK_QT_PRIVATE_BEGIN #include diff --git a/src/common/QskSizePolicy.cpp b/src/common/QskSizePolicy.cpp index 0f038af0..246cd98e 100644 --- a/src/common/QskSizePolicy.cpp +++ b/src/common/QskSizePolicy.cpp @@ -4,7 +4,6 @@ *****************************************************************************/ #include "QskSizePolicy.h" -#include QskSizePolicy::Policy QskSizePolicy::policy( Qt::Orientation orientation ) const { @@ -22,6 +21,8 @@ void QskSizePolicy::setPolicy( Qt::Orientation orientation, Policy policy ) #ifndef QT_NO_DEBUG_STREAM +#include + QDebug operator<<( QDebug debug, const QskSizePolicy& policy ) { QDebugStateSaver saver( debug ); diff --git a/src/common/QskSizePolicy.h b/src/common/QskSizePolicy.h index a70b6732..1494946d 100644 --- a/src/common/QskSizePolicy.h +++ b/src/common/QskSizePolicy.h @@ -7,7 +7,7 @@ #define QSK_SIZE_POLICY_H_ #include "QskGlobal.h" -#include +#include class QDebug; diff --git a/src/common/QskTextColors.cpp b/src/common/QskTextColors.cpp index ebda60ec..e4c70da6 100644 --- a/src/common/QskTextColors.cpp +++ b/src/common/QskTextColors.cpp @@ -6,9 +6,8 @@ #include "QskTextColors.h" #include "QskRgbValue.h" -#include +#include #include -#include uint QskTextColors::hash( uint seed ) const { @@ -42,6 +41,8 @@ QVariant QskTextColors::interpolate( const QskTextColors& from, #ifndef QT_NO_DEBUG_STREAM +#include + static inline void qskDebugColor( QDebug debug, const QColor& c ) { debug << '(' diff --git a/src/common/QskTextColors.h b/src/common/QskTextColors.h index 3344e2bf..54da0555 100644 --- a/src/common/QskTextColors.h +++ b/src/common/QskTextColors.h @@ -7,8 +7,8 @@ #define QSK_TEXT_COLORS_H #include "QskGlobal.h" -#include -#include +#include +#include class QDebug; class QVariant; diff --git a/src/common/QskTextOptions.cpp b/src/common/QskTextOptions.cpp index 3b4cae7a..7c4d7ac0 100644 --- a/src/common/QskTextOptions.cpp +++ b/src/common/QskTextOptions.cpp @@ -4,8 +4,7 @@ *****************************************************************************/ #include "QskTextOptions.h" -#include -#include +#include #include QskTextOptions::QskTextOptions(): @@ -135,6 +134,8 @@ uint qHash( const QskTextOptions &options, uint seed ) noexcept #ifndef QT_NO_DEBUG_STREAM +#include + QDebug operator<<( QDebug debug, const QskTextOptions& options ) { QDebugStateSaver saver( debug ); diff --git a/src/common/QskTextOptions.h b/src/common/QskTextOptions.h index 7f4ff9d9..854008e1 100644 --- a/src/common/QskTextOptions.h +++ b/src/common/QskTextOptions.h @@ -7,8 +7,8 @@ #define QSK_TEXT_OPTIONS_H #include "QskGlobal.h" -#include -#include +#include +#include class QDebug; diff --git a/src/controls/QskAbstractButton.cpp b/src/controls/QskAbstractButton.cpp index 4ada670b..0babb89d 100644 --- a/src/controls/QskAbstractButton.cpp +++ b/src/controls/QskAbstractButton.cpp @@ -8,7 +8,7 @@ #include "QskEvent.h" #include "QskQuick.h" -#include +#include QSK_STATE( QskAbstractButton, Flat, QskAspect::FirstSystemState << 1 ) QSK_STATE( QskAbstractButton, Checked, QskAspect::LastSystemState >> 4 ) diff --git a/src/controls/QskAnimationHint.h b/src/controls/QskAnimationHint.h index c4a23586..73061e86 100644 --- a/src/controls/QskAnimationHint.h +++ b/src/controls/QskAnimationHint.h @@ -8,8 +8,8 @@ #include "QskGlobal.h" -#include -#include +#include +#include class QSK_EXPORT QskAnimationHint { diff --git a/src/controls/QskAnimator.cpp b/src/controls/QskAnimator.cpp index d7df0f5e..de780c65 100644 --- a/src/controls/QskAnimator.cpp +++ b/src/controls/QskAnimator.cpp @@ -5,12 +5,15 @@ #include "QskAnimator.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include + +#ifndef QT_NO_DEBUG_STREAM +#include +#endif namespace { diff --git a/src/controls/QskAnimator.h b/src/controls/QskAnimator.h index c16947fb..da914f49 100644 --- a/src/controls/QskAnimator.h +++ b/src/controls/QskAnimator.h @@ -7,8 +7,8 @@ #define QSK_ANIMATOR_H #include "QskGlobal.h" -#include -#include +#include +#include class QQuickWindow; class QObject; diff --git a/src/controls/QskControl.cpp b/src/controls/QskControl.cpp index ae7208a0..612cd9d4 100644 --- a/src/controls/QskControl.cpp +++ b/src/controls/QskControl.cpp @@ -7,15 +7,14 @@ #include "QskQuick.h" #include "QskAspect.h" #include "QskSetup.h" -#include "QskSkinlet.h" -#include "QskSkin.h" #include "QskEvent.h" #include "QskDirtyItemFilter.h" #include "QskSkinHintTable.h" +#include "QskSkin.h" -#include -#include -#include +#include +#include +#include QSK_QT_PRIVATE_BEGIN #include @@ -26,7 +25,6 @@ QSK_QT_PRIVATE_END #include #include -#include QSK_STATE( QskControl, Disabled, QskAspect::FirstSystemState ) QSK_STATE( QskControl, Hovered, QskAspect::LastSystemState >> 1 ) diff --git a/src/controls/QskControl.h b/src/controls/QskControl.h index 208bb9ed..5e8bb7b4 100644 --- a/src/controls/QskControl.h +++ b/src/controls/QskControl.h @@ -12,8 +12,8 @@ #include "QskSizePolicy.h" #include "QskAspect.h" -#include -#include +#include +#include #include diff --git a/src/controls/QskDirtyItemFilter.cpp b/src/controls/QskDirtyItemFilter.cpp index f4827951..5aecca0e 100644 --- a/src/controls/QskDirtyItemFilter.cpp +++ b/src/controls/QskDirtyItemFilter.cpp @@ -4,11 +4,8 @@ *****************************************************************************/ #include "QskDirtyItemFilter.h" -#include "QskWindow.h" #include "QskControl.h" -#include - QSK_QT_PRIVATE_BEGIN #include #include diff --git a/src/controls/QskDirtyItemFilter.h b/src/controls/QskDirtyItemFilter.h index 8e193f80..9e2bbcb2 100644 --- a/src/controls/QskDirtyItemFilter.h +++ b/src/controls/QskDirtyItemFilter.h @@ -8,8 +8,8 @@ #include "QskGlobal.h" -#include -#include +#include +#include class QQuickWindow; class QQuickItem; diff --git a/src/controls/QskEvent.cpp b/src/controls/QskEvent.cpp index a1883b42..3eb26167 100644 --- a/src/controls/QskEvent.cpp +++ b/src/controls/QskEvent.cpp @@ -1,6 +1,7 @@ #include "QskEvent.h" #include "QskGesture.h" -#include + +#include static void qskRegisterEventTypes() { diff --git a/src/controls/QskEvent.h b/src/controls/QskEvent.h index 8215828d..798ba698 100644 --- a/src/controls/QskEvent.h +++ b/src/controls/QskEvent.h @@ -9,8 +9,8 @@ #include "QskGlobal.h" #include "QskAspect.h" -#include -#include +#include +#include class QskGesture; class QQuickWindow; diff --git a/src/controls/QskFocusIndicator.cpp b/src/controls/QskFocusIndicator.cpp index 3f3b13ad..fddd1113 100644 --- a/src/controls/QskFocusIndicator.cpp +++ b/src/controls/QskFocusIndicator.cpp @@ -5,11 +5,10 @@ #include "QskFocusIndicator.h" #include "QskQuick.h" -#include "QskBoxNode.h" #include "QskAspect.h" #include "QskEvent.h" -#include +#include QSK_SUBCONTROL( QskFocusIndicator, Panel ) diff --git a/src/controls/QskGesture.h b/src/controls/QskGesture.h index 562ecc4b..349ae7aa 100644 --- a/src/controls/QskGesture.h +++ b/src/controls/QskGesture.h @@ -8,8 +8,8 @@ #include "QskGlobal.h" -#include -#include +#include +#include class QSK_EXPORT QskGesture { diff --git a/src/controls/QskGestureRecognizer.cpp b/src/controls/QskGestureRecognizer.cpp index af6d7407..1a3f9129 100644 --- a/src/controls/QskGestureRecognizer.cpp +++ b/src/controls/QskGestureRecognizer.cpp @@ -1,12 +1,12 @@ #include "QskGestureRecognizer.h" -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include QSK_QT_PRIVATE_BEGIN #include diff --git a/src/controls/QskGestureRecognizer.h b/src/controls/QskGestureRecognizer.h index 7dedffa2..8858f2a5 100644 --- a/src/controls/QskGestureRecognizer.h +++ b/src/controls/QskGestureRecognizer.h @@ -7,7 +7,8 @@ #define QSK_GESTURE_RECOGNIZER_H #include "QskGlobal.h" -#include + +#include #include class QQuickItem; diff --git a/src/controls/QskGraphicLabel.cpp b/src/controls/QskGraphicLabel.cpp index 16bbe96b..a626cdf8 100644 --- a/src/controls/QskGraphicLabel.cpp +++ b/src/controls/QskGraphicLabel.cpp @@ -6,12 +6,10 @@ #include "QskGraphicLabel.h" #include "QskGraphic.h" #include "QskGraphicProvider.h" -#include "QskGraphicTextureFactory.h" #include "QskAspect.h" #include "QskSetup.h" #include "QskSkin.h" - -#include +#include "QskColorFilter.h" QSK_SUBCONTROL( QskGraphicLabel, Graphic ) diff --git a/src/controls/QskGraphicLabelSkinlet.cpp b/src/controls/QskGraphicLabelSkinlet.cpp index 39d26abe..297315fa 100644 --- a/src/controls/QskGraphicLabelSkinlet.cpp +++ b/src/controls/QskGraphicLabelSkinlet.cpp @@ -5,10 +5,9 @@ #include "QskGraphicLabelSkinlet.h" #include "QskGraphicLabel.h" -#include "QskGraphic.h" -#include "QskGraphicTextureFactory.h" #include "QskAspect.h" -#include "QskSkin.h" +#include "QskGraphic.h" +#include "QskColorFilter.h" #include "QskTextureNode.h" #include "QskFunctions.h" diff --git a/src/controls/QskHintAnimator.cpp b/src/controls/QskHintAnimator.cpp index 7391ec8d..82f0f319 100644 --- a/src/controls/QskHintAnimator.cpp +++ b/src/controls/QskHintAnimator.cpp @@ -7,12 +7,9 @@ #include "QskAnimationHint.h" #include "QskControl.h" #include "QskEvent.h" -#include "QskMargins.h" -#include "QskBoxBorderMetrics.h" -#include "QskBoxShapeMetrics.h" -#include -#include +#include +#include #include #include diff --git a/src/controls/QskHintAnimator.h b/src/controls/QskHintAnimator.h index c3d7fb7e..1784789e 100644 --- a/src/controls/QskHintAnimator.h +++ b/src/controls/QskHintAnimator.h @@ -10,7 +10,7 @@ #include "QskVariantAnimator.h" #include "QskAspect.h" -#include +#include class QskControl; class QskAnimationHint; @@ -26,7 +26,7 @@ public: void setAspect( QskAspect::Aspect ); QskAspect::Aspect aspect() const; - void setControl( QskControl* control ); + void setControl( QskControl* ); QskControl* control() const; virtual void advance( qreal value ) override; diff --git a/src/controls/QskInputGrabber.cpp b/src/controls/QskInputGrabber.cpp index 9faf90e1..1b5997b6 100644 --- a/src/controls/QskInputGrabber.cpp +++ b/src/controls/QskInputGrabber.cpp @@ -5,8 +5,8 @@ #include "QskInputGrabber.h" #include "QskWindow.h" -#include "QskQuick.h" -#include + +#include QSK_QT_PRIVATE_BEGIN #include diff --git a/src/controls/QskListViewSkinlet.cpp b/src/controls/QskListViewSkinlet.cpp index 56b86fec..a60fcf41 100644 --- a/src/controls/QskListViewSkinlet.cpp +++ b/src/controls/QskListViewSkinlet.cpp @@ -5,17 +5,13 @@ #include "QskListViewSkinlet.h" #include "QskListView.h" -#include "QskAspect.h" -#include "QskTextOptions.h" -#include "QskTextNode.h" -#include "QskGraphic.h" -#include "QskGraphicNode.h" #include "QskColorFilter.h" +#include "QskGraphic.h" -#include -#include -#include -#include +#include +#include +#include +#include class QskListViewNode final : public QSGTransformNode { diff --git a/src/controls/QskObjectTree.cpp b/src/controls/QskObjectTree.cpp index 56055db2..a0f961fd 100644 --- a/src/controls/QskObjectTree.cpp +++ b/src/controls/QskObjectTree.cpp @@ -4,9 +4,10 @@ *****************************************************************************/ #include "QskObjectTree.h" -#include -#include -#include + +#include +#include +#include bool QskObjectTree::isRoot( const QObject* object ) { diff --git a/src/controls/QskObjectTree.h b/src/controls/QskObjectTree.h index 257b55c0..dd561059 100644 --- a/src/controls/QskObjectTree.h +++ b/src/controls/QskObjectTree.h @@ -10,7 +10,7 @@ #include "QskControl.h" #include "QskWindow.h" -#include +#include namespace QskObjectTree { diff --git a/src/controls/QskPageIndicator.cpp b/src/controls/QskPageIndicator.cpp index 49911e96..61c860f9 100644 --- a/src/controls/QskPageIndicator.cpp +++ b/src/controls/QskPageIndicator.cpp @@ -4,7 +4,6 @@ *****************************************************************************/ #include "QskPageIndicator.h" -#include "QskPageIndicatorSkinlet.h" #include "QskAspect.h" QSK_SUBCONTROL( QskPageIndicator, Panel ) diff --git a/src/controls/QskPanGestureRecognizer.cpp b/src/controls/QskPanGestureRecognizer.cpp index 79f1988f..a7468019 100644 --- a/src/controls/QskPanGestureRecognizer.cpp +++ b/src/controls/QskPanGestureRecognizer.cpp @@ -2,10 +2,10 @@ #include "QskGesture.h" #include "QskEvent.h" -#include -#include -#include -#include +#include +#include +#include +#include static inline qreal qskDistance( const QPointF& from, const QPointF& to, Qt::Orientations orientations ) diff --git a/src/controls/QskPopup.cpp b/src/controls/QskPopup.cpp index 60bb3cbf..e27683dd 100644 --- a/src/controls/QskPopup.cpp +++ b/src/controls/QskPopup.cpp @@ -8,10 +8,8 @@ #include "QskAspect.h" #include "QskWindow.h" #include "QskQuick.h" -#include QSK_QT_PRIVATE_BEGIN -#include #include QSK_QT_PRIVATE_END diff --git a/src/controls/QskPushButton.cpp b/src/controls/QskPushButton.cpp index a796903f..757ecc70 100644 --- a/src/controls/QskPushButton.cpp +++ b/src/controls/QskPushButton.cpp @@ -14,7 +14,7 @@ #include "QskSetup.h" #include "QskSkinlet.h" -#include +#include QSK_SUBCONTROL( QskPushButton, Panel ) QSK_SUBCONTROL( QskPushButton, Text ) diff --git a/src/controls/QskPushButtonSkinlet.cpp b/src/controls/QskPushButtonSkinlet.cpp index 06d373f2..5213974e 100644 --- a/src/controls/QskPushButtonSkinlet.cpp +++ b/src/controls/QskPushButtonSkinlet.cpp @@ -8,8 +8,8 @@ #include "QskGraphic.h" #include "QskTextOptions.h" -#include -#include +#include +#include QskPushButtonSkinlet::QskPushButtonSkinlet( QskSkin* skin ): Inherited( skin ) diff --git a/src/controls/QskQuick.cpp b/src/controls/QskQuick.cpp index 20e9db1c..f5c3949b 100644 --- a/src/controls/QskQuick.cpp +++ b/src/controls/QskQuick.cpp @@ -5,6 +5,7 @@ #include "QskQuick.h" #include "QskControl.h" +#include QSK_QT_PRIVATE_BEGIN #include diff --git a/src/controls/QskQuick.h b/src/controls/QskQuick.h index 7aecf63d..2489e746 100644 --- a/src/controls/QskQuick.h +++ b/src/controls/QskQuick.h @@ -7,7 +7,12 @@ #define QSK_QUICK_H 1 #include "QskGlobal.h" -#include +#include + +class QQuickItem; +class QSGNode; +class QRectF; +template class QList; /* Exporting methods from QQuickItemPrivate, that should be part diff --git a/src/controls/QskRangeControl.cpp b/src/controls/QskRangeControl.cpp index 3e005dd4..eb4277ad 100644 --- a/src/controls/QskRangeControl.cpp +++ b/src/controls/QskRangeControl.cpp @@ -4,7 +4,6 @@ *****************************************************************************/ #include "QskRangeControl.h" -#include "QskAspect.h" #include "QskFunctions.h" class QskRangeControl::PrivateData diff --git a/src/controls/QskRgbValue.h b/src/controls/QskRgbValue.h index 558a0dc9..650b7312 100644 --- a/src/controls/QskRgbValue.h +++ b/src/controls/QskRgbValue.h @@ -7,7 +7,7 @@ #define QSK_RGB_VALUE_H #include "QskGlobal.h" -#include +#include #define QSK_RGB_VALUES \ /* Web colors */ \ diff --git a/src/controls/QskScrollView.cpp b/src/controls/QskScrollView.cpp index 0d1a8bdf..23d30fbf 100644 --- a/src/controls/QskScrollView.cpp +++ b/src/controls/QskScrollView.cpp @@ -12,8 +12,6 @@ #include "QskAspect.h" #include "QskEvent.h" -#include - QSK_SUBCONTROL( QskScrollView, Panel ) QSK_SUBCONTROL( QskScrollView, Viewport ) QSK_SUBCONTROL( QskScrollView, HorizontalScrollBar ) diff --git a/src/controls/QskScrollViewSkinlet.cpp b/src/controls/QskScrollViewSkinlet.cpp index a252cc7d..42f0789e 100644 --- a/src/controls/QskScrollViewSkinlet.cpp +++ b/src/controls/QskScrollViewSkinlet.cpp @@ -7,10 +7,8 @@ #include "QskScrollView.h" #include "QskQuick.h" #include "QskAspect.h" -#include "QskFunctions.h" -#include -#include +#include static void qskAlignedHandle( qreal start, qreal end, qreal scrollBarLength, qreal minHandleLength, diff --git a/src/controls/QskSetup.cpp b/src/controls/QskSetup.cpp index 836e6a6a..3ed0736e 100644 --- a/src/controls/QskSetup.cpp +++ b/src/controls/QskSetup.cpp @@ -11,11 +11,9 @@ #include "QskWindow.h" #include "QskObjectTree.h" -#include -#include - -#include -#include +#include +#include +#include QskSetup* QskSetup::s_instance = nullptr; diff --git a/src/controls/QskShortcut.cpp b/src/controls/QskShortcut.cpp index f8030be2..31d171c7 100644 --- a/src/controls/QskShortcut.cpp +++ b/src/controls/QskShortcut.cpp @@ -5,9 +5,13 @@ #include "QskShortcut.h" #include "QskShortcutMap.h" -#include -#include + +#include +#include + +QSK_QT_PRIVATE_BEGIN #include +QSK_QT_PRIVATE_END static inline QShortcutMap& qskShortcutMap() { diff --git a/src/controls/QskShortcut.h b/src/controls/QskShortcut.h index 2b4c4e69..160081bc 100644 --- a/src/controls/QskShortcut.h +++ b/src/controls/QskShortcut.h @@ -8,9 +8,10 @@ #include "QskGlobal.h" -#include -#include -#include +#include +#include +#include + #include class QKeySequence; diff --git a/src/controls/QskShortcutMap.cpp b/src/controls/QskShortcutMap.cpp index 643e9e1a..36350ceb 100644 --- a/src/controls/QskShortcutMap.cpp +++ b/src/controls/QskShortcutMap.cpp @@ -4,14 +4,15 @@ *****************************************************************************/ #include "QskShortcutMap.h" -#include "QskControl.h" #include "QskQuick.h" #include "QskMetaInvokable.h" -#include -#include -#include +#include +#include + +QSK_QT_PRIVATE_BEGIN #include +QSK_QT_PRIVATE_END #include diff --git a/src/controls/QskShortcutMap.h b/src/controls/QskShortcutMap.h index 5395c69a..84095443 100644 --- a/src/controls/QskShortcutMap.h +++ b/src/controls/QskShortcutMap.h @@ -9,7 +9,7 @@ #include "QskGlobal.h" #include "QskMetaFunction.h" -#include +#include class QQuickItem; class QKeySequence; diff --git a/src/controls/QskSimpleListBox.cpp b/src/controls/QskSimpleListBox.cpp index f734aafe..c86db919 100644 --- a/src/controls/QskSimpleListBox.cpp +++ b/src/controls/QskSimpleListBox.cpp @@ -5,7 +5,8 @@ #include "QskSimpleListBox.h" #include "QskAspect.h" -#include + +#include static inline qreal qskMaxWidth( const QFont& font, const QStringList& list ) diff --git a/src/controls/QskSimpleListBox.h b/src/controls/QskSimpleListBox.h index 9972898d..633a0b67 100644 --- a/src/controls/QskSimpleListBox.h +++ b/src/controls/QskSimpleListBox.h @@ -8,7 +8,8 @@ #include "QskGlobal.h" #include "QskListView.h" -#include + +#include class QSK_EXPORT QskSimpleListBox : public QskListView { diff --git a/src/controls/QskSkin.cpp b/src/controls/QskSkin.cpp index 6fb80c87..fc610d18 100644 --- a/src/controls/QskSkin.cpp +++ b/src/controls/QskSkin.cpp @@ -9,13 +9,10 @@ #include "QskGraphic.h" #include "QskColorFilter.h" #include "QskGraphicProviderMap.h" -#include "QskSetup.h" #include "QskAnimationHint.h" #include "QskStandardSymbol.h" #include "QskSkinHintTable.h" -#include "QskFocusIndicator.h" - QSK_QT_PRIVATE_BEGIN #include QSK_QT_PRIVATE_END @@ -23,11 +20,7 @@ QSK_QT_PRIVATE_END #include #include -#include - -#include #include -#include #include #include "QskBox.h" diff --git a/src/controls/QskSkin.h b/src/controls/QskSkin.h index a89e5cca..0ba072b0 100644 --- a/src/controls/QskSkin.h +++ b/src/controls/QskSkin.h @@ -9,8 +9,8 @@ #include "QskGlobal.h" #include "QskAspect.h" -#include -#include +#include +#include #include #include diff --git a/src/controls/QskSkinFactory.h b/src/controls/QskSkinFactory.h index 6e9f25d1..11d445f7 100644 --- a/src/controls/QskSkinFactory.h +++ b/src/controls/QskSkinFactory.h @@ -7,7 +7,7 @@ #define QSK_SKIN_FACTORY_H #include "QskGlobal.h" -#include +#include class QskSkin; class QStringList; diff --git a/src/controls/QskSkinHintTable.h b/src/controls/QskSkinHintTable.h index cc2393cc..33d92ec3 100644 --- a/src/controls/QskSkinHintTable.h +++ b/src/controls/QskSkinHintTable.h @@ -15,11 +15,10 @@ #include "QskBoxBorderColors.h" #include "QskAnimationHint.h" -#include -#include +#include +#include #include -#include class QSK_EXPORT QskSkinHintTable { diff --git a/src/controls/QskSkinManager.cpp b/src/controls/QskSkinManager.cpp index 0c5d83d6..6ddb8f1e 100644 --- a/src/controls/QskSkinManager.cpp +++ b/src/controls/QskSkinManager.cpp @@ -6,14 +6,14 @@ #include "QskSkinManager.h" #include "QskSkinFactory.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include /* We could use QFactoryLoader, but as it is again a "private" class diff --git a/src/controls/QskSkinManager.h b/src/controls/QskSkinManager.h index 25592e9c..b681a0fd 100644 --- a/src/controls/QskSkinManager.h +++ b/src/controls/QskSkinManager.h @@ -7,7 +7,7 @@ #define QSK_SKIN_MANAGER_H #include "QskGlobal.h" -#include +#include #include class QskSkin; diff --git a/src/controls/QskSkinTransition.cpp b/src/controls/QskSkinTransition.cpp index bf002c92..5ae242d3 100644 --- a/src/controls/QskSkinTransition.cpp +++ b/src/controls/QskSkinTransition.cpp @@ -5,12 +5,12 @@ #include "QskColorFilter.h" #include "QskHintAnimator.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/controls/QskSkinTransition.h b/src/controls/QskSkinTransition.h index 16546a1e..775c0378 100644 --- a/src/controls/QskSkinTransition.h +++ b/src/controls/QskSkinTransition.h @@ -5,7 +5,6 @@ #include "QskAspect.h" #include "QskAnimationHint.h" -class QskAnimatorHint; class QskSkin; class QVariant; diff --git a/src/controls/QskSkinlet.cpp b/src/controls/QskSkinlet.cpp index 5d583c82..f87ddb54 100644 --- a/src/controls/QskSkinlet.cpp +++ b/src/controls/QskSkinlet.cpp @@ -6,8 +6,6 @@ #include "QskSkinlet.h" #include "QskAspect.h" -#include "QskSetup.h" -#include "QskSkin.h" #include "QskControl.h" #include "QskBoxShapeMetrics.h" #include "QskBoxBorderMetrics.h" @@ -22,11 +20,9 @@ #include "QskGraphicTextureFactory.h" #include "QskFunctions.h" -#include -#include -#include - -#include +#include +#include +#include static const int qskBackgroundRole = 254; static const int qskDebugRole = 253; diff --git a/src/controls/QskSkinlet.h b/src/controls/QskSkinlet.h index 4527b95e..943edea8 100644 --- a/src/controls/QskSkinlet.h +++ b/src/controls/QskSkinlet.h @@ -9,8 +9,9 @@ #include "QskGlobal.h" #include "QskAspect.h" -#include -#include +#include +#include + #include class QskSkin; diff --git a/src/controls/QskSkinnable.cpp b/src/controls/QskSkinnable.cpp index 0db5269e..263fc9dd 100644 --- a/src/controls/QskSkinnable.cpp +++ b/src/controls/QskSkinnable.cpp @@ -17,9 +17,7 @@ #include "QskColorFilter.h" #include "QskSkinTransition.h" -#include -#include -#include +#include #define DEBUG_MAP 0 #define DEBUG_ANIMATOR 0 diff --git a/src/controls/QskSkinnable.h b/src/controls/QskSkinnable.h index 69d43c0f..602ffc74 100644 --- a/src/controls/QskSkinnable.h +++ b/src/controls/QskSkinnable.h @@ -9,7 +9,7 @@ #include "QskGlobal.h" #include "QskAspect.h" -#include +#include #include typedef unsigned int QRgb; @@ -19,7 +19,6 @@ class QColor; class QFont; class QMarginsF; struct QMetaObject; -class QVariant; class QDebug; class QSGNode; diff --git a/src/controls/QskSlider.cpp b/src/controls/QskSlider.cpp index 7a5524ec..5824207b 100644 --- a/src/controls/QskSlider.cpp +++ b/src/controls/QskSlider.cpp @@ -7,8 +7,6 @@ #include "QskAspect.h" #include "QskAnimationHint.h" -#include - QSK_SUBCONTROL( QskSlider, Panel ) QSK_SUBCONTROL( QskSlider, Groove ) QSK_SUBCONTROL( QskSlider, Fill ) diff --git a/src/controls/QskStatusIndicator.cpp b/src/controls/QskStatusIndicator.cpp index 35cb3fa3..8b6a82b9 100644 --- a/src/controls/QskStatusIndicator.cpp +++ b/src/controls/QskStatusIndicator.cpp @@ -7,7 +7,8 @@ #include "QskGraphic.h" #include "QskColorFilter.h" #include "QskGraphicProvider.h" -#include + +#include QSK_SUBCONTROL( QskStatusIndicator, Graphic ) diff --git a/src/controls/QskStatusIndicatorSkinlet.cpp b/src/controls/QskStatusIndicatorSkinlet.cpp index 36d880b0..01aebbd5 100644 --- a/src/controls/QskStatusIndicatorSkinlet.cpp +++ b/src/controls/QskStatusIndicatorSkinlet.cpp @@ -6,10 +6,8 @@ #include "QskStatusIndicatorSkinlet.h" #include "QskStatusIndicator.h" #include "QskGraphic.h" -#include "QskGraphicTextureFactory.h" +#include "QskColorFilter.h" #include "QskAspect.h" -#include "QskSkin.h" -#include "QskTextureNode.h" #include "QskFunctions.h" QskStatusIndicatorSkinlet::QskStatusIndicatorSkinlet( QskSkin* skin ): diff --git a/src/controls/QskSubWindow.cpp b/src/controls/QskSubWindow.cpp index 19bae25a..66b8fac0 100644 --- a/src/controls/QskSubWindow.cpp +++ b/src/controls/QskSubWindow.cpp @@ -6,12 +6,8 @@ #include "QskSubWindow.h" #include "QskQuick.h" #include "QskAspect.h" -#include "QskSkin.h" #include "QskFunctions.h" -#include -#include - QSK_SUBCONTROL( QskSubWindow, Panel ) QSK_SUBCONTROL( QskSubWindow, TitleBar ) diff --git a/src/controls/QskSubWindowArea.cpp b/src/controls/QskSubWindowArea.cpp index 482a7ece..9420c0f9 100644 --- a/src/controls/QskSubWindowArea.cpp +++ b/src/controls/QskSubWindowArea.cpp @@ -8,7 +8,7 @@ #include "QskFunctions.h" #include "QskEvent.h" -#include +#include QSK_SUBCONTROL( QskSubWindowArea, Panel ) diff --git a/src/controls/QskSubWindowSkinlet.cpp b/src/controls/QskSubWindowSkinlet.cpp index eacff657..a610811f 100644 --- a/src/controls/QskSubWindowSkinlet.cpp +++ b/src/controls/QskSubWindowSkinlet.cpp @@ -8,7 +8,7 @@ #include "QskAspect.h" #include "QskBoxBorderMetrics.h" -#include +#include QskSubWindowSkinlet::QskSubWindowSkinlet( QskSkin* skin ): Inherited( skin ) diff --git a/src/controls/QskTabButton.cpp b/src/controls/QskTabButton.cpp index ea832dc1..64c6279e 100644 --- a/src/controls/QskTabButton.cpp +++ b/src/controls/QskTabButton.cpp @@ -8,8 +8,8 @@ #include "QskTextOptions.h" #include "QskSkinlet.h" -#include -#include +#include +#include QSK_SUBCONTROL( QskTabButton, Panel ) QSK_SUBCONTROL( QskTabButton, Text ) diff --git a/src/controls/QskTabButtonSkinlet.cpp b/src/controls/QskTabButtonSkinlet.cpp index 3000e306..21eb34e7 100644 --- a/src/controls/QskTabButtonSkinlet.cpp +++ b/src/controls/QskTabButtonSkinlet.cpp @@ -5,9 +5,6 @@ #include "QskTabButtonSkinlet.h" #include "QskTabButton.h" -#include "QskTextRenderer.h" -#include "QskTabBar.h" -#include "QskTabButton.h" #include "QskTextOptions.h" QskTabButtonSkinlet::QskTabButtonSkinlet( QskSkin* skin ): diff --git a/src/controls/QskTextLabel.cpp b/src/controls/QskTextLabel.cpp index 18d14706..5666d460 100644 --- a/src/controls/QskTextLabel.cpp +++ b/src/controls/QskTextLabel.cpp @@ -8,8 +8,8 @@ #include "QskTextOptions.h" #include "QskTextRenderer.h" -#include -#include +#include +#include QSK_SUBCONTROL( QskTextLabel, Text ) diff --git a/src/controls/QskVariantAnimator.cpp b/src/controls/QskVariantAnimator.cpp index a9294532..97492e1e 100644 --- a/src/controls/QskVariantAnimator.cpp +++ b/src/controls/QskVariantAnimator.cpp @@ -15,8 +15,11 @@ // Even if we don't use the standard Qt animation system we // use its registry of interpolators: why adding our own ... -#include +#include + +QSK_QT_PRIVATE_BEGIN #include +QSK_QT_PRIVATE_END #if 1 static void qskRegisterInterpolator() diff --git a/src/controls/QskVariantAnimator.h b/src/controls/QskVariantAnimator.h index 09003f76..4b3cb8e2 100644 --- a/src/controls/QskVariantAnimator.h +++ b/src/controls/QskVariantAnimator.h @@ -8,7 +8,7 @@ #include "QskGlobal.h" #include "QskAnimator.h" -#include +#include class QSK_EXPORT QskVariantAnimator : public QskAnimator { diff --git a/src/controls/QskWindow.cpp b/src/controls/QskWindow.cpp index 7600b74a..85289a4a 100644 --- a/src/controls/QskWindow.cpp +++ b/src/controls/QskWindow.cpp @@ -6,13 +6,11 @@ #include "QskWindow.h" #include "QskControl.h" #include "QskQuick.h" -#include "QskAspect.h" #include "QskSetup.h" -#include "QskSkin.h" #include "QskEvent.h" -#include -#include +#include +#include QSK_QT_PRIVATE_BEGIN #include diff --git a/src/controls/QskWindow.h b/src/controls/QskWindow.h index a316fc0c..51f0c53c 100644 --- a/src/controls/QskWindow.h +++ b/src/controls/QskWindow.h @@ -7,7 +7,7 @@ #define QSK_WINDOW_H 1 #include "QskGlobal.h" -#include +#include class QskWindowPrivate; class QskObjectAttributes; diff --git a/src/dialogs/QskDialog.cpp b/src/dialogs/QskDialog.cpp index 3f01284f..f6adaa00 100644 --- a/src/dialogs/QskDialog.cpp +++ b/src/dialogs/QskDialog.cpp @@ -14,11 +14,10 @@ #include "QskFocusIndicator.h" #include "QskStandardSymbol.h" -#include "QskAspect.h" -#include -#include -#include +#include +#include +#include static QskDialog::DialogCode qskExec( QskDialogWindow* dialogWindow ) { diff --git a/src/dialogs/QskDialog.h b/src/dialogs/QskDialog.h index cb968580..7f432fd1 100644 --- a/src/dialogs/QskDialog.h +++ b/src/dialogs/QskDialog.h @@ -7,7 +7,7 @@ #define QSK_DIALOG_H 1 #include "QskGlobal.h" -#include +#include #include class QString; diff --git a/src/dialogs/QskDialogButtonBox.cpp b/src/dialogs/QskDialogButtonBox.cpp index 620276d0..7b2835a7 100644 --- a/src/dialogs/QskDialogButtonBox.cpp +++ b/src/dialogs/QskDialogButtonBox.cpp @@ -8,11 +8,14 @@ #include "QskLinearBox.h" #include "QskSkin.h" -#include -#include +#include #include #include +QSK_QT_PRIVATE_BEGIN +#include +QSK_QT_PRIVATE_END + QSK_SUBCONTROL( QskDialogButtonBox, Panel ) static void qskSendEventTo( QObject* object, QEvent::Type type ) diff --git a/src/dialogs/QskDialogSubWindow.cpp b/src/dialogs/QskDialogSubWindow.cpp index 807f7b89..05064819 100644 --- a/src/dialogs/QskDialogSubWindow.cpp +++ b/src/dialogs/QskDialogSubWindow.cpp @@ -4,8 +4,9 @@ *****************************************************************************/ #include "QskDialogSubWindow.h" -#include -#include + +#include +#include static inline void qskSetRejectOnClose( QskDialogSubWindow* subWindow, bool on ) { diff --git a/src/dialogs/QskDialogWindow.cpp b/src/dialogs/QskDialogWindow.cpp index 8927da82..fdc0c1b2 100644 --- a/src/dialogs/QskDialogWindow.cpp +++ b/src/dialogs/QskDialogWindow.cpp @@ -4,8 +4,8 @@ *****************************************************************************/ #include "QskDialogWindow.h" -#include -#include +#include +#include class QskDialogWindow::PrivateData { diff --git a/src/dialogs/QskInputSubWindow.cpp b/src/dialogs/QskInputSubWindow.cpp index 6385e533..55ec2c2a 100644 --- a/src/dialogs/QskInputSubWindow.cpp +++ b/src/dialogs/QskInputSubWindow.cpp @@ -13,7 +13,8 @@ #include "QskLinearBox.h" #include "QskSkin.h" -#include +#include +#include namespace { diff --git a/src/graphic/QskColorFilter.cpp b/src/graphic/QskColorFilter.cpp index 2d22cee4..cab4004d 100644 --- a/src/graphic/QskColorFilter.cpp +++ b/src/graphic/QskColorFilter.cpp @@ -6,9 +6,9 @@ #include "QskColorFilter.h" #include "QskRgbValue.h" -#include -#include -#include +#include +#include +#include static inline QRgb qskSubstitutedRgb( const QVector< QPair< QRgb, QRgb > >& substitions, QRgb rgba ) @@ -223,6 +223,8 @@ QVariant QskColorFilter::interpolate( const QskColorFilter &from, #ifndef QT_NO_DEBUG_STREAM +#include + QDebug operator<<( QDebug debug, const QskColorFilter& filter ) { const QVector< QPair< QRgb, QRgb > >& s = filter.substitutions(); diff --git a/src/graphic/QskColorFilter.h b/src/graphic/QskColorFilter.h index 479ffc8c..359e4351 100644 --- a/src/graphic/QskColorFilter.h +++ b/src/graphic/QskColorFilter.h @@ -8,10 +8,10 @@ #include "QskGlobal.h" -#include -#include -#include -#include +#include +#include +#include +#include class QPen; class QBrush; diff --git a/src/graphic/QskGraphic.cpp b/src/graphic/QskGraphic.cpp index f05d3486..5a86384e 100644 --- a/src/graphic/QskGraphic.cpp +++ b/src/graphic/QskGraphic.cpp @@ -8,14 +8,13 @@ #include "QskColorFilter.h" #include "QskPainterCommand.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include static inline qreal qskDevicePixelRatio() { diff --git a/src/graphic/QskGraphic.h b/src/graphic/QskGraphic.h index 86f89938..77c207d3 100644 --- a/src/graphic/QskGraphic.h +++ b/src/graphic/QskGraphic.h @@ -7,17 +7,19 @@ #define QSK_GRAPHIC_H #include "QskGlobal.h" -#include -#include -#include -#include + +#include +#include +#include class QskPainterCommand; class QskColorFilter; +class QskGraphicPaintEngine; class QImage; class QPixmap; class QPainterPath; -class QskGraphicPaintEngine; +class QPaintEngine; +class QPaintEngineState; class QSK_EXPORT QskGraphic : public QPaintDevice { diff --git a/src/graphic/QskGraphicIO.cpp b/src/graphic/QskGraphicIO.cpp index cb12902c..df702233 100644 --- a/src/graphic/QskGraphicIO.cpp +++ b/src/graphic/QskGraphicIO.cpp @@ -6,10 +6,10 @@ #include "QskGraphicIO.h" #include "QskGraphic.h" #include "QskPainterCommand.h" -#include -#include -#include -#include +#include +#include +#include +#include #include static const char qskMagicNumber[] = "QSKG"; diff --git a/src/graphic/QskGraphicImageProvider.h b/src/graphic/QskGraphicImageProvider.h index c8a7225c..3ffd6745 100644 --- a/src/graphic/QskGraphicImageProvider.h +++ b/src/graphic/QskGraphicImageProvider.h @@ -7,7 +7,7 @@ #define QSK_GRAPHIC_IMAGE_PROVIDER_H #include "QskGlobal.h" -#include +#include class QskGraphic; diff --git a/src/graphic/QskGraphicPaintEngine.h b/src/graphic/QskGraphicPaintEngine.h index 0889e813..cc53e066 100644 --- a/src/graphic/QskGraphicPaintEngine.h +++ b/src/graphic/QskGraphicPaintEngine.h @@ -7,7 +7,7 @@ #define QSK_PAINT_ENGINE_H #include "QskGlobal.h" -#include +#include class QSK_EXPORT QskGraphicPaintEngine : public QPaintEngine { diff --git a/src/graphic/QskGraphicProvider.cpp b/src/graphic/QskGraphicProvider.cpp index 50738587..cafabd63 100644 --- a/src/graphic/QskGraphicProvider.cpp +++ b/src/graphic/QskGraphicProvider.cpp @@ -7,11 +7,9 @@ #include "QskGraphic.h" #include "QskSetup.h" -#include -#include -#include -#include -#include +#include +#include +#include class QskGraphicProvider::PrivateData { diff --git a/src/graphic/QskGraphicProvider.h b/src/graphic/QskGraphicProvider.h index 11e94fe2..e7fc7cbc 100644 --- a/src/graphic/QskGraphicProvider.h +++ b/src/graphic/QskGraphicProvider.h @@ -7,7 +7,7 @@ #define QSK_GRAPHIC_PROVIDER_H #include "QskGlobal.h" -#include +#include #include class QskGraphic; diff --git a/src/graphic/QskGraphicProviderMap.cpp b/src/graphic/QskGraphicProviderMap.cpp index 221eeda0..781f4abb 100644 --- a/src/graphic/QskGraphicProviderMap.cpp +++ b/src/graphic/QskGraphicProviderMap.cpp @@ -6,11 +6,9 @@ #include "QskGraphicProviderMap.h" #include "QskGraphicProvider.h" -#include -#include -#include - -#include +#include +#include +#include static inline QString qskKey( const QString& providerId ) { diff --git a/src/graphic/QskGraphicProviderMap.h b/src/graphic/QskGraphicProviderMap.h index ab4a3f49..9a5c9dda 100644 --- a/src/graphic/QskGraphicProviderMap.h +++ b/src/graphic/QskGraphicProviderMap.h @@ -12,7 +12,7 @@ class QskGraphicProvider; class QString; -class QskGraphicProviderMap +class QSK_EXPORT QskGraphicProviderMap { public: QskGraphicProviderMap(); diff --git a/src/graphic/QskGraphicTextureFactory.cpp b/src/graphic/QskGraphicTextureFactory.cpp index 82bf370d..18faac79 100644 --- a/src/graphic/QskGraphicTextureFactory.cpp +++ b/src/graphic/QskGraphicTextureFactory.cpp @@ -5,10 +5,10 @@ #include "QskGraphicTextureFactory.h" -#include -#include -#include -#include +#include +#include +#include +#include // VS2012+ disable keyword macroizing unless _ALLOW_KEYWORD_MACROS is set #ifdef _MSC_VER @@ -18,13 +18,13 @@ #endif #define private public -#include +#include #undef private #include -#include -#include +#include +#include static uint qskTextureFBO( const QRect& rect, Qt::AspectRatioMode scalingMode, diff --git a/src/graphic/QskGraphicTextureFactory.h b/src/graphic/QskGraphicTextureFactory.h index 7c6618a6..9442f35b 100644 --- a/src/graphic/QskGraphicTextureFactory.h +++ b/src/graphic/QskGraphicTextureFactory.h @@ -9,9 +9,7 @@ #include "QskGlobal.h" #include "QskGraphic.h" #include "QskColorFilter.h" -#include - -class QskGraphic; +#include class QSK_EXPORT QskGraphicTextureFactory : public QQuickTextureFactory { diff --git a/src/graphic/QskPainterCommand.h b/src/graphic/QskPainterCommand.h index d970b637..ab78c615 100644 --- a/src/graphic/QskPainterCommand.h +++ b/src/graphic/QskPainterCommand.h @@ -7,12 +7,10 @@ #define QSK_PAINTER_COMMAND_H #include "QskGlobal.h" -#include -#include -#include -#include - -class QPainterPath; +#include +#include +#include +#include class QSK_EXPORT QskPainterCommand { diff --git a/src/graphic/QskStandardSymbol.cpp b/src/graphic/QskStandardSymbol.cpp index eb57c870..6153f019 100644 --- a/src/graphic/QskStandardSymbol.cpp +++ b/src/graphic/QskStandardSymbol.cpp @@ -5,7 +5,7 @@ #include "QskStandardSymbol.h" #include "QskGraphic.h" -#include +#include static void qskOkGraphic( QPainter* painter ) { diff --git a/src/graphic/QskStandardSymbol.h b/src/graphic/QskStandardSymbol.h index 18b7da2a..5b2a8a0c 100644 --- a/src/graphic/QskStandardSymbol.h +++ b/src/graphic/QskStandardSymbol.h @@ -7,7 +7,7 @@ #define QSK_STANDARD_SYMBOL_H 1 #include "QskGlobal.h" -#include +#include class QskGraphic; diff --git a/src/inputpanel/QskInputContext.cpp b/src/inputpanel/QskInputContext.cpp index 2ca5784b..d72b873f 100644 --- a/src/inputpanel/QskInputContext.cpp +++ b/src/inputpanel/QskInputContext.cpp @@ -11,12 +11,11 @@ #include "QskDialog.h" #include "QskPopup.h" #include "QskWindow.h" -#include "QskEvent.h" #include "QskQuick.h" -#include -#include -#include +#include +#include +#include QSK_QT_PRIVATE_BEGIN #include diff --git a/src/inputpanel/QskInputContext.h b/src/inputpanel/QskInputContext.h index 990cf58d..5aae987d 100644 --- a/src/inputpanel/QskInputContext.h +++ b/src/inputpanel/QskInputContext.h @@ -7,9 +7,11 @@ #define QSK_INPUT_CONTEXT_H #include "QskGlobal.h" -#include -#include -#include + +#include +#include +#include + #include class QskTextPredictor; diff --git a/src/inputpanel/QskInputPanel.cpp b/src/inputpanel/QskInputPanel.cpp index 810f9cdf..fae0a65a 100644 --- a/src/inputpanel/QskInputPanel.cpp +++ b/src/inputpanel/QskInputPanel.cpp @@ -7,8 +7,8 @@ #include "QskInputContext.h" #include "QskTextPredictor.h" -#include -#include +#include +#include static inline QQuickItem* qskReceiverItem( const QskInputPanel* panel ) { diff --git a/src/inputpanel/QskInputPanelBox.cpp b/src/inputpanel/QskInputPanelBox.cpp index e7b122d0..378b7e12 100644 --- a/src/inputpanel/QskInputPanelBox.cpp +++ b/src/inputpanel/QskInputPanelBox.cpp @@ -10,9 +10,8 @@ #include "QskTextLabel.h" #include "QskLinearBox.h" -#include -#include -#include +#include +#include namespace { diff --git a/src/inputpanel/QskInputPredictionBar.cpp b/src/inputpanel/QskInputPredictionBar.cpp index 5066dabc..8fc6f6ba 100644 --- a/src/inputpanel/QskInputPredictionBar.cpp +++ b/src/inputpanel/QskInputPredictionBar.cpp @@ -8,8 +8,8 @@ #include "QskLinearBox.h" #include "QskTextOptions.h" -#include -#include +#include +#include QSK_SUBCONTROL( QskInputPredictionBar, Panel ) QSK_SUBCONTROL( QskInputPredictionBar, ButtonPanel ) diff --git a/src/inputpanel/QskTextPredictor.h b/src/inputpanel/QskTextPredictor.h index 292e0c3f..e4b582cb 100644 --- a/src/inputpanel/QskTextPredictor.h +++ b/src/inputpanel/QskTextPredictor.h @@ -7,7 +7,7 @@ #define QSK_TEXT_PREDICTOR_H #include -#include +#include class QStringList; diff --git a/src/inputpanel/QskVirtualKeyboard.cpp b/src/inputpanel/QskVirtualKeyboard.cpp index ea8854f7..502be34b 100644 --- a/src/inputpanel/QskVirtualKeyboard.cpp +++ b/src/inputpanel/QskVirtualKeyboard.cpp @@ -7,9 +7,9 @@ #include "QskPushButton.h" #include "QskTextOptions.h" -#include -#include -#include +#include +#include +#include namespace { diff --git a/src/layouts/QskGridBox.cpp b/src/layouts/QskGridBox.cpp index 8ea6c0ce..34607ca9 100644 --- a/src/layouts/QskGridBox.cpp +++ b/src/layouts/QskGridBox.cpp @@ -6,8 +6,6 @@ #include "QskGridBox.h" #include "QskLayoutItem.h" #include "QskLayoutEngine.h" -#include -#include class QskGridBox::PrivateData { diff --git a/src/layouts/QskIndexedLayoutBox.cpp b/src/layouts/QskIndexedLayoutBox.cpp index a6db264f..3441ca1f 100644 --- a/src/layouts/QskIndexedLayoutBox.cpp +++ b/src/layouts/QskIndexedLayoutBox.cpp @@ -8,8 +8,6 @@ #include "QskLayoutEngine.h" #include "QskLayoutItem.h" -#include - class QskIndexedLayoutBox::PrivateData { public: diff --git a/src/layouts/QskLayout.cpp b/src/layouts/QskLayout.cpp index d7c824ef..53edc76d 100644 --- a/src/layouts/QskLayout.cpp +++ b/src/layouts/QskLayout.cpp @@ -6,12 +6,8 @@ #include "QskLayout.h" #include "QskLayoutItem.h" #include "QskLayoutEngine.h" -#include "QskSizePolicy.h" -#include "QskWindow.h" #include "QskEvent.h" -#include - class QskLayout::PrivateData { public: diff --git a/src/layouts/QskLayoutConstraint.cpp b/src/layouts/QskLayoutConstraint.cpp index bbe30b3d..6f626cf7 100644 --- a/src/layouts/QskLayoutConstraint.cpp +++ b/src/layouts/QskLayoutConstraint.cpp @@ -7,8 +7,6 @@ #include "QskControl.h" #include "QskSizePolicy.h" -#include - static inline qreal qskHintFor( const QQuickItem* item, const char* method, qreal widthOrHeight ) { diff --git a/src/layouts/QskLayoutConstraint.h b/src/layouts/QskLayoutConstraint.h index 6bac5145..53638426 100644 --- a/src/layouts/QskLayoutConstraint.h +++ b/src/layouts/QskLayoutConstraint.h @@ -7,7 +7,7 @@ #define QSK_LAYOUT_CONSTRAINT_H #include "QskGlobal.h" -#include +#include #include class QskSizePolicy; diff --git a/src/layouts/QskLayoutEngine.cpp b/src/layouts/QskLayoutEngine.cpp index 5e0185ab..cd352e21 100644 --- a/src/layouts/QskLayoutEngine.cpp +++ b/src/layouts/QskLayoutEngine.cpp @@ -5,7 +5,6 @@ #include "QskLayoutEngine.h" #include "QskLayoutItem.h" -#include static inline bool qskIsColliding( const QskLayoutEngine* engine, QskLayoutItem* item ) diff --git a/src/layouts/QskLayoutItem.h b/src/layouts/QskLayoutItem.h index e828bbea..92fed43c 100644 --- a/src/layouts/QskLayoutItem.h +++ b/src/layouts/QskLayoutItem.h @@ -7,7 +7,6 @@ #define QSK_LAYOUT_ITEM_H #include "QskGlobal.h" -#include "QskSizePolicy.h" QSK_QT_PRIVATE_BEGIN /* diff --git a/src/layouts/QskLinearBox.cpp b/src/layouts/QskLinearBox.cpp index 92eb4c9f..58523aec 100644 --- a/src/layouts/QskLinearBox.cpp +++ b/src/layouts/QskLinearBox.cpp @@ -7,7 +7,7 @@ #include "QskLayoutItem.h" #include "QskLayoutEngine.h" -#include +#include class QskLinearBox::PrivateData { diff --git a/src/layouts/QskStackBox.cpp b/src/layouts/QskStackBox.cpp index 10b051a4..b29ea5f5 100644 --- a/src/layouts/QskStackBox.cpp +++ b/src/layouts/QskStackBox.cpp @@ -9,7 +9,7 @@ #include "QskLayoutEngine.h" #include "QskLayoutConstraint.h" -#include +#include class QskStackBox::PrivateData { diff --git a/src/layouts/QskStackBoxAnimator.h b/src/layouts/QskStackBoxAnimator.h index 957747aa..bdba8aaf 100644 --- a/src/layouts/QskStackBoxAnimator.h +++ b/src/layouts/QskStackBoxAnimator.h @@ -9,7 +9,7 @@ #include "QskGlobal.h" #include "QskNamespace.h" #include "QskAnimator.h" -#include +#include class QskStackBox; class QskLayoutItem; diff --git a/src/nodes/QskBoxClipNode.h b/src/nodes/QskBoxClipNode.h index 38954408..b597d624 100644 --- a/src/nodes/QskBoxClipNode.h +++ b/src/nodes/QskBoxClipNode.h @@ -7,7 +7,7 @@ #define QSK_BOX_CLIP_NODE_H #include "QskGlobal.h" -#include +#include class QskBoxShapeMetrics; class QskBoxBorderMetrics; diff --git a/src/nodes/QskBoxNode.cpp b/src/nodes/QskBoxNode.cpp index f083f5ff..41d0193f 100644 --- a/src/nodes/QskBoxNode.cpp +++ b/src/nodes/QskBoxNode.cpp @@ -10,9 +10,9 @@ #include "QskBoxBorderColors.h" #include "QskGradient.h" -#include -#include -#include +#include +#include +#include Q_GLOBAL_STATIC( QSGVertexColorMaterial, qskMaterialVertex ) diff --git a/src/nodes/QskBoxNode.h b/src/nodes/QskBoxNode.h index db437987..ea497a1b 100644 --- a/src/nodes/QskBoxNode.h +++ b/src/nodes/QskBoxNode.h @@ -7,14 +7,12 @@ #define QSK_BOX_NODE_H #include "QskGlobal.h" +#include class QskBoxShapeMetrics; class QskBoxBorderMetrics; class QskBoxBorderColors; class QskGradient; -class QRectF; - -#include class QSK_EXPORT QskBoxNode : public QSGGeometryNode { diff --git a/src/nodes/QskBoxRenderer.h b/src/nodes/QskBoxRenderer.h index 7b470804..3498706f 100644 --- a/src/nodes/QskBoxRenderer.h +++ b/src/nodes/QskBoxRenderer.h @@ -9,7 +9,7 @@ #include "QskGlobal.h" #include "QskBoxShapeMetrics.h" -#include +#include class QskBoxBorderMetrics; class QskBoxBorderColors; diff --git a/src/nodes/QskBoxRendererDEllipse.cpp b/src/nodes/QskBoxRendererDEllipse.cpp index 3d3f9598..d87ff006 100644 --- a/src/nodes/QskBoxRendererDEllipse.cpp +++ b/src/nodes/QskBoxRendererDEllipse.cpp @@ -8,7 +8,7 @@ #include "QskBoxRendererColorMap.h" #include "QskGradient.h" -#include +#include namespace { diff --git a/src/nodes/QskBoxRendererEllipse.cpp b/src/nodes/QskBoxRendererEllipse.cpp index d42b6572..c969397f 100644 --- a/src/nodes/QskBoxRendererEllipse.cpp +++ b/src/nodes/QskBoxRendererEllipse.cpp @@ -11,8 +11,8 @@ #include "QskBoxBorderColors.h" #include "QskBoxShapeMetrics.h" -#include -#include +#include +#include using namespace QskVertex; diff --git a/src/nodes/QskBoxRendererRect.cpp b/src/nodes/QskBoxRendererRect.cpp index a639eeae..95009a54 100644 --- a/src/nodes/QskBoxRendererRect.cpp +++ b/src/nodes/QskBoxRendererRect.cpp @@ -5,15 +5,12 @@ #include "QskBoxRenderer.h" #include "QskBoxRendererColorMap.h" -#include "QskBoxShapeMetrics.h" #include "QskBoxBorderMetrics.h" #include "QskBoxBorderColors.h" #include "QskGradient.h" #include "QskFunctions.h" #include "QskVertex.h" -#include - using namespace QskVertex; namespace diff --git a/src/nodes/QskPlainTextRenderer.cpp b/src/nodes/QskPlainTextRenderer.cpp index e95bd083..6c674a96 100644 --- a/src/nodes/QskPlainTextRenderer.cpp +++ b/src/nodes/QskPlainTextRenderer.cpp @@ -7,11 +7,9 @@ #include "QskTextColors.h" #include "QskTextOptions.h" -#include -#include -#include -#include -#include +#include +#include +#include QSK_QT_PRIVATE_BEGIN #include diff --git a/src/nodes/QskPlainTextRenderer.h b/src/nodes/QskPlainTextRenderer.h index 0a5140c1..839f12a3 100644 --- a/src/nodes/QskPlainTextRenderer.h +++ b/src/nodes/QskPlainTextRenderer.h @@ -8,7 +8,7 @@ #include "QskGlobal.h" #include "QskNamespace.h" -#include +#include class QskTextColors; class QskTextOptions; diff --git a/src/nodes/QskRichTextRenderer.cpp b/src/nodes/QskRichTextRenderer.cpp index f05d3123..64b19dfb 100644 --- a/src/nodes/QskRichTextRenderer.cpp +++ b/src/nodes/QskRichTextRenderer.cpp @@ -7,19 +7,17 @@ #include "QskTextColors.h" #include "QskTextOptions.h" -#include -#include -#include -#include -#include +#include +#include +#include + +class QQuickWindow; QSK_QT_PRIVATE_BEGIN #include #include QSK_QT_PRIVATE_END -#include - namespace { class TextItem final : public QQuickText diff --git a/src/nodes/QskRichTextRenderer.h b/src/nodes/QskRichTextRenderer.h index 63c668b2..17bb6ff1 100644 --- a/src/nodes/QskRichTextRenderer.h +++ b/src/nodes/QskRichTextRenderer.h @@ -8,7 +8,7 @@ #include "QskGlobal.h" #include "QskNamespace.h" -#include +#include class QskTextColors; class QskTextOptions; diff --git a/src/nodes/QskTextNode.cpp b/src/nodes/QskTextNode.cpp index 927674a3..54a856cf 100644 --- a/src/nodes/QskTextNode.cpp +++ b/src/nodes/QskTextNode.cpp @@ -8,9 +8,8 @@ #include "QskTextColors.h" #include "QskTextRenderer.h" -#include -#include -#include +#include +#include static inline uint qskHash( const QString& text, const QSizeF& size, const QFont& font, diff --git a/src/nodes/QskTextNode.h b/src/nodes/QskTextNode.h index 41498103..815304f2 100644 --- a/src/nodes/QskTextNode.h +++ b/src/nodes/QskTextNode.h @@ -9,8 +9,8 @@ #include "QskGlobal.h" #include "QskNamespace.h" -#include -#include +#include +#include class QskTextOptions; class QskTextColors; diff --git a/src/nodes/QskTextRenderer.cpp b/src/nodes/QskTextRenderer.cpp index f22380a0..e69cae8b 100644 --- a/src/nodes/QskTextRenderer.cpp +++ b/src/nodes/QskTextRenderer.cpp @@ -8,7 +8,7 @@ #include "QskPlainTextRenderer.h" #include "QskTextOptions.h" -#include +#include /* Since Qt 5.7 QQuickTextNode is exported as Q_QUICK_PRIVATE_EXPORT diff --git a/src/nodes/QskTextRenderer.h b/src/nodes/QskTextRenderer.h index 25caaede..7415c230 100644 --- a/src/nodes/QskTextRenderer.h +++ b/src/nodes/QskTextRenderer.h @@ -8,7 +8,7 @@ #include "QskGlobal.h" #include "QskNamespace.h" -#include +#include class QskTextColors; class QskTextOptions; diff --git a/src/nodes/QskTextureNode.cpp b/src/nodes/QskTextureNode.cpp index ee7d829f..19867336 100644 --- a/src/nodes/QskTextureNode.cpp +++ b/src/nodes/QskTextureNode.cpp @@ -1,19 +1,17 @@ #include "QskTextureNode.h" -#include -#include -#include -#include +#include +#include +#include #include #if 1 -#include -#include -#include -#include -#include +#include +#include +#include +#include static inline qreal qskDevicePixelRatio() { diff --git a/src/nodes/QskTextureNode.h b/src/nodes/QskTextureNode.h index 4714d90a..8f25a66e 100644 --- a/src/nodes/QskTextureNode.h +++ b/src/nodes/QskTextureNode.h @@ -8,8 +8,8 @@ #include "QskGlobal.h" -#include -#include +#include +#include class QskTextureNodePrivate; diff --git a/src/nodes/QskVertex.cpp b/src/nodes/QskVertex.cpp index 756b8ad5..2218cd07 100644 --- a/src/nodes/QskVertex.cpp +++ b/src/nodes/QskVertex.cpp @@ -9,6 +9,8 @@ using namespace QskVertex; #ifndef QT_NO_DEBUG_STREAM +#include + QDebug operator<<( QDebug debug, Color color ) { QDebugStateSaver saver( debug ); diff --git a/src/nodes/QskVertex.h b/src/nodes/QskVertex.h index f427095a..c9073304 100644 --- a/src/nodes/QskVertex.h +++ b/src/nodes/QskVertex.h @@ -8,9 +8,8 @@ #include "QskGlobal.h" -#include -#include -#include +#include +#include namespace QskVertex { diff --git a/tools/svg2qvg/main.cpp b/tools/svg2qvg/main.cpp index 317215b4..5d03544e 100644 --- a/tools/svg2qvg/main.cpp +++ b/tools/svg2qvg/main.cpp @@ -6,11 +6,12 @@ #include #include #include +#include #include static void usage( const char* appName ) { - qDebug() << "usage: " << appName << "svgfile qvgfile"; + qWarning() << "usage: " << appName << "svgfile qvgfile"; } int main( int argc, char* argv[] )