Use override specifier where apropriate.

- fixed using clang-tidy's modernize-use-override check.

glabels/ColorPaletteButtonItem.h

@@ -54,10 +54,10 @@ namespace glabels
 		// Event handlers
 		/////////////////////////////////
 	protected:
-		void paintEvent( QPaintEvent* event );
+		void paintEvent( QPaintEvent* event ) override;
-		void enterEvent( QEvent* event );
+		void enterEvent( QEvent* event ) override;
-		void leaveEvent( QEvent* event );
+		void leaveEvent( QEvent* event ) override;
-		void mousePressEvent( QMouseEvent* event );
+		void mousePressEvent( QMouseEvent* event ) override;
 
 
 		/////////////////////////////////

glabels/ColorPaletteDialog.h

@@ -80,7 +80,7 @@ namespace glabels
 		void onComboIndexChanged( int index );
 
 	protected:
-		void showEvent( QShowEvent* event );
+		void showEvent( QShowEvent* event ) override;
 	
 
 		/////////////////////////////////

glabels/ColorPaletteItem.h

@@ -66,10 +66,10 @@ namespace glabels
 		// Event handlers
 		/////////////////////////////////
 	protected:
-		void paintEvent( QPaintEvent* event );
+		void paintEvent( QPaintEvent* event ) override;
-		void enterEvent( QEvent* event );
+		void enterEvent( QEvent* event ) override;
-		void leaveEvent( QEvent* event );
+		void leaveEvent( QEvent* event ) override;
-		void mousePressEvent( QMouseEvent* event );
+		void mousePressEvent( QMouseEvent* event ) override;
 
 
 		/////////////////////////////////

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 w() const override;
-		Distance h() const;
+		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& path() const override;
-		const QPainterPath& clipPath() const;
+		const QPainterPath& clipPath() const override;
-		QPainterPath marginPath( const Distance& size ) const;
+		QPainterPath marginPath( const Distance& size ) const override;
 
 
 	private:

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 w() const override;
-		Distance h() const;
+		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& path() const override;
-		const QPainterPath& clipPath() const;
+		const QPainterPath& clipPath() const override;
-		QPainterPath marginPath( const Distance& size ) const;
+		QPainterPath marginPath( const Distance& size ) const override;
 
 
 	private:

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 w() const override;
-		Distance h() const;
+		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& path() const override;
-		const QPainterPath& clipPath() const;
+		const QPainterPath& clipPath() const override;
-		QPainterPath marginPath( const Distance& size ) const;
+		QPainterPath marginPath( const Distance& size ) const override;
 
 
 	private:

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 w() const override;
-		Distance h() const;
+		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& path() const override;
-		const QPainterPath& clipPath() const;
+		const QPainterPath& clipPath() const override;
-		QPainterPath marginPath( const Distance& size ) const;
+		QPainterPath marginPath( const Distance& size ) const override;
 
 
 	private:

glabels/Handles.h

@@ -107,16 +107,16 @@ namespace glabels
 		////////////////////////////
 	public:
 		HandleNorth( LabelModelObject* owner );
-		virtual ~HandleNorth();
+		~HandleNorth() override;
-		virtual HandleNorth* clone( LabelModelObject* newOwner ) const;
+		HandleNorth* clone( LabelModelObject* newOwner ) const override;
 
 
 		////////////////////////////
 		// Drawing Methods
 		////////////////////////////
 	public:
-		virtual void  draw( QPainter* painter, double scale ) const;
+		void  draw( QPainter* painter, double scale ) const override;
-		virtual QPainterPath path( double scale ) const;
+		QPainterPath path( double scale ) const override;
 	};
 
 
@@ -130,16 +130,16 @@ namespace glabels
 		////////////////////////////
 	public:
 		HandleNorthEast( LabelModelObject* owner );
-		virtual ~HandleNorthEast();
+		~HandleNorthEast() override;
-		virtual HandleNorthEast* clone( LabelModelObject* newOwner ) const;
+		HandleNorthEast* clone( LabelModelObject* newOwner ) const override;
 
 
 		////////////////////////////
 		// Drawing Methods
 		////////////////////////////
 	public:
-		virtual void  draw( QPainter* painter, double scale ) const;
+		void  draw( QPainter* painter, double scale ) const override;
-		virtual QPainterPath path( double scale ) const;
+		QPainterPath path( double scale ) const override;
 	};
 
 
@@ -153,16 +153,16 @@ namespace glabels
 		////////////////////////////
 	public:
 		HandleEast( LabelModelObject* owner );
-		virtual ~HandleEast();
+		~HandleEast() override;
-		virtual HandleEast* clone( LabelModelObject* newOwner ) const;
+		HandleEast* clone( LabelModelObject* newOwner ) const override;
 
 
 		////////////////////////////
 		// Drawing Methods
 		////////////////////////////
 	public:
-		virtual void  draw( QPainter* painter, double scale ) const;
+		void  draw( QPainter* painter, double scale ) const override;
-		virtual QPainterPath path( double scale ) const;
+		QPainterPath path( double scale ) const override;
 	};
 
 
@@ -176,16 +176,16 @@ namespace glabels
 		////////////////////////////
 	public:
 		HandleSouthEast( LabelModelObject* owner );
-		virtual ~HandleSouthEast();
+		~HandleSouthEast() override;
-		virtual HandleSouthEast* clone( LabelModelObject* newOwner ) const;
+		HandleSouthEast* clone( LabelModelObject* newOwner ) const override;
 
 
 		////////////////////////////
 		// Drawing Methods
 		////////////////////////////
 	public:
-		virtual void  draw( QPainter* painter, double scale ) const;
+		void  draw( QPainter* painter, double scale ) const override;
-		virtual QPainterPath path( double scale ) const;
+		QPainterPath path( double scale ) const override;
 	};
 
 
@@ -199,16 +199,16 @@ namespace glabels
 		////////////////////////////
 	public:
 		HandleSouth( LabelModelObject* owner );
-		virtual ~HandleSouth();
+		~HandleSouth() override;
-		virtual HandleSouth* clone( LabelModelObject* newOwner ) const;
+		HandleSouth* clone( LabelModelObject* newOwner ) const override;
 
 
 		////////////////////////////
 		// Drawing Methods
 		////////////////////////////
 	public:
-		virtual void  draw( QPainter* painter, double scale ) const;
+		void  draw( QPainter* painter, double scale ) const override;
-		virtual QPainterPath path( double scale ) const;
+		QPainterPath path( double scale ) const override;
 	};
 
 
@@ -222,16 +222,16 @@ namespace glabels
 		////////////////////////////
 	public:
 		HandleSouthWest( LabelModelObject* owner );
-		virtual ~HandleSouthWest();
+		~HandleSouthWest() override;
-		virtual HandleSouthWest* clone( LabelModelObject* newOwner ) const;
+		HandleSouthWest* clone( LabelModelObject* newOwner ) const override;
 
 
 		////////////////////////////
 		// Drawing Methods
 		////////////////////////////
 	public:
-		virtual void  draw( QPainter* painter, double scale ) const;
+		void  draw( QPainter* painter, double scale ) const override;
-		virtual QPainterPath path( double scale ) const;
+		QPainterPath path( double scale ) const override;
 	};
 
 
@@ -245,16 +245,16 @@ namespace glabels
 		////////////////////////////
 	public:
 		HandleWest( LabelModelObject* owner );
-		virtual ~HandleWest();
+		~HandleWest() override;
-		virtual HandleWest* clone( LabelModelObject* newOwner ) const;
+		HandleWest* clone( LabelModelObject* newOwner ) const override;
 
 
 		////////////////////////////
 		// Drawing Methods
 		////////////////////////////
 	public:
-		virtual void  draw( QPainter* painter, double scale ) const;
+		void  draw( QPainter* painter, double scale ) const override;
-		virtual QPainterPath path( double scale ) const;
+		QPainterPath path( double scale ) const override;
 	};
 
 
@@ -268,16 +268,16 @@ namespace glabels
 		////////////////////////////
 	public:
 		HandleNorthWest( LabelModelObject* owner );
