168492376
/
qskinny
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QskGlobal include cleanup

This commit is contained in:
Uwe Rathmann 2018-08-03 08:30:23 +02:00
parent 0a92cb82db
commit 2a3811fcd9
81 changed files with 28 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/QskAspect.h
View File

@ -6,11 +6,9 @@
#ifndef QSK_ASPECT_H #ifndef QSK_ASPECT_H
#define QSK_ASPECT_H #define QSK_ASPECT_H
#include "QskGlobal.h"
#include "QskFlags.h" #include "QskFlags.h"
#include <qmetaobject.h> #include <qmetaobject.h>
#include <functional> #include <functional>
#ifdef Q_MOC_RUN #ifdef Q_MOC_RUN

1
src/common/QskBoxBorderColors.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_BOX_BORDER_COLORS_H #ifndef QSK_BOX_BORDER_COLORS_H
#define QSK_BOX_BORDER_COLORS_H #define QSK_BOX_BORDER_COLORS_H
#include "QskGlobal.h"
#include "QskNamespace.h" #include "QskNamespace.h"
#include <qcolor.h> #include <qcolor.h>

1
src/common/QskBoxBorderMetrics.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_BOX_BORDER_METRICS_H #ifndef QSK_BOX_BORDER_METRICS_H
#define QSK_BOX_BORDER_METRICS_H #define QSK_BOX_BORDER_METRICS_H
#include "QskGlobal.h"
#include "QskMargins.h" #include "QskMargins.h"
#include <qmetatype.h> #include <qmetatype.h>

1
src/common/QskCorner.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_CORNER_H #ifndef QSK_CORNER_H
#define QSK_CORNER_H #define QSK_CORNER_H
#include "QskGlobal.h"
#include "QskBoxShapeMetrics.h" #include "QskBoxShapeMetrics.h"
#include <qmetatype.h> #include <qmetatype.h>

1
src/common/QskMetaFunction.cpp
View File

@ -3,7 +3,6 @@
* This file may be used under the terms of the QSkinny License, Version 1.0 * This file may be used under the terms of the QSkinny License, Version 1.0
*****************************************************************************/ *****************************************************************************/
#include "QskGlobal.h"
#include "QskMetaFunction.h" #include "QskMetaFunction.h"
#include <qcoreapplication.h> #include <qcoreapplication.h>

1
src/common/QskSizePolicy.h
View File

@ -7,7 +7,6 @@
#define QSK_SIZE_POLICY_H_ #define QSK_SIZE_POLICY_H_
#include "QskGlobal.h" #include "QskGlobal.h"
#include <qmetatype.h> #include <qmetatype.h>
class QDebug; class QDebug;

1
src/common/QskTextOptions.h
View File

@ -7,6 +7,7 @@
#define QSK_TEXT_OPTIONS_H #define QSK_TEXT_OPTIONS_H
#include "QskGlobal.h" #include "QskGlobal.h"
#include <qmetatype.h> #include <qmetatype.h>
#include <qtextoption.h> #include <qtextoption.h>

1
src/controls/QskAbstractButton.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_ABSTRACT_BUTTON_H #ifndef QSK_ABSTRACT_BUTTON_H
#define QSK_ABSTRACT_BUTTON_H #define QSK_ABSTRACT_BUTTON_H
#include "QskGlobal.h"
#include "QskControl.h" #include "QskControl.h"
class QSK_EXPORT QskAbstractButton : public QskControl class QSK_EXPORT QskAbstractButton : public QskControl

1
src/controls/QskAnimator.h
View File

@ -7,6 +7,7 @@
#define QSK_ANIMATOR_H #define QSK_ANIMATOR_H
#include "QskGlobal.h" #include "QskGlobal.h"
#include <qeasingcurve.h> #include <qeasingcurve.h>
#include <qobjectdefs.h> #include <qobjectdefs.h>

1
src/controls/QskBoxSkinlet.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_BOX_SKINLET_H #ifndef QSK_BOX_SKINLET_H
#define QSK_BOX_SKINLET_H #define QSK_BOX_SKINLET_H
#include "QskGlobal.h"
#include "QskSkinlet.h" #include "QskSkinlet.h"
class QSK_EXPORT QskBoxSkinlet : public QskSkinlet class QSK_EXPORT QskBoxSkinlet : public QskSkinlet

1
src/controls/QskControl.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_CONTROL_H #ifndef QSK_CONTROL_H
#define QSK_CONTROL_H 1 #define QSK_CONTROL_H 1
#include "QskGlobal.h"
#include "QskAspect.h" #include "QskAspect.h"
#include "QskGradient.h" #include "QskGradient.h"
#include "QskSizePolicy.h" #include "QskSizePolicy.h"

