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

dh

This commit is contained in:
Uwe Rathmann 2018-07-31 17:32:25 +02:00
parent ec101b7d56
commit 68bc2f032c
136 changed files with 512 additions and 514 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/automotive/ButtonBar.cpp
View File

@ -6,7 +6,7 @@
QSK_SUBCONTROL( ButtonBar, Indicator ) QSK_SUBCONTROL( ButtonBar, Indicator )
class IndicatorLabel : public QskGraphicLabel class IndicatorLabel final : public QskGraphicLabel
{ {
public: public:
IndicatorLabel( QQuickItem* parentItem = nullptr ): IndicatorLabel( QQuickItem* parentItem = nullptr ):
@ -16,8 +16,8 @@ public:
setGraphicRole( SkinFactory::Indicator ); setGraphicRole( SkinFactory::Indicator );
} }
virtual QskAspect::Subcontrol effectiveSubcontrol( QskAspect::Subcontrol effectiveSubcontrol(
QskAspect::Subcontrol subControl ) const override final QskAspect::Subcontrol subControl ) const override
{ {
// so that we can set specific colors in the skin // so that we can set specific colors in the skin

2
examples/automotive/ButtonBar.h
View File

@ -12,7 +12,7 @@ public:
void addIndicator( const char* name ); void addIndicator( const char* name );
protected: protected:
virtual QSizeF contentsSizeHint() const override; QSizeF contentsSizeHint() const override;
}; };
#endif #endif

4
examples/automotive/DefaultSkin.cpp
View File

@ -21,10 +21,10 @@
#include <QDebug> #include <QDebug>
class Transition : public QskSkinTransition class Transition final : public QskSkinTransition
{ {
protected: protected:
virtual void updateSkin( QskSkin*, QskSkin* newSkin ) override final void updateSkin( QskSkin*, QskSkin* newSkin ) override
{ {
DefaultSkin* skin = static_cast< DefaultSkin* >( newSkin ); DefaultSkin* skin = static_cast< DefaultSkin* >( newSkin );
skin->resetHints(); skin->resetHints();

2
examples/automotive/DefaultSkin.h
View File

@ -9,7 +9,7 @@ class DefaultSkin : public QskSkin
{ {
public: public:
DefaultSkin( const QString& name, QObject* parent = nullptr ); DefaultSkin( const QString& name, QObject* parent = nullptr );
virtual ~DefaultSkin(); ~DefaultSkin() override;
void toggleScheme(); void toggleScheme();
void resetHints(); void resetHints();

2
examples/automotive/OtherSkin.h
View File

@ -9,7 +9,7 @@ class OtherSkin : public QskSkin
{ {
public: public:
OtherSkin( const QString& name, QObject* parent = nullptr ); OtherSkin( const QString& name, QObject* parent = nullptr );
virtual ~OtherSkin(); ~OtherSkin() override;
private: private:
void initHints(); void initHints();

4
examples/automotive/SkinFactory.h
View File

@ -20,8 +20,8 @@ public:
Vehicle Vehicle
}; };
virtual QStringList skinNames() const override; QStringList skinNames() const override;
virtual QskSkin* createSkin( const QString& skinName ) override; QskSkin* createSkin( const QString& skinName ) override;
public Q_SLOTS: public Q_SLOTS:
void rotateSkin(); void rotateSkin();

44
examples/automotive/SoundControl.cpp
View File

@ -20,7 +20,7 @@ QSK_SUBCONTROL( SoundControl, MarkerControl )
QSK_SUBCONTROL( SoundControl, Vehicle ) QSK_SUBCONTROL( SoundControl, Vehicle )
QSK_SUBCONTROL( SoundControl, SliderControl ) QSK_SUBCONTROL( SoundControl, SliderControl )
class VehicleLabel : public QskGraphicLabel class VehicleLabel final : public QskGraphicLabel
{ {
public: public:
VehicleLabel( QQuickItem* parentItem = nullptr ): VehicleLabel( QQuickItem* parentItem = nullptr ):
@ -29,8 +29,8 @@ public:
setGraphic( QskGraphicIO::read( QString( ":/qvg/car.qvg" ) ) ); setGraphic( QskGraphicIO::read( QString( ":/qvg/car.qvg" ) ) );
} }
virtual QskAspect::Subcontrol effectiveSubcontrol( QskAspect::Subcontrol effectiveSubcontrol(
QskAspect::Subcontrol subControl ) const override final QskAspect::Subcontrol subControl ) const override
{ {
// so that we can set specific colors in the skin // so that we can set specific colors in the skin
@ -41,7 +41,7 @@ public:
} }
}; };
class CrossHairLine : public QskBox class CrossHairLine final : public QskBox
{ {
public: public:
CrossHairLine( QQuickItem* parent ): CrossHairLine( QQuickItem* parent ):
@ -49,8 +49,8 @@ public:
{ {
} }
virtual QskAspect::Subcontrol effectiveSubcontrol( QskAspect::Subcontrol effectiveSubcontrol(
QskAspect::Subcontrol subControl ) const override final QskAspect::Subcontrol subControl ) const override
{ {
if ( subControl == QskBox::Panel ) if ( subControl == QskBox::Panel )
return SoundControl::CrossHair; return SoundControl::CrossHair;
@ -59,7 +59,7 @@ public:
} }
}; };
class BalanceFadeMarker : public QskBox class BalanceFadeMarker final : public QskBox
{ {
public: public:
BalanceFadeMarker( QQuickItem* parent ): BalanceFadeMarker( QQuickItem* parent ):
@ -67,8 +67,8 @@ public:
{ {
} }
virtual QskAspect::Subcontrol effectiveSubcontrol( QskAspect::Subcontrol effectiveSubcontrol(
QskAspect::Subcontrol subControl ) const override final QskAspect::Subcontrol subControl ) const override
{ {
if ( subControl == QskBox::Panel ) if ( subControl == QskBox::Panel )
return SoundControl::Marker; return SoundControl::Marker;
@ -77,7 +77,7 @@ public:
} }
}; };
class MarkerControlButton : public QskPushButton class MarkerControlButton final : public QskPushButton
{ {
public: public:
MarkerControlButton( Qsk::Direction direction, QQuickItem* parentItem = nullptr ): MarkerControlButton( Qsk::Direction direction, QQuickItem* parentItem = nullptr ):
@ -115,8 +115,8 @@ public:
return QPointF(); return QPointF();
} }
virtual QskAspect::Subcontrol effectiveSubcontrol( QskAspect::Subcontrol effectiveSubcontrol(
QskAspect::Subcontrol subControl ) const override final QskAspect::Subcontrol subControl ) const override
{ {
// so that we can set specific colors in the skin // so that we can set specific colors in the skin
@ -127,7 +127,7 @@ public:
} }
protected: protected:
virtual QSizeF contentsSizeHint() const override final QSizeF contentsSizeHint() const override
{ {
const qreal dim = 100; const qreal dim = 100;
@ -141,7 +141,7 @@ private:
const Qsk::Direction m_direction; const Qsk::Direction m_direction;
}; };
class ControlButton : public QskPushButton class ControlButton final : public QskPushButton
{ {
public: public:
ControlButton( const char symbol, QQuickItem* parentItem = nullptr ): ControlButton( const char symbol, QQuickItem* parentItem = nullptr ):
@ -153,7 +153,7 @@ public:
setAutoRepeat( true ); setAutoRepeat( true );
} }
virtual QskAspect::Subcontrol effectiveSubcontrol( QskAspect::Subcontrol effectiveSubcontrol(
QskAspect::Subcontrol subControl ) const override QskAspect::Subcontrol subControl ) const override
{ {
if ( subControl == QskPushButton::Panel ) if ( subControl == QskPushButton::Panel )
@ -162,14 +162,14 @@ public:
return QskPushButton::effectiveSubcontrol( subControl ); return QskPushButton::effectiveSubcontrol( subControl );
} }
virtual QSizeF contentsSizeHint() const override final QSizeF contentsSizeHint() const override
{ {
qreal h = QskPushButton::contentsSizeHint().height(); qreal h = QskPushButton::contentsSizeHint().height();
return QSizeF( h, h ); return QSizeF( h, h );
} }
}; };
class StackedControl : public QskControl class StackedControl final : public QskControl
{ {
public: public:
StackedControl( QQuickItem* parent = nullptr ): StackedControl( QQuickItem* parent = nullptr ):
@ -203,7 +203,7 @@ public:
} }
protected: protected:
virtual void updateLayout() override final void updateLayout() override
{ {
const QRectF cr = contentsRect(); const QRectF cr = contentsRect();
const qreal crossHairSize = 3; const qreal crossHairSize = 3;
@ -242,7 +242,7 @@ private:
QPointF m_offset; QPointF m_offset;
}; };
class SectionTitleBar : public QskLinearBox class SectionTitleBar final : public QskLinearBox
{ {
public: public:
SectionTitleBar( const char* title, QQuickItem* parentItem = nullptr ): SectionTitleBar( const char* title, QQuickItem* parentItem = nullptr ):
@ -262,7 +262,7 @@ public:
} }
}; };
class SliderBox : public QskLinearBox class SliderBox final : public QskLinearBox
{ {
public: public:
SliderBox( const char* title, qreal min, qreal max, QQuickItem* parentItem = nullptr ): SliderBox( const char* title, qreal min, qreal max, QQuickItem* parentItem = nullptr ):
@ -328,7 +328,7 @@ private:
QskSlider* m_slider; QskSlider* m_slider;
}; };
class ToneControlBox : public QskLinearBox class ToneControlBox final : public QskLinearBox
{ {
public: public:
ToneControlBox( QQuickItem* parentItem = nullptr ): ToneControlBox( QQuickItem* parentItem = nullptr ):
@ -344,7 +344,7 @@ public:
} }
}; };
class BalanceFadeControlBox : public QskGridBox class BalanceFadeControlBox final : public QskGridBox
{ {
public: public:
BalanceFadeControlBox( QQuickItem* parentItem = nullptr ): BalanceFadeControlBox( QQuickItem* parentItem = nullptr ):

4
examples/automotive/SoundControl.h
View File

@ -10,8 +10,8 @@ public:
SoundControl( QQuickItem* parent = nullptr ); SoundControl( QQuickItem* parent = nullptr );
virtual QskAspect::Subcontrol effectiveSubcontrol( QskAspect::Subcontrol effectiveSubcontrol(
QskAspect::Subcontrol subControl ) const override final; QskAspect::Subcontrol subControl ) const override final;
}; };
#endif // SOUNDCONTROL_H #endif

2
examples/automotive/SpeedometerDisplay.h
View File

@ -25,4 +25,4 @@ private:
QskTextLabel* m_fuelGaugeText; QskTextLabel* m_fuelGaugeText;
}; };
#endif // SPEEDOMETERDISPLAY_H #endif

6
examples/automotive/SpeedometerSkinlet.h
View File

@ -19,9 +19,9 @@ public:
}; };
Q_INVOKABLE SpeedometerSkinlet( QskSkin* skin = nullptr ); Q_INVOKABLE SpeedometerSkinlet( QskSkin* skin = nullptr );
virtual ~SpeedometerSkinlet() override; ~SpeedometerSkinlet() override;
virtual QRectF subControlRect( const QskSkinnable* skinnable, QRectF subControlRect( const QskSkinnable* skinnable,
QskAspect::Subcontrol ) const override; QskAspect::Subcontrol ) const override;
protected: protected:
@ -33,4 +33,4 @@ private:
QSGNode* updateNeedleNode( const Speedometer*, QSGNode* ) const; QSGNode* updateNeedleNode( const Speedometer*, QSGNode* ) const;
}; };
#endif // SPEEDOMETERSKINLET_H #endif

4
examples/colorswitch/Theme.cpp
View File