-		virtual ~HandleNorthWest();
+		~HandleNorthWest() override;
-		virtual HandleNorthWest* clone( LabelModelObject* newOwner ) const;
+		HandleNorthWest* clone( LabelModelObject* newOwner ) const override;
 
 
 		////////////////////////////
 		// Drawing Methods
 		////////////////////////////
 	public:
-		virtual void  draw( QPainter* painter, double scale ) const;
+		void  draw( QPainter* painter, double scale ) const override;
-		virtual QPainterPath path( double scale ) const;
+		QPainterPath path( double scale ) const override;
 	};
 
 
@@ -291,16 +291,16 @@ namespace glabels
 		////////////////////////////
 	public:
 		HandleP1( LabelModelObject* owner );
-		virtual ~HandleP1();
+		~HandleP1() override;
-		virtual HandleP1* clone( LabelModelObject* newOwner ) const;
+		HandleP1* clone( LabelModelObject* newOwner ) const override;
 
 
 		////////////////////////////
 		// Drawing Methods
 		////////////////////////////
 	public:
-		virtual void  draw( QPainter* painter, double scale ) const;
+		void  draw( QPainter* painter, double scale ) const override;
-		virtual QPainterPath path( double scale ) const;
+		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;
+		void  draw( QPainter* painter, double scale ) const override;
-		virtual QPainterPath path( double scale ) const;
+		QPainterPath path( double scale ) const override;
 	};
 
 }

glabels/LabelEditor.h

@@ -119,13 +119,13 @@ namespace glabels
 		// Event handlers
 		/////////////////////////////////////
 	protected:
-		void resizeEvent( QResizeEvent* event );
+		void resizeEvent( QResizeEvent* event ) override;
-		void mousePressEvent( QMouseEvent* event );
+		void mousePressEvent( QMouseEvent* event ) override;
-		void mouseMoveEvent( QMouseEvent* event );
+		void mouseMoveEvent( QMouseEvent* event ) override;
-		void mouseReleaseEvent( QMouseEvent* event );
+		void mouseReleaseEvent( QMouseEvent* event ) override;
-		void leaveEvent( QEvent* event );
+		void leaveEvent( QEvent* event ) override;
-		void keyPressEvent( QKeyEvent* event );
+		void keyPressEvent( QKeyEvent* event ) override;
-		void paintEvent( QPaintEvent* event );
+		void paintEvent( QPaintEvent* event ) override;
 
 
 		/////////////////////////////////////

glabels/LabelModel.h

@@ -55,7 +55,7 @@ namespace glabels
 		/////////////////////////////////
 	public:
 		LabelModel();
-		virtual ~LabelModel() {}
+		~LabelModel() override {}
 
 	
 		/////////////////////////////////

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;
+		void drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const override;
-		virtual void drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const;
+		void drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const override;
-		virtual QPainterPath hoverPath( double scale ) const;
+		QPainterPath hoverPath( double scale ) const override;
 
 	};
 

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;
+		void drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const override;
-		virtual void drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const;
+		void drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const override;
-		virtual QPainterPath hoverPath( double scale ) const;
+		QPainterPath hoverPath( double scale ) const override;
 
 	};
 

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;
+		TextNode filenameNode( void ) const override;
-		virtual void setFilenameNode( const TextNode& value );
+		void setFilenameNode( const TextNode& value ) override;
 
 		//
 		// Image Property: image
 		//
-		virtual const QImage* image() const;
+		const QImage* image() const override;
-		virtual void setImage( const QImage& value );
+		void setImage( const QImage& value ) override;
-		virtual void setImage( const QString& name, const QImage& value );
+		void setImage( const QString& name, const QImage& value ) override;
 
 		//
 		// Image Property: svg
 		//
-		virtual QByteArray svg() const;
+		QByteArray svg() const override;
-		virtual void setSvg( const QString& name, const QByteArray& value );
+		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;
+		void drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const override;
-		virtual void drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const;
+		void drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const override;
-		virtual QPainterPath hoverPath( double scale ) const;
+		QPainterPath hoverPath( double scale ) const override;
 
 
 		///////////////////////////////////////////////////////////////

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;
+		Distance lineWidth( void ) const override;
-		virtual void setLineWidth( const Distance& value );
+		void setLineWidth( const Distance& value ) override;
 
 
 		//
 		// Line Property: lineColorNode
 		//