1
src/controls/QskEvent.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_EVENT_H #ifndef QSK_EVENT_H
#define QSK_EVENT_H #define QSK_EVENT_H
#include "QskGlobal.h"
#include "QskAspect.h" #include "QskAspect.h"
#include <qcoreevent.h> #include <qcoreevent.h>

1
src/controls/QskFlickAnimator.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_FLICK_ANIMATOR_H #ifndef QSK_FLICK_ANIMATOR_H
#define QSK_FLICK_ANIMATOR_H 1 #define QSK_FLICK_ANIMATOR_H 1
#include "QskGlobal.h"
#include "QskAnimator.h" #include "QskAnimator.h"
class QSK_EXPORT QskFlickAnimator : public QskAnimator class QSK_EXPORT QskFlickAnimator : public QskAnimator

1
src/controls/QskFocusIndicatorSkinlet.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_FOCUS_INDICATOR_SKINLET_H #ifndef QSK_FOCUS_INDICATOR_SKINLET_H
#define QSK_FOCUS_INDICATOR_SKINLET_H #define QSK_FOCUS_INDICATOR_SKINLET_H
#include "QskGlobal.h"
#include "QskSkinlet.h" #include "QskSkinlet.h"
class QskFocusIndicator; class QskFocusIndicator;

1
src/controls/QskGraphicLabel.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_GRAPHIC_LABEL_H #ifndef QSK_GRAPHIC_LABEL_H
#define QSK_GRAPHIC_LABEL_H #define QSK_GRAPHIC_LABEL_H
#include "QskGlobal.h"
#include "QskControl.h" #include "QskControl.h"
class QskGraphic; class QskGraphic;

3
src/controls/QskGraphicLabelSkinlet.cpp
View File

@ -4,11 +4,12 @@
*****************************************************************************/ *****************************************************************************/
#include "QskGraphicLabelSkinlet.h" #include "QskGraphicLabelSkinlet.h"
#include "QskGraphicLabel.h"
#include "QskAspect.h" #include "QskAspect.h"
#include "QskColorFilter.h" #include "QskColorFilter.h"
#include "QskFunctions.h" #include "QskFunctions.h"
#include "QskGraphic.h" #include "QskGraphic.h"
#include "QskGraphicLabel.h"
#include "QskTextureNode.h" #include "QskTextureNode.h"
QskGraphicLabelSkinlet::QskGraphicLabelSkinlet( QskSkin* skin ) QskGraphicLabelSkinlet::QskGraphicLabelSkinlet( QskSkin* skin )

1
src/controls/QskGraphicLabelSkinlet.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_GRAPHIC_LABEL_SKINLET_H #ifndef QSK_GRAPHIC_LABEL_SKINLET_H
#define QSK_GRAPHIC_LABEL_SKINLET_H #define QSK_GRAPHIC_LABEL_SKINLET_H
#include "QskGlobal.h"
#include "QskSkinlet.h" #include "QskSkinlet.h"
class QskGraphicLabel; class QskGraphicLabel;

1
src/controls/QskHintAnimator.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_HINT_ANIMATOR_H #ifndef QSK_HINT_ANIMATOR_H
#define QSK_HINT_ANIMATOR_H #define QSK_HINT_ANIMATOR_H
#include "QskGlobal.h"
#include "QskAspect.h" #include "QskAspect.h"
#include "QskVariantAnimator.h" #include "QskVariantAnimator.h"

1
src/controls/QskInputGrabber.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_INPUT_GRABBER_H #ifndef QSK_INPUT_GRABBER_H
#define QSK_INPUT_GRABBER_H 1 #define QSK_INPUT_GRABBER_H 1
#include "QskGlobal.h"
#include "QskControl.h" #include "QskControl.h"
class QskInputGrabber : public QskControl class QskInputGrabber : public QskControl

3
src/controls/QskListViewSkinlet.cpp
View File

@ -4,9 +4,10 @@
*****************************************************************************/ *****************************************************************************/
#include "QskListViewSkinlet.h" #include "QskListViewSkinlet.h"
#include "QskListView.h"
#include "QskColorFilter.h" #include "QskColorFilter.h"
#include "QskGraphic.h" #include "QskGraphic.h"
#include "QskListView.h"
#include <qmath.h> #include <qmath.h>
#include <qsgnode.h> #include <qsgnode.h>

1
src/controls/QskListViewSkinlet.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_LIST_VIEW_SKINLET_H #ifndef QSK_LIST_VIEW_SKINLET_H
#define QSK_LIST_VIEW_SKINLET_H #define QSK_LIST_VIEW_SKINLET_H
#include "QskGlobal.h"
#include "QskScrollViewSkinlet.h" #include "QskScrollViewSkinlet.h"
class QskListView; class QskListView;

