dh

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 @@ class IndicatorLabel : public QskGraphicLabel
         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
 

examples/automotive/ButtonBar.h

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

examples/automotive/DefaultSkin.cpp

@@ -21,10 +21,10 @@
 
 #include <QDebug>
 
-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();

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

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

examples/automotive/SkinFactory.h

@@ -20,8 +20,8 @@ class SkinFactory : public QskSkinFactory
         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();

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 @@ class VehicleLabel : public QskGraphicLabel
         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,16 +41,16 @@ class VehicleLabel : public QskGraphicLabel
     }
 };
 
-class CrossHairLine : public QskBox
+class CrossHairLine final : public QskBox
 {
 public:
     CrossHairLine( QQuickItem* parent ):
         QskBox( parent )
     {
     }
 
-    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,16 +59,16 @@ class CrossHairLine : public QskBox
     }
 };
 
-class BalanceFadeMarker : public QskBox
+class BalanceFadeMarker final : public QskBox
 {
 public:
     BalanceFadeMarker( QQuickItem* parent ):
         QskBox( parent )
     {
     }
 
-    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 @@ class BalanceFadeMarker : public QskBox
     }
 };
 
-class MarkerControlButton : public QskPushButton
+class MarkerControlButton final : public QskPushButton
 {
 public:
     MarkerControlButton( Qsk::Direction direction, QQuickItem* parentItem = nullptr ):
@@ -115,8 +115,8 @@ class MarkerControlButton : public QskPushButton
         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 @@ class MarkerControlButton : public QskPushButton
     }
 
 protected:
-    virtual QSizeF contentsSizeHint() const override final
+    QSizeF contentsSizeHint() const override
     {
         const qreal dim = 100;
 
@@ -141,7 +141,7 @@ class MarkerControlButton : public QskPushButton
     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 @@ class ControlButton : public QskPushButton
         setAutoRepeat( true );
     }
 
-    virtual QskAspect::Subcontrol effectiveSubcontrol(
+    QskAspect::Subcontrol effectiveSubcontrol(
         QskAspect::Subcontrol subControl ) const override
     {
         if ( subControl == QskPushButton::Panel )
@@ -162,14 +162,14 @@ class ControlButton : public QskPushButton
         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 @@ class StackedControl : public QskControl
     }
 
 protected:
-    virtual void updateLayout() override final
+    void updateLayout() override
     {
         const QRectF cr = contentsRect();
         const qreal crossHairSize = 3;
@@ -242,7 +242,7 @@ class StackedControl : public QskControl
     QPointF m_offset;
 };
 
-class SectionTitleBar : public QskLinearBox
+class SectionTitleBar final : public QskLinearBox
 {
 public:
     SectionTitleBar( const char* title, QQuickItem* parentItem = nullptr ):
@@ -262,7 +262,7 @@ class SectionTitleBar : public QskLinearBox
     }
 };
 
-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 @@ public Q_SLOTS:
     QskSlider* m_slider;
 };
 
-class ToneControlBox : public QskLinearBox
+class ToneControlBox final : public QskLinearBox
 {
 public:
     ToneControlBox( QQuickItem* parentItem = nullptr ):
@@ -344,7 +344,7 @@ class ToneControlBox : public QskLinearBox
     }
 };
 
-class BalanceFadeControlBox : public QskGridBox
+class BalanceFadeControlBox final : public QskGridBox
 {
 public:
     BalanceFadeControlBox( QQuickItem* parentItem = nullptr ):

examples/automotive/SoundControl.h

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

examples/automotive/SpeedometerDisplay.h

@@ -25,4 +25,4 @@ class SpeedometerDisplay : public QskControl
     QskTextLabel* m_fuelGaugeText;
 };
 
-#endif // SPEEDOMETERDISPLAY_H
+#endif

examples/automotive/SpeedometerSkinlet.h

@@ -19,9 +19,9 @@ class SpeedometerSkinlet : public QskSkinlet
     };
 
     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 @@ class SpeedometerSkinlet : public QskSkinlet
     QSGNode* updateNeedleNode( const Speedometer*, QSGNode* ) const;
 };
 
-#endif // SPEEDOMETERSKINLET_H
+#endif

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

examples/frames/Frame.h

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

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

examples/sliders/Slider.h

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

examples/sliders/SliderSkinlet.h

@@ -23,13 +23,13 @@ class SliderSkinlet : public QskSliderSkinlet
     };
 
     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:

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;