| [qet] qet/qet: [5009] Modernize-use-override refactors code |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/qet Archives
]
Revision: 5009
Author: scorpio810
Date: 2017-08-05 04:10:01 +0200 (Sat, 05 Aug 2017)
Log Message:
-----------
Modernize-use-override refactors code
Modified Paths:
--------------
trunk/sources/ElementsCollection/elementcollectionhandler.h
trunk/sources/ElementsCollection/elementcollectionitem.h
trunk/sources/ElementsCollection/elementscollectionmodel.h
trunk/sources/ElementsCollection/elementscollectionwidget.h
trunk/sources/ElementsCollection/elementstreeview.h
trunk/sources/ElementsCollection/fileelementcollectionitem.h
trunk/sources/ElementsCollection/ui/renamedialog.h
trunk/sources/ElementsCollection/xmlprojectelementcollectionitem.h
trunk/sources/PropertiesEditor/propertieseditordockwidget.h
trunk/sources/QPropertyUndoCommand/qpropertyundocommand.h
trunk/sources/QetGraphicsItemModeler/qetgraphicshandleritem.h
trunk/sources/aboutqet.h
trunk/sources/autoNum/numerotationcontextcommands.h
trunk/sources/autoNum/ui/autonumberingdockwidget.h
trunk/sources/autoNum/ui/autonumberingmanagementw.h
trunk/sources/autoNum/ui/folioautonumbering.h
trunk/sources/autoNum/ui/formulaautonumberingw.h
trunk/sources/autoNum/ui/numparteditorw.h
trunk/sources/autoNum/ui/selectautonumw.h
trunk/sources/bordertitleblock.h
trunk/sources/configdialog.h
trunk/sources/configpage.h
trunk/sources/configpages.h
trunk/sources/diagram.h
trunk/sources/diagramcommands.h
trunk/sources/diagramcontextwidget.h
trunk/sources/diagramevent/diagrameventaddelement.h
trunk/sources/diagramevent/diagrameventaddimage.h
trunk/sources/diagramevent/diagrameventaddshape.h
trunk/sources/diagramevent/diagrameventaddtext.h
trunk/sources/diagramevent/diagrameventinterface.h
trunk/sources/diagramfoliolist.h
trunk/sources/diagramprintdialog.h
trunk/sources/diagramschooser.h
trunk/sources/diagramview.h
trunk/sources/dvevent/dveventinterface.h
trunk/sources/editor/arceditor.h
trunk/sources/editor/editorcommands.h
trunk/sources/editor/elementitemeditor.h
trunk/sources/editor/elementprimitivedecorator.h
trunk/sources/editor/elementscene.h
trunk/sources/editor/elementview.h
trunk/sources/editor/ellipseeditor.h
trunk/sources/editor/esevent/eseventaddarc.h
trunk/sources/editor/esevent/eseventaddellipse.h
trunk/sources/editor/esevent/eseventaddline.h
trunk/sources/editor/esevent/eseventaddpolygon.h
trunk/sources/editor/esevent/eseventaddrect.h
trunk/sources/editor/esevent/eseventaddterminal.h
trunk/sources/editor/esevent/eseventaddtext.h
trunk/sources/editor/esevent/eseventaddtextfield.h
trunk/sources/editor/graphicspart/abstractpartellipse.h
trunk/sources/editor/graphicspart/customelementgraphicpart.h
trunk/sources/editor/graphicspart/partarc.h
trunk/sources/editor/graphicspart/partellipse.h
trunk/sources/editor/graphicspart/partline.h
trunk/sources/editor/graphicspart/partpolygon.h
trunk/sources/editor/graphicspart/partrectangle.h
trunk/sources/editor/graphicspart/partterminal.h
trunk/sources/editor/graphicspart/parttext.h
trunk/sources/editor/graphicspart/parttextfield.h
trunk/sources/editor/lineeditor.h
trunk/sources/editor/polygoneditor.h
trunk/sources/editor/qetelementeditor.h
trunk/sources/editor/rectangleeditor.h
trunk/sources/editor/styleeditor.h
trunk/sources/editor/terminaleditor.h
trunk/sources/editor/texteditor.h
trunk/sources/editor/textfieldeditor.h
trunk/sources/editor/ui/elementpropertieseditorwidget.h
trunk/sources/elementscategoryeditor.h
trunk/sources/elementscollectioncache.h
trunk/sources/elementspanel.h
trunk/sources/elementspanelwidget.h
trunk/sources/exportdialog.h
trunk/sources/exportpropertieswidget.h
trunk/sources/genericpanel.h
trunk/sources/nameslistwidget.h
trunk/sources/newelementwizard.h
trunk/sources/projectconfigpages.h
trunk/sources/projectview.h
trunk/sources/properties/xrefproperties.h
trunk/sources/qetapp.h
trunk/sources/qetarguments.h
trunk/sources/qetdiagrameditor.h
trunk/sources/qetgraphicsitem/commentitem.h
trunk/sources/qetgraphicsitem/conductor.h
trunk/sources/qetgraphicsitem/conductortextitem.h
trunk/sources/qetgraphicsitem/crossrefitem.h
trunk/sources/qetgraphicsitem/customelement.h
trunk/sources/qetgraphicsitem/diagramimageitem.h
trunk/sources/qetgraphicsitem/diagramtextitem.h
trunk/sources/qetgraphicsitem/dynamicelementtextitem.h
trunk/sources/qetgraphicsitem/element.h
trunk/sources/qetgraphicsitem/elementtextitem.h
trunk/sources/qetgraphicsitem/fixedelement.h
trunk/sources/qetgraphicsitem/ghostelement.h
trunk/sources/qetgraphicsitem/independenttextitem.h
trunk/sources/qetgraphicsitem/masterelement.h
trunk/sources/qetgraphicsitem/qetgraphicsitem.h
trunk/sources/qetgraphicsitem/qetshapeitem.h
trunk/sources/qetgraphicsitem/reportelement.h
trunk/sources/qetgraphicsitem/simpleelement.h
trunk/sources/qetgraphicsitem/slaveelement.h
trunk/sources/qetgraphicsitem/terminal.h
trunk/sources/qetgraphicsitem/terminalelement.h
trunk/sources/qetmainwindow.h
trunk/sources/qetprintpreviewdialog.h
trunk/sources/qetproject.h
trunk/sources/qetregexpvalidator.h
trunk/sources/qetsingleapplication.h
trunk/sources/qfilenameedit.h
trunk/sources/qtextorientationspinboxwidget.h
trunk/sources/qtextorientationwidget.h
trunk/sources/recentfiles.h
trunk/sources/richtext/richtexteditor.cpp
trunk/sources/richtext/richtexteditor_p.h
trunk/sources/titleblock/dimensionwidget.h
trunk/sources/titleblock/gridlayoutanimation.h
trunk/sources/titleblock/helpercell.h
trunk/sources/titleblock/integrationmovetemplateshandler.h
trunk/sources/titleblock/movetemplateshandler.h
trunk/sources/titleblock/qettemplateeditor.h
trunk/sources/titleblock/splittedhelpercell.h
trunk/sources/titleblock/templatecellwidget.h
trunk/sources/titleblock/templatecommands.h
trunk/sources/titleblock/templatedeleter.h
trunk/sources/titleblock/templatelocationchooser.h
trunk/sources/titleblock/templatelocationsaver.h
trunk/sources/titleblock/templatelogomanager.h
trunk/sources/titleblock/templatescollection.h
trunk/sources/titleblock/templateview.h
trunk/sources/titleblock/templatevisualcell.h
trunk/sources/titleblocktemplate.h
trunk/sources/titleblocktemplaterenderer.h
trunk/sources/ui/borderpropertieswidget.h
trunk/sources/ui/conductorpropertiesdialog.h
trunk/sources/ui/conductorpropertieswidget.h
trunk/sources/ui/diagramselection.h
trunk/sources/ui/dialogwaiting.h
trunk/sources/ui/dynamicelementtextitemeditor.h
trunk/sources/ui/dynamicelementtextmodel.h
trunk/sources/ui/elementinfopartwidget.h
trunk/sources/ui/elementinfowidget.h
trunk/sources/ui/elementpropertieswidget.h
trunk/sources/ui/formulaassistantdialog.h
trunk/sources/ui/imagepropertieswidget.h
trunk/sources/ui/importelementdialog.h
trunk/sources/ui/linksingleelementwidget.h
trunk/sources/ui/masterpropertieswidget.h
trunk/sources/ui/potentialselectordialog.cpp
trunk/sources/ui/potentialselectordialog.h
trunk/sources/ui/projectpropertiesdialog.h
trunk/sources/ui/reportpropertiewidget.h
trunk/sources/ui/shapegraphicsitempropertieswidget.h
trunk/sources/ui/titleblockpropertieswidget.h
trunk/sources/ui/xrefpropertieswidget.h
trunk/sources/undocommand/addelementtextcommand.h
trunk/sources/undocommand/changeelementinformationcommand.h
trunk/sources/undocommand/deleteqgraphicsitemcommand.h
trunk/sources/undocommand/linkelementcommand.h
Modified: trunk/sources/ElementsCollection/elementcollectionhandler.h
===================================================================
--- trunk/sources/ElementsCollection/elementcollectionhandler.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/ElementsCollection/elementcollectionhandler.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -45,7 +45,7 @@
{
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 @@
{
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 @@
{
public:
ECHSToXml (ElementsLocation &source, ElementsLocation &destination);
- ElementsLocation copy();
+ ElementsLocation copy() override;
};
/**
Modified: trunk/sources/ElementsCollection/elementcollectionitem.h
===================================================================
--- trunk/sources/ElementsCollection/elementcollectionitem.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/ElementsCollection/elementcollectionitem.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -32,7 +32,7 @@
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;
Modified: trunk/sources/ElementsCollection/elementscollectionmodel.h
===================================================================
--- trunk/sources/ElementsCollection/elementscollectionmodel.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/ElementsCollection/elementscollectionmodel.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -35,11 +35,11 @@
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<QETProject *> projects);
Modified: trunk/sources/ElementsCollection/elementscollectionwidget.h
===================================================================
--- trunk/sources/ElementsCollection/elementscollectionwidget.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/ElementsCollection/elementscollectionwidget.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -54,7 +54,7 @@
void setCurrentLocation(const ElementsLocation &location);
protected:
- virtual void leaveEvent(QEvent *event);
+ void leaveEvent(QEvent *event) override;
private:
void setUpAction();
Modified: trunk/sources/ElementsCollection/elementstreeview.h
===================================================================
--- trunk/sources/ElementsCollection/elementstreeview.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/ElementsCollection/elementstreeview.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -34,7 +34,7 @@
ElementsTreeView(QWidget *parent = nullptr);
protected:
- virtual void startDrag(Qt::DropActions supportedActions);
+ void startDrag(Qt::DropActions supportedActions) override;
virtual void startElementDrag(const ElementsLocation &location);
};
Modified: trunk/sources/ElementsCollection/fileelementcollectionitem.h
===================================================================
--- trunk/sources/ElementsCollection/fileelementcollectionitem.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/ElementsCollection/fileelementcollectionitem.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -31,24 +31,24 @@
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();
Modified: trunk/sources/ElementsCollection/ui/renamedialog.h
===================================================================
--- trunk/sources/ElementsCollection/ui/renamedialog.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/ElementsCollection/ui/renamedialog.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -31,7 +31,7 @@
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;}
Modified: trunk/sources/ElementsCollection/xmlprojectelementcollectionitem.h
===================================================================
--- trunk/sources/ElementsCollection/xmlprojectelementcollectionitem.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/ElementsCollection/xmlprojectelementcollectionitem.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -33,21 +33,21 @@
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);
Modified: trunk/sources/PropertiesEditor/propertieseditordockwidget.h
===================================================================
--- trunk/sources/PropertiesEditor/propertieseditordockwidget.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/PropertiesEditor/propertieseditordockwidget.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -32,7 +32,7 @@
public:
explicit PropertiesEditorDockWidget(QWidget *parent = nullptr);
- ~PropertiesEditorDockWidget();
+ ~PropertiesEditorDockWidget() override;
virtual void clear();
virtual void apply();
Modified: trunk/sources/QPropertyUndoCommand/qpropertyundocommand.h
===================================================================
--- trunk/sources/QPropertyUndoCommand/qpropertyundocommand.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/QPropertyUndoCommand/qpropertyundocommand.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -39,10 +39,10 @@
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;
Modified: trunk/sources/QetGraphicsItemModeler/qetgraphicshandleritem.h
===================================================================
--- trunk/sources/QetGraphicsItemModeler/qetgraphicshandleritem.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/QetGraphicsItemModeler/qetgraphicshandleritem.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -31,15 +31,15 @@
{
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,
Modified: trunk/sources/aboutqet.h
===================================================================
--- trunk/sources/aboutqet.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/aboutqet.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -28,7 +28,7 @@
// constructors, destructor
public:
AboutQET(QWidget * = nullptr);
- virtual ~AboutQET();
+ ~AboutQET() override;
private:
AboutQET(AboutQET &);
Modified: trunk/sources/autoNum/numerotationcontextcommands.h
===================================================================
--- trunk/sources/autoNum/numerotationcontextcommands.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/autoNum/numerotationcontextcommands.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -64,9 +64,9 @@
{
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
@@ -73,9 +73,9 @@
{
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
@@ -82,9 +82,9 @@
{
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
@@ -91,9 +91,9 @@
{
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
@@ -100,9 +100,9 @@
{
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
@@ -109,9 +109,9 @@
{
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
@@ -118,9 +118,9 @@
{
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
@@ -127,9 +127,9 @@
{
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
@@ -136,9 +136,9 @@
{
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
@@ -145,9 +145,9 @@
{
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
@@ -154,9 +154,9 @@
{
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,9 +164,9 @@
{
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
@@ -173,9 +173,9 @@
{
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
@@ -182,9 +182,9 @@
{
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;
};
Modified: trunk/sources/autoNum/ui/autonumberingdockwidget.h
===================================================================
--- trunk/sources/autoNum/ui/autonumberingdockwidget.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/autoNum/ui/autonumberingdockwidget.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -32,7 +32,7 @@
public:
explicit AutoNumberingDockWidget(QWidget *parent = nullptr);
- ~AutoNumberingDockWidget();
+ ~AutoNumberingDockWidget() override;
void setContext();
void setProject(QETProject*, ProjectView*);
Modified: trunk/sources/autoNum/ui/autonumberingmanagementw.h
===================================================================
--- trunk/sources/autoNum/ui/autonumberingmanagementw.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/autoNum/ui/autonumberingmanagementw.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -35,7 +35,7 @@
//METHODS
public:
explicit AutoNumberingManagementW(QETProject *project, QWidget *parent = nullptr);
- ~AutoNumberingManagementW();
+ ~AutoNumberingManagementW() override;
Ui::AutoNumberingManagementW *ui;
void setProjectContext ();
void contextToFormula ();
Modified: trunk/sources/autoNum/ui/folioautonumbering.h
===================================================================
--- trunk/sources/autoNum/ui/folioautonumbering.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/autoNum/ui/folioautonumbering.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -36,7 +36,7 @@
//METHODS
public:
explicit FolioAutonumberingW(QETProject *project, QWidget *parent = nullptr);
- ~FolioAutonumberingW();
+ ~FolioAutonumberingW() override;
void setContext (QList <QString> autonums);
NumerotationContext toNumContext() const;
Modified: trunk/sources/autoNum/ui/formulaautonumberingw.h
===================================================================
--- trunk/sources/autoNum/ui/formulaautonumberingw.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/autoNum/ui/formulaautonumberingw.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -39,7 +39,7 @@
//METHODS
public:
explicit FormulaAutonumberingW(QWidget *parent = nullptr);
- ~FormulaAutonumberingW();
+ ~FormulaAutonumberingW() override;
QString formula();
void setContext(QString);
void clearContext();
Modified: trunk/sources/autoNum/ui/numparteditorw.h
===================================================================
--- trunk/sources/autoNum/ui/numparteditorw.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/autoNum/ui/numparteditorw.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -39,7 +39,7 @@
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,
Modified: trunk/sources/autoNum/ui/selectautonumw.h
===================================================================
--- trunk/sources/autoNum/ui/selectautonumw.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/autoNum/ui/selectautonumw.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -39,7 +39,7 @@
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;
Modified: trunk/sources/bordertitleblock.h
===================================================================
--- trunk/sources/bordertitleblock.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/bordertitleblock.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -38,7 +38,7 @@
public:
BorderTitleBlock(QObject * = nullptr);
- virtual ~BorderTitleBlock();
+ ~BorderTitleBlock() override;
private:
BorderTitleBlock(const BorderTitleBlock &);
Modified: trunk/sources/configdialog.h
===================================================================
--- trunk/sources/configdialog.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/configdialog.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -33,7 +33,7 @@
// constructors, destructor
public:
ConfigDialog(QWidget * = nullptr);
- virtual ~ConfigDialog();
+ ~ConfigDialog() override;
private:
ConfigDialog(const ConfigDialog &);
Modified: trunk/sources/configpage.h
===================================================================
--- trunk/sources/configpage.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/configpage.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -33,7 +33,7 @@
*/
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
Modified: trunk/sources/configpages.h
===================================================================
--- trunk/sources/configpages.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/configpages.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -39,7 +39,7 @@
// 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 @@
// 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 @@
// 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 @@
// 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 @@
// 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:
Modified: trunk/sources/diagram.h
===================================================================
--- trunk/sources/diagram.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/diagram.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -53,7 +53,7 @@
// constructors, destructor
public:
Diagram(QETProject *project);
- virtual ~Diagram();
+ ~Diagram() override;
private:
Diagram(const Diagram &diagram);
@@ -114,15 +114,15 @@
// 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);
Modified: trunk/sources/diagramcommands.h
===================================================================
--- trunk/sources/diagramcommands.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/diagramcommands.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -53,17 +53,17 @@
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 @@
// 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 @@
// constructors, destructor
public:
CutDiagramCommand(Diagram *, const DiagramContent &, QUndoCommand * = nullptr);
- virtual ~CutDiagramCommand();
+ ~CutDiagramCommand() override;
private:
CutDiagramCommand(const CutDiagramCommand &);
};
@@ -128,14 +128,14 @@
// 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 @@
// 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 @@
// 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 @@
// constructors, destructor
public:
RotateElementsCommand(const QList<Element *> &elements, const QList<DiagramTextItem *> &, const QList<DiagramImageItem *> &, 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 @@
// constructors, destructor
public:
RotateTextsCommand(const QList<DiagramTextItem *> &, 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 @@
// 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 @@
// constructors, destructor
public:
ResetConductorCommand(const QHash<Conductor *, ConductorProfilesGroup> &, 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 @@
// 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 @@
// 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:
Modified: trunk/sources/diagramcontextwidget.h
===================================================================
--- trunk/sources/diagramcontextwidget.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/diagramcontextwidget.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -30,7 +30,7 @@
// Constructor, destructor
public:
DiagramContextWidget(QWidget *parent = nullptr);
- virtual ~DiagramContextWidget();
+ ~DiagramContextWidget() override;
private:
DiagramContextWidget(const DiagramContextWidget &);
Modified: trunk/sources/diagramevent/diagrameventaddelement.h
===================================================================
--- trunk/sources/diagramevent/diagrameventaddelement.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/diagramevent/diagrameventaddelement.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -34,14 +34,14 @@
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();
Modified: trunk/sources/diagramevent/diagrameventaddimage.h
===================================================================
--- trunk/sources/diagramevent/diagrameventaddimage.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/diagramevent/diagrameventaddimage.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -33,12 +33,12 @@
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:
Modified: trunk/sources/diagramevent/diagrameventaddshape.h
===================================================================
--- trunk/sources/diagramevent/diagrameventaddshape.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/diagramevent/diagrameventaddshape.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -32,12 +32,12 @@
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);
Modified: trunk/sources/diagramevent/diagrameventaddtext.h
===================================================================
--- trunk/sources/diagramevent/diagrameventaddtext.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/diagramevent/diagrameventaddtext.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -32,9 +32,9 @@
public:
DiagramEventAddText(Diagram *diagram);
- virtual ~DiagramEventAddText();
+ ~DiagramEventAddText() override;
- virtual bool mousePressEvent (QGraphicsSceneMouseEvent *event);
+ bool mousePressEvent (QGraphicsSceneMouseEvent *event) override;
};
#endif // DIAGRAMEVENTADDTEXT_H
Modified: trunk/sources/diagramevent/diagrameventinterface.h
===================================================================
--- trunk/sources/diagramevent/diagrameventinterface.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/diagramevent/diagrameventinterface.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -51,7 +51,7 @@
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);
Modified: trunk/sources/diagramfoliolist.h
===================================================================
--- trunk/sources/diagramfoliolist.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/diagramfoliolist.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -25,7 +25,7 @@
{
public:
DiagramFolioList(QETProject *project);
- virtual ~DiagramFolioList();
+ ~DiagramFolioList() override;
virtual QList<QLineF *> lines() const {return list_lines_;}
virtual QList<QRectF *> rectangles() const {return list_rectangles_;}
void setId(int i) {id = i;}
@@ -34,7 +34,7 @@
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);
Modified: trunk/sources/diagramprintdialog.h
===================================================================
--- trunk/sources/diagramprintdialog.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/diagramprintdialog.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -37,7 +37,7 @@
// Constructors, destructor
public:
DiagramPrintDialog(QETProject *, QWidget * = nullptr);
- virtual ~DiagramPrintDialog();
+ ~DiagramPrintDialog() override;
private:
DiagramPrintDialog(const DiagramPrintDialog &);
Modified: trunk/sources/diagramschooser.h
===================================================================
--- trunk/sources/diagramschooser.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/diagramschooser.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -30,7 +30,7 @@
// constructors, destructor
public:
DiagramsChooser(QETProject *, QWidget * = nullptr);
- virtual ~DiagramsChooser();
+ ~DiagramsChooser() override;
private:
DiagramsChooser(const DiagramsChooser &);
Modified: trunk/sources/diagramview.h
===================================================================
--- trunk/sources/diagramview.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/diagramview.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -42,7 +42,7 @@
// constructors, destructor
public:
DiagramView(Diagram *diagram, QWidget * = nullptr);
- virtual ~DiagramView();
+ ~DiagramView() override;
private:
DiagramView(const DiagramView &);
@@ -75,13 +75,13 @@
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 *);
@@ -88,13 +88,13 @@
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 *);
Modified: trunk/sources/dvevent/dveventinterface.h
===================================================================
--- trunk/sources/dvevent/dveventinterface.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/dvevent/dveventinterface.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -41,7 +41,7 @@
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);
Modified: trunk/sources/editor/arceditor.h
===================================================================
--- trunk/sources/editor/arceditor.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/editor/arceditor.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -35,7 +35,7 @@
// constructors, destructor
public:
ArcEditor(QETElementEditor *, PartArc * = nullptr, QWidget * = nullptr);
- virtual ~ArcEditor();
+ ~ArcEditor() override;
private:
ArcEditor(const ArcEditor &);
@@ -49,14 +49,14 @@
// 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);
Modified: trunk/sources/editor/editorcommands.h
===================================================================
--- trunk/sources/editor/editorcommands.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/editor/editorcommands.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -35,7 +35,7 @@
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 @@
// constructors, destructor
public:
DeletePartsCommand(ElementScene *, const QList<QGraphicsItem *>, 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 @@
// 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 @@
// constructors, destructor
public:
CutPartsCommand(ElementScene *, const QList<QGraphicsItem *>, QUndoCommand * = nullptr);
- virtual ~CutPartsCommand();
+ ~CutPartsCommand() override;
private:
CutPartsCommand(const CutPartsCommand &);
};
@@ -126,14 +126,14 @@
// constructors, destructor
public:
MovePartsCommand(const QPointF &, ElementScene *, const QList<QGraphicsItem *>, 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 @@
// 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 @@
// 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 @@
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<QGraphicsItem *> &);
@@ -240,14 +240,14 @@
// 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 @@
// 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<CustomElementPart *> &);
QList<CustomElementPart *> scaledPrimitives() const;
@@ -297,10 +297,10 @@
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 <QString> m_type;
Modified: trunk/sources/editor/elementitemeditor.h
===================================================================
--- trunk/sources/editor/elementitemeditor.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/editor/elementitemeditor.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -36,7 +36,7 @@
// constructors, destructor
public:
ElementItemEditor(QETElementEditor *, QWidget * = nullptr);
- virtual ~ElementItemEditor() {};
+ ~ElementItemEditor() override {};
private:
ElementItemEditor(const ElementItemEditor &);
Modified: trunk/sources/editor/elementprimitivedecorator.h
===================================================================
--- trunk/sources/editor/elementprimitivedecorator.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/editor/elementprimitivedecorator.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -43,15 +43,15 @@
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<QGraphicsItem *> &);
void setItems(const QList<CustomElementPart *> &);
QList<CustomElementPart *> items() const;
@@ -64,18 +64,18 @@
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();
Modified: trunk/sources/editor/elementscene.h
===================================================================
--- trunk/sources/editor/elementscene.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/editor/elementscene.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -56,7 +56,7 @@
// constructors, destructor
public:
ElementScene(QETElementEditor *, QObject * = nullptr);
- virtual ~ElementScene();
+ ~ElementScene() override;
private:
ElementScene(const ElementScene &);
@@ -130,14 +130,14 @@
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;
Modified: trunk/sources/editor/elementview.h
===================================================================
--- trunk/sources/editor/elementview.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/editor/elementview.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -31,7 +31,7 @@
// constructors, destructor
public:
ElementView(ElementScene *, QWidget * = nullptr);
- virtual ~ElementView();
+ ~ElementView() override;
private:
ElementView(const ElementView &);
@@ -43,13 +43,13 @@
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 &);
Modified: trunk/sources/editor/ellipseeditor.h
===================================================================
--- trunk/sources/editor/ellipseeditor.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/editor/ellipseeditor.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -34,7 +34,7 @@
// constructors, destructor
public:
EllipseEditor(QETElementEditor *, PartEllipse * = nullptr, QWidget * = nullptr);
- virtual ~EllipseEditor();
+ ~EllipseEditor() override;
private:
EllipseEditor(const EllipseEditor &);
@@ -47,12 +47,12 @@
// 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);
Modified: trunk/sources/editor/esevent/eseventaddarc.h
===================================================================
--- trunk/sources/editor/esevent/eseventaddarc.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/editor/esevent/eseventaddarc.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -32,12 +32,12 @@
{
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 ();
Modified: trunk/sources/editor/esevent/eseventaddellipse.h
===================================================================
--- trunk/sources/editor/esevent/eseventaddellipse.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/editor/esevent/eseventaddellipse.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -33,11 +33,11 @@
{
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;
Modified: trunk/sources/editor/esevent/eseventaddline.h
===================================================================
--- trunk/sources/editor/esevent/eseventaddline.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/editor/esevent/eseventaddline.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -32,11 +32,11 @@
{
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;
Modified: trunk/sources/editor/esevent/eseventaddpolygon.h
===================================================================
--- trunk/sources/editor/esevent/eseventaddpolygon.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/editor/esevent/eseventaddpolygon.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -32,12 +32,12 @@
{
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;
Modified: trunk/sources/editor/esevent/eseventaddrect.h
===================================================================
--- trunk/sources/editor/esevent/eseventaddrect.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/editor/esevent/eseventaddrect.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -29,11 +29,11 @@
{
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;
Modified: trunk/sources/editor/esevent/eseventaddterminal.h
===================================================================
--- trunk/sources/editor/esevent/eseventaddterminal.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/editor/esevent/eseventaddterminal.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -32,11 +32,11 @@
{
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;
Modified: trunk/sources/editor/esevent/eseventaddtext.h
===================================================================
--- trunk/sources/editor/esevent/eseventaddtext.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/editor/esevent/eseventaddtext.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -32,10 +32,10 @@
{
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;
Modified: trunk/sources/editor/esevent/eseventaddtextfield.h
===================================================================
--- trunk/sources/editor/esevent/eseventaddtextfield.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/editor/esevent/eseventaddtextfield.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -32,10 +32,10 @@
{
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;
Modified: trunk/sources/editor/graphicspart/abstractpartellipse.h
===================================================================
--- trunk/sources/editor/graphicspart/abstractpartellipse.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/editor/graphicspart/abstractpartellipse.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -42,7 +42,7 @@
// constructors, destructor
public:
AbstractPartEllipse(QETElementEditor *editor, QGraphicsItem * parent = nullptr);
- virtual ~AbstractPartEllipse();
+ ~AbstractPartEllipse() override;
private:
AbstractPartEllipse(const AbstractPartEllipse &);
@@ -54,17 +54,17 @@
// 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);
Modified: trunk/sources/editor/graphicspart/customelementgraphicpart.h
===================================================================
--- trunk/sources/editor/graphicspart/customelementgraphicpart.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/editor/graphicspart/customelementgraphicpart.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -65,7 +65,7 @@
public:
CustomElementGraphicPart(QETElementEditor *editor, QGraphicsItem *parent = nullptr);
- virtual ~CustomElementGraphicPart();
+ ~CustomElementGraphicPart() override;
static void drawCross (const QPointF ¢er, QPainter *painter);
@@ -89,8 +89,8 @@
//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 @@
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;
Modified: trunk/sources/editor/graphicspart/partarc.h
===================================================================
--- trunk/sources/editor/graphicspart/partarc.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/editor/graphicspart/partarc.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -34,7 +34,7 @@
public:
PartArc(QETElementEditor *editor, QGraphicsItem *parent = nullptr);
- virtual ~PartArc();
+ ~PartArc() override;
private:
PartArc(const PartArc &);
@@ -45,25 +45,25 @@
* 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();
Modified: trunk/sources/editor/graphicspart/partellipse.h
===================================================================
--- trunk/sources/editor/graphicspart/partellipse.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/editor/graphicspart/partellipse.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -34,7 +34,7 @@
// constructors, destructor
public:
PartEllipse(QETElementEditor *editor, QGraphicsItem * parent = nullptr);
- virtual ~PartEllipse();
+ ~PartEllipse() override;
private:
PartEllipse(const PartEllipse &);
@@ -46,22 +46,22 @@
* 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();
Modified: trunk/sources/editor/graphicspart/partline.h
===================================================================
--- trunk/sources/editor/graphicspart/partline.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/editor/graphicspart/partline.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -46,7 +46,7 @@
// constructors, destructor
public:
PartLine(QETElementEditor *, QGraphicsItem * = nullptr);
- virtual ~PartLine();
+ ~PartLine() override;
private:
PartLine(const PartLine &);
@@ -66,21 +66,21 @@
* 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<QPointF> fourEndPoints(const QPointF &, const QPointF &, const qreal &);
@@ -96,8 +96,8 @@
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();
Modified: trunk/sources/editor/graphicspart/partpolygon.h
===================================================================
--- trunk/sources/editor/graphicspart/partpolygon.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/editor/graphicspart/partpolygon.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -39,7 +39,7 @@
// constructors, destructor
public:
PartPolygon(QETElementEditor *editor, QGraphicsItem *parent = nullptr);
- virtual ~PartPolygon();
+ ~PartPolygon() override;
private:
PartPolygon(const PartPolygon &);
@@ -55,23 +55,23 @@
* 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 @@
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();
Modified: trunk/sources/editor/graphicspart/partrectangle.h
===================================================================
--- trunk/sources/editor/graphicspart/partrectangle.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/editor/graphicspart/partrectangle.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -37,7 +37,7 @@
// constructors, destructor
public:
PartRectangle(QETElementEditor *, QGraphicsItem *parent = nullptr);
- virtual ~PartRectangle();
+ ~PartRectangle() override;
private:
PartRectangle(const PartRectangle &);
@@ -52,32 +52,32 @@
* 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();
Modified: trunk/sources/editor/graphicspart/partterminal.h
===================================================================
--- trunk/sources/editor/graphicspart/partterminal.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/editor/graphicspart/partterminal.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -36,7 +36,7 @@
public:
// constructors, destructor
PartTerminal(QETElementEditor *editor, QGraphicsItem *parent = nullptr);
- virtual ~PartTerminal();
+ ~PartTerminal() override;
private:
PartTerminal(const PartTerminal &);
@@ -56,20 +56,20 @@
* 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);
Modified: trunk/sources/editor/graphicspart/parttext.h
===================================================================
--- trunk/sources/editor/graphicspart/parttext.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/editor/graphicspart/parttext.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -32,7 +32,7 @@
// constructors, destructor
public:
PartText(QETElementEditor *, QGraphicsItem * = nullptr);
- virtual ~PartText();
+ ~PartText() override;
private:
PartText(const PartText &);
@@ -45,20 +45,20 @@
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 @@
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;
Modified: trunk/sources/editor/graphicspart/parttextfield.h
===================================================================
--- trunk/sources/editor/graphicspart/parttextfield.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/editor/graphicspart/parttextfield.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -36,7 +36,7 @@
// constructors, destructor
public:
PartTextField(QETElementEditor *, QGraphicsItem * = nullptr);
- virtual ~PartTextField();
+ ~PartTextField() override;
private:
PartTextField(const PartTextField &);
@@ -53,19 +53,19 @@
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 @@
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;
Modified: trunk/sources/editor/lineeditor.h
===================================================================
--- trunk/sources/editor/lineeditor.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/editor/lineeditor.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -34,7 +34,7 @@
// constructors, destructor
public:
LineEditor(QETElementEditor *, PartLine * = nullptr, QWidget * = nullptr);
- virtual ~LineEditor();
+ ~LineEditor() override;
private:
LineEditor(const LineEditor &);
@@ -49,8 +49,8 @@
// 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 @@
void updateLineEndType2();
void updateLineEndLength2();
void lineEditingFinished();
- void updateForm();
+ void updateForm() override;
private:
void activeConnections(bool);
Modified: trunk/sources/editor/polygoneditor.h
===================================================================
--- trunk/sources/editor/polygoneditor.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/editor/polygoneditor.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -36,7 +36,7 @@
// constructors, destructor
public:
PolygonEditor(QETElementEditor *, PartPolygon * = nullptr, QWidget * = nullptr);
- virtual ~PolygonEditor();
+ ~PolygonEditor() override;
private:
PolygonEditor(const PolygonEditor &);
@@ -50,8 +50,8 @@
// methods
public:
- virtual bool setPart(CustomElementPart *);
- virtual CustomElementPart *currentPart() const;
+ bool setPart(CustomElementPart *) override;
+ CustomElementPart *currentPart() const override;
private:
QVector<QPointF> getPointsFromTree();
@@ -59,7 +59,7 @@
public slots:
void updatePolygonPoints();
void updatePolygonClosedState();
- void updateForm();
+ void updateForm() override;
void validColumn(QTreeWidgetItem *qtwi, int column);
private:
Modified: trunk/sources/editor/qetelementeditor.h
===================================================================
--- trunk/sources/editor/qetelementeditor.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/editor/qetelementeditor.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -37,7 +37,7 @@
// constructor, destructor
public:
QETElementEditor(QWidget * = nullptr);
- virtual ~QETElementEditor();
+ ~QETElementEditor() override;
private:
QETElementEditor(const QETElementEditor &);
void setupActions();
@@ -116,8 +116,8 @@
void saveToLocation(ElementsLocation loc);
protected:
- void closeEvent(QCloseEvent *);
- virtual void firstActivation(QEvent *);
+ void closeEvent(QCloseEvent *) override;
+ void firstActivation(QEvent *) override;
private:
bool canClose();
Modified: trunk/sources/editor/rectangleeditor.h
===================================================================
--- trunk/sources/editor/rectangleeditor.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/editor/rectangleeditor.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -34,7 +34,7 @@
// constructors, destructor
public:
RectangleEditor(QETElementEditor *, PartRectangle * = nullptr, QWidget * = nullptr);
- virtual ~RectangleEditor();
+ ~RectangleEditor() override;
private:
RectangleEditor(const RectangleEditor &);
@@ -47,12 +47,12 @@
// 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:
Modified: trunk/sources/editor/styleeditor.h
===================================================================
--- trunk/sources/editor/styleeditor.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/editor/styleeditor.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -37,7 +37,7 @@
// constructors, destructor
public:
StyleEditor(QETElementEditor *, CustomElementGraphicPart * = nullptr, QWidget * = nullptr);
- virtual ~StyleEditor();
+ ~StyleEditor() override;
private:
StyleEditor(const StyleEditor &);
@@ -53,14 +53,14 @@
// methods
public:
- virtual bool setPart(CustomElementPart *);
- virtual bool setParts(QList<CustomElementPart *>);
- virtual CustomElementPart *currentPart() const;
+ bool setPart(CustomElementPart *) override;
+ bool setParts(QList<CustomElementPart *>) override;
+ CustomElementPart *currentPart() const override;
static bool isStyleEditable (QList <CustomElementPart *> cep_list);
public slots:
- void updateForm();
+ void updateForm() override;
void updatePartAntialiasing();
void updatePartColor();
void updatePartLineStyle();
Modified: trunk/sources/editor/terminaleditor.h
===================================================================
--- trunk/sources/editor/terminaleditor.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/editor/terminaleditor.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -32,7 +32,7 @@
// Constructors, destructor
public:
TerminalEditor(QETElementEditor *, PartTerminal * = nullptr, QWidget * = nullptr);
- virtual ~TerminalEditor();
+ ~TerminalEditor() override;
private:
TerminalEditor(const TerminalEditor &);
@@ -45,13 +45,13 @@
// 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);
Modified: trunk/sources/editor/texteditor.h
===================================================================
--- trunk/sources/editor/texteditor.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/editor/texteditor.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -39,7 +39,7 @@
// Constructors, destructor
public:
TextEditor(QETElementEditor *, PartText * = nullptr, QWidget * = nullptr);
- virtual ~TextEditor();
+ ~TextEditor() override;
private:
TextEditor(const TextEditor &);
@@ -56,8 +56,8 @@
// 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 @@
void updateTextC();
void updateTextRotationAngle();
void updatePos();
- void updateForm();
+ void updateForm() override;
private:
void activeConnections(bool);
Modified: trunk/sources/editor/textfieldeditor.h
===================================================================
--- trunk/sources/editor/textfieldeditor.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/editor/textfieldeditor.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -38,7 +38,7 @@
// Constructors, destructor
public:
TextFieldEditor(QETElementEditor *, PartTextField * = nullptr, QWidget * = nullptr);
- virtual ~TextFieldEditor();
+ ~TextFieldEditor() override;
private:
TextFieldEditor(const TextFieldEditor &);
@@ -55,8 +55,8 @@
// 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 @@
void updateTextFieldRotationAngle();
void updateTagg();
void updatePos();
- void updateForm();
+ void updateForm() override;
private:
void activeConnections(bool);
Modified: trunk/sources/editor/ui/elementpropertieseditorwidget.h
===================================================================
--- trunk/sources/editor/ui/elementpropertieseditorwidget.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/editor/ui/elementpropertieseditorwidget.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -38,7 +38,7 @@
//METHODS
public:
explicit ElementPropertiesEditorWidget(QString &basic_type, DiagramContext &dc, QWidget *parent = nullptr);
- ~ElementPropertiesEditorWidget();
+ ~ElementPropertiesEditorWidget() override;
void upDateInterface();
Modified: trunk/sources/elementscategoryeditor.h
===================================================================
--- trunk/sources/elementscategoryeditor.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/elementscategoryeditor.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -36,7 +36,7 @@
public:
ElementsCategoryEditor(const ElementsLocation &location, bool edit = true, QWidget *parent = nullptr);
- virtual ~ElementsCategoryEditor();
+ ~ElementsCategoryEditor() override;
ElementsLocation createdLocation() const;
Modified: trunk/sources/elementscollectioncache.h
===================================================================
--- trunk/sources/elementscollectioncache.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/elementscollectioncache.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -32,7 +32,7 @@
public:
// constructor, destructor
ElementsCollectionCache(const QString &database_path, QObject * = nullptr);
- virtual ~ElementsCollectionCache();
+ ~ElementsCollectionCache() override;
// methods
public:
Modified: trunk/sources/elementspanel.h
===================================================================
--- trunk/sources/elementspanel.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/elementspanel.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -37,7 +37,7 @@
// constructors, destructor
public:
ElementsPanel(QWidget * = nullptr);
- virtual ~ElementsPanel();
+ ~ElementsPanel() override;
private:
ElementsPanel(const ElementsPanel &);
@@ -66,7 +66,7 @@
void ensureHierarchyIsVisible(const QList<QTreeWidgetItem *> &);
protected:
- void startDrag(Qt::DropActions);
+ void startDrag(Qt::DropActions) override;
void startTitleBlockTemplateDrag(const TitleBlockTemplateLocation &);
bool matchesFilter(const QTreeWidgetItem *, QString) const;
@@ -75,8 +75,8 @@
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:
Modified: trunk/sources/elementspanelwidget.h
===================================================================
--- trunk/sources/elementspanelwidget.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/elementspanelwidget.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -31,7 +31,7 @@
// constructors, destructor
public:
ElementsPanelWidget(QWidget * = nullptr);
- virtual ~ElementsPanelWidget();
+ ~ElementsPanelWidget() override;
private:
ElementsPanelWidget(const ElementsPanelWidget &);
@@ -86,7 +86,7 @@
void filterEdited(const QString &);
protected:
- virtual void keyPressEvent (QKeyEvent *e);
+ void keyPressEvent (QKeyEvent *e) override;
private:
QString previous_filter_;
Modified: trunk/sources/exportdialog.h
===================================================================
--- trunk/sources/exportdialog.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/exportdialog.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -33,7 +33,7 @@
// constructors, destructor
public:
ExportDialog(QETProject *, QWidget * = nullptr);
- virtual ~ExportDialog();
+ ~ExportDialog() override;
private:
ExportDialog(const ExportDialog &);
Modified: trunk/sources/exportpropertieswidget.h
===================================================================
--- trunk/sources/exportpropertieswidget.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/exportpropertieswidget.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -30,7 +30,7 @@
public:
ExportPropertiesWidget(QWidget * = nullptr);
ExportPropertiesWidget(const ExportProperties &, QWidget * = nullptr);
- virtual ~ExportPropertiesWidget();
+ ~ExportPropertiesWidget() override;
private:
ExportPropertiesWidget(const ExportPropertiesWidget &);
Modified: trunk/sources/genericpanel.h
===================================================================
--- trunk/sources/genericpanel.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/genericpanel.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -56,7 +56,7 @@
// Constructors, destructor
public:
GenericPanel(QWidget * = nullptr);
- virtual ~GenericPanel();
+ ~GenericPanel() override;
public:
// convenience methods to obtain what an item represents
@@ -132,7 +132,7 @@
template<typename T> T valueForItem(QTreeWidgetItem *) const;
void unregisterItem(QTreeWidgetItem *);
- bool event(QEvent *);
+ bool event(QEvent *) override;
signals:
bool firstActivated();
Modified: trunk/sources/nameslistwidget.h
===================================================================
--- trunk/sources/nameslistwidget.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/nameslistwidget.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -29,7 +29,7 @@
// constructors, destructor
public:
NamesListWidget(QWidget * = nullptr);
- virtual ~NamesListWidget();
+ ~NamesListWidget() override;
private:
NamesListWidget(const NamesListWidget &);
Modified: trunk/sources/newelementwizard.h
===================================================================
--- trunk/sources/newelementwizard.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/newelementwizard.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -42,7 +42,7 @@
// constructors, destructor
public:
NewElementWizard(QWidget * = nullptr, Qt::WindowFlags = nullptr);
- virtual ~NewElementWizard();
+ ~NewElementWizard() override;
void preselectedLocation(const ElementsLocation &location);
@@ -66,7 +66,7 @@
QWizardPage *buildStep3();
bool validStep1();
bool validStep2();
- bool validateCurrentPage();
+ bool validateCurrentPage() override;
void createNewElement();
};
#endif
Modified: trunk/sources/projectconfigpages.h
===================================================================
--- trunk/sources/projectconfigpages.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/projectconfigpages.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -41,7 +41,7 @@
// Constructor, destructor
public:
ProjectConfigPage(QETProject *, QWidget * = nullptr);
- virtual ~ProjectConfigPage();
+ ~ProjectConfigPage() override;
private:
ProjectConfigPage(const ProjectConfigPage &);
@@ -49,7 +49,7 @@
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 @@
// 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 @@
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:
Modified: trunk/sources/projectview.h
===================================================================
--- trunk/sources/projectview.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/projectview.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -42,7 +42,7 @@
// constructors, destructor
public:
ProjectView(QETProject *, QWidget * = nullptr);
- virtual ~ProjectView();
+ ~ProjectView() override;
private:
ProjectView(const ProjectView &);
@@ -52,7 +52,7 @@
void setProject(QETProject *);
QList<DiagramView *> diagram_views() const;
DiagramView *currentDiagram() const;
- void closeEvent(QCloseEvent *);
+ void closeEvent(QCloseEvent *) override;
void changeTabUp();
void changeTabDown();
void changeFirstTab();
Modified: trunk/sources/properties/xrefproperties.h
===================================================================
--- trunk/sources/properties/xrefproperties.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/properties/xrefproperties.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -40,10 +40,10 @@
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<QString, XRefProperties> defaultProperties();
Modified: trunk/sources/qetapp.h
===================================================================
--- trunk/sources/qetapp.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/qetapp.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -55,7 +55,7 @@
// constructors, destructor
public:
QETApp(int &, char **);
- virtual ~QETApp();
+ ~QETApp() override;
private:
QETApp(const QETApp &);
Modified: trunk/sources/qetarguments.h
===================================================================
--- trunk/sources/qetarguments.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/qetarguments.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -32,7 +32,7 @@
QETArguments(const QList<QString> &, QObject * = nullptr);
QETArguments(const QETArguments &);
QETArguments &operator=(const QETArguments &);
- virtual ~QETArguments();
+ ~QETArguments() override;
// methods
public:
Modified: trunk/sources/qetdiagrameditor.h
===================================================================
--- trunk/sources/qetdiagrameditor.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/qetdiagrameditor.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -44,7 +44,7 @@
// constructors, destructor
public:
QETDiagramEditor(const QStringList & = QStringList(), QWidget * = nullptr);
- virtual ~QETDiagramEditor();
+ ~QETDiagramEditor() override;
private:
QETDiagramEditor(const QETDiagramEditor &);
@@ -61,7 +61,7 @@
// methods
public:
- void closeEvent (QCloseEvent *);
+ void closeEvent (QCloseEvent *) override;
QList<ProjectView *> openedProjects () const;
void addProjectView (ProjectView *);
bool openAndAddProject (const QString &, bool = true, bool = true);
@@ -72,7 +72,7 @@
bool drawGrid() const;
protected:
- virtual bool event(QEvent *);
+ bool event(QEvent *) override;
private:
bool addProject(QETProject *, bool = true);
Modified: trunk/sources/qetgraphicsitem/commentitem.h
===================================================================
--- trunk/sources/qetgraphicsitem/commentitem.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/qetgraphicsitem/commentitem.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -34,7 +34,7 @@
public:
explicit CommentItem(Element *elmt);
- virtual QRectF boundingRect() const;
+ QRectF boundingRect() const override;
signals:
@@ -43,8 +43,8 @@
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:
Modified: trunk/sources/qetgraphicsitem/conductor.h
===================================================================
--- trunk/sources/qetgraphicsitem/conductor.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/qetgraphicsitem/conductor.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -53,7 +53,7 @@
public:
Conductor(Terminal *, Terminal *);
- virtual ~Conductor();
+ ~Conductor() override;
bool isValid() const;
@@ -72,7 +72,7 @@
* 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 @@
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 @@
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();
Modified: trunk/sources/qetgraphicsitem/conductortextitem.h
===================================================================
--- trunk/sources/qetgraphicsitem/conductortextitem.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/qetgraphicsitem/conductortextitem.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -34,7 +34,7 @@
public:
ConductorTextItem(Conductor * = nullptr);
ConductorTextItem(const QString &, Conductor * = nullptr);
- virtual ~ConductorTextItem();
+ ~ConductorTextItem() override;
private:
ConductorTextItem(const ConductorTextItem &);
@@ -41,9 +41,9 @@
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 @@
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:
Modified: trunk/sources/qetgraphicsitem/crossrefitem.h
===================================================================
--- trunk/sources/qetgraphicsitem/crossrefitem.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/qetgraphicsitem/crossrefitem.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -42,10 +42,10 @@
//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 @@
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 @@
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 ();
Modified: trunk/sources/qetgraphicsitem/customelement.h
===================================================================
--- trunk/sources/qetgraphicsitem/customelement.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/qetgraphicsitem/customelement.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -38,7 +38,7 @@
public:
CustomElement (const ElementsLocation &, QGraphicsItem * = nullptr, int * = nullptr);
- virtual ~CustomElement();
+ ~CustomElement() override;
private:
CustomElement(const CustomElement &);
@@ -62,20 +62,20 @@
// methods
public:
- virtual QList<Terminal *> terminals() const;
- virtual QList<Conductor *> conductors() const;
- virtual QList<ElementTextItem *> texts() const;
- virtual QList<QLineF *> lines() const;
- virtual QList<QRectF *> rectangles() const;
- virtual QList<QRectF *> circles() const;
- virtual QList<QVector<QPointF> *> polygons() const;
- virtual QList<QVector<qreal> *> arcs() const;
- virtual int terminalsCount() const;
- virtual void paint(QPainter *, const QStyleOptionGraphicsItem *);
- QString typeId() const;
+ QList<Terminal *> terminals() const override;
+ QList<Conductor *> conductors() const override;
+ QList<ElementTextItem *> texts() const override;
+ QList<QLineF *> lines() const override;
+ QList<QRectF *> rectangles() const override;
+ QList<QRectF *> circles() const override;
+ QList<QVector<QPointF> *> polygons() const override;
+ QList<QVector<qreal> *> 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);
Modified: trunk/sources/qetgraphicsitem/diagramimageitem.h
===================================================================
--- trunk/sources/qetgraphicsitem/diagramimageitem.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/qetgraphicsitem/diagramimageitem.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -35,7 +35,7 @@
public:
DiagramImageItem(QetGraphicsItem * = nullptr);
DiagramImageItem(const QPixmap &pixmap, QetGraphicsItem * = nullptr);
- virtual ~DiagramImageItem();
+ ~DiagramImageItem() override;
// attributes
public:
@@ -48,17 +48,17 @@
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_;
Modified: trunk/sources/qetgraphicsitem/diagramtextitem.h
===================================================================
--- trunk/sources/qetgraphicsitem/diagramtextitem.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/qetgraphicsitem/diagramtextitem.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -49,7 +49,7 @@
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 @@
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 &);
Modified: trunk/sources/qetgraphicsitem/dynamicelementtextitem.h
===================================================================
--- trunk/sources/qetgraphicsitem/dynamicelementtextitem.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/qetgraphicsitem/dynamicelementtextitem.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -44,7 +44,7 @@
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 @@
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 @@
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;
Modified: trunk/sources/qetgraphicsitem/element.h
===================================================================
--- trunk/sources/qetgraphicsitem/element.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/qetgraphicsitem/element.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -42,7 +42,7 @@
// constructors, destructor
public:
Element(QGraphicsItem * = nullptr);
- virtual ~Element();
+ ~Element() override;
private:
Element(const Element &);
@@ -53,7 +53,7 @@
* @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 @@
/// @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 @@
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 @@
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;
Modified: trunk/sources/qetgraphicsitem/elementtextitem.h
===================================================================
--- trunk/sources/qetgraphicsitem/elementtextitem.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/qetgraphicsitem/elementtextitem.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -33,12 +33,12 @@
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 @@
// 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 @@
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 ();
Modified: trunk/sources/qetgraphicsitem/fixedelement.h
===================================================================
--- trunk/sources/qetgraphicsitem/fixedelement.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/qetgraphicsitem/fixedelement.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -30,15 +30,15 @@
// 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
Modified: trunk/sources/qetgraphicsitem/ghostelement.h
===================================================================
--- trunk/sources/qetgraphicsitem/ghostelement.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/qetgraphicsitem/ghostelement.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -37,12 +37,12 @@
// constructor, destructor
public:
GhostElement(const ElementsLocation &, QGraphicsItem * = nullptr);
- virtual ~GhostElement();
+ ~GhostElement() override;
// methods
public:
- virtual bool fromXml(QDomElement &, QHash<int, Terminal *> &, bool = false);
- virtual kind linkType() const {return Simple;}
+ bool fromXml(QDomElement &, QHash<int, Terminal *> &, bool = false) override;
+ kind linkType() const override {return Simple;}
protected:
QRectF minimalBoundingRect() const;
Modified: trunk/sources/qetgraphicsitem/independenttextitem.h
===================================================================
--- trunk/sources/qetgraphicsitem/independenttextitem.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/qetgraphicsitem/independenttextitem.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -30,7 +30,7 @@
public:
IndependentTextItem();
IndependentTextItem(const QString &);
- virtual ~IndependentTextItem();
+ ~IndependentTextItem() override;
// attributes
public:
@@ -43,9 +43,9 @@
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_;
Modified: trunk/sources/qetgraphicsitem/masterelement.h
===================================================================
--- trunk/sources/qetgraphicsitem/masterelement.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/qetgraphicsitem/masterelement.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -34,12 +34,12 @@
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);
Modified: trunk/sources/qetgraphicsitem/qetgraphicsitem.h
===================================================================
--- trunk/sources/qetgraphicsitem/qetgraphicsitem.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/qetgraphicsitem/qetgraphicsitem.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -29,7 +29,7 @@
public:
//constructor destructor
QetGraphicsItem(QGraphicsItem *parent = nullptr);
- virtual ~QetGraphicsItem() = 0;
+ ~QetGraphicsItem() override = 0;
//public methode
Diagram *diagram () const;
@@ -46,10 +46,10 @@
//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_;
Modified: trunk/sources/qetgraphicsitem/qetshapeitem.h
===================================================================
--- trunk/sources/qetgraphicsitem/qetshapeitem.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/qetgraphicsitem/qetshapeitem.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -57,10 +57,10 @@
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 @@
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 @@
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();
Modified: trunk/sources/qetgraphicsitem/reportelement.h
===================================================================
--- trunk/sources/qetgraphicsitem/reportelement.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/qetgraphicsitem/reportelement.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -33,10 +33,10 @@
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);
Modified: trunk/sources/qetgraphicsitem/simpleelement.h
===================================================================
--- trunk/sources/qetgraphicsitem/simpleelement.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/qetgraphicsitem/simpleelement.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -33,9 +33,9 @@
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);
Modified: trunk/sources/qetgraphicsitem/slaveelement.h
===================================================================
--- trunk/sources/qetgraphicsitem/slaveelement.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/qetgraphicsitem/slaveelement.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -26,10 +26,10 @@
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:
Modified: trunk/sources/qetgraphicsitem/terminal.h
===================================================================
--- trunk/sources/qetgraphicsitem/terminal.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/qetgraphicsitem/terminal.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -40,7 +40,7 @@
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 @@
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 @@
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:
Modified: trunk/sources/qetgraphicsitem/terminalelement.h
===================================================================
--- trunk/sources/qetgraphicsitem/terminalelement.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/qetgraphicsitem/terminalelement.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -28,8 +28,8 @@
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);
Modified: trunk/sources/qetmainwindow.h
===================================================================
--- trunk/sources/qetmainwindow.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/qetmainwindow.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -29,7 +29,7 @@
// constructor, destructor
public:
QETMainWindow(QWidget * = nullptr, Qt::WindowFlags = nullptr);
- virtual ~QETMainWindow();
+ ~QETMainWindow() override;
// methods
protected:
@@ -39,9 +39,9 @@
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
Modified: trunk/sources/qetprintpreviewdialog.h
===================================================================
--- trunk/sources/qetprintpreviewdialog.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/qetprintpreviewdialog.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -37,7 +37,7 @@
// constructors, destructor
public:
QETPrintPreviewDialog(QETProject *, QPrinter *, QWidget * = nullptr, Qt::WindowFlags = nullptr);
- virtual ~QETPrintPreviewDialog();
+ ~QETPrintPreviewDialog() override;
private:
QETPrintPreviewDialog(const QETPrintPreviewDialog &);
Modified: trunk/sources/qetproject.h
===================================================================
--- trunk/sources/qetproject.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/qetproject.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -51,7 +51,7 @@
public:
QETProject (int = 1, QObject * = nullptr);
QETProject (const QString &, QObject * = nullptr);
- virtual ~QETProject();
+ ~QETProject() override;
private:
QETProject(const QETProject &);
Modified: trunk/sources/qetregexpvalidator.h
===================================================================
--- trunk/sources/qetregexpvalidator.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/qetregexpvalidator.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -29,13 +29,13 @@
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;
Modified: trunk/sources/qetsingleapplication.h
===================================================================
--- trunk/sources/qetsingleapplication.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/qetsingleapplication.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -29,7 +29,7 @@
// constructors, destructor
public:
QETSingleApplication(int &, char **, const QString);
- virtual ~QETSingleApplication();
+ ~QETSingleApplication() override;
private:
QETSingleApplication(const QETSingleApplication &);
Modified: trunk/sources/qfilenameedit.h
===================================================================
--- trunk/sources/qfilenameedit.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/qfilenameedit.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -36,7 +36,7 @@
public:
QFileNameEdit(QWidget * = nullptr);
QFileNameEdit(const QString &, QWidget * = nullptr);
- virtual ~QFileNameEdit();
+ ~QFileNameEdit() override;
private:
QFileNameEdit(const QFileNameEdit &);
Modified: trunk/sources/qtextorientationspinboxwidget.h
===================================================================
--- trunk/sources/qtextorientationspinboxwidget.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/qtextorientationspinboxwidget.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -30,7 +30,7 @@
// constructors, destructor
public:
QTextOrientationSpinBoxWidget(QWidget * = nullptr);
- virtual ~QTextOrientationSpinBoxWidget();
+ ~QTextOrientationSpinBoxWidget() override;
private:
QTextOrientationSpinBoxWidget(const QTextOrientationSpinBoxWidget &);
Modified: trunk/sources/qtextorientationwidget.h
===================================================================
--- trunk/sources/qtextorientationwidget.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/qtextorientationwidget.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -27,7 +27,7 @@
// constructors, destructor
public:
QTextOrientationWidget(QWidget * = nullptr);
- virtual ~QTextOrientationWidget();
+ ~QTextOrientationWidget() override;
private:
QTextOrientationWidget(const QTextOrientationWidget &);
QTextOrientationWidget &operator=(const QTextOrientationWidget &);
@@ -48,11 +48,11 @@
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:
/**
Modified: trunk/sources/recentfiles.h
===================================================================
--- trunk/sources/recentfiles.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/recentfiles.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -29,7 +29,7 @@
// constructors, destructor
public:
RecentFiles(const QString &, int = 10, QObject * = nullptr);
- virtual ~RecentFiles();
+ ~RecentFiles() override;
private:
RecentFiles(const RecentFiles &);
Modified: trunk/sources/richtext/richtexteditor.cpp
===================================================================
--- trunk/sources/richtext/richtexteditor.cpp 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/richtext/richtexteditor.cpp 2017-08-05 02:10:01 UTC (rev 5009)
@@ -207,12 +207,12 @@
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 @@
: QTextEdit(parent)
{}
- void contextMenuEvent(QContextMenuEvent *event);
+ void contextMenuEvent(QContextMenuEvent *event) override;
private slots:
void actionTriggered(QAction *action);
Modified: trunk/sources/richtext/richtexteditor_p.h
===================================================================
--- trunk/sources/richtext/richtexteditor_p.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/richtext/richtexteditor_p.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -72,7 +72,7 @@
Q_OBJECT
public:
explicit RichTextEditorDialog(QWidget *parent = nullptr);
- ~RichTextEditorDialog();
+ ~RichTextEditorDialog() override;
int showDialog();
void setDefaultFont(const QFont &font);
Modified: trunk/sources/titleblock/dimensionwidget.h
===================================================================
--- trunk/sources/titleblock/dimensionwidget.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/titleblock/dimensionwidget.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -30,7 +30,7 @@
// constructors, destructor
public:
TitleBlockDimensionWidget(bool, QWidget * parent = nullptr);
- virtual ~TitleBlockDimensionWidget();
+ ~TitleBlockDimensionWidget() override;
private:
TitleBlockDimensionWidget(const TitleBlockDimensionWidget &);
Modified: trunk/sources/titleblock/gridlayoutanimation.h
===================================================================
--- trunk/sources/titleblock/gridlayoutanimation.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/titleblock/gridlayoutanimation.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -27,7 +27,7 @@
// Constructors, destructor
public:
GridLayoutAnimation(QGraphicsGridLayout * = nullptr, QObject * = nullptr);
- virtual ~GridLayoutAnimation();
+ ~GridLayoutAnimation() override;
// methods
public:
@@ -39,7 +39,7 @@
void setActsOnRows(bool);
protected:
- void updateCurrentValue(const QVariant &);
+ void updateCurrentValue(const QVariant &) override;
// attributes
private:
Modified: trunk/sources/titleblock/helpercell.h
===================================================================
--- trunk/sources/titleblock/helpercell.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/titleblock/helpercell.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -31,7 +31,7 @@
// constructor, destructor
public:
HelperCell(QGraphicsItem * = nullptr);
- virtual ~HelperCell();
+ ~HelperCell() override;
private:
HelperCell(const HelperCell &);
@@ -45,10 +45,10 @@
// 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<QAction *> &);
virtual QList<QAction *> actions() const;
@@ -55,8 +55,8 @@
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 *);
Modified: trunk/sources/titleblock/integrationmovetemplateshandler.h
===================================================================
--- trunk/sources/titleblock/integrationmovetemplateshandler.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/titleblock/integrationmovetemplateshandler.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -30,15 +30,15 @@
// 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;
Modified: trunk/sources/titleblock/movetemplateshandler.h
===================================================================
--- trunk/sources/titleblock/movetemplateshandler.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/titleblock/movetemplateshandler.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -33,7 +33,7 @@
// Constructors, destructor
public:
MoveTitleBlockTemplatesHandler(QObject * = nullptr) {}
- virtual ~MoveTitleBlockTemplatesHandler() {}
+ ~MoveTitleBlockTemplatesHandler() override {}
private:
MoveTitleBlockTemplatesHandler(const MoveTitleBlockTemplatesHandler &);
Modified: trunk/sources/titleblock/qettemplateeditor.h
===================================================================
--- trunk/sources/titleblock/qettemplateeditor.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/titleblock/qettemplateeditor.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -39,7 +39,7 @@
// constructor, destructor
public:
QETTitleBlockTemplateEditor(QWidget * = nullptr);
- virtual ~QETTitleBlockTemplateEditor();
+ ~QETTitleBlockTemplateEditor() override;
private:
QETTitleBlockTemplateEditor(const QETTitleBlockTemplateEditor &);
@@ -90,8 +90,8 @@
protected:
bool canClose();
- virtual void firstActivation(QEvent *);
- void closeEvent(QCloseEvent *);
+ void firstActivation(QEvent *) override;
+ void closeEvent(QCloseEvent *) override;
private:
void initActions();
Modified: trunk/sources/titleblock/splittedhelpercell.h
===================================================================
--- trunk/sources/titleblock/splittedhelpercell.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/titleblock/splittedhelpercell.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -27,13 +27,13 @@
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
Modified: trunk/sources/titleblock/templatecellwidget.h
===================================================================
--- trunk/sources/titleblock/templatecellwidget.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/titleblock/templatecellwidget.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -34,7 +34,7 @@
// constructor, destructor
public:
TitleBlockTemplateCellWidget(TitleBlockTemplate * = nullptr, QWidget * = nullptr);
- virtual ~TitleBlockTemplateCellWidget();
+ ~TitleBlockTemplateCellWidget() override;
private:
TitleBlockTemplateCellWidget(const TitleBlockTemplateCellWidget &);
Modified: trunk/sources/titleblock/templatecommands.h
===================================================================
--- trunk/sources/titleblock/templatecommands.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/titleblock/templatecommands.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -34,16 +34,16 @@
// 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 @@
// Constructors, destructor
public:
TitleBlockTemplateCommand(TitleBlockTemplate * = nullptr, QUndoCommand * = nullptr);
- virtual ~TitleBlockTemplateCommand();
+ ~TitleBlockTemplateCommand() override;
private:
TitleBlockTemplateCommand(const TitleBlockTemplateCommand &);
@@ -101,7 +101,7 @@
// Constructors, destructor
public:
ModifyTemplateGridCommand(TitleBlockTemplate * = nullptr, QUndoCommand * = nullptr);
- virtual ~ModifyTemplateGridCommand();
+ ~ModifyTemplateGridCommand() override;
private:
ModifyTemplateGridCommand(const ModifyTemplateGridCommand &);
@@ -117,8 +117,8 @@
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 @@
// Constructor, destructor
public:
ModifyTemplateDimension(TitleBlockTemplate * = nullptr, QUndoCommand * = nullptr);
- virtual ~ModifyTemplateDimension();
+ ~ModifyTemplateDimension() override;
private:
ModifyTemplateDimension(const ModifyTemplateDimension &);
@@ -155,8 +155,8 @@
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 @@
// 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 @@
// 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 @@
// 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 @@
// 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<TitleBlockCell *> &);
protected:
virtual void updateText();
@@ -291,14 +291,14 @@
// 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 &);
Modified: trunk/sources/titleblock/templatedeleter.h
===================================================================
--- trunk/sources/titleblock/templatedeleter.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/titleblock/templatedeleter.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -28,7 +28,7 @@
// Constructors, destructor
public:
TitleBlockTemplateDeleter(const TitleBlockTemplateLocation &, QWidget * = nullptr);
- virtual ~TitleBlockTemplateDeleter();
+ ~TitleBlockTemplateDeleter() override;
private:
TitleBlockTemplateDeleter(const TitleBlockTemplateDeleter &);
Modified: trunk/sources/titleblock/templatelocationchooser.h
===================================================================
--- trunk/sources/titleblock/templatelocationchooser.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/titleblock/templatelocationchooser.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -30,7 +30,7 @@
// Constructor, destructor
public:
TitleBlockTemplateLocationChooser(const TitleBlockTemplateLocation &, QWidget * = nullptr);
- ~TitleBlockTemplateLocationChooser();
+ ~TitleBlockTemplateLocationChooser() override;
private:
TitleBlockTemplateLocationChooser(const TitleBlockTemplateLocationChooser &);
Modified: trunk/sources/titleblock/templatelocationsaver.h
===================================================================
--- trunk/sources/titleblock/templatelocationsaver.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/titleblock/templatelocationsaver.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -32,13 +32,13 @@
// 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();
@@ -45,7 +45,7 @@
// slots
protected slots:
- virtual void updateTemplates();
+ void updateTemplates() override;
virtual void updateNewName();
// attributes
Modified: trunk/sources/titleblock/templatelogomanager.h
===================================================================
--- trunk/sources/titleblock/templatelogomanager.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/titleblock/templatelogomanager.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -29,7 +29,7 @@
// Constructor, destructor
public:
TitleBlockTemplateLogoManager(TitleBlockTemplate *, QWidget * = nullptr);
- virtual ~TitleBlockTemplateLogoManager();
+ ~TitleBlockTemplateLogoManager() override;
// methods
public:
Modified: trunk/sources/titleblock/templatescollection.h
===================================================================
--- trunk/sources/titleblock/templatescollection.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/titleblock/templatescollection.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -37,7 +37,7 @@
// Constructors, destructor
public:
TitleBlockTemplatesCollection(QObject *parent);
- virtual ~TitleBlockTemplatesCollection();
+ ~TitleBlockTemplatesCollection() override;
private:
TitleBlockTemplatesCollection(const TitleBlockTemplatesCollection &);
@@ -86,24 +86,24 @@
// 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,7 +127,7 @@
// Constructors, destructor
public:
TitleBlockTemplatesFilesCollection(const QString &, QObject * = nullptr);
- virtual ~TitleBlockTemplatesFilesCollection();
+ ~TitleBlockTemplatesFilesCollection() override;
private:
TitleBlockTemplatesFilesCollection(const TitleBlockTemplatesFilesCollection &);
@@ -134,15 +134,15 @@
// 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 &);
Modified: trunk/sources/titleblock/templateview.h
===================================================================
--- trunk/sources/titleblock/templateview.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/titleblock/templateview.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -36,7 +36,7 @@
public:
TitleBlockTemplateView(QWidget * = nullptr);
TitleBlockTemplateView(QGraphicsScene *, QWidget * = nullptr);
- virtual ~TitleBlockTemplateView();
+ ~TitleBlockTemplateView() override;
private:
TitleBlockTemplateView(const TitleBlockTemplateView &);
@@ -91,14 +91,14 @@
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<TitleBlockCell> &, int x = 0, int y = 0) const;
signals:
Modified: trunk/sources/titleblock/templatevisualcell.h
===================================================================
--- trunk/sources/titleblock/templatevisualcell.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/titleblock/templatevisualcell.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -30,16 +30,16 @@
// 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 *);
Modified: trunk/sources/titleblocktemplate.h
===================================================================
--- trunk/sources/titleblocktemplate.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/titleblocktemplate.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -37,7 +37,7 @@
// constructors, destructor
public:
TitleBlockTemplate(QObject * = nullptr);
- virtual ~TitleBlockTemplate();
+ ~TitleBlockTemplate() override;
private:
TitleBlockTemplate(const TitleBlockTemplate &);
Modified: trunk/sources/titleblocktemplaterenderer.h
===================================================================
--- trunk/sources/titleblocktemplaterenderer.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/titleblocktemplaterenderer.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -25,7 +25,7 @@
public:
TitleBlockTemplateRenderer(QObject * = nullptr);
- virtual ~TitleBlockTemplateRenderer();
+ ~TitleBlockTemplateRenderer() override;
const TitleBlockTemplate *titleBlockTemplate() const;
void setTitleBlockTemplate(const TitleBlockTemplate *);
void setContext(const DiagramContext &context);
Modified: trunk/sources/ui/borderpropertieswidget.h
===================================================================
--- trunk/sources/ui/borderpropertieswidget.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/ui/borderpropertieswidget.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -35,7 +35,7 @@
public:
explicit BorderPropertiesWidget(const BorderProperties &bp, QWidget *parent = nullptr);
- ~BorderPropertiesWidget();
+ ~BorderPropertiesWidget() override;
void setProperties(const BorderProperties &bp);
const BorderProperties &properties();
Modified: trunk/sources/ui/conductorpropertiesdialog.h
===================================================================
--- trunk/sources/ui/conductorpropertiesdialog.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/ui/conductorpropertiesdialog.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -36,7 +36,7 @@
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;
Modified: trunk/sources/ui/conductorpropertieswidget.h
===================================================================
--- trunk/sources/ui/conductorpropertieswidget.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/ui/conductorpropertieswidget.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -35,7 +35,7 @@
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 @@
void setConductorType(ConductorProperties::ConductorType type);
protected:
- virtual bool event(QEvent *event);
+ bool event(QEvent *event) override;
//SLOTS
public slots:
Modified: trunk/sources/ui/diagramselection.h
===================================================================
--- trunk/sources/ui/diagramselection.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/ui/diagramselection.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -33,7 +33,7 @@
public:
explicit diagramselection(QETProject *prj, QWidget *parent = nullptr);
- ~diagramselection();
+ ~diagramselection() override;
QList<Diagram *> list_of_DiagramSelected();
Modified: trunk/sources/ui/dialogwaiting.h
===================================================================
--- trunk/sources/ui/dialogwaiting.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/ui/dialogwaiting.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -31,7 +31,7 @@
public:
explicit DialogWaiting(QWidget *parent = nullptr);
- ~DialogWaiting();
+ ~DialogWaiting() override;
void setProgressBar(int val);
void setProgressBarRange(int min, int max);
Modified: trunk/sources/ui/dynamicelementtextitemeditor.h
===================================================================
--- trunk/sources/ui/dynamicelementtextitemeditor.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/ui/dynamicelementtextitemeditor.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -35,12 +35,12 @@
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);
Modified: trunk/sources/ui/dynamicelementtextmodel.h
===================================================================
--- trunk/sources/ui/dynamicelementtextmodel.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/ui/dynamicelementtextmodel.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -45,7 +45,7 @@
};
DynamicElementTextModel(QObject *parent = nullptr);
- ~DynamicElementTextModel();
+ ~DynamicElementTextModel() override;
void addText(DynamicElementTextItem *deti);
void removeText(DynamicElementTextItem *deti);
@@ -69,8 +69,8 @@
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
Modified: trunk/sources/ui/elementinfopartwidget.h
===================================================================
--- trunk/sources/ui/elementinfopartwidget.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/ui/elementinfopartwidget.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -31,7 +31,7 @@
//METHODS
public:
explicit ElementInfoPartWidget(QString key, QString translated_key, QWidget *parent = nullptr);
- ~ElementInfoPartWidget();
+ ~ElementInfoPartWidget() override;
QString key () const {return key_;}
void setText (const QString &);
Modified: trunk/sources/ui/elementinfowidget.h
===================================================================
--- trunk/sources/ui/elementinfowidget.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/ui/elementinfowidget.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -42,21 +42,21 @@
//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();
Modified: trunk/sources/ui/elementpropertieswidget.h
===================================================================
--- trunk/sources/ui/elementpropertieswidget.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/ui/elementpropertieswidget.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -32,10 +32,10 @@
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 @@
private:
void buildGui();
- void updateUi();
+ void updateUi() override;
void addGeneralWidget();
QWidget *generalWidget();
Modified: trunk/sources/ui/formulaassistantdialog.h
===================================================================
--- trunk/sources/ui/formulaassistantdialog.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/ui/formulaassistantdialog.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -31,7 +31,7 @@
public:
FormulaAssistantDialog(QWidget *parent = nullptr);
- ~FormulaAssistantDialog();
+ ~FormulaAssistantDialog() override;
void setForbiddenVariables(QStringList list);
void setText(QString text);
Modified: trunk/sources/ui/imagepropertieswidget.h
===================================================================
--- trunk/sources/ui/imagepropertieswidget.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/ui/imagepropertieswidget.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -36,16 +36,16 @@
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);
Modified: trunk/sources/ui/importelementdialog.h
===================================================================
--- trunk/sources/ui/importelementdialog.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/ui/importelementdialog.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -31,7 +31,7 @@
public:
explicit ImportElementDialog(QWidget *parent = nullptr);
- ~ImportElementDialog();
+ ~ImportElementDialog() override;
QET::Action action() const;
Modified: trunk/sources/ui/linksingleelementwidget.h
===================================================================
--- trunk/sources/ui/linksingleelementwidget.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/ui/linksingleelementwidget.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -44,19 +44,19 @@
///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 <Element *> availableElements();
Modified: trunk/sources/ui/masterpropertieswidget.h
===================================================================
--- trunk/sources/ui/masterpropertieswidget.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/ui/masterpropertieswidget.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -46,17 +46,17 @@
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);
Modified: trunk/sources/ui/potentialselectordialog.cpp
===================================================================
--- trunk/sources/ui/potentialselectordialog.cpp 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/ui/potentialselectordialog.cpp 2017-08-05 02:10:01 UTC (rev 5009)
@@ -57,7 +57,7 @@
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 @@
properties_list.append(c->properties());
}
- ~NewConductorPotentialSelector() {}
+ ~NewConductorPotentialSelector() override {}
private :
bool m_is_valid;
@@ -155,9 +155,9 @@
}
}
- ~LinkReportPotentialSelector() {}
+ ~LinkReportPotentialSelector() override {}
- bool isValid() const {return m_is_valid;}
+ bool isValid() const override {return m_is_valid;}
private:
bool m_is_valid;
Modified: trunk/sources/ui/potentialselectordialog.h
===================================================================
--- trunk/sources/ui/potentialselectordialog.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/ui/potentialselectordialog.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -61,7 +61,7 @@
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();
Modified: trunk/sources/ui/projectpropertiesdialog.h
===================================================================
--- trunk/sources/ui/projectpropertiesdialog.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/ui/projectpropertiesdialog.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -36,7 +36,7 @@
};
ProjectPropertiesDialog(QETProject *project, QWidget *parent = nullptr);
- ~ProjectPropertiesDialog();
+ ~ProjectPropertiesDialog() override;
void exec();
void setCurrentPage(ProjectPropertiesDialog::Page);
void changeToFolio();
Modified: trunk/sources/ui/reportpropertiewidget.h
===================================================================
--- trunk/sources/ui/reportpropertiewidget.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/ui/reportpropertiewidget.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -32,7 +32,7 @@
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;
Modified: trunk/sources/ui/shapegraphicsitempropertieswidget.h
===================================================================
--- trunk/sources/ui/shapegraphicsitempropertieswidget.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/ui/shapegraphicsitempropertieswidget.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -36,18 +36,18 @@
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);
Modified: trunk/sources/ui/titleblockpropertieswidget.h
===================================================================
--- trunk/sources/ui/titleblockpropertieswidget.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/ui/titleblockpropertieswidget.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -42,7 +42,7 @@
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 <TitleBlockTemplatesCollection *> 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;
Modified: trunk/sources/ui/xrefpropertieswidget.h
===================================================================
--- trunk/sources/ui/xrefpropertieswidget.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/ui/xrefpropertieswidget.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -35,7 +35,7 @@
public:
XRefPropertiesWidget(QHash <QString, XRefProperties> properties = QHash <QString, XRefProperties>(), QWidget *parent = nullptr);
- ~XRefPropertiesWidget();
+ ~XRefPropertiesWidget() override;
void setProperties (const QHash <QString, XRefProperties> &properties);
QHash <QString, XRefProperties> properties();
Modified: trunk/sources/undocommand/addelementtextcommand.h
===================================================================
--- trunk/sources/undocommand/addelementtextcommand.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/undocommand/addelementtextcommand.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -27,10 +27,10 @@
{
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;
Modified: trunk/sources/undocommand/changeelementinformationcommand.h
===================================================================
--- trunk/sources/undocommand/changeelementinformationcommand.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/undocommand/changeelementinformationcommand.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -32,10 +32,10 @@
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;
Modified: trunk/sources/undocommand/deleteqgraphicsitemcommand.h
===================================================================
--- trunk/sources/undocommand/deleteqgraphicsitemcommand.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/undocommand/deleteqgraphicsitemcommand.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -27,13 +27,13 @@
{
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:
Modified: trunk/sources/undocommand/linkelementcommand.h
===================================================================
--- trunk/sources/undocommand/linkelementcommand.h 2017-08-05 02:06:59 UTC (rev 5008)
+++ trunk/sources/undocommand/linkelementcommand.h 2017-08-05 02:10:01 UTC (rev 5009)
@@ -33,8 +33,8 @@
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 @@
void unlink (QList<Element *> element_list);
void unlinkAll ();
- void undo();
- void redo();
+ void undo() override;
+ void redo() override;
private:
void setUpNewLink (const QList<Element *> &element_list, bool already_link);