Seth/sethLabels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Use override specifier where apropriate.

Browse Source 
- fixed using clang-tidy's modernize-use-override check.
This commit is contained in:
Jim Evins
2017-03-21 23:36:39 -04:00
parent 9f9ba345cf
commit e09936233a
38 changed files with 202 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glabels/ColorPaletteButtonItem.h
+4 -4
View File
@@ -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;
/////////////////////////////////
glabels/ColorPaletteDialog.h
+1 -1
View File
@@ -80,7 +80,7 @@ namespace glabels
void onComboIndexChanged( int index );
protected:
void showEvent( QShowEvent* event );
void showEvent( QShowEvent* event ) override;
/////////////////////////////////
glabels/ColorPaletteItem.h
+4 -4
View File
@@ -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;
/////////////////////////////////
glabels/FrameCd.h
+8 -8
View File
@@ -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:
glabels/FrameEllipse.h
+8 -8
View File
@@ -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:
glabels/FrameRect.h
+8 -8
View File
@@ -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:
glabels/FrameRound.h
+8 -8
View File
@@ -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:
glabels/Handles.h
+40 -40
View File
@@ -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;
};
}
glabels/LabelEditor.h
+7 -7
View File
@@ -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;
/////////////////////////////////////
glabels/LabelModel.h
+1 -1
View File
@@ -55,7 +55,7 @@ namespace glabels
/////////////////////////////////
public:
LabelModel();
virtual ~LabelModel() {}
~LabelModel() override {}
/////////////////////////////////
glabels/LabelModelBoxObject.h
+5 -5
View File
@@ -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;
};
glabels/LabelModelEllipseObject.h
+5 -5
View File
@@ -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;
};
glabels/LabelModelImageObject.h
+13 -13
View File
@@ -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;
///////////////////////////////////////////////////////////////
glabels/LabelModelLineObject.h
+9 -9
View File
@@ -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;
///////////////////////////////////////////////////////////////
glabels/LabelModelObject.h
+1 -1
View File
@@ -59,7 +59,7 @@ namespace glabels
LabelModelObject();
LabelModelObject( const LabelModelObject* object );
public:
virtual ~LabelModelObject();
~LabelModelObject() override;
///////////////////////////////////////////////////////////////
glabels/LabelModelShapeObject.h
+7 -7
View File
@@ -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;
///////////////////////////////////////////////////////////////
glabels/LabelModelTextObject.h
+27 -27
View File
@@ -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;
glabels/MainWindow.h
+2 -2
View File
@@ -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
+5 -5
View File
@@ -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
+1 -1
View File
@@ -52,7 +52,7 @@ namespace glabels
Merge();
Merge( const Merge* merge );
public:
virtual ~Merge();
~Merge() override;
/////////////////////////////////
glabels/Merge/None.h
+7 -7
View File
@@ -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;
};
glabels/Merge/Text.h
+6 -6
View File
@@ -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;
/////////////////////////////////
glabels/Merge/TextColon.h
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -48,7 +48,7 @@ namespace glabels
/////////////////////////////////
public:
MergeView( QWidget *parent = 0 );
~MergeView();
~MergeView() override;
/////////////////////////////////
glabels/Preview.h
+1 -1
View File
@@ -63,7 +63,7 @@ namespace glabels
// Event handlers
/////////////////////////////////////
protected:
void resizeEvent( QResizeEvent* event );
void resizeEvent( QResizeEvent* event ) override;
/////////////////////////////////
glabels/PreviewOverlayItem.h
+2 -2
View File
@@ -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;
/////////////////////////////////
glabels/PrintView.h
+1 -1
View File
@@ -48,7 +48,7 @@ namespace glabels
/////////////////////////////////
public:
PrintView( QWidget *parent = 0 );
~PrintView();
~PrintView() override;
/////////////////////////////////
glabels/PropertiesView.h
+1 -1
View File
@@ -48,7 +48,7 @@ namespace glabels
/////////////////////////////////
public:
PropertiesView( QWidget *parent = 0 );
~PropertiesView();
~PropertiesView() override;
/////////////////////////////////
glabels/SelectProductDialog.h
+1 -1
View File
@@ -69,7 +69,7 @@ namespace glabels
// Events
/////////////////////////////////
protected:
void timerEvent(QTimerEvent *event);
void timerEvent(QTimerEvent *event) override;
/////////////////////////////////
glabels/SimplePreview.h
+1 -1
View File
@@ -59,7 +59,7 @@ namespace glabels
// Event handlers
/////////////////////////////////////
protected:
void resizeEvent( QResizeEvent* event );
void resizeEvent( QResizeEvent* event ) override;
/////////////////////////////////
glabels/UndoRedoModel.h
+1 -1
View File
@@ -47,7 +47,7 @@ namespace glabels
/////////////////////////////////
public:
UndoRedoModel( LabelModel* model );
virtual ~UndoRedoModel();
~UndoRedoModel() override;
/////////////////////////////////