-		virtual ColorNode lineColorNode( void ) const;
+		ColorNode lineColorNode( void ) const override;
-		virtual void setLineColorNode( const ColorNode& value );
+		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;
+		void drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const override;
-		virtual void drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const;
+		void drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const override;
-		virtual QPainterPath hoverPath( double scale ) const;
+		QPainterPath hoverPath( double scale ) const override;
 
 
 		///////////////////////////////////////////////////////////////

glabels/LabelModelObject.h

@@ -59,7 +59,7 @@ namespace glabels
 		LabelModelObject();
 		LabelModelObject( const LabelModelObject* object );
 	public:
-		virtual ~LabelModelObject();
+		~LabelModelObject() override;
 
 
 		///////////////////////////////////////////////////////////////

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;
+		Distance lineWidth( void ) const override;
-		virtual void setLineWidth( const Distance& value );
+		void setLineWidth( const Distance& value ) override;
 
 
 		//
 		// Shape Property: lineColorNode
 		//
-		virtual ColorNode lineColorNode( void ) const;
+		ColorNode lineColorNode( void ) const override;
-		virtual void setLineColorNode( const ColorNode& value );
+		void setLineColorNode( const ColorNode& value ) override;
 		
 
 		//
 		// Shape Property: fillColorNode
 		//
-		virtual ColorNode fillColorNode( void ) const;
+		ColorNode fillColorNode( void ) const override;
-		virtual void setFillColorNode( const ColorNode& value );
+		void setFillColorNode( const ColorNode& value ) override;
 		
 
 		///////////////////////////////////////////////////////////////

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;
+		QString text() const override;
-		virtual void setText( const QString &value );
+		void setText( const QString &value ) override;
 
 
 		//
 		// Text Property: fontFamily
 		//
-		virtual QString fontFamily() const;
+		QString fontFamily() const override;
-		virtual void setFontFamily( const QString &value );
+		void setFontFamily( const QString &value ) override;
 
 
 		//
 		// Text Property: fontSize
 		//
-		virtual double fontSize() const;
+		double fontSize() const override;
-		virtual void setFontSize( double value );
+		void setFontSize( double value ) override;
 
 
 		//
 		// Text Property: fontWeight
 		//
-		virtual QFont::Weight fontWeight() const;
+		QFont::Weight fontWeight() const override;
-		virtual void setFontWeight( QFont::Weight value );
+		void setFontWeight( QFont::Weight value ) override;
 
 
 		//
 		// Text Property: fontItalicFlag
 		//
-		virtual bool fontItalicFlag() const;
+		bool fontItalicFlag() const override;
-		virtual void setFontItalicFlag( bool value );
+		void setFontItalicFlag( bool value ) override;
 
 
 		//
 		// Text Property: fontUnderlineFlag
 		//
-		virtual bool fontUnderlineFlag() const;
+		bool fontUnderlineFlag() const override;
-		virtual void setFontUnderlineFlag( bool value );
+		void setFontUnderlineFlag( bool value ) override;
 
 
 		//
 		// Text Property: textColorNode
 		//
-		virtual ColorNode textColorNode() const;
+		ColorNode textColorNode() const override;
-		virtual void setTextColorNode( const ColorNode &value );
+		void setTextColorNode( const ColorNode &value ) override;
 		
 
 		//
 		// Text Property: textHAlign
 		//
-		virtual Qt::Alignment textHAlign() const;
+		Qt::Alignment textHAlign() const override;
-		virtual void setTextHAlign( Qt::Alignment value );
+		void setTextHAlign( Qt::Alignment value ) override;
 
 
 		//
 		// Text Property: textVAlign
 		//
-		virtual Qt::Alignment textVAlign() const;
+		Qt::Alignment textVAlign() const override;
-		virtual void setTextVAlign( Qt::Alignment value );
+		void setTextVAlign( Qt::Alignment value ) override;
 
 
 		//
 		// Text Property: textLineSpacing
 		//