@ -28,7 +28,7 @@ static void qskResetColors( QskSkin* skin, const QColor& accent )
namespace namespace
{ {
class SkinTransition : public QskSkinTransition class SkinTransition final : public QskSkinTransition
{ {
public: public:
SkinTransition( const QColor& accent ): SkinTransition( const QColor& accent ):
@ -37,7 +37,7 @@ namespace
} }
protected: protected:
virtual void updateSkin( QskSkin*, QskSkin* newSkin ) override final void updateSkin( QskSkin*, QskSkin* newSkin ) override
{ {
qskResetColors( newSkin, m_accent ); qskResetColors( newSkin, m_accent );
} }

4
examples/frames/Frame.h
View File

@ -38,7 +38,7 @@ public:
Q_ENUM( Style ) Q_ENUM( Style )
Frame( QQuickItem* parent = nullptr ); Frame( QQuickItem* parent = nullptr );
virtual ~Frame(); ~Frame() override;
void setStyle( Style ); void setStyle( Style );
Style style() const; Style style() const;
@ -60,7 +60,7 @@ Q_SIGNALS:
void colorChanged(); void colorChanged();
protected: protected:
virtual void updateNode( QSGNode* ) override; void updateNode( QSGNode* ) override;
private: private:
void updateFrameNode( const QRectF&, QskBoxNode* ); void updateFrameNode( const QRectF&, QskBoxNode* );

6
examples/layouts/DynamicConstraintsPage.cpp
View File

@ -13,14 +13,14 @@
namespace namespace
{ {
class Control : public QskControl class Control final : public QskControl
{ {
public: public:
Control( const char* colorName, QQuickItem* parent = nullptr ); Control( const char* colorName, QQuickItem* parent = nullptr );
Control( const char* colorName, qreal aspectRatio, QQuickItem* parent = nullptr ); Control( const char* colorName, qreal aspectRatio, QQuickItem* parent = nullptr );
virtual qreal heightForWidth( qreal width ) const override final; qreal heightForWidth( qreal width ) const override;
virtual qreal widthForHeight( qreal height ) const override final; qreal widthForHeight( qreal height ) const override;
void transpose(); void transpose();

4
examples/sliders/Slider.h
View File

@ -17,8 +17,8 @@ public:
Slider( QQuickItem* parent = nullptr ); Slider( QQuickItem* parent = nullptr );
virtual QRectF focusIndicatorRect() const override; QRectF focusIndicatorRect() const override;
virtual QSizeF contentsSizeHint() const override; QSizeF contentsSizeHint() const override;
}; };
#endif #endif

6
examples/sliders/SliderSkinlet.h
View File

@ -23,13 +23,13 @@ public:
}; };
SliderSkinlet(); SliderSkinlet();
virtual ~SliderSkinlet() override; ~SliderSkinlet() override;
virtual QRectF subControlRect( const QskSkinnable*, QRectF subControlRect( const QskSkinnable*,
QskAspect::Subcontrol ) const override; QskAspect::Subcontrol ) const override;
protected: protected:
virtual QSGNode* updateSubNode( QSGNode* updateSubNode(
const QskSkinnable*, quint8 nodeRole, QSGNode* ) const override; const QskSkinnable*, quint8 nodeRole, QSGNode* ) const override;
private: private:

10
inputcontext/QskHunspellTextPredictor.h
View File

@ -15,14 +15,14 @@ class QSK_EXPORT QskHunspellTextPredictor : public QskTextPredictor
public: public:
QskHunspellTextPredictor( QObject* = nullptr ); QskHunspellTextPredictor( QObject* = nullptr );
virtual ~QskHunspellTextPredictor() override; ~QskHunspellTextPredictor() override;
virtual int candidateCount() const override; int candidateCount() const override;
virtual QString candidate( int pos ) const override; QString candidate( int pos ) const override;
protected: protected:
virtual void request( const QString& ) override; void request( const QString& ) override;
virtual void reset() override; void reset() override;
private: private:
class PrivateData; class PrivateData;

34
inputcontext/QskInputContextPlugin.cpp
View File

@ -53,35 +53,35 @@ public:
QskPlatformInputContext(); QskPlatformInputContext();
virtual ~QskPlatformInputContext() = default; virtual ~QskPlatformInputContext() = default;
virtual bool isValid() const override; bool isValid() const override;
virtual bool hasCapability( Capability ) const override; bool hasCapability( Capability ) const override;
virtual void update( Qt::InputMethodQueries ) override; void update( Qt::InputMethodQueries ) override;
Q_INVOKABLE void update( const QQuickItem*, Qt::InputMethodQueries ); Q_INVOKABLE void update( const QQuickItem*, Qt::InputMethodQueries );
virtual void invokeAction( QInputMethod::Action, int ) override; void invokeAction( QInputMethod::Action, int ) override;
virtual QRectF keyboardRect() const override; QRectF keyboardRect() const override;
virtual bool isAnimating() const override; bool isAnimating() const override;
virtual void showInputPanel() override; void showInputPanel() override;
virtual void hideInputPanel() override; void hideInputPanel() override;
Q_INVOKABLE void setInputPanelVisible( const QQuickItem*, bool ); Q_INVOKABLE void setInputPanelVisible( const QQuickItem*, bool );
virtual bool isInputPanelVisible() const override; bool isInputPanelVisible() const override;
virtual void reset() override; void reset() override;
virtual void commit() override; void commit() override;
virtual void setFocusObject( QObject* ) override; void setFocusObject( QObject* ) override;
virtual QLocale locale() const override; QLocale locale() const override;
virtual Qt::LayoutDirection inputDirection() const override; Qt::LayoutDirection inputDirection() const override;
virtual bool filterEvent( const QEvent* ) override; bool filterEvent( const QEvent* ) override;
protected: protected:
virtual bool event( QEvent* ) override; bool event( QEvent* ) override;
private: private:
void updateContext(); void updateContext();
@ -271,7 +271,7 @@ class QskInputContextPlugin final : public QPlatformInputContextPlugin
Q_PLUGIN_METADATA( IID QPlatformInputContextFactoryInterface_iid FILE "metadata.json" ) Q_PLUGIN_METADATA( IID QPlatformInputContextFactoryInterface_iid FILE "metadata.json" )
public: public:
virtual QPlatformInputContext* create( QPlatformInputContext* create(
const QString& system, const QStringList& ) override const QString& system, const QStringList& ) override
{ {
if ( system.compare( QStringLiteral( "skinny" ), Qt::CaseInsensitive ) == 0 ) if ( system.compare( QStringLiteral( "skinny" ), Qt::CaseInsensitive ) == 0 )

10
inputcontext/QskPinyinTextPredictor.h
View File

@ -15,14 +15,14 @@ class QSK_EXPORT QskPinyinTextPredictor : public QskTextPredictor
public: public:
QskPinyinTextPredictor( QObject* = nullptr ); QskPinyinTextPredictor( QObject* = nullptr );
virtual ~QskPinyinTextPredictor() override; ~QskPinyinTextPredictor() override;
virtual int candidateCount() const override; int candidateCount() const override;
virtual QString candidate( int ) const override; QString candidate( int ) const override;
protected: protected:
virtual void request( const QString& ) override; void request( const QString& ) override;
virtual void reset() override; void reset() override;
private: private:
class PrivateData; class PrivateData;

12
playground/images/Image.h
View File

@ -35,7 +35,7 @@ class Image : public QQuickImage
public: public:
Image( QQuickItem* parent = nullptr ); Image( QQuickItem* parent = nullptr );
virtual ~Image(); ~Image() override;
void setSourceSizeAdjustment( bool ); void setSourceSizeAdjustment( bool );
bool sourceSizeAdjustment() const; bool sourceSizeAdjustment() const;
@ -59,12 +59,12 @@ Q_SIGNALS:
void deferredUpdatesChanged(); void deferredUpdatesChanged();
protected: protected:
virtual void geometryChanged( const QRectF&, const QRectF& ) override; void geometryChanged( const QRectF&, const QRectF& ) override;
virtual void itemChange( ItemChange, const ItemChangeData& ) override; void itemChange( ItemChange, const ItemChangeData& ) override;
virtual void componentComplete() override; void componentComplete() override;
virtual QSGNode* updatePaintNode( QSGNode*, UpdatePaintNodeData* ) override; QSGNode* updatePaintNode( QSGNode*, UpdatePaintNodeData* ) override;
virtual void updatePolish() override; void updatePolish() override;
private: private:
class PrivateData; class PrivateData;

12
playground/inputpanel/main.cpp
View File

@ -146,7 +146,7 @@ public:
} }
}; };
class LocaleListView : public QskListView class LocaleListView final : public QskListView
{ {
Q_OBJECT Q_OBJECT
@ -187,17 +187,17 @@ public:
[ this ]( int row ) { Q_EMIT selected( localeAt( row ) ); } ); [ this ]( int row ) { Q_EMIT selected( localeAt( row ) ); } );
} }
virtual int rowCount() const override final int rowCount() const override
{ {
return m_values.count(); return m_values.count();
} }
virtual int columnCount() const override final int columnCount() const override
{ {
return 1; return 1;
} }
virtual qreal columnWidth( int ) const override qreal columnWidth( int ) const override
{ {
if ( m_maxWidth == 0.0 ) if ( m_maxWidth == 0.0 )
{ {
@ -215,7 +215,7 @@ public:
return m_maxWidth; return m_maxWidth;
} }
virtual qreal rowHeight() const override qreal rowHeight() const override
{ {
using namespace QskAspect; using namespace QskAspect;
@ -225,7 +225,7 @@ public:
return fm.height() + padding.top() + padding.bottom(); return fm.height() + padding.top() + padding.bottom();
} }
virtual QVariant valueAt( int row, int ) const override final QVariant valueAt( int row, int ) const override
{ {
return m_values[row].first; return m_values[row].first;
} }

4
skins/material/QskMaterialSkin.h
View File

@ -17,10 +17,10 @@ class QSK_EXPORT QskMaterialSkin : public QskSkin
public: public:
QskMaterialSkin( QObject* parent = nullptr ); QskMaterialSkin( QObject* parent = nullptr );
virtual ~QskMaterialSkin(); ~QskMaterialSkin() override;
private: private:
virtual void resetColors( const QColor& accent ) override; void resetColors( const QColor& accent ) override;
void initHints(); void initHints();

6
skins/material/QskMaterialSkinFactory.h
View File

@ -17,10 +17,10 @@ class QSK_EXPORT QskMaterialSkinFactory : public QskSkinFactory
public: public:
QskMaterialSkinFactory( QObject* parent = nullptr ); QskMaterialSkinFactory( QObject* parent = nullptr );
virtual ~QskMaterialSkinFactory(); ~QskMaterialSkinFactory() override;
virtual QStringList skinNames() const override; QStringList skinNames() const override;
virtual QskSkin* createSkin( const QString& skinName ) override; QskSkin* createSkin( const QString& skinName ) override;
}; };
#endif #endif

4
skins/squiek/QskSquiekSkin.h
View File

@ -17,10 +17,10 @@ class QSK_EXPORT QskSquiekSkin : public QskSkin
public: public:
QskSquiekSkin( QObject* parent = nullptr ); QskSquiekSkin( QObject* parent = nullptr );
virtual ~QskSquiekSkin(); ~QskSquiekSkin() override;
private: private:
virtual void resetColors( const QColor& accent ) override; void resetColors( const QColor& accent ) override;
void initHints(); void initHints();

6
skins/squiek/QskSquiekSkinFactory.h
View File

@ -17,10 +17,10 @@ class QSK_EXPORT QskSquiekSkinFactory : public QskSkinFactory
public: public:
QskSquiekSkinFactory( QObject* parent = nullptr ); QskSquiekSkinFactory( QObject* parent = nullptr );
virtual ~QskSquiekSkinFactory(); ~QskSquiekSkinFactory() override;
virtual QStringList skinNames() const override; QStringList skinNames() const override;
virtual QskSkin* createSkin( const QString& skinName ) override; QskSkin* createSkin( const QString& skinName ) override;
}; };
#endif #endif

2
src/common/QskMetaInvokable.cpp
View File

@ -56,7 +56,7 @@ namespace
{ {
} }
virtual void placeMetaCall( QObject* object ) override final void placeMetaCall( QObject* object ) override
{ {
m_callFunction( object, m_call, m_index, args() ); m_callFunction( object, m_call, m_index, args() );
} }

22
src/controls/QskAbstractButton.h
View File

@ -33,7 +33,7 @@ public:
QSK_STATES( Flat, Checked, Pressed, Checkable ) QSK_STATES( Flat, Checked, Pressed, Checkable )
QskAbstractButton( QQuickItem* parent = nullptr ); QskAbstractButton( QQuickItem* parent = nullptr );
virtual ~QskAbstractButton(); ~QskAbstractButton() override;
void setCheckable( bool ); void setCheckable( bool );
bool isCheckable() const; bool isCheckable() const;
@ -78,20 +78,20 @@ Q_SIGNALS:
void exclusiveChanged( bool ); void exclusiveChanged( bool );
protected: protected:
virtual bool event( QEvent* ) override; bool event( QEvent* ) override;
virtual void keyPressEvent( QKeyEvent* ) override; void keyPressEvent( QKeyEvent* ) override;
virtual void keyReleaseEvent( QKeyEvent* ) override; void keyReleaseEvent( QKeyEvent* ) override;
virtual void mouseMoveEvent( QMouseEvent* ) override; void mouseMoveEvent( QMouseEvent* ) override;
virtual void mousePressEvent( QMouseEvent* ) override; void mousePressEvent( QMouseEvent* ) override;
virtual void mouseReleaseEvent( QMouseEvent* ) override; void mouseReleaseEvent( QMouseEvent* ) override;
virtual void mouseUngrabEvent() override; void mouseUngrabEvent() override;
virtual void focusInEvent( QFocusEvent* ) override; void focusInEvent( QFocusEvent* ) override;
virtual void focusOutEvent( QFocusEvent* ) override; void focusOutEvent( QFocusEvent* ) override;
virtual void timerEvent( QTimerEvent* ) override; void timerEvent( QTimerEvent* ) override;
virtual void setCheckedState( bool on ); virtual void setCheckedState( bool on );

