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

unused member removed

Browse Source
This commit is contained in:
Uwe Rathmann 2018-07-19 14:10:48 +02:00
parent 0b3933f800
commit aaac57de94
155 changed files with 346 additions and 397 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/automotive/Speedometer.h
View File

@ -16,7 +16,6 @@ public:
void setLabels( const QVector< QString >& labels ); void setLabels( const QVector< QString >& labels );
private: private:
float m_labelsStep;
QVector< QString > m_labels; QVector< QString > m_labels;
}; };

1
examples/gbenchmark/Benchmark.cpp
View File

@ -16,6 +16,7 @@
#include <QDebug> #include <QDebug>
#include <QElapsedTimer> #include <QElapsedTimer>
#include <QQuickWindow> #include <QQuickWindow>
#include <QPainter>
bool Benchmark::run( const QString& dirName ) bool Benchmark::run( const QString& dirName )
{ {

9
src/common/QskAspect.cpp
View File

@ -5,12 +5,11 @@
#include "QskAspect.h" #include "QskAspect.h"
#include <QDebug> #include <qdebug.h>
#include <QMetaEnum> #include <qmetaobject.h>
#include <QtAlgorithms> #include <qalgorithms.h>
#include <QVector> #include <qvector.h>
#include <limits>
#include <bitset> #include <bitset>
#include <string> #include <string>
#include <unordered_map> #include <unordered_map>

3
src/common/QskAspect.h
View File

@ -7,7 +7,8 @@
#define QSK_ASPECT_H #define QSK_ASPECT_H
#include "QskFlags.h" #include "QskFlags.h"
#include <QMetaObject>
#include <qmetaobject.h>
#include <functional> #include <functional>
#ifdef Q_MOC_RUN #ifdef Q_MOC_RUN

4
src/common/QskBoxBorderColors.cpp
View File

@ -7,7 +7,7 @@
#include "QskRgbValue.h" #include "QskRgbValue.h"
#include <qhashfunctions.h> #include <qhashfunctions.h>
#include <QDebug> #include <qvariant.h>
static void qskRegisterBoxBorderColors() static void qskRegisterBoxBorderColors()
{ {
@ -194,6 +194,8 @@ uint QskBoxBorderColors::hash( uint seed ) const
#ifndef QT_NO_DEBUG_STREAM #ifndef QT_NO_DEBUG_STREAM
#include <qdebug.h>
static inline void qskDebugColor( QDebug debug, const QColor& c ) static inline void qskDebugColor( QDebug debug, const QColor& c )
{ {
debug << '(' debug << '('

5
src/common/QskBoxBorderColors.h
View File

@ -8,10 +8,9 @@
#include "QskGlobal.h" #include "QskGlobal.h"
#include "QskNamespace.h" #include "QskNamespace.h"
#include "QskRgbValue.h"
#include <QColor> #include <qcolor.h>
#include <QMetaType> #include <qmetatype.h>
class QDebug; class QDebug;

4
src/common/QskBoxBorderMetrics.cpp
View File

@ -6,7 +6,7 @@
#include "QskBoxBorderMetrics.h" #include "QskBoxBorderMetrics.h"
#include <qhashfunctions.h> #include <qhashfunctions.h>
#include <QDebug> #include <qvariant.h>
static void qskRegisterBoxBorderMetrics() static void qskRegisterBoxBorderMetrics()
{ {
@ -104,6 +104,8 @@ uint QskBoxBorderMetrics::hash( uint seed ) const
#ifndef QT_NO_DEBUG_STREAM #ifndef QT_NO_DEBUG_STREAM
#include <qdebug.h>
QDebug operator<<( QDebug debug, const QskBoxBorderMetrics& metrics ) QDebug operator<<( QDebug debug, const QskBoxBorderMetrics& metrics )
{ {
QDebugStateSaver saver( debug ); QDebugStateSaver saver( debug );

6
src/common/QskBoxBorderMetrics.h
View File

@ -9,9 +9,9 @@
#include "QskGlobal.h" #include "QskGlobal.h"
#include "QskMargins.h" #include "QskMargins.h"
#include <Qt> #include <qnamespace.h>
#include <QMetaType> #include <qmetatype.h>
#include <QSizeF> #include <qsize.h>
class QDebug; class QDebug;
class QVariant; class QVariant;

4
src/common/QskBoxShapeMetrics.cpp
View File

@ -6,7 +6,7 @@
#include "QskBoxShapeMetrics.h" #include "QskBoxShapeMetrics.h"
#include <qhashfunctions.h> #include <qhashfunctions.h>
#include <QDebug> #include <qvariant.h>
static void qskRegisterBoxShapeMetrics() static void qskRegisterBoxShapeMetrics()
{ {
@ -210,6 +210,8 @@ uint QskBoxShapeMetrics::hash( uint seed ) const
#ifndef QT_NO_DEBUG_STREAM #ifndef QT_NO_DEBUG_STREAM
#include <qdebug.h>
QDebug operator<<( QDebug debug, const QskBoxShapeMetrics& metrics ) QDebug operator<<( QDebug debug, const QskBoxShapeMetrics& metrics )
{ {
QDebugStateSaver saver( debug ); QDebugStateSaver saver( debug );

7
src/common/QskBoxShapeMetrics.h
View File

@ -8,11 +8,10 @@
#include "QskGlobal.h" #include "QskGlobal.h"
#include <Qt> #include <qnamespace.h>
#include <QMetaType> #include <qmetatype.h>
#include <QSizeF> #include <qsize.h>
class QDebug;
class QVariant; class QVariant;
class QMarginsF; class QMarginsF;

2
src/common/QskCorner.cpp
View File

@ -4,8 +4,6 @@
*****************************************************************************/ *****************************************************************************/
#include "QskCorner.h" #include "QskCorner.h"
#include <QSizeF>
#include <QDebug>
QskCorner::QskCorner() QskCorner::QskCorner()
{ {

4
src/common/QskCorner.h
View File

@ -9,8 +9,8 @@
#include "QskGlobal.h" #include "QskGlobal.h"
#include "QskBoxShapeMetrics.h" #include "QskBoxShapeMetrics.h"
#include <QMetaType> #include <qmetatype.h>
#include <Qt> #include <qnamespace.h>
class QDebug; class QDebug;
class QSizeF; class QSizeF;

6
src/common/QskFunctions.cpp
View File

@ -1,8 +1,8 @@
#include "QskFunctions.h" #include "QskFunctions.h"
#include <QGuiApplication> #include <qguiapplication.h>
#include <QScreen> #include <qscreen.h>
#include <QtMath> #include <qmath.h>
template< class Rect, class Value > template< class Rect, class Value >
static inline Rect qskAlignedRect( const Rect& outerRect, static inline Rect qskAlignedRect( const Rect& outerRect,

4
src/common/QskFunctions.h
View File

@ -8,8 +8,8 @@
#include "QskGlobal.h" #include "QskGlobal.h"
#include <QMargins> #include <qmargins.h>
#include <QRectF> #include <qrect.h>
QSK_EXPORT qreal qskDpiScaled( qreal value ); QSK_EXPORT qreal qskDpiScaled( qreal value );

5
src/common/QskGradient.cpp
View File

@ -5,9 +5,8 @@
#include "QskGradient.h" #include "QskGradient.h"
#include "QskRgbValue.h" #include "QskRgbValue.h"
#include <QVariant>
#include <QDebug>
#include <qvariant.h>
#include <qhashfunctions.h> #include <qhashfunctions.h>
static void qskRegisterGradient() static void qskRegisterGradient()
@ -471,6 +470,8 @@ QVariant QskGradient::interpolate(
#ifndef QT_NO_DEBUG_STREAM #ifndef QT_NO_DEBUG_STREAM
#include <qdebug.h>
QDebug operator<<( QDebug debug, const QskGradientStop& stop ) QDebug operator<<( QDebug debug, const QskGradientStop& stop )
{ {
debug << "GR:" << stop.position() << stop.color(); debug << "GR:" << stop.position() << stop.color();

6
src/common/QskGradient.h
View File

@ -8,9 +8,9 @@
#include "QskGlobal.h" #include "QskGlobal.h"
#include <QMetaType> #include <qmetatype.h>
#include <QColor> #include <qcolor.h>
#include <QVector> #include <qvector.h>
class QDebug; class QDebug;
class QVariant; class QVariant;

2
src/common/QskMargins.cpp
View File

@ -1,5 +1,5 @@
#include "QskMargins.h" #include "QskMargins.h"
#include <QVariant> #include <qvariant.h>
static inline qreal qskInterpolated( qreal from, qreal to, qreal ratio ) static inline qreal qskInterpolated( qreal from, qreal to, qreal ratio )
{ {

6
src/common/QskMargins.h
View File

@ -8,9 +8,9 @@
#include "QskGlobal.h" #include "QskGlobal.h"
#include <QMarginsF> #include <qmargins.h>
#include <Qt> #include <qnamespace.h>
#include <QMetaType> #include <qmetatype.h>
class QVariant; class QVariant;

8
src/common/QskMetaFunction.cpp
View File

@ -6,10 +6,10 @@
#include "QskGlobal.h" #include "QskGlobal.h"
#include "QskMetaFunction.h" #include "QskMetaFunction.h"
#include <QCoreApplication> #include <qcoreapplication.h>
#include <QThread> #include <qthread.h>
#include <QObject> #include <qobject.h>
#include <QSemaphore> #include <qsemaphore.h>
QSK_QT_PRIVATE_BEGIN QSK_QT_PRIVATE_BEGIN
#include <private/qobject_p.h> #include <private/qobject_p.h>

5
src/common/QskMetaFunction.h
View File

@ -7,8 +7,9 @@
#define QSK_META_FUNCTION_H 1 #define QSK_META_FUNCTION_H 1
#include "QskGlobal.h" #include "QskGlobal.h"
#include <QMetaType>
#include <QObject> #include <qmetatype.h>
#include <qobject.h>
namespace QskMetaFunctionTraits namespace QskMetaFunctionTraits
{ {

2
src/common/QskMetaFunction.hpp
View File

@ -7,7 +7,7 @@
#define QSK_META_FUNCTION_HPP 1 #define QSK_META_FUNCTION_HPP 1
#include "QskGlobal.h" #include "QskGlobal.h"
#include <QObject> #include <qobject.h>
class QskMetaFunction::FunctionCall : public QtPrivate::QSlotObjectBase class QskMetaFunction::FunctionCall : public QtPrivate::QSlotObjectBase
{ {

13
src/common/QskMetaInvokable.cpp
View File

@ -6,15 +6,12 @@
#include "QskMetaInvokable.h" #include "QskMetaInvokable.h"
#include "QskMetaFunction.h" #include "QskMetaFunction.h"
#include <QMetaMethod> #include <qmetaobject.h>
#include <QMetaProperty> #include <qobject.h>
#include <QVector> #include <qthread.h>
#include <QObject> #include <qcoreapplication.h>
#include <qsemaphore.h>
#include <QThread>
#include <QCoreApplication>
#include <QSemaphore>
QSK_QT_PRIVATE_BEGIN QSK_QT_PRIVATE_BEGIN
#include <private/qobject_p.h> #include <private/qobject_p.h>

5
src/common/QskMetaInvokable.h
View File

@ -8,14 +8,15 @@
#include "QskGlobal.h" #include "QskGlobal.h"
#include <QMetaType> #include <qmetatype.h>
#include <Qt> #include <qnamespace.h>
class QskMetaFunction; class QskMetaFunction;
struct QMetaObject; struct QMetaObject;
class QMetaMethod; class QMetaMethod;
class QMetaProperty; class QMetaProperty;
class QObject; class QObject;
class QByteArray;
class QSK_EXPORT QskMetaInvokable class QSK_EXPORT QskMetaInvokable
{ {

9
src/common/QskModule.cpp
View File

@ -43,17 +43,14 @@
#include "QskSelectionWindow.h" #include "QskSelectionWindow.h"
#include "QskWindow.h" #include "QskWindow.h"
#include <QList> #include <qstringlist.h>
#include <QStringList> #include <qmargins.h>
#include <QMarginsF> #include <qjsvalueiterator.h>
#include <QJSValueIterator>
#include <QQmlEngine>
QSK_QT_PRIVATE_BEGIN QSK_QT_PRIVATE_BEGIN
#include <private/qqmlmetatype_p.h> #include <private/qqmlmetatype_p.h>
#include <private/qqmlglobal_p.h> #include <private/qqmlglobal_p.h>
#include <private/qvariantanimation_p.h> #include <private/qvariantanimation_p.h>
#include <private/qmetaobjectbuilder_p.h>
QSK_QT_PRIVATE_END QSK_QT_PRIVATE_END
#define QSK_MODULE_NAME "Skinny" #define QSK_MODULE_NAME "Skinny"

6
src/common/QskObjectCounter.cpp
View File

@ -4,9 +4,9 @@
*****************************************************************************/ *****************************************************************************/
#include "QskObjectCounter.h" #include "QskObjectCounter.h"
#include <QQuickItem>
#include <QSet> #include <qset.h>
#include <QDebug> #include <qdebug.h>
QSK_QT_PRIVATE_BEGIN QSK_QT_PRIVATE_BEGIN
#include <private/qhooks_p.h> #include <private/qhooks_p.h>

3
src/common/QskSizePolicy.cpp
View File

@ -4,7 +4,6 @@
*****************************************************************************/ *****************************************************************************/
#include "QskSizePolicy.h" #include "QskSizePolicy.h"
#include <QDebug>
QskSizePolicy::Policy QskSizePolicy::policy( Qt::Orientation orientation ) const 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 #ifndef QT_NO_DEBUG_STREAM
#include <qdebug.h>
QDebug operator<<( QDebug debug, const QskSizePolicy& policy ) QDebug operator<<( QDebug debug, const QskSizePolicy& policy )
{ {
QDebugStateSaver saver( debug ); QDebugStateSaver saver( debug );

2
src/common/QskSizePolicy.h
View File

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

5
src/common/QskTextColors.cpp
View File

@ -6,9 +6,8 @@
#include "QskTextColors.h" #include "QskTextColors.h"
#include "QskRgbValue.h" #include "QskRgbValue.h"
#include <QVariant> #include <qvariant.h>
#include <qhashfunctions.h> #include <qhashfunctions.h>
#include <QDebug>
uint QskTextColors::hash( uint seed ) const uint QskTextColors::hash( uint seed ) const
{ {
@ -42,6 +41,8 @@ QVariant QskTextColors::interpolate( const QskTextColors& from,
#ifndef QT_NO_DEBUG_STREAM #ifndef QT_NO_DEBUG_STREAM
#include <qdebug.h>
static inline void qskDebugColor( QDebug debug, const QColor& c ) static inline void qskDebugColor( QDebug debug, const QColor& c )
{ {
debug << '(' debug << '('

4
src/common/QskTextColors.h
View File

@ -7,8 +7,8 @@
#define QSK_TEXT_COLORS_H #define QSK_TEXT_COLORS_H
#include "QskGlobal.h" #include "QskGlobal.h"
#include <QColor> #include <qcolor.h>
#include <QMetaType> #include <qmetatype.h>
class QDebug; class QDebug;
class QVariant; class QVariant;

5
src/common/QskTextOptions.cpp
View File

@ -4,8 +4,7 @@
*****************************************************************************/ *****************************************************************************/
#include "QskTextOptions.h" #include "QskTextOptions.h"
#include <QTextDocument> #include <qtextdocument.h>
#include <QDebug>
#include <limits> #include <limits>
QskTextOptions::QskTextOptions(): QskTextOptions::QskTextOptions():
@ -135,6 +134,8 @@ uint qHash( const QskTextOptions &options, uint seed ) noexcept
#ifndef QT_NO_DEBUG_STREAM #ifndef QT_NO_DEBUG_STREAM
#include <qdebug.h>
QDebug operator<<( QDebug debug, const QskTextOptions& options ) QDebug operator<<( QDebug debug, const QskTextOptions& options )
{ {
QDebugStateSaver saver( debug ); QDebugStateSaver saver( debug );

4
src/common/QskTextOptions.h
View File

@ -7,8 +7,8 @@
#define QSK_TEXT_OPTIONS_H #define QSK_TEXT_OPTIONS_H
#include "QskGlobal.h" #include "QskGlobal.h"
#include <QMetaType> #include <qmetatype.h>
#include <QTextOption> #include <qtextoption.h>
class QDebug; class QDebug;

2
src/controls/QskAbstractButton.cpp
View File

@ -8,7 +8,7 @@
#include "QskEvent.h" #include "QskEvent.h"
#include "QskQuick.h" #include "QskQuick.h"
#include <QBasicTimer> #include <qbasictimer.h>
QSK_STATE( QskAbstractButton, Flat, QskAspect::FirstSystemState << 1 ) QSK_STATE( QskAbstractButton, Flat, QskAspect::FirstSystemState << 1 )
QSK_STATE( QskAbstractButton, Checked, QskAspect::LastSystemState >> 4 ) QSK_STATE( QskAbstractButton, Checked, QskAspect::LastSystemState >> 4 )

4
src/controls/QskAnimationHint.h
View File

@ -8,8 +8,8 @@
#include "QskGlobal.h" #include "QskGlobal.h"
#include <QEasingCurve> #include <qeasingcurve.h>
#include <QMetaType> #include <qmetatype.h>
class QSK_EXPORT QskAnimationHint class QSK_EXPORT QskAnimationHint
{ {

15
src/controls/QskAnimator.cpp
View File

@ -5,12 +5,15 @@
#include "QskAnimator.h" #include "QskAnimator.h"
#include <QObject> #include <qobject.h>
#include <QVector> #include <qvector.h>
#include <QQuickWindow> #include <qquickwindow.h>
#include <QElapsedTimer> #include <qelapsedtimer.h>
#include <QGlobalStatic> #include <qglobalstatic.h>
#include <QDebug>
#ifndef QT_NO_DEBUG_STREAM
#include <qdebug.h>
#endif
namespace namespace
{ {

4
src/controls/QskAnimator.h
View File

@ -7,8 +7,8 @@
#define QSK_ANIMATOR_H #define QSK_ANIMATOR_H
#include "QskGlobal.h" #include "QskGlobal.h"
#include <QEasingCurve> #include <qeasingcurve.h>
#include <QMetaObject> #include <qobjectdefs.h>
class QQuickWindow; class QQuickWindow;
class QObject; class QObject;

10
src/controls/QskControl.cpp
View File

@ -7,15 +7,14 @@
#include "QskQuick.h" #include "QskQuick.h"
#include "QskAspect.h" #include "QskAspect.h"
#include "QskSetup.h" #include "QskSetup.h"
#include "QskSkinlet.h"
#include "QskSkin.h"
#include "QskEvent.h" #include "QskEvent.h"
#include "QskDirtyItemFilter.h" #include "QskDirtyItemFilter.h"
#include "QskSkinHintTable.h" #include "QskSkinHintTable.h"
#include "QskSkin.h"
#include <QLocale> #include <qlocale.h>
#include <QVector> #include <qvector.h>
#include <QGlobalStatic> #include <qglobalstatic.h>
QSK_QT_PRIVATE_BEGIN QSK_QT_PRIVATE_BEGIN
#include <private/qquickitem_p.h> #include <private/qquickitem_p.h>
@ -26,7 +25,6 @@ QSK_QT_PRIVATE_END
#include <limits> #include <limits>
#include <unordered_set> #include <unordered_set>
#include <unordered_map>
QSK_STATE( QskControl, Disabled, QskAspect::FirstSystemState ) QSK_STATE( QskControl, Disabled, QskAspect::FirstSystemState )
QSK_STATE( QskControl, Hovered, QskAspect::LastSystemState >> 1 ) QSK_STATE( QskControl, Hovered, QskAspect::LastSystemState >> 1 )

4
src/controls/QskControl.h
View File

@ -12,8 +12,8 @@
#include "QskSizePolicy.h" #include "QskSizePolicy.h"
#include "QskAspect.h" #include "QskAspect.h"
#include <QQuickItem> #include <qquickitem.h>
#include <QLocale> #include <qlocale.h>
#include <memory> #include <memory>

3
src/controls/QskDirtyItemFilter.cpp
View File

@ -4,11 +4,8 @@
*****************************************************************************/ *****************************************************************************/
#include "QskDirtyItemFilter.h" #include "QskDirtyItemFilter.h"
#include "QskWindow.h"
#include "QskControl.h" #include "QskControl.h"
#include <QQuickWindow>
QSK_QT_PRIVATE_BEGIN QSK_QT_PRIVATE_BEGIN
#include <private/qquickwindow_p.h> #include <private/qquickwindow_p.h>
#include <private/qquickitem_p.h> #include <private/qquickitem_p.h>

4
src/controls/QskDirtyItemFilter.h
View File

@ -8,8 +8,8 @@
#include "QskGlobal.h" #include "QskGlobal.h"
#include <QObject> #include <qobject.h>
#include <QSet> #include <qset.h>
class QQuickWindow; class QQuickWindow;
class QQuickItem; class QQuickItem;

3
src/controls/QskEvent.cpp
View File

@ -1,6 +1,7 @@
#include "QskEvent.h" #include "QskEvent.h"
#include "QskGesture.h" #include "QskGesture.h"
#include <QKeyEvent>
#include <qevent.h>
static void qskRegisterEventTypes() static void qskRegisterEventTypes()
{ {

4
src/controls/QskEvent.h
View File

@ -9,8 +9,8 @@
#include "QskGlobal.h" #include "QskGlobal.h"
#include "QskAspect.h" #include "QskAspect.h"
#include <QEvent> #include <qcoreevent.h>
#include <QRectF> #include <qrect.h>
class QskGesture; class QskGesture;
class QQuickWindow; class QQuickWindow;

3
src/controls/QskFocusIndicator.cpp
View File

@ -5,11 +5,10 @@
#include "QskFocusIndicator.h" #include "QskFocusIndicator.h"
#include "QskQuick.h" #include "QskQuick.h"
#include "QskBoxNode.h"
#include "QskAspect.h" #include "QskAspect.h"
#include "QskEvent.h" #include "QskEvent.h"
#include <QQuickWindow> #include <qquickwindow.h>
QSK_SUBCONTROL( QskFocusIndicator, Panel ) QSK_SUBCONTROL( QskFocusIndicator, Panel )

4
src/controls/QskGesture.h
View File

@ -8,8 +8,8 @@
#include "QskGlobal.h" #include "QskGlobal.h"
#include <QPointF> #include <qpoint.h>
#include <QMetaType> #include <qmetatype.h>
class QSK_EXPORT QskGesture class QSK_EXPORT QskGesture
{ {

14
src/controls/QskGestureRecognizer.cpp
View File

@ -1,12 +1,12 @@
#include "QskGestureRecognizer.h" #include "QskGestureRecognizer.h"
#include <QQuickWindow> #include <qquickwindow.h>
#include <QQuickItem> #include <qquickitem.h>
#include <QCoreApplication> #include <qcoreapplication.h>
#include <QBasicTimer> #include <qcoreevent.h>
#include <QScopedPointer> #include <qbasictimer.h>
#include <QMouseEvent> #include <qscopedpointer.h>
#include <QVector> #include <qvector.h>
QSK_QT_PRIVATE_BEGIN QSK_QT_PRIVATE_BEGIN
#include <private/qquickwindow_p.h> #include <private/qquickwindow_p.h>

3
src/controls/QskGestureRecognizer.h
View File

@ -7,7 +7,8 @@
#define QSK_GESTURE_RECOGNIZER_H #define QSK_GESTURE_RECOGNIZER_H
#include "QskGlobal.h" #include "QskGlobal.h"
#include <Qt>
#include <qnamespace.h>
#include <memory> #include <memory>
class QQuickItem; class QQuickItem;

4
src/controls/QskGraphicLabel.cpp
View File

@ -6,12 +6,10 @@
#include "QskGraphicLabel.h" #include "QskGraphicLabel.h"
#include "QskGraphic.h" #include "QskGraphic.h"
#include "QskGraphicProvider.h" #include "QskGraphicProvider.h"
#include "QskGraphicTextureFactory.h"
#include "QskAspect.h" #include "QskAspect.h"
#include "QskSetup.h" #include "QskSetup.h"
#include "QskSkin.h" #include "QskSkin.h"
#include "QskColorFilter.h"
#include <QtMath>
QSK_SUBCONTROL( QskGraphicLabel, Graphic ) QSK_SUBCONTROL( QskGraphicLabel, Graphic )

5
src/controls/QskGraphicLabelSkinlet.cpp
View File

@ -5,10 +5,9 @@
#include "QskGraphicLabelSkinlet.h" #include "QskGraphicLabelSkinlet.h"
#include "QskGraphicLabel.h" #include "QskGraphicLabel.h"
#include "QskGraphic.h"
#include "QskGraphicTextureFactory.h"
#include "QskAspect.h" #include "QskAspect.h"
#include "QskSkin.h" #include "QskGraphic.h"
#include "QskColorFilter.h"
#include "QskTextureNode.h" #include "QskTextureNode.h"
#include "QskFunctions.h" #include "QskFunctions.h"

7
src/controls/QskHintAnimator.cpp
View File

@ -7,12 +7,9 @@
#include "QskAnimationHint.h" #include "QskAnimationHint.h"
#include "QskControl.h" #include "QskControl.h"
#include "QskEvent.h" #include "QskEvent.h"
#include "QskMargins.h"
#include "QskBoxBorderMetrics.h"
#include "QskBoxShapeMetrics.h"
#include <QObject> #include <qobject.h>
#include <QThread> #include <qthread.h>
#include <map> #include <map>
#include <vector> #include <vector>

4
src/controls/QskHintAnimator.h
View File

@ -10,7 +10,7 @@
#include "QskVariantAnimator.h" #include "QskVariantAnimator.h"
#include "QskAspect.h" #include "QskAspect.h"
#include <QPointer> #include <qpointer.h>
class QskControl; class QskControl;
class QskAnimationHint; class QskAnimationHint;
@ -26,7 +26,7 @@ public:
void setAspect( QskAspect::Aspect ); void setAspect( QskAspect::Aspect );
QskAspect::Aspect aspect() const; QskAspect::Aspect aspect() const;
void setControl( QskControl* control ); void setControl( QskControl* );
QskControl* control() const; QskControl* control() const;
virtual void advance( qreal value ) override; virtual void advance( qreal value ) override;

4
src/controls/QskInputGrabber.cpp
View File

@ -5,8 +5,8 @@
#include "QskInputGrabber.h" #include "QskInputGrabber.h"
#include "QskWindow.h" #include "QskWindow.h"
#include "QskQuick.h"
#include <QPointer> #include <qpointer.h>
QSK_QT_PRIVATE_BEGIN QSK_QT_PRIVATE_BEGIN
#include <private/qquickitem_p.h> #include <private/qquickitem_p.h>

14
src/controls/QskListViewSkinlet.cpp
View File

@ -5,17 +5,13 @@
#include "QskListViewSkinlet.h" #include "QskListViewSkinlet.h"
#include "QskListView.h" #include "QskListView.h"
#include "QskAspect.h"
#include "QskTextOptions.h"
#include "QskTextNode.h"
#include "QskGraphic.h"
#include "QskGraphicNode.h"
#include "QskColorFilter.h" #include "QskColorFilter.h"
#include "QskGraphic.h"
#include <QSGSimpleRectNode> #include <qsgnode.h>
#include <QSGTransformNode> #include <qsgsimplerectnode.h>
#include <QTransform> #include <qtransform.h>
#include <QtMath> #include <qmath.h>
class QskListViewNode final : public QSGTransformNode class QskListViewNode final : public QSGTransformNode
{ {

7
src/controls/QskObjectTree.cpp
View File

@ -4,9 +4,10 @@
*****************************************************************************/ *****************************************************************************/
#include "QskObjectTree.h" #include "QskObjectTree.h"
#include <QQuickWindow>
#include <QQuickItem> #include <qquickwindow.h>
#include <QGuiApplication> #include <qquickitem.h>
#include <qguiapplication.h>
bool QskObjectTree::isRoot( const QObject* object ) bool QskObjectTree::isRoot( const QObject* object )
{ {

2
src/controls/QskObjectTree.h
View File

@ -10,7 +10,7 @@
#include "QskControl.h" #include "QskControl.h"
#include "QskWindow.h" #include "QskWindow.h"
#include <QVariant> #include <qvariant.h>
namespace QskObjectTree namespace QskObjectTree
{ {

1
src/controls/QskPageIndicator.cpp
View File

@ -4,7 +4,6 @@
*****************************************************************************/ *****************************************************************************/
#include "QskPageIndicator.h" #include "QskPageIndicator.h"
#include "QskPageIndicatorSkinlet.h"
#include "QskAspect.h" #include "QskAspect.h"
QSK_SUBCONTROL( QskPageIndicator, Panel ) QSK_SUBCONTROL( QskPageIndicator, Panel )

8
src/controls/QskPanGestureRecognizer.cpp
View File

@ -2,10 +2,10 @@
#include "QskGesture.h" #include "QskGesture.h"
#include "QskEvent.h" #include "QskEvent.h"
#include <QQuickItem> #include <qquickitem.h>
#include <QCoreApplication> #include <qcoreapplication.h>
#include <QtMath> #include <qmath.h>
#include <QLineF> #include <qline.h>
static inline qreal qskDistance( const QPointF& from, const QPointF& to, static inline qreal qskDistance( const QPointF& from, const QPointF& to,
Qt::Orientations orientations ) Qt::Orientations orientations )

2
src/controls/QskPopup.cpp
View File

@ -8,10 +8,8 @@
#include "QskAspect.h" #include "QskAspect.h"
#include "QskWindow.h" #include "QskWindow.h"
#include "QskQuick.h" #include "QskQuick.h"
#include <QtMath>
QSK_QT_PRIVATE_BEGIN QSK_QT_PRIVATE_BEGIN
#include <private/qquickitem_p.h>
#include <private/qquickwindow_p.h> #include <private/qquickwindow_p.h>
QSK_QT_PRIVATE_END QSK_QT_PRIVATE_END

2
src/controls/QskPushButton.cpp
View File

@ -14,7 +14,7 @@
#include "QskSetup.h" #include "QskSetup.h"
#include "QskSkinlet.h" #include "QskSkinlet.h"
#include <QFontMetricsF> #include <qfontmetrics.h>
QSK_SUBCONTROL( QskPushButton, Panel ) QSK_SUBCONTROL( QskPushButton, Panel )
QSK_SUBCONTROL( QskPushButton, Text ) QSK_SUBCONTROL( QskPushButton, Text )

4
src/controls/QskPushButtonSkinlet.cpp
View File

@ -8,8 +8,8 @@
#include "QskGraphic.h" #include "QskGraphic.h"
#include "QskTextOptions.h" #include "QskTextOptions.h"
#include <QFontMetrics> #include <qfontmetrics.h>
#include <QtMath> #include <qmath.h>
QskPushButtonSkinlet::QskPushButtonSkinlet( QskSkin* skin ): QskPushButtonSkinlet::QskPushButtonSkinlet( QskSkin* skin ):
Inherited( skin ) Inherited( skin )

1
src/controls/QskQuick.cpp
View File

@ -5,6 +5,7 @@
#include "QskQuick.h" #include "QskQuick.h"
#include "QskControl.h" #include "QskControl.h"
#include <qquickitem.h>
QSK_QT_PRIVATE_BEGIN QSK_QT_PRIVATE_BEGIN
#include <private/qquickitem_p.h> #include <private/qquickitem_p.h>

7
src/controls/QskQuick.h
View File

@ -7,7 +7,12 @@
#define QSK_QUICK_H 1 #define QSK_QUICK_H 1
#include "QskGlobal.h" #include "QskGlobal.h"
#include <QQuickItem> #include <qnamespace.h>
class QQuickItem;
class QSGNode;
class QRectF;
template <typename T> class QList;
/* /*
Exporting methods from QQuickItemPrivate, that should be part Exporting methods from QQuickItemPrivate, that should be part

1
src/controls/QskRangeControl.cpp
View File

@ -4,7 +4,6 @@
*****************************************************************************/ *****************************************************************************/
#include "QskRangeControl.h" #include "QskRangeControl.h"
#include "QskAspect.h"
#include "QskFunctions.h" #include "QskFunctions.h"
class QskRangeControl::PrivateData class QskRangeControl::PrivateData

2
src/controls/QskRgbValue.h
View File

@ -7,7 +7,7 @@
#define QSK_RGB_VALUE_H #define QSK_RGB_VALUE_H
#include "QskGlobal.h" #include "QskGlobal.h"
#include <QColor> #include <qcolor.h>
#define QSK_RGB_VALUES \ #define QSK_RGB_VALUES \
/* Web colors */ \ /* Web colors */ \

2
src/controls/QskScrollView.cpp
View File

@ -12,8 +12,6 @@
#include "QskAspect.h" #include "QskAspect.h"
#include "QskEvent.h" #include "QskEvent.h"
#include <QSGNode>
QSK_SUBCONTROL( QskScrollView, Panel ) QSK_SUBCONTROL( QskScrollView, Panel )
QSK_SUBCONTROL( QskScrollView, Viewport ) QSK_SUBCONTROL( QskScrollView, Viewport )
QSK_SUBCONTROL( QskScrollView, HorizontalScrollBar ) QSK_SUBCONTROL( QskScrollView, HorizontalScrollBar )

4
src/controls/QskScrollViewSkinlet.cpp
View File

@ -7,10 +7,8 @@
#include "QskScrollView.h" #include "QskScrollView.h"
#include "QskQuick.h" #include "QskQuick.h"
#include "QskAspect.h" #include "QskAspect.h"
#include "QskFunctions.h"
#include <QTransform> #include <qsgnode.h>
#include <QSGNode>
static void qskAlignedHandle( qreal start, qreal end, static void qskAlignedHandle( qreal start, qreal end,
qreal scrollBarLength, qreal minHandleLength, qreal scrollBarLength, qreal minHandleLength,

8
src/controls/QskSetup.cpp
View File

@ -11,11 +11,9 @@
#include "QskWindow.h" #include "QskWindow.h"
#include "QskObjectTree.h" #include "QskObjectTree.h"
#include <QGuiApplication> #include <qpointer.h>
#include <QStyleHints> #include <qguiapplication.h>
#include <qstylehints.h>
#include <QPointer>
#include <QDebug>
QskSetup* QskSetup::s_instance = nullptr; QskSetup* QskSetup::s_instance = nullptr;

8
src/controls/QskShortcut.cpp
View File

@ -5,9 +5,13 @@
#include "QskShortcut.h" #include "QskShortcut.h"
#include "QskShortcutMap.h" #include "QskShortcutMap.h"
#include <QQuickItem>
#include <QQuickWindow> #include <qquickitem.h>
#include <qquickwindow.h>
QSK_QT_PRIVATE_BEGIN
#include <QtGui/private/qguiapplication_p.h> #include <QtGui/private/qguiapplication_p.h>
QSK_QT_PRIVATE_END
static inline QShortcutMap& qskShortcutMap() static inline QShortcutMap& qskShortcutMap()
{ {

7
src/controls/QskShortcut.h
View File

@ -8,9 +8,10 @@
#include "QskGlobal.h" #include "QskGlobal.h"
#include <QObject> #include <qobject.h>
#include <QQmlParserStatus> #include <qqmlparserstatus.h>
#include <Qt> #include <qnamespace.h>
#include <memory> #include <memory>
class QKeySequence; class QKeySequence;

9
src/controls/QskShortcutMap.cpp
View File

@ -4,14 +4,15 @@
*****************************************************************************/ *****************************************************************************/
#include "QskShortcutMap.h" #include "QskShortcutMap.h"
#include "QskControl.h"
#include "QskQuick.h" #include "QskQuick.h"
#include "QskMetaInvokable.h" #include "QskMetaInvokable.h"
#include <QQuickWindow> #include <qquickitem.h>
#include <QKeySequence> #include <qkeysequence.h>
#include <QGlobalStatic>
QSK_QT_PRIVATE_BEGIN
#include <QtGui/private/qguiapplication_p.h> #include <QtGui/private/qguiapplication_p.h>
QSK_QT_PRIVATE_END
#include <map> #include <map>

2
src/controls/QskShortcutMap.h
View File

@ -9,7 +9,7 @@
#include "QskGlobal.h" #include "QskGlobal.h"
#include "QskMetaFunction.h" #include "QskMetaFunction.h"
#include <QQuickWindow> #include <qquickwindow.h>
class QQuickItem; class QQuickItem;
class QKeySequence; class QKeySequence;

3
src/controls/QskSimpleListBox.cpp
View File

@ -5,7 +5,8 @@
#include "QskSimpleListBox.h" #include "QskSimpleListBox.h"
#include "QskAspect.h" #include "QskAspect.h"
#include <QFontMetricsF>
#include <qfontmetrics.h>
static inline qreal qskMaxWidth( static inline qreal qskMaxWidth(
const QFont& font, const QStringList& list ) const QFont& font, const QStringList& list )

3
src/controls/QskSimpleListBox.h
View File

@ -8,7 +8,8 @@
#include "QskGlobal.h" #include "QskGlobal.h"
#include "QskListView.h" #include "QskListView.h"
#include <QStringList>
#include <qstringlist.h>
class QSK_EXPORT QskSimpleListBox : public QskListView class QSK_EXPORT QskSimpleListBox : public QskListView
{ {

7
src/controls/QskSkin.cpp
View File

@ -9,13 +9,10 @@
#include "QskGraphic.h" #include "QskGraphic.h"
#include "QskColorFilter.h" #include "QskColorFilter.h"
#include "QskGraphicProviderMap.h" #include "QskGraphicProviderMap.h"
#include "QskSetup.h"
#include "QskAnimationHint.h" #include "QskAnimationHint.h"
#include "QskStandardSymbol.h" #include "QskStandardSymbol.h"
#include "QskSkinHintTable.h" #include "QskSkinHintTable.h"
#include "QskFocusIndicator.h"
QSK_QT_PRIVATE_BEGIN QSK_QT_PRIVATE_BEGIN
#include <private/qguiapplication_p.h> #include <private/qguiapplication_p.h>
QSK_QT_PRIVATE_END QSK_QT_PRIVATE_END
@ -23,11 +20,7 @@ QSK_QT_PRIVATE_END
#include <qpa/qplatformtheme.h> #include <qpa/qplatformtheme.h>
#include <qpa/qplatformdialoghelper.h> #include <qpa/qplatformdialoghelper.h>
#include <QtAlgorithms>
#include <algorithm>
#include <unordered_map> #include <unordered_map>
#include <unordered_set>
#include <cmath> #include <cmath>
#include "QskBox.h" #include "QskBox.h"

4
src/controls/QskSkin.h
View File

@ -9,8 +9,8 @@
#include "QskGlobal.h" #include "QskGlobal.h"
#include "QskAspect.h" #include "QskAspect.h"
#include <QObject> #include <qobject.h>
#include <QColor> #include <qcolor.h>
#include <unordered_map> #include <unordered_map>
#include <memory> #include <memory>

2
src/controls/QskSkinFactory.h
View File

@ -7,7 +7,7 @@
#define QSK_SKIN_FACTORY_H #define QSK_SKIN_FACTORY_H
#include "QskGlobal.h" #include "QskGlobal.h"
#include <QObject> #include <qobject.h>
class QskSkin; class QskSkin;
class QStringList; class QStringList;

5
src/controls/QskSkinHintTable.h
View File

@ -15,11 +15,10 @@
#include "QskBoxBorderColors.h" #include "QskBoxBorderColors.h"
#include "QskAnimationHint.h" #include "QskAnimationHint.h"
#include <QVariant> #include <qvariant.h>
#include <QColor> #include <qcolor.h>
#include <unordered_map> #include <unordered_map>
#include <set>
class QSK_EXPORT QskSkinHintTable class QSK_EXPORT QskSkinHintTable
{ {

16
src/controls/QskSkinManager.cpp
View File

@ -6,14 +6,14 @@
#include "QskSkinManager.h" #include "QskSkinManager.h"
#include "QskSkinFactory.h" #include "QskSkinFactory.h"
#include <QGlobalStatic> #include <qglobalstatic.h>
#include <QDir> #include <qdir.h>
#include <QPluginLoader> #include <qpluginloader.h>
#include <QJsonObject> #include <qjsonobject.h>
#include <QJsonArray> #include <qjsonarray.h>
#include <QMap> #include <qmap.h>
#include <QSet> #include <qset.h>
#include <QPointer> #include <qpointer.h>
/* /*
We could use QFactoryLoader, but as it is again a "private" class We could use QFactoryLoader, but as it is again a "private" class

2
src/controls/QskSkinManager.h
View File

@ -7,7 +7,7 @@
#define QSK_SKIN_MANAGER_H #define QSK_SKIN_MANAGER_H
#include "QskGlobal.h" #include "QskGlobal.h"
#include <QObject> #include <qobject.h>
#include <memory> #include <memory>
class QskSkin; class QskSkin;

12
src/controls/QskSkinTransition.cpp
View File

@ -5,12 +5,12 @@
#include "QskColorFilter.h" #include "QskColorFilter.h"
#include "QskHintAnimator.h" #include "QskHintAnimator.h"
#include <QGuiApplication> #include <qguiapplication.h>
#include <QQuickWindow> #include <qquickwindow.h>
#include <QVector> #include <qvector.h>
#include <QObject> #include <qobject.h>
#include <QPointer> #include <qvector.h>
#include <QGlobalStatic> #include <qglobalstatic.h>
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>

1
src/controls/QskSkinTransition.h
View File

@ -5,7 +5,6 @@
#include "QskAspect.h" #include "QskAspect.h"
#include "QskAnimationHint.h" #include "QskAnimationHint.h"
class QskAnimatorHint;
class QskSkin; class QskSkin;
class QVariant; class QVariant;

10
src/controls/QskSkinlet.cpp
View File

@ -6,8 +6,6 @@
#include "QskSkinlet.h" #include "QskSkinlet.h"
#include "QskAspect.h" #include "QskAspect.h"
#include "QskSetup.h"
#include "QskSkin.h"
#include "QskControl.h" #include "QskControl.h"
#include "QskBoxShapeMetrics.h" #include "QskBoxShapeMetrics.h"
#include "QskBoxBorderMetrics.h" #include "QskBoxBorderMetrics.h"
@ -22,11 +20,9 @@
#include "QskGraphicTextureFactory.h" #include "QskGraphicTextureFactory.h"
#include "QskFunctions.h" #include "QskFunctions.h"
#include <QQuickWindow> #include <qquickwindow.h>
#include <QGuiApplication> #include <qguiapplication.h>
#include <QSGSimpleRectNode> #include <qsgsimplerectnode.h>
#include <unordered_map>
static const int qskBackgroundRole = 254; static const int qskBackgroundRole = 254;
static const int qskDebugRole = 253; static const int qskDebugRole = 253;

5
src/controls/QskSkinlet.h
View File

@ -9,8 +9,9 @@
#include "QskGlobal.h" #include "QskGlobal.h"
#include "QskAspect.h" #include "QskAspect.h"
#include <Qt> #include <qnamespace.h>
#include <QRectF> #include <qrect.h>
#include <memory> #include <memory>
class QskSkin; class QskSkin;

4
src/controls/QskSkinnable.cpp
View File

@ -17,9 +17,7 @@
#include "QskColorFilter.h" #include "QskColorFilter.h"
#include "QskSkinTransition.h" #include "QskSkinTransition.h"
#include <QFont> #include <qfont.h>
#include <QElapsedTimer>
#include <QMarginsF>
#define DEBUG_MAP 0 #define DEBUG_MAP 0
#define DEBUG_ANIMATOR 0 #define DEBUG_ANIMATOR 0

3
src/controls/QskSkinnable.h
View File

@ -9,7 +9,7 @@
#include "QskGlobal.h" #include "QskGlobal.h"
#include "QskAspect.h" #include "QskAspect.h"
#include <QVariant> #include <qvariant.h>
#include <memory> #include <memory>
typedef unsigned int QRgb; typedef unsigned int QRgb;
@ -19,7 +19,6 @@ class QColor;
class QFont; class QFont;
class QMarginsF; class QMarginsF;
struct QMetaObject; struct QMetaObject;
class QVariant;
class QDebug; class QDebug;
class QSGNode; class QSGNode;

2
src/controls/QskSlider.cpp
View File

@ -7,8 +7,6 @@
#include "QskAspect.h" #include "QskAspect.h"
#include "QskAnimationHint.h" #include "QskAnimationHint.h"
#include <QtMath>
QSK_SUBCONTROL( QskSlider, Panel ) QSK_SUBCONTROL( QskSlider, Panel )
QSK_SUBCONTROL( QskSlider, Groove ) QSK_SUBCONTROL( QskSlider, Groove )
QSK_SUBCONTROL( QskSlider, Fill ) QSK_SUBCONTROL( QskSlider, Fill )

3
src/controls/QskStatusIndicator.cpp
View File

@ -7,7 +7,8 @@
#include "QskGraphic.h" #include "QskGraphic.h"
#include "QskColorFilter.h" #include "QskColorFilter.h"
#include "QskGraphicProvider.h" #include "QskGraphicProvider.h"
#include <QDebug>
#include <qdebug.h>
QSK_SUBCONTROL( QskStatusIndicator, Graphic ) QSK_SUBCONTROL( QskStatusIndicator, Graphic )

4
src/controls/QskStatusIndicatorSkinlet.cpp
View File

@ -6,10 +6,8 @@
#include "QskStatusIndicatorSkinlet.h" #include "QskStatusIndicatorSkinlet.h"
#include "QskStatusIndicator.h" #include "QskStatusIndicator.h"
#include "QskGraphic.h" #include "QskGraphic.h"
#include "QskGraphicTextureFactory.h" #include "QskColorFilter.h"
#include "QskAspect.h" #include "QskAspect.h"
#include "QskSkin.h"
#include "QskTextureNode.h"
#include "QskFunctions.h" #include "QskFunctions.h"
QskStatusIndicatorSkinlet::QskStatusIndicatorSkinlet( QskSkin* skin ): QskStatusIndicatorSkinlet::QskStatusIndicatorSkinlet( QskSkin* skin ):

4
src/controls/QskSubWindow.cpp
View File

@ -6,12 +6,8 @@
#include "QskSubWindow.h" #include "QskSubWindow.h"
#include "QskQuick.h" #include "QskQuick.h"
#include "QskAspect.h" #include "QskAspect.h"
#include "QskSkin.h"
#include "QskFunctions.h" #include "QskFunctions.h"
#include <QQuickWindow>
#include <QtMath>
QSK_SUBCONTROL( QskSubWindow, Panel ) QSK_SUBCONTROL( QskSubWindow, Panel )
QSK_SUBCONTROL( QskSubWindow, TitleBar ) QSK_SUBCONTROL( QskSubWindow, TitleBar )

2
src/controls/QskSubWindowArea.cpp
View File

@ -8,7 +8,7 @@
#include "QskFunctions.h" #include "QskFunctions.h"
#include "QskEvent.h" #include "QskEvent.h"
#include <QTimer> #include <qtimer.h>
QSK_SUBCONTROL( QskSubWindowArea, Panel ) QSK_SUBCONTROL( QskSubWindowArea, Panel )

2
src/controls/QskSubWindowSkinlet.cpp
View File

@ -8,7 +8,7 @@
#include "QskAspect.h" #include "QskAspect.h"
#include "QskBoxBorderMetrics.h" #include "QskBoxBorderMetrics.h"
#include <QFontMetricsF> #include <qfontmetrics.h>
QskSubWindowSkinlet::QskSubWindowSkinlet( QskSkin* skin ): QskSubWindowSkinlet::QskSubWindowSkinlet( QskSkin* skin ):
Inherited( skin ) Inherited( skin )

4
src/controls/QskTabButton.cpp
View File

@ -8,8 +8,8 @@
#include "QskTextOptions.h" #include "QskTextOptions.h"
#include "QskSkinlet.h" #include "QskSkinlet.h"
#include <QFontMetricsF> #include <qfontmetrics.h>
#include <QPointer> #include <qpointer.h>
QSK_SUBCONTROL( QskTabButton, Panel ) QSK_SUBCONTROL( QskTabButton, Panel )
QSK_SUBCONTROL( QskTabButton, Text ) QSK_SUBCONTROL( QskTabButton, Text )

3
src/controls/QskTabButtonSkinlet.cpp
View File

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

4
src/controls/QskTextLabel.cpp
View File

@ -8,8 +8,8 @@
#include "QskTextOptions.h" #include "QskTextOptions.h"
#include "QskTextRenderer.h" #include "QskTextRenderer.h"
#include <QFontMetricsF> #include <qfontmetrics.h>
#include <QtMath> #include <qmath.h>
QSK_SUBCONTROL( QskTextLabel, Text ) QSK_SUBCONTROL( QskTextLabel, Text )

5
src/controls/QskVariantAnimator.cpp
View File

@ -15,8 +15,11 @@
// Even if we don't use the standard Qt animation system we // Even if we don't use the standard Qt animation system we
// use its registry of interpolators: why adding our own ... // use its registry of interpolators: why adding our own ...
#include <QVariantAnimation> #include <qvariantanimation.h>
QSK_QT_PRIVATE_BEGIN
#include <private/qvariantanimation_p.h> #include <private/qvariantanimation_p.h>
QSK_QT_PRIVATE_END
#if 1 #if 1
static void qskRegisterInterpolator() static void qskRegisterInterpolator()

2
src/controls/QskVariantAnimator.h
View File

@ -8,7 +8,7 @@
#include "QskGlobal.h" #include "QskGlobal.h"
#include "QskAnimator.h" #include "QskAnimator.h"
#include <QVariant> #include <qvariant.h>
class QSK_EXPORT QskVariantAnimator : public QskAnimator class QSK_EXPORT QskVariantAnimator : public QskAnimator
{ {

6
src/controls/QskWindow.cpp
View File

@ -6,13 +6,11 @@
#include "QskWindow.h" #include "QskWindow.h"
#include "QskControl.h" #include "QskControl.h"
#include "QskQuick.h" #include "QskQuick.h"
#include "QskAspect.h"
#include "QskSetup.h" #include "QskSetup.h"
#include "QskSkin.h"
#include "QskEvent.h" #include "QskEvent.h"
#include <QtMath> #include <qmath.h>
#include <QPointer> #include <qpointer.h>
QSK_QT_PRIVATE_BEGIN QSK_QT_PRIVATE_BEGIN
#include <private/qquickitem_p.h> #include <private/qquickitem_p.h>

2
src/controls/QskWindow.h
View File

@ -7,7 +7,7 @@
#define QSK_WINDOW_H 1 #define QSK_WINDOW_H 1
#include "QskGlobal.h" #include "QskGlobal.h"
#include <QQuickWindow> #include <qquickwindow.h>
class QskWindowPrivate; class QskWindowPrivate;
class QskObjectAttributes; class QskObjectAttributes;

7
src/dialogs/QskDialog.cpp
View File

@ -14,11 +14,10 @@
#include "QskFocusIndicator.h" #include "QskFocusIndicator.h"
#include "QskStandardSymbol.h" #include "QskStandardSymbol.h"
#include "QskAspect.h"
#include <QPointer> #include <qpointer.h>
#include <QQuickWindow> #include <qquickwindow.h>
#include <QGuiApplication> #include <qguiapplication.h>
static QskDialog::DialogCode qskExec( QskDialogWindow* dialogWindow ) static QskDialog::DialogCode qskExec( QskDialogWindow* dialogWindow )
{ {

2
src/dialogs/QskDialog.h
View File

@ -7,7 +7,7 @@
#define QSK_DIALOG_H 1 #define QSK_DIALOG_H 1
#include "QskGlobal.h" #include "QskGlobal.h"
#include <QObject> #include <qobject.h>
#include <memory> #include <memory>
class QString; class QString;

7
src/dialogs/QskDialogButtonBox.cpp
View File

@ -8,11 +8,14 @@
#include "QskLinearBox.h" #include "QskLinearBox.h"
#include "QskSkin.h" #include "QskSkin.h"
#include <QKeyEvent> #include <qevent.h>
#include <private/qguiapplication_p.h>
#include <qpa/qplatformtheme.h> #include <qpa/qplatformtheme.h>
#include <qpa/qplatformdialoghelper.h> #include <qpa/qplatformdialoghelper.h>
QSK_QT_PRIVATE_BEGIN
#include <private/qguiapplication_p.h>
QSK_QT_PRIVATE_END
QSK_SUBCONTROL( QskDialogButtonBox, Panel ) QSK_SUBCONTROL( QskDialogButtonBox, Panel )
static void qskSendEventTo( QObject* object, QEvent::Type type ) static void qskSendEventTo( QObject* object, QEvent::Type type )

5
src/dialogs/QskDialogSubWindow.cpp
View File

@ -4,8 +4,9 @@
*****************************************************************************/ *****************************************************************************/
#include "QskDialogSubWindow.h" #include "QskDialogSubWindow.h"
#include <QEventLoop>
#include <QQuickWindow> #include <qeventloop.h>
#include <qquickwindow.h>
static inline void qskSetRejectOnClose( QskDialogSubWindow* subWindow, bool on ) static inline void qskSetRejectOnClose( QskDialogSubWindow* subWindow, bool on )
{ {

Some files were not shown because too many files have changed in this diff Show More