-		virtual double textLineSpacing() const;
+		double textLineSpacing() const override;
-		virtual void setTextLineSpacing( double value );
+		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;
+		void drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const override;
-		virtual void drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const;
+		void drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const override;
-		virtual QPainterPath hoverPath( double scale ) const;
+		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;

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;
 
 
 		/////////////////////////////////////

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;

glabels/Merge/Merge.h

@@ -52,7 +52,7 @@ namespace glabels
 			Merge();
 			Merge( const Merge* merge );
 		public:
-			virtual ~Merge();
+			~Merge() override;
 
 
 			/////////////////////////////////

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;
+			QStringList keys() const override;
-			QString primaryKey() const;
+			QString primaryKey() const override;
 		protected:
-			void open();
+			void open() override;
-			void close();
+			void close() override;
-			Record* readNextRecord();
+			Record* readNextRecord() override;
 		
 		};
 

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;
+			QStringList keys() const override;
-			QString primaryKey() const;
+			QString primaryKey() const override;
 		protected:
-			void open();
+			void open() override;
-			void close();
+			void close() override;
-			Record* readNextRecord();
+			Record* readNextRecord() override;
 
 
 			/////////////////////////////////

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;
 
 
 			/////////////////////////////////

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;
 
 
 			/////////////////////////////////

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;
 
 
 			/////////////////////////////////

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;
 
 
 			/////////////////////////////////

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;
 
 
 			/////////////////////////////////

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;
 
 
 			/////////////////////////////////

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;
 
 
 			/////////////////////////////////

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;
 
 
 			/////////////////////////////////

glabels/MergeView.h

@@ -48,7 +48,7 @@ namespace glabels
 		/////////////////////////////////
 	public:
 		MergeView( QWidget *parent = 0 );
-		~MergeView();
+		~MergeView() override;
 
 
 		/////////////////////////////////

glabels/Preview.h

@@ -63,7 +63,7 @@ namespace glabels
 		// Event handlers
 		/////////////////////////////////////
 	protected:
-		void resizeEvent( QResizeEvent* event );
+		void resizeEvent( QResizeEvent* event ) override;
 
 		
 		/////////////////////////////////

glabels/PreviewOverlayItem.h

@@ -49,8 +49,8 @@ namespace glabels
 		// Virtual method implementations
 		/////////////////////////////////////
 	public:
-		QRectF boundingRect() const;
+		QRectF boundingRect() const override;
-		void paint( QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget );
+		void paint( QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget ) override;
 
 		
 		/////////////////////////////////

glabels/PrintView.h

@@ -48,7 +48,7 @@ namespace glabels
 		/////////////////////////////////
 	public:
 		PrintView( QWidget *parent = 0 );
-		~PrintView();
+		~PrintView() override;
 
 
 		/////////////////////////////////

glabels/PropertiesView.h

@@ -48,7 +48,7 @@ namespace glabels
 		/////////////////////////////////
 	public:
 		PropertiesView( QWidget *parent = 0 );
-		~PropertiesView();
+		~PropertiesView() override;
 
 
 		/////////////////////////////////

glabels/SelectProductDialog.h

@@ -69,7 +69,7 @@ namespace glabels
 		// Events
 		/////////////////////////////////
 	protected:
-		void timerEvent(QTimerEvent *event);
+		void timerEvent(QTimerEvent *event) override;
 
 
 		/////////////////////////////////

glabels/SimplePreview.h

@@ -59,7 +59,7 @@ namespace glabels
 		// Event handlers
 		/////////////////////////////////////
 	protected:
-		void resizeEvent( QResizeEvent* event );
+		void resizeEvent( QResizeEvent* event ) override;
 
 		
 		/////////////////////////////////

glabels/UndoRedoModel.h

@@ -47,7 +47,7 @@ namespace glabels
 		/////////////////////////////////
 	public:
 		UndoRedoModel( LabelModel* model );
-		virtual ~UndoRedoModel();
+		~UndoRedoModel() override;
 
 
 		/////////////////////////////////