1
src/controls/QskObjectTree.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_OBJECT_TREE_H #ifndef QSK_OBJECT_TREE_H
#define QSK_OBJECT_TREE_H 1 #define QSK_OBJECT_TREE_H 1
#include "QskGlobal.h"
#include "QskControl.h" #include "QskControl.h"
#include "QskWindow.h" #include "QskWindow.h"

3
src/controls/QskPageIndicatorSkinlet.cpp
View File

@ -4,9 +4,10 @@
*****************************************************************************/ *****************************************************************************/
#include "QskPageIndicatorSkinlet.h" #include "QskPageIndicatorSkinlet.h"
#include "QskBoxNode.h"
#include "QskPageIndicator.h" #include "QskPageIndicator.h"
#include "QskBoxNode.h"
QskPageIndicatorSkinlet::QskPageIndicatorSkinlet( QskSkin* skin ) QskPageIndicatorSkinlet::QskPageIndicatorSkinlet( QskSkin* skin )
: QskSkinlet( skin ) : QskSkinlet( skin )
{ {

1
src/controls/QskPageIndicatorSkinlet.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_PAGE_INDICATOR_SKINLET_H #ifndef QSK_PAGE_INDICATOR_SKINLET_H
#define QSK_PAGE_INDICATOR_SKINLET_H #define QSK_PAGE_INDICATOR_SKINLET_H
#include "QskGlobal.h"
#include "QskSkinlet.h" #include "QskSkinlet.h"
class QskPageIndicator; class QskPageIndicator;

2
src/controls/QskPanGestureRecognizer.h
View File

@ -6,9 +6,7 @@
#ifndef QSK_PAN_GESTURE_RECOGNIZER_H #ifndef QSK_PAN_GESTURE_RECOGNIZER_H
#define QSK_PAN_GESTURE_RECOGNIZER_H #define QSK_PAN_GESTURE_RECOGNIZER_H
#include "QskGlobal.h"
#include "QskGestureRecognizer.h" #include "QskGestureRecognizer.h"
#include <memory> #include <memory>
class QSK_EXPORT QskPanGestureRecognizer : public QskGestureRecognizer class QSK_EXPORT QskPanGestureRecognizer : public QskGestureRecognizer

1
src/controls/QskPopup.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_POPUP_H #ifndef QSK_POPUP_H
#define QSK_POPUP_H 1 #define QSK_POPUP_H 1
#include "QskGlobal.h"
#include "QskControl.h" #include "QskControl.h"
class QSK_EXPORT QskPopup : public QskControl class QSK_EXPORT QskPopup : public QskControl

1
src/controls/QskPopupSkinlet.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_POPUP_SKINLET_H #ifndef QSK_POPUP_SKINLET_H
#define QSK_POPUP_SKINLET_H #define QSK_POPUP_SKINLET_H
#include "QskGlobal.h"
#include "QskSkinlet.h" #include "QskSkinlet.h"
class QskPopup; class QskPopup;

1
src/controls/QskPushButtonSkinlet.cpp
View File

@ -5,6 +5,7 @@
#include "QskPushButtonSkinlet.h" #include "QskPushButtonSkinlet.h"
#include "QskPushButton.h" #include "QskPushButton.h"
#include "QskGraphic.h" #include "QskGraphic.h"
#include "QskTextOptions.h" #include "QskTextOptions.h"

1
src/controls/QskPushButtonSkinlet.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_PUSH_BUTTON_SKINLET_H #ifndef QSK_PUSH_BUTTON_SKINLET_H
#define QSK_PUSH_BUTTON_SKINLET_H #define QSK_PUSH_BUTTON_SKINLET_H
#include "QskGlobal.h"
#include "QskSkinlet.h" #include "QskSkinlet.h"
class QskPushButton; class QskPushButton;

3
src/controls/QskScrollViewSkinlet.cpp
View File

@ -4,9 +4,10 @@
*****************************************************************************/ *****************************************************************************/
#include "QskScrollViewSkinlet.h" #include "QskScrollViewSkinlet.h"
#include "QskScrollView.h"
#include "QskAspect.h" #include "QskAspect.h"
#include "QskQuick.h" #include "QskQuick.h"
#include "QskScrollView.h"
#include <qsgnode.h> #include <qsgnode.h>

1
src/controls/QskScrollViewSkinlet.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_SCROLL_VIEW_SKINLET_H #ifndef QSK_SCROLL_VIEW_SKINLET_H
#define QSK_SCROLL_VIEW_SKINLET_H #define QSK_SCROLL_VIEW_SKINLET_H
#include "QskGlobal.h"
#include "QskSkinlet.h" #include "QskSkinlet.h"
class QskScrollView; class QskScrollView;

1
src/controls/QskSeparator.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_SEPARATOR_H #ifndef QSK_SEPARATOR_H
#define QSK_SEPARATOR_H #define QSK_SEPARATOR_H
#include "QskGlobal.h"
#include "QskControl.h" #include "QskControl.h"
class QSK_EXPORT QskSeparator : public QskControl class QSK_EXPORT QskSeparator : public QskControl

3
src/controls/QskSeparatorSkinlet.cpp
View File

@ -4,9 +4,10 @@
*****************************************************************************/ *****************************************************************************/
#include "QskSeparatorSkinlet.h" #include "QskSeparatorSkinlet.h"
#include "QskAspect.h"
#include "QskSeparator.h" #include "QskSeparator.h"
#include "QskAspect.h"
QskSeparatorSkinlet::QskSeparatorSkinlet( QskSkin* skin ) QskSeparatorSkinlet::QskSeparatorSkinlet( QskSkin* skin )
: Inherited( skin ) : Inherited( skin )
{ {

1
src/controls/QskSeparatorSkinlet.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_SEPARATOR_SKINLET_H #ifndef QSK_SEPARATOR_SKINLET_H
#define QSK_SEPARATOR_SKINLET_H #define QSK_SEPARATOR_SKINLET_H
#include "QskGlobal.h"
#include "QskSkinlet.h" #include "QskSkinlet.h"
class QskSeparator; class QskSeparator;

2
src/controls/QskShortcutMap.h
View File

@ -6,9 +6,7 @@
#ifndef QSK_SHORTCUT_MAP_H #ifndef QSK_SHORTCUT_MAP_H
#define QSK_SHORTCUT_MAP_H #define QSK_SHORTCUT_MAP_H
#include "QskGlobal.h"
#include "QskMetaFunction.h" #include "QskMetaFunction.h"
#include <qquickwindow.h> #include <qquickwindow.h>
class QQuickItem; class QQuickItem;

2
src/controls/QskSimpleListBox.h
View File

@ -6,9 +6,7 @@
#ifndef QSK_LIST_BOX_H #ifndef QSK_LIST_BOX_H
#define QSK_LIST_BOX_H #define QSK_LIST_BOX_H
#include "QskGlobal.h"
#include "QskListView.h" #include "QskListView.h"
#include <qstringlist.h> #include <qstringlist.h>
class QSK_EXPORT QskSimpleListBox : public QskListView class QSK_EXPORT QskSimpleListBox : public QskListView

1
src/controls/QskSkin.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_SKIN_H #ifndef QSK_SKIN_H
#define QSK_SKIN_H #define QSK_SKIN_H
#include "QskGlobal.h"
#include "QskAspect.h" #include "QskAspect.h"
#include <qcolor.h> #include <qcolor.h>

1
src/controls/QskSkinHintTable.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_SKIN_HINT_TABLE_H #ifndef QSK_SKIN_HINT_TABLE_H
#define QSK_SKIN_HINT_TABLE_H #define QSK_SKIN_HINT_TABLE_H
#include "QskGlobal.h"
#include "QskAnimationHint.h" #include "QskAnimationHint.h"
#include "QskAspect.h" #include "QskAspect.h"
#include "QskBoxBorderColors.h" #include "QskBoxBorderColors.h"

1
src/controls/QskSkinManager.h
View File

@ -7,6 +7,7 @@
#define QSK_SKIN_MANAGER_H #define QSK_SKIN_MANAGER_H
#include "QskGlobal.h" #include "QskGlobal.h"
#include <qobject.h> #include <qobject.h>
#include <memory> #include <memory>

1
src/controls/QskSkinTransition.h
View File

@ -1,7 +1,6 @@
#ifndef QSK_SKIN_TRANSITION_H #ifndef QSK_SKIN_TRANSITION_H
#define QSK_SKIN_TRANSITION_H #define QSK_SKIN_TRANSITION_H
#include "QskGlobal.h"
#include "QskAnimationHint.h" #include "QskAnimationHint.h"
#include "QskAspect.h" #include "QskAspect.h"

1
src/controls/QskSkinlet.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_SKINLET_H #ifndef QSK_SKINLET_H
#define QSK_SKINLET_H 1 #define QSK_SKINLET_H 1
#include "QskGlobal.h"
#include "QskAspect.h" #include "QskAspect.h"
#include <qnamespace.h> #include <qnamespace.h>

2
src/controls/QskSkinnable.h
View File

@ -6,9 +6,7 @@
#ifndef QSK_SKINNABLE_H #ifndef QSK_SKINNABLE_H
#define QSK_SKINNABLE_H #define QSK_SKINNABLE_H
#include "QskGlobal.h"
#include "QskAspect.h" #include "QskAspect.h"
#include <memory> #include <memory>
typedef unsigned int QRgb; typedef unsigned int QRgb;

3
src/controls/QskSliderSkinlet.cpp
View File

@ -4,10 +4,11 @@
*****************************************************************************/ *****************************************************************************/
#include "QskSliderSkinlet.h" #include "QskSliderSkinlet.h"
#include "QskSlider.h"
#include "QskAspect.h" #include "QskAspect.h"
#include "QskBoxBorderMetrics.h" #include "QskBoxBorderMetrics.h"
#include "QskFunctions.h" #include "QskFunctions.h"
#include "QskSlider.h"
static QMarginsF qskPadding( static QMarginsF qskPadding(
const QskSlider* slider, QskAspect::Subcontrol subControl ) const QskSlider* slider, QskAspect::Subcontrol subControl )

1
src/controls/QskSliderSkinlet.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_SLIDER_SKINLET_H #ifndef QSK_SLIDER_SKINLET_H
#define QSK_SLIDER_SKINLET_H #define QSK_SLIDER_SKINLET_H
#include "QskGlobal.h"
#include "QskSkinlet.h" #include "QskSkinlet.h"
class QskSlider; class QskSlider;

1
src/controls/QskStatusIndicator.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_STATUS_INDICATOR_H #ifndef QSK_STATUS_INDICATOR_H
#define QSK_STATUS_INDICATOR_H #define QSK_STATUS_INDICATOR_H
#include "QskGlobal.h"
#include "QskControl.h" #include "QskControl.h"
class QskGraphic; class QskGraphic;

3
src/controls/QskStatusIndicatorSkinlet.cpp
View File

@ -4,11 +4,12 @@
*****************************************************************************/ *****************************************************************************/
#include "QskStatusIndicatorSkinlet.h" #include "QskStatusIndicatorSkinlet.h"
#include "QskStatusIndicator.h"
#include "QskAspect.h" #include "QskAspect.h"
#include "QskColorFilter.h" #include "QskColorFilter.h"
#include "QskFunctions.h" #include "QskFunctions.h"
#include "QskGraphic.h" #include "QskGraphic.h"
#include "QskStatusIndicator.h"
QskStatusIndicatorSkinlet::QskStatusIndicatorSkinlet( QskSkin* skin ) QskStatusIndicatorSkinlet::QskStatusIndicatorSkinlet( QskSkin* skin )
: Inherited( skin ) : Inherited( skin )

1
src/controls/QskStatusIndicatorSkinlet.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_STATUS_INDICATOR_SKINLET_H #ifndef QSK_STATUS_INDICATOR_SKINLET_H
#define QSK_STATUS_INDICATOR_SKINLET_H #define QSK_STATUS_INDICATOR_SKINLET_H
#include "QskGlobal.h"
#include "QskSkinlet.h" #include "QskSkinlet.h"
class QskStatusIndicator; class QskStatusIndicator;

1
src/controls/QskSubWindow.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_SUB_WINDOW_H #ifndef QSK_SUB_WINDOW_H
#define QSK_SUB_WINDOW_H 1 #define QSK_SUB_WINDOW_H 1
#include "QskGlobal.h"
#include "QskPopup.h" #include "QskPopup.h"
class QSK_EXPORT QskSubWindow : public QskPopup class QSK_EXPORT QskSubWindow : public QskPopup

1
src/controls/QskSubWindowArea.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_SUB_WINDOW_AREA_H #ifndef QSK_SUB_WINDOW_AREA_H
#define QSK_SUB_WINDOW_AREA_H 1 #define QSK_SUB_WINDOW_AREA_H 1
#include "QskGlobal.h"
#include "QskControl.h" #include "QskControl.h"
class QskGradient; class QskGradient;

1
src/controls/QskSubWindowAreaSkinlet.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_SUB_WINDOW_AREA_SKINLET_H #ifndef QSK_SUB_WINDOW_AREA_SKINLET_H
#define QSK_SUB_WINDOW_AREA_SKINLET_H #define QSK_SUB_WINDOW_AREA_SKINLET_H
#include "QskGlobal.h"
#include "QskSkinlet.h" #include "QskSkinlet.h"
class QskSubWindowArea; class QskSubWindowArea;

3
src/controls/QskSubWindowSkinlet.cpp
View File

@ -4,9 +4,10 @@
*****************************************************************************/ *****************************************************************************/
#include "QskSubWindowSkinlet.h" #include "QskSubWindowSkinlet.h"
#include "QskSubWindow.h"
#include "QskAspect.h" #include "QskAspect.h"
#include "QskBoxBorderMetrics.h" #include "QskBoxBorderMetrics.h"
#include "QskSubWindow.h"
#include <qfontmetrics.h> #include <qfontmetrics.h>

1
src/controls/QskSubWindowSkinlet.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_SUB_WINDOW_SKINLET_H #ifndef QSK_SUB_WINDOW_SKINLET_H
#define QSK_SUB_WINDOW_SKINLET_H #define QSK_SUB_WINDOW_SKINLET_H
#include "QskGlobal.h"
#include "QskPopupSkinlet.h" #include "QskPopupSkinlet.h"
class QskSubWindow; class QskSubWindow;

1
src/controls/QskTabBar.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_TAB_BAR_H #ifndef QSK_TAB_BAR_H
#define QSK_TAB_BAR_H #define QSK_TAB_BAR_H
#include "QskGlobal.h"
#include "QskBox.h" #include "QskBox.h"
class QskTabButton; class QskTabButton;

1
src/controls/QskTabButtonSkinlet.cpp
View File

@ -5,6 +5,7 @@
#include "QskTabButtonSkinlet.h" #include "QskTabButtonSkinlet.h"
#include "QskTabButton.h" #include "QskTabButton.h"
#include "QskTextOptions.h" #include "QskTextOptions.h"
QskTabButtonSkinlet::QskTabButtonSkinlet( QskSkin* skin ) QskTabButtonSkinlet::QskTabButtonSkinlet( QskSkin* skin )

1
src/controls/QskTabButtonSkinlet.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_TAB_BUTTON_SKINLET_H #ifndef QSK_TAB_BUTTON_SKINLET_H
#define QSK_TAB_BUTTON_SKINLET_H #define QSK_TAB_BUTTON_SKINLET_H
#include "QskGlobal.h"
#include "QskSkinlet.h" #include "QskSkinlet.h"
class QSK_EXPORT QskTabButtonSkinlet : public QskSkinlet class QSK_EXPORT QskTabButtonSkinlet : public QskSkinlet

3
src/controls/QskTabViewSkinlet.cpp
View File

@ -4,9 +4,10 @@
*****************************************************************************/ *****************************************************************************/
#include "QskTabViewSkinlet.h" #include "QskTabViewSkinlet.h"
#include "QskTabBar.h"
#include "QskTabView.h" #include "QskTabView.h"
#include "QskTabBar.h"
QskTabViewSkinlet::QskTabViewSkinlet( QskSkin* skin ) QskTabViewSkinlet::QskTabViewSkinlet( QskSkin* skin )
: Inherited( skin ) : Inherited( skin )
{ {

1
src/controls/QskTabViewSkinlet.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_TAB_VIEW_SKINLET_H #ifndef QSK_TAB_VIEW_SKINLET_H
#define QSK_TAB_VIEW_SKINLET_H #define QSK_TAB_VIEW_SKINLET_H
#include "QskGlobal.h"
#include "QskSkinlet.h" #include "QskSkinlet.h"
class QskTabView; class QskTabView;

1
src/controls/QskTextInputSkinlet.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_TEXT_INPUT_SKINLET_H #ifndef QSK_TEXT_INPUT_SKINLET_H
#define QSK_TEXT_INPUT_SKINLET_H #define QSK_TEXT_INPUT_SKINLET_H
#include "QskGlobal.h"
#include "QskSkinlet.h" #include "QskSkinlet.h"
class QSK_EXPORT QskTextInputSkinlet : public QskSkinlet class QSK_EXPORT QskTextInputSkinlet : public QskSkinlet

1
src/controls/QskTextLabelSkinlet.cpp
View File

@ -5,6 +5,7 @@
#include "QskTextLabelSkinlet.h" #include "QskTextLabelSkinlet.h"
#include "QskTextLabel.h" #include "QskTextLabel.h"
#include "QskTextOptions.h" #include "QskTextOptions.h"
QskTextLabelSkinlet::QskTextLabelSkinlet( QskSkin* skin ) QskTextLabelSkinlet::QskTextLabelSkinlet( QskSkin* skin )

1
src/controls/QskTextLabelSkinlet.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_TEXT_LABEL_SKINLET_H #ifndef QSK_TEXT_LABEL_SKINLET_H
#define QSK_TEXT_LABEL_SKINLET_H #define QSK_TEXT_LABEL_SKINLET_H
#include "QskGlobal.h"
#include "QskSkinlet.h" #include "QskSkinlet.h"
class QSK_EXPORT QskTextLabelSkinlet : public QskSkinlet class QSK_EXPORT QskTextLabelSkinlet : public QskSkinlet

1
src/controls/QskVariantAnimator.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_VARIANT_ANIMATOR_H #ifndef QSK_VARIANT_ANIMATOR_H
#define QSK_VARIANT_ANIMATOR_H #define QSK_VARIANT_ANIMATOR_H
#include "QskGlobal.h"
#include "QskAnimator.h" #include "QskAnimator.h"
#include <qvariant.h> #include <qvariant.h>

1
src/dialogs/QskDialog.h
View File

@ -7,6 +7,7 @@
#define QSK_DIALOG_H 1 #define QSK_DIALOG_H 1
#include "QskGlobal.h" #include "QskGlobal.h"
#include <qobject.h> #include <qobject.h>
#include <memory> #include <memory>

1
src/dialogs/QskDialogButtonBox.h
View File

@ -8,7 +8,6 @@
#include "QskBox.h" #include "QskBox.h"
#include "QskDialog.h" #include "QskDialog.h"
#include "QskGlobal.h"
class QskPushButton; class QskPushButton;

1
src/dialogs/QskMessageSubWindow.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_MESSAGE_SUB_WINDOW_H #ifndef QSK_MESSAGE_SUB_WINDOW_H
#define QSK_MESSAGE_SUB_WINDOW_H 1 #define QSK_MESSAGE_SUB_WINDOW_H 1
#include "QskGlobal.h"
#include "QskInputSubWindow.h" #include "QskInputSubWindow.h"
class QSK_EXPORT QskMessageSubWindow : public QskInputSubWindow class QSK_EXPORT QskMessageSubWindow : public QskInputSubWindow

1
src/dialogs/QskMessageWindow.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_MESSAGE_WINDOW_H #ifndef QSK_MESSAGE_WINDOW_H
#define QSK_MESSAGE_WINDOW_H 1 #define QSK_MESSAGE_WINDOW_H 1
#include "QskGlobal.h"
#include "QskInputWindow.h" #include "QskInputWindow.h"
class QskMessageDialogBox; class QskMessageDialogBox;

1
src/dialogs/QskSelectionSubWindow.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_SELECTION_SUB_WINDOW_H #ifndef QSK_SELECTION_SUB_WINDOW_H
#define QSK_SELECTION_SUB_WINDOW_H 1 #define QSK_SELECTION_SUB_WINDOW_H 1
#include "QskGlobal.h"
#include "QskInputSubWindow.h" #include "QskInputSubWindow.h"
class QskSelectionDialogBox; class QskSelectionDialogBox;

1
src/dialogs/QskSelectionWindow.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_SELECTION_WINDOW_H #ifndef QSK_SELECTION_WINDOW_H
#define QSK_SELECTION_WINDOW_H 1 #define QSK_SELECTION_WINDOW_H 1
#include "QskGlobal.h"
#include "QskInputWindow.h" #include "QskInputWindow.h"
class QskSelectionDialogBox; class QskSelectionDialogBox;

1
src/graphic/QskGraphicProvider.h
View File

@ -7,6 +7,7 @@
#define QSK_GRAPHIC_PROVIDER_H #define QSK_GRAPHIC_PROVIDER_H
#include "QskGlobal.h" #include "QskGlobal.h"
#include <qobject.h> #include <qobject.h>
#include <memory> #include <memory>

1
src/inputpanel/QskInputPanelBox.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_INPUT_PANEL_BOX_H #ifndef QSK_INPUT_PANEL_BOX_H
#define QSK_INPUT_PANEL_BOX_H #define QSK_INPUT_PANEL_BOX_H
#include "QskGlobal.h"
#include "QskBox.h" #include "QskBox.h"
class QskInputEngine; class QskInputEngine;

1
src/layouts/QskGridBox.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_GRID_BOX_H #ifndef QSK_GRID_BOX_H
#define QSK_GRID_BOX_H #define QSK_GRID_BOX_H
#include "QskGlobal.h"
#include "QskLayout.h" #include "QskLayout.h"
class QSK_EXPORT QskGridBox : public QskLayout class QSK_EXPORT QskGridBox : public QskLayout

1
src/layouts/QskIndexedLayoutBox.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_INDEXED_LAYOUT_BOX_H #ifndef QSK_INDEXED_LAYOUT_BOX_H
#define QSK_INDEXED_LAYOUT_BOX_H #define QSK_INDEXED_LAYOUT_BOX_H
#include "QskGlobal.h"
#include "QskLayout.h" #include "QskLayout.h"
class QSK_EXPORT QskIndexedLayoutBox : public QskLayout class QSK_EXPORT QskIndexedLayoutBox : public QskLayout

1
src/layouts/QskLayoutConstraint.h
View File

@ -7,6 +7,7 @@
#define QSK_LAYOUT_CONSTRAINT_H #define QSK_LAYOUT_CONSTRAINT_H
#include "QskGlobal.h" #include "QskGlobal.h"
#include <qnamespace.h> #include <qnamespace.h>
#include <limits> #include <limits>

1
src/layouts/QskLinearBox.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_LINEAR_BOX_H #ifndef QSK_LINEAR_BOX_H
#define QSK_LINEAR_BOX_H #define QSK_LINEAR_BOX_H
#include "QskGlobal.h"
#include "QskIndexedLayoutBox.h" #include "QskIndexedLayoutBox.h"
class QSK_EXPORT QskLinearBox : public QskIndexedLayoutBox class QSK_EXPORT QskLinearBox : public QskIndexedLayoutBox

1
src/layouts/QskStackBox.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_STACK_BOX_H #ifndef QSK_STACK_BOX_H
#define QSK_STACK_BOX_H #define QSK_STACK_BOX_H
#include "QskGlobal.h"
#include "QskIndexedLayoutBox.h" #include "QskIndexedLayoutBox.h"
class QskStackBoxAnimator; class QskStackBoxAnimator;

2
src/layouts/QskStackBoxAnimator.h
View File

@ -7,8 +7,8 @@
#define QSK_STACK_BOX_ANIMATOR_H #define QSK_STACK_BOX_ANIMATOR_H
#include "QskAnimator.h" #include "QskAnimator.h"
#include "QskGlobal.h"
#include "QskNamespace.h" #include "QskNamespace.h"
#include <qobject.h> #include <qobject.h>
class QskStackBox; class QskStackBox;

1
src/nodes/QskBoxRendererColorMap.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_BOX_RENDERER_COLOR_MAP_H #ifndef QSK_BOX_RENDERER_COLOR_MAP_H
#define QSK_BOX_RENDERER_COLOR_MAP_H #define QSK_BOX_RENDERER_COLOR_MAP_H
#include <QskGlobal.h>
#include <QskGradient.h> #include <QskGradient.h>
#include <QskVertex.h> #include <QskVertex.h>

1
src/nodes/QskGraphicNode.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_GRAPHIC_NODE_H #ifndef QSK_GRAPHIC_NODE_H
#define QSK_GRAPHIC_NODE_H #define QSK_GRAPHIC_NODE_H
#include "QskGlobal.h"
#include "QskGraphicTextureFactory.h" #include "QskGraphicTextureFactory.h"
#include "QskTextureNode.h" #include "QskTextureNode.h"

1
src/nodes/QskPlainTextRenderer.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_PLAIN_TEXT_RENDERER_H #ifndef QSK_PLAIN_TEXT_RENDERER_H
#define QSK_PLAIN_TEXT_RENDERER_H #define QSK_PLAIN_TEXT_RENDERER_H
#include "QskGlobal.h"
#include "QskNamespace.h" #include "QskNamespace.h"
#include <qnamespace.h> #include <qnamespace.h>

1
src/nodes/QskRichTextRenderer.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_RICH_TEXT_RENDERER_H #ifndef QSK_RICH_TEXT_RENDERER_H
#define QSK_RICH_TEXT_RENDERER_H #define QSK_RICH_TEXT_RENDERER_H
#include "QskGlobal.h"
#include "QskNamespace.h" #include "QskNamespace.h"
#include <qnamespace.h> #include <qnamespace.h>

1
src/nodes/QskTextNode.h
View File

@ -6,7 +6,6 @@
#ifndef QSK_TEXT_NODE_H #ifndef QSK_TEXT_NODE_H
#define QSK_TEXT_NODE_H #define QSK_TEXT_NODE_H
#include "QskGlobal.h"
#include "QskNamespace.h" #include "QskNamespace.h"
#include <qrect.h> #include <qrect.h>

2
src/nodes/QskTextRenderer.h
View File

@ -6,9 +6,7 @@
#ifndef QSK_TEXT_RENDERER_H #ifndef QSK_TEXT_RENDERER_H
#define QSK_TEXT_RENDERER_H #define QSK_TEXT_RENDERER_H
#include "QskGlobal.h"
#include "QskNamespace.h" #include "QskNamespace.h"
#include <qnamespace.h> #include <qnamespace.h>
class QskTextColors; class QskTextColors;