6
src/controls/QskBox.h
View File

@ -18,10 +18,10 @@ public:
QSK_SUBCONTROLS( Panel ) QSK_SUBCONTROLS( Panel )
QskBox( QQuickItem* parent = nullptr ); QskBox( QQuickItem* parent = nullptr );
virtual ~QskBox(); ~QskBox() override;
virtual QRectF layoutRect() const override; QRectF layoutRect() const override;
virtual QSizeF contentsSizeHint() const override; QSizeF contentsSizeHint() const override;
}; };
#endif #endif

6
src/controls/QskBoxSkinlet.h
View File

@ -22,13 +22,13 @@ public:
}; };
Q_INVOKABLE QskBoxSkinlet( QskSkin* = nullptr ); Q_INVOKABLE QskBoxSkinlet( QskSkin* = nullptr );
virtual ~QskBoxSkinlet(); ~QskBoxSkinlet() override;
virtual QRectF subControlRect( const QskSkinnable*, QRectF subControlRect( const QskSkinnable*,
QskAspect::Subcontrol ) const override; QskAspect::Subcontrol ) const override;
protected: protected:
virtual QSGNode* updateSubNode( const QskSkinnable*, QSGNode* updateSubNode( const QskSkinnable*,
quint8 nodeRole, QSGNode* ) const override; quint8 nodeRole, QSGNode* ) const override;
}; };

14
src/controls/QskControl.cpp
View File

