From 68bc2f032c9de6462cb826a9179171527c1dcf98 Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Tue, 31 Jul 2018 17:32:25 +0200 Subject: [PATCH] dh --- examples/automotive/ButtonBar.cpp | 6 +-- examples/automotive/ButtonBar.h | 2 +- examples/automotive/DefaultSkin.cpp | 4 +- examples/automotive/DefaultSkin.h | 2 +- examples/automotive/OtherSkin.h | 2 +- examples/automotive/SkinFactory.h | 4 +- examples/automotive/SoundControl.cpp | 44 ++++++++++----------- examples/automotive/SoundControl.h | 4 +- examples/automotive/SpeedometerDisplay.h | 2 +- examples/automotive/SpeedometerSkinlet.h | 6 +-- examples/colorswitch/Theme.cpp | 4 +- examples/frames/Frame.h | 4 +- examples/layouts/DynamicConstraintsPage.cpp | 6 +-- examples/sliders/Slider.h | 4 +- examples/sliders/SliderSkinlet.h | 6 +-- inputcontext/QskHunspellTextPredictor.h | 10 ++--- inputcontext/QskInputContextPlugin.cpp | 34 ++++++++-------- inputcontext/QskPinyinTextPredictor.h | 10 ++--- playground/images/Image.h | 12 +++--- playground/inputpanel/main.cpp | 12 +++--- skins/material/QskMaterialSkin.h | 4 +- skins/material/QskMaterialSkinFactory.h | 6 +-- skins/squiek/QskSquiekSkin.h | 4 +- skins/squiek/QskSquiekSkinFactory.h | 6 +-- src/common/QskMetaInvokable.cpp | 2 +- src/controls/QskAbstractButton.h | 22 +++++------ src/controls/QskBox.h | 6 +-- src/controls/QskBoxSkinlet.h | 6 +-- src/controls/QskControl.cpp | 14 +++---- src/controls/QskControl.h | 29 +++++++------- src/controls/QskDirtyItemFilter.cpp | 2 +- src/controls/QskDirtyItemFilter.h | 2 +- src/controls/QskEvent.h | 4 +- src/controls/QskFlickAnimator.h | 8 ++-- src/controls/QskFocusIndicator.h | 4 +- src/controls/QskFocusIndicatorSkinlet.h | 6 +-- src/controls/QskGesture.h | 8 ++-- src/controls/QskGestureRecognizer.cpp | 9 +---- src/controls/QskGraphicLabel.h | 12 +++--- src/controls/QskGraphicLabelSkinlet.h | 6 +-- src/controls/QskHintAnimator.h | 4 +- src/controls/QskInputGrabber.cpp | 10 ++--- src/controls/QskInputGrabber.h | 4 +- src/controls/QskListView.h | 14 +++---- src/controls/QskListViewSkinlet.h | 4 +- src/controls/QskObjectTree.h | 4 +- src/controls/QskPageIndicator.h | 5 ++- src/controls/QskPageIndicatorSkinlet.h | 6 +-- src/controls/QskPanGestureRecognizer.h | 8 ++-- src/controls/QskPopup.cpp | 6 +-- src/controls/QskPopup.h | 12 +++--- src/controls/QskPopupSkinlet.h | 6 +-- src/controls/QskPushButton.h | 14 +++---- src/controls/QskPushButtonSkinlet.h | 6 +-- src/controls/QskRangeControl.h | 8 ++-- src/controls/QskScrollArea.cpp | 24 +++++------ src/controls/QskScrollArea.h | 4 +- src/controls/QskScrollView.cpp | 4 +- src/controls/QskScrollView.h | 18 ++++----- src/controls/QskScrollViewSkinlet.h | 6 +-- src/controls/QskSeparator.h | 6 +-- src/controls/QskSeparatorSkinlet.h | 6 +-- src/controls/QskSetup.cpp | 12 +++--- src/controls/QskSetup.h | 4 +- src/controls/QskShortcut.h | 8 ++-- src/controls/QskShortcutMap.cpp | 2 +- src/controls/QskSimpleListBox.h | 12 +++--- src/controls/QskSkin.h | 2 +- src/controls/QskSkinFactory.h | 2 +- src/controls/QskSkinManager.h | 2 +- src/controls/QskSlider.h | 12 +++--- src/controls/QskSliderSkinlet.h | 6 +-- src/controls/QskStatusIndicator.h | 12 +++--- src/controls/QskStatusIndicatorSkinlet.h | 6 +-- src/controls/QskSubWindow.h | 10 ++--- src/controls/QskSubWindowArea.h | 8 ++-- src/controls/QskSubWindowAreaSkinlet.h | 6 +-- src/controls/QskSubWindowSkinlet.h | 6 +-- src/controls/QskTabBar.h | 7 ++-- src/controls/QskTabButton.h | 10 ++--- src/controls/QskTabButtonSkinlet.h | 6 +-- src/controls/QskTabView.h | 8 ++-- src/controls/QskTabViewSkinlet.h | 6 +-- src/controls/QskTextInput.cpp | 4 +- src/controls/QskTextInput.h | 30 +++++++------- src/controls/QskTextInputSkinlet.h | 6 +-- src/controls/QskTextLabel.h | 10 ++--- src/controls/QskTextLabelSkinlet.h | 6 +-- src/controls/QskVariantAnimator.h | 8 ++-- src/controls/QskWindow.cpp | 4 +- src/controls/QskWindow.h | 12 +++--- src/dialogs/QskDialog.h | 2 +- src/dialogs/QskDialogButton.h | 6 +-- src/dialogs/QskDialogButtonBox.h | 10 ++--- src/dialogs/QskDialogSubWindow.h | 6 +-- src/dialogs/QskDialogWindow.h | 6 +-- src/dialogs/QskInputSubWindow.cpp | 2 +- src/dialogs/QskInputSubWindow.h | 4 +- src/dialogs/QskInputWindow.h | 2 +- src/dialogs/QskMessageSubWindow.h | 2 +- src/dialogs/QskMessageWindow.h | 2 +- src/dialogs/QskSelectionSubWindow.cpp | 2 +- src/dialogs/QskSelectionSubWindow.h | 2 +- src/dialogs/QskSelectionWindow.h | 2 +- src/graphic/QskGraphic.h | 7 ++-- src/graphic/QskGraphicImageProvider.h | 8 ++-- src/graphic/QskGraphicPaintEngine.h | 30 +++++++------- src/graphic/QskGraphicProvider.h | 2 +- src/graphic/QskGraphicTextureFactory.h | 10 ++--- src/inputpanel/QskInputContext.cpp | 10 ++--- src/inputpanel/QskInputContext.h | 2 +- src/inputpanel/QskInputPanel.h | 2 +- src/inputpanel/QskInputPanelBox.cpp | 6 +-- src/inputpanel/QskInputPanelBox.h | 6 +-- src/inputpanel/QskInputPredictionBar.cpp | 6 +-- src/inputpanel/QskInputPredictionBar.h | 4 +- src/inputpanel/QskTextPredictor.h | 2 +- src/inputpanel/QskVirtualKeyboard.cpp | 2 +- src/inputpanel/QskVirtualKeyboard.h | 12 +++--- src/layouts/QskGridBox.h | 14 +++---- src/layouts/QskIndexedLayoutBox.h | 4 +- src/layouts/QskLayout.h | 10 ++--- src/layouts/QskLayoutEngine.cpp | 6 +-- src/layouts/QskLayoutEngine.h | 2 +- src/layouts/QskLayoutItem.h | 16 ++++---- src/layouts/QskLinearBox.h | 16 ++++---- src/layouts/QskStackBox.h | 12 +++--- src/layouts/QskStackBoxAnimator.h | 18 ++++----- src/nodes/QskBoxClipNode.h | 2 +- src/nodes/QskBoxNode.h | 2 +- src/nodes/QskGraphicNode.h | 2 +- src/nodes/QskRichTextRenderer.cpp | 3 +- src/nodes/QskTextNode.h | 2 +- src/nodes/QskTextureNode.cpp | 12 +++--- src/nodes/QskTextureNode.h | 2 +- support/SkinnyShapeProvider.h | 2 +- 136 files changed, 512 insertions(+), 514 deletions(-) diff --git a/examples/automotive/ButtonBar.cpp b/examples/automotive/ButtonBar.cpp index abc2a823..efcacac4 100644 --- a/examples/automotive/ButtonBar.cpp +++ b/examples/automotive/ButtonBar.cpp @@ -6,7 +6,7 @@ QSK_SUBCONTROL( ButtonBar, Indicator ) -class IndicatorLabel : public QskGraphicLabel +class IndicatorLabel final : public QskGraphicLabel { public: IndicatorLabel( QQuickItem* parentItem = nullptr ): @@ -16,8 +16,8 @@ public: setGraphicRole( SkinFactory::Indicator ); } - virtual QskAspect::Subcontrol effectiveSubcontrol( - QskAspect::Subcontrol subControl ) const override final + QskAspect::Subcontrol effectiveSubcontrol( + QskAspect::Subcontrol subControl ) const override { // so that we can set specific colors in the skin diff --git a/examples/automotive/ButtonBar.h b/examples/automotive/ButtonBar.h index 310f385c..207cd5f8 100644 --- a/examples/automotive/ButtonBar.h +++ b/examples/automotive/ButtonBar.h @@ -12,7 +12,7 @@ public: void addIndicator( const char* name ); protected: - virtual QSizeF contentsSizeHint() const override; + QSizeF contentsSizeHint() const override; }; #endif diff --git a/examples/automotive/DefaultSkin.cpp b/examples/automotive/DefaultSkin.cpp index 38aec733..406420df 100644 --- a/examples/automotive/DefaultSkin.cpp +++ b/examples/automotive/DefaultSkin.cpp @@ -21,10 +21,10 @@ #include -class Transition : public QskSkinTransition +class Transition final : public QskSkinTransition { protected: - virtual void updateSkin( QskSkin*, QskSkin* newSkin ) override final + void updateSkin( QskSkin*, QskSkin* newSkin ) override { DefaultSkin* skin = static_cast< DefaultSkin* >( newSkin ); skin->resetHints(); diff --git a/examples/automotive/DefaultSkin.h b/examples/automotive/DefaultSkin.h index 7fbc2996..af043b90 100644 --- a/examples/automotive/DefaultSkin.h +++ b/examples/automotive/DefaultSkin.h @@ -9,7 +9,7 @@ class DefaultSkin : public QskSkin { public: DefaultSkin( const QString& name, QObject* parent = nullptr ); - virtual ~DefaultSkin(); + ~DefaultSkin() override; void toggleScheme(); void resetHints(); diff --git a/examples/automotive/OtherSkin.h b/examples/automotive/OtherSkin.h index d401e852..318d8ade 100644 --- a/examples/automotive/OtherSkin.h +++ b/examples/automotive/OtherSkin.h @@ -9,7 +9,7 @@ class OtherSkin : public QskSkin { public: OtherSkin( const QString& name, QObject* parent = nullptr ); - virtual ~OtherSkin(); + ~OtherSkin() override; private: void initHints(); diff --git a/examples/automotive/SkinFactory.h b/examples/automotive/SkinFactory.h index a8d9c846..d796ed5b 100644 --- a/examples/automotive/SkinFactory.h +++ b/examples/automotive/SkinFactory.h @@ -20,8 +20,8 @@ public: Vehicle }; - virtual QStringList skinNames() const override; - virtual QskSkin* createSkin( const QString& skinName ) override; + QStringList skinNames() const override; + QskSkin* createSkin( const QString& skinName ) override; public Q_SLOTS: void rotateSkin(); diff --git a/examples/automotive/SoundControl.cpp b/examples/automotive/SoundControl.cpp index 4033419f..9880fc56 100644 --- a/examples/automotive/SoundControl.cpp +++ b/examples/automotive/SoundControl.cpp @@ -20,7 +20,7 @@ QSK_SUBCONTROL( SoundControl, MarkerControl ) QSK_SUBCONTROL( SoundControl, Vehicle ) QSK_SUBCONTROL( SoundControl, SliderControl ) -class VehicleLabel : public QskGraphicLabel +class VehicleLabel final : public QskGraphicLabel { public: VehicleLabel( QQuickItem* parentItem = nullptr ): @@ -29,8 +29,8 @@ public: setGraphic( QskGraphicIO::read( QString( ":/qvg/car.qvg" ) ) ); } - virtual QskAspect::Subcontrol effectiveSubcontrol( - QskAspect::Subcontrol subControl ) const override final + QskAspect::Subcontrol effectiveSubcontrol( + QskAspect::Subcontrol subControl ) const override { // 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: CrossHairLine( QQuickItem* parent ): @@ -49,8 +49,8 @@ public: { } - virtual QskAspect::Subcontrol effectiveSubcontrol( - QskAspect::Subcontrol subControl ) const override final + QskAspect::Subcontrol effectiveSubcontrol( + QskAspect::Subcontrol subControl ) const override { if ( subControl == QskBox::Panel ) return SoundControl::CrossHair; @@ -59,7 +59,7 @@ public: } }; -class BalanceFadeMarker : public QskBox +class BalanceFadeMarker final : public QskBox { public: BalanceFadeMarker( QQuickItem* parent ): @@ -67,8 +67,8 @@ public: { } - virtual QskAspect::Subcontrol effectiveSubcontrol( - QskAspect::Subcontrol subControl ) const override final + QskAspect::Subcontrol effectiveSubcontrol( + QskAspect::Subcontrol subControl ) const override { if ( subControl == QskBox::Panel ) return SoundControl::Marker; @@ -77,7 +77,7 @@ public: } }; -class MarkerControlButton : public QskPushButton +class MarkerControlButton final : public QskPushButton { public: MarkerControlButton( Qsk::Direction direction, QQuickItem* parentItem = nullptr ): @@ -115,8 +115,8 @@ public: return QPointF(); } - virtual QskAspect::Subcontrol effectiveSubcontrol( - QskAspect::Subcontrol subControl ) const override final + QskAspect::Subcontrol effectiveSubcontrol( + QskAspect::Subcontrol subControl ) const override { // so that we can set specific colors in the skin @@ -127,7 +127,7 @@ public: } protected: - virtual QSizeF contentsSizeHint() const override final + QSizeF contentsSizeHint() const override { const qreal dim = 100; @@ -141,7 +141,7 @@ private: const Qsk::Direction m_direction; }; -class ControlButton : public QskPushButton +class ControlButton final : public QskPushButton { public: ControlButton( const char symbol, QQuickItem* parentItem = nullptr ): @@ -153,7 +153,7 @@ public: setAutoRepeat( true ); } - virtual QskAspect::Subcontrol effectiveSubcontrol( + QskAspect::Subcontrol effectiveSubcontrol( QskAspect::Subcontrol subControl ) const override { if ( subControl == QskPushButton::Panel ) @@ -162,14 +162,14 @@ public: return QskPushButton::effectiveSubcontrol( subControl ); } - virtual QSizeF contentsSizeHint() const override final + QSizeF contentsSizeHint() const override { qreal h = QskPushButton::contentsSizeHint().height(); return QSizeF( h, h ); } }; -class StackedControl : public QskControl +class StackedControl final : public QskControl { public: StackedControl( QQuickItem* parent = nullptr ): @@ -203,7 +203,7 @@ public: } protected: - virtual void updateLayout() override final + void updateLayout() override { const QRectF cr = contentsRect(); const qreal crossHairSize = 3; @@ -242,7 +242,7 @@ private: QPointF m_offset; }; -class SectionTitleBar : public QskLinearBox +class SectionTitleBar final : public QskLinearBox { public: SectionTitleBar( const char* title, QQuickItem* parentItem = nullptr ): @@ -262,7 +262,7 @@ public: } }; -class SliderBox : public QskLinearBox +class SliderBox final : public QskLinearBox { public: SliderBox( const char* title, qreal min, qreal max, QQuickItem* parentItem = nullptr ): @@ -328,7 +328,7 @@ private: QskSlider* m_slider; }; -class ToneControlBox : public QskLinearBox +class ToneControlBox final : public QskLinearBox { public: ToneControlBox( QQuickItem* parentItem = nullptr ): @@ -344,7 +344,7 @@ public: } }; -class BalanceFadeControlBox : public QskGridBox +class BalanceFadeControlBox final : public QskGridBox { public: BalanceFadeControlBox( QQuickItem* parentItem = nullptr ): diff --git a/examples/automotive/SoundControl.h b/examples/automotive/SoundControl.h index 05154a6e..a4bf5f26 100644 --- a/examples/automotive/SoundControl.h +++ b/examples/automotive/SoundControl.h @@ -10,8 +10,8 @@ public: SoundControl( QQuickItem* parent = nullptr ); - virtual QskAspect::Subcontrol effectiveSubcontrol( + QskAspect::Subcontrol effectiveSubcontrol( QskAspect::Subcontrol subControl ) const override final; }; -#endif // SOUNDCONTROL_H +#endif diff --git a/examples/automotive/SpeedometerDisplay.h b/examples/automotive/SpeedometerDisplay.h index de7abae9..eeca1c83 100644 --- a/examples/automotive/SpeedometerDisplay.h +++ b/examples/automotive/SpeedometerDisplay.h @@ -25,4 +25,4 @@ private: QskTextLabel* m_fuelGaugeText; }; -#endif // SPEEDOMETERDISPLAY_H +#endif diff --git a/examples/automotive/SpeedometerSkinlet.h b/examples/automotive/SpeedometerSkinlet.h index 87e8655a..8e1b5ab3 100644 --- a/examples/automotive/SpeedometerSkinlet.h +++ b/examples/automotive/SpeedometerSkinlet.h @@ -19,9 +19,9 @@ public: }; 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; protected: @@ -33,4 +33,4 @@ private: QSGNode* updateNeedleNode( const Speedometer*, QSGNode* ) const; }; -#endif // SPEEDOMETERSKINLET_H +#endif diff --git a/examples/colorswitch/Theme.cpp b/examples/colorswitch/Theme.cpp index 87616677..007a6b6a 100644 --- a/examples/colorswitch/Theme.cpp +++ b/examples/colorswitch/Theme.cpp @@ -28,7 +28,7 @@ static void qskResetColors( QskSkin* skin, const QColor& accent ) namespace { - class SkinTransition : public QskSkinTransition + class SkinTransition final : public QskSkinTransition { public: SkinTransition( const QColor& accent ): @@ -37,7 +37,7 @@ namespace } protected: - virtual void updateSkin( QskSkin*, QskSkin* newSkin ) override final + void updateSkin( QskSkin*, QskSkin* newSkin ) override { qskResetColors( newSkin, m_accent ); } diff --git a/examples/frames/Frame.h b/examples/frames/Frame.h index 83d3cb34..ae1d2a19 100644 --- a/examples/frames/Frame.h +++ b/examples/frames/Frame.h @@ -38,7 +38,7 @@ public: Q_ENUM( Style ) Frame( QQuickItem* parent = nullptr ); - virtual ~Frame(); + ~Frame() override; void setStyle( Style ); Style style() const; @@ -60,7 +60,7 @@ Q_SIGNALS: void colorChanged(); protected: - virtual void updateNode( QSGNode* ) override; + void updateNode( QSGNode* ) override; private: void updateFrameNode( const QRectF&, QskBoxNode* ); diff --git a/examples/layouts/DynamicConstraintsPage.cpp b/examples/layouts/DynamicConstraintsPage.cpp index 8217dbbc..617e6ee9 100644 --- a/examples/layouts/DynamicConstraintsPage.cpp +++ b/examples/layouts/DynamicConstraintsPage.cpp @@ -13,14 +13,14 @@ namespace { - class Control : public QskControl + class Control final : public QskControl { public: Control( const char* colorName, QQuickItem* parent = nullptr ); Control( const char* colorName, qreal aspectRatio, QQuickItem* parent = nullptr ); - virtual qreal heightForWidth( qreal width ) const override final; - virtual qreal widthForHeight( qreal height ) const override final; + qreal heightForWidth( qreal width ) const override; + qreal widthForHeight( qreal height ) const override; void transpose(); diff --git a/examples/sliders/Slider.h b/examples/sliders/Slider.h index 856ec3dd..5d072c4e 100644 --- a/examples/sliders/Slider.h +++ b/examples/sliders/Slider.h @@ -17,8 +17,8 @@ public: Slider( QQuickItem* parent = nullptr ); - virtual QRectF focusIndicatorRect() const override; - virtual QSizeF contentsSizeHint() const override; + QRectF focusIndicatorRect() const override; + QSizeF contentsSizeHint() const override; }; #endif diff --git a/examples/sliders/SliderSkinlet.h b/examples/sliders/SliderSkinlet.h index 521f632d..89ad91d1 100644 --- a/examples/sliders/SliderSkinlet.h +++ b/examples/sliders/SliderSkinlet.h @@ -23,13 +23,13 @@ public: }; SliderSkinlet(); - virtual ~SliderSkinlet() override; + ~SliderSkinlet() override; - virtual QRectF subControlRect( const QskSkinnable*, + QRectF subControlRect( const QskSkinnable*, QskAspect::Subcontrol ) const override; protected: - virtual QSGNode* updateSubNode( + QSGNode* updateSubNode( const QskSkinnable*, quint8 nodeRole, QSGNode* ) const override; private: diff --git a/inputcontext/QskHunspellTextPredictor.h b/inputcontext/QskHunspellTextPredictor.h index 9631631c..8e673939 100644 --- a/inputcontext/QskHunspellTextPredictor.h +++ b/inputcontext/QskHunspellTextPredictor.h @@ -15,14 +15,14 @@ class QSK_EXPORT QskHunspellTextPredictor : public QskTextPredictor public: QskHunspellTextPredictor( QObject* = nullptr ); - virtual ~QskHunspellTextPredictor() override; + ~QskHunspellTextPredictor() override; - virtual int candidateCount() const override; - virtual QString candidate( int pos ) const override; + int candidateCount() const override; + QString candidate( int pos ) const override; protected: - virtual void request( const QString& ) override; - virtual void reset() override; + void request( const QString& ) override; + void reset() override; private: class PrivateData; diff --git a/inputcontext/QskInputContextPlugin.cpp b/inputcontext/QskInputContextPlugin.cpp index 2feca1d4..28712d6a 100644 --- a/inputcontext/QskInputContextPlugin.cpp +++ b/inputcontext/QskInputContextPlugin.cpp @@ -53,35 +53,35 @@ public: QskPlatformInputContext(); virtual ~QskPlatformInputContext() = default; - virtual bool isValid() const override; - virtual bool hasCapability( Capability ) const override; + bool isValid() 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 ); - virtual void invokeAction( QInputMethod::Action, int ) override; + void invokeAction( QInputMethod::Action, int ) override; - virtual QRectF keyboardRect() const override; - virtual bool isAnimating() const override; + QRectF keyboardRect() const override; + bool isAnimating() const override; - virtual void showInputPanel() override; - virtual void hideInputPanel() override; + void showInputPanel() override; + void hideInputPanel() override; Q_INVOKABLE void setInputPanelVisible( const QQuickItem*, bool ); - virtual bool isInputPanelVisible() const override; + bool isInputPanelVisible() const override; - virtual void reset() override; - virtual void commit() override; + void reset() override; + void commit() override; - virtual void setFocusObject( QObject* ) override; + void setFocusObject( QObject* ) override; - virtual QLocale locale() const override; - virtual Qt::LayoutDirection inputDirection() const override; + QLocale locale() const override; + Qt::LayoutDirection inputDirection() const override; - virtual bool filterEvent( const QEvent* ) override; + bool filterEvent( const QEvent* ) override; protected: - virtual bool event( QEvent* ) override; + bool event( QEvent* ) override; private: void updateContext(); @@ -271,7 +271,7 @@ class QskInputContextPlugin final : public QPlatformInputContextPlugin Q_PLUGIN_METADATA( IID QPlatformInputContextFactoryInterface_iid FILE "metadata.json" ) public: - virtual QPlatformInputContext* create( + QPlatformInputContext* create( const QString& system, const QStringList& ) override { if ( system.compare( QStringLiteral( "skinny" ), Qt::CaseInsensitive ) == 0 ) diff --git a/inputcontext/QskPinyinTextPredictor.h b/inputcontext/QskPinyinTextPredictor.h index 9199af71..d9981bdf 100644 --- a/inputcontext/QskPinyinTextPredictor.h +++ b/inputcontext/QskPinyinTextPredictor.h @@ -15,14 +15,14 @@ class QSK_EXPORT QskPinyinTextPredictor : public QskTextPredictor public: QskPinyinTextPredictor( QObject* = nullptr ); - virtual ~QskPinyinTextPredictor() override; + ~QskPinyinTextPredictor() override; - virtual int candidateCount() const override; - virtual QString candidate( int ) const override; + int candidateCount() const override; + QString candidate( int ) const override; protected: - virtual void request( const QString& ) override; - virtual void reset() override; + void request( const QString& ) override; + void reset() override; private: class PrivateData; diff --git a/playground/images/Image.h b/playground/images/Image.h index 7348549a..36e01575 100644 --- a/playground/images/Image.h +++ b/playground/images/Image.h @@ -35,7 +35,7 @@ class Image : public QQuickImage public: Image( QQuickItem* parent = nullptr ); - virtual ~Image(); + ~Image() override; void setSourceSizeAdjustment( bool ); bool sourceSizeAdjustment() const; @@ -59,12 +59,12 @@ Q_SIGNALS: void deferredUpdatesChanged(); protected: - virtual void geometryChanged( const QRectF&, const QRectF& ) override; - virtual void itemChange( ItemChange, const ItemChangeData& ) override; - virtual void componentComplete() override; + void geometryChanged( const QRectF&, const QRectF& ) override; + void itemChange( ItemChange, const ItemChangeData& ) override; + void componentComplete() override; - virtual QSGNode* updatePaintNode( QSGNode*, UpdatePaintNodeData* ) override; - virtual void updatePolish() override; + QSGNode* updatePaintNode( QSGNode*, UpdatePaintNodeData* ) override; + void updatePolish() override; private: class PrivateData; diff --git a/playground/inputpanel/main.cpp b/playground/inputpanel/main.cpp index 093e5938..44f173dc 100644 --- a/playground/inputpanel/main.cpp +++ b/playground/inputpanel/main.cpp @@ -146,7 +146,7 @@ public: } }; -class LocaleListView : public QskListView +class LocaleListView final : public QskListView { Q_OBJECT @@ -187,17 +187,17 @@ public: [ this ]( int row ) { Q_EMIT selected( localeAt( row ) ); } ); } - virtual int rowCount() const override final + int rowCount() const override { return m_values.count(); } - virtual int columnCount() const override final + int columnCount() const override { return 1; } - virtual qreal columnWidth( int ) const override + qreal columnWidth( int ) const override { if ( m_maxWidth == 0.0 ) { @@ -215,7 +215,7 @@ public: return m_maxWidth; } - virtual qreal rowHeight() const override + qreal rowHeight() const override { using namespace QskAspect; @@ -225,7 +225,7 @@ public: 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; } diff --git a/skins/material/QskMaterialSkin.h b/skins/material/QskMaterialSkin.h index 2ab2a4d8..0afcf5e7 100644 --- a/skins/material/QskMaterialSkin.h +++ b/skins/material/QskMaterialSkin.h @@ -17,10 +17,10 @@ class QSK_EXPORT QskMaterialSkin : public QskSkin public: QskMaterialSkin( QObject* parent = nullptr ); - virtual ~QskMaterialSkin(); + ~QskMaterialSkin() override; private: - virtual void resetColors( const QColor& accent ) override; + void resetColors( const QColor& accent ) override; void initHints(); diff --git a/skins/material/QskMaterialSkinFactory.h b/skins/material/QskMaterialSkinFactory.h index 8cf95314..7bb85066 100644 --- a/skins/material/QskMaterialSkinFactory.h +++ b/skins/material/QskMaterialSkinFactory.h @@ -17,10 +17,10 @@ class QSK_EXPORT QskMaterialSkinFactory : public QskSkinFactory public: QskMaterialSkinFactory( QObject* parent = nullptr ); - virtual ~QskMaterialSkinFactory(); + ~QskMaterialSkinFactory() override; - virtual QStringList skinNames() const override; - virtual QskSkin* createSkin( const QString& skinName ) override; + QStringList skinNames() const override; + QskSkin* createSkin( const QString& skinName ) override; }; #endif diff --git a/skins/squiek/QskSquiekSkin.h b/skins/squiek/QskSquiekSkin.h index f76626f4..099cf747 100644 --- a/skins/squiek/QskSquiekSkin.h +++ b/skins/squiek/QskSquiekSkin.h @@ -17,10 +17,10 @@ class QSK_EXPORT QskSquiekSkin : public QskSkin public: QskSquiekSkin( QObject* parent = nullptr ); - virtual ~QskSquiekSkin(); + ~QskSquiekSkin() override; private: - virtual void resetColors( const QColor& accent ) override; + void resetColors( const QColor& accent ) override; void initHints(); diff --git a/skins/squiek/QskSquiekSkinFactory.h b/skins/squiek/QskSquiekSkinFactory.h index baafdf15..be9df11d 100644 --- a/skins/squiek/QskSquiekSkinFactory.h +++ b/skins/squiek/QskSquiekSkinFactory.h @@ -17,10 +17,10 @@ class QSK_EXPORT QskSquiekSkinFactory : public QskSkinFactory public: QskSquiekSkinFactory( QObject* parent = nullptr ); - virtual ~QskSquiekSkinFactory(); + ~QskSquiekSkinFactory() override; - virtual QStringList skinNames() const override; - virtual QskSkin* createSkin( const QString& skinName ) override; + QStringList skinNames() const override; + QskSkin* createSkin( const QString& skinName ) override; }; #endif diff --git a/src/common/QskMetaInvokable.cpp b/src/common/QskMetaInvokable.cpp index 2a541749..b39af836 100644 --- a/src/common/QskMetaInvokable.cpp +++ b/src/common/QskMetaInvokable.cpp @@ -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() ); } diff --git a/src/controls/QskAbstractButton.h b/src/controls/QskAbstractButton.h index c387b93d..61e6da8e 100644 --- a/src/controls/QskAbstractButton.h +++ b/src/controls/QskAbstractButton.h @@ -33,7 +33,7 @@ public: QSK_STATES( Flat, Checked, Pressed, Checkable ) QskAbstractButton( QQuickItem* parent = nullptr ); - virtual ~QskAbstractButton(); + ~QskAbstractButton() override; void setCheckable( bool ); bool isCheckable() const; @@ -78,20 +78,20 @@ Q_SIGNALS: void exclusiveChanged( bool ); protected: - virtual bool event( QEvent* ) override; + bool event( QEvent* ) override; - virtual void keyPressEvent( QKeyEvent* ) override; - virtual void keyReleaseEvent( QKeyEvent* ) override; + void keyPressEvent( QKeyEvent* ) override; + void keyReleaseEvent( QKeyEvent* ) override; - virtual void mouseMoveEvent( QMouseEvent* ) override; - virtual void mousePressEvent( QMouseEvent* ) override; - virtual void mouseReleaseEvent( QMouseEvent* ) override; - virtual void mouseUngrabEvent() override; + void mouseMoveEvent( QMouseEvent* ) override; + void mousePressEvent( QMouseEvent* ) override; + void mouseReleaseEvent( QMouseEvent* ) override; + void mouseUngrabEvent() override; - virtual void focusInEvent( QFocusEvent* ) override; - virtual void focusOutEvent( QFocusEvent* ) override; + void focusInEvent( QFocusEvent* ) override; + void focusOutEvent( QFocusEvent* ) override; - virtual void timerEvent( QTimerEvent* ) override; + void timerEvent( QTimerEvent* ) override; virtual void setCheckedState( bool on ); diff --git a/src/controls/QskBox.h b/src/controls/QskBox.h index 4ac31754..787012e0 100644 --- a/src/controls/QskBox.h +++ b/src/controls/QskBox.h @@ -18,10 +18,10 @@ public: QSK_SUBCONTROLS( Panel ) QskBox( QQuickItem* parent = nullptr ); - virtual ~QskBox(); + ~QskBox() override; - virtual QRectF layoutRect() const override; - virtual QSizeF contentsSizeHint() const override; + QRectF layoutRect() const override; + QSizeF contentsSizeHint() const override; }; #endif diff --git a/src/controls/QskBoxSkinlet.h b/src/controls/QskBoxSkinlet.h index 1614aefc..f75c1631 100644 --- a/src/controls/QskBoxSkinlet.h +++ b/src/controls/QskBoxSkinlet.h @@ -22,13 +22,13 @@ public: }; Q_INVOKABLE QskBoxSkinlet( QskSkin* = nullptr ); - virtual ~QskBoxSkinlet(); + ~QskBoxSkinlet() override; - virtual QRectF subControlRect( const QskSkinnable*, + QRectF subControlRect( const QskSkinnable*, QskAspect::Subcontrol ) const override; protected: - virtual QSGNode* updateSubNode( const QskSkinnable*, + QSGNode* updateSubNode( const QskSkinnable*, quint8 nodeRole, QSGNode* ) const override; }; diff --git a/src/controls/QskControl.cpp b/src/controls/QskControl.cpp index 612cd9d4..15abd342 100644 --- a/src/controls/QskControl.cpp +++ b/src/controls/QskControl.cpp @@ -209,12 +209,12 @@ public: } } - virtual ~QskControlPrivate() + ~QskControlPrivate() override { delete explicitSizeData; } - virtual void mirrorChange() override final + void mirrorChange() override { Q_Q( QskControl ); qskSendEventTo( q, QEvent::LayoutDirectionChange ); @@ -235,13 +235,13 @@ public: #if 0 // can we do something useful with overloading those ??? - virtual qreal getImplicitWidth() const override final; - virtual qreal getImplicitHeight() const override final; + qreal getImplicitWidth() const override; + qreal getImplicitHeight() const override; - virtual QSGTransformNode* createTransformNode(); + QSGTransformNode* createTransformNode() override; #endif - virtual void implicitWidthChanged() override final + void implicitWidthChanged() override { QQuickItemPrivate::implicitWidthChanged(); @@ -249,7 +249,7 @@ public: implicitSizeChanged(); } - virtual void implicitHeightChanged() override final + void implicitHeightChanged() override { QQuickItemPrivate::implicitWidthChanged(); diff --git a/src/controls/QskControl.h b/src/controls/QskControl.h index 5e8bb7b4..84ef2d8b 100644 --- a/src/controls/QskControl.h +++ b/src/controls/QskControl.h @@ -89,7 +89,7 @@ public: Q_DECLARE_FLAGS( Flags, Flag ) QskControl( QQuickItem* parent = nullptr ); - virtual ~QskControl(); + ~QskControl() override; const char* className() const; @@ -227,23 +227,24 @@ public Q_SLOTS: void resetImplicitSize(); protected: - virtual bool event( QEvent* ) override; + bool event( QEvent* ) override; + virtual void changeEvent( QEvent* ); virtual void geometryChangeEvent( QskGeometryChangeEvent* ); virtual void windowChangeEvent( QskWindowChangeEvent* ); virtual void gestureEvent( QskGestureEvent* ); - virtual void hoverEnterEvent( QHoverEvent* ) override; - virtual void hoverLeaveEvent( QHoverEvent* ) override; + void hoverEnterEvent( QHoverEvent* ) override; + void hoverLeaveEvent( QHoverEvent* ) override; - virtual bool childMouseEventFilter( QQuickItem*, QEvent* ) override; + bool childMouseEventFilter( QQuickItem*, QEvent* ) override; virtual bool gestureFilter( QQuickItem*, QEvent* ); - virtual void itemChange( ItemChange, const ItemChangeData& ) override; - virtual void geometryChanged( const QRectF&, const QRectF& ) override; - virtual void classBegin() override; - virtual void componentComplete() override; - virtual void releaseResources() override; + void itemChange( ItemChange, const ItemChangeData& ) override; + void geometryChanged( const QRectF&, const QRectF& ) override; + void classBegin() override; + void componentComplete() override; + void releaseResources() override; void initSizePolicy( QskSizePolicy::Policy, QskSizePolicy::Policy ); @@ -254,15 +255,15 @@ protected: private: // 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 updateInputMethod( Qt::InputMethodQueries ) = delete; // use qskUpdateInputMethod - virtual QSGNode* updatePaintNode( QSGNode*, UpdatePaintNodeData* ) override final; - virtual void updatePolish() override final; + QSGNode* updatePaintNode( QSGNode*, UpdatePaintNodeData* ) override final; + void updatePolish() override final; - virtual QskControl* owningControl() const override final; + QskControl* owningControl() const override final; void layoutConstraintChanged(); void updateImplicitSize(); diff --git a/src/controls/QskDirtyItemFilter.cpp b/src/controls/QskDirtyItemFilter.cpp index 5aecca0e..bea4a3b4 100644 --- a/src/controls/QskDirtyItemFilter.cpp +++ b/src/controls/QskDirtyItemFilter.cpp @@ -57,7 +57,7 @@ namespace { } - virtual void run() override final + void run() override { qskBlockDirty( m_window->contentItem(), false ); } diff --git a/src/controls/QskDirtyItemFilter.h b/src/controls/QskDirtyItemFilter.h index 9e2bbcb2..7001abd7 100644 --- a/src/controls/QskDirtyItemFilter.h +++ b/src/controls/QskDirtyItemFilter.h @@ -20,7 +20,7 @@ class QSK_EXPORT QskDirtyItemFilter : public QObject public: QskDirtyItemFilter( QObject* parent = nullptr ); - virtual ~QskDirtyItemFilter(); + ~QskDirtyItemFilter() override; void addWindow( QQuickWindow* window ); diff --git a/src/controls/QskEvent.h b/src/controls/QskEvent.h index 798ba698..b3495fb0 100644 --- a/src/controls/QskEvent.h +++ b/src/controls/QskEvent.h @@ -69,7 +69,7 @@ class QSK_EXPORT QskGestureEvent : public QskEvent { public: QskGestureEvent( const QskGesture* gesture, bool ownedByEvent = true ); - virtual ~QskGestureEvent(); + ~QskGestureEvent() override; inline const QskGesture* gesture() const { return m_gesture; } inline bool isGestureOwnedByEvent() const { return m_gestureOwnedByEvent; } @@ -89,7 +89,7 @@ public: }; QskAnimatorEvent( QskAspect::Aspect aspect, State state ); - virtual ~QskAnimatorEvent(); + ~QskAnimatorEvent() override; inline QskAspect::Aspect aspect() const { return m_aspect; } inline State state() const { return m_state; } diff --git a/src/controls/QskFlickAnimator.h b/src/controls/QskFlickAnimator.h index 18bdfc39..a245df8f 100644 --- a/src/controls/QskFlickAnimator.h +++ b/src/controls/QskFlickAnimator.h @@ -13,7 +13,7 @@ class QSK_EXPORT QskFlickAnimator : public QskAnimator { public: QskFlickAnimator(); - virtual ~QskFlickAnimator(); + ~QskFlickAnimator() override; void setAngle( qreal degrees ); qreal angle() const; @@ -27,9 +27,9 @@ public: void accelerate( qreal degrees, qreal velocity ); protected: - virtual void setup() override; - virtual void advance( qreal value ) override final; - virtual void done() override; + void setup() override; + void advance( qreal value ) override final; + void done() override; virtual void translate( qreal dx, qreal dy ) = 0; diff --git a/src/controls/QskFocusIndicator.h b/src/controls/QskFocusIndicator.h index b5411308..f541bbcd 100644 --- a/src/controls/QskFocusIndicator.h +++ b/src/controls/QskFocusIndicator.h @@ -20,10 +20,10 @@ public: QSK_SUBCONTROLS( Panel ) QskFocusIndicator( QQuickItem* parent = nullptr ); - virtual ~QskFocusIndicator(); + ~QskFocusIndicator() override; protected: - virtual void windowChangeEvent( QskWindowChangeEvent* ) override; + void windowChangeEvent( QskWindowChangeEvent* ) override; virtual QRectF focusRect() const; private: diff --git a/src/controls/QskFocusIndicatorSkinlet.h b/src/controls/QskFocusIndicatorSkinlet.h index f356bae8..7f273996 100644 --- a/src/controls/QskFocusIndicatorSkinlet.h +++ b/src/controls/QskFocusIndicatorSkinlet.h @@ -24,13 +24,13 @@ public: }; Q_INVOKABLE QskFocusIndicatorSkinlet( QskSkin* = nullptr ); - virtual ~QskFocusIndicatorSkinlet(); + ~QskFocusIndicatorSkinlet() override; - virtual QRectF subControlRect( const QskSkinnable*, + QRectF subControlRect( const QskSkinnable*, QskAspect::Subcontrol ) const override; protected: - virtual QSGNode* updateSubNode( const QskSkinnable*, + QSGNode* updateSubNode( const QskSkinnable*, quint8 nodeRole, QSGNode* ) const override; private: diff --git a/src/controls/QskGesture.h b/src/controls/QskGesture.h index 349ae7aa..090338cd 100644 --- a/src/controls/QskGesture.h +++ b/src/controls/QskGesture.h @@ -64,7 +64,7 @@ class QSK_EXPORT QskTapGesture : public QskGesture public: QskTapGesture(); - virtual ~QskTapGesture(); + ~QskTapGesture() override; void setPosition( const QPointF& pos ); inline QPointF position() const { return m_position; } @@ -79,7 +79,7 @@ class QSK_EXPORT QskTapAndHoldGesture : public QskGesture public: QskTapAndHoldGesture(); - virtual ~QskTapAndHoldGesture(); + ~QskTapAndHoldGesture() override; void setPosition( const QPointF& pos ); inline QPointF position() const { return m_position; } @@ -98,7 +98,7 @@ class QskPanGesture : public QskGesture public: QskPanGesture(); - virtual ~QskPanGesture(); + ~QskPanGesture() override; void setVelocity( qreal ); inline qreal velocity() const { return m_velocity; } @@ -132,7 +132,7 @@ class QskSwipeGesture : public QskGesture public: QskSwipeGesture(); - virtual ~QskSwipeGesture(); + ~QskSwipeGesture() override; void setVelocity( qreal velocity ); inline qreal velocity() const { return m_velocity; } diff --git a/src/controls/QskGestureRecognizer.cpp b/src/controls/QskGestureRecognizer.cpp index 1a3f9129..7a3043cf 100644 --- a/src/controls/QskGestureRecognizer.cpp +++ b/src/controls/QskGestureRecognizer.cpp @@ -42,11 +42,6 @@ namespace class Timer final : public QObject { public: - Timer(): - m_recognizer( nullptr ) - { - } - void start( int ms, QskGestureRecognizer* recognizer ) { if ( m_timer.isActive() ) @@ -68,7 +63,7 @@ namespace } protected: - virtual void timerEvent( QTimerEvent* ) override final + void timerEvent( QTimerEvent* ) override { m_timer.stop(); @@ -82,7 +77,7 @@ namespace } QBasicTimer m_timer; - QskGestureRecognizer* m_recognizer; + QskGestureRecognizer* m_recognizer = nullptr; }; class TimerTable diff --git a/src/controls/QskGraphicLabel.h b/src/controls/QskGraphicLabel.h index 5e4a2e78..92425780 100644 --- a/src/controls/QskGraphicLabel.h +++ b/src/controls/QskGraphicLabel.h @@ -53,7 +53,7 @@ public: QskGraphicLabel( const QskGraphic&, QQuickItem* parent = nullptr ); - virtual ~QskGraphicLabel(); + ~QskGraphicLabel() override; QskGraphic graphic() const; @@ -77,10 +77,10 @@ public: void setFillMode( FillMode ); FillMode fillMode() const; - virtual qreal heightForWidth( qreal width ) const override; - virtual qreal widthForHeight( qreal height ) const override; + qreal heightForWidth( qreal width ) const override; + qreal widthForHeight( qreal height ) const override; - virtual QSizeF contentsSizeHint() const override; + QSizeF contentsSizeHint() const override; bool isEmpty() const; @@ -99,8 +99,8 @@ public Q_SLOTS: void setGraphic( const QskGraphic& ); protected: - virtual void changeEvent( QEvent* ) override; - virtual void updateLayout() override; + void changeEvent( QEvent* ) override; + void updateLayout() override; virtual QskGraphic loadSource( const QUrl& ) const; private: diff --git a/src/controls/QskGraphicLabelSkinlet.h b/src/controls/QskGraphicLabelSkinlet.h index 52083fee..7eea5f02 100644 --- a/src/controls/QskGraphicLabelSkinlet.h +++ b/src/controls/QskGraphicLabelSkinlet.h @@ -24,13 +24,13 @@ public: }; Q_INVOKABLE QskGraphicLabelSkinlet( QskSkin* = nullptr ); - virtual ~QskGraphicLabelSkinlet(); + ~QskGraphicLabelSkinlet() override; - virtual QRectF subControlRect( const QskSkinnable*, + QRectF subControlRect( const QskSkinnable*, QskAspect::Subcontrol ) const override; protected: - virtual QSGNode* updateSubNode( + QSGNode* updateSubNode( const QskSkinnable*, quint8 nodeRole, QSGNode* ) const override; private: diff --git a/src/controls/QskHintAnimator.h b/src/controls/QskHintAnimator.h index 1784789e..3d3277f1 100644 --- a/src/controls/QskHintAnimator.h +++ b/src/controls/QskHintAnimator.h @@ -21,7 +21,7 @@ class QSK_EXPORT QskHintAnimator : public QskVariantAnimator public: QskHintAnimator(); - virtual ~QskHintAnimator(); + ~QskHintAnimator() override; void setAspect( QskAspect::Aspect ); QskAspect::Aspect aspect() const; @@ -29,7 +29,7 @@ public: void setControl( QskControl* ); QskControl* control() const; - virtual void advance( qreal value ) override; + void advance( qreal value ) override; private: QskAspect::Aspect m_aspect; diff --git a/src/controls/QskInputGrabber.cpp b/src/controls/QskInputGrabber.cpp index 366313d4..b6632e87 100644 --- a/src/controls/QskInputGrabber.cpp +++ b/src/controls/QskInputGrabber.cpp @@ -13,7 +13,7 @@ QSK_QT_PRIVATE_BEGIN #include QSK_QT_PRIVATE_END -class QskInputGrabber::PrivateData : public QQuickItemChangeListener +class QskInputGrabber::PrivateData final : public QQuickItemChangeListener { public: PrivateData( QskInputGrabber* grabber ): @@ -75,8 +75,8 @@ public: private: #if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0) - virtual void itemGeometryChanged( QQuickItem* item, - QQuickGeometryChange change, const QRectF& ) override final + void itemGeometryChanged( QQuickItem* item, + QQuickGeometryChange change, const QRectF& ) override { bool doUpdate = false; @@ -90,7 +90,7 @@ private: } #else - virtual void itemGeometryChanged( + void itemGeometryChanged( QQuickItem* item, const QRectF& newRect, const QRectF& oldRect ) override { bool doUpdate = false; @@ -105,7 +105,7 @@ private: } #endif - virtual void itemParentChanged( QQuickItem* item, QQuickItem* parentItem ) override + void itemParentChanged( QQuickItem* item, QQuickItem* parentItem ) override { if ( item == m_grabber && parentItem ) { diff --git a/src/controls/QskInputGrabber.h b/src/controls/QskInputGrabber.h index 68d8e976..81ff4667 100644 --- a/src/controls/QskInputGrabber.h +++ b/src/controls/QskInputGrabber.h @@ -17,7 +17,7 @@ class QskInputGrabber: public QskControl public: QskInputGrabber( QQuickItem* parent = nullptr ); - virtual ~QskInputGrabber(); + ~QskInputGrabber() override; virtual QRectF grabberRect() const; virtual bool isBlocking( const QPointF& ) const; @@ -26,7 +26,7 @@ public Q_SLOTS: void updateGeometry(); protected: - virtual bool event( QEvent* ) override; + bool event( QEvent* ) override; private: class PrivateData; diff --git a/src/controls/QskListView.h b/src/controls/QskListView.h index eca198de..bf3cb5cc 100644 --- a/src/controls/QskListView.h +++ b/src/controls/QskListView.h @@ -50,7 +50,7 @@ public: Q_ENUM( SelectionMode ) QskListView( QQuickItem* parent = nullptr ); - virtual ~QskListView(); + ~QskListView() override; void setPreferredWidthFromColumns( bool ); bool preferredWidthFromColumns() const; @@ -79,7 +79,7 @@ public: virtual QskAspect::Subcontrol textSubControlAt( int row, int col ) const; #endif - virtual QSizeF contentsSizeHint() const override; + QSizeF contentsSizeHint() const override; public Q_SLOTS: void setSelectedRow( int row ); @@ -93,15 +93,15 @@ Q_SIGNALS: void textOptionsChanged(); protected: - virtual void keyPressEvent( QKeyEvent* ) override; - virtual void keyReleaseEvent( QKeyEvent* ) override; + void keyPressEvent( QKeyEvent* ) override; + void keyReleaseEvent( QKeyEvent* ) override; - virtual void mousePressEvent( QMouseEvent* ) override; - virtual void mouseReleaseEvent( QMouseEvent* ) override; + void mousePressEvent( QMouseEvent* ) override; + void mouseReleaseEvent( QMouseEvent* ) override; void updateScrollableSize(); - virtual void componentComplete() override; + void componentComplete() override; private: class PrivateData; diff --git a/src/controls/QskListViewSkinlet.h b/src/controls/QskListViewSkinlet.h index c4b68c5a..5bae6ab5 100644 --- a/src/controls/QskListViewSkinlet.h +++ b/src/controls/QskListViewSkinlet.h @@ -26,7 +26,7 @@ class QSK_EXPORT QskListViewSkinlet : public QskScrollViewSkinlet public: Q_INVOKABLE QskListViewSkinlet( QskSkin* = nullptr ); - virtual ~QskListViewSkinlet(); + ~QskListViewSkinlet() override; protected: enum NodeRole @@ -35,7 +35,7 @@ protected: GraphicRole }; - virtual QSGNode* updateContentsNode( + QSGNode* updateContentsNode( const QskScrollView*, QSGNode* ) const override; virtual QSGNode* updateCellNode( const QskListView*, diff --git a/src/controls/QskObjectTree.h b/src/controls/QskObjectTree.h index dd561059..d7100da9 100644 --- a/src/controls/QskObjectTree.h +++ b/src/controls/QskObjectTree.h @@ -49,7 +49,7 @@ namespace QskObjectTree m_value = value; } - virtual bool visitDown( QObject* object ) override final + bool visitDown( QObject* object ) override final { if ( QskControl* control = qobject_cast< QskControl* >( object ) ) return setImplicitValue( control, m_value ); @@ -60,7 +60,7 @@ namespace QskObjectTree 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 ) ) return true; diff --git a/src/controls/QskPageIndicator.h b/src/controls/QskPageIndicator.h index 67d09a8a..96b1ec7e 100644 --- a/src/controls/QskPageIndicator.h +++ b/src/controls/QskPageIndicator.h @@ -25,7 +25,8 @@ public: QskPageIndicator( QQuickItem* parent = nullptr ); QskPageIndicator( int count, QQuickItem* parent = nullptr ); - virtual ~QskPageIndicator(); + + ~QskPageIndicator() override; int count() const; @@ -34,7 +35,7 @@ public: Qt::Orientation orientation() const; void setOrientation( Qt::Orientation ); - virtual QSizeF contentsSizeHint() const override; + QSizeF contentsSizeHint() const override; Q_SIGNALS: void countChanged(); diff --git a/src/controls/QskPageIndicatorSkinlet.h b/src/controls/QskPageIndicatorSkinlet.h index 0e823208..d520b8f3 100644 --- a/src/controls/QskPageIndicatorSkinlet.h +++ b/src/controls/QskPageIndicatorSkinlet.h @@ -25,13 +25,13 @@ public: }; Q_INVOKABLE QskPageIndicatorSkinlet( QskSkin* = nullptr ); - virtual ~QskPageIndicatorSkinlet(); + ~QskPageIndicatorSkinlet() override; - virtual QRectF subControlRect( + QRectF subControlRect( const QskSkinnable*, QskAspect::Subcontrol ) const override; protected: - virtual QSGNode* updateSubNode( const QskSkinnable*, + QSGNode* updateSubNode( const QskSkinnable*, quint8 nodeRole, QSGNode* ) const override; private: diff --git a/src/controls/QskPanGestureRecognizer.h b/src/controls/QskPanGestureRecognizer.h index 6be3234d..b692573d 100644 --- a/src/controls/QskPanGestureRecognizer.h +++ b/src/controls/QskPanGestureRecognizer.h @@ -17,7 +17,7 @@ class QSK_EXPORT QskPanGestureRecognizer : public QskGestureRecognizer public: QskPanGestureRecognizer(); - virtual ~QskPanGestureRecognizer(); + ~QskPanGestureRecognizer() override; void setMinDistance( int pixels ); int minDistance() const; @@ -26,9 +26,9 @@ public: Qt::Orientations orientations() const; private: - virtual void pressEvent( const QMouseEvent* ) override; - virtual void moveEvent( const QMouseEvent* ) override; - virtual void releaseEvent( const QMouseEvent* ) override; + void pressEvent( const QMouseEvent* ) override; + void moveEvent( const QMouseEvent* ) override; + void releaseEvent( const QMouseEvent* ) override; class PrivateData; std::unique_ptr< PrivateData > m_data; diff --git a/src/controls/QskPopup.cpp b/src/controls/QskPopup.cpp index 64a0bafa..05913f61 100644 --- a/src/controls/QskPopup.cpp +++ b/src/controls/QskPopup.cpp @@ -49,8 +49,8 @@ namespace { } - virtual void geometryChanged( - const QRectF& newGeometry, const QRectF& oldGeometry ) override final + void geometryChanged( + const QRectF& newGeometry, const QRectF& oldGeometry ) override { 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 ); diff --git a/src/controls/QskPopup.h b/src/controls/QskPopup.h index c4f5e938..0eed76be 100644 --- a/src/controls/QskPopup.h +++ b/src/controls/QskPopup.h @@ -32,7 +32,7 @@ public: Q_DECLARE_FLAGS( PopupFlags, PopupFlag ) QskPopup( QQuickItem* parent = nullptr ); - virtual ~QskPopup(); + ~QskPopup() override; void setPopupFlags( PopupFlags ); PopupFlags popupFlags() const; @@ -60,14 +60,14 @@ Q_SIGNALS: void overlayChanged( bool ); protected: - virtual void aboutToShow() override; + void aboutToShow() override; virtual void setFading( bool on ); - virtual bool event( QEvent* ) override; - virtual void focusInEvent( QFocusEvent * ) override; - virtual void focusOutEvent( QFocusEvent * ) override; + bool event( QEvent* ) override; + void focusInEvent( QFocusEvent * ) override; + void focusOutEvent( QFocusEvent * ) override; - virtual void itemChange( QQuickItem::ItemChange, + void itemChange( QQuickItem::ItemChange, const QQuickItem::ItemChangeData& ) override; virtual QQuickItem* focusSuccessor() const; diff --git a/src/controls/QskPopupSkinlet.h b/src/controls/QskPopupSkinlet.h index a24535e5..f91c0acc 100644 --- a/src/controls/QskPopupSkinlet.h +++ b/src/controls/QskPopupSkinlet.h @@ -24,13 +24,13 @@ public: }; Q_INVOKABLE QskPopupSkinlet( QskSkin* = nullptr ); - virtual ~QskPopupSkinlet(); + ~QskPopupSkinlet() override; - virtual QRectF subControlRect( const QskSkinnable*, + QRectF subControlRect( const QskSkinnable*, QskAspect::Subcontrol ) const override; protected: - virtual QSGNode* updateSubNode( const QskSkinnable*, + QSGNode* updateSubNode( const QskSkinnable*, quint8 nodeRole, QSGNode* ) const override; private: diff --git a/src/controls/QskPushButton.h b/src/controls/QskPushButton.h index 0c300360..91042c83 100644 --- a/src/controls/QskPushButton.h +++ b/src/controls/QskPushButton.h @@ -38,7 +38,7 @@ public: QskPushButton( QQuickItem* parent = nullptr ); QskPushButton( const QString& text, QQuickItem* parent = nullptr ); - virtual ~QskPushButton(); + ~QskPushButton() override; void setCorner( const QskCorner& ); QskCorner corner() const; @@ -57,8 +57,8 @@ public: QFont font() const; - virtual QSizeF contentsSizeHint() const override; - virtual QRectF layoutRect() const override; + QSizeF contentsSizeHint() const override; + QRectF layoutRect() const override; public Q_SLOTS: void setText( const QString& text ); @@ -78,11 +78,11 @@ Q_SIGNALS: void hovered( bool ); protected: - virtual void hoverEnterEvent( QHoverEvent* ) override; - virtual void hoverLeaveEvent( QHoverEvent* ) override; - virtual void changeEvent( QEvent* ) override; + void hoverEnterEvent( QHoverEvent* ) override; + void hoverLeaveEvent( QHoverEvent* ) override; + void changeEvent( QEvent* ) override; - virtual void updateLayout() override; + void updateLayout() override; virtual QskGraphic loadGraphic( const QUrl& ) const; private: diff --git a/src/controls/QskPushButtonSkinlet.h b/src/controls/QskPushButtonSkinlet.h index 31044b25..f3e0d959 100644 --- a/src/controls/QskPushButtonSkinlet.h +++ b/src/controls/QskPushButtonSkinlet.h @@ -26,13 +26,13 @@ public: }; Q_INVOKABLE QskPushButtonSkinlet( QskSkin* = nullptr ); - virtual ~QskPushButtonSkinlet(); + ~QskPushButtonSkinlet() override; - virtual QRectF subControlRect( + QRectF subControlRect( const QskSkinnable*, QskAspect::Subcontrol ) const override; protected: - virtual QSGNode* updateSubNode( const QskSkinnable*, + QSGNode* updateSubNode( const QskSkinnable*, quint8 nodeRole, QSGNode* ) const override; private: diff --git a/src/controls/QskRangeControl.h b/src/controls/QskRangeControl.h index 2884ca56..b62a352d 100644 --- a/src/controls/QskRangeControl.h +++ b/src/controls/QskRangeControl.h @@ -26,7 +26,7 @@ class QSK_EXPORT QskRangeControl : public QskControl public: QskRangeControl( QQuickItem* parent = nullptr ); - virtual ~QskRangeControl(); + ~QskRangeControl() override; bool pressed() const; @@ -71,13 +71,13 @@ Q_SIGNALS: protected: virtual qreal fixupValue( qreal value ) const; - virtual void keyPressEvent( QKeyEvent* event ) override; + void keyPressEvent( QKeyEvent* event ) override; #ifndef QT_NO_WHEELEVENT - virtual void wheelEvent( QWheelEvent* ) override; + void wheelEvent( QWheelEvent* ) override; #endif - virtual void componentComplete() override; + void componentComplete() override; private: void adjustRangeAndValue( bool ); diff --git a/src/controls/QskScrollArea.cpp b/src/controls/QskScrollArea.cpp index 6969075a..c657a0c0 100644 --- a/src/controls/QskScrollArea.cpp +++ b/src/controls/QskScrollArea.cpp @@ -128,7 +128,7 @@ namespace markDirty( QSGNode::DirtyGeometry ); } - virtual void update() override final + void update() override { /* The Qt-Quick framework is limited to setting clipNodes from @@ -157,41 +157,41 @@ public: 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 ); } - virtual QRectF clipRect() const override final + QRectF clipRect() const override { return scrollArea()->subControlRect( QskScrollView::Viewport ); } protected: - virtual bool event( QEvent* event ) override final; - virtual void windowChangeEvent( QskWindowChangeEvent* ) override final; + bool event( QEvent* event ) override; + void windowChangeEvent( QskWindowChangeEvent* ) override; - virtual void itemChange( ItemChange, const ItemChangeData& ) override final; - virtual void geometryChanged( const QRectF&, const QRectF& ) override final; + void itemChange( ItemChange, const ItemChangeData& ) override; + void geometryChanged( const QRectF&, const QRectF& ) override; #if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0) - virtual void itemGeometryChanged( QQuickItem*, - QQuickGeometryChange change, const QRectF& ) override final + void itemGeometryChanged( QQuickItem*, + QQuickGeometryChange change, const QRectF& ) override { if ( change.sizeChange() ) scrollArea()->polish(); } #else - virtual void itemGeometryChanged( QQuickItem*, - const QRectF& newRect, const QRectF& oldRect ) override final + void itemGeometryChanged( QQuickItem*, + const QRectF& newRect, const QRectF& oldRect ) override { if ( oldRect.size() != newRect.size() ) scrollArea()->polish(); } #endif - virtual void updateNode( QSGNode* ) override final; + void updateNode( QSGNode* ) override; private: void connectWindow( const QQuickWindow*, bool on ); diff --git a/src/controls/QskScrollArea.h b/src/controls/QskScrollArea.h index 654106a8..62cdf27f 100644 --- a/src/controls/QskScrollArea.h +++ b/src/controls/QskScrollArea.h @@ -25,7 +25,7 @@ class QSK_EXPORT QskScrollArea : public QskScrollView public: QskScrollArea( QQuickItem* parent = nullptr ); - virtual ~QskScrollArea(); + ~QskScrollArea() override; void setScrolledItem( QQuickItem* ); QQuickItem* scrolledItem() const; @@ -44,7 +44,7 @@ Q_SIGNALS: void autoScrollFocusedItemChanged(); protected: - virtual void updateLayout() override; + void updateLayout() override; private: void translateItem(); diff --git a/src/controls/QskScrollView.cpp b/src/controls/QskScrollView.cpp index 23d30fbf..abd34dc2 100644 --- a/src/controls/QskScrollView.cpp +++ b/src/controls/QskScrollView.cpp @@ -39,7 +39,7 @@ namespace 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(); m_scrollView->setScrollPos( pos - QPointF( dx, -dy ) ); @@ -89,7 +89,7 @@ namespace } 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 y = m_from.y() + ( m_to.y() - m_from.y() ) * value; diff --git a/src/controls/QskScrollView.h b/src/controls/QskScrollView.h index c712c90b..2d024f9b 100644 --- a/src/controls/QskScrollView.h +++ b/src/controls/QskScrollView.h @@ -33,7 +33,7 @@ public: QSK_STATES( VerticalHandlePressed, HorizontalHandlePressed ) QskScrollView( QQuickItem* parent = nullptr ); - virtual ~QskScrollView(); + ~QskScrollView() override; void setVerticalScrollBarPolicy( Qt::ScrollBarPolicy ); Qt::ScrollBarPolicy verticalScrollBarPolicy() const; @@ -54,7 +54,7 @@ public: QSizeF scrollableSize() const; QRectF viewContentsRect() const; - virtual QRectF gestureRect() const override; + QRectF gestureRect() const override; Q_SIGNALS: void scrolledTo( const QPointF& ); @@ -73,17 +73,17 @@ public Q_SLOTS: void ensureVisible( const QRectF& ); protected: - virtual void mouseMoveEvent( QMouseEvent* ) override; - virtual void mousePressEvent( QMouseEvent* ) override; - virtual void mouseReleaseEvent( QMouseEvent* ) override; - virtual void geometryChangeEvent( QskGeometryChangeEvent* ) override; - virtual void gestureEvent( QskGestureEvent* ) override; + void mouseMoveEvent( QMouseEvent* ) override; + void mousePressEvent( QMouseEvent* ) override; + void mouseReleaseEvent( QMouseEvent* ) override; + void geometryChangeEvent( QskGeometryChangeEvent* ) override; + void gestureEvent( QskGestureEvent* ) override; #ifndef QT_NO_WHEELEVENT - virtual void wheelEvent( QWheelEvent* ) override; + void wheelEvent( QWheelEvent* ) override; #endif - virtual bool gestureFilter( QQuickItem*, QEvent* ) override; + bool gestureFilter( QQuickItem*, QEvent* ) override; void setScrollableSize( const QSizeF& ); diff --git a/src/controls/QskScrollViewSkinlet.h b/src/controls/QskScrollViewSkinlet.h index cd374222..6fcadc4a 100644 --- a/src/controls/QskScrollViewSkinlet.h +++ b/src/controls/QskScrollViewSkinlet.h @@ -31,13 +31,13 @@ public: }; Q_INVOKABLE QskScrollViewSkinlet( QskSkin* = nullptr ); - virtual ~QskScrollViewSkinlet(); + ~QskScrollViewSkinlet() override; - virtual QRectF subControlRect( + QRectF subControlRect( const QskSkinnable*, QskAspect::Subcontrol ) const override; protected: - virtual QSGNode* updateSubNode( const QskSkinnable*, + QSGNode* updateSubNode( const QskSkinnable*, quint8 nodeRole, QSGNode* ) const override; virtual QSGNode* updateContentsNode( const QskScrollView*, QSGNode* ) const; diff --git a/src/controls/QskSeparator.h b/src/controls/QskSeparator.h index e5cb042c..87267990 100644 --- a/src/controls/QskSeparator.h +++ b/src/controls/QskSeparator.h @@ -27,7 +27,7 @@ public: QskSeparator( QQuickItem* parent = nullptr ); QskSeparator( Qt::Orientation, QQuickItem* parent = nullptr ); - virtual ~QskSeparator(); + ~QskSeparator() override; void setOrientation( Qt::Orientation ); Qt::Orientation orientation() const; @@ -35,8 +35,8 @@ public: void setThickness( qreal thickness ); qreal thickness() const; - virtual QSizeF contentsSizeHint() const override; - virtual QskAspect::Placement effectivePlacement() const override; + QSizeF contentsSizeHint() const override; + QskAspect::Placement effectivePlacement() const override; Q_SIGNALS: void orientationChanged( Qt::Orientation ); diff --git a/src/controls/QskSeparatorSkinlet.h b/src/controls/QskSeparatorSkinlet.h index 9faa760f..cd2c34bd 100644 --- a/src/controls/QskSeparatorSkinlet.h +++ b/src/controls/QskSeparatorSkinlet.h @@ -24,13 +24,13 @@ public: }; Q_INVOKABLE QskSeparatorSkinlet( QskSkin* = nullptr ); - virtual ~QskSeparatorSkinlet(); + ~QskSeparatorSkinlet() override; - virtual QRectF subControlRect( const QskSkinnable*, + QRectF subControlRect( const QskSkinnable*, QskAspect::Subcontrol ) const override; protected: - virtual QSGNode* updateSubNode( const QskSkinnable*, + QSGNode* updateSubNode( const QskSkinnable*, quint8 nodeRole, QSGNode* ) const override; private: diff --git a/src/controls/QskSetup.cpp b/src/controls/QskSetup.cpp index 3ed0736e..915d3a6f 100644 --- a/src/controls/QskSetup.cpp +++ b/src/controls/QskSetup.cpp @@ -87,24 +87,24 @@ namespace } private: - virtual bool setImplicitValue( - QskControl* control, const QLocale& locale ) override final + bool setImplicitValue( + QskControl* control, const QLocale& locale ) override { return qskInheritLocale( control, locale ); } - virtual bool setImplicitValue( - QskWindow* window, const QLocale& locale ) override final + bool setImplicitValue( + QskWindow* window, const QLocale& locale ) override { return qskInheritLocale( window, locale ); } - virtual QLocale value( const QskControl* control ) const override final + QLocale value( const QskControl* control ) const override { return control->locale(); } - virtual QLocale value( const QskWindow* window ) const override final + QLocale value( const QskWindow* window ) const override { return window->locale(); } diff --git a/src/controls/QskSetup.h b/src/controls/QskSetup.h index f1c2456d..4b7e3942 100644 --- a/src/controls/QskSetup.h +++ b/src/controls/QskSetup.h @@ -75,9 +75,9 @@ Q_SIGNALS: private: QskSetup(); - virtual ~QskSetup(); + ~QskSetup() override; - virtual bool eventFilter( QObject*, QEvent* ) override final; + bool eventFilter( QObject*, QEvent* ) override final; static QskSetup* s_instance; diff --git a/src/controls/QskShortcut.h b/src/controls/QskShortcut.h index 160081bc..bb23da41 100644 --- a/src/controls/QskShortcut.h +++ b/src/controls/QskShortcut.h @@ -48,7 +48,7 @@ public: QskShortcut( const QKeySequence&, QObject* = nullptr ); QskShortcut( const QKeySequence&, Qt::ShortcutContext, QObject* = nullptr ); - virtual ~QskShortcut(); + ~QskShortcut() override; int shortcutId() const; @@ -82,9 +82,9 @@ Q_SIGNALS: int shortcutIdChanged( int ) const; protected: - virtual bool event( QEvent* ) override; - virtual void classBegin() override; - virtual void componentComplete() override; + bool event( QEvent* ) override; + void classBegin() override; + void componentComplete() override; private: class PrivateData; diff --git a/src/controls/QskShortcutMap.cpp b/src/controls/QskShortcutMap.cpp index 36350ceb..5190fdda 100644 --- a/src/controls/QskShortcutMap.cpp +++ b/src/controls/QskShortcutMap.cpp @@ -34,7 +34,7 @@ public: void setEnabled( int id, bool ); void setAutoRepeat( int id, bool repeat ); - virtual bool eventFilter( QObject*, QEvent* ) override final; + bool eventFilter( QObject*, QEvent* ) override; private: diff --git a/src/controls/QskSimpleListBox.h b/src/controls/QskSimpleListBox.h index 633a0b67..4377a0af 100644 --- a/src/controls/QskSimpleListBox.h +++ b/src/controls/QskSimpleListBox.h @@ -22,7 +22,7 @@ class QSK_EXPORT QskSimpleListBox : public QskListView public: QskSimpleListBox( QQuickItem* parent = nullptr ); - virtual ~QskSimpleListBox(); + ~QskSimpleListBox() override; void setColumnWidthHint( int column, qreal width ); qreal columnWidthHint( int column ) const; @@ -39,17 +39,17 @@ public: void removeAt( int index ); void removeBulk( int from, int to = -1 ); - virtual int rowCount() const override final; - virtual int columnCount() const override final; + int rowCount() const override final; + int columnCount() const override final; - virtual qreal columnWidth( int col ) const override; - virtual qreal rowHeight() const override; + qreal columnWidth( int col ) const override; + qreal rowHeight() const override; QString entryAt( int row ) const; QString selectedEntry() 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: void setEntries( const QStringList& ); diff --git a/src/controls/QskSkin.h b/src/controls/QskSkin.h index 0ba072b0..48411378 100644 --- a/src/controls/QskSkin.h +++ b/src/controls/QskSkin.h @@ -55,7 +55,7 @@ public: Q_ENUM( SkinFontRole ) QskSkin( QObject* parent = nullptr ); - virtual ~QskSkin(); + ~QskSkin() override; template void declareSkinlet(); diff --git a/src/controls/QskSkinFactory.h b/src/controls/QskSkinFactory.h index 11d445f7..5b8258d0 100644 --- a/src/controls/QskSkinFactory.h +++ b/src/controls/QskSkinFactory.h @@ -18,7 +18,7 @@ class QSK_EXPORT QskSkinFactory : public QObject public: QskSkinFactory( QObject* parent = nullptr ); - virtual ~QskSkinFactory(); + ~QskSkinFactory() override; virtual QStringList skinNames() const = 0; virtual QskSkin* createSkin( const QString& skinName ) = 0; diff --git a/src/controls/QskSkinManager.h b/src/controls/QskSkinManager.h index b681a0fd..7acfe8b7 100644 --- a/src/controls/QskSkinManager.h +++ b/src/controls/QskSkinManager.h @@ -42,7 +42,7 @@ public: protected: QskSkinManager(); - virtual ~QskSkinManager(); + ~QskSkinManager() override; class PrivateData; std::unique_ptr< PrivateData > m_data; diff --git a/src/controls/QskSlider.h b/src/controls/QskSlider.h index f7e015cc..466105fb 100644 --- a/src/controls/QskSlider.h +++ b/src/controls/QskSlider.h @@ -31,7 +31,7 @@ public: explicit QskSlider( QQuickItem* parent = nullptr ); explicit QskSlider( Qt::Orientation, QQuickItem* parent = nullptr ); - virtual ~QskSlider(); + ~QskSlider() override; bool isPressed() const; @@ -41,8 +41,8 @@ public: void setTracking( bool ); bool isTracking() const; - virtual QSizeF contentsSizeHint() const override; - virtual QskAspect::Placement effectivePlacement() const override; + QSizeF contentsSizeHint() const override; + QskAspect::Placement effectivePlacement() const override; Q_SIGNALS: void pressedChanged( bool ); @@ -50,9 +50,9 @@ Q_SIGNALS: void trackingChanged( bool ); protected: - virtual void mousePressEvent( QMouseEvent* e ) override; - virtual void mouseMoveEvent( QMouseEvent* e ) override; - virtual void mouseReleaseEvent( QMouseEvent* e ) override; + void mousePressEvent( QMouseEvent* e ) override; + void mouseMoveEvent( QMouseEvent* e ) override; + void mouseReleaseEvent( QMouseEvent* e ) override; QSizeF handleSize() const; QRectF handleRect() const; diff --git a/src/controls/QskSliderSkinlet.h b/src/controls/QskSliderSkinlet.h index 9e12761c..b828857f 100644 --- a/src/controls/QskSliderSkinlet.h +++ b/src/controls/QskSliderSkinlet.h @@ -27,13 +27,13 @@ public: }; Q_INVOKABLE QskSliderSkinlet( QskSkin* = nullptr ); - virtual ~QskSliderSkinlet(); + ~QskSliderSkinlet() override; - virtual QRectF subControlRect( const QskSkinnable*, + QRectF subControlRect( const QskSkinnable*, QskAspect::Subcontrol ) const override; protected: - virtual QSGNode* updateSubNode( const QskSkinnable*, + QSGNode* updateSubNode( const QskSkinnable*, quint8 nodeRole, QSGNode* ) const override; private: diff --git a/src/controls/QskStatusIndicator.h b/src/controls/QskStatusIndicator.h index fa14d1d1..1bba08d1 100644 --- a/src/controls/QskStatusIndicator.h +++ b/src/controls/QskStatusIndicator.h @@ -25,7 +25,7 @@ public: QSK_SUBCONTROLS( Graphic ) QskStatusIndicator( QQuickItem* parent = nullptr ); - virtual ~QskStatusIndicator(); + ~QskStatusIndicator() override; Q_INVOKABLE QUrl source( int status ) const; Q_INVOKABLE void setSource( int status, const QUrl& url ); @@ -36,10 +36,10 @@ public: virtual QskColorFilter graphicFilter( int status ) const; virtual QskGraphic loadSource( const QUrl& ) const; - virtual qreal heightForWidth( qreal width ) const override; - virtual qreal widthForHeight( qreal height ) const override; + qreal heightForWidth( qreal width ) const override; + qreal widthForHeight( qreal height ) const override; - virtual QSizeF contentsSizeHint() const override; + QSizeF contentsSizeHint() const override; int status() const; bool hasStatus( int status ) const; @@ -51,8 +51,8 @@ Q_SIGNALS: void statusChanged( int status ); protected: - virtual void changeEvent( QEvent* ) override; - virtual void updateLayout() override; + void changeEvent( QEvent* ) override; + void updateLayout() override; private: qreal sizeConstraint( Qt::Orientation, qreal ) const; diff --git a/src/controls/QskStatusIndicatorSkinlet.h b/src/controls/QskStatusIndicatorSkinlet.h index 11d52c26..8fba91fb 100644 --- a/src/controls/QskStatusIndicatorSkinlet.h +++ b/src/controls/QskStatusIndicatorSkinlet.h @@ -24,13 +24,13 @@ public: }; Q_INVOKABLE QskStatusIndicatorSkinlet( QskSkin* = nullptr ); - virtual ~QskStatusIndicatorSkinlet(); + ~QskStatusIndicatorSkinlet() override; - virtual QRectF subControlRect( const QskSkinnable*, + QRectF subControlRect( const QskSkinnable*, QskAspect::Subcontrol ) const override; protected: - virtual QSGNode* updateSubNode( + QSGNode* updateSubNode( const QskSkinnable*, quint8 nodeRole, QSGNode* ) const override; private: diff --git a/src/controls/QskSubWindow.h b/src/controls/QskSubWindow.h index 0e24710c..970b99af 100644 --- a/src/controls/QskSubWindow.h +++ b/src/controls/QskSubWindow.h @@ -36,7 +36,7 @@ public: QSK_SUBCONTROLS( Panel, TitleBar ) QskSubWindow( QQuickItem* parent = nullptr ); - virtual ~QskSubWindow(); + ~QskSubWindow() override; Q_INVOKABLE void setTitle( const QString& ); Q_INVOKABLE QString title() const; @@ -52,8 +52,8 @@ public: QRectF titleBarRect() const; - virtual QSizeF contentsSizeHint() const override; - virtual QRectF layoutRect() const override; + QSizeF contentsSizeHint() const override; + QRectF layoutRect() const override; Q_SIGNALS: void titleChanged(); @@ -61,9 +61,9 @@ Q_SIGNALS: void windowButtonsChanged(); protected: - virtual bool event( QEvent* ) override; + bool event( QEvent* ) override; - virtual void itemChange( QQuickItem::ItemChange, + void itemChange( QQuickItem::ItemChange, const QQuickItem::ItemChangeData& ) override; private: diff --git a/src/controls/QskSubWindowArea.h b/src/controls/QskSubWindowArea.h index f64e4d6b..df560d0e 100644 --- a/src/controls/QskSubWindowArea.h +++ b/src/controls/QskSubWindowArea.h @@ -22,15 +22,15 @@ public: QSK_SUBCONTROLS( Panel ) QskSubWindowArea( QQuickItem* parent = nullptr ); - virtual ~QskSubWindowArea(); + ~QskSubWindowArea() override; 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 void itemChange( ItemChange, const ItemChangeData& ) override; + void itemChange( ItemChange, const ItemChangeData& ) override; private: virtual void setDragging( QskSubWindow*, bool ); diff --git a/src/controls/QskSubWindowAreaSkinlet.h b/src/controls/QskSubWindowAreaSkinlet.h index ebfd834d..24f7382d 100644 --- a/src/controls/QskSubWindowAreaSkinlet.h +++ b/src/controls/QskSubWindowAreaSkinlet.h @@ -24,13 +24,13 @@ public: }; Q_INVOKABLE QskSubWindowAreaSkinlet( QskSkin* = nullptr ); - virtual ~QskSubWindowAreaSkinlet(); + ~QskSubWindowAreaSkinlet() override; - virtual QRectF subControlRect( const QskSkinnable*, + QRectF subControlRect( const QskSkinnable*, QskAspect::Subcontrol ) const override; protected: - virtual QSGNode* updateSubNode( const QskSkinnable*, + QSGNode* updateSubNode( const QskSkinnable*, quint8 nodeRole, QSGNode* ) const override; private: diff --git a/src/controls/QskSubWindowSkinlet.h b/src/controls/QskSubWindowSkinlet.h index 5302d8af..06ac5e11 100644 --- a/src/controls/QskSubWindowSkinlet.h +++ b/src/controls/QskSubWindowSkinlet.h @@ -25,13 +25,13 @@ public: }; Q_INVOKABLE QskSubWindowSkinlet( QskSkin* = nullptr ); - virtual ~QskSubWindowSkinlet(); + ~QskSubWindowSkinlet() override; - virtual QRectF subControlRect( + QRectF subControlRect( const QskSkinnable*, QskAspect::Subcontrol ) const override; protected: - virtual QSGNode* updateSubNode( const QskSkinnable*, + QSGNode* updateSubNode( const QskSkinnable*, quint8 nodeRole, QSGNode* ) const override; private: diff --git a/src/controls/QskTabBar.h b/src/controls/QskTabBar.h index 745e2543..e0539b95 100644 --- a/src/controls/QskTabBar.h +++ b/src/controls/QskTabBar.h @@ -34,7 +34,8 @@ public: QskTabBar( QQuickItem* parent = nullptr ); QskTabBar( Qt::Orientation, QQuickItem* parent = nullptr ); - virtual ~QskTabBar(); + + ~QskTabBar() override; void setOrientation( Qt::Orientation ); Qt::Orientation orientation() const; @@ -69,7 +70,7 @@ public: int indexOf( const QskTabButton* ) const; Q_INVOKABLE int indexOf( QskTabButton* ) const; - virtual QskAspect::Subcontrol effectiveSubcontrol( + QskAspect::Subcontrol effectiveSubcontrol( QskAspect::Subcontrol ) const override; public Q_SLOTS: @@ -82,7 +83,7 @@ Q_SIGNALS: void orientationChanged(); protected: - virtual void componentComplete() override; + void componentComplete() override; private: void restack(); diff --git a/src/controls/QskTabButton.h b/src/controls/QskTabButton.h index d9108143..178642cb 100644 --- a/src/controls/QskTabButton.h +++ b/src/controls/QskTabButton.h @@ -27,7 +27,7 @@ public: QskTabButton( QQuickItem* parent = nullptr ); QskTabButton( const QString& text, QQuickItem* parent = nullptr ); - virtual ~QskTabButton(); + ~QskTabButton() override; void setText( const QString& text ); QString text() const; @@ -35,9 +35,9 @@ public: void setTextOptions( const QskTextOptions& ); QskTextOptions textOptions() const; - virtual QSizeF contentsSizeHint() const override; - virtual QRectF layoutRect() const override; - virtual QskAspect::Placement effectivePlacement() const override; + QSizeF contentsSizeHint() const override; + QRectF layoutRect() const override; + QskAspect::Placement effectivePlacement() const override; QskTabBar* tabBar() const; @@ -46,7 +46,7 @@ Q_SIGNALS: void textOptionsChanged(); protected: - virtual void changeEvent( QEvent* ) override; + void changeEvent( QEvent* ) override; private: void resolveTabBar(); diff --git a/src/controls/QskTabButtonSkinlet.h b/src/controls/QskTabButtonSkinlet.h index f2150580..962f4c83 100644 --- a/src/controls/QskTabButtonSkinlet.h +++ b/src/controls/QskTabButtonSkinlet.h @@ -23,13 +23,13 @@ public: }; Q_INVOKABLE QskTabButtonSkinlet( QskSkin* = nullptr ); - virtual ~QskTabButtonSkinlet(); + ~QskTabButtonSkinlet() override; - virtual QRectF subControlRect( + QRectF subControlRect( const QskSkinnable*, QskAspect::Subcontrol ) const override; protected: - virtual QSGNode* updateSubNode( + QSGNode* updateSubNode( const QskSkinnable*, quint8 nodeRole, QSGNode* ) const override; }; diff --git a/src/controls/QskTabView.h b/src/controls/QskTabView.h index a7dc4118..985d5062 100644 --- a/src/controls/QskTabView.h +++ b/src/controls/QskTabView.h @@ -30,7 +30,7 @@ public: QskTabView( QQuickItem* parent = nullptr ); QskTabView( Qt::Orientation, QQuickItem* parent = nullptr ); - virtual ~QskTabView(); + ~QskTabView() override; const QskTabBar* tabBar() const; @@ -60,7 +60,7 @@ public: QRectF tabRect() const; - virtual QSizeF contentsSizeHint() const override; + QSizeF contentsSizeHint() const override; public Q_SLOTS: void setCurrentIndex( int index ); @@ -71,8 +71,8 @@ Q_SIGNALS: void orientationChanged(); protected: - virtual bool event( QEvent* event ) override; - virtual void updateLayout() override; + bool event( QEvent* event ) override; + void updateLayout() override; private: class PrivateData; diff --git a/src/controls/QskTabViewSkinlet.h b/src/controls/QskTabViewSkinlet.h index 23dd7c96..df99fa2b 100644 --- a/src/controls/QskTabViewSkinlet.h +++ b/src/controls/QskTabViewSkinlet.h @@ -24,13 +24,13 @@ public: }; Q_INVOKABLE QskTabViewSkinlet( QskSkin* = nullptr ); - virtual ~QskTabViewSkinlet(); + ~QskTabViewSkinlet() override; - virtual QRectF subControlRect( + QRectF subControlRect( const QskSkinnable*, QskAspect::Subcontrol ) const override; protected: - virtual QSGNode* updateSubNode( const QskSkinnable*, + QSGNode* updateSubNode( const QskSkinnable*, quint8 nodeRole, QSGNode* ) const override; private: diff --git a/src/controls/QskTextInput.cpp b/src/controls/QskTextInput.cpp index addfa3f5..99778925 100644 --- a/src/controls/QskTextInput.cpp +++ b/src/controls/QskTextInput.cpp @@ -113,7 +113,7 @@ namespace } protected: - virtual void geometryChanged( + void geometryChanged( const QRectF& newGeometry, const QRectF& oldGeometry ) override { Inherited::geometryChanged( newGeometry, oldGeometry ); @@ -126,7 +126,7 @@ namespace ( contentHeight() > height() ) ); } - virtual QSGNode* updatePaintNode( + QSGNode* updatePaintNode( QSGNode* oldNode, UpdatePaintNodeData* data ) override { updateColors(); diff --git a/src/controls/QskTextInput.h b/src/controls/QskTextInput.h index 29e42da4..7bfcf39e 100644 --- a/src/controls/QskTextInput.h +++ b/src/controls/QskTextInput.h @@ -76,7 +76,7 @@ public: QskTextInput( QQuickItem* parent = nullptr ); QskTextInput( const QString& text, QQuickItem* parent = nullptr ); - virtual ~QskTextInput(); + ~QskTextInput() override; void setupFrom( const QQuickItem* ); @@ -135,7 +135,7 @@ public: virtual bool hasAcceptableInput() const; virtual bool fixup(); - virtual QVariant inputMethodQuery( Qt::InputMethodQuery ) const override; + QVariant inputMethodQuery( Qt::InputMethodQuery ) const override; QVariant inputMethodQuery( Qt::InputMethodQuery, QVariant argument) const; bool canUndo() const; @@ -146,7 +146,7 @@ public: void ensureVisible( int position ); - virtual QSizeF contentsSizeHint() const override; + QSizeF contentsSizeHint() const override; public Q_SLOTS: void setText( const QString& ); @@ -184,23 +184,23 @@ Q_SIGNALS: void inputMaskChanged( const QString& ); protected: - virtual bool event( QEvent* ) override; + bool event( QEvent* ) override; - virtual void inputMethodEvent( QInputMethodEvent* ) override; + void inputMethodEvent( QInputMethodEvent* ) override; - virtual void focusInEvent( QFocusEvent* ) override; - virtual void focusOutEvent( QFocusEvent* ) override; + void focusInEvent( QFocusEvent* ) override; + void focusOutEvent( QFocusEvent* ) override; - virtual void mousePressEvent( QMouseEvent* ) override; - virtual void mouseMoveEvent( QMouseEvent* ) override; - virtual void mouseReleaseEvent( QMouseEvent* ) override; - virtual void mouseDoubleClickEvent( QMouseEvent* ) override; + void mousePressEvent( QMouseEvent* ) override; + void mouseMoveEvent( QMouseEvent* ) override; + void mouseReleaseEvent( QMouseEvent* ) override; + void mouseDoubleClickEvent( QMouseEvent* ) override; - virtual void keyPressEvent( QKeyEvent* ) override; - virtual void keyReleaseEvent( QKeyEvent* ) override; + void keyPressEvent( QKeyEvent* ) override; + void keyReleaseEvent( QKeyEvent* ) override; - virtual void updateLayout() override; - virtual void updateNode( QSGNode*) override; + void updateLayout() override; + void updateNode( QSGNode*) override; private: class PrivateData; diff --git a/src/controls/QskTextInputSkinlet.h b/src/controls/QskTextInputSkinlet.h index f43a2279..2ae7b6aa 100644 --- a/src/controls/QskTextInputSkinlet.h +++ b/src/controls/QskTextInputSkinlet.h @@ -22,13 +22,13 @@ public: }; Q_INVOKABLE QskTextInputSkinlet( QskSkin* = nullptr ); - virtual ~QskTextInputSkinlet(); + ~QskTextInputSkinlet() override; - virtual QRectF subControlRect( const QskSkinnable*, + QRectF subControlRect( const QskSkinnable*, QskAspect::Subcontrol ) const override; protected: - virtual QSGNode* updateSubNode( const QskSkinnable*, + QSGNode* updateSubNode( const QskSkinnable*, quint8 nodeRole, QSGNode* ) const override; }; diff --git a/src/controls/QskTextLabel.h b/src/controls/QskTextLabel.h index 7b2ffae5..5da50174 100644 --- a/src/controls/QskTextLabel.h +++ b/src/controls/QskTextLabel.h @@ -36,7 +36,7 @@ public: QskTextLabel( QQuickItem* parent = nullptr ); QskTextLabel( const QString& text, QQuickItem* parent = nullptr ); - virtual ~QskTextLabel(); + ~QskTextLabel() override; QString text() const; @@ -52,10 +52,10 @@ public: void setAlignment( Qt::Alignment ); Qt::Alignment alignment() const; - virtual QSizeF contentsSizeHint() const override; + QSizeF contentsSizeHint() const override; - virtual qreal heightForWidth( qreal width ) const override; - virtual qreal widthForHeight( qreal height ) const override; + qreal heightForWidth( qreal width ) const override; + qreal widthForHeight( qreal height ) const override; QFont font() const; @@ -70,7 +70,7 @@ public Q_SLOTS: void setText( const QString& ); protected: - virtual void changeEvent( QEvent* ) override; + void changeEvent( QEvent* ) override; private: class PrivateData; diff --git a/src/controls/QskTextLabelSkinlet.h b/src/controls/QskTextLabelSkinlet.h index 2cf597cd..931a7c29 100644 --- a/src/controls/QskTextLabelSkinlet.h +++ b/src/controls/QskTextLabelSkinlet.h @@ -22,13 +22,13 @@ public: }; Q_INVOKABLE QskTextLabelSkinlet( QskSkin* = nullptr ); - virtual ~QskTextLabelSkinlet(); + ~QskTextLabelSkinlet() override; - virtual QRectF subControlRect( const QskSkinnable*, + QRectF subControlRect( const QskSkinnable*, QskAspect::Subcontrol ) const override; protected: - virtual QSGNode* updateSubNode( const QskSkinnable*, + QSGNode* updateSubNode( const QskSkinnable*, quint8 nodeRole, QSGNode* ) const override; }; diff --git a/src/controls/QskVariantAnimator.h b/src/controls/QskVariantAnimator.h index 4b3cb8e2..5270012d 100644 --- a/src/controls/QskVariantAnimator.h +++ b/src/controls/QskVariantAnimator.h @@ -14,7 +14,7 @@ class QSK_EXPORT QskVariantAnimator : public QskAnimator { public: QskVariantAnimator(); - virtual ~QskVariantAnimator(); + ~QskVariantAnimator() override; void setCurrentValue( const QVariant& ); QVariant currentValue() const; @@ -26,9 +26,9 @@ public: QVariant endValue() const; protected: - virtual void setup() override; - virtual void advance( qreal value ) override; - virtual void done() override; + void setup() override; + void advance( qreal value ) override; + void done() override; private: QVariant m_startValue; diff --git a/src/controls/QskWindow.cpp b/src/controls/QskWindow.cpp index 85289a4a..ff823b70 100644 --- a/src/controls/QskWindow.cpp +++ b/src/controls/QskWindow.cpp @@ -63,7 +63,7 @@ namespace p->removeItemChangeListener( this, types ); } - virtual void itemChildAdded( QQuickItem*, QQuickItem* ) override final + void itemChildAdded( QQuickItem*, QQuickItem* ) override { QskWindow* window = static_cast< QskWindow* >( m_item->window() ); 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 ); diff --git a/src/controls/QskWindow.h b/src/controls/QskWindow.h index 51f0c53c..dfb4914c 100644 --- a/src/controls/QskWindow.h +++ b/src/controls/QskWindow.h @@ -35,7 +35,7 @@ public: }; QskWindow( QWindow* parent = nullptr ); - virtual ~QskWindow(); + ~QskWindow() override; bool deleteOnClose() const; void setDeleteOnClose( bool ); @@ -74,11 +74,11 @@ public Q_SLOTS: void resizeF( const QSizeF& ); protected: - virtual bool event( QEvent* ) override; - virtual void resizeEvent( QResizeEvent* ) override; - virtual void exposeEvent( QExposeEvent* ) override; - virtual void keyPressEvent(QKeyEvent *) override; - virtual void keyReleaseEvent(QKeyEvent *) override; + bool event( QEvent* ) override; + void resizeEvent( QResizeEvent* ) override; + void exposeEvent( QExposeEvent* ) override; + void keyPressEvent(QKeyEvent *) override; + void keyReleaseEvent(QKeyEvent *) override; virtual void layoutItems(); virtual void ensureFocus( Qt::FocusReason ); diff --git a/src/dialogs/QskDialog.h b/src/dialogs/QskDialog.h index 7f432fd1..7db94873 100644 --- a/src/dialogs/QskDialog.h +++ b/src/dialogs/QskDialog.h @@ -140,7 +140,7 @@ Q_SIGNALS: private: QskDialog(); - virtual ~QskDialog(); + ~QskDialog() override; static QskDialog* s_instance; diff --git a/src/dialogs/QskDialogButton.h b/src/dialogs/QskDialogButton.h index be24bf77..ab7dbc60 100644 --- a/src/dialogs/QskDialogButton.h +++ b/src/dialogs/QskDialogButton.h @@ -25,19 +25,19 @@ public: QskDialogButton( QskDialog::StandardButton, QQuickItem* parent = nullptr ); QskDialogButton( QQuickItem* parent = nullptr ); - virtual ~QskDialogButton(); + ~QskDialogButton() override; void setStandardButton( QskDialog::StandardButton ); QskDialog::StandardButton standardButton() const; - virtual QskAspect::Subcontrol effectiveSubcontrol( + QskAspect::Subcontrol effectiveSubcontrol( QskAspect::Subcontrol ) const override; Q_SIGNALS: void standardButtonChanged(); protected: - virtual void changeEvent( QEvent* ) override; + void changeEvent( QEvent* ) override; private: QskDialog::StandardButton m_buttonType; diff --git a/src/dialogs/QskDialogButtonBox.h b/src/dialogs/QskDialogButtonBox.h index 5beb18a3..2b767424 100644 --- a/src/dialogs/QskDialogButtonBox.h +++ b/src/dialogs/QskDialogButtonBox.h @@ -30,7 +30,7 @@ public: QskDialogButtonBox( QQuickItem* parent = nullptr ); QskDialogButtonBox( Qt::Orientation orientation, QQuickItem* parent = nullptr ); - virtual ~QskDialogButtonBox(); + ~QskDialogButtonBox() override; void setOrientation( Qt::Orientation ); Qt::Orientation orientation() const; @@ -57,9 +57,9 @@ public: QskDialog::StandardButton clickedButton() const; - virtual QSizeF contentsSizeHint() const override; + QSizeF contentsSizeHint() const override; - virtual QskAspect::Subcontrol effectiveSubcontrol( + QskAspect::Subcontrol effectiveSubcontrol( QskAspect::Subcontrol ) const override; static bool isDefaultButtonKeyEvent( const QKeyEvent* ); @@ -74,8 +74,8 @@ Q_SIGNALS: void orientationChanged(); protected: - virtual bool event( QEvent* event ) override; - virtual void updateLayout() override; + bool event( QEvent* event ) override; + void updateLayout() override; virtual QskPushButton* createButton( QskDialog::StandardButton ) const; diff --git a/src/dialogs/QskDialogSubWindow.h b/src/dialogs/QskDialogSubWindow.h index 29b9d1c3..4471d0ab 100644 --- a/src/dialogs/QskDialogSubWindow.h +++ b/src/dialogs/QskDialogSubWindow.h @@ -18,7 +18,7 @@ class QSK_EXPORT QskDialogSubWindow : public QskSubWindow public: QskDialogSubWindow( QQuickItem* parent = nullptr ); - virtual ~QskDialogSubWindow(); + ~QskDialogSubWindow() override; Q_INVOKABLE QskDialog::DialogCode result() const; Q_INVOKABLE QskDialog::DialogCode exec(); @@ -35,9 +35,9 @@ public Q_SLOTS: protected: void setResult( QskDialog::DialogCode r ); - virtual void keyPressEvent( QKeyEvent* ) override; + void keyPressEvent( QKeyEvent* ) override; - virtual void aboutToShow() override; + void aboutToShow() override; private: QskDialog::DialogCode m_result; diff --git a/src/dialogs/QskDialogWindow.h b/src/dialogs/QskDialogWindow.h index 68165a1f..ac51bf0c 100644 --- a/src/dialogs/QskDialogWindow.h +++ b/src/dialogs/QskDialogWindow.h @@ -19,7 +19,7 @@ class QSK_EXPORT QskDialogWindow : public QskWindow public: QskDialogWindow( QWindow* parent = nullptr ); - virtual ~QskDialogWindow(); + ~QskDialogWindow() override; Q_INVOKABLE QskDialog::DialogCode result() const; Q_INVOKABLE QskDialog::DialogCode exec(); @@ -37,8 +37,8 @@ public Q_SLOTS: protected: void setResult( QskDialog::DialogCode r ); - virtual bool event( QEvent* ) override; - virtual void keyPressEvent( QKeyEvent* ) override; + bool event( QEvent* ) override; + void keyPressEvent( QKeyEvent* ) override; private: class PrivateData; diff --git a/src/dialogs/QskInputSubWindow.cpp b/src/dialogs/QskInputSubWindow.cpp index 55ec2c2a..2e982780 100644 --- a/src/dialogs/QskInputSubWindow.cpp +++ b/src/dialogs/QskInputSubWindow.cpp @@ -48,7 +48,7 @@ namespace } protected: - virtual void changeEvent( QEvent* event ) override final + void changeEvent( QEvent* event ) override { if ( event->type() == QEvent::FontChange ) updateSourceSize(); diff --git a/src/dialogs/QskInputSubWindow.h b/src/dialogs/QskInputSubWindow.h index b967f19b..ceef3169 100644 --- a/src/dialogs/QskInputSubWindow.h +++ b/src/dialogs/QskInputSubWindow.h @@ -30,7 +30,7 @@ class QSK_EXPORT QskInputSubWindow : public QskDialogSubWindow public: QskInputSubWindow( QQuickItem* parent = nullptr ); - virtual ~QskInputSubWindow(); + ~QskInputSubWindow() override; QskDialog::StandardButtons standardButtons() const; void setStandardButtons( QskDialog::StandardButtons ); @@ -68,7 +68,7 @@ protected: void setInputControl( QskControl* ); QskControl* inputControl() const; - virtual void keyPressEvent( QKeyEvent* ) override; + void keyPressEvent( QKeyEvent* ) override; private: void updateTitleBox(); diff --git a/src/dialogs/QskInputWindow.h b/src/dialogs/QskInputWindow.h index 8608d865..cc6d9458 100644 --- a/src/dialogs/QskInputWindow.h +++ b/src/dialogs/QskInputWindow.h @@ -32,7 +32,7 @@ class QSK_EXPORT QskInputWindow : public QskDialogWindow public: QskInputWindow( QWindow* parent = nullptr ); - virtual ~QskInputWindow(); + ~QskInputWindow() override; QskDialog::StandardButtons standardButtons() const; void setStandardButtons( QskDialog::StandardButtons ); diff --git a/src/dialogs/QskMessageSubWindow.h b/src/dialogs/QskMessageSubWindow.h index 7b7b96f9..d68c466a 100644 --- a/src/dialogs/QskMessageSubWindow.h +++ b/src/dialogs/QskMessageSubWindow.h @@ -17,7 +17,7 @@ class QSK_EXPORT QskMessageSubWindow : public QskInputSubWindow public: QskMessageSubWindow( QQuickItem* parent = nullptr ); - virtual ~QskMessageSubWindow(); + ~QskMessageSubWindow() override; }; #endif diff --git a/src/dialogs/QskMessageWindow.h b/src/dialogs/QskMessageWindow.h index 86ab49cb..289524bc 100644 --- a/src/dialogs/QskMessageWindow.h +++ b/src/dialogs/QskMessageWindow.h @@ -19,7 +19,7 @@ class QSK_EXPORT QskMessageWindow : public QskInputWindow public: QskMessageWindow( QWindow* parent = nullptr ); - virtual ~QskMessageWindow(); + ~QskMessageWindow() override; }; #endif diff --git a/src/dialogs/QskSelectionSubWindow.cpp b/src/dialogs/QskSelectionSubWindow.cpp index cbd225df..e09856eb 100644 --- a/src/dialogs/QskSelectionSubWindow.cpp +++ b/src/dialogs/QskSelectionSubWindow.cpp @@ -27,7 +27,7 @@ namespace #if 1 // how to find a reasonable default size ??? - virtual QSizeF contentsSizeHint() const override final + QSizeF contentsSizeHint() const override { return QSizeF( 500, 500 ); } diff --git a/src/dialogs/QskSelectionSubWindow.h b/src/dialogs/QskSelectionSubWindow.h index 9b5e9f4e..08e06b0e 100644 --- a/src/dialogs/QskSelectionSubWindow.h +++ b/src/dialogs/QskSelectionSubWindow.h @@ -25,7 +25,7 @@ class QSK_EXPORT QskSelectionSubWindow : public QskInputSubWindow public: QskSelectionSubWindow( QQuickItem* parent = nullptr ); - virtual ~QskSelectionSubWindow(); + ~QskSelectionSubWindow() override; Q_INVOKABLE QStringList entries() const; Q_INVOKABLE int selectedRow() const; diff --git a/src/dialogs/QskSelectionWindow.h b/src/dialogs/QskSelectionWindow.h index 02d5d216..6328aa58 100644 --- a/src/dialogs/QskSelectionWindow.h +++ b/src/dialogs/QskSelectionWindow.h @@ -25,7 +25,7 @@ class QSK_EXPORT QskSelectionWindow : public QskInputWindow public: QskSelectionWindow( QWindow* parent = nullptr ); - virtual ~QskSelectionWindow(); + ~QskSelectionWindow() override; Q_INVOKABLE QStringList entries() const; Q_INVOKABLE int selectedRow() const; diff --git a/src/graphic/QskGraphic.h b/src/graphic/QskGraphic.h index 77c207d3..0232be22 100644 --- a/src/graphic/QskGraphic.h +++ b/src/graphic/QskGraphic.h @@ -35,7 +35,7 @@ public: QskGraphic( const QskGraphic& ); QskGraphic( QskGraphic&& ); - virtual ~QskGraphic(); + ~QskGraphic() override; QskGraphic& operator=( const QskGraphic& ); QskGraphic& operator=( QskGraphic&& ); @@ -93,14 +93,15 @@ public: RenderHints renderHints() const; - virtual QPaintEngine* paintEngine() const override; - virtual int metric( PaintDeviceMetric metric ) const override; + QPaintEngine* paintEngine() const override; + int metric( PaintDeviceMetric metric ) const override; static QskGraphic fromImage( const QImage& ); static QskGraphic fromPixmap( const QPixmap& ); protected: friend class QskGraphicPaintEngine; + virtual QSize sizeMetrics() const; virtual void drawPath( const QPainterPath& ); diff --git a/src/graphic/QskGraphicImageProvider.h b/src/graphic/QskGraphicImageProvider.h index 3ffd6745..3feb0375 100644 --- a/src/graphic/QskGraphicImageProvider.h +++ b/src/graphic/QskGraphicImageProvider.h @@ -15,18 +15,18 @@ class QSK_EXPORT QskGraphicImageProvider : public QQuickImageProvider { public: QskGraphicImageProvider( const QString& providerId, ImageType ); - virtual ~QskGraphicImageProvider(); + ~QskGraphicImageProvider() override; void setCacheSize( int ); int cacheSize() const; - virtual QImage requestImage( const QString& id, + QImage requestImage( const QString& id, QSize* size, const QSize& requestedSize ) override; - virtual QPixmap requestPixmap( const QString& id, + QPixmap requestPixmap( const QString& id, QSize* size, const QSize& requestedSize ) override; - virtual QQuickTextureFactory* requestTexture( const QString& id, + QQuickTextureFactory* requestTexture( const QString& id, QSize* size, const QSize& requestedSize ) override; QString graphicProviderId() const; diff --git a/src/graphic/QskGraphicPaintEngine.h b/src/graphic/QskGraphicPaintEngine.h index cc53e066..d6883db0 100644 --- a/src/graphic/QskGraphicPaintEngine.h +++ b/src/graphic/QskGraphicPaintEngine.h @@ -9,33 +9,33 @@ #include "QskGlobal.h" #include -class QSK_EXPORT QskGraphicPaintEngine : public QPaintEngine +class QSK_EXPORT QskGraphicPaintEngine final : public QPaintEngine { public: QskGraphicPaintEngine(); - virtual ~QskGraphicPaintEngine(); + ~QskGraphicPaintEngine() override; - virtual bool begin( QPaintDevice* ) override final; - virtual bool end() override final; + bool begin( QPaintDevice* ) override; + bool end() override; - virtual Type type () const override final; + Type type () const override; - virtual void updateState( const QPaintEngineState& state ) override final; + void updateState( const QPaintEngineState& state ) override; - virtual void drawPath( const QPainterPath& path ) override final; + void drawPath( const QPainterPath& path ) override; - virtual void drawPolygon( const QPointF* points, - int pointCount, PolygonDrawMode mode ) override final; + void drawPolygon( const QPointF* points, + int pointCount, PolygonDrawMode mode ) override; - virtual void drawPolygon( const QPoint* points, - int pointCount, PolygonDrawMode mode ) override final; + void drawPolygon( const QPoint* points, + int pointCount, PolygonDrawMode mode ) override; - virtual void drawPixmap( const QRectF& rect, - const QPixmap& pixmap, const QRectF& subRect ) override final; + void drawPixmap( const QRectF& rect, + const QPixmap& pixmap, const QRectF& subRect ) override; - virtual void drawImage( const QRectF& rect, + void drawImage( const QRectF& rect, const QImage& image, const QRectF& subRect, - Qt::ImageConversionFlags flags ) override final; + Qt::ImageConversionFlags flags ) override; }; #endif diff --git a/src/graphic/QskGraphicProvider.h b/src/graphic/QskGraphicProvider.h index e7fc7cbc..96cd0608 100644 --- a/src/graphic/QskGraphicProvider.h +++ b/src/graphic/QskGraphicProvider.h @@ -17,7 +17,7 @@ class QSK_EXPORT QskGraphicProvider: public QObject { public: QskGraphicProvider( QObject* parent = nullptr ); - virtual ~QskGraphicProvider(); + ~QskGraphicProvider() override; void setCacheSize( int ); int cacheSize() const; diff --git a/src/graphic/QskGraphicTextureFactory.h b/src/graphic/QskGraphicTextureFactory.h index 9442f35b..06a30352 100644 --- a/src/graphic/QskGraphicTextureFactory.h +++ b/src/graphic/QskGraphicTextureFactory.h @@ -23,7 +23,7 @@ public: QskGraphicTextureFactory(); QskGraphicTextureFactory( const QskGraphic&, const QSize& size ); - virtual ~QskGraphicTextureFactory(); + ~QskGraphicTextureFactory() override; void setGraphic( const QskGraphic& ); QskGraphic graphic() const; @@ -34,11 +34,11 @@ public: void setSize( const QSize& size ); QSize size() const; - virtual QSGTexture* createTexture( QQuickWindow* ) const override; - virtual QSize textureSize() const override; - virtual int textureByteCount() const override; + QSGTexture* createTexture( QQuickWindow* ) const override; + QSize textureSize() const override; + int textureByteCount() const override; - virtual QImage image() const override; + QImage image() const override; static uint createTexture( RenderMode, const QRect& rect, Qt::AspectRatioMode, diff --git a/src/inputpanel/QskInputContext.cpp b/src/inputpanel/QskInputContext.cpp index d72b873f..5d9c78be 100644 --- a/src/inputpanel/QskInputContext.cpp +++ b/src/inputpanel/QskInputContext.cpp @@ -43,27 +43,27 @@ namespace this, &QskInputPanel::predictiveTextSelected ); } - virtual void attachItem( QQuickItem* item ) override + void attachItem( QQuickItem* item ) override { m_box->attachInputItem( item ); } - virtual QQuickItem* inputProxy() const override + QQuickItem* inputProxy() const override { return m_box->inputProxy(); } - virtual void setPrompt( const QString& prompt ) override + void setPrompt( const QString& prompt ) override { m_box->setInputPrompt( prompt ); } - virtual void setPredictionEnabled( bool on ) override + void setPredictionEnabled( bool on ) override { m_box->setPanelHint( QskInputPanelBox::Prediction, on ); } - virtual void setPrediction( const QStringList& prediction ) override + void setPrediction( const QStringList& prediction ) override { m_box->setPrediction( prediction ); } diff --git a/src/inputpanel/QskInputContext.h b/src/inputpanel/QskInputContext.h index 5aae987d..3a37d824 100644 --- a/src/inputpanel/QskInputContext.h +++ b/src/inputpanel/QskInputContext.h @@ -27,7 +27,7 @@ class QSK_EXPORT QskInputContextFactory : public QObject public: QskInputContextFactory( QObject* parent = nullptr ); - virtual ~QskInputContextFactory(); + ~QskInputContextFactory() override; virtual QskTextPredictor* createPredictor( const QLocale& ) const; virtual QskInputPanel* createPanel() const; diff --git a/src/inputpanel/QskInputPanel.h b/src/inputpanel/QskInputPanel.h index 2488ea68..50f06253 100644 --- a/src/inputpanel/QskInputPanel.h +++ b/src/inputpanel/QskInputPanel.h @@ -22,7 +22,7 @@ class QSK_EXPORT QskInputPanel : public QskControl public: QskInputPanel( QQuickItem* parent = nullptr ); - virtual ~QskInputPanel() override; + ~QskInputPanel() override; void attachInputItem( QQuickItem* ); void updateInputPanel( Qt::InputMethodQueries ); diff --git a/src/inputpanel/QskInputPanelBox.cpp b/src/inputpanel/QskInputPanelBox.cpp index 378b7e12..e726f860 100644 --- a/src/inputpanel/QskInputPanelBox.cpp +++ b/src/inputpanel/QskInputPanelBox.cpp @@ -26,7 +26,7 @@ namespace setFocusPolicy( Qt::NoFocus ); } - virtual QskAspect::Subcontrol effectiveSubcontrol( + QskAspect::Subcontrol effectiveSubcontrol( QskAspect::Subcontrol subControl ) const override { if ( subControl == QskTextInput::Panel ) @@ -39,11 +39,11 @@ namespace } protected: - virtual void focusInEvent( QFocusEvent* ) override final + void focusInEvent( QFocusEvent* ) override { } - virtual void focusOutEvent( QFocusEvent* ) override final + void focusOutEvent( QFocusEvent* ) override { } diff --git a/src/inputpanel/QskInputPanelBox.h b/src/inputpanel/QskInputPanelBox.h index 130b32a5..665675db 100644 --- a/src/inputpanel/QskInputPanelBox.h +++ b/src/inputpanel/QskInputPanelBox.h @@ -39,7 +39,7 @@ public: Q_DECLARE_FLAGS( PanelHints, PanelHint ) QskInputPanelBox( QQuickItem* parent = nullptr ); - virtual ~QskInputPanelBox() override; + ~QskInputPanelBox() override; void attachInputItem( QQuickItem* ); QQuickItem* attachedInputItem() const; @@ -53,7 +53,7 @@ public: QString inputPrompt() const; - virtual QskAspect::Subcontrol effectiveSubcontrol( + QskAspect::Subcontrol effectiveSubcontrol( QskAspect::Subcontrol ) const override; Q_SIGNALS: @@ -68,7 +68,7 @@ public Q_SLOTS: void setPrediction( const QStringList& ); protected: - virtual void keyPressEvent( QKeyEvent* ) override; + void keyPressEvent( QKeyEvent* ) override; private: class PrivateData; diff --git a/src/inputpanel/QskInputPredictionBar.cpp b/src/inputpanel/QskInputPredictionBar.cpp index 8fc6f6ba..033056d5 100644 --- a/src/inputpanel/QskInputPredictionBar.cpp +++ b/src/inputpanel/QskInputPredictionBar.cpp @@ -29,7 +29,7 @@ namespace setTextOptions( options ); } - virtual QSizeF contentsSizeHint() const override + QSizeF contentsSizeHint() const override { auto size = QFontMetricsF( font() ).size( Qt::TextSingleLine, text() ); @@ -42,8 +42,8 @@ namespace return size; } - virtual QskAspect::Subcontrol effectiveSubcontrol( - QskAspect::Subcontrol subControl ) const override final + QskAspect::Subcontrol effectiveSubcontrol( + QskAspect::Subcontrol subControl ) const override { if( subControl == QskPushButton::Panel ) return QskInputPredictionBar::ButtonPanel; diff --git a/src/inputpanel/QskInputPredictionBar.h b/src/inputpanel/QskInputPredictionBar.h index b9d104b1..599aa0d2 100644 --- a/src/inputpanel/QskInputPredictionBar.h +++ b/src/inputpanel/QskInputPredictionBar.h @@ -18,9 +18,9 @@ public: QSK_SUBCONTROLS( Panel, ButtonPanel, ButtonText ) QskInputPredictionBar( QQuickItem* parent = nullptr ); - virtual ~QskInputPredictionBar(); + ~QskInputPredictionBar() override; - virtual QskAspect::Subcontrol effectiveSubcontrol( + QskAspect::Subcontrol effectiveSubcontrol( QskAspect::Subcontrol subControl ) const override; QStringList candidates() const; diff --git a/src/inputpanel/QskTextPredictor.h b/src/inputpanel/QskTextPredictor.h index e4b582cb..660b2944 100644 --- a/src/inputpanel/QskTextPredictor.h +++ b/src/inputpanel/QskTextPredictor.h @@ -26,7 +26,7 @@ public: Q_ENUM( Attribute ) Q_DECLARE_FLAGS( Attributes, Attribute ) - virtual ~QskTextPredictor(); + ~QskTextPredictor() override; virtual void request( const QString& text ) = 0; virtual void reset() = 0; diff --git a/src/inputpanel/QskVirtualKeyboard.cpp b/src/inputpanel/QskVirtualKeyboard.cpp index 502be34b..1e8b42e9 100644 --- a/src/inputpanel/QskVirtualKeyboard.cpp +++ b/src/inputpanel/QskVirtualKeyboard.cpp @@ -36,7 +36,7 @@ namespace setFocusPolicy( Qt::TabFocus ); } - virtual QskAspect::Subcontrol effectiveSubcontrol( + QskAspect::Subcontrol effectiveSubcontrol( QskAspect::Subcontrol subControl ) const override { auto keyBoard = static_cast< const QskVirtualKeyboard*>( parent() ); diff --git a/src/inputpanel/QskVirtualKeyboard.h b/src/inputpanel/QskVirtualKeyboard.h index 07d3a9b9..62ffe429 100644 --- a/src/inputpanel/QskVirtualKeyboard.h +++ b/src/inputpanel/QskVirtualKeyboard.h @@ -28,19 +28,19 @@ public: Q_ENUM( Mode ) QskVirtualKeyboard( QQuickItem* parent = nullptr ); - virtual ~QskVirtualKeyboard() override; + ~QskVirtualKeyboard() override; void setMode( Mode ); Mode mode() const; void updateLocale( const QLocale& ); - virtual qreal heightForWidth( qreal width ) const override; - virtual qreal widthForHeight( qreal height ) const override; + qreal heightForWidth( qreal width ) const override; + qreal widthForHeight( qreal height ) const override; - virtual QSizeF contentsSizeHint() const override; + QSizeF contentsSizeHint() const override; - virtual QskAspect::Subcontrol effectiveSubcontrol( + QskAspect::Subcontrol effectiveSubcontrol( QskAspect::Subcontrol ) const override; bool hasKey( int keyCode ) const; @@ -50,7 +50,7 @@ Q_SIGNALS: void keySelected( int keyCode ); protected: - virtual void updateLayout() override; + void updateLayout() override; private: void buttonPressed(); diff --git a/src/layouts/QskGridBox.h b/src/layouts/QskGridBox.h index fc2d8fe4..26ef57d6 100644 --- a/src/layouts/QskGridBox.h +++ b/src/layouts/QskGridBox.h @@ -25,7 +25,7 @@ class QSK_EXPORT QskGridBox : public QskLayout public: explicit QskGridBox( QQuickItem* parent = nullptr ); - virtual ~QskGridBox(); + ~QskGridBox() override; Q_INVOKABLE void addItem( QQuickItem*, int row, int column, int rowSpan, int columnSpan, @@ -114,19 +114,19 @@ public: Q_INVOKABLE bool retainSizeWhenHidden( QQuickItem* ) const; Q_INVOKABLE void setRetainSizeWhenHidden( QQuickItem*, bool on ); - virtual qreal heightForWidth( qreal width ) const override; - virtual qreal widthForHeight( qreal height ) const override; + qreal heightForWidth( qreal width ) const override; + qreal widthForHeight( qreal height ) const override; - virtual QSizeF contentsSizeHint() const override; + QSizeF contentsSizeHint() const override; Q_SIGNALS: void verticalSpacingChanged(); void horizontalSpacingChanged(); protected: - virtual void setupLayoutItem( QskLayoutItem*, int index ) override; - virtual void layoutItemInserted( QskLayoutItem*, int index ) override; - virtual void layoutItemRemoved( QskLayoutItem*, int index ) override; + void setupLayoutItem( QskLayoutItem*, int index ) override; + void layoutItemInserted( QskLayoutItem*, int index ) override; + void layoutItemRemoved( QskLayoutItem*, int index ) override; private: void setRowSizeHint( diff --git a/src/layouts/QskIndexedLayoutBox.h b/src/layouts/QskIndexedLayoutBox.h index 4c064b1b..4a641124 100644 --- a/src/layouts/QskIndexedLayoutBox.h +++ b/src/layouts/QskIndexedLayoutBox.h @@ -23,7 +23,7 @@ class QSK_EXPORT QskIndexedLayoutBox : public QskLayout public: explicit QskIndexedLayoutBox( QQuickItem* parent = nullptr ); - virtual ~QskIndexedLayoutBox(); + ~QskIndexedLayoutBox() override; void setAutoAddChildren( bool ); bool autoAddChildren() const; @@ -50,7 +50,7 @@ Q_SIGNALS: void defaultAlignmentChanged(); protected: - virtual void itemChange( ItemChange, const ItemChangeData& ) override; + void itemChange( ItemChange, const ItemChangeData& ) override; void insertLayoutItem( QskLayoutItem*, int index ); private: diff --git a/src/layouts/QskLayout.h b/src/layouts/QskLayout.h index 8f27b3c9..77f90ff0 100644 --- a/src/layouts/QskLayout.h +++ b/src/layouts/QskLayout.h @@ -21,7 +21,7 @@ class QSK_EXPORT QskLayout : public QskControl public: explicit QskLayout( QQuickItem* parent = 0 ); - virtual ~QskLayout(); + ~QskLayout() override; Q_INVOKABLE bool isEmpty() const; @@ -45,11 +45,11 @@ public Q_SLOTS: void invalidate(); protected: - virtual bool event( QEvent* ) override; - virtual void geometryChangeEvent( QskGeometryChangeEvent* ) override; + bool event( QEvent* ) override; + void geometryChangeEvent( QskGeometryChangeEvent* ) override; - virtual void itemChange( ItemChange, const ItemChangeData& ) override; - virtual void updateLayout() override; + void itemChange( ItemChange, const ItemChangeData& ) override; + void updateLayout() override; QskLayoutEngine& engine(); const QskLayoutEngine& engine() const; diff --git a/src/layouts/QskLayoutEngine.cpp b/src/layouts/QskLayoutEngine.cpp index cd352e21..1db8e9f6 100644 --- a/src/layouts/QskLayoutEngine.cpp +++ b/src/layouts/QskLayoutEngine.cpp @@ -59,19 +59,19 @@ namespace { } - virtual qreal spacing( Qt::Orientation ) const override + qreal spacing( Qt::Orientation ) const override { // later from the theme !! return 5.0; } - virtual qreal windowMargin( Qt::Orientation ) const override + qreal windowMargin( Qt::Orientation ) const override { // later from the theme !! return 0; } - virtual bool hasChangedCore() const override + bool hasChangedCore() const override { return false; // never changes } diff --git a/src/layouts/QskLayoutEngine.h b/src/layouts/QskLayoutEngine.h index 218608cf..797f736b 100644 --- a/src/layouts/QskLayoutEngine.h +++ b/src/layouts/QskLayoutEngine.h @@ -25,7 +25,7 @@ class QskLayoutEngine : public QGridLayoutEngine { public: QskLayoutEngine(); - virtual ~QskLayoutEngine(); + ~QskLayoutEngine(); void setGeometries( const QRectF ); diff --git a/src/layouts/QskLayoutItem.h b/src/layouts/QskLayoutItem.h index 92fed43c..4b455046 100644 --- a/src/layouts/QskLayoutItem.h +++ b/src/layouts/QskLayoutItem.h @@ -36,20 +36,20 @@ public: QskLayoutItem( const QSizeF& size, int stretch, int row, int column ); - virtual ~QskLayoutItem(); + ~QskLayoutItem() override; QQuickItem* item(); const QQuickItem* item() const; - virtual QLayoutPolicy::Policy sizePolicy( Qt::Orientation ) const override final; - virtual QSizeF sizeHint( Qt::SizeHint, const QSizeF& ) const override final; - virtual void setGeometry( const QRectF& ) override final; + QLayoutPolicy::Policy sizePolicy( Qt::Orientation ) const override final; + QSizeF sizeHint( Qt::SizeHint, const QSizeF& ) const override final; + void setGeometry( const QRectF& ) override final; - virtual bool hasDynamicConstraint() const override final; - virtual Qt::Orientation dynamicConstraintOrientation() const override final; + bool hasDynamicConstraint() const override final; + Qt::Orientation dynamicConstraintOrientation() const override final; - virtual bool isIgnored() const override final; - virtual QLayoutPolicy::ControlTypes controlTypes( LayoutSide side ) const override final; + bool isIgnored() const override final; + QLayoutPolicy::ControlTypes controlTypes( LayoutSide side ) const override final; bool retainSizeWhenHidden() const; void setRetainSizeWhenHidden( bool on ); diff --git a/src/layouts/QskLinearBox.h b/src/layouts/QskLinearBox.h index a385e8ea..f27168cc 100644 --- a/src/layouts/QskLinearBox.h +++ b/src/layouts/QskLinearBox.h @@ -34,7 +34,7 @@ public: QskLinearBox( Qt::Orientation, uint dimension, QQuickItem* parent = nullptr ); - virtual ~QskLinearBox(); + ~QskLinearBox() override; Qt::Orientation orientation() const; void setOrientation( Qt::Orientation ); @@ -73,10 +73,10 @@ public: Q_INVOKABLE bool retainSizeWhenHidden( QQuickItem* ) const; Q_INVOKABLE void setRetainSizeWhenHidden( QQuickItem*, bool on ); - virtual QSizeF contentsSizeHint() const override; + QSizeF contentsSizeHint() const override; - virtual qreal heightForWidth( qreal width ) const override; - virtual qreal widthForHeight( qreal height ) const override; + qreal heightForWidth( qreal width ) const override; + qreal widthForHeight( qreal height ) const override; #if 1 Q_INVOKABLE void setRowSpacing( int row, qreal spacing ); @@ -102,12 +102,12 @@ Q_SIGNALS: void extraSpacingAtChanged(); protected: - virtual QRectF alignedLayoutRect( const QRectF& ) const override; + QRectF alignedLayoutRect( const QRectF& ) const override; private: - virtual void setupLayoutItem( QskLayoutItem*, int index ) override; - virtual void layoutItemInserted( QskLayoutItem*, int index ) override; - virtual void layoutItemRemoved( QskLayoutItem*, int index ) override; + void setupLayoutItem( QskLayoutItem*, int index ) override; + void layoutItemInserted( QskLayoutItem*, int index ) override; + void layoutItemRemoved( QskLayoutItem*, int index ) override; void rearrange(); diff --git a/src/layouts/QskStackBox.h b/src/layouts/QskStackBox.h index 561c746f..27c205dc 100644 --- a/src/layouts/QskStackBox.h +++ b/src/layouts/QskStackBox.h @@ -27,15 +27,15 @@ public: explicit QskStackBox( QQuickItem* parent = nullptr ); QskStackBox( bool autoAddChildren, QQuickItem* parent = nullptr ); - virtual ~QskStackBox(); + ~QskStackBox() override; QQuickItem* currentItem() const; int currentIndex() const; - virtual QSizeF contentsSizeHint() const override; + QSizeF contentsSizeHint() const override; - virtual qreal heightForWidth( qreal width ) const override; - virtual qreal widthForHeight( qreal height ) const override; + qreal heightForWidth( qreal width ) const override; + qreal widthForHeight( qreal height ) const override; void setAnimator( QskStackBoxAnimator* ); const QskStackBoxAnimator* animator() const; @@ -55,8 +55,8 @@ protected: private: friend class QskStackBoxAnimator; - virtual void layoutItemInserted( QskLayoutItem*, int index ) override; - virtual void layoutItemRemoved( QskLayoutItem*, int index ) override; + void layoutItemInserted( QskLayoutItem*, int index ) override; + void layoutItemRemoved( QskLayoutItem*, int index ) override; class PrivateData; std::unique_ptr< PrivateData > m_data; diff --git a/src/layouts/QskStackBoxAnimator.h b/src/layouts/QskStackBoxAnimator.h index bdba8aaf..43ddd32d 100644 --- a/src/layouts/QskStackBoxAnimator.h +++ b/src/layouts/QskStackBoxAnimator.h @@ -20,7 +20,7 @@ class QSK_EXPORT QskStackBoxAnimator : public QObject, public QskAnimator public: QskStackBoxAnimator( QskStackBox* parent ); - virtual ~QskStackBoxAnimator(); + ~QskStackBoxAnimator() override; void setStartIndex( int index ); void setEndIndex( int index ); @@ -44,15 +44,15 @@ class QSK_EXPORT QskStackBoxAnimator1 : public QskStackBoxAnimator public: QskStackBoxAnimator1( QskStackBox* parent ); - virtual ~QskStackBoxAnimator1(); + ~QskStackBoxAnimator1() override; void setOrientation( Qt::Orientation ); Qt::Orientation orientation() const; protected: - virtual void setup() override; - virtual void advance( qreal value ) override; - virtual void done() override; + void setup() override; + void advance( qreal value ) override; + void done() override; private: qreal m_itemOffset[2]; @@ -68,12 +68,12 @@ class QSK_EXPORT QskStackBoxAnimator3 : public QskStackBoxAnimator public: QskStackBoxAnimator3( QskStackBox* parent ); - virtual ~QskStackBoxAnimator3(); + ~QskStackBoxAnimator3() override; protected: - virtual void setup() override; - virtual void advance( qreal value ) override; - virtual void done() override; + void setup() override; + void advance( qreal value ) override; + void done() override; }; #endif diff --git a/src/nodes/QskBoxClipNode.h b/src/nodes/QskBoxClipNode.h index b597d624..0c838dc5 100644 --- a/src/nodes/QskBoxClipNode.h +++ b/src/nodes/QskBoxClipNode.h @@ -16,7 +16,7 @@ class QSK_EXPORT QskBoxClipNode : public QSGClipNode { public: QskBoxClipNode(); - virtual ~QskBoxClipNode(); + ~QskBoxClipNode() override; void setBox( const QRectF&, const QskBoxShapeMetrics&, const QskBoxBorderMetrics& ); diff --git a/src/nodes/QskBoxNode.h b/src/nodes/QskBoxNode.h index ea497a1b..0f6e00ec 100644 --- a/src/nodes/QskBoxNode.h +++ b/src/nodes/QskBoxNode.h @@ -18,7 +18,7 @@ class QSK_EXPORT QskBoxNode : public QSGGeometryNode { public: QskBoxNode(); - virtual ~QskBoxNode(); + ~QskBoxNode() override; void setBoxData( const QRectF& rect, const QskBoxShapeMetrics&, const QskBoxBorderMetrics&, diff --git a/src/nodes/QskGraphicNode.h b/src/nodes/QskGraphicNode.h index b1c6128a..91730433 100644 --- a/src/nodes/QskGraphicNode.h +++ b/src/nodes/QskGraphicNode.h @@ -17,7 +17,7 @@ class QSK_EXPORT QskGraphicNode : public QskTextureNode { public: QskGraphicNode(); - virtual ~QskGraphicNode(); + ~QskGraphicNode() override; void setGraphic( const QskGraphic&, const QskColorFilter&, QskGraphicTextureFactory::RenderMode, const QRect& ); diff --git a/src/nodes/QskRichTextRenderer.cpp b/src/nodes/QskRichTextRenderer.cpp index 64b19dfb..7854c4e0 100644 --- a/src/nodes/QskRichTextRenderer.cpp +++ b/src/nodes/QskRichTextRenderer.cpp @@ -117,8 +117,7 @@ namespace } protected: - virtual QSGNode* updatePaintNode( - QSGNode*, UpdatePaintNodeData* ) override final + QSGNode* updatePaintNode( QSGNode*, UpdatePaintNodeData* ) override { Q_ASSERT( false ); return nullptr; diff --git a/src/nodes/QskTextNode.h b/src/nodes/QskTextNode.h index 815304f2..1843908c 100644 --- a/src/nodes/QskTextNode.h +++ b/src/nodes/QskTextNode.h @@ -22,7 +22,7 @@ class QSK_EXPORT QskTextNode : public QSGTransformNode { public: QskTextNode(); - virtual ~QskTextNode(); + ~QskTextNode() override; void setTextData( const QQuickItem* item, const QString& text, const QRectF&, const QFont&, diff --git a/src/nodes/QskTextureNode.cpp b/src/nodes/QskTextureNode.cpp index 19867336..31d4f125 100644 --- a/src/nodes/QskTextureNode.cpp +++ b/src/nodes/QskTextureNode.cpp @@ -48,11 +48,11 @@ namespace public: MaterialShader( bool isOpaque ); - virtual char const* const* attributeNames() const override final; - virtual void updateState( const RenderState&, QSGMaterial*, QSGMaterial* ) override final; + char const* const* attributeNames() const override; + void updateState( const RenderState&, QSGMaterial*, QSGMaterial* ) override; protected: - virtual void initialize() override final; + void initialize() override; private: int m_matrixId; @@ -66,13 +66,13 @@ namespace public: Material( bool isOpaque ); - virtual QSGMaterialType* type() const override; - virtual QSGMaterialShader* createShader() const override; + QSGMaterialType* type() const override; + QSGMaterialShader* createShader() const override; void setTextureId( uint ); uint textureId() const; - virtual int compare(const QSGMaterial* ) const override; + int compare(const QSGMaterial* ) const override; private: uint m_textureId; diff --git a/src/nodes/QskTextureNode.h b/src/nodes/QskTextureNode.h index 8f25a66e..933a2390 100644 --- a/src/nodes/QskTextureNode.h +++ b/src/nodes/QskTextureNode.h @@ -17,7 +17,7 @@ class QSK_EXPORT QskTextureNode : public QSGGeometryNode { public: QskTextureNode(); - virtual ~QskTextureNode(); + ~QskTextureNode() override; void setRect(const QRectF& rect); QRectF rect() const; diff --git a/support/SkinnyShapeProvider.h b/support/SkinnyShapeProvider.h index 5d213da9..b7970f33 100644 --- a/support/SkinnyShapeProvider.h +++ b/support/SkinnyShapeProvider.h @@ -12,7 +12,7 @@ class SKINNY_EXPORT SkinnyShapeProvider : public QskGraphicProvider { protected: - virtual const QskGraphic* loadGraphic( const QString& id ) const override final; + const QskGraphic* loadGraphic( const QString& id ) const override final; }; #endif