From e09936233a6252a8a8c5b9e697c24c80edaed5ea Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Tue, 21 Mar 2017 23:36:39 -0400 Subject: [PATCH] Use override specifier where apropriate. - fixed using clang-tidy's modernize-use-override check. --- glabels/ColorPaletteButtonItem.h | 8 ++-- glabels/ColorPaletteDialog.h | 2 +- glabels/ColorPaletteItem.h | 8 ++-- glabels/FrameCd.h | 16 +++---- glabels/FrameEllipse.h | 16 +++---- glabels/FrameRect.h | 16 +++---- glabels/FrameRound.h | 16 +++---- glabels/Handles.h | 80 +++++++++++++++---------------- glabels/LabelEditor.h | 14 +++--- glabels/LabelModel.h | 2 +- glabels/LabelModelBoxObject.h | 10 ++-- glabels/LabelModelEllipseObject.h | 10 ++-- glabels/LabelModelImageObject.h | 26 +++++----- glabels/LabelModelLineObject.h | 18 +++---- glabels/LabelModelObject.h | 2 +- glabels/LabelModelShapeObject.h | 14 +++--- glabels/LabelModelTextObject.h | 54 ++++++++++----------- glabels/MainWindow.h | 4 +- glabels/Markup.h | 10 ++-- glabels/Merge/Merge.h | 2 +- glabels/Merge/None.h | 14 +++--- glabels/Merge/Text.h | 12 ++--- glabels/Merge/TextColon.h | 4 +- glabels/Merge/TextColonKeys.h | 4 +- glabels/Merge/TextCsv.h | 4 +- glabels/Merge/TextCsvKeys.h | 4 +- glabels/Merge/TextSemicolon.h | 4 +- glabels/Merge/TextSemicolonKeys.h | 4 +- glabels/Merge/TextTsv.h | 4 +- glabels/Merge/TextTsvKeys.h | 4 +- glabels/MergeView.h | 2 +- glabels/Preview.h | 2 +- glabels/PreviewOverlayItem.h | 4 +- glabels/PrintView.h | 2 +- glabels/PropertiesView.h | 2 +- glabels/SelectProductDialog.h | 2 +- glabels/SimplePreview.h | 2 +- glabels/UndoRedoModel.h | 2 +- 38 files changed, 202 insertions(+), 202 deletions(-) diff --git a/glabels/ColorPaletteButtonItem.h b/glabels/ColorPaletteButtonItem.h index 9a2788c..87be520 100644 --- a/glabels/ColorPaletteButtonItem.h +++ b/glabels/ColorPaletteButtonItem.h @@ -54,10 +54,10 @@ namespace glabels // Event handlers ///////////////////////////////// protected: - void paintEvent( QPaintEvent* event ); - void enterEvent( QEvent* event ); - void leaveEvent( QEvent* event ); - void mousePressEvent( QMouseEvent* event ); + void paintEvent( QPaintEvent* event ) override; + void enterEvent( QEvent* event ) override; + void leaveEvent( QEvent* event ) override; + void mousePressEvent( QMouseEvent* event ) override; ///////////////////////////////// diff --git a/glabels/ColorPaletteDialog.h b/glabels/ColorPaletteDialog.h index 3c56e36..a222a9a 100644 --- a/glabels/ColorPaletteDialog.h +++ b/glabels/ColorPaletteDialog.h @@ -80,7 +80,7 @@ namespace glabels void onComboIndexChanged( int index ); protected: - void showEvent( QShowEvent* event ); + void showEvent( QShowEvent* event ) override; ///////////////////////////////// diff --git a/glabels/ColorPaletteItem.h b/glabels/ColorPaletteItem.h index 9cd4ab4..1ec1f53 100644 --- a/glabels/ColorPaletteItem.h +++ b/glabels/ColorPaletteItem.h @@ -66,10 +66,10 @@ namespace glabels // Event handlers ///////////////////////////////// protected: - void paintEvent( QPaintEvent* event ); - void enterEvent( QEvent* event ); - void leaveEvent( QEvent* event ); - void mousePressEvent( QMouseEvent* event ); + void paintEvent( QPaintEvent* event ) override; + void enterEvent( QEvent* event ) override; + void leaveEvent( QEvent* event ) override; + void mousePressEvent( QMouseEvent* event ) override; ///////////////////////////////// diff --git a/glabels/FrameCd.h b/glabels/FrameCd.h index 366d046..0d8f0e7 100644 --- a/glabels/FrameCd.h +++ b/glabels/FrameCd.h @@ -40,21 +40,21 @@ namespace glabels FrameCd( const FrameCd &other ); - Frame *dup() const; + Frame *dup() const override; Distance r1() const; Distance r2() const; Distance waste() const; - Distance w() const; - Distance h() const; + Distance w() const override; + Distance h() const override; - QString sizeDescription( const Units& units ) const; - bool isSimilarTo( Frame* other ) const; + QString sizeDescription( const Units& units ) const override; + bool isSimilarTo( Frame* other ) const override; - const QPainterPath& path() const; - const QPainterPath& clipPath() const; - QPainterPath marginPath( const Distance& size ) const; + const QPainterPath& path() const override; + const QPainterPath& clipPath() const override; + QPainterPath marginPath( const Distance& size ) const override; private: diff --git a/glabels/FrameEllipse.h b/glabels/FrameEllipse.h index ed6e12e..1bdbb20 100644 --- a/glabels/FrameEllipse.h +++ b/glabels/FrameEllipse.h @@ -39,19 +39,19 @@ namespace glabels FrameEllipse( const FrameEllipse& other ); - Frame* dup() const; + Frame* dup() const override; Distance waste() const; - Distance w() const; - Distance h() const; + Distance w() const override; + Distance h() const override; - QString sizeDescription( const Units& units ) const; - bool isSimilarTo( Frame* other ) const; + QString sizeDescription( const Units& units ) const override; + bool isSimilarTo( Frame* other ) const override; - const QPainterPath& path() const; - const QPainterPath& clipPath() const; - QPainterPath marginPath( const Distance& size ) const; + const QPainterPath& path() const override; + const QPainterPath& clipPath() const override; + QPainterPath marginPath( const Distance& size ) const override; private: diff --git a/glabels/FrameRect.h b/glabels/FrameRect.h index 9ed80ae..e7ecad3 100644 --- a/glabels/FrameRect.h +++ b/glabels/FrameRect.h @@ -40,22 +40,22 @@ namespace glabels FrameRect( const FrameRect& other ); - Frame* dup() const; + Frame* dup() const override; Distance r() const; Distance xWaste() const; Distance yWaste() const; - Distance w() const; - Distance h() const; + Distance w() const override; + Distance h() const override; - QString sizeDescription( const Units& units ) const; + QString sizeDescription( const Units& units ) const override; - bool isSimilarTo( Frame* other ) const; + bool isSimilarTo( Frame* other ) const override; - const QPainterPath& path() const; - const QPainterPath& clipPath() const; - QPainterPath marginPath( const Distance& size ) const; + const QPainterPath& path() const override; + const QPainterPath& clipPath() const override; + QPainterPath marginPath( const Distance& size ) const override; private: diff --git a/glabels/FrameRound.h b/glabels/FrameRound.h index 6003f5d..7048032 100644 --- a/glabels/FrameRound.h +++ b/glabels/FrameRound.h @@ -38,20 +38,20 @@ namespace glabels FrameRound( const FrameRound &other ); - Frame *dup() const; + Frame *dup() const override; Distance r() const; Distance waste() const; - Distance w() const; - Distance h() const; + Distance w() const override; + Distance h() const override; - QString sizeDescription( const Units& units ) const; - bool isSimilarTo( Frame* other ) const; + QString sizeDescription( const Units& units ) const override; + bool isSimilarTo( Frame* other ) const override; - const QPainterPath& path() const; - const QPainterPath& clipPath() const; - QPainterPath marginPath( const Distance& size ) const; + const QPainterPath& path() const override; + const QPainterPath& clipPath() const override; + QPainterPath marginPath( const Distance& size ) const override; private: diff --git a/glabels/Handles.h b/glabels/Handles.h index b0f18e3..4494ddd 100644 --- a/glabels/Handles.h +++ b/glabels/Handles.h @@ -107,16 +107,16 @@ namespace glabels //////////////////////////// public: HandleNorth( LabelModelObject* owner ); - virtual ~HandleNorth(); - virtual HandleNorth* clone( LabelModelObject* newOwner ) const; + ~HandleNorth() override; + HandleNorth* clone( LabelModelObject* newOwner ) const override; //////////////////////////// // Drawing Methods //////////////////////////// public: - virtual void draw( QPainter* painter, double scale ) const; - virtual QPainterPath path( double scale ) const; + void draw( QPainter* painter, double scale ) const override; + QPainterPath path( double scale ) const override; }; @@ -130,16 +130,16 @@ namespace glabels //////////////////////////// public: HandleNorthEast( LabelModelObject* owner ); - virtual ~HandleNorthEast(); - virtual HandleNorthEast* clone( LabelModelObject* newOwner ) const; + ~HandleNorthEast() override; + HandleNorthEast* clone( LabelModelObject* newOwner ) const override; //////////////////////////// // Drawing Methods //////////////////////////// public: - virtual void draw( QPainter* painter, double scale ) const; - virtual QPainterPath path( double scale ) const; + void draw( QPainter* painter, double scale ) const override; + QPainterPath path( double scale ) const override; }; @@ -153,16 +153,16 @@ namespace glabels //////////////////////////// public: HandleEast( LabelModelObject* owner ); - virtual ~HandleEast(); - virtual HandleEast* clone( LabelModelObject* newOwner ) const; + ~HandleEast() override; + HandleEast* clone( LabelModelObject* newOwner ) const override; //////////////////////////// // Drawing Methods //////////////////////////// public: - virtual void draw( QPainter* painter, double scale ) const; - virtual QPainterPath path( double scale ) const; + void draw( QPainter* painter, double scale ) const override; + QPainterPath path( double scale ) const override; }; @@ -176,16 +176,16 @@ namespace glabels //////////////////////////// public: HandleSouthEast( LabelModelObject* owner ); - virtual ~HandleSouthEast(); - virtual HandleSouthEast* clone( LabelModelObject* newOwner ) const; + ~HandleSouthEast() override; + HandleSouthEast* clone( LabelModelObject* newOwner ) const override; //////////////////////////// // Drawing Methods //////////////////////////// public: - virtual void draw( QPainter* painter, double scale ) const; - virtual QPainterPath path( double scale ) const; + void draw( QPainter* painter, double scale ) const override; + QPainterPath path( double scale ) const override; }; @@ -199,16 +199,16 @@ namespace glabels //////////////////////////// public: HandleSouth( LabelModelObject* owner ); - virtual ~HandleSouth(); - virtual HandleSouth* clone( LabelModelObject* newOwner ) const; + ~HandleSouth() override; + HandleSouth* clone( LabelModelObject* newOwner ) const override; //////////////////////////// // Drawing Methods //////////////////////////// public: - virtual void draw( QPainter* painter, double scale ) const; - virtual QPainterPath path( double scale ) const; + void draw( QPainter* painter, double scale ) const override; + QPainterPath path( double scale ) const override; }; @@ -222,16 +222,16 @@ namespace glabels //////////////////////////// public: HandleSouthWest( LabelModelObject* owner ); - virtual ~HandleSouthWest(); - virtual HandleSouthWest* clone( LabelModelObject* newOwner ) const; + ~HandleSouthWest() override; + HandleSouthWest* clone( LabelModelObject* newOwner ) const override; //////////////////////////// // Drawing Methods //////////////////////////// public: - virtual void draw( QPainter* painter, double scale ) const; - virtual QPainterPath path( double scale ) const; + void draw( QPainter* painter, double scale ) const override; + QPainterPath path( double scale ) const override; }; @@ -245,16 +245,16 @@ namespace glabels //////////////////////////// public: HandleWest( LabelModelObject* owner ); - virtual ~HandleWest(); - virtual HandleWest* clone( LabelModelObject* newOwner ) const; + ~HandleWest() override; + HandleWest* clone( LabelModelObject* newOwner ) const override; //////////////////////////// // Drawing Methods //////////////////////////// public: - virtual void draw( QPainter* painter, double scale ) const; - virtual QPainterPath path( double scale ) const; + void draw( QPainter* painter, double scale ) const override; + QPainterPath path( double scale ) const override; }; @@ -268,16 +268,16 @@ namespace glabels //////////////////////////// public: HandleNorthWest( LabelModelObject* owner ); - virtual ~HandleNorthWest(); - virtual HandleNorthWest* clone( LabelModelObject* newOwner ) const; + ~HandleNorthWest() override; + HandleNorthWest* clone( LabelModelObject* newOwner ) const override; //////////////////////////// // Drawing Methods //////////////////////////// public: - virtual void draw( QPainter* painter, double scale ) const; - virtual QPainterPath path( double scale ) const; + void draw( QPainter* painter, double scale ) const override; + QPainterPath path( double scale ) const override; }; @@ -291,16 +291,16 @@ namespace glabels //////////////////////////// public: HandleP1( LabelModelObject* owner ); - virtual ~HandleP1(); - virtual HandleP1* clone( LabelModelObject* newOwner ) const; + ~HandleP1() override; + HandleP1* clone( LabelModelObject* newOwner ) const override; //////////////////////////// // Drawing Methods //////////////////////////// public: - virtual void draw( QPainter* painter, double scale ) const; - virtual QPainterPath path( double scale ) const; + void draw( QPainter* painter, double scale ) const override; + QPainterPath path( double scale ) const override; }; @@ -314,20 +314,20 @@ namespace glabels //////////////////////////// public: HandleP2( LabelModelObject* owner ); - virtual ~HandleP2(); + ~HandleP2() override; //////////////////////////// // Duplication //////////////////////////// - virtual HandleP2* clone( LabelModelObject* newOwner ) const; + HandleP2* clone( LabelModelObject* newOwner ) const override; //////////////////////////// // Drawing Methods //////////////////////////// public: - virtual void draw( QPainter* painter, double scale ) const; - virtual QPainterPath path( double scale ) const; + void draw( QPainter* painter, double scale ) const override; + QPainterPath path( double scale ) const override; }; } diff --git a/glabels/LabelEditor.h b/glabels/LabelEditor.h index 60d997b..e6f2b17 100644 --- a/glabels/LabelEditor.h +++ b/glabels/LabelEditor.h @@ -119,13 +119,13 @@ namespace glabels // Event handlers ///////////////////////////////////// protected: - void resizeEvent( QResizeEvent* event ); - void mousePressEvent( QMouseEvent* event ); - void mouseMoveEvent( QMouseEvent* event ); - void mouseReleaseEvent( QMouseEvent* event ); - void leaveEvent( QEvent* event ); - void keyPressEvent( QKeyEvent* event ); - void paintEvent( QPaintEvent* event ); + void resizeEvent( QResizeEvent* event ) override; + void mousePressEvent( QMouseEvent* event ) override; + void mouseMoveEvent( QMouseEvent* event ) override; + void mouseReleaseEvent( QMouseEvent* event ) override; + void leaveEvent( QEvent* event ) override; + void keyPressEvent( QKeyEvent* event ) override; + void paintEvent( QPaintEvent* event ) override; ///////////////////////////////////// diff --git a/glabels/LabelModel.h b/glabels/LabelModel.h index 98aea41..4a062c5 100644 --- a/glabels/LabelModel.h +++ b/glabels/LabelModel.h @@ -55,7 +55,7 @@ namespace glabels ///////////////////////////////// public: LabelModel(); - virtual ~LabelModel() {} + ~LabelModel() override {} ///////////////////////////////// diff --git a/glabels/LabelModelBoxObject.h b/glabels/LabelModelBoxObject.h index b6f86b3..e3b75da 100644 --- a/glabels/LabelModelBoxObject.h +++ b/glabels/LabelModelBoxObject.h @@ -41,22 +41,22 @@ namespace glabels public: LabelModelBoxObject(); LabelModelBoxObject( const LabelModelBoxObject* object ); - virtual ~LabelModelBoxObject(); + ~LabelModelBoxObject() override; /////////////////////////////////////////////////////////////// // Object duplication /////////////////////////////////////////////////////////////// - virtual LabelModelBoxObject* clone() const; + LabelModelBoxObject* clone() const override; /////////////////////////////////////////////////////////////// // Drawing operations /////////////////////////////////////////////////////////////// protected: - virtual void drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const; - virtual void drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const; - virtual QPainterPath hoverPath( double scale ) const; + void drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const override; + void drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const override; + QPainterPath hoverPath( double scale ) const override; }; diff --git a/glabels/LabelModelEllipseObject.h b/glabels/LabelModelEllipseObject.h index 0a6c777..1ef0b97 100644 --- a/glabels/LabelModelEllipseObject.h +++ b/glabels/LabelModelEllipseObject.h @@ -41,22 +41,22 @@ namespace glabels public: LabelModelEllipseObject(); LabelModelEllipseObject( const LabelModelEllipseObject* object ); - virtual ~LabelModelEllipseObject(); + ~LabelModelEllipseObject() override; /////////////////////////////////////////////////////////////// // Object duplication /////////////////////////////////////////////////////////////// - virtual LabelModelEllipseObject* clone() const; + LabelModelEllipseObject* clone() const override; /////////////////////////////////////////////////////////////// // Drawing operations /////////////////////////////////////////////////////////////// protected: - virtual void drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const; - virtual void drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const; - virtual QPainterPath hoverPath( double scale ) const; + void drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const override; + void drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const override; + QPainterPath hoverPath( double scale ) const override; }; diff --git a/glabels/LabelModelImageObject.h b/glabels/LabelModelImageObject.h index 4927cfe..61b1558 100644 --- a/glabels/LabelModelImageObject.h +++ b/glabels/LabelModelImageObject.h @@ -43,13 +43,13 @@ namespace glabels public: LabelModelImageObject(); LabelModelImageObject( const LabelModelImageObject* object ); - virtual ~LabelModelImageObject(); + ~LabelModelImageObject() override; /////////////////////////////////////////////////////////////// // Object duplication /////////////////////////////////////////////////////////////// - virtual LabelModelImageObject* clone() const; + LabelModelImageObject* clone() const override; /////////////////////////////////////////////////////////////// @@ -59,26 +59,26 @@ namespace glabels // // Image Property: filenameNode // - virtual TextNode filenameNode( void ) const; - virtual void setFilenameNode( const TextNode& value ); + TextNode filenameNode( void ) const override; + void setFilenameNode( const TextNode& value ) override; // // Image Property: image // - virtual const QImage* image() const; - virtual void setImage( const QImage& value ); - virtual void setImage( const QString& name, const QImage& value ); + const QImage* image() const override; + void setImage( const QImage& value ) override; + void setImage( const QString& name, const QImage& value ) override; // // Image Property: svg // - virtual QByteArray svg() const; - virtual void setSvg( const QString& name, const QByteArray& value ); + QByteArray svg() const override; + void setSvg( const QString& name, const QByteArray& value ) override; // // Property: naturalSize // - virtual Size naturalSize() const; + Size naturalSize() const override; /////////////////////////////////////////////////////////////// @@ -90,9 +90,9 @@ namespace glabels // Drawing operations /////////////////////////////////////////////////////////////// protected: - virtual void drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const; - virtual void drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const; - virtual QPainterPath hoverPath( double scale ) const; + void drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const override; + void drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const override; + QPainterPath hoverPath( double scale ) const override; /////////////////////////////////////////////////////////////// diff --git a/glabels/LabelModelLineObject.h b/glabels/LabelModelLineObject.h index 4cc234e..bf2453d 100644 --- a/glabels/LabelModelLineObject.h +++ b/glabels/LabelModelLineObject.h @@ -41,13 +41,13 @@ namespace glabels public: LabelModelLineObject(); LabelModelLineObject( const LabelModelLineObject* object ); - virtual ~LabelModelLineObject(); + ~LabelModelLineObject() override; /////////////////////////////////////////////////////////////// // Object duplication /////////////////////////////////////////////////////////////// - virtual LabelModelLineObject* clone() const; + LabelModelLineObject* clone() const override; /////////////////////////////////////////////////////////////// @@ -57,15 +57,15 @@ namespace glabels // // Line Property: lineWidth // - virtual Distance lineWidth( void ) const; - virtual void setLineWidth( const Distance& value ); + Distance lineWidth( void ) const override; + void setLineWidth( const Distance& value ) override; // // Line Property: lineColorNode // - virtual ColorNode lineColorNode( void ) const; - virtual void setLineColorNode( const ColorNode& value ); + ColorNode lineColorNode( void ) const override; + void setLineColorNode( const ColorNode& value ) override; /////////////////////////////////////////////////////////////// @@ -80,9 +80,9 @@ namespace glabels // Drawing operations /////////////////////////////////////////////////////////////// protected: - virtual void drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const; - virtual void drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const; - virtual QPainterPath hoverPath( double scale ) const; + void drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const override; + void drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const override; + QPainterPath hoverPath( double scale ) const override; /////////////////////////////////////////////////////////////// diff --git a/glabels/LabelModelObject.h b/glabels/LabelModelObject.h index da0fd51..49bd298 100644 --- a/glabels/LabelModelObject.h +++ b/glabels/LabelModelObject.h @@ -59,7 +59,7 @@ namespace glabels LabelModelObject(); LabelModelObject( const LabelModelObject* object ); public: - virtual ~LabelModelObject(); + ~LabelModelObject() override; /////////////////////////////////////////////////////////////// diff --git a/glabels/LabelModelShapeObject.h b/glabels/LabelModelShapeObject.h index e3b6d2a..0966a63 100644 --- a/glabels/LabelModelShapeObject.h +++ b/glabels/LabelModelShapeObject.h @@ -42,7 +42,7 @@ namespace glabels LabelModelShapeObject(); LabelModelShapeObject( const LabelModelShapeObject* object ); public: - virtual ~LabelModelShapeObject(); + ~LabelModelShapeObject() override; /////////////////////////////////////////////////////////////// @@ -52,22 +52,22 @@ namespace glabels // // Shape Property: lineWidth // - virtual Distance lineWidth( void ) const; - virtual void setLineWidth( const Distance& value ); + Distance lineWidth( void ) const override; + void setLineWidth( const Distance& value ) override; // // Shape Property: lineColorNode // - virtual ColorNode lineColorNode( void ) const; - virtual void setLineColorNode( const ColorNode& value ); + ColorNode lineColorNode( void ) const override; + void setLineColorNode( const ColorNode& value ) override; // // Shape Property: fillColorNode // - virtual ColorNode fillColorNode( void ) const; - virtual void setFillColorNode( const ColorNode& value ); + ColorNode fillColorNode( void ) const override; + void setFillColorNode( const ColorNode& value ) override; /////////////////////////////////////////////////////////////// diff --git a/glabels/LabelModelTextObject.h b/glabels/LabelModelTextObject.h index da1d702..6c0a408 100644 --- a/glabels/LabelModelTextObject.h +++ b/glabels/LabelModelTextObject.h @@ -43,13 +43,13 @@ namespace glabels public: LabelModelTextObject(); LabelModelTextObject( const LabelModelTextObject* object ); - virtual ~LabelModelTextObject(); + ~LabelModelTextObject() override; /////////////////////////////////////////////////////////////// // Object duplication /////////////////////////////////////////////////////////////// - virtual LabelModelTextObject* clone() const; + LabelModelTextObject* clone() const override; /////////////////////////////////////////////////////////////// @@ -59,77 +59,77 @@ namespace glabels // // Text Property: text // - virtual QString text() const; - virtual void setText( const QString &value ); + QString text() const override; + void setText( const QString &value ) override; // // Text Property: fontFamily // - virtual QString fontFamily() const; - virtual void setFontFamily( const QString &value ); + QString fontFamily() const override; + void setFontFamily( const QString &value ) override; // // Text Property: fontSize // - virtual double fontSize() const; - virtual void setFontSize( double value ); + double fontSize() const override; + void setFontSize( double value ) override; // // Text Property: fontWeight // - virtual QFont::Weight fontWeight() const; - virtual void setFontWeight( QFont::Weight value ); + QFont::Weight fontWeight() const override; + void setFontWeight( QFont::Weight value ) override; // // Text Property: fontItalicFlag // - virtual bool fontItalicFlag() const; - virtual void setFontItalicFlag( bool value ); + bool fontItalicFlag() const override; + void setFontItalicFlag( bool value ) override; // // Text Property: fontUnderlineFlag // - virtual bool fontUnderlineFlag() const; - virtual void setFontUnderlineFlag( bool value ); + bool fontUnderlineFlag() const override; + void setFontUnderlineFlag( bool value ) override; // // Text Property: textColorNode // - virtual ColorNode textColorNode() const; - virtual void setTextColorNode( const ColorNode &value ); + ColorNode textColorNode() const override; + void setTextColorNode( const ColorNode &value ) override; // // Text Property: textHAlign // - virtual Qt::Alignment textHAlign() const; - virtual void setTextHAlign( Qt::Alignment value ); + Qt::Alignment textHAlign() const override; + void setTextHAlign( Qt::Alignment value ) override; // // Text Property: textVAlign // - virtual Qt::Alignment textVAlign() const; - virtual void setTextVAlign( Qt::Alignment value ); + Qt::Alignment textVAlign() const override; + void setTextVAlign( Qt::Alignment value ) override; // // Text Property: textLineSpacing // - virtual double textLineSpacing() const; - virtual void setTextLineSpacing( double value ); + double textLineSpacing() const override; + void setTextLineSpacing( double value ) override; // // Property: naturalSize // - virtual Size naturalSize() const; + Size naturalSize() const override; /////////////////////////////////////////////////////////////// @@ -143,16 +143,16 @@ namespace glabels // Drawing operations /////////////////////////////////////////////////////////////// protected: - virtual void drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const; - virtual void drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const; - virtual QPainterPath hoverPath( double scale ) const; + void drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const override; + void drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const override; + QPainterPath hoverPath( double scale ) const override; /////////////////////////////////////////////////////////////// // Private methods /////////////////////////////////////////////////////////////// private: - virtual void sizeUpdated(); + void sizeUpdated() override; void update(); void drawTextInEditor( QPainter* painter, const QColor& color ) const; void drawText( QPainter* painter, const QColor&color, merge::Record* record ) const; diff --git a/glabels/MainWindow.h b/glabels/MainWindow.h index c2a9bc4..b804abe 100644 --- a/glabels/MainWindow.h +++ b/glabels/MainWindow.h @@ -61,7 +61,7 @@ namespace glabels ///////////////////////////////////// public: MainWindow(); - virtual ~MainWindow(); + ~MainWindow() override; ///////////////////////////////////// @@ -77,7 +77,7 @@ namespace glabels // Events ///////////////////////////////////// protected: - void closeEvent( QCloseEvent *event ); + void closeEvent( QCloseEvent *event ) override; ///////////////////////////////////// diff --git a/glabels/Markup.h b/glabels/Markup.h index f8a2699..749cd63 100644 --- a/glabels/Markup.h +++ b/glabels/Markup.h @@ -50,7 +50,7 @@ namespace glabels Distance size() const; - Markup* dup() const; + Markup* dup() const override; private: const Frame* mFrame; @@ -71,7 +71,7 @@ namespace glabels Distance x2() const; Distance y2() const; - Markup* dup() const; + Markup* dup() const override; private: Distance mX1; @@ -96,7 +96,7 @@ namespace glabels Distance h() const; Distance r() const; - Markup* dup() const; + Markup* dup() const override; private: Distance mX1; @@ -120,7 +120,7 @@ namespace glabels Distance w() const; Distance h() const; - Markup* dup() const; + Markup* dup() const override; private: Distance mX1; @@ -141,7 +141,7 @@ namespace glabels Distance y0() const; Distance r() const; - Markup* dup() const; + Markup* dup() const override; private: Distance mX0; diff --git a/glabels/Merge/Merge.h b/glabels/Merge/Merge.h index ab5ff98..b50e0f4 100644 --- a/glabels/Merge/Merge.h +++ b/glabels/Merge/Merge.h @@ -52,7 +52,7 @@ namespace glabels Merge(); Merge( const Merge* merge ); public: - virtual ~Merge(); + ~Merge() override; ///////////////////////////////// diff --git a/glabels/Merge/None.h b/glabels/Merge/None.h index 1547002..b82d493 100644 --- a/glabels/Merge/None.h +++ b/glabels/Merge/None.h @@ -42,13 +42,13 @@ namespace glabels public: None(); None( const None* merge ); - virtual ~None(); + ~None() override; ///////////////////////////////// // Object duplication ///////////////////////////////// - None* clone() const; + None* clone() const override; ///////////////////////////////// @@ -63,12 +63,12 @@ namespace glabels // Implementation of virtual methods ///////////////////////////////// public: - QStringList keys() const; - QString primaryKey() const; + QStringList keys() const override; + QString primaryKey() const override; protected: - void open(); - void close(); - Record* readNextRecord(); + void open() override; + void close() override; + Record* readNextRecord() override; }; diff --git a/glabels/Merge/Text.h b/glabels/Merge/Text.h index 3ce9c3c..4f95429 100644 --- a/glabels/Merge/Text.h +++ b/glabels/Merge/Text.h @@ -44,19 +44,19 @@ namespace glabels protected: Text( QChar delimiter, bool line1HasKeys ); Text( const Text* merge ); - virtual ~Text(); + ~Text() override; ///////////////////////////////// // Implementation of virtual methods ///////////////////////////////// public: - QStringList keys() const; - QString primaryKey() const; + QStringList keys() const override; + QString primaryKey() const override; protected: - void open(); - void close(); - Record* readNextRecord(); + void open() override; + void close() override; + Record* readNextRecord() override; ///////////////////////////////// diff --git a/glabels/Merge/TextColon.h b/glabels/Merge/TextColon.h index be07c4d..d58bea1 100644 --- a/glabels/Merge/TextColon.h +++ b/glabels/Merge/TextColon.h @@ -42,14 +42,14 @@ namespace glabels private: TextColon(); TextColon( const TextColon* merge ); - virtual ~TextColon(); + ~TextColon() override; ///////////////////////////////// // Object duplication ///////////////////////////////// public: - TextColon* clone() const; + TextColon* clone() const override; ///////////////////////////////// diff --git a/glabels/Merge/TextColonKeys.h b/glabels/Merge/TextColonKeys.h index 4eeaf61..2dddfba 100644 --- a/glabels/Merge/TextColonKeys.h +++ b/glabels/Merge/TextColonKeys.h @@ -42,14 +42,14 @@ namespace glabels private: TextColonKeys(); TextColonKeys( const TextColonKeys* merge ); - virtual ~TextColonKeys(); + ~TextColonKeys() override; ///////////////////////////////// // Object duplication ///////////////////////////////// public: - TextColonKeys* clone() const; + TextColonKeys* clone() const override; ///////////////////////////////// diff --git a/glabels/Merge/TextCsv.h b/glabels/Merge/TextCsv.h index e1f3cd3..a750cb1 100644 --- a/glabels/Merge/TextCsv.h +++ b/glabels/Merge/TextCsv.h @@ -42,14 +42,14 @@ namespace glabels private: TextCsv(); TextCsv( const TextCsv* merge ); - virtual ~TextCsv(); + ~TextCsv() override; ///////////////////////////////// // Object duplication ///////////////////////////////// public: - TextCsv* clone() const; + TextCsv* clone() const override; ///////////////////////////////// diff --git a/glabels/Merge/TextCsvKeys.h b/glabels/Merge/TextCsvKeys.h index de1a5e3..f8935be 100644 --- a/glabels/Merge/TextCsvKeys.h +++ b/glabels/Merge/TextCsvKeys.h @@ -42,14 +42,14 @@ namespace glabels private: TextCsvKeys(); TextCsvKeys( const TextCsvKeys* merge ); - virtual ~TextCsvKeys(); + ~TextCsvKeys() override; ///////////////////////////////// // Object duplication ///////////////////////////////// public: - TextCsvKeys* clone() const; + TextCsvKeys* clone() const override; ///////////////////////////////// diff --git a/glabels/Merge/TextSemicolon.h b/glabels/Merge/TextSemicolon.h index ae12f46..07c8d06 100644 --- a/glabels/Merge/TextSemicolon.h +++ b/glabels/Merge/TextSemicolon.h @@ -42,14 +42,14 @@ namespace glabels private: TextSemicolon(); TextSemicolon( const TextSemicolon* merge ); - virtual ~TextSemicolon(); + ~TextSemicolon() override; ///////////////////////////////// // Object duplication ///////////////////////////////// public: - TextSemicolon* clone() const; + TextSemicolon* clone() const override; ///////////////////////////////// diff --git a/glabels/Merge/TextSemicolonKeys.h b/glabels/Merge/TextSemicolonKeys.h index e7ed43c..993f9a7 100644 --- a/glabels/Merge/TextSemicolonKeys.h +++ b/glabels/Merge/TextSemicolonKeys.h @@ -42,14 +42,14 @@ namespace glabels private: TextSemicolonKeys(); TextSemicolonKeys( const TextSemicolonKeys* merge ); - virtual ~TextSemicolonKeys(); + ~TextSemicolonKeys() override; ///////////////////////////////// // Object duplication ///////////////////////////////// public: - TextSemicolonKeys* clone() const; + TextSemicolonKeys* clone() const override; ///////////////////////////////// diff --git a/glabels/Merge/TextTsv.h b/glabels/Merge/TextTsv.h index 9e3bbf4..eab05a0 100644 --- a/glabels/Merge/TextTsv.h +++ b/glabels/Merge/TextTsv.h @@ -42,14 +42,14 @@ namespace glabels private: TextTsv(); TextTsv( const TextTsv* merge ); - virtual ~TextTsv(); + ~TextTsv() override; ///////////////////////////////// // Object duplication ///////////////////////////////// public: - TextTsv* clone() const; + TextTsv* clone() const override; ///////////////////////////////// diff --git a/glabels/Merge/TextTsvKeys.h b/glabels/Merge/TextTsvKeys.h index 1c3caec..c26d748 100644 --- a/glabels/Merge/TextTsvKeys.h +++ b/glabels/Merge/TextTsvKeys.h @@ -42,14 +42,14 @@ namespace glabels private: TextTsvKeys(); TextTsvKeys( const TextTsvKeys* merge ); - virtual ~TextTsvKeys(); + ~TextTsvKeys() override; ///////////////////////////////// // Object duplication ///////////////////////////////// public: - TextTsvKeys* clone() const; + TextTsvKeys* clone() const override; ///////////////////////////////// diff --git a/glabels/MergeView.h b/glabels/MergeView.h index 1a0e849..c1df60a 100644 --- a/glabels/MergeView.h +++ b/glabels/MergeView.h @@ -48,7 +48,7 @@ namespace glabels ///////////////////////////////// public: MergeView( QWidget *parent = 0 ); - ~MergeView(); + ~MergeView() override; ///////////////////////////////// diff --git a/glabels/Preview.h b/glabels/Preview.h index 145dd4d..d15f0b0 100644 --- a/glabels/Preview.h +++ b/glabels/Preview.h @@ -63,7 +63,7 @@ namespace glabels // Event handlers ///////////////////////////////////// protected: - void resizeEvent( QResizeEvent* event ); + void resizeEvent( QResizeEvent* event ) override; ///////////////////////////////// diff --git a/glabels/PreviewOverlayItem.h b/glabels/PreviewOverlayItem.h index 5b462c6..f530a4c 100644 --- a/glabels/PreviewOverlayItem.h +++ b/glabels/PreviewOverlayItem.h @@ -49,8 +49,8 @@ namespace glabels // Virtual method implementations ///////////////////////////////////// public: - QRectF boundingRect() const; - void paint( QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget ); + QRectF boundingRect() const override; + void paint( QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget ) override; ///////////////////////////////// diff --git a/glabels/PrintView.h b/glabels/PrintView.h index dea4c83..64c2856 100644 --- a/glabels/PrintView.h +++ b/glabels/PrintView.h @@ -48,7 +48,7 @@ namespace glabels ///////////////////////////////// public: PrintView( QWidget *parent = 0 ); - ~PrintView(); + ~PrintView() override; ///////////////////////////////// diff --git a/glabels/PropertiesView.h b/glabels/PropertiesView.h index f1ee215..a560b18 100644 --- a/glabels/PropertiesView.h +++ b/glabels/PropertiesView.h @@ -48,7 +48,7 @@ namespace glabels ///////////////////////////////// public: PropertiesView( QWidget *parent = 0 ); - ~PropertiesView(); + ~PropertiesView() override; ///////////////////////////////// diff --git a/glabels/SelectProductDialog.h b/glabels/SelectProductDialog.h index 8434606..7e62f95 100644 --- a/glabels/SelectProductDialog.h +++ b/glabels/SelectProductDialog.h @@ -69,7 +69,7 @@ namespace glabels // Events ///////////////////////////////// protected: - void timerEvent(QTimerEvent *event); + void timerEvent(QTimerEvent *event) override; ///////////////////////////////// diff --git a/glabels/SimplePreview.h b/glabels/SimplePreview.h index 9aa2f3c..be7be43 100644 --- a/glabels/SimplePreview.h +++ b/glabels/SimplePreview.h @@ -59,7 +59,7 @@ namespace glabels // Event handlers ///////////////////////////////////// protected: - void resizeEvent( QResizeEvent* event ); + void resizeEvent( QResizeEvent* event ) override; ///////////////////////////////// diff --git a/glabels/UndoRedoModel.h b/glabels/UndoRedoModel.h index 12e259f..5b14b7d 100644 --- a/glabels/UndoRedoModel.h +++ b/glabels/UndoRedoModel.h @@ -47,7 +47,7 @@ namespace glabels ///////////////////////////////// public: UndoRedoModel( LabelModel* model ); - virtual ~UndoRedoModel(); + ~UndoRedoModel() override; /////////////////////////////////