@ -209,12 +209,12 @@ public:
} }
} }
virtual ~QskControlPrivate() ~QskControlPrivate() override
{ {
delete explicitSizeData; delete explicitSizeData;
} }
virtual void mirrorChange() override final void mirrorChange() override
{ {
Q_Q( QskControl ); Q_Q( QskControl );
qskSendEventTo( q, QEvent::LayoutDirectionChange ); qskSendEventTo( q, QEvent::LayoutDirectionChange );
@ -235,13 +235,13 @@ public:
#if 0 #if 0
// can we do something useful with overloading those ??? // can we do something useful with overloading those ???
virtual qreal getImplicitWidth() const override final; qreal getImplicitWidth() const override;
virtual qreal getImplicitHeight() const override final; qreal getImplicitHeight() const override;
virtual QSGTransformNode* createTransformNode(); QSGTransformNode* createTransformNode() override;
#endif #endif
virtual void implicitWidthChanged() override final void implicitWidthChanged() override
{ {
QQuickItemPrivate::implicitWidthChanged(); QQuickItemPrivate::implicitWidthChanged();
@ -249,7 +249,7 @@ public:
implicitSizeChanged(); implicitSizeChanged();
} }
virtual void implicitHeightChanged() override final void implicitHeightChanged() override
{ {
QQuickItemPrivate::implicitWidthChanged(); QQuickItemPrivate::implicitWidthChanged();

29
src/controls/QskControl.h
View File

@ -89,7 +89,7 @@ public:
Q_DECLARE_FLAGS( Flags, Flag ) Q_DECLARE_FLAGS( Flags, Flag )
QskControl( QQuickItem* parent = nullptr ); QskControl( QQuickItem* parent = nullptr );
virtual ~QskControl(); ~QskControl() override;
const char* className() const; const char* className() const;
@ -227,23 +227,24 @@ public Q_SLOTS:
void resetImplicitSize(); void resetImplicitSize();
protected: protected:
virtual bool event( QEvent* ) override; bool event( QEvent* ) override;
virtual void changeEvent( QEvent* ); virtual void changeEvent( QEvent* );
virtual void geometryChangeEvent( QskGeometryChangeEvent* ); virtual void geometryChangeEvent( QskGeometryChangeEvent* );
virtual void windowChangeEvent( QskWindowChangeEvent* ); virtual void windowChangeEvent( QskWindowChangeEvent* );
virtual void gestureEvent( QskGestureEvent* ); virtual void gestureEvent( QskGestureEvent* );
virtual void hoverEnterEvent( QHoverEvent* ) override; void hoverEnterEvent( QHoverEvent* ) override;
virtual void hoverLeaveEvent( QHoverEvent* ) override; void hoverLeaveEvent( QHoverEvent* ) override;
virtual bool childMouseEventFilter( QQuickItem*, QEvent* ) override; bool childMouseEventFilter( QQuickItem*, QEvent* ) override;
virtual bool gestureFilter( QQuickItem*, QEvent* ); virtual bool gestureFilter( QQuickItem*, QEvent* );
virtual void itemChange( ItemChange, const ItemChangeData& ) override; void itemChange( ItemChange, const ItemChangeData& ) override;
virtual void geometryChanged( const QRectF&, const QRectF& ) override; void geometryChanged( const QRectF&, const QRectF& ) override;
virtual void classBegin() override; void classBegin() override;
virtual void componentComplete() override; void componentComplete() override;
virtual void releaseResources() override; void releaseResources() override;
void initSizePolicy( QskSizePolicy::Policy, QskSizePolicy::Policy ); void initSizePolicy( QskSizePolicy::Policy, QskSizePolicy::Policy );
@ -254,15 +255,15 @@ protected:
private: private:
// don't use boundingRect - it seems to be deprecated // don't use boundingRect - it seems to be deprecated
virtual QRectF boundingRect() const override final { return rect(); } QRectF boundingRect() const override final { return rect(); }
void setActiveFocusOnTab( bool ) = delete; // use setFocusPolicy void setActiveFocusOnTab( bool ) = delete; // use setFocusPolicy
void updateInputMethod( Qt::InputMethodQueries ) = delete; // use qskUpdateInputMethod void updateInputMethod( Qt::InputMethodQueries ) = delete; // use qskUpdateInputMethod
virtual QSGNode* updatePaintNode( QSGNode*, UpdatePaintNodeData* ) override final; QSGNode* updatePaintNode( QSGNode*, UpdatePaintNodeData* ) override final;
virtual void updatePolish() override final; void updatePolish() override final;
virtual QskControl* owningControl() const override final; QskControl* owningControl() const override final;
void layoutConstraintChanged(); void layoutConstraintChanged();
void updateImplicitSize(); void updateImplicitSize();

2
src/controls/QskDirtyItemFilter.cpp
View File

@ -57,7 +57,7 @@ namespace
{ {
} }
virtual void run() override final void run() override
{ {
qskBlockDirty( m_window->contentItem(), false ); qskBlockDirty( m_window->contentItem(), false );
} }

2
src/controls/QskDirtyItemFilter.h
View File

@ -20,7 +20,7 @@ class QSK_EXPORT QskDirtyItemFilter : public QObject
public: public:
QskDirtyItemFilter( QObject* parent = nullptr ); QskDirtyItemFilter( QObject* parent = nullptr );
virtual ~QskDirtyItemFilter(); ~QskDirtyItemFilter() override;
void addWindow( QQuickWindow* window ); void addWindow( QQuickWindow* window );

4
src/controls/QskEvent.h
View File

@ -69,7 +69,7 @@ class QSK_EXPORT QskGestureEvent : public QskEvent
{ {
public: public:
QskGestureEvent( const QskGesture* gesture, bool ownedByEvent = true ); QskGestureEvent( const QskGesture* gesture, bool ownedByEvent = true );
virtual ~QskGestureEvent(); ~QskGestureEvent() override;
inline const QskGesture* gesture() const { return m_gesture; } inline const QskGesture* gesture() const { return m_gesture; }
inline bool isGestureOwnedByEvent() const { return m_gestureOwnedByEvent; } inline bool isGestureOwnedByEvent() const { return m_gestureOwnedByEvent; }
@ -89,7 +89,7 @@ public:
}; };
QskAnimatorEvent( QskAspect::Aspect aspect, State state ); QskAnimatorEvent( QskAspect::Aspect aspect, State state );
virtual ~QskAnimatorEvent(); ~QskAnimatorEvent() override;
inline QskAspect::Aspect aspect() const { return m_aspect; } inline QskAspect::Aspect aspect() const { return m_aspect; }
inline State state() const { return m_state; } inline State state() const { return m_state; }

8
src/controls/QskFlickAnimator.h
View File

@ -13,7 +13,7 @@ class QSK_EXPORT QskFlickAnimator : public QskAnimator
{ {
public: public:
QskFlickAnimator(); QskFlickAnimator();
virtual ~QskFlickAnimator(); ~QskFlickAnimator() override;
void setAngle( qreal degrees ); void setAngle( qreal degrees );
qreal angle() const; qreal angle() const;
@ -27,9 +27,9 @@ public:
void accelerate( qreal degrees, qreal velocity ); void accelerate( qreal degrees, qreal velocity );
protected: protected:
virtual void setup() override; void setup() override;
virtual void advance( qreal value ) override final; void advance( qreal value ) override final;
virtual void done() override; void done() override;
virtual void translate( qreal dx, qreal dy ) = 0; virtual void translate( qreal dx, qreal dy ) = 0;

4
src/controls/QskFocusIndicator.h
View File

@ -20,10 +20,10 @@ public:
QSK_SUBCONTROLS( Panel ) QSK_SUBCONTROLS( Panel )
QskFocusIndicator( QQuickItem* parent = nullptr ); QskFocusIndicator( QQuickItem* parent = nullptr );
virtual ~QskFocusIndicator(); ~QskFocusIndicator() override;
protected: protected:
virtual void windowChangeEvent( QskWindowChangeEvent* ) override; void windowChangeEvent( QskWindowChangeEvent* ) override;
virtual QRectF focusRect() const; virtual QRectF focusRect() const;
private: private:

6
src/controls/QskFocusIndicatorSkinlet.h
View File

@ -24,13 +24,13 @@ public:
}; };
Q_INVOKABLE QskFocusIndicatorSkinlet( QskSkin* = nullptr ); Q_INVOKABLE QskFocusIndicatorSkinlet( QskSkin* = nullptr );
virtual ~QskFocusIndicatorSkinlet(); ~QskFocusIndicatorSkinlet() override;
virtual QRectF subControlRect( const QskSkinnable*, QRectF subControlRect( const QskSkinnable*,
QskAspect::Subcontrol ) const override; QskAspect::Subcontrol ) const override;
protected: protected:
virtual QSGNode* updateSubNode( const QskSkinnable*, QSGNode* updateSubNode( const QskSkinnable*,
quint8 nodeRole, QSGNode* ) const override; quint8 nodeRole, QSGNode* ) const override;
private: private:

8
src/controls/QskGesture.h
View File

@ -64,7 +64,7 @@ class QSK_EXPORT QskTapGesture : public QskGesture
public: public:
QskTapGesture(); QskTapGesture();
virtual ~QskTapGesture(); ~QskTapGesture() override;
void setPosition( const QPointF& pos ); void setPosition( const QPointF& pos );
inline QPointF position() const { return m_position; } inline QPointF position() const { return m_position; }
@ -79,7 +79,7 @@ class QSK_EXPORT QskTapAndHoldGesture : public QskGesture
public: public:
QskTapAndHoldGesture(); QskTapAndHoldGesture();
virtual ~QskTapAndHoldGesture(); ~QskTapAndHoldGesture() override;
void setPosition( const QPointF& pos ); void setPosition( const QPointF& pos );
inline QPointF position() const { return m_position; } inline QPointF position() const { return m_position; }
@ -98,7 +98,7 @@ class QskPanGesture : public QskGesture
public: public:
QskPanGesture(); QskPanGesture();
virtual ~QskPanGesture(); ~QskPanGesture() override;
void setVelocity( qreal ); void setVelocity( qreal );
inline qreal velocity() const { return m_velocity; } inline qreal velocity() const { return m_velocity; }
@ -132,7 +132,7 @@ class QskSwipeGesture : public QskGesture
public: public:
QskSwipeGesture(); QskSwipeGesture();
virtual ~QskSwipeGesture(); ~QskSwipeGesture() override;
void setVelocity( qreal velocity ); void setVelocity( qreal velocity );
inline qreal velocity() const { return m_velocity; } inline qreal velocity() const { return m_velocity; }

9
src/controls/QskGestureRecognizer.cpp
View File

@ -42,11 +42,6 @@ namespace
class Timer final : public QObject class Timer final : public QObject
{ {
public: public:
Timer():
m_recognizer( nullptr )
{
}
void start( int ms, QskGestureRecognizer* recognizer ) void start( int ms, QskGestureRecognizer* recognizer )
{ {
if ( m_timer.isActive() ) if ( m_timer.isActive() )
@ -68,7 +63,7 @@ namespace
} }
protected: protected:
virtual void timerEvent( QTimerEvent* ) override final void timerEvent( QTimerEvent* ) override
{ {
m_timer.stop(); m_timer.stop();
@ -82,7 +77,7 @@ namespace
} }
QBasicTimer m_timer; QBasicTimer m_timer;
QskGestureRecognizer* m_recognizer; QskGestureRecognizer* m_recognizer = nullptr;
}; };
class TimerTable class TimerTable

12
src/controls/QskGraphicLabel.h
View File

@ -53,7 +53,7 @@ public:
QskGraphicLabel( const QskGraphic&, QQuickItem* parent = nullptr ); QskGraphicLabel( const QskGraphic&, QQuickItem* parent = nullptr );
virtual ~QskGraphicLabel(); ~QskGraphicLabel() override;
QskGraphic graphic() const; QskGraphic graphic() const;
@ -77,10 +77,10 @@ public:
void setFillMode( FillMode ); void setFillMode( FillMode );
FillMode fillMode() const; FillMode fillMode() const;
virtual qreal heightForWidth( qreal width ) const override; qreal heightForWidth( qreal width ) const override;
virtual qreal widthForHeight( qreal height ) const override; qreal widthForHeight( qreal height ) const override;
virtual QSizeF contentsSizeHint() const override; QSizeF contentsSizeHint() const override;
bool isEmpty() const; bool isEmpty() const;
@ -99,8 +99,8 @@ public Q_SLOTS:
void setGraphic( const QskGraphic& ); void setGraphic( const QskGraphic& );
protected: protected:
virtual void changeEvent( QEvent* ) override; void changeEvent( QEvent* ) override;
virtual void updateLayout() override; void updateLayout() override;
virtual QskGraphic loadSource( const QUrl& ) const; virtual QskGraphic loadSource( const QUrl& ) const;
private: private:

6
src/controls/QskGraphicLabelSkinlet.h
View File

@ -24,13 +24,13 @@ public:
}; };
Q_INVOKABLE QskGraphicLabelSkinlet( QskSkin* = nullptr ); Q_INVOKABLE QskGraphicLabelSkinlet( QskSkin* = nullptr );
virtual ~QskGraphicLabelSkinlet(); ~QskGraphicLabelSkinlet() override;
virtual QRectF subControlRect( const QskSkinnable*, QRectF subControlRect( const QskSkinnable*,
QskAspect::Subcontrol ) const override; QskAspect::Subcontrol ) const override;
protected: protected:
virtual QSGNode* updateSubNode( QSGNode* updateSubNode(
const QskSkinnable*, quint8 nodeRole, QSGNode* ) const override; const QskSkinnable*, quint8 nodeRole, QSGNode* ) const override;
private: private:

4
src/controls/QskHintAnimator.h
View File

@ -21,7 +21,7 @@ class QSK_EXPORT QskHintAnimator : public QskVariantAnimator
public: public:
QskHintAnimator(); QskHintAnimator();
virtual ~QskHintAnimator(); ~QskHintAnimator() override;
void setAspect( QskAspect::Aspect ); void setAspect( QskAspect::Aspect );
QskAspect::Aspect aspect() const; QskAspect::Aspect aspect() const;
@ -29,7 +29,7 @@ public:
void setControl( QskControl* ); void setControl( QskControl* );
QskControl* control() const; QskControl* control() const;
virtual void advance( qreal value ) override; void advance( qreal value ) override;
private: private:
QskAspect::Aspect m_aspect; QskAspect::Aspect m_aspect;

10
src/controls/QskInputGrabber.cpp
View File

@ -13,7 +13,7 @@ QSK_QT_PRIVATE_BEGIN
#include <private/qquickitemchangelistener_p.h> #include <private/qquickitemchangelistener_p.h>
QSK_QT_PRIVATE_END QSK_QT_PRIVATE_END
class QskInputGrabber::PrivateData : public QQuickItemChangeListener class QskInputGrabber::PrivateData final : public QQuickItemChangeListener
{ {
public: public:
PrivateData( QskInputGrabber* grabber ): PrivateData( QskInputGrabber* grabber ):
@ -75,8 +75,8 @@ public:
private: private:
#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
virtual void itemGeometryChanged( QQuickItem* item, void itemGeometryChanged( QQuickItem* item,
QQuickGeometryChange change, const QRectF& ) override final QQuickGeometryChange change, const QRectF& ) override
{ {
bool doUpdate = false; bool doUpdate = false;
@ -90,7 +90,7 @@ private:
} }
#else #else
virtual void itemGeometryChanged( void itemGeometryChanged(
QQuickItem* item, const QRectF& newRect, const QRectF& oldRect ) override QQuickItem* item, const QRectF& newRect, const QRectF& oldRect ) override
{ {
bool doUpdate = false; bool doUpdate = false;
@ -105,7 +105,7 @@ private:
} }
#endif #endif
virtual void itemParentChanged( QQuickItem* item, QQuickItem* parentItem ) override void itemParentChanged( QQuickItem* item, QQuickItem* parentItem ) override
{ {
if ( item == m_grabber && parentItem ) if ( item == m_grabber && parentItem )
{ {

4
src/controls/QskInputGrabber.h
View File

@ -17,7 +17,7 @@ class QskInputGrabber: public QskControl
public: public:
QskInputGrabber( QQuickItem* parent = nullptr ); QskInputGrabber( QQuickItem* parent = nullptr );
virtual ~QskInputGrabber(); ~QskInputGrabber() override;
virtual QRectF grabberRect() const; virtual QRectF grabberRect() const;
virtual bool isBlocking( const QPointF& ) const; virtual bool isBlocking( const QPointF& ) const;
@ -26,7 +26,7 @@ public Q_SLOTS:
void updateGeometry(); void updateGeometry();
protected: protected:
virtual bool event( QEvent* ) override; bool event( QEvent* ) override;
private: private:
class PrivateData; class PrivateData;

14
src/controls/QskListView.h
View File

@ -50,7 +50,7 @@ public:
Q_ENUM( SelectionMode ) Q_ENUM( SelectionMode )
QskListView( QQuickItem* parent = nullptr ); QskListView( QQuickItem* parent = nullptr );
virtual ~QskListView(); ~QskListView() override;
void setPreferredWidthFromColumns( bool ); void setPreferredWidthFromColumns( bool );
bool preferredWidthFromColumns() const; bool preferredWidthFromColumns() const;
@ -79,7 +79,7 @@ public:
virtual QskAspect::Subcontrol textSubControlAt( int row, int col ) const; virtual QskAspect::Subcontrol textSubControlAt( int row, int col ) const;
#endif #endif
virtual QSizeF contentsSizeHint() const override; QSizeF contentsSizeHint() const override;
public Q_SLOTS: public Q_SLOTS:
void setSelectedRow( int row ); void setSelectedRow( int row );
@ -93,15 +93,15 @@ Q_SIGNALS:
void textOptionsChanged(); void textOptionsChanged();
protected: protected:
virtual void keyPressEvent( QKeyEvent* ) override; void keyPressEvent( QKeyEvent* ) override;
virtual void keyReleaseEvent( QKeyEvent* ) override; void keyReleaseEvent( QKeyEvent* ) override;
virtual void mousePressEvent( QMouseEvent* ) override; void mousePressEvent( QMouseEvent* ) override;
virtual void mouseReleaseEvent( QMouseEvent* ) override; void mouseReleaseEvent( QMouseEvent* ) override;
void updateScrollableSize(); void updateScrollableSize();
virtual void componentComplete() override; void componentComplete() override;
private: private:
class PrivateData; class PrivateData;

4
src/controls/QskListViewSkinlet.h
View File

@ -26,7 +26,7 @@ class QSK_EXPORT QskListViewSkinlet : public QskScrollViewSkinlet
public: public:
Q_INVOKABLE QskListViewSkinlet( QskSkin* = nullptr ); Q_INVOKABLE QskListViewSkinlet( QskSkin* = nullptr );
virtual ~QskListViewSkinlet(); ~QskListViewSkinlet() override;
protected: protected:
enum NodeRole enum NodeRole
@ -35,7 +35,7 @@ protected:
GraphicRole GraphicRole
}; };
virtual QSGNode* updateContentsNode( QSGNode* updateContentsNode(
const QskScrollView*, QSGNode* ) const override; const QskScrollView*, QSGNode* ) const override;
virtual QSGNode* updateCellNode( const QskListView*, virtual QSGNode* updateCellNode( const QskListView*,

4
src/controls/QskObjectTree.h
View File

@ -49,7 +49,7 @@ namespace QskObjectTree
m_value = value; m_value = value;
} }
virtual bool visitDown( QObject* object ) override final bool visitDown( QObject* object ) override final
{ {
if ( QskControl* control = qobject_cast< QskControl* >( object ) ) if ( QskControl* control = qobject_cast< QskControl* >( object ) )
return setImplicitValue( control, m_value ); return setImplicitValue( control, m_value );
@ -60,7 +60,7 @@ namespace QskObjectTree
return !setProperty( object, m_propertyName.constData(), m_value ); return !setProperty( object, m_propertyName.constData(), m_value );
} }
virtual bool visitUp( const QObject* object ) override final bool visitUp( const QObject* object ) override final
{ {
if ( isRoot( object ) ) if ( isRoot( object ) )
return true; return true;

5
src/controls/QskPageIndicator.h
View File

@ -25,7 +25,8 @@ public:
QskPageIndicator( QQuickItem* parent = nullptr ); QskPageIndicator( QQuickItem* parent = nullptr );
QskPageIndicator( int count, QQuickItem* parent = nullptr ); QskPageIndicator( int count, QQuickItem* parent = nullptr );
virtual ~QskPageIndicator();
~QskPageIndicator() override;
int count() const; int count() const;
@ -34,7 +35,7 @@ public:
Qt::Orientation orientation() const; Qt::Orientation orientation() const;
void setOrientation( Qt::Orientation ); void setOrientation( Qt::Orientation );
virtual QSizeF contentsSizeHint() const override; QSizeF contentsSizeHint() const override;
Q_SIGNALS: Q_SIGNALS:
void countChanged(); void countChanged();

6
src/controls/QskPageIndicatorSkinlet.h
View File

@ -25,13 +25,13 @@ public:
}; };
Q_INVOKABLE QskPageIndicatorSkinlet( QskSkin* = nullptr ); Q_INVOKABLE QskPageIndicatorSkinlet( QskSkin* = nullptr );
virtual ~QskPageIndicatorSkinlet(); ~QskPageIndicatorSkinlet() override;
virtual QRectF subControlRect( QRectF subControlRect(
const QskSkinnable*, QskAspect::Subcontrol ) const override; const QskSkinnable*, QskAspect::Subcontrol ) const override;
protected: protected:
virtual QSGNode* updateSubNode( const QskSkinnable*, QSGNode* updateSubNode( const QskSkinnable*,
quint8 nodeRole, QSGNode* ) const override; quint8 nodeRole, QSGNode* ) const override;
private: private:

8
src/controls/QskPanGestureRecognizer.h
View File

@ -17,7 +17,7 @@ class QSK_EXPORT QskPanGestureRecognizer : public QskGestureRecognizer
public: public:
QskPanGestureRecognizer(); QskPanGestureRecognizer();
virtual ~QskPanGestureRecognizer(); ~QskPanGestureRecognizer() override;
void setMinDistance( int pixels ); void setMinDistance( int pixels );
int minDistance() const; int minDistance() const;
@ -26,9 +26,9 @@ public:
Qt::Orientations orientations() const; Qt::Orientations orientations() const;
private: private:
virtual void pressEvent( const QMouseEvent* ) override; void pressEvent( const QMouseEvent* ) override;
virtual void moveEvent( const QMouseEvent* ) override; void moveEvent( const QMouseEvent* ) override;
virtual void releaseEvent( const QMouseEvent* ) override; void releaseEvent( const QMouseEvent* ) override;
class PrivateData; class PrivateData;
std::unique_ptr< PrivateData > m_data; std::unique_ptr< PrivateData > m_data;

6
src/controls/QskPopup.cpp
View File

@ -49,8 +49,8 @@ namespace
{ {
} }
virtual void geometryChanged( void geometryChanged(
const QRectF& newGeometry, const QRectF& oldGeometry ) override final const QRectF& newGeometry, const QRectF& oldGeometry ) override
{ {
Inherited::geometryChanged( newGeometry, oldGeometry ); Inherited::geometryChanged( newGeometry, oldGeometry );
@ -61,7 +61,7 @@ namespace
} }
} }
virtual bool event( QEvent* event ) override final bool event( QEvent* event ) override
{ {
bool ok = Inherited::event( event ); bool ok = Inherited::event( event );

12
src/controls/QskPopup.h
View File

@ -32,7 +32,7 @@ public:
Q_DECLARE_FLAGS( PopupFlags, PopupFlag ) Q_DECLARE_FLAGS( PopupFlags, PopupFlag )
QskPopup( QQuickItem* parent = nullptr ); QskPopup( QQuickItem* parent = nullptr );
virtual ~QskPopup(); ~QskPopup() override;
void setPopupFlags( PopupFlags ); void setPopupFlags( PopupFlags );
PopupFlags popupFlags() const; PopupFlags popupFlags() const;
@ -60,14 +60,14 @@ Q_SIGNALS:
void overlayChanged( bool ); void overlayChanged( bool );
protected: protected:
virtual void aboutToShow() override; void aboutToShow() override;
virtual void setFading( bool on ); virtual void setFading( bool on );
virtual bool event( QEvent* ) override; bool event( QEvent* ) override;
virtual void focusInEvent( QFocusEvent * ) override; void focusInEvent( QFocusEvent * ) override;
virtual void focusOutEvent( QFocusEvent * ) override; void focusOutEvent( QFocusEvent * ) override;
virtual void itemChange( QQuickItem::ItemChange, void itemChange( QQuickItem::ItemChange,
const QQuickItem::ItemChangeData& ) override; const QQuickItem::ItemChangeData& ) override;
virtual QQuickItem* focusSuccessor() const; virtual QQuickItem* focusSuccessor() const;

6
src/controls/QskPopupSkinlet.h
View File

@ -24,13 +24,13 @@ public:
}; };
Q_INVOKABLE QskPopupSkinlet( QskSkin* = nullptr ); Q_INVOKABLE QskPopupSkinlet( QskSkin* = nullptr );
virtual ~QskPopupSkinlet(); ~QskPopupSkinlet() override;
virtual QRectF subControlRect( const QskSkinnable*, QRectF subControlRect( const QskSkinnable*,
QskAspect::Subcontrol ) const override; QskAspect::Subcontrol ) const override;
protected: protected:
virtual QSGNode* updateSubNode( const QskSkinnable*, QSGNode* updateSubNode( const QskSkinnable*,
quint8 nodeRole, QSGNode* ) const override; quint8 nodeRole, QSGNode* ) const override;
private: private:

14
src/controls/QskPushButton.h
View File

@ -38,7 +38,7 @@ public:
QskPushButton( QQuickItem* parent = nullptr ); QskPushButton( QQuickItem* parent = nullptr );
QskPushButton( const QString& text, QQuickItem* parent = nullptr ); QskPushButton( const QString& text, QQuickItem* parent = nullptr );
virtual ~QskPushButton(); ~QskPushButton() override;
void setCorner( const QskCorner& ); void setCorner( const QskCorner& );
QskCorner corner() const; QskCorner corner() const;
@ -57,8 +57,8 @@ public:
QFont font() const; QFont font() const;
virtual QSizeF contentsSizeHint() const override; QSizeF contentsSizeHint() const override;
virtual QRectF layoutRect() const override; QRectF layoutRect() const override;
public Q_SLOTS: public Q_SLOTS:
void setText( const QString& text ); void setText( const QString& text );
@ -78,11 +78,11 @@ Q_SIGNALS:
void hovered( bool ); void hovered( bool );
protected: protected:
virtual void hoverEnterEvent( QHoverEvent* ) override; void hoverEnterEvent( QHoverEvent* ) override;
virtual void hoverLeaveEvent( QHoverEvent* ) override; void hoverLeaveEvent( QHoverEvent* ) override;
virtual void changeEvent( QEvent* ) override; void changeEvent( QEvent* ) override;
virtual void updateLayout() override; void updateLayout() override;
virtual QskGraphic loadGraphic( const QUrl& ) const; virtual QskGraphic loadGraphic( const QUrl& ) const;
private: private:

6
src/controls/QskPushButtonSkinlet.h
View File

@ -26,13 +26,13 @@ public:
}; };
Q_INVOKABLE QskPushButtonSkinlet( QskSkin* = nullptr ); Q_INVOKABLE QskPushButtonSkinlet( QskSkin* = nullptr );
virtual ~QskPushButtonSkinlet(); ~QskPushButtonSkinlet() override;
virtual QRectF subControlRect( QRectF subControlRect(
const QskSkinnable*, QskAspect::Subcontrol ) const override; const QskSkinnable*, QskAspect::Subcontrol ) const override;
protected: protected:
virtual QSGNode* updateSubNode( const QskSkinnable*, QSGNode* updateSubNode( const QskSkinnable*,
quint8 nodeRole, QSGNode* ) const override; quint8 nodeRole, QSGNode* ) const override;
private: private:

8
src/controls/QskRangeControl.h
View File

@ -26,7 +26,7 @@ class QSK_EXPORT QskRangeControl : public QskControl
public: public:
QskRangeControl( QQuickItem* parent = nullptr ); QskRangeControl( QQuickItem* parent = nullptr );
virtual ~QskRangeControl(); ~QskRangeControl() override;
bool pressed() const; bool pressed() const;
@ -71,13 +71,13 @@ Q_SIGNALS:
protected: protected:
virtual qreal fixupValue( qreal value ) const; virtual qreal fixupValue( qreal value ) const;
virtual void keyPressEvent( QKeyEvent* event ) override; void keyPressEvent( QKeyEvent* event ) override;
#ifndef QT_NO_WHEELEVENT #ifndef QT_NO_WHEELEVENT
virtual void wheelEvent( QWheelEvent* ) override; void wheelEvent( QWheelEvent* ) override;
#endif #endif
virtual void componentComplete() override; void componentComplete() override;
private: private:
void adjustRangeAndValue( bool ); void adjustRangeAndValue( bool );

24
src/controls/QskScrollArea.cpp
View File

@ -128,7 +128,7 @@ namespace
markDirty( QSGNode::DirtyGeometry ); markDirty( QSGNode::DirtyGeometry );
} }
virtual void update() override final void update() override
{ {
/* /*
The Qt-Quick framework is limited to setting clipNodes from The Qt-Quick framework is limited to setting clipNodes from
@ -157,41 +157,41 @@ public:
return children.isEmpty() ? nullptr : children.first(); return children.isEmpty() ? nullptr : children.first();
} }
virtual bool contains( const QPointF& pos ) const override final bool contains( const QPointF& pos ) const override
{ {
return clipRect().contains( pos ); return clipRect().contains( pos );
} }
virtual QRectF clipRect() const override final QRectF clipRect() const override
{ {
return scrollArea()->subControlRect( QskScrollView::Viewport ); return scrollArea()->subControlRect( QskScrollView::Viewport );
} }
protected: protected:
virtual bool event( QEvent* event ) override final; bool event( QEvent* event ) override;
virtual void windowChangeEvent( QskWindowChangeEvent* ) override final; void windowChangeEvent( QskWindowChangeEvent* ) override;
virtual void itemChange( ItemChange, const ItemChangeData& ) override final; void itemChange( ItemChange, const ItemChangeData& ) override;
virtual void geometryChanged( const QRectF&, const QRectF& ) override final; void geometryChanged( const QRectF&, const QRectF& ) override;
#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
virtual void itemGeometryChanged( QQuickItem*, void itemGeometryChanged( QQuickItem*,
QQuickGeometryChange change, const QRectF& ) override final QQuickGeometryChange change, const QRectF& ) override
{ {
if ( change.sizeChange() ) if ( change.sizeChange() )
scrollArea()->polish(); scrollArea()->polish();
} }
#else #else
virtual void itemGeometryChanged( QQuickItem*, void itemGeometryChanged( QQuickItem*,
const QRectF& newRect, const QRectF& oldRect ) override final const QRectF& newRect, const QRectF& oldRect ) override
{ {
if ( oldRect.size() != newRect.size() ) if ( oldRect.size() != newRect.size() )
scrollArea()->polish(); scrollArea()->polish();
} }
#endif #endif
virtual void updateNode( QSGNode* ) override final; void updateNode( QSGNode* ) override;
private: private:
void connectWindow( const QQuickWindow*, bool on ); void connectWindow( const QQuickWindow*, bool on );

4
src/controls/QskScrollArea.h
View File

@ -25,7 +25,7 @@ class QSK_EXPORT QskScrollArea : public QskScrollView
public: public:
QskScrollArea( QQuickItem* parent = nullptr ); QskScrollArea( QQuickItem* parent = nullptr );
virtual ~QskScrollArea(); ~QskScrollArea() override;
void setScrolledItem( QQuickItem* ); void setScrolledItem( QQuickItem* );
QQuickItem* scrolledItem() const; QQuickItem* scrolledItem() const;
@ -44,7 +44,7 @@ Q_SIGNALS:
void autoScrollFocusedItemChanged(); void autoScrollFocusedItemChanged();
protected: protected:
virtual void updateLayout() override; void updateLayout() override;
private: private:
void translateItem(); void translateItem();

4
src/controls/QskScrollView.cpp
View File

@ -39,7 +39,7 @@ namespace
m_scrollView = scrollView; m_scrollView = scrollView;
} }
virtual void translate( qreal dx, qreal dy ) override final void translate( qreal dx, qreal dy ) override
{ {
const QPointF pos = m_scrollView->scrollPos(); const QPointF pos = m_scrollView->scrollPos();
m_scrollView->setScrollPos( pos - QPointF( dx, -dy ) ); m_scrollView->setScrollPos( pos - QPointF( dx, -dy ) );
@ -89,7 +89,7 @@ namespace
} }
protected: protected:
virtual void advance( qreal value ) override final void advance( qreal value ) override
{ {
qreal x = m_from.x() + ( m_to.x() - m_from.x() ) * value; qreal x = m_from.x() + ( m_to.x() - m_from.x() ) * value;
qreal y = m_from.y() + ( m_to.y() - m_from.y() ) * value; qreal y = m_from.y() + ( m_to.y() - m_from.y() ) * value;

18
src/controls/QskScrollView.h
View File

@ -33,7 +33,7 @@ public:
QSK_STATES( VerticalHandlePressed, HorizontalHandlePressed ) QSK_STATES( VerticalHandlePressed, HorizontalHandlePressed )
QskScrollView( QQuickItem* parent = nullptr ); QskScrollView( QQuickItem* parent = nullptr );
virtual ~QskScrollView(); ~QskScrollView() override;
void setVerticalScrollBarPolicy( Qt::ScrollBarPolicy ); void setVerticalScrollBarPolicy( Qt::ScrollBarPolicy );
Qt::ScrollBarPolicy verticalScrollBarPolicy() const; Qt::ScrollBarPolicy verticalScrollBarPolicy() const;
@ -54,7 +54,7 @@ public:
QSizeF scrollableSize() const; QSizeF scrollableSize() const;
QRectF viewContentsRect() const; QRectF viewContentsRect() const;
virtual QRectF gestureRect() const override; QRectF gestureRect() const override;
Q_SIGNALS: Q_SIGNALS:
void scrolledTo( const QPointF& ); void scrolledTo( const QPointF& );
@ -73,17 +73,17 @@ public Q_SLOTS:
void ensureVisible( const QRectF& ); void ensureVisible( const QRectF& );
protected: protected:
virtual void mouseMoveEvent( QMouseEvent* ) override; void mouseMoveEvent( QMouseEvent* ) override;
virtual void mousePressEvent( QMouseEvent* ) override; void mousePressEvent( QMouseEvent* ) override;
virtual void mouseReleaseEvent( QMouseEvent* ) override; void mouseReleaseEvent( QMouseEvent* ) override;
virtual void geometryChangeEvent( QskGeometryChangeEvent* ) override; void geometryChangeEvent( QskGeometryChangeEvent* ) override;
virtual void gestureEvent( QskGestureEvent* ) override; void gestureEvent( QskGestureEvent* ) override;
#ifndef QT_NO_WHEELEVENT #ifndef QT_NO_WHEELEVENT
virtual void wheelEvent( QWheelEvent* ) override; void wheelEvent( QWheelEvent* ) override;
#endif #endif
virtual bool gestureFilter( QQuickItem*, QEvent* ) override; bool gestureFilter( QQuickItem*, QEvent* ) override;
void setScrollableSize( const QSizeF& ); void setScrollableSize( const QSizeF& );

6
src/controls/QskScrollViewSkinlet.h
View File

@ -31,13 +31,13 @@ public:
}; };
Q_INVOKABLE QskScrollViewSkinlet( QskSkin* = nullptr ); Q_INVOKABLE QskScrollViewSkinlet( QskSkin* = nullptr );
virtual ~QskScrollViewSkinlet(); ~QskScrollViewSkinlet() override;
virtual QRectF subControlRect( QRectF subControlRect(
const QskSkinnable*, QskAspect::Subcontrol ) const override; const QskSkinnable*, QskAspect::Subcontrol ) const override;
protected: protected:
virtual QSGNode* updateSubNode( const QskSkinnable*, QSGNode* updateSubNode( const QskSkinnable*,
quint8 nodeRole, QSGNode* ) const override; quint8 nodeRole, QSGNode* ) const override;
virtual QSGNode* updateContentsNode( const QskScrollView*, QSGNode* ) const; virtual QSGNode* updateContentsNode( const QskScrollView*, QSGNode* ) const;

6
src/controls/QskSeparator.h
View File

@ -27,7 +27,7 @@ public:
QskSeparator( QQuickItem* parent = nullptr ); QskSeparator( QQuickItem* parent = nullptr );
QskSeparator( Qt::Orientation, QQuickItem* parent = nullptr ); QskSeparator( Qt::Orientation, QQuickItem* parent = nullptr );
virtual ~QskSeparator(); ~QskSeparator() override;
void setOrientation( Qt::Orientation ); void setOrientation( Qt::Orientation );
Qt::Orientation orientation() const; Qt::Orientation orientation() const;
@ -35,8 +35,8 @@ public:
void setThickness( qreal thickness ); void setThickness( qreal thickness );
qreal thickness() const; qreal thickness() const;
virtual QSizeF contentsSizeHint() const override; QSizeF contentsSizeHint() const override;
virtual QskAspect::Placement effectivePlacement() const override; QskAspect::Placement effectivePlacement() const override;
Q_SIGNALS: Q_SIGNALS:
void orientationChanged( Qt::Orientation ); void orientationChanged( Qt::Orientation );

6
src/controls/QskSeparatorSkinlet.h
View File

@ -24,13 +24,13 @@ public:
}; };
Q_INVOKABLE QskSeparatorSkinlet( QskSkin* = nullptr ); Q_INVOKABLE QskSeparatorSkinlet( QskSkin* = nullptr );
virtual ~QskSeparatorSkinlet(); ~QskSeparatorSkinlet() override;
virtual QRectF subControlRect( const QskSkinnable*, QRectF subControlRect( const QskSkinnable*,
QskAspect::Subcontrol ) const override; QskAspect::Subcontrol ) const override;
protected: protected:
virtual QSGNode* updateSubNode( const QskSkinnable*, QSGNode* updateSubNode( const QskSkinnable*,
quint8 nodeRole, QSGNode* ) const override; quint8 nodeRole, QSGNode* ) const override;
private: private:

12
src/controls/QskSetup.cpp
View File

@ -87,24 +87,24 @@ namespace
} }
private: private:
virtual bool setImplicitValue( bool setImplicitValue(
QskControl* control, const QLocale& locale ) override final QskControl* control, const QLocale& locale ) override
{ {
return qskInheritLocale( control, locale ); return qskInheritLocale( control, locale );
} }
virtual bool setImplicitValue( bool setImplicitValue(
QskWindow* window, const QLocale& locale ) override final QskWindow* window, const QLocale& locale ) override
{ {
return qskInheritLocale( window, locale ); return qskInheritLocale( window, locale );
} }
virtual QLocale value( const QskControl* control ) const override final QLocale value( const QskControl* control ) const override
{ {
return control->locale(); return control->locale();
} }
virtual QLocale value( const QskWindow* window ) const override final QLocale value( const QskWindow* window ) const override
{ {
return window->locale(); return window->locale();
} }

4
src/controls/QskSetup.h
View File

@ -75,9 +75,9 @@ Q_SIGNALS:
private: private:
QskSetup(); QskSetup();
virtual ~QskSetup(); ~QskSetup() override;
virtual bool eventFilter( QObject*, QEvent* ) override final; bool eventFilter( QObject*, QEvent* ) override final;
static QskSetup* s_instance; static QskSetup* s_instance;

8
src/controls/QskShortcut.h
View File

@ -48,7 +48,7 @@ public:
QskShortcut( const QKeySequence&, QObject* = nullptr ); QskShortcut( const QKeySequence&, QObject* = nullptr );
QskShortcut( const QKeySequence&, Qt::ShortcutContext, QObject* = nullptr ); QskShortcut( const QKeySequence&, Qt::ShortcutContext, QObject* = nullptr );
virtual ~QskShortcut(); ~QskShortcut() override;
int shortcutId() const; int shortcutId() const;
@ -82,9 +82,9 @@ Q_SIGNALS:
int shortcutIdChanged( int ) const; int shortcutIdChanged( int ) const;
protected: protected:
virtual bool event( QEvent* ) override; bool event( QEvent* ) override;
virtual void classBegin() override; void classBegin() override;
virtual void componentComplete() override; void componentComplete() override;
private: private:
class PrivateData; class PrivateData;

2
src/controls/QskShortcutMap.cpp
View File

@ -34,7 +34,7 @@ public:
void setEnabled( int id, bool ); void setEnabled( int id, bool );
void setAutoRepeat( int id, bool repeat ); void setAutoRepeat( int id, bool repeat );
virtual bool eventFilter( QObject*, QEvent* ) override final; bool eventFilter( QObject*, QEvent* ) override;
private: private:

12
src/controls/QskSimpleListBox.h
View File

@ -22,7 +22,7 @@ class QSK_EXPORT QskSimpleListBox : public QskListView
public: public:
QskSimpleListBox( QQuickItem* parent = nullptr ); QskSimpleListBox( QQuickItem* parent = nullptr );
virtual ~QskSimpleListBox(); ~QskSimpleListBox() override;
void setColumnWidthHint( int column, qreal width ); void setColumnWidthHint( int column, qreal width );
qreal columnWidthHint( int column ) const; qreal columnWidthHint( int column ) const;
@ -39,17 +39,17 @@ public:
void removeAt( int index ); void removeAt( int index );
void removeBulk( int from, int to = -1 ); void removeBulk( int from, int to = -1 );
virtual int rowCount() const override final; int rowCount() const override final;
virtual int columnCount() const override final; int columnCount() const override final;
virtual qreal columnWidth( int col ) const override; qreal columnWidth( int col ) const override;
virtual qreal rowHeight() const override; qreal rowHeight() const override;
QString entryAt( int row ) const; QString entryAt( int row ) const;
QString selectedEntry() const; QString selectedEntry() const;
QStringList entries() const; QStringList entries() const;
virtual QVariant valueAt( int row, int col ) const override final; QVariant valueAt( int row, int col ) const override final;
public Q_SLOTS: public Q_SLOTS:
void setEntries( const QStringList& ); void setEntries( const QStringList& );

2
src/controls/QskSkin.h
View File

@ -55,7 +55,7 @@ public:
Q_ENUM( SkinFontRole ) Q_ENUM( SkinFontRole )
QskSkin( QObject* parent = nullptr ); QskSkin( QObject* parent = nullptr );
virtual ~QskSkin(); ~QskSkin() override;
template<typename Control, typename Skinlet> void declareSkinlet(); template<typename Control, typename Skinlet> void declareSkinlet();

2
src/controls/QskSkinFactory.h
View File

@ -18,7 +18,7 @@ class QSK_EXPORT QskSkinFactory : public QObject
public: public:
QskSkinFactory( QObject* parent = nullptr ); QskSkinFactory( QObject* parent = nullptr );
virtual ~QskSkinFactory(); ~QskSkinFactory() override;
virtual QStringList skinNames() const = 0; virtual QStringList skinNames() const = 0;
virtual QskSkin* createSkin( const QString& skinName ) = 0; virtual QskSkin* createSkin( const QString& skinName ) = 0;

2
src/controls/QskSkinManager.h
View File

@ -42,7 +42,7 @@ public:
protected: protected:
QskSkinManager(); QskSkinManager();
virtual ~QskSkinManager(); ~QskSkinManager() override;
class PrivateData; class PrivateData;
std::unique_ptr< PrivateData > m_data; std::unique_ptr< PrivateData > m_data;

12
src/controls/QskSlider.h
View File

@ -31,7 +31,7 @@ public:
explicit QskSlider( QQuickItem* parent = nullptr ); explicit QskSlider( QQuickItem* parent = nullptr );
explicit QskSlider( Qt::Orientation, QQuickItem* parent = nullptr ); explicit QskSlider( Qt::Orientation, QQuickItem* parent = nullptr );
virtual ~QskSlider(); ~QskSlider() override;
bool isPressed() const; bool isPressed() const;
@ -41,8 +41,8 @@ public:
void setTracking( bool ); void setTracking( bool );
bool isTracking() const; bool isTracking() const;
virtual QSizeF contentsSizeHint() const override; QSizeF contentsSizeHint() const override;
virtual QskAspect::Placement effectivePlacement() const override; QskAspect::Placement effectivePlacement() const override;
Q_SIGNALS: Q_SIGNALS:
void pressedChanged( bool ); void pressedChanged( bool );
@ -50,9 +50,9 @@ Q_SIGNALS:
void trackingChanged( bool ); void trackingChanged( bool );
protected: protected:
virtual void mousePressEvent( QMouseEvent* e ) override; void mousePressEvent( QMouseEvent* e ) override;
virtual void mouseMoveEvent( QMouseEvent* e ) override; void mouseMoveEvent( QMouseEvent* e ) override;
virtual void mouseReleaseEvent( QMouseEvent* e ) override; void mouseReleaseEvent( QMouseEvent* e ) override;
QSizeF handleSize() const; QSizeF handleSize() const;
QRectF handleRect() const; QRectF handleRect() const;

6
src/controls/QskSliderSkinlet.h
View File

@ -27,13 +27,13 @@ public:
}; };
Q_INVOKABLE QskSliderSkinlet( QskSkin* = nullptr ); Q_INVOKABLE QskSliderSkinlet( QskSkin* = nullptr );
virtual ~QskSliderSkinlet(); ~QskSliderSkinlet() override;
virtual QRectF subControlRect( const QskSkinnable*, QRectF subControlRect( const QskSkinnable*,
QskAspect::Subcontrol ) const override; QskAspect::Subcontrol ) const override;
protected: protected:
virtual QSGNode* updateSubNode( const QskSkinnable*, QSGNode* updateSubNode( const QskSkinnable*,
quint8 nodeRole, QSGNode* ) const override; quint8 nodeRole, QSGNode* ) const override;
private: private:

12
src/controls/QskStatusIndicator.h
View File

@ -25,7 +25,7 @@ public:
QSK_SUBCONTROLS( Graphic ) QSK_SUBCONTROLS( Graphic )
QskStatusIndicator( QQuickItem* parent = nullptr ); QskStatusIndicator( QQuickItem* parent = nullptr );
virtual ~QskStatusIndicator(); ~QskStatusIndicator() override;
Q_INVOKABLE QUrl source( int status ) const; Q_INVOKABLE QUrl source( int status ) const;
Q_INVOKABLE void setSource( int status, const QUrl& url ); Q_INVOKABLE void setSource( int status, const QUrl& url );
@ -36,10 +36,10 @@ public:
virtual QskColorFilter graphicFilter( int status ) const; virtual QskColorFilter graphicFilter( int status ) const;
virtual QskGraphic loadSource( const QUrl& ) const; virtual QskGraphic loadSource( const QUrl& ) const;
virtual qreal heightForWidth( qreal width ) const override; qreal heightForWidth( qreal width ) const override;
virtual qreal widthForHeight( qreal height ) const override; qreal widthForHeight( qreal height ) const override;
virtual QSizeF contentsSizeHint() const override; QSizeF contentsSizeHint() const override;
int status() const; int status() const;
bool hasStatus( int status ) const; bool hasStatus( int status ) const;
@ -51,8 +51,8 @@ Q_SIGNALS:
void statusChanged( int status ); void statusChanged( int status );
protected: protected:
virtual void changeEvent( QEvent* ) override; void changeEvent( QEvent* ) override;
virtual void updateLayout() override; void updateLayout() override;
private: private:
qreal sizeConstraint( Qt::Orientation, qreal ) const; qreal sizeConstraint( Qt::Orientation, qreal ) const;

6
src/controls/QskStatusIndicatorSkinlet.h
View File

@ -24,13 +24,13 @@ public:
}; };
Q_INVOKABLE QskStatusIndicatorSkinlet( QskSkin* = nullptr ); Q_INVOKABLE QskStatusIndicatorSkinlet( QskSkin* = nullptr );
virtual ~QskStatusIndicatorSkinlet(); ~QskStatusIndicatorSkinlet() override;
virtual QRectF subControlRect( const QskSkinnable*, QRectF subControlRect( const QskSkinnable*,
QskAspect::Subcontrol ) const override; QskAspect::Subcontrol ) const override;
protected: protected:
virtual QSGNode* updateSubNode( QSGNode* updateSubNode(
const QskSkinnable*, quint8 nodeRole, QSGNode* ) const override; const QskSkinnable*, quint8 nodeRole, QSGNode* ) const override;
private: private:

10
src/controls/QskSubWindow.h
View File

@ -36,7 +36,7 @@ public:
QSK_SUBCONTROLS( Panel, TitleBar ) QSK_SUBCONTROLS( Panel, TitleBar )
QskSubWindow( QQuickItem* parent = nullptr ); QskSubWindow( QQuickItem* parent = nullptr );
virtual ~QskSubWindow(); ~QskSubWindow() override;
Q_INVOKABLE void setTitle( const QString& ); Q_INVOKABLE void setTitle( const QString& );
Q_INVOKABLE QString title() const; Q_INVOKABLE QString title() const;
@ -52,8 +52,8 @@ public:
QRectF titleBarRect() const; QRectF titleBarRect() const;
virtual QSizeF contentsSizeHint() const override; QSizeF contentsSizeHint() const override;
virtual QRectF layoutRect() const override; QRectF layoutRect() const override;
Q_SIGNALS: Q_SIGNALS:
void titleChanged(); void titleChanged();
@ -61,9 +61,9 @@ Q_SIGNALS:
void windowButtonsChanged(); void windowButtonsChanged();
protected: protected:
virtual bool event( QEvent* ) override; bool event( QEvent* ) override;
virtual void itemChange( QQuickItem::ItemChange, void itemChange( QQuickItem::ItemChange,
const QQuickItem::ItemChangeData& ) override; const QQuickItem::ItemChangeData& ) override;
private: private:

8
src/controls/QskSubWindowArea.h
View File

@ -22,15 +22,15 @@ public:
QSK_SUBCONTROLS( Panel ) QSK_SUBCONTROLS( Panel )
QskSubWindowArea( QQuickItem* parent = nullptr ); QskSubWindowArea( QQuickItem* parent = nullptr );
virtual ~QskSubWindowArea(); ~QskSubWindowArea() override;
protected: protected:
virtual void geometryChangeEvent( QskGeometryChangeEvent* ) override; void geometryChangeEvent( QskGeometryChangeEvent* ) override;
virtual bool eventFilter( QObject*, QEvent* ) override; bool eventFilter( QObject*, QEvent* ) override;
virtual bool mouseEventFilter( QskSubWindow*, const QMouseEvent* ); virtual bool mouseEventFilter( QskSubWindow*, const QMouseEvent* );
virtual void itemChange( ItemChange, const ItemChangeData& ) override; void itemChange( ItemChange, const ItemChangeData& ) override;
private: private:
virtual void setDragging( QskSubWindow*, bool ); virtual void setDragging( QskSubWindow*, bool );

6
src/controls/QskSubWindowAreaSkinlet.h
View File

@ -24,13 +24,13 @@ public:
}; };
Q_INVOKABLE QskSubWindowAreaSkinlet( QskSkin* = nullptr ); Q_INVOKABLE QskSubWindowAreaSkinlet( QskSkin* = nullptr );
virtual ~QskSubWindowAreaSkinlet(); ~QskSubWindowAreaSkinlet() override;
virtual QRectF subControlRect( const QskSkinnable*, QRectF subControlRect( const QskSkinnable*,
QskAspect::Subcontrol ) const override; QskAspect::Subcontrol ) const override;
protected: protected:
virtual QSGNode* updateSubNode( const QskSkinnable*, QSGNode* updateSubNode( const QskSkinnable*,
quint8 nodeRole, QSGNode* ) const override; quint8 nodeRole, QSGNode* ) const override;
private: private:

6
src/controls/QskSubWindowSkinlet.h
View File

@ -25,13 +25,13 @@ public:
}; };
Q_INVOKABLE QskSubWindowSkinlet( QskSkin* = nullptr ); Q_INVOKABLE QskSubWindowSkinlet( QskSkin* = nullptr );
virtual ~QskSubWindowSkinlet(); ~QskSubWindowSkinlet() override;
virtual QRectF subControlRect( QRectF subControlRect(
const QskSkinnable*, QskAspect::Subcontrol ) const override; const QskSkinnable*, QskAspect::Subcontrol ) const override;
protected: protected:
virtual QSGNode* updateSubNode( const QskSkinnable*, QSGNode* updateSubNode( const QskSkinnable*,
quint8 nodeRole, QSGNode* ) const override; quint8 nodeRole, QSGNode* ) const override;
private: private:

7
src/controls/QskTabBar.h
View File

@ -34,7 +34,8 @@ public:
QskTabBar( QQuickItem* parent = nullptr ); QskTabBar( QQuickItem* parent = nullptr );
QskTabBar( Qt::Orientation, QQuickItem* parent = nullptr ); QskTabBar( Qt::Orientation, QQuickItem* parent = nullptr );
virtual ~QskTabBar();
~QskTabBar() override;
void setOrientation( Qt::Orientation ); void setOrientation( Qt::Orientation );
Qt::Orientation orientation() const; Qt::Orientation orientation() const;
@ -69,7 +70,7 @@ public:
int indexOf( const QskTabButton* ) const; int indexOf( const QskTabButton* ) const;
Q_INVOKABLE int indexOf( QskTabButton* ) const; Q_INVOKABLE int indexOf( QskTabButton* ) const;
virtual QskAspect::Subcontrol effectiveSubcontrol( QskAspect::Subcontrol effectiveSubcontrol(
QskAspect::Subcontrol ) const override; QskAspect::Subcontrol ) const override;
public Q_SLOTS: public Q_SLOTS:
@ -82,7 +83,7 @@ Q_SIGNALS:
void orientationChanged(); void orientationChanged();
protected: protected:
virtual void componentComplete() override; void componentComplete() override;
private: private:
void restack(); void restack();

10
src/controls/QskTabButton.h
View File

@ -27,7 +27,7 @@ public:
QskTabButton( QQuickItem* parent = nullptr ); QskTabButton( QQuickItem* parent = nullptr );
QskTabButton( const QString& text, QQuickItem* parent = nullptr ); QskTabButton( const QString& text, QQuickItem* parent = nullptr );
virtual ~QskTabButton(); ~QskTabButton() override;
void setText( const QString& text ); void setText( const QString& text );
QString text() const; QString text() const;
@ -35,9 +35,9 @@ public:
void setTextOptions( const QskTextOptions& ); void setTextOptions( const QskTextOptions& );
QskTextOptions textOptions() const; QskTextOptions textOptions() const;
virtual QSizeF contentsSizeHint() const override; QSizeF contentsSizeHint() const override;
virtual QRectF layoutRect() const override; QRectF layoutRect() const override;
virtual QskAspect::Placement effectivePlacement() const override; QskAspect::Placement effectivePlacement() const override;
QskTabBar* tabBar() const; QskTabBar* tabBar() const;
@ -46,7 +46,7 @@ Q_SIGNALS:
void textOptionsChanged(); void textOptionsChanged();
protected: protected:
virtual void changeEvent( QEvent* ) override; void changeEvent( QEvent* ) override;
private: private:
void resolveTabBar(); void resolveTabBar();

6
src/controls/QskTabButtonSkinlet.h
View File

@ -23,13 +23,13 @@ public:
}; };
Q_INVOKABLE QskTabButtonSkinlet( QskSkin* = nullptr ); Q_INVOKABLE QskTabButtonSkinlet( QskSkin* = nullptr );
virtual ~QskTabButtonSkinlet(); ~QskTabButtonSkinlet() override;
virtual QRectF subControlRect( QRectF subControlRect(
const QskSkinnable*, QskAspect::Subcontrol ) const override; const QskSkinnable*, QskAspect::Subcontrol ) const override;
protected: protected:
virtual QSGNode* updateSubNode( QSGNode* updateSubNode(
const QskSkinnable*, quint8 nodeRole, QSGNode* ) const override; const QskSkinnable*, quint8 nodeRole, QSGNode* ) const override;
}; };

8
src/controls/QskTabView.h
View File

@ -30,7 +30,7 @@ public:
QskTabView( QQuickItem* parent = nullptr ); QskTabView( QQuickItem* parent = nullptr );
QskTabView( Qt::Orientation, QQuickItem* parent = nullptr ); QskTabView( Qt::Orientation, QQuickItem* parent = nullptr );
virtual ~QskTabView(); ~QskTabView() override;
const QskTabBar* tabBar() const; const QskTabBar* tabBar() const;
@ -60,7 +60,7 @@ public:
QRectF tabRect() const; QRectF tabRect() const;
virtual QSizeF contentsSizeHint() const override; QSizeF contentsSizeHint() const override;
public Q_SLOTS: public Q_SLOTS:
void setCurrentIndex( int index ); void setCurrentIndex( int index );
@ -71,8 +71,8 @@ Q_SIGNALS:
void orientationChanged(); void orientationChanged();
protected: protected:
virtual bool event( QEvent* event ) override; bool event( QEvent* event ) override;
virtual void updateLayout() override; void updateLayout() override;
private: private:
class PrivateData; class PrivateData;

6
src/controls/QskTabViewSkinlet.h
View File

@ -24,13 +24,13 @@ public:
}; };
Q_INVOKABLE QskTabViewSkinlet( QskSkin* = nullptr ); Q_INVOKABLE QskTabViewSkinlet( QskSkin* = nullptr );
virtual ~QskTabViewSkinlet(); ~QskTabViewSkinlet() override;
virtual QRectF subControlRect( QRectF subControlRect(
const QskSkinnable*, QskAspect::Subcontrol ) const override; const QskSkinnable*, QskAspect::Subcontrol ) const override;
protected: protected:
virtual QSGNode* updateSubNode( const QskSkinnable*, QSGNode* updateSubNode( const QskSkinnable*,
quint8 nodeRole, QSGNode* ) const override; quint8 nodeRole, QSGNode* ) const override;
private: private:

4
src/controls/QskTextInput.cpp
View File

@ -113,7 +113,7 @@ namespace
} }
protected: protected:
virtual void geometryChanged( void geometryChanged(
const QRectF& newGeometry, const QRectF& oldGeometry ) override const QRectF& newGeometry, const QRectF& oldGeometry ) override
{ {
Inherited::geometryChanged( newGeometry, oldGeometry ); Inherited::geometryChanged( newGeometry, oldGeometry );
@ -126,7 +126,7 @@ namespace
( contentHeight() > height() ) ); ( contentHeight() > height() ) );
} }
virtual QSGNode* updatePaintNode( QSGNode* updatePaintNode(
QSGNode* oldNode, UpdatePaintNodeData* data ) override QSGNode* oldNode, UpdatePaintNodeData* data ) override
{ {
updateColors(); updateColors();

30
src/controls/QskTextInput.h
View File

@ -76,7 +76,7 @@ public:
QskTextInput( QQuickItem* parent = nullptr ); QskTextInput( QQuickItem* parent = nullptr );
QskTextInput( const QString& text, QQuickItem* parent = nullptr ); QskTextInput( const QString& text, QQuickItem* parent = nullptr );
virtual ~QskTextInput(); ~QskTextInput() override;
void setupFrom( const QQuickItem* ); void setupFrom( const QQuickItem* );
@ -135,7 +135,7 @@ public:
virtual bool hasAcceptableInput() const; virtual bool hasAcceptableInput() const;
virtual bool fixup(); virtual bool fixup();
virtual QVariant inputMethodQuery( Qt::InputMethodQuery ) const override; QVariant inputMethodQuery( Qt::InputMethodQuery ) const override;
QVariant inputMethodQuery( Qt::InputMethodQuery, QVariant argument) const; QVariant inputMethodQuery( Qt::InputMethodQuery, QVariant argument) const;
bool canUndo() const; bool canUndo() const;
@ -146,7 +146,7 @@ public:
void ensureVisible( int position ); void ensureVisible( int position );
virtual QSizeF contentsSizeHint() const override; QSizeF contentsSizeHint() const override;
public Q_SLOTS: public Q_SLOTS:
void setText( const QString& ); void setText( const QString& );
@ -184,23 +184,23 @@ Q_SIGNALS:
void inputMaskChanged( const QString& ); void inputMaskChanged( const QString& );
protected: protected:
virtual bool event( QEvent* ) override; bool event( QEvent* ) override;
virtual void inputMethodEvent( QInputMethodEvent* ) override; void inputMethodEvent( QInputMethodEvent* ) override;
virtual void focusInEvent( QFocusEvent* ) override; void focusInEvent( QFocusEvent* ) override;
virtual void focusOutEvent( QFocusEvent* ) override; void focusOutEvent( QFocusEvent* ) override;
virtual void mousePressEvent( QMouseEvent* ) override; void mousePressEvent( QMouseEvent* ) override;
virtual void mouseMoveEvent( QMouseEvent* ) override; void mouseMoveEvent( QMouseEvent* ) override;
virtual void mouseReleaseEvent( QMouseEvent* ) override; void mouseReleaseEvent( QMouseEvent* ) override;
virtual void mouseDoubleClickEvent( QMouseEvent* ) override; void mouseDoubleClickEvent( QMouseEvent* ) override;
virtual void keyPressEvent( QKeyEvent* ) override; void keyPressEvent( QKeyEvent* ) override;
virtual void keyReleaseEvent( QKeyEvent* ) override; void keyReleaseEvent( QKeyEvent* ) override;
virtual void updateLayout() override; void updateLayout() override;
virtual void updateNode( QSGNode*) override; void updateNode( QSGNode*) override;
private: private:
class PrivateData; class PrivateData;

6
src/controls/QskTextInputSkinlet.h
View File

@ -22,13 +22,13 @@ public:
}; };
Q_INVOKABLE QskTextInputSkinlet( QskSkin* = nullptr ); Q_INVOKABLE QskTextInputSkinlet( QskSkin* = nullptr );
virtual ~QskTextInputSkinlet(); ~QskTextInputSkinlet() override;
virtual QRectF subControlRect( const QskSkinnable*, QRectF subControlRect( const QskSkinnable*,
QskAspect::Subcontrol ) const override; QskAspect::Subcontrol ) const override;
protected: protected:
virtual QSGNode* updateSubNode( const QskSkinnable*, QSGNode* updateSubNode( const QskSkinnable*,
quint8 nodeRole, QSGNode* ) const override; quint8 nodeRole, QSGNode* ) const override;
}; };

10
src/controls/QskTextLabel.h
View File

@ -36,7 +36,7 @@ public:
QskTextLabel( QQuickItem* parent = nullptr ); QskTextLabel( QQuickItem* parent = nullptr );
QskTextLabel( const QString& text, QQuickItem* parent = nullptr ); QskTextLabel( const QString& text, QQuickItem* parent = nullptr );
virtual ~QskTextLabel(); ~QskTextLabel() override;
QString text() const; QString text() const;
@ -52,10 +52,10 @@ public:
void setAlignment( Qt::Alignment ); void setAlignment( Qt::Alignment );
Qt::Alignment alignment() const; Qt::Alignment alignment() const;
virtual QSizeF contentsSizeHint() const override; QSizeF contentsSizeHint() const override;
virtual qreal heightForWidth( qreal width ) const override; qreal heightForWidth( qreal width ) const override;
virtual qreal widthForHeight( qreal height ) const override; qreal widthForHeight( qreal height ) const override;
QFont font() const; QFont font() const;
@ -70,7 +70,7 @@ public Q_SLOTS:
void setText( const QString& ); void setText( const QString& );
protected: protected:
virtual void changeEvent( QEvent* ) override; void changeEvent( QEvent* ) override;
private: private:
class PrivateData; class PrivateData;

6
src/controls/QskTextLabelSkinlet.h
View File

@ -22,13 +22,13 @@ public:
}; };
Q_INVOKABLE QskTextLabelSkinlet( QskSkin* = nullptr ); Q_INVOKABLE QskTextLabelSkinlet( QskSkin* = nullptr );
virtual ~QskTextLabelSkinlet(); ~QskTextLabelSkinlet() override;
virtual QRectF subControlRect( const QskSkinnable*, QRectF subControlRect( const QskSkinnable*,
QskAspect::Subcontrol ) const override; QskAspect::Subcontrol ) const override;
protected: protected:
virtual QSGNode* updateSubNode( const QskSkinnable*, QSGNode* updateSubNode( const QskSkinnable*,
quint8 nodeRole, QSGNode* ) const override; quint8 nodeRole, QSGNode* ) const override;
}; };

8
src/controls/QskVariantAnimator.h
View File

@ -14,7 +14,7 @@ class QSK_EXPORT QskVariantAnimator : public QskAnimator
{ {
public: public:
QskVariantAnimator(); QskVariantAnimator();
virtual ~QskVariantAnimator(); ~QskVariantAnimator() override;
void setCurrentValue( const QVariant& ); void setCurrentValue( const QVariant& );
QVariant currentValue() const; QVariant currentValue() const;
@ -26,9 +26,9 @@ public:
QVariant endValue() const; QVariant endValue() const;
protected: protected:
virtual void setup() override; void setup() override;
virtual void advance( qreal value ) override; void advance( qreal value ) override;
virtual void done() override; void done() override;
private: private:
QVariant m_startValue; QVariant m_startValue;

4
src/controls/QskWindow.cpp
View File

@ -63,7 +63,7 @@ namespace
p->removeItemChangeListener( this, types ); p->removeItemChangeListener( this, types );
} }
virtual void itemChildAdded( QQuickItem*, QQuickItem* ) override final void itemChildAdded( QQuickItem*, QQuickItem* ) override
{ {
QskWindow* window = static_cast< QskWindow* >( m_item->window() ); QskWindow* window = static_cast< QskWindow* >( m_item->window() );
if ( window->isExposed() ) if ( window->isExposed() )
@ -471,7 +471,7 @@ void QskWindow::setCustomRenderMode( const char* mode )
{ {
} }
virtual void run() override final void run() override
{ {
auto* d = QQuickWindowPrivate::get( m_window ); auto* d = QQuickWindowPrivate::get( m_window );

12
src/controls/QskWindow.h
View File

@ -35,7 +35,7 @@ public:
}; };
QskWindow( QWindow* parent = nullptr ); QskWindow( QWindow* parent = nullptr );
virtual ~QskWindow(); ~QskWindow() override;
bool deleteOnClose() const; bool deleteOnClose() const;
void setDeleteOnClose( bool ); void setDeleteOnClose( bool );
@ -74,11 +74,11 @@ public Q_SLOTS:
void resizeF( const QSizeF& ); void resizeF( const QSizeF& );
protected: protected:
virtual bool event( QEvent* ) override; bool event( QEvent* ) override;
virtual void resizeEvent( QResizeEvent* ) override; void resizeEvent( QResizeEvent* ) override;
virtual void exposeEvent( QExposeEvent* ) override; void exposeEvent( QExposeEvent* ) override;
virtual void keyPressEvent(QKeyEvent *) override; void keyPressEvent(QKeyEvent *) override;
virtual void keyReleaseEvent(QKeyEvent *) override; void keyReleaseEvent(QKeyEvent *) override;
virtual void layoutItems(); virtual void layoutItems();
virtual void ensureFocus( Qt::FocusReason ); virtual void ensureFocus( Qt::FocusReason );

2
src/dialogs/QskDialog.h
View File

@ -140,7 +140,7 @@ Q_SIGNALS:
private: private:
QskDialog(); QskDialog();
virtual ~QskDialog(); ~QskDialog() override;
static QskDialog* s_instance; static QskDialog* s_instance;

6
src/dialogs/QskDialogButton.h
View File

@ -25,19 +25,19 @@ public:
QskDialogButton( QskDialog::StandardButton, QQuickItem* parent = nullptr ); QskDialogButton( QskDialog::StandardButton, QQuickItem* parent = nullptr );
QskDialogButton( QQuickItem* parent = nullptr ); QskDialogButton( QQuickItem* parent = nullptr );
virtual ~QskDialogButton(); ~QskDialogButton() override;
void setStandardButton( QskDialog::StandardButton ); void setStandardButton( QskDialog::StandardButton );
QskDialog::StandardButton standardButton() const; QskDialog::StandardButton standardButton() const;
virtual QskAspect::Subcontrol effectiveSubcontrol( QskAspect::Subcontrol effectiveSubcontrol(
QskAspect::Subcontrol ) const override; QskAspect::Subcontrol ) const override;
Q_SIGNALS: Q_SIGNALS:
void standardButtonChanged(); void standardButtonChanged();
protected: protected:
virtual void changeEvent( QEvent* ) override; void changeEvent( QEvent* ) override;
private: private:
QskDialog::StandardButton m_buttonType; QskDialog::StandardButton m_buttonType;

10
src/dialogs/QskDialogButtonBox.h
View File

@ -30,7 +30,7 @@ public:
QskDialogButtonBox( QQuickItem* parent = nullptr ); QskDialogButtonBox( QQuickItem* parent = nullptr );
QskDialogButtonBox( Qt::Orientation orientation, QQuickItem* parent = nullptr ); QskDialogButtonBox( Qt::Orientation orientation, QQuickItem* parent = nullptr );
virtual ~QskDialogButtonBox(); ~QskDialogButtonBox() override;
void setOrientation( Qt::Orientation ); void setOrientation( Qt::Orientation );
Qt::Orientation orientation() const; Qt::Orientation orientation() const;
@ -57,9 +57,9 @@ public:
QskDialog::StandardButton clickedButton() const; QskDialog::StandardButton clickedButton() const;
virtual QSizeF contentsSizeHint() const override; QSizeF contentsSizeHint() const override;
virtual QskAspect::Subcontrol effectiveSubcontrol( QskAspect::Subcontrol effectiveSubcontrol(
QskAspect::Subcontrol ) const override; QskAspect::Subcontrol ) const override;
static bool isDefaultButtonKeyEvent( const QKeyEvent* ); static bool isDefaultButtonKeyEvent( const QKeyEvent* );
@ -74,8 +74,8 @@ Q_SIGNALS:
void orientationChanged(); void orientationChanged();
protected: protected:
virtual bool event( QEvent* event ) override; bool event( QEvent* event ) override;
virtual void updateLayout() override; void updateLayout() override;
virtual QskPushButton* createButton( QskDialog::StandardButton ) const; virtual QskPushButton* createButton( QskDialog::StandardButton ) const;

6
src/dialogs/QskDialogSubWindow.h
View File

@ -18,7 +18,7 @@ class QSK_EXPORT QskDialogSubWindow : public QskSubWindow
public: public:
QskDialogSubWindow( QQuickItem* parent = nullptr ); QskDialogSubWindow( QQuickItem* parent = nullptr );
virtual ~QskDialogSubWindow(); ~QskDialogSubWindow() override;
Q_INVOKABLE QskDialog::DialogCode result() const; Q_INVOKABLE QskDialog::DialogCode result() const;
Q_INVOKABLE QskDialog::DialogCode exec(); Q_INVOKABLE QskDialog::DialogCode exec();
@ -35,9 +35,9 @@ public Q_SLOTS:
protected: protected:
void setResult( QskDialog::DialogCode r ); void setResult( QskDialog::DialogCode r );
virtual void keyPressEvent( QKeyEvent* ) override; void keyPressEvent( QKeyEvent* ) override;
virtual void aboutToShow() override; void aboutToShow() override;
private: private:
QskDialog::DialogCode m_result; QskDialog::DialogCode m_result;

6
src/dialogs/QskDialogWindow.h
View File

@ -19,7 +19,7 @@ class QSK_EXPORT QskDialogWindow : public QskWindow
public: public:
QskDialogWindow( QWindow* parent = nullptr ); QskDialogWindow( QWindow* parent = nullptr );
virtual ~QskDialogWindow(); ~QskDialogWindow() override;
Q_INVOKABLE QskDialog::DialogCode result() const; Q_INVOKABLE QskDialog::DialogCode result() const;
Q_INVOKABLE QskDialog::DialogCode exec(); Q_INVOKABLE QskDialog::DialogCode exec();
@ -37,8 +37,8 @@ public Q_SLOTS:
protected: protected:
void setResult( QskDialog::DialogCode r ); void setResult( QskDialog::DialogCode r );
virtual bool event( QEvent* ) override; bool event( QEvent* ) override;
virtual void keyPressEvent( QKeyEvent* ) override; void keyPressEvent( QKeyEvent* ) override;
private: private:
class PrivateData; class PrivateData;

2
src/dialogs/QskInputSubWindow.cpp
View File

@ -48,7 +48,7 @@ namespace
} }
protected: protected:
virtual void changeEvent( QEvent* event ) override final void changeEvent( QEvent* event ) override
{ {
if ( event->type() == QEvent::FontChange ) if ( event->type() == QEvent::FontChange )
updateSourceSize(); updateSourceSize();

4
src/dialogs/QskInputSubWindow.h
View File

@ -30,7 +30,7 @@ class QSK_EXPORT QskInputSubWindow : public QskDialogSubWindow
public: public:
QskInputSubWindow( QQuickItem* parent = nullptr ); QskInputSubWindow( QQuickItem* parent = nullptr );
virtual ~QskInputSubWindow(); ~QskInputSubWindow() override;
QskDialog::StandardButtons standardButtons() const; QskDialog::StandardButtons standardButtons() const;
void setStandardButtons( QskDialog::StandardButtons ); void setStandardButtons( QskDialog::StandardButtons );
@ -68,7 +68,7 @@ protected:
void setInputControl( QskControl* ); void setInputControl( QskControl* );
QskControl* inputControl() const; QskControl* inputControl() const;
virtual void keyPressEvent( QKeyEvent* ) override; void keyPressEvent( QKeyEvent* ) override;
private: private:
void updateTitleBox(); void updateTitleBox();

2
src/dialogs/QskInputWindow.h
View File

@ -32,7 +32,7 @@ class QSK_EXPORT QskInputWindow : public QskDialogWindow
public: public:
QskInputWindow( QWindow* parent = nullptr ); QskInputWindow( QWindow* parent = nullptr );
virtual ~QskInputWindow(); ~QskInputWindow() override;
QskDialog::StandardButtons standardButtons() const; QskDialog::StandardButtons standardButtons() const;
void setStandardButtons( QskDialog::StandardButtons ); void setStandardButtons( QskDialog::StandardButtons );

2
src/dialogs/QskMessageSubWindow.h
View File

@ -17,7 +17,7 @@ class QSK_EXPORT QskMessageSubWindow : public QskInputSubWindow
public: public:
QskMessageSubWindow( QQuickItem* parent = nullptr ); QskMessageSubWindow( QQuickItem* parent = nullptr );
virtual ~QskMessageSubWindow(); ~QskMessageSubWindow() override;
}; };
#endif #endif

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