diff --git a/src/common/QskAspect.h b/src/common/QskAspect.h index 7064025f..953ca7ed 100644 --- a/src/common/QskAspect.h +++ b/src/common/QskAspect.h @@ -6,11 +6,9 @@ #ifndef QSK_ASPECT_H #define QSK_ASPECT_H -#include "QskGlobal.h" #include "QskFlags.h" #include - #include #ifdef Q_MOC_RUN diff --git a/src/common/QskBoxBorderColors.h b/src/common/QskBoxBorderColors.h index 445b235b..275b9538 100644 --- a/src/common/QskBoxBorderColors.h +++ b/src/common/QskBoxBorderColors.h @@ -6,7 +6,6 @@ #ifndef QSK_BOX_BORDER_COLORS_H #define QSK_BOX_BORDER_COLORS_H -#include "QskGlobal.h" #include "QskNamespace.h" #include diff --git a/src/common/QskBoxBorderMetrics.h b/src/common/QskBoxBorderMetrics.h index 7a87bbef..f91113ac 100644 --- a/src/common/QskBoxBorderMetrics.h +++ b/src/common/QskBoxBorderMetrics.h @@ -6,7 +6,6 @@ #ifndef QSK_BOX_BORDER_METRICS_H #define QSK_BOX_BORDER_METRICS_H -#include "QskGlobal.h" #include "QskMargins.h" #include diff --git a/src/common/QskCorner.h b/src/common/QskCorner.h index 978bdf72..f6e5a14e 100644 --- a/src/common/QskCorner.h +++ b/src/common/QskCorner.h @@ -6,7 +6,6 @@ #ifndef QSK_CORNER_H #define QSK_CORNER_H -#include "QskGlobal.h" #include "QskBoxShapeMetrics.h" #include diff --git a/src/common/QskMetaFunction.cpp b/src/common/QskMetaFunction.cpp index 768a8dbc..717d0f77 100644 --- a/src/common/QskMetaFunction.cpp +++ b/src/common/QskMetaFunction.cpp @@ -3,7 +3,6 @@ * This file may be used under the terms of the QSkinny License, Version 1.0 *****************************************************************************/ -#include "QskGlobal.h" #include "QskMetaFunction.h" #include diff --git a/src/common/QskSizePolicy.h b/src/common/QskSizePolicy.h index d59e529c..9f5c8028 100644 --- a/src/common/QskSizePolicy.h +++ b/src/common/QskSizePolicy.h @@ -7,7 +7,6 @@ #define QSK_SIZE_POLICY_H_ #include "QskGlobal.h" - #include class QDebug; diff --git a/src/common/QskTextOptions.h b/src/common/QskTextOptions.h index db15718b..4f21dbb5 100644 --- a/src/common/QskTextOptions.h +++ b/src/common/QskTextOptions.h @@ -7,6 +7,7 @@ #define QSK_TEXT_OPTIONS_H #include "QskGlobal.h" + #include #include diff --git a/src/controls/QskAbstractButton.h b/src/controls/QskAbstractButton.h index 11e40468..f4ca1e5a 100644 --- a/src/controls/QskAbstractButton.h +++ b/src/controls/QskAbstractButton.h @@ -6,7 +6,6 @@ #ifndef QSK_ABSTRACT_BUTTON_H #define QSK_ABSTRACT_BUTTON_H -#include "QskGlobal.h" #include "QskControl.h" class QSK_EXPORT QskAbstractButton : public QskControl diff --git a/src/controls/QskAnimator.h b/src/controls/QskAnimator.h index 645bf483..751ea792 100644 --- a/src/controls/QskAnimator.h +++ b/src/controls/QskAnimator.h @@ -7,6 +7,7 @@ #define QSK_ANIMATOR_H #include "QskGlobal.h" + #include #include diff --git a/src/controls/QskBoxSkinlet.h b/src/controls/QskBoxSkinlet.h index 086c680d..95ed4371 100644 --- a/src/controls/QskBoxSkinlet.h +++ b/src/controls/QskBoxSkinlet.h @@ -6,7 +6,6 @@ #ifndef QSK_BOX_SKINLET_H #define QSK_BOX_SKINLET_H -#include "QskGlobal.h" #include "QskSkinlet.h" class QSK_EXPORT QskBoxSkinlet : public QskSkinlet diff --git a/src/controls/QskControl.h b/src/controls/QskControl.h index 06687d82..11039228 100644 --- a/src/controls/QskControl.h +++ b/src/controls/QskControl.h @@ -6,7 +6,6 @@ #ifndef QSK_CONTROL_H #define QSK_CONTROL_H 1 -#include "QskGlobal.h" #include "QskAspect.h" #include "QskGradient.h" #include "QskSizePolicy.h" diff --git a/src/controls/QskEvent.h b/src/controls/QskEvent.h index 6cbb849e..51f6a417 100644 --- a/src/controls/QskEvent.h +++ b/src/controls/QskEvent.h @@ -6,7 +6,6 @@ #ifndef QSK_EVENT_H #define QSK_EVENT_H -#include "QskGlobal.h" #include "QskAspect.h" #include diff --git a/src/controls/QskFlickAnimator.h b/src/controls/QskFlickAnimator.h index 5a2640cb..92dce7d3 100644 --- a/src/controls/QskFlickAnimator.h +++ b/src/controls/QskFlickAnimator.h @@ -6,7 +6,6 @@ #ifndef QSK_FLICK_ANIMATOR_H #define QSK_FLICK_ANIMATOR_H 1 -#include "QskGlobal.h" #include "QskAnimator.h" class QSK_EXPORT QskFlickAnimator : public QskAnimator diff --git a/src/controls/QskFocusIndicatorSkinlet.h b/src/controls/QskFocusIndicatorSkinlet.h index d0816d51..caa588ab 100644 --- a/src/controls/QskFocusIndicatorSkinlet.h +++ b/src/controls/QskFocusIndicatorSkinlet.h @@ -6,7 +6,6 @@ #ifndef QSK_FOCUS_INDICATOR_SKINLET_H #define QSK_FOCUS_INDICATOR_SKINLET_H -#include "QskGlobal.h" #include "QskSkinlet.h" class QskFocusIndicator; diff --git a/src/controls/QskGraphicLabel.h b/src/controls/QskGraphicLabel.h index 87898c80..825f1297 100644 --- a/src/controls/QskGraphicLabel.h +++ b/src/controls/QskGraphicLabel.h @@ -6,7 +6,6 @@ #ifndef QSK_GRAPHIC_LABEL_H #define QSK_GRAPHIC_LABEL_H -#include "QskGlobal.h" #include "QskControl.h" class QskGraphic; diff --git a/src/controls/QskGraphicLabelSkinlet.cpp b/src/controls/QskGraphicLabelSkinlet.cpp index 3c9c9a21..975c216f 100644 --- a/src/controls/QskGraphicLabelSkinlet.cpp +++ b/src/controls/QskGraphicLabelSkinlet.cpp @@ -4,11 +4,12 @@ *****************************************************************************/ #include "QskGraphicLabelSkinlet.h" +#include "QskGraphicLabel.h" + #include "QskAspect.h" #include "QskColorFilter.h" #include "QskFunctions.h" #include "QskGraphic.h" -#include "QskGraphicLabel.h" #include "QskTextureNode.h" QskGraphicLabelSkinlet::QskGraphicLabelSkinlet( QskSkin* skin ) diff --git a/src/controls/QskGraphicLabelSkinlet.h b/src/controls/QskGraphicLabelSkinlet.h index bd0fad99..1f60180e 100644 --- a/src/controls/QskGraphicLabelSkinlet.h +++ b/src/controls/QskGraphicLabelSkinlet.h @@ -6,7 +6,6 @@ #ifndef QSK_GRAPHIC_LABEL_SKINLET_H #define QSK_GRAPHIC_LABEL_SKINLET_H -#include "QskGlobal.h" #include "QskSkinlet.h" class QskGraphicLabel; diff --git a/src/controls/QskHintAnimator.h b/src/controls/QskHintAnimator.h index e44d4cae..69f4b73b 100644 --- a/src/controls/QskHintAnimator.h +++ b/src/controls/QskHintAnimator.h @@ -6,7 +6,6 @@ #ifndef QSK_HINT_ANIMATOR_H #define QSK_HINT_ANIMATOR_H -#include "QskGlobal.h" #include "QskAspect.h" #include "QskVariantAnimator.h" diff --git a/src/controls/QskInputGrabber.h b/src/controls/QskInputGrabber.h index 29709822..6e1a77b7 100644 --- a/src/controls/QskInputGrabber.h +++ b/src/controls/QskInputGrabber.h @@ -6,7 +6,6 @@ #ifndef QSK_INPUT_GRABBER_H #define QSK_INPUT_GRABBER_H 1 -#include "QskGlobal.h" #include "QskControl.h" class QskInputGrabber : public QskControl diff --git a/src/controls/QskListViewSkinlet.cpp b/src/controls/QskListViewSkinlet.cpp index 26018dc1..9f1e69fa 100644 --- a/src/controls/QskListViewSkinlet.cpp +++ b/src/controls/QskListViewSkinlet.cpp @@ -4,9 +4,10 @@ *****************************************************************************/ #include "QskListViewSkinlet.h" +#include "QskListView.h" + #include "QskColorFilter.h" #include "QskGraphic.h" -#include "QskListView.h" #include #include diff --git a/src/controls/QskListViewSkinlet.h b/src/controls/QskListViewSkinlet.h index 8d385dba..89646a47 100644 --- a/src/controls/QskListViewSkinlet.h +++ b/src/controls/QskListViewSkinlet.h @@ -6,7 +6,6 @@ #ifndef QSK_LIST_VIEW_SKINLET_H #define QSK_LIST_VIEW_SKINLET_H -#include "QskGlobal.h" #include "QskScrollViewSkinlet.h" class QskListView; diff --git a/src/controls/QskObjectTree.h b/src/controls/QskObjectTree.h index c235807d..a6359e8d 100644 --- a/src/controls/QskObjectTree.h +++ b/src/controls/QskObjectTree.h @@ -6,7 +6,6 @@ #ifndef QSK_OBJECT_TREE_H #define QSK_OBJECT_TREE_H 1 -#include "QskGlobal.h" #include "QskControl.h" #include "QskWindow.h" diff --git a/src/controls/QskPageIndicatorSkinlet.cpp b/src/controls/QskPageIndicatorSkinlet.cpp index e0335b0c..1953c6fd 100644 --- a/src/controls/QskPageIndicatorSkinlet.cpp +++ b/src/controls/QskPageIndicatorSkinlet.cpp @@ -4,9 +4,10 @@ *****************************************************************************/ #include "QskPageIndicatorSkinlet.h" -#include "QskBoxNode.h" #include "QskPageIndicator.h" +#include "QskBoxNode.h" + QskPageIndicatorSkinlet::QskPageIndicatorSkinlet( QskSkin* skin ) : QskSkinlet( skin ) { diff --git a/src/controls/QskPageIndicatorSkinlet.h b/src/controls/QskPageIndicatorSkinlet.h index 836be92c..a5d9ec96 100644 --- a/src/controls/QskPageIndicatorSkinlet.h +++ b/src/controls/QskPageIndicatorSkinlet.h @@ -6,7 +6,6 @@ #ifndef QSK_PAGE_INDICATOR_SKINLET_H #define QSK_PAGE_INDICATOR_SKINLET_H -#include "QskGlobal.h" #include "QskSkinlet.h" class QskPageIndicator; diff --git a/src/controls/QskPanGestureRecognizer.h b/src/controls/QskPanGestureRecognizer.h index f10f9a79..8f6749f2 100644 --- a/src/controls/QskPanGestureRecognizer.h +++ b/src/controls/QskPanGestureRecognizer.h @@ -6,9 +6,7 @@ #ifndef QSK_PAN_GESTURE_RECOGNIZER_H #define QSK_PAN_GESTURE_RECOGNIZER_H -#include "QskGlobal.h" #include "QskGestureRecognizer.h" - #include class QSK_EXPORT QskPanGestureRecognizer : public QskGestureRecognizer diff --git a/src/controls/QskPopup.h b/src/controls/QskPopup.h index c9a14730..cdb5e17d 100644 --- a/src/controls/QskPopup.h +++ b/src/controls/QskPopup.h @@ -6,7 +6,6 @@ #ifndef QSK_POPUP_H #define QSK_POPUP_H 1 -#include "QskGlobal.h" #include "QskControl.h" class QSK_EXPORT QskPopup : public QskControl diff --git a/src/controls/QskPopupSkinlet.h b/src/controls/QskPopupSkinlet.h index fc997d19..53997dd6 100644 --- a/src/controls/QskPopupSkinlet.h +++ b/src/controls/QskPopupSkinlet.h @@ -6,7 +6,6 @@ #ifndef QSK_POPUP_SKINLET_H #define QSK_POPUP_SKINLET_H -#include "QskGlobal.h" #include "QskSkinlet.h" class QskPopup; diff --git a/src/controls/QskPushButtonSkinlet.cpp b/src/controls/QskPushButtonSkinlet.cpp index 2870686f..f9393723 100644 --- a/src/controls/QskPushButtonSkinlet.cpp +++ b/src/controls/QskPushButtonSkinlet.cpp @@ -5,6 +5,7 @@ #include "QskPushButtonSkinlet.h" #include "QskPushButton.h" + #include "QskGraphic.h" #include "QskTextOptions.h" diff --git a/src/controls/QskPushButtonSkinlet.h b/src/controls/QskPushButtonSkinlet.h index 5245d1ab..43e08be3 100644 --- a/src/controls/QskPushButtonSkinlet.h +++ b/src/controls/QskPushButtonSkinlet.h @@ -6,7 +6,6 @@ #ifndef QSK_PUSH_BUTTON_SKINLET_H #define QSK_PUSH_BUTTON_SKINLET_H -#include "QskGlobal.h" #include "QskSkinlet.h" class QskPushButton; diff --git a/src/controls/QskScrollViewSkinlet.cpp b/src/controls/QskScrollViewSkinlet.cpp index 2aa3df18..14189aea 100644 --- a/src/controls/QskScrollViewSkinlet.cpp +++ b/src/controls/QskScrollViewSkinlet.cpp @@ -4,9 +4,10 @@ *****************************************************************************/ #include "QskScrollViewSkinlet.h" +#include "QskScrollView.h" + #include "QskAspect.h" #include "QskQuick.h" -#include "QskScrollView.h" #include diff --git a/src/controls/QskScrollViewSkinlet.h b/src/controls/QskScrollViewSkinlet.h index 5e96a6ed..f9caf2d1 100644 --- a/src/controls/QskScrollViewSkinlet.h +++ b/src/controls/QskScrollViewSkinlet.h @@ -6,7 +6,6 @@ #ifndef QSK_SCROLL_VIEW_SKINLET_H #define QSK_SCROLL_VIEW_SKINLET_H -#include "QskGlobal.h" #include "QskSkinlet.h" class QskScrollView; diff --git a/src/controls/QskSeparator.h b/src/controls/QskSeparator.h index a162693b..bc0b50da 100644 --- a/src/controls/QskSeparator.h +++ b/src/controls/QskSeparator.h @@ -6,7 +6,6 @@ #ifndef QSK_SEPARATOR_H #define QSK_SEPARATOR_H -#include "QskGlobal.h" #include "QskControl.h" class QSK_EXPORT QskSeparator : public QskControl diff --git a/src/controls/QskSeparatorSkinlet.cpp b/src/controls/QskSeparatorSkinlet.cpp index a2020124..d1da70e8 100644 --- a/src/controls/QskSeparatorSkinlet.cpp +++ b/src/controls/QskSeparatorSkinlet.cpp @@ -4,9 +4,10 @@ *****************************************************************************/ #include "QskSeparatorSkinlet.h" -#include "QskAspect.h" #include "QskSeparator.h" +#include "QskAspect.h" + QskSeparatorSkinlet::QskSeparatorSkinlet( QskSkin* skin ) : Inherited( skin ) { diff --git a/src/controls/QskSeparatorSkinlet.h b/src/controls/QskSeparatorSkinlet.h index a970c38b..7a659d03 100644 --- a/src/controls/QskSeparatorSkinlet.h +++ b/src/controls/QskSeparatorSkinlet.h @@ -6,7 +6,6 @@ #ifndef QSK_SEPARATOR_SKINLET_H #define QSK_SEPARATOR_SKINLET_H -#include "QskGlobal.h" #include "QskSkinlet.h" class QskSeparator; diff --git a/src/controls/QskShortcutMap.h b/src/controls/QskShortcutMap.h index 8e9f74c2..c379a8d3 100644 --- a/src/controls/QskShortcutMap.h +++ b/src/controls/QskShortcutMap.h @@ -6,9 +6,7 @@ #ifndef QSK_SHORTCUT_MAP_H #define QSK_SHORTCUT_MAP_H -#include "QskGlobal.h" #include "QskMetaFunction.h" - #include class QQuickItem; diff --git a/src/controls/QskSimpleListBox.h b/src/controls/QskSimpleListBox.h index 3a64e5a2..f73d5845 100644 --- a/src/controls/QskSimpleListBox.h +++ b/src/controls/QskSimpleListBox.h @@ -6,9 +6,7 @@ #ifndef QSK_LIST_BOX_H #define QSK_LIST_BOX_H -#include "QskGlobal.h" #include "QskListView.h" - #include class QSK_EXPORT QskSimpleListBox : public QskListView diff --git a/src/controls/QskSkin.h b/src/controls/QskSkin.h index 75b66646..3a34f636 100644 --- a/src/controls/QskSkin.h +++ b/src/controls/QskSkin.h @@ -6,7 +6,6 @@ #ifndef QSK_SKIN_H #define QSK_SKIN_H -#include "QskGlobal.h" #include "QskAspect.h" #include diff --git a/src/controls/QskSkinHintTable.h b/src/controls/QskSkinHintTable.h index c0b56a31..3c56f156 100644 --- a/src/controls/QskSkinHintTable.h +++ b/src/controls/QskSkinHintTable.h @@ -6,7 +6,6 @@ #ifndef QSK_SKIN_HINT_TABLE_H #define QSK_SKIN_HINT_TABLE_H -#include "QskGlobal.h" #include "QskAnimationHint.h" #include "QskAspect.h" #include "QskBoxBorderColors.h" diff --git a/src/controls/QskSkinManager.h b/src/controls/QskSkinManager.h index 8cb845ff..0c61b719 100644 --- a/src/controls/QskSkinManager.h +++ b/src/controls/QskSkinManager.h @@ -7,6 +7,7 @@ #define QSK_SKIN_MANAGER_H #include "QskGlobal.h" + #include #include diff --git a/src/controls/QskSkinTransition.h b/src/controls/QskSkinTransition.h index ee3fd84c..0794d38e 100644 --- a/src/controls/QskSkinTransition.h +++ b/src/controls/QskSkinTransition.h @@ -1,7 +1,6 @@ #ifndef QSK_SKIN_TRANSITION_H #define QSK_SKIN_TRANSITION_H -#include "QskGlobal.h" #include "QskAnimationHint.h" #include "QskAspect.h" diff --git a/src/controls/QskSkinlet.h b/src/controls/QskSkinlet.h index fae43f24..4117b7b4 100644 --- a/src/controls/QskSkinlet.h +++ b/src/controls/QskSkinlet.h @@ -6,7 +6,6 @@ #ifndef QSK_SKINLET_H #define QSK_SKINLET_H 1 -#include "QskGlobal.h" #include "QskAspect.h" #include diff --git a/src/controls/QskSkinnable.h b/src/controls/QskSkinnable.h index 9d299202..2588817e 100644 --- a/src/controls/QskSkinnable.h +++ b/src/controls/QskSkinnable.h @@ -6,9 +6,7 @@ #ifndef QSK_SKINNABLE_H #define QSK_SKINNABLE_H -#include "QskGlobal.h" #include "QskAspect.h" - #include typedef unsigned int QRgb; diff --git a/src/controls/QskSliderSkinlet.cpp b/src/controls/QskSliderSkinlet.cpp index efc8c7b8..feac1f02 100644 --- a/src/controls/QskSliderSkinlet.cpp +++ b/src/controls/QskSliderSkinlet.cpp @@ -4,10 +4,11 @@ *****************************************************************************/ #include "QskSliderSkinlet.h" +#include "QskSlider.h" + #include "QskAspect.h" #include "QskBoxBorderMetrics.h" #include "QskFunctions.h" -#include "QskSlider.h" static QMarginsF qskPadding( const QskSlider* slider, QskAspect::Subcontrol subControl ) diff --git a/src/controls/QskSliderSkinlet.h b/src/controls/QskSliderSkinlet.h index 48abd01f..885a3b82 100644 --- a/src/controls/QskSliderSkinlet.h +++ b/src/controls/QskSliderSkinlet.h @@ -6,7 +6,6 @@ #ifndef QSK_SLIDER_SKINLET_H #define QSK_SLIDER_SKINLET_H -#include "QskGlobal.h" #include "QskSkinlet.h" class QskSlider; diff --git a/src/controls/QskStatusIndicator.h b/src/controls/QskStatusIndicator.h index d28dedb4..3e5a99c5 100644 --- a/src/controls/QskStatusIndicator.h +++ b/src/controls/QskStatusIndicator.h @@ -6,7 +6,6 @@ #ifndef QSK_STATUS_INDICATOR_H #define QSK_STATUS_INDICATOR_H -#include "QskGlobal.h" #include "QskControl.h" class QskGraphic; diff --git a/src/controls/QskStatusIndicatorSkinlet.cpp b/src/controls/QskStatusIndicatorSkinlet.cpp index fc312ea6..be90c585 100644 --- a/src/controls/QskStatusIndicatorSkinlet.cpp +++ b/src/controls/QskStatusIndicatorSkinlet.cpp @@ -4,11 +4,12 @@ *****************************************************************************/ #include "QskStatusIndicatorSkinlet.h" +#include "QskStatusIndicator.h" + #include "QskAspect.h" #include "QskColorFilter.h" #include "QskFunctions.h" #include "QskGraphic.h" -#include "QskStatusIndicator.h" QskStatusIndicatorSkinlet::QskStatusIndicatorSkinlet( QskSkin* skin ) : Inherited( skin ) diff --git a/src/controls/QskStatusIndicatorSkinlet.h b/src/controls/QskStatusIndicatorSkinlet.h index 2b012024..82361e24 100644 --- a/src/controls/QskStatusIndicatorSkinlet.h +++ b/src/controls/QskStatusIndicatorSkinlet.h @@ -6,7 +6,6 @@ #ifndef QSK_STATUS_INDICATOR_SKINLET_H #define QSK_STATUS_INDICATOR_SKINLET_H -#include "QskGlobal.h" #include "QskSkinlet.h" class QskStatusIndicator; diff --git a/src/controls/QskSubWindow.h b/src/controls/QskSubWindow.h index f18ce423..1bcd4f25 100644 --- a/src/controls/QskSubWindow.h +++ b/src/controls/QskSubWindow.h @@ -6,7 +6,6 @@ #ifndef QSK_SUB_WINDOW_H #define QSK_SUB_WINDOW_H 1 -#include "QskGlobal.h" #include "QskPopup.h" class QSK_EXPORT QskSubWindow : public QskPopup diff --git a/src/controls/QskSubWindowArea.h b/src/controls/QskSubWindowArea.h index 96fa7848..e381c501 100644 --- a/src/controls/QskSubWindowArea.h +++ b/src/controls/QskSubWindowArea.h @@ -6,7 +6,6 @@ #ifndef QSK_SUB_WINDOW_AREA_H #define QSK_SUB_WINDOW_AREA_H 1 -#include "QskGlobal.h" #include "QskControl.h" class QskGradient; diff --git a/src/controls/QskSubWindowAreaSkinlet.h b/src/controls/QskSubWindowAreaSkinlet.h index 890be6e2..8d8a422b 100644 --- a/src/controls/QskSubWindowAreaSkinlet.h +++ b/src/controls/QskSubWindowAreaSkinlet.h @@ -6,7 +6,6 @@ #ifndef QSK_SUB_WINDOW_AREA_SKINLET_H #define QSK_SUB_WINDOW_AREA_SKINLET_H -#include "QskGlobal.h" #include "QskSkinlet.h" class QskSubWindowArea; diff --git a/src/controls/QskSubWindowSkinlet.cpp b/src/controls/QskSubWindowSkinlet.cpp index a9ba8393..66eae373 100644 --- a/src/controls/QskSubWindowSkinlet.cpp +++ b/src/controls/QskSubWindowSkinlet.cpp @@ -4,9 +4,10 @@ *****************************************************************************/ #include "QskSubWindowSkinlet.h" +#include "QskSubWindow.h" + #include "QskAspect.h" #include "QskBoxBorderMetrics.h" -#include "QskSubWindow.h" #include diff --git a/src/controls/QskSubWindowSkinlet.h b/src/controls/QskSubWindowSkinlet.h index 7f165649..51099209 100644 --- a/src/controls/QskSubWindowSkinlet.h +++ b/src/controls/QskSubWindowSkinlet.h @@ -6,7 +6,6 @@ #ifndef QSK_SUB_WINDOW_SKINLET_H #define QSK_SUB_WINDOW_SKINLET_H -#include "QskGlobal.h" #include "QskPopupSkinlet.h" class QskSubWindow; diff --git a/src/controls/QskTabBar.h b/src/controls/QskTabBar.h index 573f2c95..34c556d1 100644 --- a/src/controls/QskTabBar.h +++ b/src/controls/QskTabBar.h @@ -6,7 +6,6 @@ #ifndef QSK_TAB_BAR_H #define QSK_TAB_BAR_H -#include "QskGlobal.h" #include "QskBox.h" class QskTabButton; diff --git a/src/controls/QskTabButtonSkinlet.cpp b/src/controls/QskTabButtonSkinlet.cpp index ddc2cce8..32defa3c 100644 --- a/src/controls/QskTabButtonSkinlet.cpp +++ b/src/controls/QskTabButtonSkinlet.cpp @@ -5,6 +5,7 @@ #include "QskTabButtonSkinlet.h" #include "QskTabButton.h" + #include "QskTextOptions.h" QskTabButtonSkinlet::QskTabButtonSkinlet( QskSkin* skin ) diff --git a/src/controls/QskTabButtonSkinlet.h b/src/controls/QskTabButtonSkinlet.h index 2dca3db8..7cfc6e90 100644 --- a/src/controls/QskTabButtonSkinlet.h +++ b/src/controls/QskTabButtonSkinlet.h @@ -6,7 +6,6 @@ #ifndef QSK_TAB_BUTTON_SKINLET_H #define QSK_TAB_BUTTON_SKINLET_H -#include "QskGlobal.h" #include "QskSkinlet.h" class QSK_EXPORT QskTabButtonSkinlet : public QskSkinlet diff --git a/src/controls/QskTabViewSkinlet.cpp b/src/controls/QskTabViewSkinlet.cpp index b6377e34..2211179b 100644 --- a/src/controls/QskTabViewSkinlet.cpp +++ b/src/controls/QskTabViewSkinlet.cpp @@ -4,9 +4,10 @@ *****************************************************************************/ #include "QskTabViewSkinlet.h" -#include "QskTabBar.h" #include "QskTabView.h" +#include "QskTabBar.h" + QskTabViewSkinlet::QskTabViewSkinlet( QskSkin* skin ) : Inherited( skin ) { diff --git a/src/controls/QskTabViewSkinlet.h b/src/controls/QskTabViewSkinlet.h index 758fe38e..6689d247 100644 --- a/src/controls/QskTabViewSkinlet.h +++ b/src/controls/QskTabViewSkinlet.h @@ -6,7 +6,6 @@ #ifndef QSK_TAB_VIEW_SKINLET_H #define QSK_TAB_VIEW_SKINLET_H -#include "QskGlobal.h" #include "QskSkinlet.h" class QskTabView; diff --git a/src/controls/QskTextInputSkinlet.h b/src/controls/QskTextInputSkinlet.h index e76e566f..7e0528bd 100644 --- a/src/controls/QskTextInputSkinlet.h +++ b/src/controls/QskTextInputSkinlet.h @@ -6,7 +6,6 @@ #ifndef QSK_TEXT_INPUT_SKINLET_H #define QSK_TEXT_INPUT_SKINLET_H -#include "QskGlobal.h" #include "QskSkinlet.h" class QSK_EXPORT QskTextInputSkinlet : public QskSkinlet diff --git a/src/controls/QskTextLabelSkinlet.cpp b/src/controls/QskTextLabelSkinlet.cpp index 4e9a864c..fd93eac1 100644 --- a/src/controls/QskTextLabelSkinlet.cpp +++ b/src/controls/QskTextLabelSkinlet.cpp @@ -5,6 +5,7 @@ #include "QskTextLabelSkinlet.h" #include "QskTextLabel.h" + #include "QskTextOptions.h" QskTextLabelSkinlet::QskTextLabelSkinlet( QskSkin* skin ) diff --git a/src/controls/QskTextLabelSkinlet.h b/src/controls/QskTextLabelSkinlet.h index c5e73b7b..2e60df03 100644 --- a/src/controls/QskTextLabelSkinlet.h +++ b/src/controls/QskTextLabelSkinlet.h @@ -6,7 +6,6 @@ #ifndef QSK_TEXT_LABEL_SKINLET_H #define QSK_TEXT_LABEL_SKINLET_H -#include "QskGlobal.h" #include "QskSkinlet.h" class QSK_EXPORT QskTextLabelSkinlet : public QskSkinlet diff --git a/src/controls/QskVariantAnimator.h b/src/controls/QskVariantAnimator.h index c1c5a113..1507670d 100644 --- a/src/controls/QskVariantAnimator.h +++ b/src/controls/QskVariantAnimator.h @@ -6,7 +6,6 @@ #ifndef QSK_VARIANT_ANIMATOR_H #define QSK_VARIANT_ANIMATOR_H -#include "QskGlobal.h" #include "QskAnimator.h" #include diff --git a/src/dialogs/QskDialog.h b/src/dialogs/QskDialog.h index dfdc972c..c72813f3 100644 --- a/src/dialogs/QskDialog.h +++ b/src/dialogs/QskDialog.h @@ -7,6 +7,7 @@ #define QSK_DIALOG_H 1 #include "QskGlobal.h" + #include #include diff --git a/src/dialogs/QskDialogButtonBox.h b/src/dialogs/QskDialogButtonBox.h index 88c6405e..33c4604e 100644 --- a/src/dialogs/QskDialogButtonBox.h +++ b/src/dialogs/QskDialogButtonBox.h @@ -8,7 +8,6 @@ #include "QskBox.h" #include "QskDialog.h" -#include "QskGlobal.h" class QskPushButton; diff --git a/src/dialogs/QskMessageSubWindow.h b/src/dialogs/QskMessageSubWindow.h index 71f6a005..070a5793 100644 --- a/src/dialogs/QskMessageSubWindow.h +++ b/src/dialogs/QskMessageSubWindow.h @@ -6,7 +6,6 @@ #ifndef QSK_MESSAGE_SUB_WINDOW_H #define QSK_MESSAGE_SUB_WINDOW_H 1 -#include "QskGlobal.h" #include "QskInputSubWindow.h" class QSK_EXPORT QskMessageSubWindow : public QskInputSubWindow diff --git a/src/dialogs/QskMessageWindow.h b/src/dialogs/QskMessageWindow.h index 334238d7..c348c657 100644 --- a/src/dialogs/QskMessageWindow.h +++ b/src/dialogs/QskMessageWindow.h @@ -6,7 +6,6 @@ #ifndef QSK_MESSAGE_WINDOW_H #define QSK_MESSAGE_WINDOW_H 1 -#include "QskGlobal.h" #include "QskInputWindow.h" class QskMessageDialogBox; diff --git a/src/dialogs/QskSelectionSubWindow.h b/src/dialogs/QskSelectionSubWindow.h index 0d3b615e..36aa1186 100644 --- a/src/dialogs/QskSelectionSubWindow.h +++ b/src/dialogs/QskSelectionSubWindow.h @@ -6,7 +6,6 @@ #ifndef QSK_SELECTION_SUB_WINDOW_H #define QSK_SELECTION_SUB_WINDOW_H 1 -#include "QskGlobal.h" #include "QskInputSubWindow.h" class QskSelectionDialogBox; diff --git a/src/dialogs/QskSelectionWindow.h b/src/dialogs/QskSelectionWindow.h index 6153ad5e..3971ed03 100644 --- a/src/dialogs/QskSelectionWindow.h +++ b/src/dialogs/QskSelectionWindow.h @@ -6,7 +6,6 @@ #ifndef QSK_SELECTION_WINDOW_H #define QSK_SELECTION_WINDOW_H 1 -#include "QskGlobal.h" #include "QskInputWindow.h" class QskSelectionDialogBox; diff --git a/src/graphic/QskGraphicProvider.h b/src/graphic/QskGraphicProvider.h index 59d0bb84..4fd34245 100644 --- a/src/graphic/QskGraphicProvider.h +++ b/src/graphic/QskGraphicProvider.h @@ -7,6 +7,7 @@ #define QSK_GRAPHIC_PROVIDER_H #include "QskGlobal.h" + #include #include diff --git a/src/inputpanel/QskInputPanelBox.h b/src/inputpanel/QskInputPanelBox.h index a72cb3b4..39ae0ee9 100644 --- a/src/inputpanel/QskInputPanelBox.h +++ b/src/inputpanel/QskInputPanelBox.h @@ -6,7 +6,6 @@ #ifndef QSK_INPUT_PANEL_BOX_H #define QSK_INPUT_PANEL_BOX_H -#include "QskGlobal.h" #include "QskBox.h" class QskInputEngine; diff --git a/src/layouts/QskGridBox.h b/src/layouts/QskGridBox.h index 7f43592f..4e3acbf2 100644 --- a/src/layouts/QskGridBox.h +++ b/src/layouts/QskGridBox.h @@ -6,7 +6,6 @@ #ifndef QSK_GRID_BOX_H #define QSK_GRID_BOX_H -#include "QskGlobal.h" #include "QskLayout.h" class QSK_EXPORT QskGridBox : public QskLayout diff --git a/src/layouts/QskIndexedLayoutBox.h b/src/layouts/QskIndexedLayoutBox.h index 8dfb2ffe..8fdcb823 100644 --- a/src/layouts/QskIndexedLayoutBox.h +++ b/src/layouts/QskIndexedLayoutBox.h @@ -6,7 +6,6 @@ #ifndef QSK_INDEXED_LAYOUT_BOX_H #define QSK_INDEXED_LAYOUT_BOX_H -#include "QskGlobal.h" #include "QskLayout.h" class QSK_EXPORT QskIndexedLayoutBox : public QskLayout diff --git a/src/layouts/QskLayoutConstraint.h b/src/layouts/QskLayoutConstraint.h index 53638426..c2d5d0d6 100644 --- a/src/layouts/QskLayoutConstraint.h +++ b/src/layouts/QskLayoutConstraint.h @@ -7,6 +7,7 @@ #define QSK_LAYOUT_CONSTRAINT_H #include "QskGlobal.h" + #include #include diff --git a/src/layouts/QskLinearBox.h b/src/layouts/QskLinearBox.h index 0ac7ff7c..be16d7ad 100644 --- a/src/layouts/QskLinearBox.h +++ b/src/layouts/QskLinearBox.h @@ -6,7 +6,6 @@ #ifndef QSK_LINEAR_BOX_H #define QSK_LINEAR_BOX_H -#include "QskGlobal.h" #include "QskIndexedLayoutBox.h" class QSK_EXPORT QskLinearBox : public QskIndexedLayoutBox diff --git a/src/layouts/QskStackBox.h b/src/layouts/QskStackBox.h index 04317ca9..e138d2f5 100644 --- a/src/layouts/QskStackBox.h +++ b/src/layouts/QskStackBox.h @@ -6,7 +6,6 @@ #ifndef QSK_STACK_BOX_H #define QSK_STACK_BOX_H -#include "QskGlobal.h" #include "QskIndexedLayoutBox.h" class QskStackBoxAnimator; diff --git a/src/layouts/QskStackBoxAnimator.h b/src/layouts/QskStackBoxAnimator.h index be776f64..68eaa4e5 100644 --- a/src/layouts/QskStackBoxAnimator.h +++ b/src/layouts/QskStackBoxAnimator.h @@ -7,8 +7,8 @@ #define QSK_STACK_BOX_ANIMATOR_H #include "QskAnimator.h" -#include "QskGlobal.h" #include "QskNamespace.h" + #include class QskStackBox; diff --git a/src/nodes/QskBoxRendererColorMap.h b/src/nodes/QskBoxRendererColorMap.h index 4cb25d41..f2e57361 100644 --- a/src/nodes/QskBoxRendererColorMap.h +++ b/src/nodes/QskBoxRendererColorMap.h @@ -6,7 +6,6 @@ #ifndef QSK_BOX_RENDERER_COLOR_MAP_H #define QSK_BOX_RENDERER_COLOR_MAP_H -#include #include #include diff --git a/src/nodes/QskGraphicNode.h b/src/nodes/QskGraphicNode.h index 3c9078b4..2519f87a 100644 --- a/src/nodes/QskGraphicNode.h +++ b/src/nodes/QskGraphicNode.h @@ -6,7 +6,6 @@ #ifndef QSK_GRAPHIC_NODE_H #define QSK_GRAPHIC_NODE_H -#include "QskGlobal.h" #include "QskGraphicTextureFactory.h" #include "QskTextureNode.h" diff --git a/src/nodes/QskPlainTextRenderer.h b/src/nodes/QskPlainTextRenderer.h index fb192d23..714f09f1 100644 --- a/src/nodes/QskPlainTextRenderer.h +++ b/src/nodes/QskPlainTextRenderer.h @@ -6,7 +6,6 @@ #ifndef QSK_PLAIN_TEXT_RENDERER_H #define QSK_PLAIN_TEXT_RENDERER_H -#include "QskGlobal.h" #include "QskNamespace.h" #include diff --git a/src/nodes/QskRichTextRenderer.h b/src/nodes/QskRichTextRenderer.h index 9d46c4d8..91d461d9 100644 --- a/src/nodes/QskRichTextRenderer.h +++ b/src/nodes/QskRichTextRenderer.h @@ -6,7 +6,6 @@ #ifndef QSK_RICH_TEXT_RENDERER_H #define QSK_RICH_TEXT_RENDERER_H -#include "QskGlobal.h" #include "QskNamespace.h" #include diff --git a/src/nodes/QskTextNode.h b/src/nodes/QskTextNode.h index e4fab750..f09328ba 100644 --- a/src/nodes/QskTextNode.h +++ b/src/nodes/QskTextNode.h @@ -6,7 +6,6 @@ #ifndef QSK_TEXT_NODE_H #define QSK_TEXT_NODE_H -#include "QskGlobal.h" #include "QskNamespace.h" #include diff --git a/src/nodes/QskTextRenderer.h b/src/nodes/QskTextRenderer.h index 888e6945..3c8d1959 100644 --- a/src/nodes/QskTextRenderer.h +++ b/src/nodes/QskTextRenderer.h @@ -6,9 +6,7 @@ #ifndef QSK_TEXT_RENDERER_H #define QSK_TEXT_RENDERER_H -#include "QskGlobal.h" #include "QskNamespace.h" - #include class QskTextColors;