QskGlobal include cleanup

2018-08-03 08:30:23 +02:00 · 2018-08-03 08:30:23 +02:00 · 2a3811fcd9
parent 0a92cb82db
commit 2a3811fcd9
81 changed files with 28 additions and 78 deletions
--- 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 <qmetaobject.h>
-
 #include <functional>

 #ifdef Q_MOC_RUN
--- 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 <qcolor.h>
--- 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 <qmetatype.h>
--- 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 <qmetatype.h>
--- 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 <qcoreapplication.h>
--- a/src/common/QskSizePolicy.h
+++ b/src/common/QskSizePolicy.h
@ -7,7 +7,6 @@
 #define QSK_SIZE_POLICY_H_

 #include "QskGlobal.h"
-
 #include <qmetatype.h>

 class QDebug;
--- a/src/common/QskTextOptions.h
+++ b/src/common/QskTextOptions.h
@ -7,6 +7,7 @@
 #define QSK_TEXT_OPTIONS_H

 #include "QskGlobal.h"
+
 #include <qmetatype.h>
 #include <qtextoption.h>

--- 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
--- a/src/controls/QskAnimator.h
+++ b/src/controls/QskAnimator.h
@ -7,6 +7,7 @@
 #define QSK_ANIMATOR_H

 #include "QskGlobal.h"
+
 #include <qeasingcurve.h>
 #include <qobjectdefs.h>

--- 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
--- 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"
--- 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 <qcoreevent.h>
--- 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
--- 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;
--- 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;
--- 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 )
--- 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;
--- 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"

--- 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
--- 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 <qmath.h>
 #include <qsgnode.h>
--- 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;
--- 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"

--- 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 )
 {
--- 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;
--- 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 <memory>

 class QSK_EXPORT QskPanGestureRecognizer : public QskGestureRecognizer
--- 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
--- 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;
--- 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"

--- 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;
--- 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 <qsgnode.h>

--- 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;
--- 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
--- 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 )
 {
--- 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;
--- 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 <qquickwindow.h>

 class QQuickItem;
--- 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 <qstringlist.h>

 class QSK_EXPORT QskSimpleListBox : public QskListView
--- 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 <qcolor.h>
--- 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"
--- a/src/controls/QskSkinManager.h
+++ b/src/controls/QskSkinManager.h
@ -7,6 +7,7 @@
 #define QSK_SKIN_MANAGER_H

 #include "QskGlobal.h"
+
 #include <qobject.h>
 #include <memory>

--- 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"

--- 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 <qnamespace.h>
--- 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 <memory>

 typedef unsigned int QRgb;
--- 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 )
--- 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;
--- 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;
--- 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 )
--- 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;
--- 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
--- 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;
--- 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;
--- 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 <qfontmetrics.h>

--- 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;
--- 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;
--- 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 )
--- 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
--- 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 )
 {
--- 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;
--- 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
--- 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 )
--- 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
--- 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 <qvariant.h>

--- a/src/dialogs/QskDialog.h
+++ b/src/dialogs/QskDialog.h
@ -7,6 +7,7 @@
 #define QSK_DIALOG_H 1

 #include "QskGlobal.h"
+
 #include <qobject.h>
 #include <memory>

--- 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;

--- 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
--- 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;
--- 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;
--- 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;
--- a/src/graphic/QskGraphicProvider.h
+++ b/src/graphic/QskGraphicProvider.h
@ -7,6 +7,7 @@
 #define QSK_GRAPHIC_PROVIDER_H

 #include "QskGlobal.h"
+
 #include <qobject.h>
 #include <memory>

--- 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;
--- 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
--- 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
--- a/src/layouts/QskLayoutConstraint.h
+++ b/src/layouts/QskLayoutConstraint.h
@ -7,6 +7,7 @@
 #define QSK_LAYOUT_CONSTRAINT_H

 #include "QskGlobal.h"
+
 #include <qnamespace.h>
 #include <limits>

--- 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
--- 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;
--- 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 <qobject.h>

 class QskStackBox;
--- 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 <QskGlobal.h>
 #include <QskGradient.h>
 #include <QskVertex.h>

--- 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"

--- 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 <qnamespace.h>

--- 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 <qnamespace.h>

--- 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 <qrect.h>
--- 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 <qnamespace.h>

 class QskTextColors;