diff --git a/sources/ElementsCollection/elementcollectionhandler.h b/sources/ElementsCollection/elementcollectionhandler.h index bde54ffc6..34f5de0dd 100644 --- a/sources/ElementsCollection/elementcollectionhandler.h +++ b/sources/ElementsCollection/elementcollectionhandler.h @@ -45,7 +45,7 @@ class ECHSFileToFile : public ECHStrategy { public: ECHSFileToFile (ElementsLocation &source, ElementsLocation &destination); - ElementsLocation copy(); + ElementsLocation copy() override; private: ElementsLocation copyDirectory(ElementsLocation &source, ElementsLocation &destination, QString rename = QString()); @@ -60,7 +60,7 @@ class ECHSXmlToFile : public ECHStrategy { public: ECHSXmlToFile (ElementsLocation &source, ElementsLocation &destination); - ElementsLocation copy(); + ElementsLocation copy() override; private: ElementsLocation copyDirectory(ElementsLocation &source, ElementsLocation &destination, QString rename = QString()); @@ -76,7 +76,7 @@ class ECHSToXml : public ECHStrategy { public: ECHSToXml (ElementsLocation &source, ElementsLocation &destination); - ElementsLocation copy(); + ElementsLocation copy() override; }; /** diff --git a/sources/ElementsCollection/elementcollectionitem.h b/sources/ElementsCollection/elementcollectionitem.h index 2243be6b1..13253ce29 100644 --- a/sources/ElementsCollection/elementcollectionitem.h +++ b/sources/ElementsCollection/elementcollectionitem.h @@ -32,7 +32,7 @@ class ElementCollectionItem : public QStandardItem ElementCollectionItem(); enum {Type = UserType+1}; - virtual int type() const { return Type; } + int type() const override { return Type; } virtual bool isDir() const = 0; virtual bool isElement() const = 0; diff --git a/sources/ElementsCollection/elementscollectionmodel.h b/sources/ElementsCollection/elementscollectionmodel.h index cc92b59a8..1e18f7a0e 100644 --- a/sources/ElementsCollection/elementscollectionmodel.h +++ b/sources/ElementsCollection/elementscollectionmodel.h @@ -35,11 +35,11 @@ class ElementsCollectionModel : public QStandardItemModel public: ElementsCollectionModel(QObject *parent = Q_NULLPTR); - virtual QVariant data(const QModelIndex &index, int role) const; - virtual QMimeData *mimeData(const QModelIndexList &indexes) const; - virtual QStringList mimeTypes() const; - virtual bool canDropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) const; - virtual bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent); + QVariant data(const QModelIndex &index, int role) const override; + QMimeData *mimeData(const QModelIndexList &indexes) const override; + QStringList mimeTypes() const override; + bool canDropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) const override; + bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override; void loadCollections(bool common_collection, bool custom_collection, QList projects); diff --git a/sources/ElementsCollection/elementscollectionwidget.h b/sources/ElementsCollection/elementscollectionwidget.h index 12e2b042d..75a90796f 100644 --- a/sources/ElementsCollection/elementscollectionwidget.h +++ b/sources/ElementsCollection/elementscollectionwidget.h @@ -54,7 +54,7 @@ class ElementsCollectionWidget : public QWidget void setCurrentLocation(const ElementsLocation &location); protected: - virtual void leaveEvent(QEvent *event); + void leaveEvent(QEvent *event) override; private: void setUpAction(); diff --git a/sources/ElementsCollection/elementstreeview.h b/sources/ElementsCollection/elementstreeview.h index 94b549810..e3cfb0176 100644 --- a/sources/ElementsCollection/elementstreeview.h +++ b/sources/ElementsCollection/elementstreeview.h @@ -34,7 +34,7 @@ class ElementsTreeView : public QTreeView ElementsTreeView(QWidget *parent = nullptr); protected: - virtual void startDrag(Qt::DropActions supportedActions); + void startDrag(Qt::DropActions supportedActions) override; virtual void startElementDrag(const ElementsLocation &location); }; diff --git a/sources/ElementsCollection/fileelementcollectionitem.h b/sources/ElementsCollection/fileelementcollectionitem.h index 7374827da..985f422a4 100644 --- a/sources/ElementsCollection/fileelementcollectionitem.h +++ b/sources/ElementsCollection/fileelementcollectionitem.h @@ -31,24 +31,24 @@ class FileElementCollectionItem : public ElementCollectionItem FileElementCollectionItem(); enum { Type = UserType+2 }; - virtual int type() const { return Type;} + int type() const override { return Type;} bool setRootPath(QString path, bool set_data = true, bool hide_element = false); QString fileSystemPath() const; QString dirPath() const; - virtual bool isDir() const; - virtual bool isElement() const; - virtual QString localName(); - virtual QString name() const; - virtual QString collectionPath() const; - virtual bool isCollectionRoot() const; + bool isDir() const override; + bool isElement() const override; + QString localName() override; + QString name() const override; + QString collectionPath() const override; + bool isCollectionRoot() const override; bool isCommonCollection() const; bool isCustomCollection() const; - virtual void addChildAtPath(const QString &collection_name); + void addChildAtPath(const QString &collection_name) override; - void setUpData(); - void setUpIcon(); + void setUpData() override; + void setUpIcon() override; void hire(); diff --git a/sources/ElementsCollection/ui/renamedialog.h b/sources/ElementsCollection/ui/renamedialog.h index 409c776d4..6223fc00c 100644 --- a/sources/ElementsCollection/ui/renamedialog.h +++ b/sources/ElementsCollection/ui/renamedialog.h @@ -31,7 +31,7 @@ class RenameDialog : public QDialog public: explicit RenameDialog(QString path, QWidget *parent = nullptr); - ~RenameDialog(); + ~RenameDialog() override; QString newName() const {return m_new_name;} QET::Action selectedAction() const {return m_action;} diff --git a/sources/ElementsCollection/xmlprojectelementcollectionitem.h b/sources/ElementsCollection/xmlprojectelementcollectionitem.h index eb614faa9..59ca18f86 100644 --- a/sources/ElementsCollection/xmlprojectelementcollectionitem.h +++ b/sources/ElementsCollection/xmlprojectelementcollectionitem.h @@ -33,21 +33,21 @@ class XmlProjectElementCollectionItem : public ElementCollectionItem XmlProjectElementCollectionItem(); enum {Type = UserType+3}; - virtual int type() const { return Type; } + int type() const override { return Type; } - virtual bool isDir() const; - virtual bool isElement() const; - virtual QString localName(); - virtual QString name() const; - virtual QString collectionPath() const; + bool isDir() const override; + bool isElement() const override; + QString localName() override; + QString name() const override; + QString collectionPath() const override; virtual QString embeddedPath() const; - virtual bool isCollectionRoot() const; - virtual void addChildAtPath(const QString &collection_name); + bool isCollectionRoot() const override; + void addChildAtPath(const QString &collection_name) override; QETProject * project() const; void setProject (QETProject *project, bool set_data = true, bool hide_element = false); - void setUpData(); - void setUpIcon(); + void setUpData() override; + void setUpIcon() override; private: void populate(bool set_data = true, bool hide_element = false); diff --git a/sources/PropertiesEditor/propertieseditordockwidget.h b/sources/PropertiesEditor/propertieseditordockwidget.h index b673fdea9..a5b62d36b 100644 --- a/sources/PropertiesEditor/propertieseditordockwidget.h +++ b/sources/PropertiesEditor/propertieseditordockwidget.h @@ -32,7 +32,7 @@ class PropertiesEditorDockWidget : public QDockWidget public: explicit PropertiesEditorDockWidget(QWidget *parent = nullptr); - ~PropertiesEditorDockWidget(); + ~PropertiesEditorDockWidget() override; virtual void clear(); virtual void apply(); diff --git a/sources/QPropertyUndoCommand/qpropertyundocommand.h b/sources/QPropertyUndoCommand/qpropertyundocommand.h index b8db96239..90b46df58 100644 --- a/sources/QPropertyUndoCommand/qpropertyundocommand.h +++ b/sources/QPropertyUndoCommand/qpropertyundocommand.h @@ -39,10 +39,10 @@ class QPropertyUndoCommand : public QUndoCommand void setNewValue(const QVariant &new_value); void enableAnimation (bool animate = true); - int id() const{return 10000;} - virtual bool mergeWith(const QUndoCommand *other); - void redo(); - void undo(); + int id() const override{return 10000;} + bool mergeWith(const QUndoCommand *other) override; + void redo() override; + void undo() override; private: QObject *m_object; diff --git a/sources/QetGraphicsItemModeler/qetgraphicshandleritem.h b/sources/QetGraphicsItemModeler/qetgraphicshandleritem.h index 9cf6646ce..6ba2a2677 100644 --- a/sources/QetGraphicsItemModeler/qetgraphicshandleritem.h +++ b/sources/QetGraphicsItemModeler/qetgraphicshandleritem.h @@ -31,15 +31,15 @@ class QetGraphicsHandlerItem : public QGraphicsItem { public: QetGraphicsHandlerItem(qreal size = 15); - virtual QRectF boundingRect() const; + QRectF boundingRect() const override; enum { Type = UserType + 1200}; - virtual int type() const {return Type;} + int type() const override {return Type;} void setColor(QColor color); protected: - virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; private: qreal m_size, diff --git a/sources/aboutqet.h b/sources/aboutqet.h index f5ffb674f..3da62609a 100644 --- a/sources/aboutqet.h +++ b/sources/aboutqet.h @@ -28,7 +28,7 @@ class AboutQET : public QDialog { // constructors, destructor public: AboutQET(QWidget * = nullptr); - virtual ~AboutQET(); + ~AboutQET() override; private: AboutQET(AboutQET &); diff --git a/sources/autoNum/numerotationcontextcommands.h b/sources/autoNum/numerotationcontextcommands.h index 643b93a18..4bd71a080 100644 --- a/sources/autoNum/numerotationcontextcommands.h +++ b/sources/autoNum/numerotationcontextcommands.h @@ -64,99 +64,99 @@ class UnitNum: public NumStrategy { public: UnitNum (Diagram *); - QString toRepresentedString(const QString) const; - NumerotationContext next (const NumerotationContext &, const int) const; - NumerotationContext previous (const NumerotationContext &, const int) const; + QString toRepresentedString(const QString) const override; + NumerotationContext next (const NumerotationContext &, const int) const override; + NumerotationContext previous (const NumerotationContext &, const int) const override; }; class UnitFNum: public NumStrategy { public: UnitFNum (Diagram *); - QString toRepresentedString(const QString) const; - NumerotationContext next (const NumerotationContext &, const int) const; - NumerotationContext previous (const NumerotationContext &, const int) const; + QString toRepresentedString(const QString) const override; + NumerotationContext next (const NumerotationContext &, const int) const override; + NumerotationContext previous (const NumerotationContext &, const int) const override; }; class TenNum: public NumStrategy { public: TenNum (Diagram *); - QString toRepresentedString(const QString) const; - NumerotationContext next (const NumerotationContext &, const int) const; - NumerotationContext previous (const NumerotationContext &, const int) const; + QString toRepresentedString(const QString) const override; + NumerotationContext next (const NumerotationContext &, const int) const override; + NumerotationContext previous (const NumerotationContext &, const int) const override; }; class TenFNum: public NumStrategy { public: TenFNum (Diagram *); - QString toRepresentedString(const QString) const; - NumerotationContext next (const NumerotationContext &, const int) const; - NumerotationContext previous (const NumerotationContext &, const int) const; + QString toRepresentedString(const QString) const override; + NumerotationContext next (const NumerotationContext &, const int) const override; + NumerotationContext previous (const NumerotationContext &, const int) const override; }; class HundredNum: public NumStrategy { public: HundredNum (Diagram *); - QString toRepresentedString(const QString) const; - NumerotationContext next (const NumerotationContext &, const int) const; - NumerotationContext previous (const NumerotationContext &, const int) const; + QString toRepresentedString(const QString) const override; + NumerotationContext next (const NumerotationContext &, const int) const override; + NumerotationContext previous (const NumerotationContext &, const int) const override; }; class HundredFNum: public NumStrategy { public: HundredFNum (Diagram *); - QString toRepresentedString(const QString) const; - NumerotationContext next (const NumerotationContext &, const int) const; - NumerotationContext previous (const NumerotationContext &, const int) const; + QString toRepresentedString(const QString) const override; + NumerotationContext next (const NumerotationContext &, const int) const override; + NumerotationContext previous (const NumerotationContext &, const int) const override; }; class StringNum: public NumStrategy { public: StringNum (Diagram *); - QString toRepresentedString(const QString) const; - NumerotationContext next (const NumerotationContext &, const int) const; - NumerotationContext previous (const NumerotationContext &, const int) const; + QString toRepresentedString(const QString) const override; + NumerotationContext next (const NumerotationContext &, const int) const override; + NumerotationContext previous (const NumerotationContext &, const int) const override; }; class IdFolioNum: public NumStrategy { public: IdFolioNum (Diagram *); - QString toRepresentedString(const QString) const; - NumerotationContext next (const NumerotationContext &, const int) const; - NumerotationContext previous (const NumerotationContext &, const int) const; + QString toRepresentedString(const QString) const override; + NumerotationContext next (const NumerotationContext &, const int) const override; + NumerotationContext previous (const NumerotationContext &, const int) const override; }; class FolioNum: public NumStrategy { public: FolioNum (Diagram *); - QString toRepresentedString(const QString) const; - NumerotationContext next (const NumerotationContext &, const int) const; - NumerotationContext previous (const NumerotationContext &, const int) const; + QString toRepresentedString(const QString) const override; + NumerotationContext next (const NumerotationContext &, const int) const override; + NumerotationContext previous (const NumerotationContext &, const int) const override; }; class MachineNum: public NumStrategy { public: MachineNum (Diagram *); - QString toRepresentedString(const QString) const; - NumerotationContext next (const NumerotationContext &, const int) const; - NumerotationContext previous (const NumerotationContext &, const int) const; + QString toRepresentedString(const QString) const override; + NumerotationContext next (const NumerotationContext &, const int) const override; + NumerotationContext previous (const NumerotationContext &, const int) const override; }; class LocmachNum: public NumStrategy { public: LocmachNum (Diagram *); - QString toRepresentedString(const QString) const; - NumerotationContext next (const NumerotationContext &, const int) const; - NumerotationContext previous (const NumerotationContext &, const int) const; + QString toRepresentedString(const QString) const override; + NumerotationContext next (const NumerotationContext &, const int) const override; + NumerotationContext previous (const NumerotationContext &, const int) const override; }; @@ -164,27 +164,27 @@ class ElementLineNum: public NumStrategy { public: ElementLineNum (Diagram *); - QString toRepresentedString(const QString) const; - NumerotationContext next (const NumerotationContext &, const int) const; - NumerotationContext previous (const NumerotationContext &, const int) const; + QString toRepresentedString(const QString) const override; + NumerotationContext next (const NumerotationContext &, const int) const override; + NumerotationContext previous (const NumerotationContext &, const int) const override; }; class ElementColumnNum: public NumStrategy { public: ElementColumnNum (Diagram *); - QString toRepresentedString(const QString) const; - NumerotationContext next (const NumerotationContext &, const int) const; - NumerotationContext previous (const NumerotationContext &, const int) const; + QString toRepresentedString(const QString) const override; + NumerotationContext next (const NumerotationContext &, const int) const override; + NumerotationContext previous (const NumerotationContext &, const int) const override; }; class ElementPrefixNum: public NumStrategy { public: ElementPrefixNum (Diagram *); - QString toRepresentedString(const QString) const; - NumerotationContext next (const NumerotationContext &, const int) const; - NumerotationContext previous (const NumerotationContext &, const int) const; + QString toRepresentedString(const QString) const override; + NumerotationContext next (const NumerotationContext &, const int) const override; + NumerotationContext previous (const NumerotationContext &, const int) const override; }; diff --git a/sources/autoNum/ui/autonumberingdockwidget.h b/sources/autoNum/ui/autonumberingdockwidget.h index 9f7e5aa79..fad3da934 100644 --- a/sources/autoNum/ui/autonumberingdockwidget.h +++ b/sources/autoNum/ui/autonumberingdockwidget.h @@ -32,7 +32,7 @@ class AutoNumberingDockWidget : public QDockWidget public: explicit AutoNumberingDockWidget(QWidget *parent = nullptr); - ~AutoNumberingDockWidget(); + ~AutoNumberingDockWidget() override; void setContext(); void setProject(QETProject*, ProjectView*); diff --git a/sources/autoNum/ui/autonumberingmanagementw.h b/sources/autoNum/ui/autonumberingmanagementw.h index b0dcb0743..e21d9b3fa 100644 --- a/sources/autoNum/ui/autonumberingmanagementw.h +++ b/sources/autoNum/ui/autonumberingmanagementw.h @@ -35,7 +35,7 @@ class AutoNumberingManagementW : public QWidget //METHODS public: explicit AutoNumberingManagementW(QETProject *project, QWidget *parent = nullptr); - ~AutoNumberingManagementW(); + ~AutoNumberingManagementW() override; Ui::AutoNumberingManagementW *ui; void setProjectContext (); void contextToFormula (); diff --git a/sources/autoNum/ui/folioautonumbering.h b/sources/autoNum/ui/folioautonumbering.h index 25327c8e7..2ef28c3fd 100644 --- a/sources/autoNum/ui/folioautonumbering.h +++ b/sources/autoNum/ui/folioautonumbering.h @@ -36,7 +36,7 @@ class FolioAutonumberingW : public QWidget //METHODS public: explicit FolioAutonumberingW(QETProject *project, QWidget *parent = nullptr); - ~FolioAutonumberingW(); + ~FolioAutonumberingW() override; void setContext (QList autonums); NumerotationContext toNumContext() const; diff --git a/sources/autoNum/ui/formulaautonumberingw.h b/sources/autoNum/ui/formulaautonumberingw.h index c74199073..47a95e6f6 100644 --- a/sources/autoNum/ui/formulaautonumberingw.h +++ b/sources/autoNum/ui/formulaautonumberingw.h @@ -39,7 +39,7 @@ class FormulaAutonumberingW : public QWidget //METHODS public: explicit FormulaAutonumberingW(QWidget *parent = nullptr); - ~FormulaAutonumberingW(); + ~FormulaAutonumberingW() override; QString formula(); void setContext(QString); void clearContext(); diff --git a/sources/autoNum/ui/numparteditorw.h b/sources/autoNum/ui/numparteditorw.h index f05ee837d..165c99d35 100644 --- a/sources/autoNum/ui/numparteditorw.h +++ b/sources/autoNum/ui/numparteditorw.h @@ -39,7 +39,7 @@ class NumPartEditorW : public QWidget public: explicit NumPartEditorW(int type, QWidget *parent = nullptr); NumPartEditorW (NumerotationContext &, int, int type, QWidget *parent=nullptr); - ~NumPartEditorW(); + ~NumPartEditorW() override; enum type {unit,unitfolio,ten,tenfolio, hundred, hundredfolio, string,idfolio,folio,machine,locmach, diff --git a/sources/autoNum/ui/selectautonumw.h b/sources/autoNum/ui/selectautonumw.h index c5890f9cb..1a8206b16 100644 --- a/sources/autoNum/ui/selectautonumw.h +++ b/sources/autoNum/ui/selectautonumw.h @@ -39,7 +39,7 @@ class SelectAutonumW : public QWidget public: explicit SelectAutonumW(int type, QWidget *parent = nullptr); explicit SelectAutonumW(const NumerotationContext &context, int type, QWidget *parent = nullptr); - ~SelectAutonumW(); + ~SelectAutonumW() override; void setContext (const NumerotationContext &context); NumerotationContext toNumContext() const; diff --git a/sources/bordertitleblock.h b/sources/bordertitleblock.h index 812fb1f3f..1b14f45f5 100644 --- a/sources/bordertitleblock.h +++ b/sources/bordertitleblock.h @@ -38,7 +38,7 @@ class BorderTitleBlock : public QObject public: BorderTitleBlock(QObject * = nullptr); - virtual ~BorderTitleBlock(); + ~BorderTitleBlock() override; private: BorderTitleBlock(const BorderTitleBlock &); diff --git a/sources/configdialog.h b/sources/configdialog.h index 2409dbffa..7379a41de 100644 --- a/sources/configdialog.h +++ b/sources/configdialog.h @@ -33,7 +33,7 @@ class ConfigDialog : public QDialog { // constructors, destructor public: ConfigDialog(QWidget * = nullptr); - virtual ~ConfigDialog(); + ~ConfigDialog() override; private: ConfigDialog(const ConfigDialog &); diff --git a/sources/configpage.h b/sources/configpage.h index 20bc4570f..2625969b9 100644 --- a/sources/configpage.h +++ b/sources/configpage.h @@ -33,7 +33,7 @@ class ConfigPage : public QWidget { */ ConfigPage(QWidget *parent) : QWidget(parent) {}; /// Destructor - virtual ~ConfigPage() {}; + ~ConfigPage() override {}; /// Apply the configuration after user input virtual void applyConf() = 0; /// @return the configuration page title diff --git a/sources/configpages.h b/sources/configpages.h index fbc7e7eaa..75da8afcd 100644 --- a/sources/configpages.h +++ b/sources/configpages.h @@ -39,7 +39,7 @@ class NewDiagramPage : public ConfigPage { // constructors, destructor public: NewDiagramPage(QETProject *project = nullptr, QWidget * = nullptr, ProjectPropertiesDialog *teste = nullptr); - virtual ~NewDiagramPage(); + ~NewDiagramPage() override; private: NewDiagramPage(const NewDiagramPage &); public slots: @@ -51,9 +51,9 @@ public slots: // methods public: - void applyConf(); - QString title() const; - QIcon icon() const; + void applyConf() override; + QString title() const override; + QIcon icon() const override; // attributes private: @@ -77,15 +77,15 @@ class GeneralConfigurationPage : public ConfigPage { // constructors, destructor public: GeneralConfigurationPage(QWidget * = nullptr); - virtual ~GeneralConfigurationPage(); + ~GeneralConfigurationPage() override; private: GeneralConfigurationPage(const GeneralConfigurationPage &); // methods public: - void applyConf(); - QString title() const; - QIcon icon() const; + void applyConf() override; + QString title() const override; + QIcon icon() const override; private: void fillLang(QSettings &); @@ -122,15 +122,15 @@ class ExportConfigPage : public ConfigPage { // constructors, destructor public: ExportConfigPage(QWidget * = nullptr); - virtual ~ExportConfigPage(); + ~ExportConfigPage() override; private: ExportConfigPage(const ExportConfigPage &); // methods public: - void applyConf(); - QString title() const; - QIcon icon() const; + void applyConf() override; + QString title() const override; + QIcon icon() const override; // attributes public: @@ -145,15 +145,15 @@ class PrintConfigPage : public ConfigPage { // constructors, destructor public: PrintConfigPage(QWidget * = nullptr); - virtual ~PrintConfigPage(); + ~PrintConfigPage() override; private: PrintConfigPage(const PrintConfigPage &); // methods public: - void applyConf(); - QString title() const; - QIcon icon() const; + void applyConf() override; + QString title() const override; + QIcon icon() const override; // attributes public: diff --git a/sources/diagram.h b/sources/diagram.h index 93d487033..3a8d69de7 100644 --- a/sources/diagram.h +++ b/sources/diagram.h @@ -53,7 +53,7 @@ class Diagram : public QGraphicsScene // constructors, destructor public: Diagram(QETProject *project); - virtual ~Diagram(); + ~Diagram() override; private: Diagram(const Diagram &diagram); @@ -114,15 +114,15 @@ class Diagram : public QGraphicsScene // METHODS protected: - virtual void drawBackground(QPainter *, const QRectF &); + void drawBackground(QPainter *, const QRectF &) override; - virtual void mouseDoubleClickEvent (QGraphicsSceneMouseEvent *event); - virtual void mousePressEvent (QGraphicsSceneMouseEvent *event); - virtual void mouseMoveEvent (QGraphicsSceneMouseEvent *event); - virtual void mouseReleaseEvent (QGraphicsSceneMouseEvent *event); - virtual void wheelEvent (QGraphicsSceneWheelEvent *event); - virtual void keyPressEvent (QKeyEvent *); - virtual void keyReleaseEvent (QKeyEvent *); + void mouseDoubleClickEvent (QGraphicsSceneMouseEvent *event) override; + void mousePressEvent (QGraphicsSceneMouseEvent *event) override; + void mouseMoveEvent (QGraphicsSceneMouseEvent *event) override; + void mouseReleaseEvent (QGraphicsSceneMouseEvent *event) override; + void wheelEvent (QGraphicsSceneWheelEvent *event) override; + void keyPressEvent (QKeyEvent *) override; + void keyReleaseEvent (QKeyEvent *) override; public: void setEventInterface (DiagramEventInterface *event_interface); diff --git a/sources/diagramcommands.h b/sources/diagramcommands.h index 5ac5274c4..64dfb9768 100644 --- a/sources/diagramcommands.h +++ b/sources/diagramcommands.h @@ -53,17 +53,17 @@ class AddItemCommand : public QUndoCommand { m_diagram -> qgiManager().manage(m_item); } - virtual ~AddItemCommand() { + ~AddItemCommand() override { m_diagram -> qgiManager().release(m_item); } - virtual void undo() { + void undo() override { m_diagram -> showMe(); m_diagram -> removeItem(m_item); QUndoCommand::undo(); } - virtual void redo() { + void redo() override { m_diagram -> showMe(); m_diagram -> addItem(m_item); m_item -> setPos(m_pos); @@ -88,14 +88,14 @@ class PasteDiagramCommand : public QUndoCommand { // constructors, destructor public: PasteDiagramCommand(Diagram *, const DiagramContent &, QUndoCommand * = nullptr); - virtual ~PasteDiagramCommand(); + ~PasteDiagramCommand() override; private: PasteDiagramCommand(const PasteDiagramCommand &); // methods public: - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; // attributes private: @@ -116,7 +116,7 @@ class CutDiagramCommand : public DeleteQGraphicsItemCommand { // constructors, destructor public: CutDiagramCommand(Diagram *, const DiagramContent &, QUndoCommand * = nullptr); - virtual ~CutDiagramCommand(); + ~CutDiagramCommand() override; private: CutDiagramCommand(const CutDiagramCommand &); }; @@ -128,14 +128,14 @@ class MoveElementsCommand : public QUndoCommand { // constructors, destructor public: MoveElementsCommand(Diagram *, const DiagramContent &, const QPointF &m, QUndoCommand * = nullptr); - virtual ~MoveElementsCommand(); + ~MoveElementsCommand() override; private: MoveElementsCommand(const MoveElementsCommand &); // methods public: - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; virtual void move(const QPointF &); private: @@ -163,14 +163,14 @@ class MoveConductorsTextsCommand : public QUndoCommand { // constructors, destructor public: MoveConductorsTextsCommand(Diagram *, QUndoCommand * = nullptr); - virtual ~MoveConductorsTextsCommand(); + ~MoveConductorsTextsCommand() override; private: MoveConductorsTextsCommand(const MoveConductorsTextsCommand &); // methods public: - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; virtual void addTextMovement(ConductorTextItem *, const QPointF &, const QPointF &, bool = false); private: @@ -193,14 +193,14 @@ class ChangeDiagramTextCommand : public QUndoCommand { // constructors, destructor public: ChangeDiagramTextCommand(DiagramTextItem *, const QString &before, const QString &after, QUndoCommand * = nullptr); - virtual ~ChangeDiagramTextCommand(); + ~ChangeDiagramTextCommand() override; private: ChangeDiagramTextCommand(const ChangeDiagramTextCommand &); // methods public: - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; // attributes private: @@ -222,14 +222,14 @@ class RotateElementsCommand : public QUndoCommand { // constructors, destructor public: RotateElementsCommand(const QList &elements, const QList &, const QList &, QUndoCommand * = nullptr); - virtual ~RotateElementsCommand(); + ~RotateElementsCommand() override; private: RotateElementsCommand(const RotateElementsCommand &); // methods public: - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; // attributes private: @@ -255,14 +255,14 @@ class RotateTextsCommand : public QUndoCommand // constructors, destructor public: RotateTextsCommand(const QList &, double, QUndoCommand * = nullptr); - virtual ~RotateTextsCommand() override; + ~RotateTextsCommand() override; private: RotateTextsCommand(const RotateTextsCommand &); // methods public: - virtual void undo() override; - virtual void redo() override; + void undo() override; + void redo() override; private: void defineCommandName(); @@ -285,14 +285,14 @@ class ChangeConductorCommand : public QUndoCommand { // constructors, destructor public: ChangeConductorCommand(Conductor *, const ConductorProfile &, const ConductorProfile &, Qt::Corner, QUndoCommand * = nullptr); - virtual ~ChangeConductorCommand(); + ~ChangeConductorCommand() override; private: ChangeConductorCommand(const ChangeConductorCommand &); // methods public: - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; virtual void setConductorTextItemMove(const QPointF &, const QPointF &); // attributes @@ -321,14 +321,14 @@ class ResetConductorCommand : public QUndoCommand { // constructors, destructor public: ResetConductorCommand(const QHash &, QUndoCommand * = nullptr); - virtual ~ResetConductorCommand(); + ~ResetConductorCommand() override; private: ResetConductorCommand(const ResetConductorCommand &); // methods public: - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; // attributes private: @@ -344,14 +344,14 @@ class ChangeTitleBlockCommand : public QUndoCommand { // constructors, destructor public: ChangeTitleBlockCommand(Diagram *, const TitleBlockProperties &, const TitleBlockProperties &, QUndoCommand * = nullptr); - virtual ~ChangeTitleBlockCommand(); + ~ChangeTitleBlockCommand() override; private: ChangeTitleBlockCommand(const ChangeTitleBlockCommand &); // methods public: - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; // attributes private: @@ -370,14 +370,14 @@ class ChangeBorderCommand : public QUndoCommand { // constructors, destructor public: ChangeBorderCommand(Diagram *, const BorderProperties &, const BorderProperties &, QUndoCommand * = nullptr); - virtual ~ChangeBorderCommand(); + ~ChangeBorderCommand() override; private: ChangeBorderCommand(const ChangeBorderCommand &); // methods public: - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; // attributes private: diff --git a/sources/diagramcontextwidget.h b/sources/diagramcontextwidget.h index 11f536c33..fcb839962 100644 --- a/sources/diagramcontextwidget.h +++ b/sources/diagramcontextwidget.h @@ -30,7 +30,7 @@ class DiagramContextWidget : public QWidget { // Constructor, destructor public: DiagramContextWidget(QWidget *parent = nullptr); - virtual ~DiagramContextWidget(); + ~DiagramContextWidget() override; private: DiagramContextWidget(const DiagramContextWidget &); diff --git a/sources/diagramevent/diagrameventaddelement.h b/sources/diagramevent/diagrameventaddelement.h index 5ace1d0d0..b8b3eddaf 100644 --- a/sources/diagramevent/diagrameventaddelement.h +++ b/sources/diagramevent/diagrameventaddelement.h @@ -34,14 +34,14 @@ class DiagramEventAddElement : public DiagramEventInterface public: DiagramEventAddElement(ElementsLocation &location, Diagram *diagram, QPointF pos = QPointF(0,0)); - virtual ~DiagramEventAddElement(); + ~DiagramEventAddElement() override; - virtual bool mouseMoveEvent (QGraphicsSceneMouseEvent *event); - virtual bool mousePressEvent (QGraphicsSceneMouseEvent *event); - virtual bool mouseReleaseEvent (QGraphicsSceneMouseEvent *event); - virtual bool mouseDoubleClickEvent (QGraphicsSceneMouseEvent *event); - virtual bool keyPressEvent (QKeyEvent *event); - virtual void init(); + bool mouseMoveEvent (QGraphicsSceneMouseEvent *event) override; + bool mousePressEvent (QGraphicsSceneMouseEvent *event) override; + bool mouseReleaseEvent (QGraphicsSceneMouseEvent *event) override; + bool mouseDoubleClickEvent (QGraphicsSceneMouseEvent *event) override; + bool keyPressEvent (QKeyEvent *event) override; + void init() override; private: bool buildElement(); diff --git a/sources/diagramevent/diagrameventaddimage.h b/sources/diagramevent/diagrameventaddimage.h index ff2500521..395a09c50 100644 --- a/sources/diagramevent/diagrameventaddimage.h +++ b/sources/diagramevent/diagrameventaddimage.h @@ -33,12 +33,12 @@ class DiagramEventAddImage : public DiagramEventInterface public: DiagramEventAddImage(Diagram *diagram); - virtual ~DiagramEventAddImage(); + ~DiagramEventAddImage() override; - virtual bool mousePressEvent (QGraphicsSceneMouseEvent *event); - virtual bool mouseMoveEvent (QGraphicsSceneMouseEvent *event); - virtual bool mouseDoubleClickEvent (QGraphicsSceneMouseEvent *event); - virtual bool wheelEvent (QGraphicsSceneWheelEvent *event); + bool mousePressEvent (QGraphicsSceneMouseEvent *event) override; + bool mouseMoveEvent (QGraphicsSceneMouseEvent *event) override; + bool mouseDoubleClickEvent (QGraphicsSceneMouseEvent *event) override; + bool wheelEvent (QGraphicsSceneWheelEvent *event) override; bool isNull () const; private: diff --git a/sources/diagramevent/diagrameventaddshape.h b/sources/diagramevent/diagrameventaddshape.h index a5510b54b..e6a784ee1 100644 --- a/sources/diagramevent/diagrameventaddshape.h +++ b/sources/diagramevent/diagrameventaddshape.h @@ -32,12 +32,12 @@ class DiagramEventAddShape : public DiagramEventInterface public: DiagramEventAddShape(Diagram *diagram, QetShapeItem::ShapeType shape_type); - virtual ~DiagramEventAddShape(); - virtual bool mousePressEvent (QGraphicsSceneMouseEvent *event); - virtual bool mouseMoveEvent (QGraphicsSceneMouseEvent *event); - virtual bool mouseReleaseEvent (QGraphicsSceneMouseEvent *event); - virtual bool mouseDoubleClickEvent (QGraphicsSceneMouseEvent *event); - virtual void init(); + ~DiagramEventAddShape() override; + bool mousePressEvent (QGraphicsSceneMouseEvent *event) override; + bool mouseMoveEvent (QGraphicsSceneMouseEvent *event) override; + bool mouseReleaseEvent (QGraphicsSceneMouseEvent *event) override; + bool mouseDoubleClickEvent (QGraphicsSceneMouseEvent *event) override; + void init() override; private: void updateHelpCross (const QPointF &p); diff --git a/sources/diagramevent/diagrameventaddtext.h b/sources/diagramevent/diagrameventaddtext.h index 9a0a1e135..b7a836cf9 100644 --- a/sources/diagramevent/diagrameventaddtext.h +++ b/sources/diagramevent/diagrameventaddtext.h @@ -32,9 +32,9 @@ class DiagramEventAddText : public DiagramEventInterface public: DiagramEventAddText(Diagram *diagram); - virtual ~DiagramEventAddText(); + ~DiagramEventAddText() override; - virtual bool mousePressEvent (QGraphicsSceneMouseEvent *event); + bool mousePressEvent (QGraphicsSceneMouseEvent *event) override; }; #endif // DIAGRAMEVENTADDTEXT_H diff --git a/sources/diagramevent/diagrameventinterface.h b/sources/diagramevent/diagrameventinterface.h index bc5b29da9..a9de87fff 100644 --- a/sources/diagramevent/diagrameventinterface.h +++ b/sources/diagramevent/diagrameventinterface.h @@ -51,7 +51,7 @@ class DiagramEventInterface : public QObject public: DiagramEventInterface(Diagram *diagram); - virtual ~DiagramEventInterface() = 0; + ~DiagramEventInterface() override = 0; virtual bool mouseDoubleClickEvent (QGraphicsSceneMouseEvent *event); virtual bool mousePressEvent (QGraphicsSceneMouseEvent *event); virtual bool mouseMoveEvent (QGraphicsSceneMouseEvent *event); diff --git a/sources/diagramfoliolist.h b/sources/diagramfoliolist.h index 34d57f3e8..c2173f7fd 100644 --- a/sources/diagramfoliolist.h +++ b/sources/diagramfoliolist.h @@ -25,7 +25,7 @@ class DiagramFolioList : public Diagram { public: DiagramFolioList(QETProject *project); - virtual ~DiagramFolioList(); + ~DiagramFolioList() override; virtual QList lines() const {return list_lines_;} virtual QList rectangles() const {return list_rectangles_;} void setId(int i) {id = i;} @@ -34,7 +34,7 @@ class DiagramFolioList : public Diagram static qreal colWidths[7]; protected: - void drawBackground(QPainter *, const QRectF &); + void drawBackground(QPainter *, const QRectF &) override; private: void fillRow(QPainter *, const QRectF &, QString, QString, QString, QString, QString, QString, QString); diff --git a/sources/diagramprintdialog.h b/sources/diagramprintdialog.h index 42ee80c2c..3072588ec 100644 --- a/sources/diagramprintdialog.h +++ b/sources/diagramprintdialog.h @@ -37,7 +37,7 @@ class DiagramPrintDialog : public QWidget // Constructors, destructor public: DiagramPrintDialog(QETProject *, QWidget * = nullptr); - virtual ~DiagramPrintDialog(); + ~DiagramPrintDialog() override; private: DiagramPrintDialog(const DiagramPrintDialog &); diff --git a/sources/diagramschooser.h b/sources/diagramschooser.h index 0db6965bc..182246066 100644 --- a/sources/diagramschooser.h +++ b/sources/diagramschooser.h @@ -30,7 +30,7 @@ class DiagramsChooser : public QScrollArea { // constructors, destructor public: DiagramsChooser(QETProject *, QWidget * = nullptr); - virtual ~DiagramsChooser(); + ~DiagramsChooser() override; private: DiagramsChooser(const DiagramsChooser &); diff --git a/sources/diagramview.h b/sources/diagramview.h index be4dded15..4dbd0e434 100644 --- a/sources/diagramview.h +++ b/sources/diagramview.h @@ -42,7 +42,7 @@ class DiagramView : public QGraphicsView // constructors, destructor public: DiagramView(Diagram *diagram, QWidget * = nullptr); - virtual ~DiagramView(); + ~DiagramView() override; private: DiagramView(const DiagramView &); @@ -75,26 +75,26 @@ class DiagramView : public QGraphicsView void setEventInterface (DVEventInterface *event_interface); protected: - virtual void mouseDoubleClickEvent(QMouseEvent *); - virtual void contextMenuEvent(QContextMenuEvent *); - virtual void wheelEvent(QWheelEvent *); - virtual void focusInEvent(QFocusEvent *); - virtual void keyPressEvent(QKeyEvent *); - virtual void keyReleaseEvent(QKeyEvent *); - virtual bool event(QEvent *); + void mouseDoubleClickEvent(QMouseEvent *) override; + void contextMenuEvent(QContextMenuEvent *) override; + void wheelEvent(QWheelEvent *) override; + void focusInEvent(QFocusEvent *) override; + void keyPressEvent(QKeyEvent *) override; + void keyReleaseEvent(QKeyEvent *) override; + bool event(QEvent *) override; virtual bool switchToVisualisationModeIfNeeded(QInputEvent *e); virtual bool switchToSelectionModeIfNeeded(QInputEvent *e); virtual bool isCtrlShifting(QInputEvent *); virtual bool selectedItemHasFocus(); private: - void mousePressEvent(QMouseEvent *); - void mouseMoveEvent(QMouseEvent *); - void mouseReleaseEvent(QMouseEvent *); - void dragEnterEvent(QDragEnterEvent *); - void dragLeaveEvent(QDragLeaveEvent *); - void dragMoveEvent(QDragMoveEvent *); - void dropEvent(QDropEvent *); + void mousePressEvent(QMouseEvent *) override; + void mouseMoveEvent(QMouseEvent *) override; + void mouseReleaseEvent(QMouseEvent *) override; + void dragEnterEvent(QDragEnterEvent *) override; + void dragLeaveEvent(QDragLeaveEvent *) override; + void dragMoveEvent(QDragMoveEvent *) override; + void dropEvent(QDropEvent *) override; void handleElementDrop(QDropEvent *); void handleTitleBlockDrop(QDropEvent *); void handleTextDrop(QDropEvent *); diff --git a/sources/dvevent/dveventinterface.h b/sources/dvevent/dveventinterface.h index 016c4575b..e211ed6ca 100644 --- a/sources/dvevent/dveventinterface.h +++ b/sources/dvevent/dveventinterface.h @@ -41,7 +41,7 @@ class DVEventInterface : public QObject public: DVEventInterface(DiagramView *dv); - virtual ~DVEventInterface () = 0; + ~DVEventInterface () override = 0; virtual bool mouseDoubleClickEvent (QMouseEvent *event); virtual bool mousePressEvent (QMouseEvent *event); virtual bool mouseMoveEvent (QMouseEvent *event); diff --git a/sources/editor/arceditor.h b/sources/editor/arceditor.h index bf01b664b..bc9ab90df 100644 --- a/sources/editor/arceditor.h +++ b/sources/editor/arceditor.h @@ -35,7 +35,7 @@ class ArcEditor : public ElementItemEditor // constructors, destructor public: ArcEditor(QETElementEditor *, PartArc * = nullptr, QWidget * = nullptr); - virtual ~ArcEditor(); + ~ArcEditor() override; private: ArcEditor(const ArcEditor &); @@ -49,14 +49,14 @@ class ArcEditor : public ElementItemEditor // methods public: - virtual bool setPart(CustomElementPart *); - virtual CustomElementPart *currentPart() const; + bool setPart(CustomElementPart *) override; + CustomElementPart *currentPart() const override; public slots: void updateArcS(); void updateArcA(); void updateArcRect(); - void updateForm(); + void updateForm() override; private: void activeConnections(bool); diff --git a/sources/editor/editorcommands.h b/sources/editor/editorcommands.h index 2e60d287e..8a0e77052 100644 --- a/sources/editor/editorcommands.h +++ b/sources/editor/editorcommands.h @@ -35,7 +35,7 @@ class ElementEditionCommand : public QUndoCommand public: ElementEditionCommand(ElementScene * = nullptr, ElementView * = nullptr, QUndoCommand * = nullptr); ElementEditionCommand(const QString &, ElementScene * = nullptr, ElementView * = nullptr, QUndoCommand * = nullptr); - virtual ~ElementEditionCommand(); + ~ElementEditionCommand() override; private: ElementEditionCommand(const ElementEditionCommand &); @@ -61,14 +61,14 @@ class DeletePartsCommand : public ElementEditionCommand { // constructors, destructor public: DeletePartsCommand(ElementScene *, const QList, QUndoCommand * = nullptr); - virtual ~DeletePartsCommand(); + ~DeletePartsCommand() override; private: DeletePartsCommand(const DeletePartsCommand &); // methods public: - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; // attributes private: @@ -83,14 +83,14 @@ class PastePartsCommand : public ElementEditionCommand { // constructors, destructor public: PastePartsCommand(ElementView *, const ElementContent &, QUndoCommand * = nullptr); - virtual ~PastePartsCommand(); + ~PastePartsCommand() override; private: PastePartsCommand(const PastePartsCommand &); // methods public: - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; virtual void setOffset(int, const QPointF &, int, const QPointF &); // attributes @@ -114,7 +114,7 @@ class CutPartsCommand : public DeletePartsCommand { // constructors, destructor public: CutPartsCommand(ElementScene *, const QList, QUndoCommand * = nullptr); - virtual ~CutPartsCommand(); + ~CutPartsCommand() override; private: CutPartsCommand(const CutPartsCommand &); }; @@ -126,14 +126,14 @@ class MovePartsCommand : public ElementEditionCommand { // constructors, destructor public: MovePartsCommand(const QPointF &, ElementScene *, const QList, QUndoCommand * = nullptr); - virtual ~MovePartsCommand(); + ~MovePartsCommand() override; private: MovePartsCommand(const MovePartsCommand &); // methods public: - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; // attributes private: @@ -152,14 +152,14 @@ class AddPartCommand : public ElementEditionCommand { // constructors, destructor public: AddPartCommand(const QString &, ElementScene *, QGraphicsItem *, QUndoCommand * = nullptr); - virtual ~AddPartCommand(); + ~AddPartCommand() override; private: AddPartCommand(const AddPartCommand &); // methods public: - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; // attributes private: @@ -176,14 +176,14 @@ class ChangeNamesCommand : public ElementEditionCommand { // constructors, destructor public: ChangeNamesCommand(ElementScene *, const NamesList &, const NamesList &, QUndoCommand * = nullptr); - virtual ~ChangeNamesCommand(); + ~ChangeNamesCommand() override; private: ChangeNamesCommand(const ChangeNamesCommand &); // methods public: - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; // attributes private: @@ -208,14 +208,14 @@ class ChangeZValueCommand : public ElementEditionCommand { SendBackward ///< Send primitives to the background so they have the lowest zValue }; ChangeZValueCommand(ElementScene *, Option, QUndoCommand * = nullptr); - virtual ~ChangeZValueCommand(); + ~ChangeZValueCommand() override; private: ChangeZValueCommand(const ChangeZValueCommand &); // methods public: - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; private: void applyBringForward(const QList &); @@ -240,14 +240,14 @@ class ChangeInformationsCommand : public ElementEditionCommand { // constructors, destructor public: ChangeInformationsCommand(ElementScene *, const QString &, const QString &, QUndoCommand * = nullptr); - virtual ~ChangeInformationsCommand(); + ~ChangeInformationsCommand() override; private: ChangeInformationsCommand(const ChangeInformationsCommand &); // methods public: - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; // attributes private: @@ -264,14 +264,14 @@ class ScalePartsCommand : public ElementEditionCommand { // constructors, destructor public: ScalePartsCommand(ElementScene * = nullptr, QUndoCommand * = nullptr); - virtual ~ScalePartsCommand(); + ~ScalePartsCommand() override; private: ScalePartsCommand(const ScalePartsCommand &); // methods public: - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; ElementScene *elementScene() const; void setScaledPrimitives(const QList &); QList scaledPrimitives() const; @@ -297,10 +297,10 @@ class ScalePartsCommand : public ElementEditionCommand { class ChangePropertiesCommand : public ElementEditionCommand { public: ChangePropertiesCommand (ElementScene *scene, QString type, DiagramContext info, QUndoCommand *parent=nullptr); - virtual ~ChangePropertiesCommand (); + ~ChangePropertiesCommand () override; - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; private: QList m_type; diff --git a/sources/editor/elementitemeditor.h b/sources/editor/elementitemeditor.h index fbbd01b38..a921336c0 100644 --- a/sources/editor/elementitemeditor.h +++ b/sources/editor/elementitemeditor.h @@ -36,7 +36,7 @@ class ElementItemEditor : public QWidget // constructors, destructor public: ElementItemEditor(QETElementEditor *, QWidget * = nullptr); - virtual ~ElementItemEditor() {}; + ~ElementItemEditor() override {}; private: ElementItemEditor(const ElementItemEditor &); diff --git a/sources/editor/elementprimitivedecorator.h b/sources/editor/elementprimitivedecorator.h index 297f303eb..fb6975a31 100644 --- a/sources/editor/elementprimitivedecorator.h +++ b/sources/editor/elementprimitivedecorator.h @@ -43,15 +43,15 @@ class ElementPrimitiveDecorator : public QGraphicsObject public: ElementPrimitiveDecorator(QGraphicsItem * = nullptr); - virtual ~ElementPrimitiveDecorator(); + ~ElementPrimitiveDecorator() override; enum { Type = UserType + 2200 }; // methods QRectF internalBoundingRect() const; - virtual QRectF boundingRect () const; - virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr); - virtual int type() const { return Type; } + QRectF boundingRect () const override; + void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr) override; + int type() const override { return Type; } void setItems(const QList &); void setItems(const QList &); QList items() const; @@ -64,18 +64,18 @@ class ElementPrimitiveDecorator : public QGraphicsObject void actionFinished(ElementEditionCommand *); protected: - void mousePressEvent(QGraphicsSceneMouseEvent *); - void mouseMoveEvent(QGraphicsSceneMouseEvent *); - void mouseReleaseEvent(QGraphicsSceneMouseEvent *); - void keyPressEvent(QKeyEvent *); - void keyReleaseEvent(QKeyEvent *); + void mousePressEvent(QGraphicsSceneMouseEvent *) override; + void mouseMoveEvent(QGraphicsSceneMouseEvent *) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *) override; + void keyPressEvent(QKeyEvent *) override; + void keyReleaseEvent(QKeyEvent *) override; QPointF deltaForRoundScaling(const QRectF &, const QRectF &, qreal); QPointF snapConstPointToGrid(const QPointF &) const; void snapPointToGrid(QPointF &) const; bool mustSnapToGrid(QGraphicsSceneMouseEvent *); QET::ScalingMethod scalingMethod(QGraphicsSceneMouseEvent *); - virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value); - virtual bool sceneEventFilter(QGraphicsItem *watched, QEvent *event); + QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; + bool sceneEventFilter(QGraphicsItem *watched, QEvent *event) override; private: void init(); diff --git a/sources/editor/elementscene.h b/sources/editor/elementscene.h index 113f50b75..2d15745c1 100644 --- a/sources/editor/elementscene.h +++ b/sources/editor/elementscene.h @@ -56,7 +56,7 @@ class ElementScene : public QGraphicsScene // constructors, destructor public: ElementScene(QETElementEditor *, QObject * = nullptr); - virtual ~ElementScene(); + ~ElementScene() override; private: ElementScene(const ElementScene &); @@ -130,14 +130,14 @@ class ElementScene : public QGraphicsScene QETElementEditor* editor() const; protected: - virtual void mouseMoveEvent (QGraphicsSceneMouseEvent *); - virtual void mousePressEvent (QGraphicsSceneMouseEvent *); - virtual void mouseReleaseEvent (QGraphicsSceneMouseEvent *); - virtual void mouseDoubleClickEvent (QGraphicsSceneMouseEvent *event); - virtual void keyPressEvent (QKeyEvent *event); - virtual void contextMenuEvent(QGraphicsSceneContextMenuEvent *event); + void mouseMoveEvent (QGraphicsSceneMouseEvent *) override; + void mousePressEvent (QGraphicsSceneMouseEvent *) override; + void mouseReleaseEvent (QGraphicsSceneMouseEvent *) override; + void mouseDoubleClickEvent (QGraphicsSceneMouseEvent *event) override; + void keyPressEvent (QKeyEvent *event) override; + void contextMenuEvent(QGraphicsSceneContextMenuEvent *event) override; - virtual void drawForeground(QPainter *, const QRectF &); + void drawForeground(QPainter *, const QRectF &) override; private: QRectF elementContentBoundingRect(const ElementContent &) const; diff --git a/sources/editor/elementview.h b/sources/editor/elementview.h index 69e3a0a13..4ee0b3468 100644 --- a/sources/editor/elementview.h +++ b/sources/editor/elementview.h @@ -31,7 +31,7 @@ class ElementView : public QGraphicsView { // constructors, destructor public: ElementView(ElementScene *, QWidget * = nullptr); - virtual ~ElementView(); + ~ElementView() override; private: ElementView(const ElementView &); @@ -43,13 +43,13 @@ class ElementView : public QGraphicsView { QRectF viewedSceneRect() const; protected: - void mousePressEvent(QMouseEvent *); - void mouseMoveEvent(QMouseEvent *); - void mouseReleaseEvent(QMouseEvent *); + void mousePressEvent(QMouseEvent *) override; + void mouseMoveEvent(QMouseEvent *) override; + void mouseReleaseEvent(QMouseEvent *) override; bool gestureEvent(QGestureEvent *event); - bool event(QEvent *event); - void wheelEvent(QWheelEvent *); - virtual void drawBackground(QPainter *, const QRectF &); + bool event(QEvent *event) override; + void wheelEvent(QWheelEvent *) override; + void drawBackground(QPainter *, const QRectF &) override; private: QRectF applyMovement(const QRectF &, const QPointF &); diff --git a/sources/editor/ellipseeditor.h b/sources/editor/ellipseeditor.h index 0fadad9b8..39a90f6d1 100644 --- a/sources/editor/ellipseeditor.h +++ b/sources/editor/ellipseeditor.h @@ -34,7 +34,7 @@ class EllipseEditor : public ElementItemEditor // constructors, destructor public: EllipseEditor(QETElementEditor *, PartEllipse * = nullptr, QWidget * = nullptr); - virtual ~EllipseEditor(); + ~EllipseEditor() override; private: EllipseEditor(const EllipseEditor &); @@ -47,12 +47,12 @@ class EllipseEditor : public ElementItemEditor // methods public: - virtual bool setPart(CustomElementPart *); - virtual CustomElementPart *currentPart() const; + bool setPart(CustomElementPart *) override; + CustomElementPart *currentPart() const override; public slots: void editingFinished(); - void updateForm(); + void updateForm() override; private: void activeConnections(bool); diff --git a/sources/editor/esevent/eseventaddarc.h b/sources/editor/esevent/eseventaddarc.h index 164eb906b..e5a9fc37b 100644 --- a/sources/editor/esevent/eseventaddarc.h +++ b/sources/editor/esevent/eseventaddarc.h @@ -32,12 +32,12 @@ class ESEventAddArc : public ESEventInterface { public: ESEventAddArc(ElementScene *scene); - virtual ~ESEventAddArc(); + ~ESEventAddArc() override; - virtual bool mousePressEvent (QGraphicsSceneMouseEvent *event); - virtual bool mouseMoveEvent (QGraphicsSceneMouseEvent *event); - virtual bool mouseReleaseEvent (QGraphicsSceneMouseEvent *event); - virtual bool keyPressEvent (QKeyEvent *event); + bool mousePressEvent (QGraphicsSceneMouseEvent *event) override; + bool mouseMoveEvent (QGraphicsSceneMouseEvent *event) override; + bool mouseReleaseEvent (QGraphicsSceneMouseEvent *event) override; + bool keyPressEvent (QKeyEvent *event) override; private: void updateArc (); diff --git a/sources/editor/esevent/eseventaddellipse.h b/sources/editor/esevent/eseventaddellipse.h index 910a75bd4..2e0eaaf18 100644 --- a/sources/editor/esevent/eseventaddellipse.h +++ b/sources/editor/esevent/eseventaddellipse.h @@ -33,11 +33,11 @@ class ESEventAddEllipse : public ESEventInterface { public: ESEventAddEllipse(ElementScene *scene); - ~ESEventAddEllipse(); + ~ESEventAddEllipse() override; - virtual bool mousePressEvent (QGraphicsSceneMouseEvent *event); - virtual bool mouseMoveEvent (QGraphicsSceneMouseEvent *event); - virtual bool mouseReleaseEvent (QGraphicsSceneMouseEvent *event); + bool mousePressEvent (QGraphicsSceneMouseEvent *event) override; + bool mouseMoveEvent (QGraphicsSceneMouseEvent *event) override; + bool mouseReleaseEvent (QGraphicsSceneMouseEvent *event) override; private: PartEllipse *m_ellipse; diff --git a/sources/editor/esevent/eseventaddline.h b/sources/editor/esevent/eseventaddline.h index d01495d7a..7470839ac 100644 --- a/sources/editor/esevent/eseventaddline.h +++ b/sources/editor/esevent/eseventaddline.h @@ -32,11 +32,11 @@ class ESEventAddLine : public ESEventInterface { public: ESEventAddLine(ElementScene *scene); - virtual ~ESEventAddLine(); + ~ESEventAddLine() override; - virtual bool mousePressEvent (QGraphicsSceneMouseEvent *event); - virtual bool mouseMoveEvent (QGraphicsSceneMouseEvent *event); - virtual bool mouseReleaseEvent (QGraphicsSceneMouseEvent *event); + bool mousePressEvent (QGraphicsSceneMouseEvent *event) override; + bool mouseMoveEvent (QGraphicsSceneMouseEvent *event) override; + bool mouseReleaseEvent (QGraphicsSceneMouseEvent *event) override; private: PartLine *m_line; diff --git a/sources/editor/esevent/eseventaddpolygon.h b/sources/editor/esevent/eseventaddpolygon.h index 79756e945..cae272753 100644 --- a/sources/editor/esevent/eseventaddpolygon.h +++ b/sources/editor/esevent/eseventaddpolygon.h @@ -32,12 +32,12 @@ class ESEventAddPolygon : public ESEventInterface { public: ESEventAddPolygon(ElementScene *scene); - virtual ~ESEventAddPolygon(); + ~ESEventAddPolygon() override; - virtual bool mousePressEvent (QGraphicsSceneMouseEvent *event); - virtual bool mouseMoveEvent (QGraphicsSceneMouseEvent *event); - virtual bool mouseReleaseEvent (QGraphicsSceneMouseEvent *event); - virtual bool mouseDoubleClickEvent (QGraphicsSceneMouseEvent *event); + bool mousePressEvent (QGraphicsSceneMouseEvent *event) override; + bool mouseMoveEvent (QGraphicsSceneMouseEvent *event) override; + bool mouseReleaseEvent (QGraphicsSceneMouseEvent *event) override; + bool mouseDoubleClickEvent (QGraphicsSceneMouseEvent *event) override; private: PartPolygon *m_polygon; diff --git a/sources/editor/esevent/eseventaddrect.h b/sources/editor/esevent/eseventaddrect.h index 59a1e5b0a..10e4e8459 100644 --- a/sources/editor/esevent/eseventaddrect.h +++ b/sources/editor/esevent/eseventaddrect.h @@ -29,11 +29,11 @@ class ESEventAddRect : public ESEventInterface { public: ESEventAddRect(ElementScene *scene); - virtual ~ESEventAddRect(); + ~ESEventAddRect() override; - virtual bool mousePressEvent (QGraphicsSceneMouseEvent *event); - virtual bool mouseMoveEvent (QGraphicsSceneMouseEvent *event); - virtual bool mouseReleaseEvent (QGraphicsSceneMouseEvent *event); + bool mousePressEvent (QGraphicsSceneMouseEvent *event) override; + bool mouseMoveEvent (QGraphicsSceneMouseEvent *event) override; + bool mouseReleaseEvent (QGraphicsSceneMouseEvent *event) override; private: PartRectangle *m_rect; diff --git a/sources/editor/esevent/eseventaddterminal.h b/sources/editor/esevent/eseventaddterminal.h index be31e1bc6..8dc75abbe 100644 --- a/sources/editor/esevent/eseventaddterminal.h +++ b/sources/editor/esevent/eseventaddterminal.h @@ -32,11 +32,11 @@ class ESEventAddTerminal : public ESEventInterface { public: ESEventAddTerminal(ElementScene *scene); - virtual ~ESEventAddTerminal(); + ~ESEventAddTerminal() override; - virtual bool mouseMoveEvent (QGraphicsSceneMouseEvent *event); - virtual bool mouseReleaseEvent (QGraphicsSceneMouseEvent *event); - virtual bool keyPressEvent (QKeyEvent *event); + bool mouseMoveEvent (QGraphicsSceneMouseEvent *event) override; + bool mouseReleaseEvent (QGraphicsSceneMouseEvent *event) override; + bool keyPressEvent (QKeyEvent *event) override; private: PartTerminal *m_terminal; diff --git a/sources/editor/esevent/eseventaddtext.h b/sources/editor/esevent/eseventaddtext.h index f42213d5b..69145cb73 100644 --- a/sources/editor/esevent/eseventaddtext.h +++ b/sources/editor/esevent/eseventaddtext.h @@ -32,10 +32,10 @@ class ESEventAddText : public ESEventInterface { public: ESEventAddText(ElementScene *scene); - virtual ~ESEventAddText(); + ~ESEventAddText() override; - virtual bool mouseMoveEvent (QGraphicsSceneMouseEvent *event); - virtual bool mouseReleaseEvent (QGraphicsSceneMouseEvent *event); + bool mouseMoveEvent (QGraphicsSceneMouseEvent *event) override; + bool mouseReleaseEvent (QGraphicsSceneMouseEvent *event) override; private: PartText *m_text; diff --git a/sources/editor/esevent/eseventaddtextfield.h b/sources/editor/esevent/eseventaddtextfield.h index c5f959193..bb5591d69 100644 --- a/sources/editor/esevent/eseventaddtextfield.h +++ b/sources/editor/esevent/eseventaddtextfield.h @@ -32,10 +32,10 @@ class ESEventAddTextField : public ESEventInterface { public: ESEventAddTextField(ElementScene *scene); - virtual ~ESEventAddTextField(); + ~ESEventAddTextField() override; - virtual bool mouseMoveEvent (QGraphicsSceneMouseEvent *event); - virtual bool mouseReleaseEvent (QGraphicsSceneMouseEvent *event); + bool mouseMoveEvent (QGraphicsSceneMouseEvent *event) override; + bool mouseReleaseEvent (QGraphicsSceneMouseEvent *event) override; private: PartTextField *m_text; diff --git a/sources/editor/graphicspart/abstractpartellipse.h b/sources/editor/graphicspart/abstractpartellipse.h index 36bf15c4f..b81783316 100644 --- a/sources/editor/graphicspart/abstractpartellipse.h +++ b/sources/editor/graphicspart/abstractpartellipse.h @@ -42,7 +42,7 @@ class AbstractPartEllipse : public CustomElementGraphicPart // constructors, destructor public: AbstractPartEllipse(QETElementEditor *editor, QGraphicsItem * parent = nullptr); - virtual ~AbstractPartEllipse(); + ~AbstractPartEllipse() override; private: AbstractPartEllipse(const AbstractPartEllipse &); @@ -54,17 +54,17 @@ class AbstractPartEllipse : public CustomElementGraphicPart // methods public: - virtual void startUserTransformation (const QRectF &); - virtual void handleUserTransformation (const QRectF &, const QRectF &); + void startUserTransformation (const QRectF &) override; + void handleUserTransformation (const QRectF &, const QRectF &) override; //Coordinates - virtual QRectF boundingRect() const; - virtual QRectF sceneGeometricRect() const; + QRectF boundingRect() const override; + QRectF sceneGeometricRect() const override; virtual QPointF sceneTopLeft() const; QRectF rect() const; virtual void setRect (const QRectF &rect); - virtual bool isUseless() const; + bool isUseless() const override; int startAngle() const {return m_start_angle;} virtual void setStartAngle (const int &start_angle); diff --git a/sources/editor/graphicspart/customelementgraphicpart.h b/sources/editor/graphicspart/customelementgraphicpart.h index 279ef5cbc..ac48ac694 100644 --- a/sources/editor/graphicspart/customelementgraphicpart.h +++ b/sources/editor/graphicspart/customelementgraphicpart.h @@ -65,7 +65,7 @@ class CustomElementGraphicPart : public QGraphicsObject, public CustomElementPar public: CustomElementGraphicPart(QETElementEditor *editor, QGraphicsItem *parent = nullptr); - virtual ~CustomElementGraphicPart(); + ~CustomElementGraphicPart() override; static void drawCross (const QPointF ¢er, QPainter *painter); @@ -89,8 +89,8 @@ class CustomElementGraphicPart : public QGraphicsObject, public CustomElementPar //Rediriged to QObject Q_PROPERTY system - virtual void setProperty (const char *name, const QVariant &value) {QObject::setProperty(name, value);} - virtual QVariant property (const char *name) const {return QObject::property(name);} + void setProperty (const char *name, const QVariant &value) override {QObject::setProperty(name, value);} + QVariant property (const char *name) const override {return QObject::property(name);} virtual QPainterPath shadowShape ()const = 0; @@ -101,14 +101,14 @@ class CustomElementGraphicPart : public QGraphicsObject, public CustomElementPar void applyStylesToQPainter(QPainter &) const; void drawShadowShape (QPainter *painter); - QVariant itemChange(GraphicsItemChange change, const QVariant &value); - void hoverEnterEvent(QGraphicsSceneHoverEvent *event); - void hoverMoveEvent (QGraphicsSceneHoverEvent *event); - void hoverLeaveEvent(QGraphicsSceneHoverEvent *event); + QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; + void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; + void hoverMoveEvent (QGraphicsSceneHoverEvent *event) override; + void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; - virtual void mousePressEvent(QGraphicsSceneMouseEvent *event); - virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event); - virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); + void mousePressEvent(QGraphicsSceneMouseEvent *event) override; + void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; // attributes bool m_hovered; diff --git a/sources/editor/graphicspart/partarc.h b/sources/editor/graphicspart/partarc.h index e99e283ea..ddb9da19b 100644 --- a/sources/editor/graphicspart/partarc.h +++ b/sources/editor/graphicspart/partarc.h @@ -34,7 +34,7 @@ class PartArc : public AbstractPartEllipse public: PartArc(QETElementEditor *editor, QGraphicsItem *parent = nullptr); - virtual ~PartArc(); + ~PartArc() override; private: PartArc(const PartArc &); @@ -45,25 +45,25 @@ class PartArc : public AbstractPartEllipse * Enable the use of qgraphicsitem_cast to safely cast a QGraphicsItem into a PartArc. * @return the QGraphicsItem type */ - virtual int type() const { return Type; } - virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr); + int type() const override { return Type; } + void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr) override; //Name and XML - virtual QString name() const { return(QObject::tr("arc", "element part name")); } - virtual QString xmlName() const { return(QString("arc")); } - virtual const QDomElement toXml (QDomDocument &) const; - virtual void fromXml (const QDomElement &); + QString name() const override { return(QObject::tr("arc", "element part name")); } + QString xmlName() const override { return(QString("arc")); } + const QDomElement toXml (QDomDocument &) const override; + void fromXml (const QDomElement &) override; - virtual QPainterPath shape() const; - virtual QPainterPath shadowShape() const; - virtual void setRect(const QRectF &rect) {AbstractPartEllipse::setRect(rect); adjusteHandlerPos();} - virtual void setStartAngle(const int &start_angle) {AbstractPartEllipse::setStartAngle(start_angle); adjusteHandlerPos();} - virtual void setSpanAngle(const int &span_angle) {AbstractPartEllipse::setSpanAngle(span_angle); adjusteHandlerPos();} + QPainterPath shape() const override; + QPainterPath shadowShape() const override; + void setRect(const QRectF &rect) override {AbstractPartEllipse::setRect(rect); adjusteHandlerPos();} + void setStartAngle(const int &start_angle) override {AbstractPartEllipse::setStartAngle(start_angle); adjusteHandlerPos();} + void setSpanAngle(const int &span_angle) override {AbstractPartEllipse::setSpanAngle(span_angle); adjusteHandlerPos();} protected: - virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); - virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value); - virtual bool sceneEventFilter(QGraphicsItem *watched, QEvent *event); + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; + QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; + bool sceneEventFilter(QGraphicsItem *watched, QEvent *event) override; private: void switchResizeMode(); diff --git a/sources/editor/graphicspart/partellipse.h b/sources/editor/graphicspart/partellipse.h index 72225e70d..e3d82c789 100644 --- a/sources/editor/graphicspart/partellipse.h +++ b/sources/editor/graphicspart/partellipse.h @@ -34,7 +34,7 @@ class PartEllipse : public AbstractPartEllipse // constructors, destructor public: PartEllipse(QETElementEditor *editor, QGraphicsItem * parent = nullptr); - virtual ~PartEllipse(); + ~PartEllipse() override; private: PartEllipse(const PartEllipse &); @@ -46,22 +46,22 @@ class PartEllipse : public AbstractPartEllipse * Enable the use of qgraphicsitem_cast to safely cast a QGraphicsItem into a PartEllipse. * @return the QGraphicsItem type */ - virtual int type() const { return Type; } - virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr); + int type() const override { return Type; } + void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr) override; //Name and XML - virtual QString name() const { return(QObject::tr("ellipse", "element part name")); } - virtual QString xmlName() const { return(QString("ellipse")); } - virtual const QDomElement toXml (QDomDocument &) const; - virtual void fromXml (const QDomElement &); - virtual QPainterPath shape() const; - virtual QPainterPath shadowShape() const; - virtual void setRect(const QRectF &rect) {AbstractPartEllipse::setRect(rect); adjusteHandlerPos();} + QString name() const override { return(QObject::tr("ellipse", "element part name")); } + QString xmlName() const override { return(QString("ellipse")); } + const QDomElement toXml (QDomDocument &) const override; + void fromXml (const QDomElement &) override; + QPainterPath shape() const override; + QPainterPath shadowShape() const override; + void setRect(const QRectF &rect) override {AbstractPartEllipse::setRect(rect); adjusteHandlerPos();} protected: - virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); - virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value); - virtual bool sceneEventFilter(QGraphicsItem *watched, QEvent *event); + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; + QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; + bool sceneEventFilter(QGraphicsItem *watched, QEvent *event) override; private: void switchResizeMode(); diff --git a/sources/editor/graphicspart/partline.h b/sources/editor/graphicspart/partline.h index d1b1acacf..9afee4eb5 100644 --- a/sources/editor/graphicspart/partline.h +++ b/sources/editor/graphicspart/partline.h @@ -46,7 +46,7 @@ class PartLine : public CustomElementGraphicPart // constructors, destructor public: PartLine(QETElementEditor *, QGraphicsItem * = nullptr); - virtual ~PartLine(); + ~PartLine() override; private: PartLine(const PartLine &); @@ -66,21 +66,21 @@ class PartLine : public CustomElementGraphicPart * Enable the use of qgraphicsitem_cast to safely cast a QGraphicsItem into a PartLine. * @return the QGraphicsItem type */ - virtual int type() const { return Type; } - virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr); - virtual QString name() const { return(QObject::tr("ligne", "element part name")); } - virtual QString xmlName() const { return(QString("line")); } - virtual const QDomElement toXml(QDomDocument &) const; - virtual void fromXml(const QDomElement &); + int type() const override { return Type; } + void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr) override; + QString name() const override { return(QObject::tr("ligne", "element part name")); } + QString xmlName() const override { return(QString("line")); } + const QDomElement toXml(QDomDocument &) const override; + void fromXml(const QDomElement &) override; virtual QPointF sceneP1() const; virtual QPointF sceneP2() const; - virtual QPainterPath shape() const; - virtual QPainterPath shadowShape() const; - virtual QRectF boundingRect() const; - virtual bool isUseless() const; - virtual QRectF sceneGeometricRect() const; - virtual void startUserTransformation(const QRectF &); - virtual void handleUserTransformation(const QRectF &, const QRectF &); + QPainterPath shape() const override; + QPainterPath shadowShape() const override; + QRectF boundingRect() const override; + bool isUseless() const override; + QRectF sceneGeometricRect() const override; + void startUserTransformation(const QRectF &) override; + void handleUserTransformation(const QRectF &, const QRectF &) override; static uint requiredLengthForEndType(const Qet::EndType &); static QList fourEndPoints(const QPointF &, const QPointF &, const qreal &); @@ -96,8 +96,8 @@ class PartLine : public CustomElementGraphicPart void setSecondEndLength(const qreal &l); protected: - virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value); - virtual bool sceneEventFilter(QGraphicsItem *watched, QEvent *event); + QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; + bool sceneEventFilter(QGraphicsItem *watched, QEvent *event) override; private: void adjusteHandlerPos(); diff --git a/sources/editor/graphicspart/partpolygon.h b/sources/editor/graphicspart/partpolygon.h index 696d82411..27098ae44 100644 --- a/sources/editor/graphicspart/partpolygon.h +++ b/sources/editor/graphicspart/partpolygon.h @@ -39,7 +39,7 @@ class PartPolygon : public CustomElementGraphicPart // constructors, destructor public: PartPolygon(QETElementEditor *editor, QGraphicsItem *parent = nullptr); - virtual ~PartPolygon(); + ~PartPolygon() override; private: PartPolygon(const PartPolygon &); @@ -55,23 +55,23 @@ class PartPolygon : public CustomElementGraphicPart * Enable the use of qgraphicsitem_cast to safely cast a QGraphicsItem into a PartPolygon. * @return the QGraphicsItem type */ - virtual int type() const { return Type; } - void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *); + int type() const override { return Type; } + void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) override; - virtual QString name() const { return(QObject::tr("polygone", "element part name")); } - virtual QString xmlName() const { return(QString("polygon")); } - void fromXml(const QDomElement &); - const QDomElement toXml(QDomDocument &) const; + QString name() const override { return(QObject::tr("polygone", "element part name")); } + QString xmlName() const override { return(QString("polygon")); } + void fromXml(const QDomElement &) override; + const QDomElement toXml(QDomDocument &) const override; - virtual QPainterPath shape () const; - virtual QPainterPath shadowShape() const; - virtual QRectF boundingRect() const; - virtual bool isUseless() const; - virtual QRectF sceneGeometricRect() const; + QPainterPath shape () const override; + QPainterPath shadowShape() const override; + QRectF boundingRect() const override; + bool isUseless() const override; + QRectF sceneGeometricRect() const override; - virtual void startUserTransformation(const QRectF &); - virtual void handleUserTransformation(const QRectF &, const QRectF &); - virtual QET::ScalingMethod preferredScalingMethod() const; + void startUserTransformation(const QRectF &) override; + void handleUserTransformation(const QRectF &, const QRectF &) override; + QET::ScalingMethod preferredScalingMethod() const override; QPolygonF polygon () const; void setPolygon (const QPolygonF &polygon); @@ -84,8 +84,8 @@ class PartPolygon : public CustomElementGraphicPart void setClosed (bool close); protected: - virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value); - virtual bool sceneEventFilter(QGraphicsItem *watched, QEvent *event); + QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; + bool sceneEventFilter(QGraphicsItem *watched, QEvent *event) override; private: void adjusteHandlerPos(); diff --git a/sources/editor/graphicspart/partrectangle.h b/sources/editor/graphicspart/partrectangle.h index ad17fc899..0d0a0670a 100644 --- a/sources/editor/graphicspart/partrectangle.h +++ b/sources/editor/graphicspart/partrectangle.h @@ -37,7 +37,7 @@ class PartRectangle : public CustomElementGraphicPart // constructors, destructor public: PartRectangle(QETElementEditor *, QGraphicsItem *parent = nullptr); - virtual ~PartRectangle(); + ~PartRectangle() override; private: PartRectangle(const PartRectangle &); @@ -52,32 +52,32 @@ class PartRectangle : public CustomElementGraphicPart * Enable the use of qgraphicsitem_cast to safely cast a QGraphicsItem into a PartRectangle. * @return the QGraphicsItem type */ - virtual int type () const { return Type; } - virtual void paint (QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr); - virtual QString name () const { return(QObject::tr("rectangle", "element part name")); } + int type () const override { return Type; } + void paint (QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr) override; + QString name () const override { return(QObject::tr("rectangle", "element part name")); } - virtual QString xmlName () const { return(QString("rect")); } - virtual const QDomElement toXml (QDomDocument &) const; - virtual void fromXml (const QDomElement &); + QString xmlName () const override { return(QString("rect")); } + const QDomElement toXml (QDomDocument &) const override; + void fromXml (const QDomElement &) override; QRectF rect() const; void setRect(const QRectF &rect); - virtual QRectF sceneGeometricRect() const; + QRectF sceneGeometricRect() const override; virtual QPointF sceneTopLeft() const; - virtual QPainterPath shape () const; - virtual QPainterPath shadowShape() const; - virtual QRectF boundingRect() const; - virtual bool isUseless() const; + QPainterPath shape () const override; + QPainterPath shadowShape() const override; + QRectF boundingRect() const override; + bool isUseless() const override; - virtual void startUserTransformation(const QRectF &); - virtual void handleUserTransformation(const QRectF &, const QRectF &); + void startUserTransformation(const QRectF &) override; + void handleUserTransformation(const QRectF &, const QRectF &) override; protected: - virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); - virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value); - virtual bool sceneEventFilter(QGraphicsItem *watched, QEvent *event); + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; + QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; + bool sceneEventFilter(QGraphicsItem *watched, QEvent *event) override; private: void switchResizeMode(); diff --git a/sources/editor/graphicspart/partterminal.h b/sources/editor/graphicspart/partterminal.h index 6653f39bb..fed47b30b 100644 --- a/sources/editor/graphicspart/partterminal.h +++ b/sources/editor/graphicspart/partterminal.h @@ -36,7 +36,7 @@ class PartTerminal : public CustomElementGraphicPart public: // constructors, destructor PartTerminal(QETElementEditor *editor, QGraphicsItem *parent = nullptr); - virtual ~PartTerminal(); + ~PartTerminal() override; private: PartTerminal(const PartTerminal &); @@ -56,20 +56,20 @@ class PartTerminal : public CustomElementGraphicPart * Enable the use of qgraphicsitem_cast to safely cast a QGraphicsItem into a PartTerminal. * @return the QGraphicsItem type */ - virtual int type() const { return Type; } - virtual QString name() const { return(QObject::tr("borne", "element part name")); } - virtual QString xmlName() const { return(QString("terminal")); } - virtual void fromXml(const QDomElement &); - virtual const QDomElement toXml(QDomDocument &) const; - virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *); + int type() const override { return Type; } + QString name() const override { return(QObject::tr("borne", "element part name")); } + QString xmlName() const override { return(QString("terminal")); } + void fromXml(const QDomElement &) override; + const QDomElement toXml(QDomDocument &) const override; + void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) override; - virtual QPainterPath shape() const; - virtual QPainterPath shadowShape() const {return shape();} - virtual QRectF boundingRect() const; - virtual bool isUseless() const; - virtual QRectF sceneGeometricRect() const; - virtual void startUserTransformation(const QRectF &); - virtual void handleUserTransformation(const QRectF &, const QRectF &); + QPainterPath shape() const override; + QPainterPath shadowShape() const override {return shape();} + QRectF boundingRect() const override; + bool isUseless() const override; + QRectF sceneGeometricRect() const override; + void startUserTransformation(const QRectF &) override; + void handleUserTransformation(const QRectF &, const QRectF &) override; Qet::Orientation orientation() const {return m_orientation;} void setOrientation(Qet::Orientation ori); diff --git a/sources/editor/graphicspart/parttext.h b/sources/editor/graphicspart/parttext.h index ace8db0dc..8865cb95f 100644 --- a/sources/editor/graphicspart/parttext.h +++ b/sources/editor/graphicspart/parttext.h @@ -32,7 +32,7 @@ class PartText : public QGraphicsTextItem, public CustomElementPart { // constructors, destructor public: PartText(QETElementEditor *, QGraphicsItem * = nullptr); - virtual ~PartText(); + ~PartText() override; private: PartText(const PartText &); @@ -45,20 +45,20 @@ class PartText : public QGraphicsTextItem, public CustomElementPart { PartText. @return the QGraphicsItem type */ - virtual int type() const { return Type; } - virtual QString name() const { return(QObject::tr("texte", "element part name")); } - virtual QString xmlName() const { return(QString("text")); } - void fromXml(const QDomElement &); - const QDomElement toXml(QDomDocument &) const; + int type() const override { return Type; } + QString name() const override { return(QObject::tr("texte", "element part name")); } + QString xmlName() const override { return(QString("text")); } + void fromXml(const QDomElement &) override; + const QDomElement toXml(QDomDocument &) const override; void setRotation(qreal angle) {(QGraphicsObject::setRotation(QET::correctAngle(angle)));} - virtual bool isUseless() const; - virtual QRectF sceneGeometricRect() const; - virtual void startUserTransformation(const QRectF &); - virtual void handleUserTransformation(const QRectF &, const QRectF &); + bool isUseless() const override; + QRectF sceneGeometricRect() const override; + void startUserTransformation(const QRectF &) override; + void handleUserTransformation(const QRectF &, const QRectF &) override; ///PROPERTY - void setProperty(const char *name, const QVariant &value) {QGraphicsTextItem::setProperty(name, value);} - QVariant property(const char *name) const {return QGraphicsTextItem::property(name);} + void setProperty(const char *name, const QVariant &value) override {QGraphicsTextItem::setProperty(name, value);} + QVariant property(const char *name) const override {return QGraphicsTextItem::property(name);} // Size value Q_PROPERTY(qreal size READ size WRITE setSize) qreal size () const {return font().pointSize();} @@ -81,15 +81,15 @@ class PartText : public QGraphicsTextItem, public CustomElementPart { void endEdition(); protected: - virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event); - virtual void mousePressEvent(QGraphicsSceneMouseEvent *event); - virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); - virtual void focusInEvent(QFocusEvent *); - virtual void focusOutEvent(QFocusEvent *); - virtual void keyPressEvent(QKeyEvent *); - virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *); - virtual QVariant itemChange(GraphicsItemChange, const QVariant &); - QRectF boundingRect() const; + void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override; + void mousePressEvent(QGraphicsSceneMouseEvent *event) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; + void focusInEvent(QFocusEvent *) override; + void focusOutEvent(QFocusEvent *) override; + void keyPressEvent(QKeyEvent *) override; + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *) override; + QVariant itemChange(GraphicsItemChange, const QVariant &) override; + QRectF boundingRect() const override; private: QPointF margin() const; diff --git a/sources/editor/graphicspart/parttextfield.h b/sources/editor/graphicspart/parttextfield.h index c6ad0fd8c..509e02b22 100644 --- a/sources/editor/graphicspart/parttextfield.h +++ b/sources/editor/graphicspart/parttextfield.h @@ -36,7 +36,7 @@ class PartTextField : public QGraphicsTextItem, public CustomElementPart // constructors, destructor public: PartTextField(QETElementEditor *, QGraphicsItem * = nullptr); - virtual ~PartTextField(); + ~PartTextField() override; private: PartTextField(const PartTextField &); @@ -53,19 +53,19 @@ class PartTextField : public QGraphicsTextItem, public CustomElementPart PartTextField. @return the QGraphicsItem type */ - virtual int type() const { return Type; } - virtual QString name() const { return(QObject::tr("champ de texte", "element part name")); } - virtual QString xmlName() const { return(QString("input")); } - void fromXml(const QDomElement &); - const QDomElement toXml(QDomDocument &) const; - virtual bool isUseless() const; - virtual QRectF sceneGeometricRect() const; - virtual void startUserTransformation(const QRectF &); - virtual void handleUserTransformation(const QRectF &, const QRectF &); + int type() const override { return Type; } + QString name() const override { return(QObject::tr("champ de texte", "element part name")); } + QString xmlName() const override { return(QString("input")); } + void fromXml(const QDomElement &) override; + const QDomElement toXml(QDomDocument &) const override; + bool isUseless() const override; + QRectF sceneGeometricRect() const override; + void startUserTransformation(const QRectF &) override; + void handleUserTransformation(const QRectF &, const QRectF &) override; ///PROPERTY - virtual void setProperty(const char *name, const QVariant &value) {QGraphicsTextItem::setProperty(name, value);} - virtual QVariant property(const char *name) const {return QGraphicsTextItem::property(name);} + void setProperty(const char *name, const QVariant &value) override {QGraphicsTextItem::setProperty(name, value);} + QVariant property(const char *name) const override {return QGraphicsTextItem::property(name);} // displayed text Q_PROPERTY(QString text READ toPlainText WRITE setPlainText) @@ -97,15 +97,15 @@ class PartTextField : public QGraphicsTextItem, public CustomElementPart void endEdition(); protected: - virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event); - virtual void mousePressEvent(QGraphicsSceneMouseEvent *event); - virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); - virtual void focusInEvent(QFocusEvent *); - virtual void focusOutEvent(QFocusEvent *); - virtual void keyPressEvent(QKeyEvent *); - virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *); - virtual QVariant itemChange(GraphicsItemChange, const QVariant &); - QRectF boundingRect() const; + void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override; + void mousePressEvent(QGraphicsSceneMouseEvent *event) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; + void focusInEvent(QFocusEvent *) override; + void focusOutEvent(QFocusEvent *) override; + void keyPressEvent(QKeyEvent *) override; + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *) override; + QVariant itemChange(GraphicsItemChange, const QVariant &) override; + QRectF boundingRect() const override; private: QPointF margin() const; diff --git a/sources/editor/lineeditor.h b/sources/editor/lineeditor.h index cc4bcc506..1d1699a1f 100644 --- a/sources/editor/lineeditor.h +++ b/sources/editor/lineeditor.h @@ -34,7 +34,7 @@ class LineEditor : public ElementItemEditor // constructors, destructor public: LineEditor(QETElementEditor *, PartLine * = nullptr, QWidget * = nullptr); - virtual ~LineEditor(); + ~LineEditor() override; private: LineEditor(const LineEditor &); @@ -49,8 +49,8 @@ class LineEditor : public ElementItemEditor // methods public: - virtual bool setPart(CustomElementPart *); - virtual CustomElementPart *currentPart() const; + bool setPart(CustomElementPart *) override; + CustomElementPart *currentPart() const override; QPointF editedP1() const; QPointF editedP2() const; @@ -60,7 +60,7 @@ class LineEditor : public ElementItemEditor void updateLineEndType2(); void updateLineEndLength2(); void lineEditingFinished(); - void updateForm(); + void updateForm() override; private: void activeConnections(bool); diff --git a/sources/editor/polygoneditor.h b/sources/editor/polygoneditor.h index 1922118fa..86bee4683 100644 --- a/sources/editor/polygoneditor.h +++ b/sources/editor/polygoneditor.h @@ -36,7 +36,7 @@ class PolygonEditor : public ElementItemEditor { // constructors, destructor public: PolygonEditor(QETElementEditor *, PartPolygon * = nullptr, QWidget * = nullptr); - virtual ~PolygonEditor(); + ~PolygonEditor() override; private: PolygonEditor(const PolygonEditor &); @@ -50,8 +50,8 @@ class PolygonEditor : public ElementItemEditor { // methods public: - virtual bool setPart(CustomElementPart *); - virtual CustomElementPart *currentPart() const; + bool setPart(CustomElementPart *) override; + CustomElementPart *currentPart() const override; private: QVector getPointsFromTree(); @@ -59,7 +59,7 @@ class PolygonEditor : public ElementItemEditor { public slots: void updatePolygonPoints(); void updatePolygonClosedState(); - void updateForm(); + void updateForm() override; void validColumn(QTreeWidgetItem *qtwi, int column); private: diff --git a/sources/editor/qetelementeditor.h b/sources/editor/qetelementeditor.h index 10f46de47..a3da9cc68 100644 --- a/sources/editor/qetelementeditor.h +++ b/sources/editor/qetelementeditor.h @@ -37,7 +37,7 @@ class QETElementEditor : public QETMainWindow { // constructor, destructor public: QETElementEditor(QWidget * = nullptr); - virtual ~QETElementEditor(); + ~QETElementEditor() override; private: QETElementEditor(const QETElementEditor &); void setupActions(); @@ -116,8 +116,8 @@ class QETElementEditor : public QETMainWindow { void saveToLocation(ElementsLocation loc); protected: - void closeEvent(QCloseEvent *); - virtual void firstActivation(QEvent *); + void closeEvent(QCloseEvent *) override; + void firstActivation(QEvent *) override; private: bool canClose(); diff --git a/sources/editor/rectangleeditor.h b/sources/editor/rectangleeditor.h index 4d0b016a6..b9298c318 100644 --- a/sources/editor/rectangleeditor.h +++ b/sources/editor/rectangleeditor.h @@ -34,7 +34,7 @@ class RectangleEditor : public ElementItemEditor // constructors, destructor public: RectangleEditor(QETElementEditor *, PartRectangle * = nullptr, QWidget * = nullptr); - virtual ~RectangleEditor(); + ~RectangleEditor() override; private: RectangleEditor(const RectangleEditor &); @@ -47,12 +47,12 @@ class RectangleEditor : public ElementItemEditor // methods public: - virtual bool setPart(CustomElementPart *); - virtual CustomElementPart *currentPart() const; + bool setPart(CustomElementPart *) override; + CustomElementPart *currentPart() const override; QPointF editedTopLeft () const; public slots: - void updateForm(); + void updateForm() override; void editingFinished(); private: diff --git a/sources/editor/styleeditor.h b/sources/editor/styleeditor.h index d8ae27a87..dfcbe8b07 100644 --- a/sources/editor/styleeditor.h +++ b/sources/editor/styleeditor.h @@ -37,7 +37,7 @@ class StyleEditor : public ElementItemEditor // constructors, destructor public: StyleEditor(QETElementEditor *, CustomElementGraphicPart * = nullptr, QWidget * = nullptr); - virtual ~StyleEditor(); + ~StyleEditor() override; private: StyleEditor(const StyleEditor &); @@ -53,14 +53,14 @@ class StyleEditor : public ElementItemEditor // methods public: - virtual bool setPart(CustomElementPart *); - virtual bool setParts(QList); - virtual CustomElementPart *currentPart() const; + bool setPart(CustomElementPart *) override; + bool setParts(QList) override; + CustomElementPart *currentPart() const override; static bool isStyleEditable (QList cep_list); public slots: - void updateForm(); + void updateForm() override; void updatePartAntialiasing(); void updatePartColor(); void updatePartLineStyle(); diff --git a/sources/editor/terminaleditor.h b/sources/editor/terminaleditor.h index 0f0a00f34..6bfdc9cd9 100644 --- a/sources/editor/terminaleditor.h +++ b/sources/editor/terminaleditor.h @@ -32,7 +32,7 @@ class TerminalEditor : public ElementItemEditor { // Constructors, destructor public: TerminalEditor(QETElementEditor *, PartTerminal * = nullptr, QWidget * = nullptr); - virtual ~TerminalEditor(); + ~TerminalEditor() override; private: TerminalEditor(const TerminalEditor &); @@ -45,13 +45,13 @@ class TerminalEditor : public ElementItemEditor { // methods public: - virtual bool setPart(CustomElementPart *); - virtual CustomElementPart *currentPart() const; + bool setPart(CustomElementPart *) override; + CustomElementPart *currentPart() const override; public slots: void updateTerminalO(); void updatePos(); - void updateForm(); + void updateForm() override; private: void activeConnections(bool); diff --git a/sources/editor/texteditor.h b/sources/editor/texteditor.h index dcbd64680..6ab183480 100644 --- a/sources/editor/texteditor.h +++ b/sources/editor/texteditor.h @@ -39,7 +39,7 @@ class TextEditor : public ElementItemEditor // Constructors, destructor public: TextEditor(QETElementEditor *, PartText * = nullptr, QWidget * = nullptr); - virtual ~TextEditor(); + ~TextEditor() override; private: TextEditor(const TextEditor &); @@ -56,8 +56,8 @@ class TextEditor : public ElementItemEditor // methods public: - virtual bool setPart(CustomElementPart *); - virtual CustomElementPart *currentPart() const; + bool setPart(CustomElementPart *) override; + CustomElementPart *currentPart() const override; public slots: void updateTextT(); @@ -65,7 +65,7 @@ class TextEditor : public ElementItemEditor void updateTextC(); void updateTextRotationAngle(); void updatePos(); - void updateForm(); + void updateForm() override; private: void activeConnections(bool); diff --git a/sources/editor/textfieldeditor.h b/sources/editor/textfieldeditor.h index 4169cf5c7..63cbd11c0 100644 --- a/sources/editor/textfieldeditor.h +++ b/sources/editor/textfieldeditor.h @@ -38,7 +38,7 @@ class TextFieldEditor : public ElementItemEditor // Constructors, destructor public: TextFieldEditor(QETElementEditor *, PartTextField * = nullptr, QWidget * = nullptr); - virtual ~TextFieldEditor(); + ~TextFieldEditor() override; private: TextFieldEditor(const TextFieldEditor &); @@ -55,8 +55,8 @@ class TextFieldEditor : public ElementItemEditor // methods public: - virtual bool setPart(CustomElementPart *); - virtual CustomElementPart *currentPart() const; + bool setPart(CustomElementPart *) override; + CustomElementPart *currentPart() const override; public slots: void updateTextFieldT(); @@ -65,7 +65,7 @@ class TextFieldEditor : public ElementItemEditor void updateTextFieldRotationAngle(); void updateTagg(); void updatePos(); - void updateForm(); + void updateForm() override; private: void activeConnections(bool); diff --git a/sources/editor/ui/elementpropertieseditorwidget.h b/sources/editor/ui/elementpropertieseditorwidget.h index 47fdda135..fa432b66a 100644 --- a/sources/editor/ui/elementpropertieseditorwidget.h +++ b/sources/editor/ui/elementpropertieseditorwidget.h @@ -38,7 +38,7 @@ class ElementPropertiesEditorWidget : public QDialog //METHODS public: explicit ElementPropertiesEditorWidget(QString &basic_type, DiagramContext &dc, QWidget *parent = nullptr); - ~ElementPropertiesEditorWidget(); + ~ElementPropertiesEditorWidget() override; void upDateInterface(); diff --git a/sources/elementscategoryeditor.h b/sources/elementscategoryeditor.h index 0010d725e..4c10a009c 100644 --- a/sources/elementscategoryeditor.h +++ b/sources/elementscategoryeditor.h @@ -36,7 +36,7 @@ class ElementsCategoryEditor : public QDialog public: ElementsCategoryEditor(const ElementsLocation &location, bool edit = true, QWidget *parent = nullptr); - virtual ~ElementsCategoryEditor(); + ~ElementsCategoryEditor() override; ElementsLocation createdLocation() const; diff --git a/sources/elementscollectioncache.h b/sources/elementscollectioncache.h index 9e18a21c2..8223933e2 100644 --- a/sources/elementscollectioncache.h +++ b/sources/elementscollectioncache.h @@ -32,7 +32,7 @@ class ElementsCollectionCache : public QObject public: // constructor, destructor ElementsCollectionCache(const QString &database_path, QObject * = nullptr); - virtual ~ElementsCollectionCache(); + ~ElementsCollectionCache() override; // methods public: diff --git a/sources/elementspanel.h b/sources/elementspanel.h index 3fea19506..dd6d445fa 100644 --- a/sources/elementspanel.h +++ b/sources/elementspanel.h @@ -37,7 +37,7 @@ class ElementsPanel : public GenericPanel { // constructors, destructor public: ElementsPanel(QWidget * = nullptr); - virtual ~ElementsPanel(); + ~ElementsPanel() override; private: ElementsPanel(const ElementsPanel &); @@ -66,7 +66,7 @@ class ElementsPanel : public GenericPanel { void ensureHierarchyIsVisible(const QList &); protected: - void startDrag(Qt::DropActions); + void startDrag(Qt::DropActions) override; void startTitleBlockTemplateDrag(const TitleBlockTemplateLocation &); bool matchesFilter(const QTreeWidgetItem *, QString) const; @@ -75,8 +75,8 @@ class ElementsPanel : public GenericPanel { private: virtual QTreeWidgetItem *addProject (QETProject *); - virtual QTreeWidgetItem *updateTemplatesCollectionItem(QTreeWidgetItem *, TitleBlockTemplatesCollection *, PanelOptions = AddAllChild, bool = false); - virtual QTreeWidgetItem *updateTemplateItem (QTreeWidgetItem *, const TitleBlockTemplateLocation &, PanelOptions, bool = false); + QTreeWidgetItem *updateTemplatesCollectionItem(QTreeWidgetItem *, TitleBlockTemplatesCollection *, PanelOptions = AddAllChild, bool = false) override; + QTreeWidgetItem *updateTemplateItem (QTreeWidgetItem *, const TitleBlockTemplateLocation &, PanelOptions, bool = false) override; // attributes private: diff --git a/sources/elementspanelwidget.h b/sources/elementspanelwidget.h index 9de6166c9..51fcadbd5 100644 --- a/sources/elementspanelwidget.h +++ b/sources/elementspanelwidget.h @@ -31,7 +31,7 @@ class ElementsPanelWidget : public QWidget { // constructors, destructor public: ElementsPanelWidget(QWidget * = nullptr); - virtual ~ElementsPanelWidget(); + ~ElementsPanelWidget() override; private: ElementsPanelWidget(const ElementsPanelWidget &); @@ -86,7 +86,7 @@ class ElementsPanelWidget : public QWidget { void filterEdited(const QString &); protected: - virtual void keyPressEvent (QKeyEvent *e); + void keyPressEvent (QKeyEvent *e) override; private: QString previous_filter_; diff --git a/sources/exportdialog.h b/sources/exportdialog.h index 1ae7a3a8d..78350024b 100644 --- a/sources/exportdialog.h +++ b/sources/exportdialog.h @@ -33,7 +33,7 @@ class ExportDialog : public QDialog { // constructors, destructor public: ExportDialog(QETProject *, QWidget * = nullptr); - virtual ~ExportDialog(); + ~ExportDialog() override; private: ExportDialog(const ExportDialog &); diff --git a/sources/exportpropertieswidget.h b/sources/exportpropertieswidget.h index 8662db934..1cd1e56f6 100644 --- a/sources/exportpropertieswidget.h +++ b/sources/exportpropertieswidget.h @@ -30,7 +30,7 @@ class ExportPropertiesWidget : public QWidget { public: ExportPropertiesWidget(QWidget * = nullptr); ExportPropertiesWidget(const ExportProperties &, QWidget * = nullptr); - virtual ~ExportPropertiesWidget(); + ~ExportPropertiesWidget() override; private: ExportPropertiesWidget(const ExportPropertiesWidget &); diff --git a/sources/genericpanel.h b/sources/genericpanel.h index d0b27701d..52e8d022e 100644 --- a/sources/genericpanel.h +++ b/sources/genericpanel.h @@ -56,7 +56,7 @@ class GenericPanel : public QTreeWidget { // Constructors, destructor public: GenericPanel(QWidget * = nullptr); - virtual ~GenericPanel(); + ~GenericPanel() override; public: // convenience methods to obtain what an item represents @@ -132,7 +132,7 @@ class GenericPanel : public QTreeWidget { template T valueForItem(QTreeWidgetItem *) const; void unregisterItem(QTreeWidgetItem *); - bool event(QEvent *); + bool event(QEvent *) override; signals: bool firstActivated(); diff --git a/sources/nameslistwidget.h b/sources/nameslistwidget.h index cbe4d5e0c..b7669a110 100644 --- a/sources/nameslistwidget.h +++ b/sources/nameslistwidget.h @@ -29,7 +29,7 @@ class NamesListWidget : public QWidget { // constructors, destructor public: NamesListWidget(QWidget * = nullptr); - virtual ~NamesListWidget(); + ~NamesListWidget() override; private: NamesListWidget(const NamesListWidget &); diff --git a/sources/newelementwizard.h b/sources/newelementwizard.h index 04205f30b..102388dd5 100644 --- a/sources/newelementwizard.h +++ b/sources/newelementwizard.h @@ -42,7 +42,7 @@ class NewElementWizard : public QWizard // constructors, destructor public: NewElementWizard(QWidget * = nullptr, Qt::WindowFlags = nullptr); - virtual ~NewElementWizard(); + ~NewElementWizard() override; void preselectedLocation(const ElementsLocation &location); @@ -66,7 +66,7 @@ class NewElementWizard : public QWizard QWizardPage *buildStep3(); bool validStep1(); bool validStep2(); - bool validateCurrentPage(); + bool validateCurrentPage() override; void createNewElement(); }; #endif diff --git a/sources/projectconfigpages.h b/sources/projectconfigpages.h index 23f07c720..4fee3a729 100644 --- a/sources/projectconfigpages.h +++ b/sources/projectconfigpages.h @@ -41,7 +41,7 @@ class ProjectConfigPage : public ConfigPage { // Constructor, destructor public: ProjectConfigPage(QETProject *, QWidget * = nullptr); - virtual ~ProjectConfigPage(); + ~ProjectConfigPage() override; private: ProjectConfigPage(const ProjectConfigPage &); @@ -49,7 +49,7 @@ class ProjectConfigPage : public ConfigPage { public: virtual QETProject *project() const; virtual QETProject *setProject(QETProject *project, bool = true); - virtual void applyConf(); + void applyConf() override; /** Apply configuration to the project after user input. This method is automatically called when the ConfigDialog is validated, and only if the @@ -91,22 +91,22 @@ class ProjectMainConfigPage : public ProjectConfigPage { // Constructor, destructor public: ProjectMainConfigPage(QETProject *, QWidget * = nullptr); - virtual ~ProjectMainConfigPage(); + ~ProjectMainConfigPage() override; private: ProjectMainConfigPage(const ProjectMainConfigPage &); // methods public: - QString title() const; - QIcon icon() const; - void applyProjectConf(); + QString title() const override; + QIcon icon() const override; + void applyProjectConf() override; QString projectTitle() const; protected: - void initWidgets(); - void initLayout(); - void readValuesFromProject(); - void adjustReadOnly(); + void initWidgets() override; + void initLayout() override; + void readValuesFromProject() override; + void adjustReadOnly() override; // attributes protected: @@ -124,15 +124,15 @@ class ProjectAutoNumConfigPage : public ProjectConfigPage { public: ProjectAutoNumConfigPage (QETProject *project, QWidget *parent = nullptr); - virtual QString title() const; - virtual QIcon icon() const; - virtual void applyProjectConf(); + QString title() const override; + QIcon icon() const override; + void applyProjectConf() override; virtual void changeToTab(int); protected: - virtual void initWidgets(); - virtual void initLayout() {} - virtual void readValuesFromProject(); - virtual void adjustReadOnly(); + void initWidgets() override; + void initLayout() override {} + void readValuesFromProject() override; + void adjustReadOnly() override; private: void buildConnections(); private slots: diff --git a/sources/projectview.h b/sources/projectview.h index 190eddac3..5d630c9b1 100644 --- a/sources/projectview.h +++ b/sources/projectview.h @@ -42,7 +42,7 @@ class ProjectView : public QWidget // constructors, destructor public: ProjectView(QETProject *, QWidget * = nullptr); - virtual ~ProjectView(); + ~ProjectView() override; private: ProjectView(const ProjectView &); @@ -52,7 +52,7 @@ class ProjectView : public QWidget void setProject(QETProject *); QList diagram_views() const; DiagramView *currentDiagram() const; - void closeEvent(QCloseEvent *); + void closeEvent(QCloseEvent *) override; void changeTabUp(); void changeTabDown(); void changeFirstTab(); diff --git a/sources/properties/xrefproperties.h b/sources/properties/xrefproperties.h index f64454591..86b59b51c 100644 --- a/sources/properties/xrefproperties.h +++ b/sources/properties/xrefproperties.h @@ -40,10 +40,10 @@ class XRefProperties : public PropertiesInterface Label }; - virtual void toSettings (QSettings &settings, const QString = QString()) const; - virtual void fromSettings (const QSettings &settings, const QString = QString()); - virtual void toXml (QDomElement &xml_element) const; - virtual void fromXml (const QDomElement &xml_element); + void toSettings (QSettings &settings, const QString = QString()) const override; + void fromSettings (const QSettings &settings, const QString = QString()) override; + void toXml (QDomElement &xml_element) const override; + void fromXml (const QDomElement &xml_element) override; static QHash defaultProperties(); diff --git a/sources/qetapp.h b/sources/qetapp.h index 98238de15..46593c293 100644 --- a/sources/qetapp.h +++ b/sources/qetapp.h @@ -55,7 +55,7 @@ class QETApp : public QETSingleApplication { // constructors, destructor public: QETApp(int &, char **); - virtual ~QETApp(); + ~QETApp() override; private: QETApp(const QETApp &); diff --git a/sources/qetarguments.h b/sources/qetarguments.h index e57b200c2..c838d709d 100644 --- a/sources/qetarguments.h +++ b/sources/qetarguments.h @@ -32,7 +32,7 @@ class QETArguments : public QObject { QETArguments(const QList &, QObject * = nullptr); QETArguments(const QETArguments &); QETArguments &operator=(const QETArguments &); - virtual ~QETArguments(); + ~QETArguments() override; // methods public: diff --git a/sources/qetdiagrameditor.h b/sources/qetdiagrameditor.h index f0c6503d5..92103d614 100644 --- a/sources/qetdiagrameditor.h +++ b/sources/qetdiagrameditor.h @@ -44,7 +44,7 @@ class QETDiagramEditor : public QETMainWindow { // constructors, destructor public: QETDiagramEditor(const QStringList & = QStringList(), QWidget * = nullptr); - virtual ~QETDiagramEditor(); + ~QETDiagramEditor() override; private: QETDiagramEditor(const QETDiagramEditor &); @@ -61,7 +61,7 @@ class QETDiagramEditor : public QETMainWindow { // methods public: - void closeEvent (QCloseEvent *); + void closeEvent (QCloseEvent *) override; QList openedProjects () const; void addProjectView (ProjectView *); bool openAndAddProject (const QString &, bool = true, bool = true); @@ -72,7 +72,7 @@ class QETDiagramEditor : public QETMainWindow { bool drawGrid() const; protected: - virtual bool event(QEvent *); + bool event(QEvent *) override; private: bool addProject(QETProject *, bool = true); diff --git a/sources/qetgraphicsitem/commentitem.h b/sources/qetgraphicsitem/commentitem.h index 2abb612a4..fb9cdcbbc 100644 --- a/sources/qetgraphicsitem/commentitem.h +++ b/sources/qetgraphicsitem/commentitem.h @@ -34,7 +34,7 @@ class CommentItem : public QGraphicsObject public: explicit CommentItem(Element *elmt); - virtual QRectF boundingRect() const; + QRectF boundingRect() const override; signals: @@ -43,8 +43,8 @@ class CommentItem : public QGraphicsObject void updateLabel(); protected: - virtual void paint (QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); - virtual void mouseDoubleClickEvent (QGraphicsSceneMouseEvent * event ); + void paint (QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; + void mouseDoubleClickEvent (QGraphicsSceneMouseEvent * event ) override; virtual bool setTextParent (); private: diff --git a/sources/qetgraphicsitem/conductor.h b/sources/qetgraphicsitem/conductor.h index f2e2c84af..79ea3be68 100644 --- a/sources/qetgraphicsitem/conductor.h +++ b/sources/qetgraphicsitem/conductor.h @@ -53,7 +53,7 @@ class Conductor : public QObject, public QGraphicsPathItem public: Conductor(Terminal *, Terminal *); - virtual ~Conductor(); + ~Conductor() override; bool isValid() const; @@ -72,7 +72,7 @@ class Conductor : public QObject, public QGraphicsPathItem * Enable the use of qgraphicsitem_cast to safely cast a QGraphicsItem into a conductor. * @return the QGraphicsItem type */ - virtual int type() const { return Type; } + int type() const override { return Type; } Diagram *diagram() const; ConductorTextItem *textItem() const; void updatePath(const QRectF & = QRectF()); @@ -82,9 +82,9 @@ class Conductor : public QObject, public QGraphicsPathItem void updatePathAnimate(const int = 1) {updatePath();} int fakePath() {return 1;} - void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *); - QRectF boundingRect() const; - virtual QPainterPath shape() const; + void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) override; + QRectF boundingRect() const override; + QPainterPath shape() const override; virtual QPainterPath nearShape() const; qreal length() const; ConductorSegment *middleSegment(); @@ -132,13 +132,13 @@ class Conductor : public QObject, public QGraphicsPathItem void displayedTextChanged(); protected: - virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event); - virtual void mousePressEvent(QGraphicsSceneMouseEvent *event); - virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); - virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event); - virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event); - virtual QVariant itemChange(GraphicsItemChange, const QVariant &); - virtual bool sceneEventFilter(QGraphicsItem *watched, QEvent *event); + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override; + void mousePressEvent(QGraphicsSceneMouseEvent *event) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; + void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; + void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; + QVariant itemChange(GraphicsItemChange, const QVariant &) override; + bool sceneEventFilter(QGraphicsItem *watched, QEvent *event) override; private: void adjusteHandlerPos(); diff --git a/sources/qetgraphicsitem/conductortextitem.h b/sources/qetgraphicsitem/conductortextitem.h index 442ebf8a8..c618c55e5 100644 --- a/sources/qetgraphicsitem/conductortextitem.h +++ b/sources/qetgraphicsitem/conductortextitem.h @@ -34,16 +34,16 @@ class ConductorTextItem : public DiagramTextItem public: ConductorTextItem(Conductor * = nullptr); ConductorTextItem(const QString &, Conductor * = nullptr); - virtual ~ConductorTextItem(); + ~ConductorTextItem() override; private: ConductorTextItem(const ConductorTextItem &); public: enum { Type = UserType + 1006 }; Conductor *parentConductor() const; - virtual void fromXml(const QDomElement &); + void fromXml(const QDomElement &) override; virtual void toXml (QDomElement &xml) const; - virtual int type() const { return Type; } + int type() const override { return Type; } virtual bool wasMovedByUser() const; virtual bool wasRotateByUser() const; virtual void forceMovedByUser(bool); @@ -52,12 +52,12 @@ class ConductorTextItem : public DiagramTextItem virtual void setPos(qreal x, qreal y); protected: - virtual void mousePressEvent (QGraphicsSceneMouseEvent *event); - virtual void mouseMoveEvent (QGraphicsSceneMouseEvent *event); - virtual void mouseReleaseEvent (QGraphicsSceneMouseEvent *event); - virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *); - virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *); - virtual void hoverMoveEvent(QGraphicsSceneHoverEvent *); + void mousePressEvent (QGraphicsSceneMouseEvent *event) override; + void mouseMoveEvent (QGraphicsSceneMouseEvent *event) override; + void mouseReleaseEvent (QGraphicsSceneMouseEvent *event) override; + void hoverEnterEvent(QGraphicsSceneHoverEvent *) override; + void hoverLeaveEvent(QGraphicsSceneHoverEvent *) override; + void hoverMoveEvent(QGraphicsSceneHoverEvent *) override; // attributes private: diff --git a/sources/qetgraphicsitem/crossrefitem.h b/sources/qetgraphicsitem/crossrefitem.h index 8eec3598e..87ccc38ad 100644 --- a/sources/qetgraphicsitem/crossrefitem.h +++ b/sources/qetgraphicsitem/crossrefitem.h @@ -42,10 +42,10 @@ class CrossRefItem : public QGraphicsObject //Methods public: explicit CrossRefItem(Element *elmt); - ~CrossRefItem(); + ~CrossRefItem() override; enum { Type = UserType + 1009 }; - virtual int type() const { return Type; } + int type() const override { return Type; } enum CONTACTS { NO = 1, @@ -58,8 +58,8 @@ class CrossRefItem : public QGraphicsObject Delay = 48 }; - QRectF boundingRect () const; - virtual QPainterPath shape () const; + QRectF boundingRect () const override; + QPainterPath shape () const override; QString elementPositionText (const Element *elmt, const bool &add_prefix = false) const; public slots: @@ -68,11 +68,11 @@ class CrossRefItem : public QGraphicsObject void autoPos (); protected: - virtual void paint (QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); - virtual void mouseDoubleClickEvent (QGraphicsSceneMouseEvent * event ); - virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event); - virtual void hoverMoveEvent(QGraphicsSceneHoverEvent *event); - virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event); + void paint (QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; + void mouseDoubleClickEvent (QGraphicsSceneMouseEvent * event ) override; + void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; + void hoverMoveEvent(QGraphicsSceneHoverEvent *event) override; + void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; private: void buildHeaderContact (); diff --git a/sources/qetgraphicsitem/customelement.h b/sources/qetgraphicsitem/customelement.h index 79e07f3c1..013d8827b 100644 --- a/sources/qetgraphicsitem/customelement.h +++ b/sources/qetgraphicsitem/customelement.h @@ -38,7 +38,7 @@ class CustomElement : public FixedElement public: CustomElement (const ElementsLocation &, QGraphicsItem * = nullptr, int * = nullptr); - virtual ~CustomElement(); + ~CustomElement() override; private: CustomElement(const CustomElement &); @@ -62,20 +62,20 @@ class CustomElement : public FixedElement // methods public: - virtual QList terminals() const; - virtual QList conductors() const; - virtual QList texts() const; - virtual QList lines() const; - virtual QList rectangles() const; - virtual QList circles() const; - virtual QList *> polygons() const; - virtual QList *> arcs() const; - virtual int terminalsCount() const; - virtual void paint(QPainter *, const QStyleOptionGraphicsItem *); - QString typeId() const; + QList terminals() const override; + QList conductors() const override; + QList texts() const override; + QList lines() const override; + QList rectangles() const override; + QList circles() const override; + QList *> polygons() const override; + QList *> arcs() const override; + int terminalsCount() const override; + void paint(QPainter *, const QStyleOptionGraphicsItem *) override; + QString typeId() const override; ElementsLocation location() const; - QString name() const; - ElementTextItem* taggedText(const QString &tagg) const; + QString name() const override; + ElementTextItem* taggedText(const QString &tagg) const override; protected: virtual bool buildFromXml(const QDomElement &, int * = nullptr); diff --git a/sources/qetgraphicsitem/diagramimageitem.h b/sources/qetgraphicsitem/diagramimageitem.h index 69ddb3887..cf0a5f7fe 100644 --- a/sources/qetgraphicsitem/diagramimageitem.h +++ b/sources/qetgraphicsitem/diagramimageitem.h @@ -35,7 +35,7 @@ class DiagramImageItem : public QetGraphicsItem { public: DiagramImageItem(QetGraphicsItem * = nullptr); DiagramImageItem(const QPixmap &pixmap, QetGraphicsItem * = nullptr); - virtual ~DiagramImageItem(); + ~DiagramImageItem() override; // attributes public: @@ -48,17 +48,17 @@ class DiagramImageItem : public QetGraphicsItem { DiagramImageItem @return the QGraphicsItem type */ - virtual int type() const { return Type; } + int type() const override { return Type; } virtual bool fromXml(const QDomElement &); virtual QDomElement toXml(QDomDocument &) const; - virtual void editProperty(); + void editProperty() override; void setPixmap(const QPixmap &pixmap); - virtual QRectF boundingRect() const; - virtual QString name() const; + QRectF boundingRect() const override; + QString name() const override; protected: - virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *); + void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) override; protected: QPixmap pixmap_; diff --git a/sources/qetgraphicsitem/diagramtextitem.h b/sources/qetgraphicsitem/diagramtextitem.h index 46efc780b..8bba7424e 100644 --- a/sources/qetgraphicsitem/diagramtextitem.h +++ b/sources/qetgraphicsitem/diagramtextitem.h @@ -49,7 +49,7 @@ class DiagramTextItem : public QGraphicsTextItem public: enum { Type = UserType + 1004 }; - virtual int type() const override { return Type; } + int type() const override { return Type; } Diagram *diagram() const; virtual void fromXml(const QDomElement &) = 0; @@ -73,18 +73,18 @@ class DiagramTextItem : public QGraphicsTextItem void setNoEditable(bool e = true) {m_no_editable = e;} protected: - virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) override; - virtual void focusInEvent(QFocusEvent *) override; - virtual void focusOutEvent(QFocusEvent *) override; + void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) override; + void focusInEvent(QFocusEvent *) override; + void focusOutEvent(QFocusEvent *) override; - virtual void mouseDoubleClickEvent (QGraphicsSceneMouseEvent *event) override; - virtual void mousePressEvent (QGraphicsSceneMouseEvent *event) override; - virtual void mouseMoveEvent (QGraphicsSceneMouseEvent *event) override; - virtual void mouseReleaseEvent (QGraphicsSceneMouseEvent *event) override; + void mouseDoubleClickEvent (QGraphicsSceneMouseEvent *event) override; + void mousePressEvent (QGraphicsSceneMouseEvent *event) override; + void mouseMoveEvent (QGraphicsSceneMouseEvent *event) override; + void mouseReleaseEvent (QGraphicsSceneMouseEvent *event) override; - virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *) override; - virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *) override; - virtual void hoverMoveEvent(QGraphicsSceneHoverEvent *) override; + void hoverEnterEvent(QGraphicsSceneHoverEvent *) override; + void hoverLeaveEvent(QGraphicsSceneHoverEvent *) override; + void hoverMoveEvent(QGraphicsSceneHoverEvent *) override; virtual void applyRotation(const qreal &); diff --git a/sources/qetgraphicsitem/dynamicelementtextitem.h b/sources/qetgraphicsitem/dynamicelementtextitem.h index 567a7158e..ebfa4ce70 100644 --- a/sources/qetgraphicsitem/dynamicelementtextitem.h +++ b/sources/qetgraphicsitem/dynamicelementtextitem.h @@ -44,7 +44,7 @@ class DynamicElementTextItem : public DiagramTextItem ElementInfo }; enum {Type = UserType + 1010}; - virtual int type() const override {return Type;} + int type() const override {return Type;} signals: void taggChanged(QString tagg); @@ -53,13 +53,13 @@ class DynamicElementTextItem : public DiagramTextItem public: DynamicElementTextItem(Element *parent_element); - virtual ~DynamicElementTextItem() override; + ~DynamicElementTextItem() override; private: DynamicElementTextItem(const DynamicElementTextItem &); public: - virtual QDomElement toXml(QDomDocument &dom_doc) const override; - virtual void fromXml(const QDomElement &dom_elmt) override; + QDomElement toXml(QDomDocument &dom_doc) const override; + void fromXml(const QDomElement &dom_elmt) override; Element *ParentElement() const; @@ -72,8 +72,8 @@ class DynamicElementTextItem : public DiagramTextItem static QString xmlTaggName() {return QString("dynamic_elmt_text");} protected: - virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override; - virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; + void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; private: Element *m_parent_element = nullptr; diff --git a/sources/qetgraphicsitem/element.h b/sources/qetgraphicsitem/element.h index 85f868bb6..a16112797 100644 --- a/sources/qetgraphicsitem/element.h +++ b/sources/qetgraphicsitem/element.h @@ -42,7 +42,7 @@ class Element : public QetGraphicsItem // constructors, destructor public: Element(QGraphicsItem * = nullptr); - virtual ~Element(); + ~Element() override; private: Element(const Element &); @@ -53,7 +53,7 @@ class Element : public QetGraphicsItem * @return the QGraphicsItem type */ enum { Type = UserType + 1000 }; - virtual int type() const { return Type; } + int type() const override { return Type; } /** * @brief The kind enum @@ -164,13 +164,13 @@ class Element : public QetGraphicsItem /// @return This element type ID virtual QString typeId() const = 0; /// @return the human name for this element - virtual QString name() const = 0; + QString name() const override = 0; virtual bool isHighlighted() const; virtual void setHighlighted(bool); void displayHelpLine(bool b = true); - void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *); - QRectF boundingRect() const; + void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) override; + QRectF boundingRect() const override; QSize setSize(int, int); QSize size() const; QPixmap pixmap(); @@ -183,8 +183,8 @@ class Element : public QetGraphicsItem void select(); void deselect(); - virtual void rotateBy(const qreal &); - virtual void editProperty(); + void rotateBy(const qreal &) override; + void editProperty() override; // methods related to XML import/export static bool valideXml(QDomElement &); @@ -210,10 +210,10 @@ class Element : public QetGraphicsItem void etiToElementLabels(ElementTextItem*); protected: - virtual void mouseMoveEvent ( QGraphicsSceneMouseEvent *event ); - virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent *event ); - virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent * ); - virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * ); + void mouseMoveEvent ( QGraphicsSceneMouseEvent *event ) override; + void mouseReleaseEvent ( QGraphicsSceneMouseEvent *event ) override; + void hoverEnterEvent ( QGraphicsSceneHoverEvent * ) override; + void hoverLeaveEvent ( QGraphicsSceneHoverEvent * ) override; private: bool m_mouse_over; diff --git a/sources/qetgraphicsitem/elementtextitem.h b/sources/qetgraphicsitem/elementtextitem.h index 64a46c79a..6466ea567 100644 --- a/sources/qetgraphicsitem/elementtextitem.h +++ b/sources/qetgraphicsitem/elementtextitem.h @@ -33,12 +33,12 @@ class ElementTextItem : public DiagramTextItem { public: ElementTextItem(Element * = nullptr); ElementTextItem(const QString &, Element * = nullptr); - virtual ~ElementTextItem(); + ~ElementTextItem() override; // attributes public: enum { Type = UserType + 1003 }; - virtual int type () const { return Type; } + int type () const override { return Type; } private: Element *parent_element_; @@ -50,8 +50,8 @@ class ElementTextItem : public DiagramTextItem { // methods public: Element *parentElement () const; - void fromXml ( const QDomElement & ); - QDomElement toXml ( QDomDocument & ) const; + void fromXml ( const QDomElement & ) override; + QDomElement toXml ( QDomDocument & ) const override; void setOriginalPos ( const QPointF & ); QPointF originalPos () const; void setOriginalRotationAngle ( const qreal & ); @@ -66,11 +66,11 @@ class ElementTextItem : public DiagramTextItem { void adjustItemPosition(int = 0); protected: - virtual void mouseDoubleClickEvent ( QGraphicsSceneMouseEvent *event ); - virtual void mouseMoveEvent ( QGraphicsSceneMouseEvent *event ); - virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent *event ); - virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent *event ); - virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent *event ); + void mouseDoubleClickEvent ( QGraphicsSceneMouseEvent *event ) override; + void mouseMoveEvent ( QGraphicsSceneMouseEvent *event ) override; + void mouseReleaseEvent ( QGraphicsSceneMouseEvent *event ) override; + void hoverEnterEvent ( QGraphicsSceneHoverEvent *event ) override; + void hoverLeaveEvent ( QGraphicsSceneHoverEvent *event ) override; private: void build (); diff --git a/sources/qetgraphicsitem/fixedelement.h b/sources/qetgraphicsitem/fixedelement.h index ffea506ee..c508ee71a 100644 --- a/sources/qetgraphicsitem/fixedelement.h +++ b/sources/qetgraphicsitem/fixedelement.h @@ -30,15 +30,15 @@ class FixedElement : public Element { // constructors, destructor public: FixedElement(QGraphicsItem * = nullptr); - virtual ~FixedElement(); + ~FixedElement() override; // methods public: - int minTerminalsCount() const; - int maxTerminalsCount() const; - virtual int terminalsCount() const = 0; - virtual void paint(QPainter *, const QStyleOptionGraphicsItem *) = 0; - virtual QString typeId() const = 0; - virtual QString name() const = 0; + int minTerminalsCount() const override; + int maxTerminalsCount() const override; + int terminalsCount() const override = 0; + void paint(QPainter *, const QStyleOptionGraphicsItem *) override = 0; + QString typeId() const override = 0; + QString name() const override = 0; }; #endif diff --git a/sources/qetgraphicsitem/ghostelement.h b/sources/qetgraphicsitem/ghostelement.h index d0100dd39..e9f47ea19 100644 --- a/sources/qetgraphicsitem/ghostelement.h +++ b/sources/qetgraphicsitem/ghostelement.h @@ -37,12 +37,12 @@ class GhostElement : public CustomElement { // constructor, destructor public: GhostElement(const ElementsLocation &, QGraphicsItem * = nullptr); - virtual ~GhostElement(); + ~GhostElement() override; // methods public: - virtual bool fromXml(QDomElement &, QHash &, bool = false); - virtual kind linkType() const {return Simple;} + bool fromXml(QDomElement &, QHash &, bool = false) override; + kind linkType() const override {return Simple;} protected: QRectF minimalBoundingRect() const; diff --git a/sources/qetgraphicsitem/independenttextitem.h b/sources/qetgraphicsitem/independenttextitem.h index 7240cc1b4..5bd899bd0 100644 --- a/sources/qetgraphicsitem/independenttextitem.h +++ b/sources/qetgraphicsitem/independenttextitem.h @@ -30,7 +30,7 @@ class IndependentTextItem : public DiagramTextItem { public: IndependentTextItem(); IndependentTextItem(const QString &); - virtual ~IndependentTextItem(); + ~IndependentTextItem() override; // attributes public: @@ -43,9 +43,9 @@ class IndependentTextItem : public DiagramTextItem { IndependentTextItem. @return le type de QGraphicsItem */ - virtual int type() const { return Type; } - virtual void fromXml(const QDomElement &); - virtual QDomElement toXml(QDomDocument &) const; + int type() const override { return Type; } + void fromXml(const QDomElement &) override; + QDomElement toXml(QDomDocument &) const override; private: QPointF mouse_to_origin_movement_; diff --git a/sources/qetgraphicsitem/masterelement.h b/sources/qetgraphicsitem/masterelement.h index 942a7a73d..fdafd72d3 100644 --- a/sources/qetgraphicsitem/masterelement.h +++ b/sources/qetgraphicsitem/masterelement.h @@ -34,12 +34,12 @@ class MasterElement : public CustomElement public: explicit MasterElement(const ElementsLocation &, QGraphicsItem * = nullptr, int * = nullptr); - ~MasterElement(); + ~MasterElement() override; - virtual void linkToElement (Element *elmt); - virtual void unlinkAllElements (); - virtual void unlinkElement (Element *elmt); - virtual void initLink (QETProject *project); + void linkToElement (Element *elmt) override; + void unlinkAllElements () override; + void unlinkElement (Element *elmt) override; + void initLink (QETProject *project) override; public slots: void updateLabel(DiagramContext old_info, DiagramContext new_info); diff --git a/sources/qetgraphicsitem/qetgraphicsitem.h b/sources/qetgraphicsitem/qetgraphicsitem.h index eb733b14e..6818395d8 100644 --- a/sources/qetgraphicsitem/qetgraphicsitem.h +++ b/sources/qetgraphicsitem/qetgraphicsitem.h @@ -29,7 +29,7 @@ class QetGraphicsItem : public QGraphicsObject public: //constructor destructor QetGraphicsItem(QGraphicsItem *parent = nullptr); - virtual ~QetGraphicsItem() = 0; + ~QetGraphicsItem() override = 0; //public methode Diagram *diagram () const; @@ -46,10 +46,10 @@ class QetGraphicsItem : public QGraphicsObject //protected method protected: - virtual void mousePressEvent(QGraphicsSceneMouseEvent *e); - virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *e); - virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *e); - virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *e); + void mousePressEvent(QGraphicsSceneMouseEvent *e) override; + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *e) override; + void mouseMoveEvent(QGraphicsSceneMouseEvent *e) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *e) override; protected: bool is_movable_; diff --git a/sources/qetgraphicsitem/qetshapeitem.h b/sources/qetgraphicsitem/qetshapeitem.h index 13f023486..676ee7e7e 100644 --- a/sources/qetgraphicsitem/qetshapeitem.h +++ b/sources/qetgraphicsitem/qetshapeitem.h @@ -57,10 +57,10 @@ class QetShapeItem : public QetGraphicsItem enum { Type = UserType + 1008 }; QetShapeItem(QPointF, QPointF = QPointF(0,0), ShapeType = Line, QGraphicsItem *parent = nullptr); - virtual ~QetShapeItem(); + ~QetShapeItem() override; //Enable the use of qgraphicsitem_cast to safely cast a QGraphicsItem into a QetShapeItem @return the QGraphicsItem type - virtual int type() const { return Type; } + int type() const override { return Type; } ///METHODS QPen pen() const {return m_pen;} @@ -73,8 +73,8 @@ class QetShapeItem : public QetGraphicsItem virtual QDomElement toXml (QDomDocument &document) const; virtual bool toDXF (const QString &filepath); - virtual void editProperty(); - virtual QString name() const; + void editProperty() override; + QString name() const override; void setP2 (const QPointF &P2); QLineF line() const{return QLineF(m_P1, m_P2);} @@ -91,16 +91,16 @@ class QetShapeItem : public QetGraphicsItem void setNextPoint (QPointF P); void removePoints (int number = 1); - QRectF boundingRect() const; - QPainterPath shape() const; + QRectF boundingRect() const override; + QPainterPath shape() const override; protected: - virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); - virtual void hoverEnterEvent (QGraphicsSceneHoverEvent *event); - virtual void hoverLeaveEvent (QGraphicsSceneHoverEvent *event); - virtual void mouseReleaseEvent (QGraphicsSceneMouseEvent *event); - virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value); - virtual bool sceneEventFilter(QGraphicsItem *watched, QEvent *event); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; + void hoverEnterEvent (QGraphicsSceneHoverEvent *event) override; + void hoverLeaveEvent (QGraphicsSceneHoverEvent *event) override; + void mouseReleaseEvent (QGraphicsSceneMouseEvent *event) override; + QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; + bool sceneEventFilter(QGraphicsItem *watched, QEvent *event) override; private: void switchResizeMode(); diff --git a/sources/qetgraphicsitem/reportelement.h b/sources/qetgraphicsitem/reportelement.h index 12f93fc03..ea4509fa5 100644 --- a/sources/qetgraphicsitem/reportelement.h +++ b/sources/qetgraphicsitem/reportelement.h @@ -33,10 +33,10 @@ class ReportElement : public CustomElement public : explicit ReportElement(const ElementsLocation &,QString link_type, QGraphicsItem * = nullptr, int * = nullptr); - ~ReportElement(); - virtual void linkToElement(Element *); - virtual void unlinkAllElements(); - virtual void unlinkElement(Element *elmt); + ~ReportElement() override; + void linkToElement(Element *) override; + void unlinkAllElements() override; + void unlinkElement(Element *elmt) override; private: void conductorWasAdded(Conductor *conductor); diff --git a/sources/qetgraphicsitem/simpleelement.h b/sources/qetgraphicsitem/simpleelement.h index 89277539d..02508d1f9 100644 --- a/sources/qetgraphicsitem/simpleelement.h +++ b/sources/qetgraphicsitem/simpleelement.h @@ -33,9 +33,9 @@ class SimpleElement : public CustomElement { public : explicit SimpleElement(const ElementsLocation &, QGraphicsItem * = nullptr, int * = nullptr); - ~SimpleElement(); + ~SimpleElement() override; - virtual void initLink(QETProject *project); + void initLink(QETProject *project) override; public slots: void updateLabel(DiagramContext old_info, DiagramContext new_info); diff --git a/sources/qetgraphicsitem/slaveelement.h b/sources/qetgraphicsitem/slaveelement.h index 51d171da8..02dd1ab6b 100644 --- a/sources/qetgraphicsitem/slaveelement.h +++ b/sources/qetgraphicsitem/slaveelement.h @@ -26,10 +26,10 @@ class SlaveElement : public CustomElement Q_OBJECT public: explicit SlaveElement (const ElementsLocation &, QGraphicsItem * = nullptr, int * = nullptr); - ~SlaveElement(); - virtual void linkToElement(Element *elmt); - virtual void unlinkAllElements(); - virtual void unlinkElement(Element *elmt); + ~SlaveElement() override; + void linkToElement(Element *elmt) override; + void unlinkAllElements() override; + void unlinkElement(Element *elmt) override; signals: diff --git a/sources/qetgraphicsitem/terminal.h b/sources/qetgraphicsitem/terminal.h index 38a1a53cd..bc9b5466d 100644 --- a/sources/qetgraphicsitem/terminal.h +++ b/sources/qetgraphicsitem/terminal.h @@ -40,7 +40,7 @@ class Terminal : public QGraphicsObject Terminal(QPointF, Qet::Orientation, Element * = nullptr); Terminal(qreal, qreal, Qet::Orientation, Element * = nullptr); Terminal(QPointF, Qet::Orientation, QString number, QString name, bool hiddenName, Element * = nullptr); - virtual ~Terminal(); + ~Terminal() override; private: Terminal(const Terminal &); @@ -49,12 +49,12 @@ class Terminal : public QGraphicsObject public: //Enable the use of qgraphicsitem_cast to safely cast a QGraphicsItem into a Terminal //@return the QGraphicsItem type - virtual int type() const { return Type; } + int type() const override { return Type; } - void paint (QPainter *, const QStyleOptionGraphicsItem *, QWidget *); + void paint (QPainter *, const QStyleOptionGraphicsItem *, QWidget *) override; void drawHelpLine (bool draw = true); QLineF HelpLine () const; - QRectF boundingRect () const; + QRectF boundingRect () const override; // methods to manage conductors attached to the terminal Terminal* alignedWithTerminal () const; @@ -82,12 +82,12 @@ class Terminal : public QGraphicsObject protected: // methods related to events management - void hoverEnterEvent (QGraphicsSceneHoverEvent *); - void hoverMoveEvent (QGraphicsSceneHoverEvent *); - void hoverLeaveEvent (QGraphicsSceneHoverEvent *); - void mousePressEvent (QGraphicsSceneMouseEvent *); - void mouseMoveEvent (QGraphicsSceneMouseEvent *); - void mouseReleaseEvent(QGraphicsSceneMouseEvent *); + void hoverEnterEvent (QGraphicsSceneHoverEvent *) override; + void hoverMoveEvent (QGraphicsSceneHoverEvent *) override; + void hoverLeaveEvent (QGraphicsSceneHoverEvent *) override; + void mousePressEvent (QGraphicsSceneMouseEvent *) override; + void mouseMoveEvent (QGraphicsSceneMouseEvent *) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *) override; // attributes public: diff --git a/sources/qetgraphicsitem/terminalelement.h b/sources/qetgraphicsitem/terminalelement.h index d0f615e4e..60d6278ec 100644 --- a/sources/qetgraphicsitem/terminalelement.h +++ b/sources/qetgraphicsitem/terminalelement.h @@ -28,8 +28,8 @@ class TerminalElement : public CustomElement Q_OBJECT public: TerminalElement(const ElementsLocation &, QGraphicsItem * = nullptr, int * = nullptr); - ~TerminalElement(); - virtual void initLink(QETProject *project); + ~TerminalElement() override; + void initLink(QETProject *project) override; public slots: void updateLabel(DiagramContext old_info, DiagramContext new_info); diff --git a/sources/qetmainwindow.h b/sources/qetmainwindow.h index 737f4b355..aca1f5a22 100644 --- a/sources/qetmainwindow.h +++ b/sources/qetmainwindow.h @@ -29,7 +29,7 @@ class QETMainWindow : public QMainWindow { // constructor, destructor public: QETMainWindow(QWidget * = nullptr, Qt::WindowFlags = nullptr); - virtual ~QETMainWindow(); + ~QETMainWindow() override; // methods protected: @@ -39,9 +39,9 @@ class QETMainWindow : public QMainWindow { QAction *actionForMenu(QMenu *); protected: - virtual bool event(QEvent *); - virtual void dragEnterEvent(QDragEnterEvent *e); - virtual void dropEvent(QDropEvent *e); + bool event(QEvent *) override; + void dragEnterEvent(QDragEnterEvent *e) override; + void dropEvent(QDropEvent *e) override; virtual void firstActivation(QEvent *); // slots diff --git a/sources/qetprintpreviewdialog.h b/sources/qetprintpreviewdialog.h index 39843fbf3..61cfd7723 100644 --- a/sources/qetprintpreviewdialog.h +++ b/sources/qetprintpreviewdialog.h @@ -37,7 +37,7 @@ class QETPrintPreviewDialog : public QDialog { // constructors, destructor public: QETPrintPreviewDialog(QETProject *, QPrinter *, QWidget * = nullptr, Qt::WindowFlags = nullptr); - virtual ~QETPrintPreviewDialog(); + ~QETPrintPreviewDialog() override; private: QETPrintPreviewDialog(const QETPrintPreviewDialog &); diff --git a/sources/qetproject.h b/sources/qetproject.h index dfd27e656..8c42b23d5 100644 --- a/sources/qetproject.h +++ b/sources/qetproject.h @@ -51,7 +51,7 @@ class QETProject : public QObject public: QETProject (int = 1, QObject * = nullptr); QETProject (const QString &, QObject * = nullptr); - virtual ~QETProject(); + ~QETProject() override; private: QETProject(const QETProject &); diff --git a/sources/qetregexpvalidator.h b/sources/qetregexpvalidator.h index 6873ac9f2..55927f095 100644 --- a/sources/qetregexpvalidator.h +++ b/sources/qetregexpvalidator.h @@ -29,13 +29,13 @@ class QETRegExpValidator : public QRegExpValidator { public: QETRegExpValidator(QObject *); QETRegExpValidator(const QRegExp &, QObject *); - virtual ~QETRegExpValidator(); + ~QETRegExpValidator() override; private: QETRegExpValidator(const QETRegExpValidator &); // methods public: - virtual QValidator::State validate(QString &, int &) const; + QValidator::State validate(QString &, int &) const override; signals: void validationFailed() const; diff --git a/sources/qetsingleapplication.h b/sources/qetsingleapplication.h index c30d9036e..4ea7ba0f8 100644 --- a/sources/qetsingleapplication.h +++ b/sources/qetsingleapplication.h @@ -29,7 +29,7 @@ class QETSingleApplication : public QApplication { // constructors, destructor public: QETSingleApplication(int &, char **, const QString); - virtual ~QETSingleApplication(); + ~QETSingleApplication() override; private: QETSingleApplication(const QETSingleApplication &); diff --git a/sources/qfilenameedit.h b/sources/qfilenameedit.h index 7ab01cc81..3c8a99b66 100644 --- a/sources/qfilenameedit.h +++ b/sources/qfilenameedit.h @@ -36,7 +36,7 @@ class QFileNameEdit : public QLineEdit { public: QFileNameEdit(QWidget * = nullptr); QFileNameEdit(const QString &, QWidget * = nullptr); - virtual ~QFileNameEdit(); + ~QFileNameEdit() override; private: QFileNameEdit(const QFileNameEdit &); diff --git a/sources/qtextorientationspinboxwidget.h b/sources/qtextorientationspinboxwidget.h index 2c07177c3..1dfbb384c 100644 --- a/sources/qtextorientationspinboxwidget.h +++ b/sources/qtextorientationspinboxwidget.h @@ -30,7 +30,7 @@ class QTextOrientationSpinBoxWidget : public QWidget { // constructors, destructor public: QTextOrientationSpinBoxWidget(QWidget * = nullptr); - virtual ~QTextOrientationSpinBoxWidget(); + ~QTextOrientationSpinBoxWidget() override; private: QTextOrientationSpinBoxWidget(const QTextOrientationSpinBoxWidget &); diff --git a/sources/qtextorientationwidget.h b/sources/qtextorientationwidget.h index e6bf270bf..792508ef4 100644 --- a/sources/qtextorientationwidget.h +++ b/sources/qtextorientationwidget.h @@ -27,7 +27,7 @@ class QTextOrientationWidget : public QWidget { // constructors, destructor public: QTextOrientationWidget(QWidget * = nullptr); - virtual ~QTextOrientationWidget(); + ~QTextOrientationWidget() override; private: QTextOrientationWidget(const QTextOrientationWidget &); QTextOrientationWidget &operator=(const QTextOrientationWidget &); @@ -48,11 +48,11 @@ class QTextOrientationWidget : public QWidget { void setOrientation(const double &); protected: - virtual QSize sizeHint () const; - int heightForWidth(int) const; - virtual void paintEvent(QPaintEvent *); - void mouseMoveEvent(QMouseEvent *); - void mouseReleaseEvent(QMouseEvent *); + QSize sizeHint () const override; + int heightForWidth(int) const override; + void paintEvent(QPaintEvent *) override; + void mouseMoveEvent(QMouseEvent *) override; + void mouseReleaseEvent(QMouseEvent *) override; signals: /** diff --git a/sources/recentfiles.h b/sources/recentfiles.h index 3d2bd2845..171e311d4 100644 --- a/sources/recentfiles.h +++ b/sources/recentfiles.h @@ -29,7 +29,7 @@ class RecentFiles : public QObject { // constructors, destructor public: RecentFiles(const QString &, int = 10, QObject * = nullptr); - virtual ~RecentFiles(); + ~RecentFiles() override; private: RecentFiles(const RecentFiles &); diff --git a/sources/richtext/richtexteditor.cpp b/sources/richtext/richtexteditor.cpp index e54ab96c7..61779bb62 100644 --- a/sources/richtext/richtexteditor.cpp +++ b/sources/richtext/richtexteditor.cpp @@ -207,12 +207,12 @@ class AddLinkDialog : public QDialog public: AddLinkDialog(RichTextEditor *editor, QWidget *parent = nullptr); - ~AddLinkDialog(); + ~AddLinkDialog() override; int showDialog(); public slots: - void accept(); + void accept() override; private: RichTextEditor *m_editor; @@ -279,7 +279,7 @@ public: : QTextEdit(parent) {} - void contextMenuEvent(QContextMenuEvent *event); + void contextMenuEvent(QContextMenuEvent *event) override; private slots: void actionTriggered(QAction *action); diff --git a/sources/richtext/richtexteditor_p.h b/sources/richtext/richtexteditor_p.h index 54e1a4597..fd801f57e 100644 --- a/sources/richtext/richtexteditor_p.h +++ b/sources/richtext/richtexteditor_p.h @@ -72,7 +72,7 @@ class RichTextEditorDialog : public QDialog Q_OBJECT public: explicit RichTextEditorDialog(QWidget *parent = nullptr); - ~RichTextEditorDialog(); + ~RichTextEditorDialog() override; int showDialog(); void setDefaultFont(const QFont &font); diff --git a/sources/titleblock/dimensionwidget.h b/sources/titleblock/dimensionwidget.h index 48567ff91..b8e992b16 100644 --- a/sources/titleblock/dimensionwidget.h +++ b/sources/titleblock/dimensionwidget.h @@ -30,7 +30,7 @@ class TitleBlockDimensionWidget : public QDialog { // constructors, destructor public: TitleBlockDimensionWidget(bool, QWidget * parent = nullptr); - virtual ~TitleBlockDimensionWidget(); + ~TitleBlockDimensionWidget() override; private: TitleBlockDimensionWidget(const TitleBlockDimensionWidget &); diff --git a/sources/titleblock/gridlayoutanimation.h b/sources/titleblock/gridlayoutanimation.h index 481eba60a..e3c5453be 100644 --- a/sources/titleblock/gridlayoutanimation.h +++ b/sources/titleblock/gridlayoutanimation.h @@ -27,7 +27,7 @@ class GridLayoutAnimation : public QVariantAnimation { // Constructors, destructor public: GridLayoutAnimation(QGraphicsGridLayout * = nullptr, QObject * = nullptr); - virtual ~GridLayoutAnimation(); + ~GridLayoutAnimation() override; // methods public: @@ -39,7 +39,7 @@ class GridLayoutAnimation : public QVariantAnimation { void setActsOnRows(bool); protected: - void updateCurrentValue(const QVariant &); + void updateCurrentValue(const QVariant &) override; // attributes private: diff --git a/sources/titleblock/helpercell.h b/sources/titleblock/helpercell.h index a8b72a1d2..372e2dcc6 100644 --- a/sources/titleblock/helpercell.h +++ b/sources/titleblock/helpercell.h @@ -31,7 +31,7 @@ class HelperCell : public QGraphicsObject, public QGraphicsLayoutItem { // constructor, destructor public: HelperCell(QGraphicsItem * = nullptr); - virtual ~HelperCell(); + ~HelperCell() override; private: HelperCell(const HelperCell &); @@ -45,18 +45,18 @@ class HelperCell : public QGraphicsObject, public QGraphicsLayoutItem { // methods public: - virtual void setGeometry(const QRectF &); - virtual QSizeF sizeHint(Qt::SizeHint, const QSizeF & = QSizeF()) const; - virtual QRectF boundingRect() const; - void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr); + void setGeometry(const QRectF &) override; + QSizeF sizeHint(Qt::SizeHint, const QSizeF & = QSizeF()) const override; + QRectF boundingRect() const override; + void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr) override; virtual void setType(QET::TitleBlockColumnLength); virtual void setActions(const QList &); virtual QList actions() const; virtual void setLabel(const QString &text, bool = true); protected: - void contextMenuEvent(QGraphicsSceneContextMenuEvent *); - void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *); + void contextMenuEvent(QGraphicsSceneContextMenuEvent *) override; + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *) override; signals: void contextMenuTriggered(HelperCell *); diff --git a/sources/titleblock/integrationmovetemplateshandler.h b/sources/titleblock/integrationmovetemplateshandler.h index e0984a7ef..2988fea57 100644 --- a/sources/titleblock/integrationmovetemplateshandler.h +++ b/sources/titleblock/integrationmovetemplateshandler.h @@ -30,15 +30,15 @@ class IntegrationMoveTitleBlockTemplatesHandler : public MoveTitleBlockTemplates // constructors, destructor public: IntegrationMoveTitleBlockTemplatesHandler(QWidget * = nullptr); - virtual ~IntegrationMoveTitleBlockTemplatesHandler(); + ~IntegrationMoveTitleBlockTemplatesHandler() override; private: IntegrationMoveTitleBlockTemplatesHandler(const IntegrationMoveTitleBlockTemplatesHandler &); // methods public: - virtual QET::Action templateAlreadyExists(const TitleBlockTemplateLocation &src, const TitleBlockTemplateLocation &dst); - virtual QET::Action errorWithATemplate(const TitleBlockTemplateLocation &, const QString &); - virtual QString nameForRenamingOperation(); + QET::Action templateAlreadyExists(const TitleBlockTemplateLocation &src, const TitleBlockTemplateLocation &dst) override; + QET::Action errorWithATemplate(const TitleBlockTemplateLocation &, const QString &) override; + QString nameForRenamingOperation() override; private: QString dateString() const; diff --git a/sources/titleblock/movetemplateshandler.h b/sources/titleblock/movetemplateshandler.h index 7fe3a3ce9..4a194770b 100644 --- a/sources/titleblock/movetemplateshandler.h +++ b/sources/titleblock/movetemplateshandler.h @@ -33,7 +33,7 @@ class MoveTitleBlockTemplatesHandler : public QObject { // Constructors, destructor public: MoveTitleBlockTemplatesHandler(QObject * = nullptr) {} - virtual ~MoveTitleBlockTemplatesHandler() {} + ~MoveTitleBlockTemplatesHandler() override {} private: MoveTitleBlockTemplatesHandler(const MoveTitleBlockTemplatesHandler &); diff --git a/sources/titleblock/qettemplateeditor.h b/sources/titleblock/qettemplateeditor.h index c4bc9b105..b8f1ae3e3 100644 --- a/sources/titleblock/qettemplateeditor.h +++ b/sources/titleblock/qettemplateeditor.h @@ -39,7 +39,7 @@ class QETTitleBlockTemplateEditor : public QETMainWindow { // constructor, destructor public: QETTitleBlockTemplateEditor(QWidget * = nullptr); - virtual ~QETTitleBlockTemplateEditor(); + ~QETTitleBlockTemplateEditor() override; private: QETTitleBlockTemplateEditor(const QETTitleBlockTemplateEditor &); @@ -90,8 +90,8 @@ class QETTitleBlockTemplateEditor : public QETMainWindow { protected: bool canClose(); - virtual void firstActivation(QEvent *); - void closeEvent(QCloseEvent *); + void firstActivation(QEvent *) override; + void closeEvent(QCloseEvent *) override; private: void initActions(); diff --git a/sources/titleblock/splittedhelpercell.h b/sources/titleblock/splittedhelpercell.h index 2d9c6c166..2de1433db 100644 --- a/sources/titleblock/splittedhelpercell.h +++ b/sources/titleblock/splittedhelpercell.h @@ -27,13 +27,13 @@ class SplittedHelperCell : public HelperCell { Q_OBJECT public: SplittedHelperCell(QGraphicsItem * = nullptr); - virtual ~SplittedHelperCell(); + ~SplittedHelperCell() override; private: SplittedHelperCell(const SplittedHelperCell &); // methods public: - void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr); + void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr) override; // attributes QColor split_background_color; ///< Background color on the split side diff --git a/sources/titleblock/templatecellwidget.h b/sources/titleblock/templatecellwidget.h index 79fe801aa..1f94b4cef 100644 --- a/sources/titleblock/templatecellwidget.h +++ b/sources/titleblock/templatecellwidget.h @@ -34,7 +34,7 @@ class TitleBlockTemplateCellWidget : public QWidget { // constructor, destructor public: TitleBlockTemplateCellWidget(TitleBlockTemplate * = nullptr, QWidget * = nullptr); - virtual ~TitleBlockTemplateCellWidget(); + ~TitleBlockTemplateCellWidget() override; private: TitleBlockTemplateCellWidget(const TitleBlockTemplateCellWidget &); diff --git a/sources/titleblock/templatecommands.h b/sources/titleblock/templatecommands.h index c0736ea98..39473ea9f 100644 --- a/sources/titleblock/templatecommands.h +++ b/sources/titleblock/templatecommands.h @@ -34,16 +34,16 @@ class ModifyTitleBlockCellCommand : public QUndoCommand { // constructor, destructor public: ModifyTitleBlockCellCommand(TitleBlockCell *, QUndoCommand * = nullptr); - virtual ~ModifyTitleBlockCellCommand(); + ~ModifyTitleBlockCellCommand() override; private: ModifyTitleBlockCellCommand(const ModifyTitleBlockCellCommand &); // methods public: - virtual int id() const; - virtual bool mergeWith(const QUndoCommand *); - virtual void undo(); - virtual void redo(); + int id() const override; + bool mergeWith(const QUndoCommand *) override; + void undo() override; + void redo() override; TitleBlockCell *cell() const; void setCell(TitleBlockCell *); TitleBlockTemplateView *view() const; @@ -67,7 +67,7 @@ class TitleBlockTemplateCommand : public QUndoCommand { // Constructors, destructor public: TitleBlockTemplateCommand(TitleBlockTemplate * = nullptr, QUndoCommand * = nullptr); - virtual ~TitleBlockTemplateCommand(); + ~TitleBlockTemplateCommand() override; private: TitleBlockTemplateCommand(const TitleBlockTemplateCommand &); @@ -101,7 +101,7 @@ class ModifyTemplateGridCommand : public TitleBlockTemplateCommand { // Constructors, destructor public: ModifyTemplateGridCommand(TitleBlockTemplate * = nullptr, QUndoCommand * = nullptr); - virtual ~ModifyTemplateGridCommand(); + ~ModifyTemplateGridCommand() override; private: ModifyTemplateGridCommand(const ModifyTemplateGridCommand &); @@ -117,8 +117,8 @@ class ModifyTemplateGridCommand : public TitleBlockTemplateCommand { void setType(bool); bool isInsertion() const; void setInsertion(bool); - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; private: void updateText(); @@ -141,7 +141,7 @@ class ModifyTemplateDimension : public TitleBlockTemplateCommand { // Constructor, destructor public: ModifyTemplateDimension(TitleBlockTemplate * = nullptr, QUndoCommand * = nullptr); - virtual ~ModifyTemplateDimension(); + ~ModifyTemplateDimension() override; private: ModifyTemplateDimension(const ModifyTemplateDimension &); @@ -155,8 +155,8 @@ class ModifyTemplateDimension : public TitleBlockTemplateCommand { void setDimensionBefore(const TitleBlockDimension &); TitleBlockDimension dimensionAfter() const; void setDimensionAfter(const TitleBlockDimension &); - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; private: void updateText(); @@ -178,14 +178,14 @@ class MergeCellsCommand : public TitleBlockTemplateCommand { // Constructor, destructor public: MergeCellsCommand(const TitleBlockTemplateCellsSet &, TitleBlockTemplate * = nullptr, QUndoCommand * = nullptr); - virtual ~MergeCellsCommand(); + ~MergeCellsCommand() override; // methods public: static bool canMerge(const TitleBlockTemplateCellsSet &, TitleBlockTemplate *); bool isValid() const; - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; private: static TitleBlockCell *getBottomRightCell(const TitleBlockTemplateCellsSet &); @@ -212,14 +212,14 @@ class SplitCellsCommand : public TitleBlockTemplateCommand { // Constructor, destructor public: SplitCellsCommand(const TitleBlockTemplateCellsSet &, TitleBlockTemplate * = nullptr, QUndoCommand * = nullptr); - virtual ~SplitCellsCommand(); + ~SplitCellsCommand() override; // methods public: static bool canSplit(const TitleBlockTemplateCellsSet &splitted_cells, TitleBlockTemplate *tbtemplate); bool isValid() const; - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; // attributes private: @@ -240,14 +240,14 @@ class ChangeTemplateInformationsCommand : public QUndoCommand { // constructors, destructor public: ChangeTemplateInformationsCommand(TitleBlockTemplate *, const QString &, const QString &, QUndoCommand * = nullptr); - virtual ~ChangeTemplateInformationsCommand(); + ~ChangeTemplateInformationsCommand() override; private: ChangeTemplateInformationsCommand(const ChangeTemplateInformationsCommand &); // methods public: - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; // attributes private: @@ -266,14 +266,14 @@ class CutTemplateCellsCommand : public TitleBlockTemplateCommand { // constructors, destructor public: CutTemplateCellsCommand(TitleBlockTemplate *, QUndoCommand * = nullptr); - virtual ~CutTemplateCellsCommand(); + ~CutTemplateCellsCommand() override; private: CutTemplateCellsCommand(const CutTemplateCellsCommand &); // methods public: - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; virtual void setCutCells(const QList &); protected: virtual void updateText(); @@ -291,14 +291,14 @@ class PasteTemplateCellsCommand : public TitleBlockTemplateCommand { // constructors, destructor public: PasteTemplateCellsCommand(TitleBlockTemplate *, QUndoCommand * = nullptr); - virtual ~PasteTemplateCellsCommand(); + ~PasteTemplateCellsCommand() override; private: PasteTemplateCellsCommand(const PasteTemplateCellsCommand &); // methods public: - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; virtual void addPastedCell(TitleBlockCell *, const TitleBlockCell &); virtual void addErasedCell(TitleBlockCell *, const TitleBlockCell &); virtual void addCell(TitleBlockCell *, const TitleBlockCell &, const TitleBlockCell &); diff --git a/sources/titleblock/templatedeleter.h b/sources/titleblock/templatedeleter.h index e863a5a91..1b6230219 100644 --- a/sources/titleblock/templatedeleter.h +++ b/sources/titleblock/templatedeleter.h @@ -28,7 +28,7 @@ class TitleBlockTemplateDeleter : public QWidget { // Constructors, destructor public: TitleBlockTemplateDeleter(const TitleBlockTemplateLocation &, QWidget * = nullptr); - virtual ~TitleBlockTemplateDeleter(); + ~TitleBlockTemplateDeleter() override; private: TitleBlockTemplateDeleter(const TitleBlockTemplateDeleter &); diff --git a/sources/titleblock/templatelocationchooser.h b/sources/titleblock/templatelocationchooser.h index e7d112152..def68fdc4 100644 --- a/sources/titleblock/templatelocationchooser.h +++ b/sources/titleblock/templatelocationchooser.h @@ -30,7 +30,7 @@ class TitleBlockTemplateLocationChooser : public QWidget { // Constructor, destructor public: TitleBlockTemplateLocationChooser(const TitleBlockTemplateLocation &, QWidget * = nullptr); - ~TitleBlockTemplateLocationChooser(); + ~TitleBlockTemplateLocationChooser() override; private: TitleBlockTemplateLocationChooser(const TitleBlockTemplateLocationChooser &); diff --git a/sources/titleblock/templatelocationsaver.h b/sources/titleblock/templatelocationsaver.h index 780ba2bcc..75c2fe905 100644 --- a/sources/titleblock/templatelocationsaver.h +++ b/sources/titleblock/templatelocationsaver.h @@ -32,20 +32,20 @@ class TitleBlockTemplateLocationSaver : public TitleBlockTemplateLocationChooser // Constructor, destructor public: TitleBlockTemplateLocationSaver(const TitleBlockTemplateLocation &, QWidget * = nullptr); - ~TitleBlockTemplateLocationSaver(); + ~TitleBlockTemplateLocationSaver() override; private: TitleBlockTemplateLocationSaver(const TitleBlockTemplateLocationSaver &); // methods - virtual QString name() const; - virtual void setLocation(const TitleBlockTemplateLocation &); + QString name() const override; + void setLocation(const TitleBlockTemplateLocation &) override; private: void init(); // slots protected slots: - virtual void updateTemplates(); + void updateTemplates() override; virtual void updateNewName(); // attributes diff --git a/sources/titleblock/templatelogomanager.h b/sources/titleblock/templatelogomanager.h index bf7269e31..928b7f12f 100644 --- a/sources/titleblock/templatelogomanager.h +++ b/sources/titleblock/templatelogomanager.h @@ -29,7 +29,7 @@ class TitleBlockTemplateLogoManager : public QWidget { // Constructor, destructor public: TitleBlockTemplateLogoManager(TitleBlockTemplate *, QWidget * = nullptr); - virtual ~TitleBlockTemplateLogoManager(); + ~TitleBlockTemplateLogoManager() override; // methods public: diff --git a/sources/titleblock/templatescollection.h b/sources/titleblock/templatescollection.h index d07953182..327ec6ab4 100644 --- a/sources/titleblock/templatescollection.h +++ b/sources/titleblock/templatescollection.h @@ -37,7 +37,7 @@ class TitleBlockTemplatesCollection : public QObject { // Constructors, destructor public: TitleBlockTemplatesCollection(QObject *parent); - virtual ~TitleBlockTemplatesCollection(); + ~TitleBlockTemplatesCollection() override; private: TitleBlockTemplatesCollection(const TitleBlockTemplatesCollection &); @@ -86,24 +86,24 @@ class TitleBlockTemplatesProjectCollection : public TitleBlockTemplatesCollectio // Constructors, destructor public: TitleBlockTemplatesProjectCollection(QETProject *, QObject *parent = nullptr); - virtual ~TitleBlockTemplatesProjectCollection(); + ~TitleBlockTemplatesProjectCollection() override; private: TitleBlockTemplatesProjectCollection(const TitleBlockTemplatesProjectCollection &); // methods public: - virtual QString title() const; - virtual QString protocol() const; - virtual QETProject *parentProject(); - virtual QStringList templates(); - virtual TitleBlockTemplate *getTemplate(const QString &); - virtual QDomElement getTemplateXmlDescription(const QString &); - virtual bool setTemplateXmlDescription(const QString &, const QDomElement &); - virtual void removeTemplate(const QString &); - virtual TitleBlockTemplateLocation location(const QString & = QString()); - virtual bool hasFilePath(); - virtual QString filePath(); - virtual bool isReadOnly(const QString & = QString()) const; + QString title() const override; + QString protocol() const override; + QETProject *parentProject() override; + QStringList templates() override; + TitleBlockTemplate *getTemplate(const QString &) override; + QDomElement getTemplateXmlDescription(const QString &) override; + bool setTemplateXmlDescription(const QString &, const QDomElement &) override; + void removeTemplate(const QString &) override; + TitleBlockTemplateLocation location(const QString & = QString()) override; + bool hasFilePath() override; + QString filePath() override; + bool isReadOnly(const QString & = QString()) const override; virtual void fromXml(const QDomElement &); virtual void deleteUnusedTitleBlocKTemplates(); @@ -127,22 +127,22 @@ class TitleBlockTemplatesFilesCollection : public TitleBlockTemplatesCollection // Constructors, destructor public: TitleBlockTemplatesFilesCollection(const QString &, QObject * = nullptr); - virtual ~TitleBlockTemplatesFilesCollection(); + ~TitleBlockTemplatesFilesCollection() override; private: TitleBlockTemplatesFilesCollection(const TitleBlockTemplatesFilesCollection &); // methods public: QString path(const QString & = QString()) const; - virtual QStringList templates(); - virtual TitleBlockTemplate *getTemplate(const QString &); - virtual QDomElement getTemplateXmlDescription(const QString &); - virtual bool setTemplateXmlDescription(const QString &, const QDomElement &); - virtual void removeTemplate(const QString &); - virtual TitleBlockTemplateLocation location(const QString & = QString()); - virtual bool hasFilePath(); - virtual QString filePath(); - virtual bool isReadOnly(const QString & = QString()) const; + QStringList templates() override; + TitleBlockTemplate *getTemplate(const QString &) override; + QDomElement getTemplateXmlDescription(const QString &) override; + bool setTemplateXmlDescription(const QString &, const QDomElement &) override; + void removeTemplate(const QString &) override; + TitleBlockTemplateLocation location(const QString & = QString()) override; + bool hasFilePath() override; + QString filePath() override; + bool isReadOnly(const QString & = QString()) const override; static QString toTemplateName(const QString &); static QString toFileName(const QString &); diff --git a/sources/titleblock/templateview.h b/sources/titleblock/templateview.h index 88a80eaba..00d687bdb 100644 --- a/sources/titleblock/templateview.h +++ b/sources/titleblock/templateview.h @@ -36,7 +36,7 @@ class TitleBlockTemplateView : public QGraphicsView { public: TitleBlockTemplateView(QWidget * = nullptr); TitleBlockTemplateView(QGraphicsScene *, QWidget * = nullptr); - virtual ~TitleBlockTemplateView(); + ~TitleBlockTemplateView() override; private: TitleBlockTemplateView(const TitleBlockTemplateView &); @@ -91,14 +91,14 @@ class TitleBlockTemplateView : public QGraphicsView { virtual void updateColumnsHelperCells(); protected: - virtual void drawBackground(QPainter *, const QRectF &); + void drawBackground(QPainter *, const QRectF &) override; virtual void addCells(); virtual void loadTemplate(TitleBlockTemplate *); virtual void init(); - virtual void wheelEvent(QWheelEvent *); + void wheelEvent(QWheelEvent *) override; virtual qreal zoomFactor() const; virtual void fillWithEmptyCells(); - virtual bool event(QEvent *); + bool event(QEvent *) override; virtual void normalizeCells(QList &, int x = 0, int y = 0) const; signals: diff --git a/sources/titleblock/templatevisualcell.h b/sources/titleblock/templatevisualcell.h index 86ad6fc44..fc7353c2e 100644 --- a/sources/titleblock/templatevisualcell.h +++ b/sources/titleblock/templatevisualcell.h @@ -30,16 +30,16 @@ class TitleBlockTemplateVisualCell : public QGraphicsLayoutItem, public QGraphic // constructor, destructor public: TitleBlockTemplateVisualCell(QGraphicsItem * parent = nullptr); - virtual ~TitleBlockTemplateVisualCell(); + ~TitleBlockTemplateVisualCell() override; private: TitleBlockTemplateVisualCell(const TitleBlockTemplateVisualCell &); // methods public: - virtual void setGeometry(const QRectF &); - virtual QSizeF sizeHint(Qt::SizeHint, const QSizeF & = QSizeF()) const; - virtual QRectF boundingRect() const; - void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr); + void setGeometry(const QRectF &) override; + QSizeF sizeHint(Qt::SizeHint, const QSizeF & = QSizeF()) const override; + QRectF boundingRect() const override; + void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr) override; public slots: void setTemplateCell(TitleBlockTemplate *, TitleBlockCell *); diff --git a/sources/titleblocktemplate.h b/sources/titleblocktemplate.h index 1a96b2d1e..b5d01965e 100644 --- a/sources/titleblocktemplate.h +++ b/sources/titleblocktemplate.h @@ -37,7 +37,7 @@ class TitleBlockTemplate : public QObject { // constructors, destructor public: TitleBlockTemplate(QObject * = nullptr); - virtual ~TitleBlockTemplate(); + ~TitleBlockTemplate() override; private: TitleBlockTemplate(const TitleBlockTemplate &); diff --git a/sources/titleblocktemplaterenderer.h b/sources/titleblocktemplaterenderer.h index 157ae3582..90183d84d 100644 --- a/sources/titleblocktemplaterenderer.h +++ b/sources/titleblocktemplaterenderer.h @@ -25,7 +25,7 @@ class TitleBlockTemplateRenderer : public QObject { public: TitleBlockTemplateRenderer(QObject * = nullptr); - virtual ~TitleBlockTemplateRenderer(); + ~TitleBlockTemplateRenderer() override; const TitleBlockTemplate *titleBlockTemplate() const; void setTitleBlockTemplate(const TitleBlockTemplate *); void setContext(const DiagramContext &context); diff --git a/sources/ui/borderpropertieswidget.h b/sources/ui/borderpropertieswidget.h index 05dc59395..c8deac16e 100644 --- a/sources/ui/borderpropertieswidget.h +++ b/sources/ui/borderpropertieswidget.h @@ -35,7 +35,7 @@ class BorderPropertiesWidget : public QWidget public: explicit BorderPropertiesWidget(const BorderProperties &bp, QWidget *parent = nullptr); - ~BorderPropertiesWidget(); + ~BorderPropertiesWidget() override; void setProperties(const BorderProperties &bp); const BorderProperties &properties(); diff --git a/sources/ui/conductorpropertiesdialog.h b/sources/ui/conductorpropertiesdialog.h index 6a615f637..3f151a9ac 100644 --- a/sources/ui/conductorpropertiesdialog.h +++ b/sources/ui/conductorpropertiesdialog.h @@ -36,7 +36,7 @@ class ConductorPropertiesDialog : public QDialog public: explicit ConductorPropertiesDialog (Conductor *conductor, QWidget *parent = nullptr); static void PropertiesDialog (Conductor *conductor, QWidget *parent = nullptr); - ~ConductorPropertiesDialog(); + ~ConductorPropertiesDialog() override; ConductorProperties properties() const; bool applyAll() const; diff --git a/sources/ui/conductorpropertieswidget.h b/sources/ui/conductorpropertieswidget.h index a6387af80..425fbe8be 100644 --- a/sources/ui/conductorpropertieswidget.h +++ b/sources/ui/conductorpropertieswidget.h @@ -35,7 +35,7 @@ class ConductorPropertiesWidget : public QWidget public: explicit ConductorPropertiesWidget(QWidget *parent = nullptr); explicit ConductorPropertiesWidget(const ConductorProperties &properties, QWidget *parent = nullptr); - ~ConductorPropertiesWidget(); + ~ConductorPropertiesWidget() override; //METHODS void setProperties(const ConductorProperties &properties); @@ -54,7 +54,7 @@ class ConductorPropertiesWidget : public QWidget void setConductorType(ConductorProperties::ConductorType type); protected: - virtual bool event(QEvent *event); + bool event(QEvent *event) override; //SLOTS public slots: diff --git a/sources/ui/diagramselection.h b/sources/ui/diagramselection.h index 82ed66a3a..e7f9a5123 100644 --- a/sources/ui/diagramselection.h +++ b/sources/ui/diagramselection.h @@ -33,7 +33,7 @@ class diagramselection : public QWidget public: explicit diagramselection(QETProject *prj, QWidget *parent = nullptr); - ~diagramselection(); + ~diagramselection() override; QList list_of_DiagramSelected(); diff --git a/sources/ui/dialogwaiting.h b/sources/ui/dialogwaiting.h index 3e2767e1a..88de170d1 100644 --- a/sources/ui/dialogwaiting.h +++ b/sources/ui/dialogwaiting.h @@ -31,7 +31,7 @@ class DialogWaiting : public QDialog public: explicit DialogWaiting(QWidget *parent = nullptr); - ~DialogWaiting(); + ~DialogWaiting() override; void setProgressBar(int val); void setProgressBarRange(int min, int max); diff --git a/sources/ui/dynamicelementtextitemeditor.h b/sources/ui/dynamicelementtextitemeditor.h index afbf2931e..4007a2cf9 100644 --- a/sources/ui/dynamicelementtextitemeditor.h +++ b/sources/ui/dynamicelementtextitemeditor.h @@ -35,12 +35,12 @@ class DynamicElementTextItemEditor : public AbstractElementPropertiesEditorWidge public: explicit DynamicElementTextItemEditor(Element *element, QWidget *parent = nullptr); - ~DynamicElementTextItemEditor(); + ~DynamicElementTextItemEditor() override; - virtual void setElement(Element *element); - virtual QString title() const {return tr("Textes");} - virtual bool setLiveEdit(bool live_edit); - virtual void apply(); + void setElement(Element *element) override; + QString title() const override {return tr("Textes");} + bool setLiveEdit(bool live_edit) override; + void apply() override; private: void dataEdited(QStandardItem *qsi); diff --git a/sources/ui/dynamicelementtextmodel.h b/sources/ui/dynamicelementtextmodel.h index 615beac10..27a088ef8 100644 --- a/sources/ui/dynamicelementtextmodel.h +++ b/sources/ui/dynamicelementtextmodel.h @@ -45,7 +45,7 @@ class DynamicElementTextModel : public QStandardItemModel }; DynamicElementTextModel(QObject *parent = nullptr); - ~DynamicElementTextModel(); + ~DynamicElementTextModel() override; void addText(DynamicElementTextItem *deti); void removeText(DynamicElementTextItem *deti); @@ -69,8 +69,8 @@ class DynamicTextItemDelegate : public QStyledItemDelegate public: DynamicTextItemDelegate(QObject *parent = Q_NULLPTR); - virtual QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const; - virtual void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const; + QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override; + void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override; }; #endif // DYNAMICELEMENTTEXTMODEL_H diff --git a/sources/ui/elementinfopartwidget.h b/sources/ui/elementinfopartwidget.h index 34134fe6d..c7ceff9ed 100644 --- a/sources/ui/elementinfopartwidget.h +++ b/sources/ui/elementinfopartwidget.h @@ -31,7 +31,7 @@ class ElementInfoPartWidget : public QWidget //METHODS public: explicit ElementInfoPartWidget(QString key, QString translated_key, QWidget *parent = nullptr); - ~ElementInfoPartWidget(); + ~ElementInfoPartWidget() override; QString key () const {return key_;} void setText (const QString &); diff --git a/sources/ui/elementinfowidget.h b/sources/ui/elementinfowidget.h index 255c154b3..8919fbc36 100644 --- a/sources/ui/elementinfowidget.h +++ b/sources/ui/elementinfowidget.h @@ -42,21 +42,21 @@ class ElementInfoWidget : public AbstractElementPropertiesEditorWidget //METHODS public: explicit ElementInfoWidget(Element *elmt, QWidget *parent = nullptr); - ~ElementInfoWidget(); + ~ElementInfoWidget() override; - void setElement(Element *element); - void apply(); - QUndoCommand *associatedUndo () const; - QString title() const {return tr("Informations");} - bool setLiveEdit(bool live_edit); - virtual void updateUi(); + void setElement(Element *element) override; + void apply() override; + QUndoCommand *associatedUndo () const override; + QString title() const override {return tr("Informations");} + bool setLiveEdit(bool live_edit) override; + void updateUi() override; DiagramContext currentInfo() const; protected: - virtual bool event(QEvent *event); - virtual void enableLiveEdit(); - virtual void disableLiveEdit(); + bool event(QEvent *event) override; + void enableLiveEdit() override; + void disableLiveEdit() override; private: void buildInterface(); diff --git a/sources/ui/elementpropertieswidget.h b/sources/ui/elementpropertieswidget.h index 83077b61d..3d6f1c66f 100644 --- a/sources/ui/elementpropertieswidget.h +++ b/sources/ui/elementpropertieswidget.h @@ -32,10 +32,10 @@ class ElementPropertiesWidget : public AbstractElementPropertiesEditorWidget public: explicit ElementPropertiesWidget(Element *elmt, QWidget *parent = nullptr); - void setElement(Element *element); - void apply(); - void reset(); - bool setLiveEdit(bool live_edit); + void setElement(Element *element) override; + void apply() override; + void reset() override; + bool setLiveEdit(bool live_edit) override; public slots: void findInPanel (); @@ -43,7 +43,7 @@ class ElementPropertiesWidget : public AbstractElementPropertiesEditorWidget private: void buildGui(); - void updateUi(); + void updateUi() override; void addGeneralWidget(); QWidget *generalWidget(); diff --git a/sources/ui/formulaassistantdialog.h b/sources/ui/formulaassistantdialog.h index 99ec54955..a4d9b7bf9 100644 --- a/sources/ui/formulaassistantdialog.h +++ b/sources/ui/formulaassistantdialog.h @@ -31,7 +31,7 @@ class FormulaAssistantDialog : public QDialog public: FormulaAssistantDialog(QWidget *parent = nullptr); - ~FormulaAssistantDialog(); + ~FormulaAssistantDialog() override; void setForbiddenVariables(QStringList list); void setText(QString text); diff --git a/sources/ui/imagepropertieswidget.h b/sources/ui/imagepropertieswidget.h index 56084b67e..56203adde 100644 --- a/sources/ui/imagepropertieswidget.h +++ b/sources/ui/imagepropertieswidget.h @@ -36,16 +36,16 @@ class ImagePropertiesWidget : public PropertiesEditorWidget public: explicit ImagePropertiesWidget(DiagramImageItem *image = nullptr, QWidget *parent = nullptr); - ~ImagePropertiesWidget(); + ~ImagePropertiesWidget() override; void setImageItem (DiagramImageItem *image); - void apply(); - void reset(); - bool setLiveEdit(bool live_edit); + void apply() override; + void reset() override; + bool setLiveEdit(bool live_edit) override; QUndoCommand* associatedUndo(); private: - void updateUi(); + void updateUi() override; private slots: void on_m_scale_slider_valueChanged(int value); diff --git a/sources/ui/importelementdialog.h b/sources/ui/importelementdialog.h index 61fbe27d0..517ea3b20 100644 --- a/sources/ui/importelementdialog.h +++ b/sources/ui/importelementdialog.h @@ -31,7 +31,7 @@ class ImportElementDialog : public QDialog public: explicit ImportElementDialog(QWidget *parent = nullptr); - ~ImportElementDialog(); + ~ImportElementDialog() override; QET::Action action() const; diff --git a/sources/ui/linksingleelementwidget.h b/sources/ui/linksingleelementwidget.h index 106acd929..0ce20eb7d 100644 --- a/sources/ui/linksingleelementwidget.h +++ b/sources/ui/linksingleelementwidget.h @@ -44,19 +44,19 @@ class LinkSingleElementWidget : public AbstractElementPropertiesEditorWidget ///Methods public: explicit LinkSingleElementWidget(Element *elmt, QWidget *parent = nullptr); - ~LinkSingleElementWidget(); + ~LinkSingleElementWidget() override; - void setElement (Element *element); - void apply(); - QUndoCommand *associatedUndo() const; - QString title() const; + void setElement (Element *element) override; + void apply() override; + QUndoCommand *associatedUndo() const override; + QString title() const override; public slots: - void updateUi(); + void updateUi() override; void buildTree(); public: - bool setLiveEdit(bool live_edit); + bool setLiveEdit(bool live_edit) override; private : QList availableElements(); diff --git a/sources/ui/masterpropertieswidget.h b/sources/ui/masterpropertieswidget.h index b38257f6e..a44122ec0 100644 --- a/sources/ui/masterpropertieswidget.h +++ b/sources/ui/masterpropertieswidget.h @@ -46,17 +46,17 @@ class MasterPropertiesWidget : public AbstractElementPropertiesEditorWidget public: explicit MasterPropertiesWidget(Element *elmt, QWidget *parent = nullptr); - ~MasterPropertiesWidget(); + ~MasterPropertiesWidget() override; - void setElement (Element *element); - void apply(); - void reset(); - QUndoCommand *associatedUndo () const; - QString title() const {return tr("Référence croisée (maître)");} - bool setLiveEdit(bool live_edit); + void setElement (Element *element) override; + void apply() override; + void reset() override; + QUndoCommand *associatedUndo () const override; + QString title() const override {return tr("Référence croisée (maître)");} + bool setLiveEdit(bool live_edit) override; public slots: - void updateUi(); + void updateUi() override; private slots: void headerCustomContextMenuRequested(const QPoint &pos); diff --git a/sources/ui/potentialselectordialog.cpp b/sources/ui/potentialselectordialog.cpp index 4039aa0bb..5477b0b3f 100644 --- a/sources/ui/potentialselectordialog.cpp +++ b/sources/ui/potentialselectordialog.cpp @@ -57,7 +57,7 @@ class NewConductorPotentialSelector : public AbstractPotentialSelector m_is_valid = true; } - bool isValid() const {return m_is_valid;} + bool isValid() const override {return m_is_valid;} /** * @brief getPotential @@ -110,7 +110,7 @@ class NewConductorPotentialSelector : public AbstractPotentialSelector properties_list.append(c->properties()); } - ~NewConductorPotentialSelector() {} + ~NewConductorPotentialSelector() override {} private : bool m_is_valid; @@ -155,9 +155,9 @@ class LinkReportPotentialSelector : public AbstractPotentialSelector } } - ~LinkReportPotentialSelector() {} + ~LinkReportPotentialSelector() override {} - bool isValid() const {return m_is_valid;} + bool isValid() const override {return m_is_valid;} private: bool m_is_valid; diff --git a/sources/ui/potentialselectordialog.h b/sources/ui/potentialselectordialog.h index dedb9b7d6..0af016ff7 100644 --- a/sources/ui/potentialselectordialog.h +++ b/sources/ui/potentialselectordialog.h @@ -61,7 +61,7 @@ class PotentialSelectorDialog : public QDialog public: explicit PotentialSelectorDialog(Conductor *conductor, QUndoCommand *parent_undo = nullptr, QWidget *parent = nullptr); explicit PotentialSelectorDialog(Element *report, QUndoCommand *parent_undo = nullptr, QWidget *parent = nullptr); - ~PotentialSelectorDialog(); + ~PotentialSelectorDialog() override; private slots: void on_buttonBox_accepted(); diff --git a/sources/ui/projectpropertiesdialog.h b/sources/ui/projectpropertiesdialog.h index 85078457e..2bdd84da8 100644 --- a/sources/ui/projectpropertiesdialog.h +++ b/sources/ui/projectpropertiesdialog.h @@ -36,7 +36,7 @@ class ProjectPropertiesDialog : public QObject { }; ProjectPropertiesDialog(QETProject *project, QWidget *parent = nullptr); - ~ProjectPropertiesDialog(); + ~ProjectPropertiesDialog() override; void exec(); void setCurrentPage(ProjectPropertiesDialog::Page); void changeToFolio(); diff --git a/sources/ui/reportpropertiewidget.h b/sources/ui/reportpropertiewidget.h index affeab04f..3e923e649 100644 --- a/sources/ui/reportpropertiewidget.h +++ b/sources/ui/reportpropertiewidget.h @@ -32,7 +32,7 @@ class ReportPropertieWidget : public QWidget public: explicit ReportPropertieWidget(QString value, QWidget *parent = nullptr); - ~ReportPropertieWidget(); + ~ReportPropertieWidget() override; void toSettings (QSettings &settings, const QString &prefix); void setReportProperties (QString label); QString ReportProperties () const; diff --git a/sources/ui/shapegraphicsitempropertieswidget.h b/sources/ui/shapegraphicsitempropertieswidget.h index d31d4ad19..d2fbd96b4 100644 --- a/sources/ui/shapegraphicsitempropertieswidget.h +++ b/sources/ui/shapegraphicsitempropertieswidget.h @@ -36,18 +36,18 @@ class ShapeGraphicsItemPropertiesWidget : public PropertiesEditorWidget public: explicit ShapeGraphicsItemPropertiesWidget(QetShapeItem *item, QWidget *parent = nullptr); - ~ShapeGraphicsItemPropertiesWidget(); + ~ShapeGraphicsItemPropertiesWidget() override; void setItem(QetShapeItem *shape); public slots: - virtual void apply(); - virtual void reset(); + void apply() override; + void reset() override; public: - virtual QUndoCommand* associatedUndo() const; - virtual QString title() const { return tr("Éditer les propriétés d'une primitive "); } - virtual void updateUi(); - virtual bool setLiveEdit(bool live_edit); + QUndoCommand* associatedUndo() const override; + QString title() const override { return tr("Éditer les propriétés d'une primitive "); } + void updateUi() override; + bool setLiveEdit(bool live_edit) override; private: void setPenColorButton(const QColor &color); diff --git a/sources/ui/titleblockpropertieswidget.h b/sources/ui/titleblockpropertieswidget.h index 27caa9c4c..2f62dddf0 100644 --- a/sources/ui/titleblockpropertieswidget.h +++ b/sources/ui/titleblockpropertieswidget.h @@ -42,7 +42,7 @@ class TitleBlockPropertiesWidget : public QWidget explicit TitleBlockPropertiesWidget(const TitleBlockProperties &titleblock = TitleBlockProperties(), bool current_date = false, QETProject *project = nullptr, QWidget *parent = nullptr); explicit TitleBlockPropertiesWidget(TitleBlockTemplatesCollection *tbt_collection, const TitleBlockProperties &titleblock = TitleBlockProperties(), bool current_date = false, QETProject *project = nullptr, QWidget *parent = nullptr); explicit TitleBlockPropertiesWidget(QList tbt_collection, const TitleBlockProperties &titleblock = TitleBlockProperties(), bool current_date = false, QETProject *project = nullptr, QWidget *parent = nullptr); - ~TitleBlockPropertiesWidget(); + ~TitleBlockPropertiesWidget() override; void setProperties(const TitleBlockProperties &properties); TitleBlockProperties properties() const; diff --git a/sources/ui/xrefpropertieswidget.h b/sources/ui/xrefpropertieswidget.h index 1ebd27fbb..df5ca70c2 100644 --- a/sources/ui/xrefpropertieswidget.h +++ b/sources/ui/xrefpropertieswidget.h @@ -35,7 +35,7 @@ class XRefPropertiesWidget : public QWidget public: XRefPropertiesWidget(QHash properties = QHash (), QWidget *parent = nullptr); - ~XRefPropertiesWidget(); + ~XRefPropertiesWidget() override; void setProperties (const QHash &properties); QHash properties(); diff --git a/sources/undocommand/addelementtextcommand.h b/sources/undocommand/addelementtextcommand.h index 09420e471..d0c4289db 100644 --- a/sources/undocommand/addelementtextcommand.h +++ b/sources/undocommand/addelementtextcommand.h @@ -27,10 +27,10 @@ class AddElementTextCommand : public QUndoCommand { public: AddElementTextCommand(Element *element, DynamicElementTextItem *deti, QUndoCommand *parent = nullptr); - virtual ~AddElementTextCommand(); + ~AddElementTextCommand() override; - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; private: Element *m_element = nullptr; diff --git a/sources/undocommand/changeelementinformationcommand.h b/sources/undocommand/changeelementinformationcommand.h index 5ca80d7a1..071d1c21d 100644 --- a/sources/undocommand/changeelementinformationcommand.h +++ b/sources/undocommand/changeelementinformationcommand.h @@ -32,10 +32,10 @@ class ChangeElementInformationCommand : public QUndoCommand public: ChangeElementInformationCommand(Element *elmt, DiagramContext &old_info, DiagramContext &new_info, QUndoCommand *parent = nullptr); - virtual int id() const {return 1;} - virtual bool mergeWith(const QUndoCommand *other); - virtual void undo(); - virtual void redo(); + int id() const override {return 1;} + bool mergeWith(const QUndoCommand *other) override; + void undo() override; + void redo() override; private: Element *m_element; diff --git a/sources/undocommand/deleteqgraphicsitemcommand.h b/sources/undocommand/deleteqgraphicsitemcommand.h index c5906434b..bd78ef785 100644 --- a/sources/undocommand/deleteqgraphicsitemcommand.h +++ b/sources/undocommand/deleteqgraphicsitemcommand.h @@ -27,13 +27,13 @@ class DeleteQGraphicsItemCommand : public QUndoCommand { public: DeleteQGraphicsItemCommand(Diagram *diagram, const DiagramContent &content, QUndoCommand * parent = nullptr); - virtual ~DeleteQGraphicsItemCommand() override; + ~DeleteQGraphicsItemCommand() override; private: DeleteQGraphicsItemCommand(const DeleteQGraphicsItemCommand &); public: - virtual void undo() override; - virtual void redo() override; + void undo() override; + void redo() override; // attributes private: diff --git a/sources/undocommand/linkelementcommand.h b/sources/undocommand/linkelementcommand.h index 4ab5082b0..6a5524c8f 100644 --- a/sources/undocommand/linkelementcommand.h +++ b/sources/undocommand/linkelementcommand.h @@ -33,8 +33,8 @@ class LinkElementCommand : public QUndoCommand public: LinkElementCommand(Element *element_, QUndoCommand *parent = nullptr); - virtual int id() const {return 2;} - virtual bool mergeWith(const QUndoCommand *other); + int id() const override {return 2;} + bool mergeWith(const QUndoCommand *other) override; static bool isLinkable (Element *element_a, Element *element_b, bool already_linked = false); @@ -45,8 +45,8 @@ class LinkElementCommand : public QUndoCommand void unlink (QList element_list); void unlinkAll (); - void undo(); - void redo(); + void undo() override; + void redo() override; private: void setUpNewLink (const QList &element_list, bool already_link);