Index: sources/ElementsCollection/elementcollectionhandler.h =================================================================== --- sources/ElementsCollection/elementcollectionhandler.h (révision 4993) +++ sources/ElementsCollection/elementcollectionhandler.h (copie de travail) @@ -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; }; /** Index: sources/ElementsCollection/elementcollectionitem.h =================================================================== --- sources/ElementsCollection/elementcollectionitem.h (révision 4993) +++ sources/ElementsCollection/elementcollectionitem.h (copie de travail) @@ -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; Index: sources/ElementsCollection/elementscollectionmodel.h =================================================================== --- sources/ElementsCollection/elementscollectionmodel.h (révision 4993) +++ sources/ElementsCollection/elementscollectionmodel.h (copie de travail) @@ -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 projects); Index: sources/ElementsCollection/elementscollectionwidget.h =================================================================== --- sources/ElementsCollection/elementscollectionwidget.h (révision 4993) +++ sources/ElementsCollection/elementscollectionwidget.h (copie de travail) @@ -54,7 +54,7 @@ void setCurrentLocation(const ElementsLocation &location); protected: - virtual void leaveEvent(QEvent *event); + void leaveEvent(QEvent *event) override; private: void setUpAction(); Index: sources/ElementsCollection/elementslocation.cpp =================================================================== --- sources/ElementsCollection/elementslocation.cpp (révision 4993) +++ sources/ElementsCollection/elementslocation.cpp (copie de travail) @@ -649,7 +649,7 @@ { ElementFactory *factory = ElementFactory::Instance(); int state; - Element *elmt = factory->createElement(*this, 0, &state); + Element *elmt = factory->createElement(*this, nullptr, &state); if (state == 0) return QIcon(elmt->pixmap()); Index: sources/ElementsCollection/elementstreeview.cpp =================================================================== --- sources/ElementsCollection/elementstreeview.cpp (révision 4993) +++ sources/ElementsCollection/elementstreeview.cpp (copie de travail) @@ -89,7 +89,7 @@ //Build the element for set the pixmap of the QDrag int elmt_creation_state; - Element *temp_elmt = ElementFactory::Instance()->createElement(location, 0, &elmt_creation_state); + Element *temp_elmt = ElementFactory::Instance()->createElement(location, nullptr, &elmt_creation_state); if (elmt_creation_state) { delete temp_elmt; Index: sources/ElementsCollection/elementstreeview.h =================================================================== --- sources/ElementsCollection/elementstreeview.h (révision 4993) +++ sources/ElementsCollection/elementstreeview.h (copie de travail) @@ -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); }; Index: sources/ElementsCollection/fileelementcollectionitem.h =================================================================== --- sources/ElementsCollection/fileelementcollectionitem.h (révision 4993) +++ sources/ElementsCollection/fileelementcollectionitem.h (copie de travail) @@ -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(); Index: sources/ElementsCollection/ui/renamedialog.h =================================================================== --- sources/ElementsCollection/ui/renamedialog.h (révision 4993) +++ sources/ElementsCollection/ui/renamedialog.h (copie de travail) @@ -30,8 +30,8 @@ Q_OBJECT public: - explicit RenameDialog(QString path, QWidget *parent = 0); - ~RenameDialog(); + explicit RenameDialog(QString path, QWidget *parent = nullptr); + ~RenameDialog() override; QString newName() const {return m_new_name;} QET::Action selectedAction() const {return m_action;} Index: sources/ElementsCollection/xmlprojectelementcollectionitem.h =================================================================== --- sources/ElementsCollection/xmlprojectelementcollectionitem.h (révision 4993) +++ sources/ElementsCollection/xmlprojectelementcollectionitem.h (copie de travail) @@ -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); Index: sources/PropertiesEditor/propertieseditordialog.h =================================================================== --- sources/PropertiesEditor/propertieseditordialog.h (révision 4993) +++ sources/PropertiesEditor/propertieseditordialog.h (copie de travail) @@ -39,7 +39,7 @@ Q_OBJECT public: template - PropertiesEditorDialog(T editor, QWidget *parent = 0) : + PropertiesEditorDialog(T editor, QWidget *parent = nullptr) : QDialog (parent) { //Set dialog title Index: sources/PropertiesEditor/propertieseditordockwidget.h =================================================================== --- sources/PropertiesEditor/propertieseditordockwidget.h (révision 4993) +++ sources/PropertiesEditor/propertieseditordockwidget.h (copie de travail) @@ -31,8 +31,8 @@ Q_OBJECT public: - explicit PropertiesEditorDockWidget(QWidget *parent = 0); - ~PropertiesEditorDockWidget(); + explicit PropertiesEditorDockWidget(QWidget *parent = nullptr); + ~PropertiesEditorDockWidget() override; virtual void clear(); virtual void apply(); Index: sources/PropertiesEditor/propertieseditorwidget.h =================================================================== --- sources/PropertiesEditor/propertieseditorwidget.h (révision 4993) +++ sources/PropertiesEditor/propertieseditorwidget.h (copie de travail) @@ -31,7 +31,7 @@ { Q_OBJECT public: - explicit PropertiesEditorWidget(QWidget *parent = 0); + explicit PropertiesEditorWidget(QWidget *parent = nullptr); virtual void apply() {} virtual void reset() {} Index: sources/QPropertyUndoCommand/qpropertyundocommand.h =================================================================== --- sources/QPropertyUndoCommand/qpropertyundocommand.h (révision 4993) +++ sources/QPropertyUndoCommand/qpropertyundocommand.h (copie de travail) @@ -33,16 +33,16 @@ class QPropertyUndoCommand : public QUndoCommand { public: - QPropertyUndoCommand(QObject *object, const char *property_name, const QVariant &old_value, const QVariant &new_value, QUndoCommand *parent = 0); - QPropertyUndoCommand(QObject *object, const char *property_name, const QVariant &old_value, QUndoCommand *parent = 0); + QPropertyUndoCommand(QObject *object, const char *property_name, const QVariant &old_value, const QVariant &new_value, QUndoCommand *parent = nullptr); + QPropertyUndoCommand(QObject *object, const char *property_name, const QVariant &old_value, QUndoCommand *parent = nullptr); 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; Index: sources/aboutqet.h =================================================================== --- sources/aboutqet.h (révision 4993) +++ sources/aboutqet.h (copie de travail) @@ -27,8 +27,8 @@ // constructors, destructor public: - AboutQET(QWidget * = 0); - virtual ~AboutQET(); + AboutQET(QWidget * = nullptr); + ~AboutQET() override; private: AboutQET(AboutQET &); Index: sources/autoNum/numerotationcontextcommands.cpp =================================================================== --- sources/autoNum/numerotationcontextcommands.cpp (révision 4993) +++ sources/autoNum/numerotationcontextcommands.cpp (copie de travail) @@ -24,7 +24,7 @@ NumerotationContextCommands::NumerotationContextCommands(const NumerotationContext &nc, Diagram *d): diagram_ (d), context_ (nc), - strategy_ (NULL) + strategy_ (nullptr) {} /** Index: sources/autoNum/numerotationcontextcommands.h =================================================================== --- sources/autoNum/numerotationcontextcommands.h (révision 4993) +++ sources/autoNum/numerotationcontextcommands.h (copie de travail) @@ -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; }; Index: sources/autoNum/ui/autonumberingdockwidget.cpp =================================================================== --- sources/autoNum/ui/autonumberingdockwidget.cpp (révision 4993) +++ sources/autoNum/ui/autonumberingdockwidget.cpp (copie de travail) @@ -167,7 +167,7 @@ * @param dv: activated diagramview */ void AutoNumberingDockWidget::setConductorActive(DiagramView* dv) { - if (dv!=NULL) { + if (dv!=nullptr) { QString conductor_autonum = dv->diagram()->conductorsAutonumName(); int conductor_index = ui->m_conductor_cb->findText(conductor_autonum); ui->m_conductor_cb->setCurrentIndex(conductor_index); @@ -180,7 +180,7 @@ */ void AutoNumberingDockWidget::setActive() { - if (m_project_view!=NULL) { + if (m_project_view!=nullptr) { //Conductor if (m_project_view->currentDiagram()) { QString conductor_autonum = m_project_view->currentDiagram()->diagram()->conductorsAutonumName(); Index: sources/autoNum/ui/autonumberingdockwidget.h =================================================================== --- sources/autoNum/ui/autonumberingdockwidget.h (révision 4993) +++ sources/autoNum/ui/autonumberingdockwidget.h (copie de travail) @@ -31,8 +31,8 @@ Q_OBJECT public: - explicit AutoNumberingDockWidget(QWidget *parent = 0); - ~AutoNumberingDockWidget(); + explicit AutoNumberingDockWidget(QWidget *parent = nullptr); + ~AutoNumberingDockWidget() override; void setContext(); void setProject(QETProject*, ProjectView*); Index: sources/autoNum/ui/autonumberingmanagementw.h =================================================================== --- sources/autoNum/ui/autonumberingmanagementw.h (révision 4993) +++ sources/autoNum/ui/autonumberingmanagementw.h (copie de travail) @@ -34,8 +34,8 @@ //METHODS public: - explicit AutoNumberingManagementW(QETProject *project, QWidget *parent = 0); - ~AutoNumberingManagementW(); + explicit AutoNumberingManagementW(QETProject *project, QWidget *parent = nullptr); + ~AutoNumberingManagementW() override; Ui::AutoNumberingManagementW *ui; void setProjectContext (); void contextToFormula (); Index: sources/autoNum/ui/folioautonumbering.h =================================================================== --- sources/autoNum/ui/folioautonumbering.h (révision 4993) +++ sources/autoNum/ui/folioautonumbering.h (copie de travail) @@ -35,8 +35,8 @@ //METHODS public: - explicit FolioAutonumberingW(QETProject *project, QWidget *parent = 0); - ~FolioAutonumberingW(); + explicit FolioAutonumberingW(QETProject *project, QWidget *parent = nullptr); + ~FolioAutonumberingW() override; void setContext (QList autonums); NumerotationContext toNumContext() const; Index: sources/autoNum/ui/formulaautonumberingw.h =================================================================== --- sources/autoNum/ui/formulaautonumberingw.h (révision 4993) +++ sources/autoNum/ui/formulaautonumberingw.h (copie de travail) @@ -38,8 +38,8 @@ //METHODS public: - explicit FormulaAutonumberingW(QWidget *parent = 0); - ~FormulaAutonumberingW(); + explicit FormulaAutonumberingW(QWidget *parent = nullptr); + ~FormulaAutonumberingW() override; QString formula(); void setContext(QString); void clearContext(); Index: sources/autoNum/ui/numparteditorw.cpp =================================================================== --- sources/autoNum/ui/numparteditorw.cpp (révision 4993) +++ sources/autoNum/ui/numparteditorw.cpp (copie de travail) @@ -249,7 +249,7 @@ ui -> value_field -> clear(); ui -> increase_spinBox -> setDisabled(true); if (t==string) { - ui -> value_field -> setValidator(0); + ui -> value_field -> setValidator(nullptr); ui -> value_field -> setEnabled(true); } else if (t==folio) { Index: sources/autoNum/ui/numparteditorw.h =================================================================== --- sources/autoNum/ui/numparteditorw.h (révision 4993) +++ sources/autoNum/ui/numparteditorw.h (copie de travail) @@ -37,9 +37,9 @@ //METHODS public: - explicit NumPartEditorW(int type, QWidget *parent = 0); - NumPartEditorW (NumerotationContext &, int, int type, QWidget *parent=0); - ~NumPartEditorW(); + explicit NumPartEditorW(int type, QWidget *parent = nullptr); + NumPartEditorW (NumerotationContext &, int, int type, QWidget *parent=nullptr); + ~NumPartEditorW() override; enum type {unit,unitfolio,ten,tenfolio, hundred, hundredfolio, string,idfolio,folio,machine,locmach, Index: sources/autoNum/ui/selectautonumw.h =================================================================== --- sources/autoNum/ui/selectautonumw.h (révision 4993) +++ sources/autoNum/ui/selectautonumw.h (copie de travail) @@ -37,9 +37,9 @@ //METHODS public: - explicit SelectAutonumW(int type, QWidget *parent = 0); - explicit SelectAutonumW(const NumerotationContext &context, int type, QWidget *parent = 0); - ~SelectAutonumW(); + explicit SelectAutonumW(int type, QWidget *parent = nullptr); + explicit SelectAutonumW(const NumerotationContext &context, int type, QWidget *parent = nullptr); + ~SelectAutonumW() override; void setContext (const NumerotationContext &context); NumerotationContext toNumContext() const; Index: sources/bordertitleblock.h =================================================================== --- sources/bordertitleblock.h (révision 4993) +++ sources/bordertitleblock.h (copie de travail) @@ -37,8 +37,8 @@ Q_OBJECT public: - BorderTitleBlock(QObject * = 0); - virtual ~BorderTitleBlock(); + BorderTitleBlock(QObject * = nullptr); + ~BorderTitleBlock() override; private: BorderTitleBlock(const BorderTitleBlock &); @@ -153,7 +153,7 @@ btb_folio_ = folio; emit (titleBlockFolioChanged(folio)); } - void setFolioData(int, int, QString = NULL, const DiagramContext & = DiagramContext()); + void setFolioData(int, int, QString = nullptr, const DiagramContext & = DiagramContext()); /// @param author the new value of the "File" field void setMachine(const QString &machine) { btb_machine_ = machine; } void setLocMach(const QString &locmach) { btb_locmach_ = locmach; } @@ -180,7 +180,7 @@ public slots: void titleBlockTemplateChanged(const QString &); - void titleBlockTemplateRemoved(const QString &, const TitleBlockTemplate * = 0); + void titleBlockTemplateRemoved(const QString &, const TitleBlockTemplate * = nullptr); // methods to set display options void displayTitleBlock(bool); Index: sources/conductorsegment.cpp =================================================================== --- sources/conductorsegment.cpp (révision 4993) +++ sources/conductorsegment.cpp (copie de travail) @@ -477,7 +477,7 @@ @return true si le segment a un segment precedent, false sinon */ bool ConductorSegment::hasPreviousSegment() const { - return(previous_segment != NULL); + return(previous_segment != nullptr); } /** @@ -484,7 +484,7 @@ @return true si le segment a un segment suivant, false sinon */ bool ConductorSegment::hasNextSegment() const { - return(next_segment != NULL); + return(next_segment != nullptr); } /** Index: sources/conductorsegment.h =================================================================== --- sources/conductorsegment.h (révision 4993) +++ sources/conductorsegment.h (copie de travail) @@ -26,7 +26,7 @@ // constructors, destructor public: - ConductorSegment(const QPointF &, const QPointF &, ConductorSegment * = NULL, ConductorSegment * = NULL); + ConductorSegment(const QPointF &, const QPointF &, ConductorSegment * = nullptr, ConductorSegment * = nullptr); virtual ~ConductorSegment(); private: Index: sources/configdialog.h =================================================================== --- sources/configdialog.h (révision 4993) +++ sources/configdialog.h (copie de travail) @@ -32,8 +32,8 @@ Q_OBJECT // constructors, destructor public: - ConfigDialog(QWidget * = 0); - virtual ~ConfigDialog(); + ConfigDialog(QWidget * = nullptr); + ~ConfigDialog() override; private: ConfigDialog(const ConfigDialog &); Index: sources/configpage.h =================================================================== --- sources/configpage.h (révision 4993) +++ sources/configpage.h (copie de travail) @@ -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 Index: sources/configpages.h =================================================================== --- sources/configpages.h (révision 4993) +++ sources/configpages.h (copie de travail) @@ -38,8 +38,8 @@ Q_OBJECT // constructors, destructor public: - NewDiagramPage(QETProject *project = 0, QWidget * = 0, ProjectPropertiesDialog *teste = NULL); - virtual ~NewDiagramPage(); + NewDiagramPage(QETProject *project = nullptr, QWidget * = nullptr, ProjectPropertiesDialog *teste = nullptr); + ~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: @@ -76,16 +76,16 @@ Q_OBJECT // constructors, destructor public: - GeneralConfigurationPage(QWidget * = 0); - virtual ~GeneralConfigurationPage(); + GeneralConfigurationPage(QWidget * = nullptr); + ~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 &); @@ -121,16 +121,16 @@ Q_OBJECT // constructors, destructor public: - ExportConfigPage(QWidget * = 0); - virtual ~ExportConfigPage(); + ExportConfigPage(QWidget * = nullptr); + ~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: @@ -144,16 +144,16 @@ Q_OBJECT // constructors, destructor public: - PrintConfigPage(QWidget * = 0); - virtual ~PrintConfigPage(); + PrintConfigPage(QWidget * = nullptr); + ~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: Index: sources/diagram.cpp =================================================================== --- sources/diagram.cpp (révision 4993) +++ sources/diagram.cpp (copie de travail) @@ -66,7 +66,7 @@ setProject(project); qgi_manager_ = new QGIManager(this); setBackgroundBrush(Qt::white); - conductor_setter_ = new QGraphicsLineItem(0); + conductor_setter_ = new QGraphicsLineItem(nullptr); conductor_setter_ -> setZValue(1000000); QPen pen(Qt::NoBrush, 1.5, Qt::DashLine); @@ -862,7 +862,7 @@ } int state = 0; - Element *nvel_elmt = ElementFactory::Instance() -> createElement(element_location, 0, &state); + Element *nvel_elmt = ElementFactory::Instance() -> createElement(element_location, nullptr, &state); if (state) { QString debug_message = QString("Diagram::fromXml() : Le chargement de la description de l'element %1 a echoue avec le code d'erreur %2").arg(element_location.path()).arg(state); Index: sources/diagram.h =================================================================== --- sources/diagram.h (révision 4993) +++ sources/diagram.h (copie de travail) @@ -56,7 +56,7 @@ // constructors, destructor public: Diagram(QETProject *project); - virtual ~Diagram(); + ~Diagram() override; private: Diagram(const Diagram &diagram); @@ -117,15 +117,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); @@ -153,9 +153,9 @@ // methods related to XML import/export QDomDocument toXml(bool = true); - bool initFromXml(QDomElement &, QPointF = QPointF(), bool = true, DiagramContent * = 0); - bool fromXml(QDomDocument &, QPointF = QPointF(), bool = true, DiagramContent * = 0); - bool fromXml(QDomElement &, QPointF = QPointF(), bool = true, DiagramContent * = 0); + bool initFromXml(QDomElement &, QPointF = QPointF(), bool = true, DiagramContent * = nullptr); + bool fromXml(QDomDocument &, QPointF = QPointF(), bool = true, DiagramContent * = nullptr); + bool fromXml(QDomElement &, QPointF = QPointF(), bool = true, DiagramContent * = nullptr); void folioSequentialsToXml(QHash*, QDomElement *, QString, QString, QDomDocument *); void folioSequentialsFromXml(const QDomElement&, QHash*, QString, QString, QString, QString); @@ -197,10 +197,10 @@ DiagramContent content() const; DiagramContent selectedContent(); bool canRotateSelection() const; - int beginMoveElements(QGraphicsItem * = 0); + int beginMoveElements(QGraphicsItem * = nullptr); void continueMoveElements(const QPointF &); void endMoveElements(); - int beginMoveElementTexts(QGraphicsItem * = 0); + int beginMoveElementTexts(QGraphicsItem * = nullptr); void continueMoveElementTexts(const QPointF &); void endMoveElementTexts(); bool usesElement(const ElementsLocation &); Index: sources/diagramcommands.h =================================================================== --- sources/diagramcommands.h (révision 4993) +++ sources/diagramcommands.h (copie de travail) @@ -52,17 +52,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); @@ -86,15 +86,15 @@ class DeleteElementsCommand : public QUndoCommand { // constructors, destructor public: - DeleteElementsCommand(Diagram *, const DiagramContent &, QUndoCommand * = 0); - virtual ~DeleteElementsCommand(); + DeleteElementsCommand(Diagram *, const DiagramContent &, QUndoCommand * = nullptr); + ~DeleteElementsCommand() override; private: DeleteElementsCommand(const DeleteElementsCommand &); // methods public: - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; // attributes private: @@ -112,15 +112,15 @@ class PasteDiagramCommand : public QUndoCommand { // constructors, destructor public: - PasteDiagramCommand(Diagram *, const DiagramContent &, QUndoCommand * = 0); - virtual ~PasteDiagramCommand(); + PasteDiagramCommand(Diagram *, const DiagramContent &, QUndoCommand * = nullptr); + ~PasteDiagramCommand() override; private: PasteDiagramCommand(const PasteDiagramCommand &); // methods public: - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; // attributes private: @@ -140,8 +140,8 @@ class CutDiagramCommand : public DeleteElementsCommand { // constructors, destructor public: - CutDiagramCommand(Diagram *, const DiagramContent &, QUndoCommand * = 0); - virtual ~CutDiagramCommand(); + CutDiagramCommand(Diagram *, const DiagramContent &, QUndoCommand * = nullptr); + ~CutDiagramCommand() override; private: CutDiagramCommand(const CutDiagramCommand &); }; @@ -152,15 +152,15 @@ class MoveElementsCommand : public QUndoCommand { // constructors, destructor public: - MoveElementsCommand(Diagram *, const DiagramContent &, const QPointF &m, QUndoCommand * = 0); - virtual ~MoveElementsCommand(); + MoveElementsCommand(Diagram *, const DiagramContent &, const QPointF &m, QUndoCommand * = nullptr); + ~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: @@ -187,15 +187,15 @@ class MoveConductorsTextsCommand : public QUndoCommand { // constructors, destructor public: - MoveConductorsTextsCommand(Diagram *, QUndoCommand * = 0); - virtual ~MoveConductorsTextsCommand(); + MoveConductorsTextsCommand(Diagram *, QUndoCommand * = nullptr); + ~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: @@ -217,15 +217,15 @@ class ChangeDiagramTextCommand : public QUndoCommand { // constructors, destructor public: - ChangeDiagramTextCommand(DiagramTextItem *, const QString &before, const QString &after, QUndoCommand * = 0); - virtual ~ChangeDiagramTextCommand(); + ChangeDiagramTextCommand(DiagramTextItem *, const QString &before, const QString &after, QUndoCommand * = nullptr); + ~ChangeDiagramTextCommand() override; private: ChangeDiagramTextCommand(const ChangeDiagramTextCommand &); // methods public: - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; // attributes private: @@ -246,15 +246,15 @@ class RotateElementsCommand : public QUndoCommand { // constructors, destructor public: - RotateElementsCommand(const QList &elements, const QList &, const QList &, QUndoCommand * = 0); - virtual ~RotateElementsCommand(); + RotateElementsCommand(const QList &elements, const QList &, const QList &, QUndoCommand * = nullptr); + ~RotateElementsCommand() override; private: RotateElementsCommand(const RotateElementsCommand &); // methods public: - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; // attributes private: @@ -278,16 +278,16 @@ class RotateTextsCommand : public QUndoCommand { // constructors, destructor public: - RotateTextsCommand(const QHash &, double, QUndoCommand * = 0); - RotateTextsCommand(const QList &, double, QUndoCommand * = 0); - virtual ~RotateTextsCommand(); + RotateTextsCommand(const QHash &, double, QUndoCommand * = nullptr); + RotateTextsCommand(const QList &, double, QUndoCommand * = nullptr); + ~RotateTextsCommand() override; private: RotateTextsCommand(const RotateTextsCommand &); // methods public: - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; private: void defineCommandName(); @@ -309,15 +309,15 @@ class ChangeConductorCommand : public QUndoCommand { // constructors, destructor public: - ChangeConductorCommand(Conductor *, const ConductorProfile &, const ConductorProfile &, Qt::Corner, QUndoCommand * = 0); - virtual ~ChangeConductorCommand(); + ChangeConductorCommand(Conductor *, const ConductorProfile &, const ConductorProfile &, Qt::Corner, QUndoCommand * = nullptr); + ~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 @@ -345,15 +345,15 @@ class ResetConductorCommand : public QUndoCommand { // constructors, destructor public: - ResetConductorCommand(const QHash &, QUndoCommand * = 0); - virtual ~ResetConductorCommand(); + ResetConductorCommand(const QHash &, QUndoCommand * = nullptr); + ~ResetConductorCommand() override; private: ResetConductorCommand(const ResetConductorCommand &); // methods public: - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; // attributes private: @@ -368,15 +368,15 @@ class ChangeTitleBlockCommand : public QUndoCommand { // constructors, destructor public: - ChangeTitleBlockCommand(Diagram *, const TitleBlockProperties &, const TitleBlockProperties &, QUndoCommand * = 0); - virtual ~ChangeTitleBlockCommand(); + ChangeTitleBlockCommand(Diagram *, const TitleBlockProperties &, const TitleBlockProperties &, QUndoCommand * = nullptr); + ~ChangeTitleBlockCommand() override; private: ChangeTitleBlockCommand(const ChangeTitleBlockCommand &); // methods public: - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; // attributes private: @@ -394,15 +394,15 @@ class ChangeBorderCommand : public QUndoCommand { // constructors, destructor public: - ChangeBorderCommand(Diagram *, const BorderProperties &, const BorderProperties &, QUndoCommand * = 0); - virtual ~ChangeBorderCommand(); + ChangeBorderCommand(Diagram *, const BorderProperties &, const BorderProperties &, QUndoCommand * = nullptr); + ~ChangeBorderCommand() override; private: ChangeBorderCommand(const ChangeBorderCommand &); // methods public: - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; // attributes private: Index: sources/diagramcontextwidget.h =================================================================== --- sources/diagramcontextwidget.h (révision 4993) +++ sources/diagramcontextwidget.h (copie de travail) @@ -29,8 +29,8 @@ Q_OBJECT // Constructor, destructor public: - DiagramContextWidget(QWidget *parent = 0); - virtual ~DiagramContextWidget(); + DiagramContextWidget(QWidget *parent = nullptr); + ~DiagramContextWidget() override; private: DiagramContextWidget(const DiagramContextWidget &); Index: sources/diagramevent/diagrameventaddelement.cpp =================================================================== --- sources/diagramevent/diagrameventaddelement.cpp (révision 4993) +++ sources/diagramevent/diagrameventaddelement.cpp (copie de travail) @@ -180,7 +180,7 @@ int state; ElementsLocation loc(m_integrate_path); - m_element = ElementFactory::Instance() -> createElement(loc, 0, &state); + m_element = ElementFactory::Instance() -> createElement(loc, nullptr, &state); //The creation of element failed, we delete it if (state) { delete m_element; @@ -200,9 +200,9 @@ int state; Element *element; if (m_integrate_path.isEmpty()) - element = ElementFactory::Instance() -> createElement(m_location, 0, &state); + element = ElementFactory::Instance() -> createElement(m_location, nullptr, &state); else - element = ElementFactory::Instance() -> createElement(ElementsLocation(m_integrate_path), 0, &state); + element = ElementFactory::Instance() -> createElement(ElementsLocation(m_integrate_path), nullptr, &state); //Build failed if (state) Index: sources/diagramevent/diagrameventaddelement.h =================================================================== --- sources/diagramevent/diagrameventaddelement.h (révision 4993) +++ sources/diagramevent/diagrameventaddelement.h (copie de travail) @@ -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(); Index: sources/diagramevent/diagrameventaddimage.h =================================================================== --- sources/diagramevent/diagrameventaddimage.h (révision 4993) +++ sources/diagramevent/diagrameventaddimage.h (copie de travail) @@ -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: Index: sources/diagramevent/diagrameventaddshape.h =================================================================== --- sources/diagramevent/diagrameventaddshape.h (révision 4993) +++ sources/diagramevent/diagrameventaddshape.h (copie de travail) @@ -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); Index: sources/diagramevent/diagrameventaddtext.h =================================================================== --- sources/diagramevent/diagrameventaddtext.h (révision 4993) +++ sources/diagramevent/diagrameventaddtext.h (copie de travail) @@ -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 Index: sources/diagramevent/diagrameventinterface.h =================================================================== --- sources/diagramevent/diagrameventinterface.h (révision 4993) +++ sources/diagramevent/diagrameventinterface.h (copie de travail) @@ -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); Index: sources/diagramfoliolist.h =================================================================== --- sources/diagramfoliolist.h (révision 4993) +++ sources/diagramfoliolist.h (copie de travail) @@ -25,7 +25,7 @@ { public: DiagramFolioList(QETProject *project); - virtual ~DiagramFolioList(); + ~DiagramFolioList() override; virtual QList lines() const {return list_lines_;} virtual QList rectangles() const {return list_rectangles_;} void setId(int i) {id = i;} @@ -34,7 +34,7 @@ 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); Index: sources/diagramprintdialog.cpp =================================================================== --- sources/diagramprintdialog.cpp (révision 4993) +++ sources/diagramprintdialog.cpp (copie de travail) @@ -34,7 +34,7 @@ DiagramPrintDialog::DiagramPrintDialog(QETProject *project, QWidget *parent) : QWidget(parent), project_(project), - dialog_(0) + dialog_(nullptr) { // initialise l'imprimante printer_ = new QPrinter(); Index: sources/diagramprintdialog.h =================================================================== --- sources/diagramprintdialog.h (révision 4993) +++ sources/diagramprintdialog.h (copie de travail) @@ -36,8 +36,8 @@ Q_OBJECT // Constructors, destructor public: - DiagramPrintDialog(QETProject *, QWidget * = 0); - virtual ~DiagramPrintDialog(); + DiagramPrintDialog(QETProject *, QWidget * = nullptr); + ~DiagramPrintDialog() override; private: DiagramPrintDialog(const DiagramPrintDialog &); @@ -63,7 +63,7 @@ private slots: void print(const QList &, bool, const ExportProperties); - void printDiagram(Diagram *, bool, const ExportProperties &, QPainter *, QPrinter * = 0); + void printDiagram(Diagram *, bool, const ExportProperties &, QPainter *, QPrinter * = nullptr); void updatePrintTypeDialog(); void acceptPrintTypeDialog(); void browseFilePrintTypeDialog(); Index: sources/diagramschooser.cpp =================================================================== --- sources/diagramschooser.cpp (révision 4993) +++ sources/diagramschooser.cpp (copie de travail) @@ -27,8 +27,8 @@ DiagramsChooser::DiagramsChooser(QETProject *project, QWidget *parent) : QScrollArea(parent), project_(project), - widget0_(0), - vlayout0_(0) + widget0_(nullptr), + vlayout0_(nullptr) { setFrameShadow(QFrame::Sunken); setFrameShape(QFrame::StyledPanel); Index: sources/diagramschooser.h =================================================================== --- sources/diagramschooser.h (révision 4993) +++ sources/diagramschooser.h (copie de travail) @@ -29,8 +29,8 @@ // constructors, destructor public: - DiagramsChooser(QETProject *, QWidget * = 0); - virtual ~DiagramsChooser(); + DiagramsChooser(QETProject *, QWidget * = nullptr); + ~DiagramsChooser() override; private: DiagramsChooser(const DiagramsChooser &); Index: sources/diagramview.h =================================================================== --- sources/diagramview.h (révision 4993) +++ sources/diagramview.h (copie de travail) @@ -41,8 +41,8 @@ // constructors, destructor public: - DiagramView(Diagram *diagram, QWidget * = 0); - virtual ~DiagramView(); + DiagramView(Diagram *diagram, QWidget * = nullptr); + ~DiagramView() override; private: DiagramView(const DiagramView &); @@ -76,13 +76,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 *); @@ -89,13 +89,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 *); Index: sources/dvevent/dveventinterface.h =================================================================== --- sources/dvevent/dveventinterface.h (révision 4993) +++ sources/dvevent/dveventinterface.h (copie de travail) @@ -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); Index: sources/editor/arceditor.cpp =================================================================== --- sources/editor/arceditor.cpp (révision 4993) +++ sources/editor/arceditor.cpp (copie de travail) @@ -93,8 +93,8 @@ disconnect(part, &PartArc::spanAngleChanged, this, &ArcEditor::updateForm); disconnect(part, &PartArc::startAngleChanged, this, &ArcEditor::updateForm); } - part = 0; - style_ -> setPart(0); + part = nullptr; + style_ -> setPart(nullptr); return(true); } Index: sources/editor/arceditor.h =================================================================== --- sources/editor/arceditor.h (révision 4993) +++ sources/editor/arceditor.h (copie de travail) @@ -34,8 +34,8 @@ // constructors, destructor public: - ArcEditor(QETElementEditor *, PartArc * = 0, QWidget * = 0); - virtual ~ArcEditor(); + ArcEditor(QETElementEditor *, PartArc * = nullptr, QWidget * = nullptr); + ~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); Index: sources/editor/editorcommands.cpp =================================================================== --- sources/editor/editorcommands.cpp (révision 4993) +++ sources/editor/editorcommands.cpp (copie de travail) @@ -86,7 +86,7 @@ const QList parts, QUndoCommand *parent ) : - ElementEditionCommand(QObject::tr("suppression", "undo caption"), scene, 0, parent), + ElementEditionCommand(QObject::tr("suppression", "undo caption"), scene, nullptr, parent), deleted_parts(parts) { foreach(QGraphicsItem *qgi, deleted_parts) { @@ -131,7 +131,7 @@ const ElementContent &c, QUndoCommand *parent ) : - ElementEditionCommand(view ? view -> scene() : 0, view, parent), + ElementEditionCommand(view ? view -> scene() : nullptr, view, parent), content_(c), uses_offset(false), first_redo(true) @@ -227,7 +227,7 @@ const QList parts, QUndoCommand *parent ) : - ElementEditionCommand(QObject::tr("déplacement", "undo caption"), scene, 0, parent), + ElementEditionCommand(QObject::tr("déplacement", "undo caption"), scene, nullptr, parent), movement(m), first_redo(true) { @@ -267,7 +267,7 @@ QGraphicsItem *p, QUndoCommand *parent ) : - ElementEditionCommand(QString(QObject::tr("ajout %1", "undo caption")).arg(name), scene, 0, parent), + ElementEditionCommand(QString(QObject::tr("ajout %1", "undo caption")).arg(name), scene, nullptr, parent), part(p), first_redo(true) { @@ -315,7 +315,7 @@ const NamesList &after, QUndoCommand *parent ) : - ElementEditionCommand(QObject::tr("modification noms", "undo caption"), element_scene, 0, parent), + ElementEditionCommand(QObject::tr("modification noms", "undo caption"), element_scene, nullptr, parent), names_before(before), names_after(after) { @@ -346,7 +346,7 @@ ChangeZValueCommand::Option o, QUndoCommand *parent ) : - ElementEditionCommand(elmt, 0, parent), + ElementEditionCommand(elmt, nullptr, parent), option(o) { // retrieve all primitives but terminals @@ -466,7 +466,7 @@ @param parent QUndoCommand parent */ ChangeInformationsCommand::ChangeInformationsCommand(ElementScene *elmt, const QString &old_infos, const QString &new_infos, QUndoCommand *parent) : - ElementEditionCommand(QObject::tr("modification informations complementaires", "undo caption"), elmt, 0, parent), + ElementEditionCommand(QObject::tr("modification informations complementaires", "undo caption"), elmt, nullptr, parent), old_informations_(old_infos), new_informations_(new_infos) { @@ -492,7 +492,7 @@ @param parent Parent QUndoCommand */ ScalePartsCommand::ScalePartsCommand(ElementScene *scene, QUndoCommand * parent) : - ElementEditionCommand(scene, 0, parent), + ElementEditionCommand(scene, nullptr, parent), first_redo(true) {} @@ -594,7 +594,7 @@ * @param parent: parent undo */ ChangePropertiesCommand::ChangePropertiesCommand(ElementScene *scene, QString type, DiagramContext info, QUndoCommand *parent) : - ElementEditionCommand(scene, 0, parent) + ElementEditionCommand(scene, nullptr, parent) { m_type << scene->m_elmt_type << type; m_info << scene->m_elmt_kindInfo << info; Index: sources/editor/editorcommands.h =================================================================== --- sources/editor/editorcommands.h (révision 4993) +++ sources/editor/editorcommands.h (copie de travail) @@ -33,9 +33,9 @@ { // constructors, destructor public: - ElementEditionCommand(ElementScene * = 0, ElementView * = 0, QUndoCommand * = 0); - ElementEditionCommand(const QString &, ElementScene * = 0, ElementView * = 0, QUndoCommand * = 0); - virtual ~ElementEditionCommand(); + ElementEditionCommand(ElementScene * = nullptr, ElementView * = nullptr, QUndoCommand * = nullptr); + ElementEditionCommand(const QString &, ElementScene * = nullptr, ElementView * = nullptr, QUndoCommand * = nullptr); + ~ElementEditionCommand() override; private: ElementEditionCommand(const ElementEditionCommand &); @@ -60,15 +60,15 @@ class DeletePartsCommand : public ElementEditionCommand { // constructors, destructor public: - DeletePartsCommand(ElementScene *, const QList, QUndoCommand * = 0); - virtual ~DeletePartsCommand(); + DeletePartsCommand(ElementScene *, const QList, QUndoCommand * = nullptr); + ~DeletePartsCommand() override; private: DeletePartsCommand(const DeletePartsCommand &); // methods public: - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; // attributes private: @@ -82,15 +82,15 @@ class PastePartsCommand : public ElementEditionCommand { // constructors, destructor public: - PastePartsCommand(ElementView *, const ElementContent &, QUndoCommand * = 0); - virtual ~PastePartsCommand(); + PastePartsCommand(ElementView *, const ElementContent &, QUndoCommand * = nullptr); + ~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 @@ -113,8 +113,8 @@ class CutPartsCommand : public DeletePartsCommand { // constructors, destructor public: - CutPartsCommand(ElementScene *, const QList, QUndoCommand * = 0); - virtual ~CutPartsCommand(); + CutPartsCommand(ElementScene *, const QList, QUndoCommand * = nullptr); + ~CutPartsCommand() override; private: CutPartsCommand(const CutPartsCommand &); }; @@ -125,15 +125,15 @@ class MovePartsCommand : public ElementEditionCommand { // constructors, destructor public: - MovePartsCommand(const QPointF &, ElementScene *, const QList, QUndoCommand * = 0); - virtual ~MovePartsCommand(); + MovePartsCommand(const QPointF &, ElementScene *, const QList, QUndoCommand * = nullptr); + ~MovePartsCommand() override; private: MovePartsCommand(const MovePartsCommand &); // methods public: - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; // attributes private: @@ -151,15 +151,15 @@ class AddPartCommand : public ElementEditionCommand { // constructors, destructor public: - AddPartCommand(const QString &, ElementScene *, QGraphicsItem *, QUndoCommand * = 0); - virtual ~AddPartCommand(); + AddPartCommand(const QString &, ElementScene *, QGraphicsItem *, QUndoCommand * = nullptr); + ~AddPartCommand() override; private: AddPartCommand(const AddPartCommand &); // methods public: - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; // attributes private: @@ -175,15 +175,15 @@ class ChangeNamesCommand : public ElementEditionCommand { // constructors, destructor public: - ChangeNamesCommand(ElementScene *, const NamesList &, const NamesList &, QUndoCommand * = 0); - virtual ~ChangeNamesCommand(); + ChangeNamesCommand(ElementScene *, const NamesList &, const NamesList &, QUndoCommand * = nullptr); + ~ChangeNamesCommand() override; private: ChangeNamesCommand(const ChangeNamesCommand &); // methods public: - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; // attributes private: @@ -207,15 +207,15 @@ Lower, ///< Send primitives one layer below their current one; zValues are decremented SendBackward ///< Send primitives to the background so they have the lowest zValue }; - ChangeZValueCommand(ElementScene *, Option, QUndoCommand * = 0); - virtual ~ChangeZValueCommand(); + ChangeZValueCommand(ElementScene *, Option, QUndoCommand * = nullptr); + ~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 &); @@ -239,15 +239,15 @@ class ChangeInformationsCommand : public ElementEditionCommand { // constructors, destructor public: - ChangeInformationsCommand(ElementScene *, const QString &, const QString &, QUndoCommand * = 0); - virtual ~ChangeInformationsCommand(); + ChangeInformationsCommand(ElementScene *, const QString &, const QString &, QUndoCommand * = nullptr); + ~ChangeInformationsCommand() override; private: ChangeInformationsCommand(const ChangeInformationsCommand &); // methods public: - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; // attributes private: @@ -263,15 +263,15 @@ class ScalePartsCommand : public ElementEditionCommand { // constructors, destructor public: - ScalePartsCommand(ElementScene * = 0, QUndoCommand * = 0); - virtual ~ScalePartsCommand(); + ScalePartsCommand(ElementScene * = nullptr, QUndoCommand * = nullptr); + ~ScalePartsCommand() override; private: ScalePartsCommand(const ScalePartsCommand &); // methods public: - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; ElementScene *elementScene() const; void setScaledPrimitives(const QList &); QList scaledPrimitives() const; @@ -296,11 +296,11 @@ class ChangePropertiesCommand : public ElementEditionCommand { public: - ChangePropertiesCommand (ElementScene *scene, QString type, DiagramContext info, QUndoCommand *parent=0); - virtual ~ChangePropertiesCommand (); + ChangePropertiesCommand (ElementScene *scene, QString type, DiagramContext info, QUndoCommand *parent=nullptr); + ~ChangePropertiesCommand () override; - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; private: QList m_type; Index: sources/editor/elementitemeditor.cpp =================================================================== --- sources/editor/elementitemeditor.cpp (révision 4993) +++ sources/editor/elementitemeditor.cpp (copie de travail) @@ -61,5 +61,5 @@ @see setPart */ void ElementItemEditor::detach() { - setPart(0); + setPart(nullptr); } Index: sources/editor/elementitemeditor.h =================================================================== --- sources/editor/elementitemeditor.h (révision 4993) +++ sources/editor/elementitemeditor.h (copie de travail) @@ -35,8 +35,8 @@ Q_OBJECT // constructors, destructor public: - ElementItemEditor(QETElementEditor *, QWidget * = 0); - virtual ~ElementItemEditor() {}; + ElementItemEditor(QETElementEditor *, QWidget * = nullptr); + ~ElementItemEditor() override {}; private: ElementItemEditor(const ElementItemEditor &); Index: sources/editor/elementprimitivedecorator.cpp =================================================================== --- sources/editor/elementprimitivedecorator.cpp (révision 4993) +++ sources/editor/elementprimitivedecorator.cpp (copie de travail) @@ -118,9 +118,9 @@ // break any connection between the former single selected item (if any) and // the decorator - single_item -> setDecorator(0); + single_item -> setDecorator(nullptr); if (QGraphicsObject *single_object = dynamic_cast(single_item)) { - disconnect(single_object, 0, this, 0); + disconnect(single_object, nullptr, this, nullptr); } } @@ -355,7 +355,7 @@ void ElementPrimitiveDecorator::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { Q_UNUSED(event) - ElementEditionCommand *command = 0; + ElementEditionCommand *command = nullptr; if (current_operation_square_ > QET::NoOperation) { ScalePartsCommand *scale_command = new ScalePartsCommand(); scale_command -> setScaledPrimitives(items()); @@ -367,7 +367,7 @@ } else if (current_operation_square_ == QET::MoveArea) { QPointF movement = mapToScene(modified_bounding_rect_.topLeft()) - mapToScene(original_bounding_rect_.topLeft()); if (!movement.isNull()) { - MovePartsCommand *move_command = new MovePartsCommand(movement, 0, graphicsItems()); + MovePartsCommand *move_command = new MovePartsCommand(movement, nullptr, graphicsItems()); command = move_command; } } else { @@ -430,7 +430,7 @@ moving_by_keys_ && !e -> isAutoRepeat() ) { // cree un objet d'annulation pour le mouvement qui vient de se finir - emit(actionFinished(new MovePartsCommand(keys_movement_, 0, graphicsItems()))); + emit(actionFinished(new MovePartsCommand(keys_movement_, nullptr, graphicsItems()))); keys_movement_ = QPointF(); moving_by_keys_ = false; } @@ -524,7 +524,7 @@ if (decorated_items_.count() == 1) { return(decorated_items_.first()); } - return(0); + return(nullptr); } /** Index: sources/editor/elementprimitivedecorator.h =================================================================== --- sources/editor/elementprimitivedecorator.h (révision 4993) +++ sources/editor/elementprimitivedecorator.h (copie de travail) @@ -42,16 +42,16 @@ Q_OBJECT public: - ElementPrimitiveDecorator(QGraphicsItem * = 0); - virtual ~ElementPrimitiveDecorator(); + ElementPrimitiveDecorator(QGraphicsItem * = nullptr); + ~ElementPrimitiveDecorator() override; enum { Type = UserType + 2200 }; // methods QRectF internalBoundingRect() const; - virtual QRectF boundingRect () const; - virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = 0); - virtual int type() const { return Type; } + QRectF boundingRect () const override; + void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr) override; + int type() const override { return Type; } void setItems(const QList &); void setItems(const QList &); QList items() const; @@ -64,13 +64,13 @@ void actionFinished(ElementEditionCommand *); protected: - void hoverMoveEvent(QGraphicsSceneHoverEvent *); - void mousePressEvent(QGraphicsSceneMouseEvent *); - void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *); - void mouseMoveEvent(QGraphicsSceneMouseEvent *); - void mouseReleaseEvent(QGraphicsSceneMouseEvent *); - void keyPressEvent(QKeyEvent *); - void keyReleaseEvent(QKeyEvent *); + void hoverMoveEvent(QGraphicsSceneHoverEvent *) override; + void mousePressEvent(QGraphicsSceneMouseEvent *) override; + void mouseDoubleClickEvent(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; Index: sources/editor/elementscene.h =================================================================== --- sources/editor/elementscene.h (révision 4993) +++ sources/editor/elementscene.h (copie de travail) @@ -54,8 +54,8 @@ // constructors, destructor public: - ElementScene(QETElementEditor *, QObject * = 0); - virtual ~ElementScene(); + ElementScene(QETElementEditor *, QObject * = nullptr); + ~ElementScene() override; private: ElementScene(const ElementScene &); @@ -118,7 +118,7 @@ virtual void setGrid(int, int); virtual const QDomDocument toXml(bool = true); virtual QRectF boundingRectFromXml(const QDomDocument &); - virtual void fromXml(const QDomDocument &, const QPointF & = QPointF(), bool = true, ElementContent * = 0); + virtual void fromXml(const QDomDocument &, const QPointF & = QPointF(), bool = true, ElementContent * = nullptr); virtual void reset(); virtual QList primitives() const; virtual QList zItems(ItemOptions options = ItemOptions(SortByZValue | IncludeTerminals | SelectedOrNot)) const; @@ -135,21 +135,21 @@ 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; - bool applyInformations(const QDomDocument &, QString * = 0); - ElementContent loadContent(const QDomDocument &, QString * = 0); - ElementContent addContent(const ElementContent &, QString * = 0); - ElementContent addContentAtPos(const ElementContent &, const QPointF &, QString * = 0); + bool applyInformations(const QDomDocument &, QString * = nullptr); + ElementContent loadContent(const QDomDocument &, QString * = nullptr); + ElementContent addContent(const ElementContent &, QString * = nullptr); + ElementContent addContentAtPos(const ElementContent &, const QPointF &, QString * = nullptr); void addPrimitive(QGraphicsItem *); void initPasteArea(); static bool zValueLessThan(QGraphicsItem *, QGraphicsItem *); Index: sources/editor/elementview.h =================================================================== --- sources/editor/elementview.h (révision 4993) +++ sources/editor/elementview.h (copie de travail) @@ -30,8 +30,8 @@ // constructors, destructor public: - ElementView(ElementScene *, QWidget * = 0); - virtual ~ElementView(); + ElementView(ElementScene *, QWidget * = nullptr); + ~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 &); Index: sources/editor/ellipseeditor.cpp =================================================================== --- sources/editor/ellipseeditor.cpp (révision 4993) +++ sources/editor/ellipseeditor.cpp (copie de travail) @@ -83,8 +83,8 @@ { if (part) disconnect(part, &PartEllipse::rectChanged, this, &EllipseEditor::updateForm); - part = 0; - style_ -> setPart(0); + part = nullptr; + style_ -> setPart(nullptr); return(true); } if (PartEllipse *part_ellipse = dynamic_cast(new_part)) Index: sources/editor/ellipseeditor.h =================================================================== --- sources/editor/ellipseeditor.h (révision 4993) +++ sources/editor/ellipseeditor.h (copie de travail) @@ -33,8 +33,8 @@ // constructors, destructor public: - EllipseEditor(QETElementEditor *, PartEllipse * = 0, QWidget * = 0); - virtual ~EllipseEditor(); + EllipseEditor(QETElementEditor *, PartEllipse * = nullptr, QWidget * = nullptr); + ~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); Index: sources/editor/esevent/eseventaddarc.h =================================================================== --- sources/editor/esevent/eseventaddarc.h (révision 4993) +++ sources/editor/esevent/eseventaddarc.h (copie de travail) @@ -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 (); Index: sources/editor/esevent/eseventaddellipse.h =================================================================== --- sources/editor/esevent/eseventaddellipse.h (révision 4993) +++ sources/editor/esevent/eseventaddellipse.h (copie de travail) @@ -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; Index: sources/editor/esevent/eseventaddline.h =================================================================== --- sources/editor/esevent/eseventaddline.h (révision 4993) +++ sources/editor/esevent/eseventaddline.h (copie de travail) @@ -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; Index: sources/editor/esevent/eseventaddpolygon.h =================================================================== --- sources/editor/esevent/eseventaddpolygon.h (révision 4993) +++ sources/editor/esevent/eseventaddpolygon.h (copie de travail) @@ -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; Index: sources/editor/esevent/eseventaddrect.h =================================================================== --- sources/editor/esevent/eseventaddrect.h (révision 4993) +++ sources/editor/esevent/eseventaddrect.h (copie de travail) @@ -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; Index: sources/editor/esevent/eseventaddterminal.h =================================================================== --- sources/editor/esevent/eseventaddterminal.h (révision 4993) +++ sources/editor/esevent/eseventaddterminal.h (copie de travail) @@ -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; Index: sources/editor/esevent/eseventaddtext.h =================================================================== --- sources/editor/esevent/eseventaddtext.h (révision 4993) +++ sources/editor/esevent/eseventaddtext.h (copie de travail) @@ -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; Index: sources/editor/esevent/eseventaddtextfield.h =================================================================== --- sources/editor/esevent/eseventaddtextfield.h (révision 4993) +++ sources/editor/esevent/eseventaddtextfield.h (copie de travail) @@ -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; Index: sources/editor/graphicspart/abstractpartellipse.h =================================================================== --- sources/editor/graphicspart/abstractpartellipse.h (révision 4993) +++ sources/editor/graphicspart/abstractpartellipse.h (copie de travail) @@ -39,8 +39,8 @@ // constructors, destructor public: - AbstractPartEllipse(QETElementEditor *editor, QGraphicsItem * parent = 0); - virtual ~AbstractPartEllipse(); + AbstractPartEllipse(QETElementEditor *editor, QGraphicsItem * parent = nullptr); + ~AbstractPartEllipse() override; private: AbstractPartEllipse(const AbstractPartEllipse &); @@ -52,17 +52,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; void setRect (const QRectF &rect); - virtual bool isUseless() const; + bool isUseless() const override; int startAngle() const {return m_start_angle;} void setStartAngle (const int &start_angle); Index: sources/editor/graphicspart/customelementgraphicpart.h =================================================================== --- sources/editor/graphicspart/customelementgraphicpart.h (révision 4993) +++ sources/editor/graphicspart/customelementgraphicpart.h (copie de travail) @@ -64,8 +64,8 @@ // constructors, destructor public: - CustomElementGraphicPart(QETElementEditor *editor, QGraphicsItem *parent = 0); - virtual ~CustomElementGraphicPart(); + CustomElementGraphicPart(QETElementEditor *editor, QGraphicsItem *parent = nullptr); + ~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; Index: sources/editor/graphicspart/partarc.h =================================================================== --- sources/editor/graphicspart/partarc.h (révision 4993) +++ sources/editor/graphicspart/partarc.h (copie de travail) @@ -33,8 +33,8 @@ Q_OBJECT public: - PartArc(QETElementEditor *editor, QGraphicsItem *parent = 0); - virtual ~PartArc(); + PartArc(QETElementEditor *editor, QGraphicsItem *parent = nullptr); + ~PartArc() override; private: PartArc(const PartArc &); @@ -45,24 +45,24 @@ * 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 * = 0); + 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 QRectF boundingRect() const; - virtual QPainterPath shape() const; - virtual QPainterPath shadowShape() const; + QRectF boundingRect() const override; + QPainterPath shape() const override; + QPainterPath shadowShape() const override; protected: - virtual void hoverMoveEvent(QGraphicsSceneHoverEvent *event); - virtual void mousePressEvent(QGraphicsSceneMouseEvent *event); - virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event); - virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); + void hoverMoveEvent(QGraphicsSceneHoverEvent *event) override; + void mousePressEvent(QGraphicsSceneMouseEvent *event) override; + void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; private: void switchResizeMode(); Index: sources/editor/graphicspart/partellipse.h =================================================================== --- sources/editor/graphicspart/partellipse.h (révision 4993) +++ sources/editor/graphicspart/partellipse.h (copie de travail) @@ -34,8 +34,8 @@ // constructors, destructor public: - PartEllipse(QETElementEditor *editor, QGraphicsItem * parent = 0); - virtual ~PartEllipse(); + PartEllipse(QETElementEditor *editor, QGraphicsItem * parent = nullptr); + ~PartEllipse() override; private: PartEllipse(const PartEllipse &); @@ -47,24 +47,24 @@ * 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 * = 0); + 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 &); + 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; - virtual QRectF boundingRect() const; - virtual QPainterPath shape() const; - virtual QPainterPath shadowShape() const; + QRectF boundingRect() const override; + QPainterPath shape() const override; + QPainterPath shadowShape() const override; protected: - virtual void hoverMoveEvent(QGraphicsSceneHoverEvent *event); - virtual void mousePressEvent(QGraphicsSceneMouseEvent *event); - virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event); - virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); + void hoverMoveEvent(QGraphicsSceneHoverEvent *event) override; + void mousePressEvent(QGraphicsSceneMouseEvent *event) override; + void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; private: void switchResizeMode(); Index: sources/editor/graphicspart/partline.h =================================================================== --- sources/editor/graphicspart/partline.h (révision 4993) +++ sources/editor/graphicspart/partline.h (copie de travail) @@ -45,8 +45,8 @@ // constructors, destructor public: - PartLine(QETElementEditor *, QGraphicsItem * = 0); - virtual ~PartLine(); + PartLine(QETElementEditor *, QGraphicsItem * = nullptr); + ~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 * = 0); - virtual QString name() const { return(QObject::tr("ligne", "element part name")); } - virtual QString xmlName() const { return(QString("line")); } - virtual const QDomElement toXml(QDomDocument &) const; - virtual void fromXml(const QDomElement &); + int type() const override { return Type; } + void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr) override; + QString name() const override { return(QObject::tr("ligne", "element part name")); } + QString xmlName() const override { return(QString("line")); } + const QDomElement toXml(QDomDocument &) const override; + void fromXml(const QDomElement &) override; virtual QPointF sceneP1() const; virtual QPointF sceneP2() const; - virtual QPainterPath shape() const; - virtual QPainterPath shadowShape() const; - virtual QRectF boundingRect() const; - virtual bool isUseless() const; - virtual QRectF sceneGeometricRect() const; - virtual void startUserTransformation(const QRectF &); - virtual void handleUserTransformation(const QRectF &, const QRectF &); + QPainterPath shape() const override; + QPainterPath shadowShape() const override; + QRectF boundingRect() const override; + bool isUseless() const override; + QRectF sceneGeometricRect() const override; + void startUserTransformation(const QRectF &) override; + void handleUserTransformation(const QRectF &, const QRectF &) override; static uint requiredLengthForEndType(const Qet::EndType &); static QList fourEndPoints(const QPointF &, const QPointF &, const qreal &); @@ -96,10 +96,10 @@ void setSecondEndLength(const qreal &l); protected: - virtual void hoverMoveEvent(QGraphicsSceneHoverEvent *event); - virtual void mousePressEvent(QGraphicsSceneMouseEvent *event); - virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event); - virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); + void hoverMoveEvent(QGraphicsSceneHoverEvent *event) override; + void mousePressEvent(QGraphicsSceneMouseEvent *event) override; + void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; private: QPainterPath path() const; Index: sources/editor/graphicspart/partpolygon.h =================================================================== --- sources/editor/graphicspart/partpolygon.h (révision 4993) +++ sources/editor/graphicspart/partpolygon.h (copie de travail) @@ -39,8 +39,8 @@ // constructors, destructor public: - PartPolygon(QETElementEditor *editor, QGraphicsItem *parent = 0); - virtual ~PartPolygon(); + PartPolygon(QETElementEditor *editor, QGraphicsItem *parent = nullptr); + ~PartPolygon() override; private: PartPolygon(const PartPolygon &); @@ -56,23 +56,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); @@ -85,10 +85,10 @@ void setClosed (bool close); protected: - virtual void hoverMoveEvent(QGraphicsSceneHoverEvent *event); - virtual void mousePressEvent(QGraphicsSceneMouseEvent *event); - virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event); - virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); + void hoverMoveEvent(QGraphicsSceneHoverEvent *event) override; + void mousePressEvent(QGraphicsSceneMouseEvent *event) override; + void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; private: bool m_closed; Index: sources/editor/graphicspart/partrectangle.h =================================================================== --- sources/editor/graphicspart/partrectangle.h (révision 4993) +++ sources/editor/graphicspart/partrectangle.h (copie de travail) @@ -36,8 +36,8 @@ // constructors, destructor public: - PartRectangle(QETElementEditor *, QGraphicsItem *parent = 0); - virtual ~PartRectangle(); + PartRectangle(QETElementEditor *, QGraphicsItem *parent = nullptr); + ~PartRectangle() override; private: PartRectangle(const PartRectangle &); @@ -52,33 +52,33 @@ * 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 * = 0); - 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 hoverMoveEvent(QGraphicsSceneHoverEvent *event); - virtual void mousePressEvent(QGraphicsSceneMouseEvent *event); - virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event); - virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); + void hoverMoveEvent(QGraphicsSceneHoverEvent *event) override; + void mousePressEvent(QGraphicsSceneMouseEvent *event) override; + void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; private: void switchResizeMode(); Index: sources/editor/graphicspart/partterminal.h =================================================================== --- sources/editor/graphicspart/partterminal.h (révision 4993) +++ sources/editor/graphicspart/partterminal.h (copie de travail) @@ -35,8 +35,8 @@ public: // constructors, destructor - PartTerminal(QETElementEditor *editor, QGraphicsItem *parent = 0); - virtual ~PartTerminal(); + PartTerminal(QETElementEditor *editor, QGraphicsItem *parent = nullptr); + ~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); Index: sources/editor/graphicspart/parttext.cpp =================================================================== --- sources/editor/graphicspart/parttext.cpp (révision 4993) +++ sources/editor/graphicspart/parttext.cpp (copie de travail) @@ -32,7 +32,7 @@ QGraphicsTextItem(parent), CustomElementPart(editor), previous_text(), - decorator_(0) + decorator_(nullptr) { Q_UNUSED(scene) document() -> setDocumentMargin(1.0); Index: sources/editor/graphicspart/parttext.h =================================================================== --- sources/editor/graphicspart/parttext.h (révision 4993) +++ sources/editor/graphicspart/parttext.h (copie de travail) @@ -31,8 +31,8 @@ // constructors, destructor public: - PartText(QETElementEditor *, QGraphicsItem * = 0, ElementScene * = 0); - virtual ~PartText(); + PartText(QETElementEditor *, QGraphicsItem * = nullptr, ElementScene * = nullptr); + ~PartText() override; private: PartText(const PartText &); @@ -45,26 +45,26 @@ 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 &); - virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = 0 ); - virtual void setDecorator(ElementPrimitiveDecorator *); - virtual bool singleItemPressEvent(ElementPrimitiveDecorator *, QGraphicsSceneMouseEvent *); - virtual bool singleItemMoveEvent(ElementPrimitiveDecorator *, QGraphicsSceneMouseEvent *); - virtual bool singleItemReleaseEvent(ElementPrimitiveDecorator *, QGraphicsSceneMouseEvent *); - virtual bool singleItemDoubleClickEvent(ElementPrimitiveDecorator *, QGraphicsSceneMouseEvent *); + bool isUseless() const override; + QRectF sceneGeometricRect() const override; + void startUserTransformation(const QRectF &) override; + void handleUserTransformation(const QRectF &, const QRectF &) override; + void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr ) override; + void setDecorator(ElementPrimitiveDecorator *) override; + bool singleItemPressEvent(ElementPrimitiveDecorator *, QGraphicsSceneMouseEvent *) override; + bool singleItemMoveEvent(ElementPrimitiveDecorator *, QGraphicsSceneMouseEvent *) override; + bool singleItemReleaseEvent(ElementPrimitiveDecorator *, QGraphicsSceneMouseEvent *) override; + bool singleItemDoubleClickEvent(ElementPrimitiveDecorator *, QGraphicsSceneMouseEvent *) 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();} @@ -87,15 +87,15 @@ void endEdition(); protected: - virtual void contextMenuEvent(QGraphicsSceneContextMenuEvent *); - virtual void hoverMoveEvent(QGraphicsSceneHoverEvent *); - virtual bool sceneEventFilter(QGraphicsItem *, QEvent *); - 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 contextMenuEvent(QGraphicsSceneContextMenuEvent *) override; + void hoverMoveEvent(QGraphicsSceneHoverEvent *) override; + bool sceneEventFilter(QGraphicsItem *, QEvent *) 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; Index: sources/editor/graphicspart/parttextfield.cpp =================================================================== --- sources/editor/graphicspart/parttextfield.cpp (révision 4993) +++ sources/editor/graphicspart/parttextfield.cpp (copie de travail) @@ -33,7 +33,7 @@ follow_parent_rotations(true), m_tagg("none"), previous_text(), - decorator_(0) + decorator_(nullptr) { Q_UNUSED(scene); setDefaultTextColor(Qt::black); Index: sources/editor/graphicspart/parttextfield.h =================================================================== --- sources/editor/graphicspart/parttextfield.h (révision 4993) +++ sources/editor/graphicspart/parttextfield.h (copie de travail) @@ -34,8 +34,8 @@ // constructors, destructor public: - PartTextField(QETElementEditor *, QGraphicsItem * = 0, QGraphicsScene * = 0); - virtual ~PartTextField(); + PartTextField(QETElementEditor *, QGraphicsItem * = nullptr, QGraphicsScene * = nullptr); + ~PartTextField() override; private: PartTextField(const PartTextField &); @@ -52,25 +52,25 @@ 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 &); - virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = 0 ); - virtual void setDecorator(ElementPrimitiveDecorator *); - virtual bool singleItemPressEvent(ElementPrimitiveDecorator *, QGraphicsSceneMouseEvent *); - virtual bool singleItemMoveEvent(ElementPrimitiveDecorator *, QGraphicsSceneMouseEvent *); - virtual bool singleItemReleaseEvent(ElementPrimitiveDecorator *, QGraphicsSceneMouseEvent *); - virtual bool singleItemDoubleClickEvent(ElementPrimitiveDecorator *, QGraphicsSceneMouseEvent *); + 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; + void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr ) override; + void setDecorator(ElementPrimitiveDecorator *) override; + bool singleItemPressEvent(ElementPrimitiveDecorator *, QGraphicsSceneMouseEvent *) override; + bool singleItemMoveEvent(ElementPrimitiveDecorator *, QGraphicsSceneMouseEvent *) override; + bool singleItemReleaseEvent(ElementPrimitiveDecorator *, QGraphicsSceneMouseEvent *) override; + bool singleItemDoubleClickEvent(ElementPrimitiveDecorator *, QGraphicsSceneMouseEvent *) 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) @@ -102,15 +102,15 @@ void endEdition(); protected: - virtual void contextMenuEvent(QGraphicsSceneContextMenuEvent *); - virtual void hoverMoveEvent(QGraphicsSceneHoverEvent *); - virtual bool sceneEventFilter(QGraphicsItem *, QEvent *); - 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 contextMenuEvent(QGraphicsSceneContextMenuEvent *) override; + void hoverMoveEvent(QGraphicsSceneHoverEvent *) override; + bool sceneEventFilter(QGraphicsItem *, QEvent *) 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; Index: sources/editor/lineeditor.cpp =================================================================== --- sources/editor/lineeditor.cpp (révision 4993) +++ sources/editor/lineeditor.cpp (copie de travail) @@ -110,8 +110,8 @@ disconnect(part, &PartLine::firstEndLengthChanged, this, &LineEditor::updateForm); disconnect(part, &PartLine::secondEndLengthChanged, this, &LineEditor::updateForm); } - part = 0; - style_ -> setPart(0); + part = nullptr; + style_ -> setPart(nullptr); return(true); } if (PartLine *part_line = dynamic_cast(new_part)) Index: sources/editor/lineeditor.h =================================================================== --- sources/editor/lineeditor.h (révision 4993) +++ sources/editor/lineeditor.h (copie de travail) @@ -33,8 +33,8 @@ Q_OBJECT // constructors, destructor public: - LineEditor(QETElementEditor *, PartLine * = 0, QWidget * = 0); - virtual ~LineEditor(); + LineEditor(QETElementEditor *, PartLine * = nullptr, QWidget * = nullptr); + ~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); Index: sources/editor/polygoneditor.cpp =================================================================== --- sources/editor/polygoneditor.cpp (révision 4993) +++ sources/editor/polygoneditor.cpp (copie de travail) @@ -130,8 +130,8 @@ disconnect(part, &PartPolygon::polygonChanged, this, &PolygonEditor::updateForm); disconnect(part, &PartPolygon::closedChange, this, &PolygonEditor::updateForm); } - part = 0; - style_ -> setPart(0); + part = nullptr; + style_ -> setPart(nullptr); return(true); } if (PartPolygon *part_polygon = dynamic_cast(new_part)) Index: sources/editor/polygoneditor.h =================================================================== --- sources/editor/polygoneditor.h (révision 4993) +++ sources/editor/polygoneditor.h (copie de travail) @@ -35,8 +35,8 @@ // constructors, destructor public: - PolygonEditor(QETElementEditor *, PartPolygon * = 0, QWidget * = 0); - virtual ~PolygonEditor(); + PolygonEditor(QETElementEditor *, PartPolygon * = nullptr, QWidget * = nullptr); + ~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 getPointsFromTree(); @@ -59,7 +59,7 @@ public slots: void updatePolygonPoints(); void updatePolygonClosedState(); - void updateForm(); + void updateForm() override; void validColumn(QTreeWidgetItem *qtwi, int column); private: Index: sources/editor/qetelementeditor.cpp =================================================================== --- sources/editor/qetelementeditor.cpp (révision 4993) +++ sources/editor/qetelementeditor.cpp (copie de travail) @@ -1250,11 +1250,11 @@ */ QWidget *QETElementEditor::clearToolsDock() { if (QWidget *previous_widget = tools_dock_scroll_area_ -> takeWidget()) { - previous_widget -> setParent(0); + previous_widget -> setParent(nullptr); previous_widget -> hide(); return(previous_widget); } - return(0); + return(nullptr); } /** Index: sources/editor/qetelementeditor.h =================================================================== --- sources/editor/qetelementeditor.h (révision 4993) +++ sources/editor/qetelementeditor.h (copie de travail) @@ -36,8 +36,8 @@ // constructor, destructor public: - QETElementEditor(QWidget * = 0); - virtual ~QETElementEditor(); + QETElementEditor(QWidget * = nullptr); + ~QETElementEditor() override; private: QETElementEditor(const QETElementEditor &); void setupActions(); @@ -109,7 +109,7 @@ void readSettings(); void writeSettings(); static QPointF pasteOffset(); - static QString getOpenElementFileName(QWidget * = 0, const QString & = QString()); + static QString getOpenElementFileName(QWidget * = nullptr, const QString & = QString()); void contextMenu(QPoint p); signals: @@ -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(); Index: sources/editor/rectangleeditor.cpp =================================================================== --- sources/editor/rectangleeditor.cpp (révision 4993) +++ sources/editor/rectangleeditor.cpp (copie de travail) @@ -82,8 +82,8 @@ { if (part) disconnect(part, &PartRectangle::rectChanged, this, &RectangleEditor::updateForm); - part = 0; - style_ -> setPart(0); + part = nullptr; + style_ -> setPart(nullptr); return(true); } Index: sources/editor/rectangleeditor.h =================================================================== --- sources/editor/rectangleeditor.h (révision 4993) +++ sources/editor/rectangleeditor.h (copie de travail) @@ -33,8 +33,8 @@ // constructors, destructor public: - RectangleEditor(QETElementEditor *, PartRectangle * = 0, QWidget * = 0); - virtual ~RectangleEditor(); + RectangleEditor(QETElementEditor *, PartRectangle * = nullptr, QWidget * = nullptr); + ~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: Index: sources/editor/styleeditor.h =================================================================== --- sources/editor/styleeditor.h (révision 4993) +++ sources/editor/styleeditor.h (copie de travail) @@ -36,8 +36,8 @@ Q_OBJECT // constructors, destructor public: - StyleEditor(QETElementEditor *, CustomElementGraphicPart * = 0, QWidget * = 0); - virtual ~StyleEditor(); + StyleEditor(QETElementEditor *, CustomElementGraphicPart * = nullptr, QWidget * = nullptr); + ~StyleEditor() override; private: StyleEditor(const StyleEditor &); @@ -53,14 +53,14 @@ // methods public: - virtual bool setPart(CustomElementPart *); - virtual bool setParts(QList); - virtual CustomElementPart *currentPart() const; + bool setPart(CustomElementPart *) override; + bool setParts(QList) override; + CustomElementPart *currentPart() const override; static bool isStyleEditable (QList cep_list); public slots: - void updateForm(); + void updateForm() override; void updatePartAntialiasing(); void updatePartColor(); void updatePartLineStyle(); Index: sources/editor/terminaleditor.cpp =================================================================== --- sources/editor/terminaleditor.cpp (révision 4993) +++ sources/editor/terminaleditor.cpp (copie de travail) @@ -88,7 +88,7 @@ { if (part) disconnect(part, &PartTerminal::orientationChanged, this, &TerminalEditor::updateForm); - part = 0; + part = nullptr; return(true); } if (PartTerminal *part_terminal = dynamic_cast(new_part)) Index: sources/editor/terminaleditor.h =================================================================== --- sources/editor/terminaleditor.h (révision 4993) +++ sources/editor/terminaleditor.h (copie de travail) @@ -31,8 +31,8 @@ Q_OBJECT // Constructors, destructor public: - TerminalEditor(QETElementEditor *, PartTerminal * = 0, QWidget * = 0); - virtual ~TerminalEditor(); + TerminalEditor(QETElementEditor *, PartTerminal * = nullptr, QWidget * = nullptr); + ~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); Index: sources/editor/texteditor.cpp =================================================================== --- sources/editor/texteditor.cpp (révision 4993) +++ sources/editor/texteditor.cpp (copie de travail) @@ -107,7 +107,7 @@ { if (!new_part) { - part = 0; + part = nullptr; return(true); } if (PartText *part_text = dynamic_cast(new_part)) Index: sources/editor/texteditor.h =================================================================== --- sources/editor/texteditor.h (révision 4993) +++ sources/editor/texteditor.h (copie de travail) @@ -38,8 +38,8 @@ // Constructors, destructor public: - TextEditor(QETElementEditor *, PartText * = 0, QWidget * = 0); - virtual ~TextEditor(); + TextEditor(QETElementEditor *, PartText * = nullptr, QWidget * = nullptr); + ~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); Index: sources/editor/textfieldeditor.cpp =================================================================== --- sources/editor/textfieldeditor.cpp (révision 4993) +++ sources/editor/textfieldeditor.cpp (copie de travail) @@ -106,7 +106,7 @@ { if (!new_part) { - part = 0; + part = nullptr; return(true); } if (PartTextField *part_textfield = dynamic_cast(new_part)) Index: sources/editor/textfieldeditor.h =================================================================== --- sources/editor/textfieldeditor.h (révision 4993) +++ sources/editor/textfieldeditor.h (copie de travail) @@ -37,8 +37,8 @@ // Constructors, destructor public: - TextFieldEditor(QETElementEditor *, PartTextField * = 0, QWidget * = 0); - virtual ~TextFieldEditor(); + TextFieldEditor(QETElementEditor *, PartTextField * = nullptr, QWidget * = nullptr); + ~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); Index: sources/editor/ui/elementpropertieseditorwidget.h =================================================================== --- sources/editor/ui/elementpropertieseditorwidget.h (révision 4993) +++ sources/editor/ui/elementpropertieseditorwidget.h (copie de travail) @@ -37,8 +37,8 @@ //METHODS public: - explicit ElementPropertiesEditorWidget(QString &basic_type, DiagramContext &dc, QWidget *parent = 0); - ~ElementPropertiesEditorWidget(); + explicit ElementPropertiesEditorWidget(QString &basic_type, DiagramContext &dc, QWidget *parent = nullptr); + ~ElementPropertiesEditorWidget() override; void upDateInterface(); Index: sources/elementprovider.h =================================================================== --- sources/elementprovider.h (révision 4993) +++ sources/elementprovider.h (copie de travail) @@ -34,7 +34,7 @@ class ElementProvider { public: - ElementProvider(QETProject *prj, Diagram *diagram=0); + ElementProvider(QETProject *prj, Diagram *diagram=nullptr); ElementProvider(Diagram *diag); QList freeElement(const int filter) const; QList fromUuids(QList ) const; Index: sources/elementscategoryeditor.h =================================================================== --- sources/elementscategoryeditor.h (révision 4993) +++ sources/elementscategoryeditor.h (copie de travail) @@ -36,7 +36,7 @@ public: ElementsCategoryEditor(const ElementsLocation &location, bool edit = true, QWidget *parent = nullptr); - virtual ~ElementsCategoryEditor(); + ~ElementsCategoryEditor() override; ElementsLocation createdLocation() const; Index: sources/elementscollectioncache.cpp =================================================================== --- sources/elementscollectioncache.cpp (révision 4993) +++ sources/elementscollectioncache.cpp (copie de travail) @@ -208,7 +208,7 @@ */ bool ElementsCollectionCache::fetchData(const ElementsLocation &location) { int state; - Element *custom_elmt = ElementFactory::Instance() -> createElement(location, 0, &state); + Element *custom_elmt = ElementFactory::Instance() -> createElement(location, nullptr, &state); if (state) { qDebug() << "ElementsCollectionCache::fetchData() : Le chargement du composant" << qPrintable(location.toString()) << "a echoue avec le code d'erreur" << state; } else { Index: sources/elementscollectioncache.h =================================================================== --- sources/elementscollectioncache.h (révision 4993) +++ sources/elementscollectioncache.h (copie de travail) @@ -31,8 +31,8 @@ { public: // constructor, destructor - ElementsCollectionCache(const QString &database_path, QObject * = 0); - virtual ~ElementsCollectionCache(); + ElementsCollectionCache(const QString &database_path, QObject * = nullptr); + ~ElementsCollectionCache() override; // methods public: Index: sources/elementsmover.cpp =================================================================== --- sources/elementsmover.cpp (révision 4993) +++ sources/elementsmover.cpp (copie de travail) @@ -32,8 +32,8 @@ ElementsMover::ElementsMover() : movement_running_(false), current_movement_(), - diagram_(0), - movement_driver_(0), + diagram_(nullptr), + movement_driver_(nullptr), moved_content_() { Index: sources/elementsmover.h =================================================================== --- sources/elementsmover.h (révision 4993) +++ sources/elementsmover.h (copie de travail) @@ -46,7 +46,7 @@ // methods public: bool isReady() const; - int beginMovement(Diagram *, QGraphicsItem * = 0); + int beginMovement(Diagram *, QGraphicsItem * = nullptr); void continueMovement(const QPointF &); void endMovement(); Index: sources/elementspanel.cpp =================================================================== --- sources/elementspanel.cpp (révision 4993) +++ sources/elementspanel.cpp (copie de travail) @@ -127,7 +127,7 @@ bool first_add = (first_reload_ || !projects_to_display_.contains(project)); // create the QTreeWidgetItem representing the project - QTreeWidgetItem *qtwi_project = GenericPanel::addProject(project, 0, GenericPanel::All); + QTreeWidgetItem *qtwi_project = GenericPanel::addProject(project, nullptr, GenericPanel::All); // the project will be inserted right before the common tb templates collection invisibleRootItem() -> insertChild( indexOfTopLevelItem(common_tbt_collection_item_), Index: sources/elementspanel.h =================================================================== --- sources/elementspanel.h (révision 4993) +++ sources/elementspanel.h (copie de travail) @@ -36,8 +36,8 @@ // constructors, destructor public: - ElementsPanel(QWidget * = 0); - virtual ~ElementsPanel(); + ElementsPanel(QWidget * = nullptr); + ~ElementsPanel() override; private: ElementsPanel(const ElementsPanel &); @@ -66,7 +66,7 @@ void ensureHierarchyIsVisible(const QList &); protected: - void startDrag(Qt::DropActions); + void startDrag(Qt::DropActions) override; void startTitleBlockTemplateDrag(const TitleBlockTemplateLocation &); bool matchesFilter(const QTreeWidgetItem *, QString) const; @@ -75,8 +75,8 @@ 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: Index: sources/elementspanelwidget.h =================================================================== --- sources/elementspanelwidget.h (révision 4993) +++ sources/elementspanelwidget.h (copie de travail) @@ -30,8 +30,8 @@ // constructors, destructor public: - ElementsPanelWidget(QWidget * = 0); - virtual ~ElementsPanelWidget(); + ElementsPanelWidget(QWidget * = nullptr); + ~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_; Index: sources/elementtextsmover.h =================================================================== --- sources/elementtextsmover.h (révision 4993) +++ sources/elementtextsmover.h (copie de travail) @@ -38,7 +38,7 @@ public: bool isReady() const; - int beginMovement(Diagram *, QGraphicsItem * = 0); + int beginMovement(Diagram *, QGraphicsItem * = nullptr); void continueMovement(const QPointF &); void endMovement(); Index: sources/exportdialog.h =================================================================== --- sources/exportdialog.h (révision 4993) +++ sources/exportdialog.h (copie de travail) @@ -32,8 +32,8 @@ // constructors, destructor public: - ExportDialog(QETProject *, QWidget * = 0); - virtual ~ExportDialog(); + ExportDialog(QETProject *, QWidget * = nullptr); + ~ExportDialog() override; private: ExportDialog(const ExportDialog &); Index: sources/exportpropertieswidget.h =================================================================== --- sources/exportpropertieswidget.h (révision 4993) +++ sources/exportpropertieswidget.h (copie de travail) @@ -28,9 +28,9 @@ Q_OBJECT // constructors, destructor public: - ExportPropertiesWidget(QWidget * = 0); - ExportPropertiesWidget(const ExportProperties &, QWidget * = 0); - virtual ~ExportPropertiesWidget(); + ExportPropertiesWidget(QWidget * = nullptr); + ExportPropertiesWidget(const ExportProperties &, QWidget * = nullptr); + ~ExportPropertiesWidget() override; private: ExportPropertiesWidget(const ExportPropertiesWidget &); Index: sources/factory/elementfactory.h =================================================================== --- sources/factory/elementfactory.h (révision 4993) +++ sources/factory/elementfactory.h (copie de travail) @@ -52,7 +52,7 @@ if (factory_) { mutex.lock(); delete factory_; - factory_ = 0; + factory_ = nullptr; mutex.unlock(); } } @@ -69,7 +69,7 @@ ~ElementFactory() {} public: - Element *createElement (const ElementsLocation &, QGraphicsItem * = 0, int * = 0); + Element *createElement (const ElementsLocation &, QGraphicsItem * = nullptr, int * = nullptr); }; //ElementFactory ElementFactory::factory_ = 0; #endif // ELEMENTFACTORY_H Index: sources/genericpanel.cpp =================================================================== --- sources/genericpanel.cpp (révision 4993) +++ sources/genericpanel.cpp (copie de travail) @@ -55,7 +55,7 @@ if (item && item -> type() == QET::Project) { return(valueForItem(item)); } - return(0); + return(nullptr); } @@ -66,7 +66,7 @@ if (item && item -> type() == QET::Diagram) { return(valueForItem(item)); } - return(0); + return(nullptr); } /** @@ -104,7 +104,7 @@ */ QTreeWidgetItem *GenericPanel::addProject(QETProject *project, QTreeWidgetItem *parent_item, PanelOptions options) { - if (!project) return(0); + if (!project) return(nullptr); bool creation_required; QTreeWidgetItem *project_qtwi = getItemForProject(project, &creation_required); @@ -121,8 +121,8 @@ project does not appear within this panel. */ QTreeWidgetItem *GenericPanel::itemForProject(QETProject *project) { - if (!project) return(0); - return(projects_.value(project, 0)); + if (!project) return(nullptr); + return(projects_.value(project, nullptr)); } /** @@ -134,9 +134,9 @@ appear within this panel, it is created. */ QTreeWidgetItem *GenericPanel::getItemForProject(QETProject *project, bool *created) { - if (!project) return(0); + if (!project) return(nullptr); - QTreeWidgetItem *project_qtwi = projects_.value(project, 0); + QTreeWidgetItem *project_qtwi = projects_.value(project, nullptr); if (project_qtwi) { if (created) *created = false; return(project_qtwi); @@ -152,7 +152,7 @@ */ QTreeWidgetItem *GenericPanel::updateProjectItem(QTreeWidgetItem *project_qtwi, QETProject *project, PanelOptions options, bool freshly_created) { Q_UNUSED(options) - if (!project_qtwi || !project) return(0); + if (!project_qtwi || !project) return(nullptr); if (freshly_created) { project_qtwi -> setData(0, GenericPanel::Item, qVariantFromValue(project)); @@ -188,7 +188,7 @@ */ QTreeWidgetItem *GenericPanel::fillProjectItem(QTreeWidgetItem *project_qtwi, QETProject *project, PanelOptions options, bool freshly_created) { - if (!project_qtwi || !project) return(0); + if (!project_qtwi || !project) return(nullptr); if (options & AddChildDiagrams) { @@ -211,7 +211,7 @@ } int index = 0; foreach (Diagram *diagram, project -> diagrams()) { - QTreeWidgetItem *diagram_qtwi = addDiagram(diagram, 0, options); + QTreeWidgetItem *diagram_qtwi = addDiagram(diagram, nullptr, options); project_qtwi -> insertChild(index, diagram_qtwi); ++ index; } @@ -239,7 +239,7 @@ */ QTreeWidgetItem *GenericPanel::addDiagram(Diagram *diagram, QTreeWidgetItem *parent_item, PanelOptions options) { Q_UNUSED(options) - if (!diagram) return(0); + if (!diagram) return(nullptr); bool creation_required; @@ -255,9 +255,9 @@ */ QTreeWidgetItem *GenericPanel::getItemForDiagram(Diagram *diagram, bool *created) { - if (!diagram) return(0); + if (!diagram) return(nullptr); - QTreeWidgetItem *diagram_qtwi = diagrams_.value(diagram, 0); + QTreeWidgetItem *diagram_qtwi = diagrams_.value(diagram, nullptr); if (diagram_qtwi) { if (created) *created = false; return(diagram_qtwi); @@ -273,7 +273,7 @@ */ QTreeWidgetItem *GenericPanel::updateDiagramItem(QTreeWidgetItem *diagram_qtwi, Diagram *diagram, PanelOptions options, bool freshly_created) { Q_UNUSED(options) - if (!diagram || !diagram_qtwi) return(0); + if (!diagram || !diagram_qtwi) return(nullptr); QSettings settings; QString displayed_title = diagram -> title(); @@ -342,7 +342,7 @@ */ QTreeWidgetItem *GenericPanel::addTemplatesCollection(TitleBlockTemplatesCollection *tbt_collection, QTreeWidgetItem *parent_item, PanelOptions options) { - if (!tbt_collection) return(0); + if (!tbt_collection) return(nullptr); bool creation_required; QTreeWidgetItem *tbt_collection_qtwi = getItemForTemplatesCollection(tbt_collection, &creation_required); @@ -357,8 +357,8 @@ */ QTreeWidgetItem *GenericPanel::itemForTemplatesCollection(TitleBlockTemplatesCollection *tbt_collection) { - if (!tbt_collection) return(0); - return(tb_templates_.value(tbt_collection -> location(), 0)); + if (!tbt_collection) return(nullptr); + return(tb_templates_.value(tbt_collection -> location(), nullptr)); } /** @@ -365,8 +365,8 @@ */ QTreeWidgetItem *GenericPanel::getItemForTemplatesCollection(TitleBlockTemplatesCollection *tbt_collection, bool *created) { - if (!tbt_collection) return(0); - QTreeWidgetItem *tbt_collection_item = tb_templates_.value(tbt_collection -> location(), 0); + if (!tbt_collection) return(nullptr); + QTreeWidgetItem *tbt_collection_item = tb_templates_.value(tbt_collection -> location(), nullptr); if (tbt_collection_item) { if (created) *created = false; return(tbt_collection_item); @@ -421,7 +421,7 @@ int index = 0; foreach (QString template_name, tbt_collection -> templates()) { - QTreeWidgetItem *template_item = addTemplate(tbt_collection -> location(template_name), 0, options); + QTreeWidgetItem *template_item = addTemplate(tbt_collection -> location(template_name), nullptr, options); tbt_collection_qtwi -> insertChild(index ++, template_item); } } @@ -433,7 +433,7 @@ */ QTreeWidgetItem *GenericPanel::addTemplate(const TitleBlockTemplateLocation &tb_template, QTreeWidgetItem *parent_item, PanelOptions options) { - if (!tb_template.isValid()) return(0); + if (!tb_template.isValid()) return(nullptr); bool creation_required; QTreeWidgetItem *tb_template_qtwi = getItemForTemplate(tb_template, &creation_required); @@ -448,9 +448,9 @@ */ QTreeWidgetItem *GenericPanel::getItemForTemplate(const TitleBlockTemplateLocation &tb_template, bool *created) { - if (!tb_template.isValid()) return(0); + if (!tb_template.isValid()) return(nullptr); - QTreeWidgetItem *tb_template_qtwi = tb_templates_.value(tb_template, 0); + QTreeWidgetItem *tb_template_qtwi = tb_templates_.value(tb_template, nullptr); if (tb_template_qtwi) { if (created) *created = false; return(tb_template_qtwi); @@ -530,7 +530,7 @@ */ void GenericPanel::projectInformationsChanged(QETProject *project) { - addProject(project, 0, 0); + addProject(project, nullptr, nullptr); emit(panelContentChanged()); } @@ -539,7 +539,7 @@ */ void GenericPanel::diagramAdded(QETProject *project, Diagram *diagram) { Q_UNUSED(diagram) - addProject(project, 0, GenericPanel::AddChildDiagrams); + addProject(project, nullptr, GenericPanel::AddChildDiagrams); emit(panelContentChanged()); } @@ -548,7 +548,7 @@ */ void GenericPanel::diagramRemoved(QETProject *project, Diagram *diagram) { Q_UNUSED(diagram) - addProject(project, 0, GenericPanel::AddChildDiagrams); + addProject(project, nullptr, GenericPanel::AddChildDiagrams); emit(panelContentChanged()); } Index: sources/genericpanel.h =================================================================== --- sources/genericpanel.h (révision 4993) +++ sources/genericpanel.h (copie de travail) @@ -55,8 +55,8 @@ // Constructors, destructor public: - GenericPanel(QWidget * = 0); - virtual ~GenericPanel(); + GenericPanel(QWidget * = nullptr); + ~GenericPanel() override; public: // convenience methods to obtain what an item represents @@ -72,35 +72,35 @@ // project-related methods public: - virtual QTreeWidgetItem *addProject(QETProject *, QTreeWidgetItem * = 0, PanelOptions = AddAllChild); + virtual QTreeWidgetItem *addProject(QETProject *, QTreeWidgetItem * = nullptr, PanelOptions = AddAllChild); virtual QTreeWidgetItem *itemForProject(QETProject *); protected: - virtual QTreeWidgetItem *getItemForProject(QETProject *, bool * = 0); + virtual QTreeWidgetItem *getItemForProject(QETProject *, bool * = nullptr); virtual QTreeWidgetItem *updateProjectItem(QTreeWidgetItem *, QETProject *, PanelOptions = AddAllChild, bool = false); virtual QTreeWidgetItem *fillProjectItem (QTreeWidgetItem *, QETProject *, PanelOptions = AddAllChild, bool = false); // diagram-related methods public: - virtual QTreeWidgetItem *addDiagram(Diagram *, QTreeWidgetItem * = 0, PanelOptions = AddAllChild); + virtual QTreeWidgetItem *addDiagram(Diagram *, QTreeWidgetItem * = nullptr, PanelOptions = AddAllChild); protected: - virtual QTreeWidgetItem *getItemForDiagram(Diagram *, bool * = 0); + virtual QTreeWidgetItem *getItemForDiagram(Diagram *, bool * = nullptr); virtual QTreeWidgetItem *updateDiagramItem(QTreeWidgetItem *, Diagram *, PanelOptions = AddAllChild, bool = false); virtual QTreeWidgetItem *fillDiagramItem (QTreeWidgetItem *, Diagram *, PanelOptions = AddAllChild, bool = false); // title block templates collections methods public: - virtual QTreeWidgetItem *addTemplatesCollection(TitleBlockTemplatesCollection *, QTreeWidgetItem * = 0, PanelOptions = AddAllChild); + virtual QTreeWidgetItem *addTemplatesCollection(TitleBlockTemplatesCollection *, QTreeWidgetItem * = nullptr, PanelOptions = AddAllChild); virtual QTreeWidgetItem *itemForTemplatesCollection(TitleBlockTemplatesCollection *); protected: - virtual QTreeWidgetItem *getItemForTemplatesCollection(TitleBlockTemplatesCollection *, bool * = 0); + virtual QTreeWidgetItem *getItemForTemplatesCollection(TitleBlockTemplatesCollection *, bool * = nullptr); virtual QTreeWidgetItem *updateTemplatesCollectionItem(QTreeWidgetItem *, TitleBlockTemplatesCollection *, PanelOptions = AddAllChild, bool = false); virtual QTreeWidgetItem *fillTemplatesCollectionItem (QTreeWidgetItem *, TitleBlockTemplatesCollection *, PanelOptions = AddAllChild, bool = false); // title block templates methods public: - virtual QTreeWidgetItem *addTemplate(const TitleBlockTemplateLocation &, QTreeWidgetItem * = 0, PanelOptions = AddAllChild); + virtual QTreeWidgetItem *addTemplate(const TitleBlockTemplateLocation &, QTreeWidgetItem * = nullptr, PanelOptions = AddAllChild); protected: - virtual QTreeWidgetItem *getItemForTemplate(const TitleBlockTemplateLocation &, bool * = 0); + virtual QTreeWidgetItem *getItemForTemplate(const TitleBlockTemplateLocation &, bool * = nullptr); virtual QTreeWidgetItem *updateTemplateItem(QTreeWidgetItem *, const TitleBlockTemplateLocation &, PanelOptions = AddAllChild, bool = false); virtual QTreeWidgetItem *fillTemplateItem (QTreeWidgetItem *, const TitleBlockTemplateLocation &, PanelOptions = AddAllChild, bool = false); @@ -123,7 +123,7 @@ protected: virtual QString defaultText(QET::ItemType); virtual QIcon defaultIcon(QET::ItemType); - virtual QTreeWidgetItem *makeItem(QET::ItemType, QTreeWidgetItem * = 0, const QString & = QString(), const QIcon & = QIcon()); + virtual QTreeWidgetItem *makeItem(QET::ItemType, QTreeWidgetItem * = nullptr, const QString & = QString(), const QIcon & = QIcon()); virtual void deleteItem(QTreeWidgetItem *, bool = false); virtual void markItemAsUnused(QTreeWidgetItem *); virtual void reparent(QTreeWidgetItem *, QTreeWidgetItem *); @@ -132,7 +132,7 @@ template T valueForItem(QTreeWidgetItem *) const; void unregisterItem(QTreeWidgetItem *); - bool event(QEvent *); + bool event(QEvent *) override; signals: bool firstActivated(); Index: sources/nameslistwidget.h =================================================================== --- sources/nameslistwidget.h (révision 4993) +++ sources/nameslistwidget.h (copie de travail) @@ -28,8 +28,8 @@ // constructors, destructor public: - NamesListWidget(QWidget * = 0); - virtual ~NamesListWidget(); + NamesListWidget(QWidget * = nullptr); + ~NamesListWidget() override; private: NamesListWidget(const NamesListWidget &); Index: sources/newelementwizard.h =================================================================== --- sources/newelementwizard.h (révision 4993) +++ sources/newelementwizard.h (copie de travail) @@ -41,8 +41,8 @@ // constructors, destructor public: - NewElementWizard(QWidget * = 0, Qt::WindowFlags = 0); - virtual ~NewElementWizard(); + NewElementWizard(QWidget * = nullptr, Qt::WindowFlags = nullptr); + ~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 Index: sources/nomenclature.h =================================================================== --- sources/nomenclature.h (révision 4993) +++ sources/nomenclature.h (copie de travail) @@ -43,7 +43,7 @@ // constructors, destructor public: - nomenclature(QETProject *project, QWidget *parent =0); + nomenclature(QETProject *project, QWidget *parent =nullptr); virtual ~nomenclature(); // attributes Index: sources/projectconfigpages.h =================================================================== --- sources/projectconfigpages.h (révision 4993) +++ sources/projectconfigpages.h (copie de travail) @@ -40,8 +40,8 @@ Q_OBJECT // Constructor, destructor public: - ProjectConfigPage(QETProject *, QWidget * = 0); - virtual ~ProjectConfigPage(); + ProjectConfigPage(QETProject *, QWidget * = nullptr); + ~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 @@ -90,23 +90,23 @@ Q_OBJECT // Constructor, destructor public: - ProjectMainConfigPage(QETProject *, QWidget * = 0); - virtual ~ProjectMainConfigPage(); + ProjectMainConfigPage(QETProject *, QWidget * = nullptr); + ~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: @@ -122,17 +122,17 @@ //Methods public: - ProjectAutoNumConfigPage (QETProject *project, QWidget *parent = 0); + 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: Index: sources/projectview.cpp =================================================================== --- sources/projectview.cpp (révision 4993) +++ sources/projectview.cpp (copie de travail) @@ -41,7 +41,7 @@ */ ProjectView::ProjectView(QETProject *project, QWidget *parent) : QWidget(parent), - m_project(0) + m_project(nullptr) { initActions(); initWidgets(); @@ -123,7 +123,7 @@ */ void ProjectView::changeTabDown(){ DiagramView *nextDiagramView = this->nextDiagram(); - if (nextDiagramView!=NULL){ + if (nextDiagramView!=nullptr){ rebuildDiagramsMap(); m_tab -> setCurrentWidget(nextDiagramView); } @@ -138,7 +138,7 @@ if (next_tab_index= greatest tab the last tab is activated so no need to change tab. return(m_diagram_ids[next_tab_index]); else - return NULL; + return nullptr; } /** @@ -146,7 +146,7 @@ */ void ProjectView::changeTabUp(){ DiagramView *previousDiagramView = this->previousDiagram(); - if (previousDiagramView!=NULL){ + if (previousDiagramView!=nullptr){ rebuildDiagramsMap(); m_tab -> setCurrentWidget(previousDiagramView); } @@ -161,7 +161,7 @@ if (previous_tab_index>=0) //if previous tab index = 0 then the first tab is activated so no need to change tab. return(m_diagram_ids[previous_tab_index]); else - return NULL; + return nullptr; } /** @@ -965,7 +965,7 @@ return(diagram_view); } } - return(0); + return(nullptr); } /** Index: sources/projectview.h =================================================================== --- sources/projectview.h (révision 4993) +++ sources/projectview.h (copie de travail) @@ -41,8 +41,8 @@ // constructors, destructor public: - ProjectView(QETProject *, QWidget * = 0); - virtual ~ProjectView(); + ProjectView(QETProject *, QWidget * = nullptr); + ~ProjectView() override; private: ProjectView(const ProjectView &); @@ -52,7 +52,7 @@ void setProject(QETProject *); QList diagram_views() const; DiagramView *currentDiagram() const; - void closeEvent(QCloseEvent *); + void closeEvent(QCloseEvent *) override; void changeTabUp(); void changeTabDown(); void changeFirstTab(); Index: sources/properties/xrefproperties.h =================================================================== --- sources/properties/xrefproperties.h (révision 4993) +++ sources/properties/xrefproperties.h (copie de travail) @@ -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 defaultProperties(); Index: sources/qet.cpp =================================================================== --- sources/qet.cpp (révision 4993) +++ sources/qet.cpp (copie de travail) @@ -199,7 +199,7 @@ bool ok; int tmp = e.attribute(nom_attribut).toInt(&ok); if (!ok) return(false); - if (entier != NULL) *entier = tmp; + if (entier != nullptr) *entier = tmp; return(true); } @@ -218,7 +218,7 @@ bool ok; qreal tmp = e.attribute(nom_attribut).toDouble(&ok); if (!ok) return(false); - if (reel != NULL) *reel = tmp; + if (reel != nullptr) *reel = tmp; return(true); } Index: sources/qet.h =================================================================== --- sources/qet.h (révision 4993) +++ sources/qet.h (copie de travail) @@ -140,9 +140,9 @@ QetCollection qetCollectionFromString (const QString &str); bool lineContainsPoint(const QLineF &, const QPointF &); - bool orthogonalProjection(const QPointF &, const QLineF &, QPointF * = 0); - bool attributeIsAnInteger(const QDomElement &, QString , int * = NULL); - bool attributeIsAReal(const QDomElement &, QString , qreal * = NULL); + bool orthogonalProjection(const QPointF &, const QLineF &, QPointF * = nullptr); + bool attributeIsAnInteger(const QDomElement &, QString , int * = nullptr); + bool attributeIsAReal(const QDomElement &, QString , qreal * = nullptr); QString ElementsAndConductorsSentence(int, int, int = 0, int = 0, int = 0); QList findInDomElement(const QDomElement &, const QString &); QList findInDomElement(const QDomElement &, const QString &, const QString &); @@ -160,7 +160,7 @@ qreal correctAngle(const qreal &); bool compareCanonicalFilePaths(const QString &, const QString &); QString titleBlockColumnLengthToString(const TitleBlockColumnLength &); - bool writeXmlFile(QDomDocument &, const QString &, QString * = 0); + bool writeXmlFile(QDomDocument &, const QString &, QString * = nullptr); QPointF graphicsSceneEventPos(QEvent *); bool eachStrIsEqual (const QStringList &qsl); } Index: sources/qetapp.cpp =================================================================== --- sources/qetapp.cpp (révision 4993) +++ sources/qetapp.cpp (copie de travail) @@ -48,13 +48,13 @@ QString QETApp::lang_dir = QString(); TitleBlockTemplatesFilesCollection *QETApp::common_tbt_collection_; TitleBlockTemplatesFilesCollection *QETApp::custom_tbt_collection_; -ElementsCollectionCache *QETApp::collections_cache_ = 0; +ElementsCollectionCache *QETApp::collections_cache_ = nullptr; QMap QETApp::registered_projects_ = QMap(); uint QETApp::next_project_id = 0; -RecentFiles *QETApp::projects_recent_files_ = 0; -RecentFiles *QETApp::elements_recent_files_ = 0; -AboutQET *QETApp::about_dialog_ = 0; -TitleBlockTemplate *QETApp::default_titleblock_template_ = 0; +RecentFiles *QETApp::projects_recent_files_ = nullptr; +RecentFiles *QETApp::elements_recent_files_ = nullptr; +AboutQET *QETApp::about_dialog_ = nullptr; +TitleBlockTemplate *QETApp::default_titleblock_template_ = nullptr; /** Constructeur @@ -63,7 +63,7 @@ */ QETApp::QETApp(int &argc, char **argv) : QETSingleApplication(argc, argv, QString("qelectrotech-" + QETApp::userName())), - splash_screen_(0), + splash_screen_(nullptr), non_interactive_execution_(false) { parseArguments(); @@ -382,7 +382,7 @@ return(project -> embeddedTitleBlockTemplatesCollection()); } } - return(0); + return(nullptr); } /** @@ -601,7 +601,7 @@ n'est pas edite par l'application. */ QETDiagramEditor *QETApp::diagramEditorForFile(const QString &filepath) { - if (filepath.isEmpty()) return(0); + if (filepath.isEmpty()) return(nullptr); QETApp *qet_app(QETApp::instance()); foreach (QETDiagramEditor *diagram_editor, qet_app -> diagramEditors()) { @@ -610,7 +610,7 @@ } } - return(0); + return(nullptr); } /** @@ -1229,7 +1229,7 @@ // affiche le dialogue puis evite de le lier a un quelconque widget parent cd.exec(); - cd.setParent(0, cd.windowFlags()); + cd.setParent(nullptr, cd.windowFlags()); } /** @@ -1258,7 +1258,7 @@ // affiche le dialogue puis evite de le lier a un quelconque widget parent about_dialog_ -> exec(); - about_dialog_ -> setParent(0, about_dialog_ -> windowFlags()); + about_dialog_ -> setParent(nullptr, about_dialog_ -> windowFlags()); } /** @@ -1490,7 +1490,7 @@ */ QETProject *QETApp::projectFromString(const QString &url) { int project_id = projectIdFromString(url); - if (project_id == -1) return(0); + if (project_id == -1) return(nullptr); return(project(project_id)); } @@ -1674,7 +1674,7 @@ if (registered_projects_.contains(id)) { return(registered_projects_[id]); } else { - return(0); + return(nullptr); } } Index: sources/qetapp.h =================================================================== --- sources/qetapp.h (révision 4993) +++ sources/qetapp.h (copie de travail) @@ -55,7 +55,7 @@ // constructors, destructor public: QETApp(int &, char **); - virtual ~QETApp(); + ~QETApp() override; private: QETApp(const QETApp &); Index: sources/qetarguments.h =================================================================== --- sources/qetarguments.h (révision 4993) +++ sources/qetarguments.h (copie de travail) @@ -28,11 +28,11 @@ // constructors, destructor public: - QETArguments(QObject * = 0); - QETArguments(const QList &, QObject * = 0); + QETArguments(QObject * = nullptr); + QETArguments(const QList &, QObject * = nullptr); QETArguments(const QETArguments &); QETArguments &operator=(const QETArguments &); - virtual ~QETArguments(); + ~QETArguments() override; // methods public: Index: sources/qetdiagrameditor.cpp =================================================================== --- sources/qetdiagrameditor.cpp (révision 4993) +++ sources/qetdiagrameditor.cpp (copie de travail) @@ -980,7 +980,7 @@ // met a jour le panel d'elements if (update_panel) { pa -> elementsPanel().projectWasOpened(project); - if (currentDiagram() != NULL) + if (currentDiagram() != nullptr) m_autonumbering_dock->setProject(project, project_view); } @@ -1007,15 +1007,15 @@ */ ProjectView *QETDiagramEditor::currentProject() const { QMdiSubWindow *current_window = workspace.activeSubWindow(); - if (!current_window) return(0); + if (!current_window) return(nullptr); QWidget *current_widget = current_window -> widget(); - if (!current_widget) return(0); + if (!current_widget) return(nullptr); if (ProjectView *project_view = qobject_cast(current_widget)) { return(project_view); } - return(0); + return(nullptr); } /** @@ -1026,7 +1026,7 @@ if (ProjectView *project_view = currentProject()) { return(project_view -> currentDiagram()); } - return(0); + return(nullptr); } /** @@ -1037,10 +1037,10 @@ */ Element *QETDiagramEditor::currentElement() const { DiagramView *dv = currentDiagram(); - if (!dv) return(0); + if (!dv) return(nullptr); QList selected_elements = dv -> diagram() -> selectedContent().elements.toList(); - if (selected_elements.count() != 1) return(0); + if (selected_elements.count() != 1) return(nullptr); return(selected_elements.first()); } @@ -1067,7 +1067,7 @@ return(project_view); } } - return(0); + return(nullptr); } /** @@ -1083,7 +1083,7 @@ } } } - return(0); + return(nullptr); } /** @@ -1096,7 +1096,7 @@ return(opened_project); } } - return(0); + return(nullptr); } /** @@ -1112,7 +1112,7 @@ } } } - return(0); + return(nullptr); } /** @@ -1126,7 +1126,7 @@ return(sub_window); } } - return(0); + return(nullptr); } /** @@ -1354,7 +1354,7 @@ void QETDiagramEditor::slot_updateAutoNumDock() { if ( workspace.subWindowList().indexOf(workspace.activeSubWindow()) != activeSubWindowIndex) { activeSubWindowIndex = workspace.subWindowList().indexOf(workspace.activeSubWindow()); - if (currentProject() != NULL && currentDiagram() != NULL) { + if (currentProject() != nullptr && currentDiagram() != nullptr) { m_autonumbering_dock->setProject(currentProject()->project(),currentProject()); } } @@ -1567,12 +1567,12 @@ pas edite par cet editeur de schemas. */ ProjectView *QETDiagramEditor::viewForFile(const QString &filepath) const { - if (filepath.isEmpty()) return(0); + if (filepath.isEmpty()) return(nullptr); QString searched_can_file_path = QFileInfo(filepath).canonicalFilePath(); if (searched_can_file_path.isEmpty()) { // QFileInfo returns an empty path for non-existent files - return(0); + return(nullptr); } foreach (ProjectView *project_view, openedProjects()) { QString project_can_file_path = QFileInfo(project_view -> project() -> filePath()).canonicalFilePath(); @@ -1580,7 +1580,7 @@ return(project_view); } } - return(0); + return(nullptr); } /** @@ -1589,15 +1589,15 @@ */ ProjectView *QETDiagramEditor::acessCurrentProject (){ QMdiSubWindow *current_window = workspace.activeSubWindow(); - if (!current_window) return(0); + if (!current_window) return(nullptr); QWidget *current_widget = current_window -> widget(); - if (!current_widget) return(0); + if (!current_widget) return(nullptr); if (ProjectView *project_view = qobject_cast(current_widget)) { return(project_view); } - return(0); + return(nullptr); } /** @@ -1616,7 +1616,7 @@ if (ProjectView *project_view = currentProject()) { return(project_view -> currentDiagram()); } - return(0); + return(nullptr); } /** @@ -2174,7 +2174,7 @@ success = process->startDetached("qet_tb_generator"); #endif if ( !success ) { -QMessageBox::warning(0, +QMessageBox::warning(nullptr, "Error launching plugin", "To install the plugin qet_tb_generator\nVisit https://pypi.python.org/pypi/qet-tb-generator/\n" "\n" Index: sources/qetdiagrameditor.h =================================================================== --- sources/qetdiagrameditor.h (révision 4993) +++ sources/qetdiagrameditor.h (copie de travail) @@ -43,8 +43,8 @@ // constructors, destructor public: - QETDiagramEditor(const QStringList & = QStringList(), QWidget * = 0); - virtual ~QETDiagramEditor(); + QETDiagramEditor(const QStringList & = QStringList(), QWidget * = nullptr); + ~QETDiagramEditor() override; private: QETDiagramEditor(const QETDiagramEditor &); @@ -61,7 +61,7 @@ // methods public: - void closeEvent (QCloseEvent *); + void closeEvent (QCloseEvent *) override; QList openedProjects () const; void addProjectView (ProjectView *); bool openAndAddProject (const QString &, bool = true, bool = true); @@ -72,7 +72,7 @@ bool drawGrid() const; protected: - virtual bool event(QEvent *); + bool event(QEvent *) override; private: bool addProject(QETProject *, bool = true); Index: sources/qetgraphicsitem/commentitem.h =================================================================== --- sources/qetgraphicsitem/commentitem.h (révision 4993) +++ sources/qetgraphicsitem/commentitem.h (copie de travail) @@ -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: Index: sources/qetgraphicsitem/conductor.cpp =================================================================== --- sources/qetgraphicsitem/conductor.cpp (révision 4993) +++ sources/qetgraphicsitem/conductor.cpp (copie de travail) @@ -74,13 +74,13 @@ */ Conductor::Conductor(Terminal *p1, Terminal* p2) : QObject(), - QGraphicsPathItem(0), + QGraphicsPathItem(nullptr), terminal1(p1), terminal2(p2), m_mouse_over(false), m_handler(10), - m_text_item(0), - segments(NULL), + m_text_item(nullptr), + segments(nullptr), moving_segment(false), modified_path(false), has_to_save_profile(false), @@ -178,7 +178,7 @@ QPainterPath path; // s'il n'y a pa des segments, on arrete la - if (segments == NULL) setPath(path); + if (segments == nullptr) setPath(path); // demarre le chemin path.moveTo(segments -> firstPoint()); @@ -807,7 +807,7 @@ QList points_list; // on retourne la liste tout de suite s'il n'y a pas de segments - if (segments == NULL) return(points_list); + if (segments == nullptr) return(points_list); // recupere le premier point points_list << segments -> firstPoint(); @@ -835,7 +835,7 @@ deleteSegments(); // cree les segments a partir de la liste de points - ConductorSegment *last_segment = NULL; + ConductorSegment *last_segment = nullptr; for (int i = 0 ; i < points_list.size() - 1 ; ++ i) { last_segment = new ConductorSegment(points_list.at(i), points_list.at(i + 1), last_segment); if (!i) segments = last_segment; @@ -850,8 +850,8 @@ */ bool Conductor::fromXml(QDomElement &dom_element) { - setPos(dom_element.attribute("x", 0).toDouble(), - dom_element.attribute("y", 0).toDouble()); + setPos(dom_element.attribute("x", nullptr).toDouble(), + dom_element.attribute("y", nullptr).toDouble()); bool return_ = pathFromXml(dom_element); @@ -1017,7 +1017,7 @@ /// @return les segments de ce conducteur const QList Conductor::segmentsList() const { - if (segments == NULL) return(QList()); + if (segments == nullptr) return(QList()); QList segments_vector; ConductorSegment *segment = segments; @@ -1042,7 +1042,7 @@ @return Le segment qui contient le point au milieu du conducteur */ ConductorSegment *Conductor::middleSegment() { - if (segments == NULL) return(NULL); + if (segments == nullptr) return(nullptr); qreal half_length = length() / 2.0; @@ -1426,7 +1426,7 @@ */ QSet Conductor::relatedPotentialConductors(const bool all_diagram, QList *t_list) { bool declar_t_list = false; - if (t_list == 0) { + if (t_list == nullptr) { declar_t_list = true; t_list = new QList ; } @@ -1696,10 +1696,10 @@ /// Supprime les segments void Conductor::deleteSegments() { - if (segments != NULL) { + if (segments != nullptr) { while (segments -> hasNextSegment()) delete segments -> nextSegment(); delete segments; - segments = NULL; + segments = nullptr; } } Index: sources/qetgraphicsitem/conductor.h =================================================================== --- sources/qetgraphicsitem/conductor.h (révision 4993) +++ sources/qetgraphicsitem/conductor.h (copie de travail) @@ -52,7 +52,7 @@ public: Conductor(Terminal *, Terminal *); - virtual ~Conductor(); + ~Conductor() override; bool isValid() const; @@ -71,7 +71,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()); @@ -81,9 +81,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(); @@ -112,7 +112,7 @@ void calculateTextItemPosition(); virtual Highlight highlight() const; virtual void setHighlighted(Highlight); - QSet relatedPotentialConductors(const bool all_diagram = true, QList *t_list=0); + QSet relatedPotentialConductors(const bool all_diagram = true, QList *t_list=nullptr); QETDiagramEditor* diagramEditor() const; void editProperty (); @@ -131,14 +131,14 @@ void displayedTextChanged(); protected: - virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event); - virtual void mousePressEvent(QGraphicsSceneMouseEvent *event); - virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event); - virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); - virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event); - virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event); - virtual void hoverMoveEvent(QGraphicsSceneHoverEvent *event); - virtual QVariant itemChange(GraphicsItemChange, const QVariant &); + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override; + void mousePressEvent(QGraphicsSceneMouseEvent *event) override; + void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; + void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; + void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; + void hoverMoveEvent(QGraphicsSceneHoverEvent *event) override; + QVariant itemChange(GraphicsItemChange, const QVariant &) override; private: bool m_mouse_over; Index: sources/qetgraphicsitem/conductortextitem.h =================================================================== --- sources/qetgraphicsitem/conductortextitem.h (révision 4993) +++ sources/qetgraphicsitem/conductortextitem.h (copie de travail) @@ -31,9 +31,9 @@ // constructors, destructor public: - ConductorTextItem(Conductor * = 0); - ConductorTextItem(const QString &, Conductor * = 0); - virtual ~ConductorTextItem(); + ConductorTextItem(Conductor * = nullptr); + ConductorTextItem(const QString &, Conductor * = nullptr); + ~ConductorTextItem() override; private: ConductorTextItem(const ConductorTextItem &); @@ -41,12 +41,12 @@ public: enum { Type = UserType + 1006 }; Conductor *parentConductor() const; - virtual void fromXml(const QDomElement &); + void fromXml(const QDomElement &) override; virtual void toXml (QDomElement &xml) const; // methods public: - virtual int type() const { return Type; } + int type() const override { return Type; } virtual bool wasMovedByUser() const; virtual bool wasRotateByUser() const; virtual void forceMovedByUser(bool); @@ -53,14 +53,14 @@ virtual void forceRotateByUser(bool); protected: - 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; protected: - virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *); - virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *); - virtual void hoverMoveEvent(QGraphicsSceneHoverEvent *); + void hoverEnterEvent(QGraphicsSceneHoverEvent *) override; + void hoverLeaveEvent(QGraphicsSceneHoverEvent *) override; + void hoverMoveEvent(QGraphicsSceneHoverEvent *) override; // attributes private: Index: sources/qetgraphicsitem/crossrefitem.h =================================================================== --- sources/qetgraphicsitem/crossrefitem.h (révision 4993) +++ sources/qetgraphicsitem/crossrefitem.h (copie de travail) @@ -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 (); Index: sources/qetgraphicsitem/customelement.cpp =================================================================== --- sources/qetgraphicsitem/customelement.cpp (révision 4993) +++ sources/qetgraphicsitem/customelement.cpp (copie de travail) @@ -692,7 +692,7 @@ !QET::attributeIsAReal(e, "x", &pos_x) ||\ !QET::attributeIsAReal(e, "y", &pos_y) ||\ !QET::attributeIsAnInteger(e, "size", &size) - ) return(0); + ) return(nullptr); ElementTextItem *eti = new ElementTextItem(e.attribute("text"), this); eti -> setFont(QETApp::diagramTextsFont(size)); @@ -733,14 +733,14 @@ // verifie la presence et la validite des attributs obligatoires qreal terminalx, terminaly; Qet::Orientation terminalo; - if (!QET::attributeIsAReal(e, QString("x"), &terminalx)) return(0); - if (!QET::attributeIsAReal(e, QString("y"), &terminaly)) return(0); - if (!e.hasAttribute("orientation")) return(0); + if (!QET::attributeIsAReal(e, QString("x"), &terminalx)) return(nullptr); + if (!QET::attributeIsAReal(e, QString("y"), &terminaly)) return(nullptr); + if (!e.hasAttribute("orientation")) return(nullptr); if (e.attribute("orientation") == "n") terminalo = Qet::North; else if (e.attribute("orientation") == "s") terminalo = Qet::South; else if (e.attribute("orientation") == "e") terminalo = Qet::East; else if (e.attribute("orientation") == "w") terminalo = Qet::West; - else return(0); + else return(nullptr); Terminal *new_terminal = new Terminal(terminalx, terminaly, terminalo, this); new_terminal -> setZValue(420); // valeur arbitraire pour maintenir les bornes au-dessus des champs de texte list_terminals << new_terminal; @@ -991,5 +991,5 @@ foreach (ElementTextItem *eti, list_texts_) { if (eti -> tagg() == tagg) return eti; } - return NULL; + return nullptr; } Index: sources/qetgraphicsitem/customelement.h =================================================================== --- sources/qetgraphicsitem/customelement.h (révision 4993) +++ sources/qetgraphicsitem/customelement.h (copie de travail) @@ -36,9 +36,9 @@ // constructors, destructor public: - CustomElement (const ElementsLocation &, QGraphicsItem * = 0, int * = 0); + CustomElement (const ElementsLocation &, QGraphicsItem * = nullptr, int * = nullptr); - virtual ~CustomElement(); + ~CustomElement() override; private: CustomElement(const CustomElement &); @@ -62,23 +62,23 @@ // methods public: - virtual QList terminals() const; - virtual QList conductors() const; - virtual QList texts() const; - virtual QList lines() const; - virtual QList rectangles() const; - virtual QList circles() const; - virtual QList *> polygons() const; - virtual QList *> arcs() const; - virtual int terminalsCount() const; - virtual void paint(QPainter *, const QStyleOptionGraphicsItem *); - QString typeId() const; + QList terminals() const override; + QList conductors() const override; + QList texts() const override; + QList lines() const override; + QList rectangles() const override; + QList circles() const override; + QList *> polygons() const override; + QList *> arcs() const override; + int terminalsCount() const override; + void paint(QPainter *, const QStyleOptionGraphicsItem *) override; + QString typeId() const override; ElementsLocation location() const; - QString name() const; - ElementTextItem* taggedText(const QString &tagg) const; + QString name() const override; + ElementTextItem* taggedText(const QString &tagg) const override; protected: - virtual bool buildFromXml(const QDomElement &, int * = 0); + virtual bool buildFromXml(const QDomElement &, int * = nullptr); virtual bool parseElement(QDomElement &, QPainter &); virtual bool parseLine(QDomElement &, QPainter &); virtual bool parseRect(QDomElement &, QPainter &); Index: sources/qetgraphicsitem/diagramimageitem.h =================================================================== --- sources/qetgraphicsitem/diagramimageitem.h (révision 4993) +++ sources/qetgraphicsitem/diagramimageitem.h (copie de travail) @@ -33,9 +33,9 @@ // constructors, destructor public: - DiagramImageItem(QetGraphicsItem * = 0); - DiagramImageItem(const QPixmap &pixmap, QetGraphicsItem * = 0); - virtual ~DiagramImageItem(); + DiagramImageItem(QetGraphicsItem * = nullptr); + DiagramImageItem(const QPixmap &pixmap, QetGraphicsItem * = nullptr); + ~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_; Index: sources/qetgraphicsitem/diagramtextitem.h =================================================================== --- sources/qetgraphicsitem/diagramtextitem.h (révision 4993) +++ sources/qetgraphicsitem/diagramtextitem.h (copie de travail) @@ -34,8 +34,8 @@ Q_OBJECT public: - DiagramTextItem(QGraphicsItem * = 0); - DiagramTextItem(const QString &, QGraphicsItem * = 0); + DiagramTextItem(QGraphicsItem * = nullptr); + DiagramTextItem(const QString &, QGraphicsItem * = nullptr); private: void build(); @@ -42,7 +42,7 @@ public: enum { Type = UserType + 1004 }; - virtual int type() const { return Type; } + int type() const override { return Type; } Diagram *diagram() const; virtual void fromXml(const QDomElement &) = 0; @@ -61,18 +61,18 @@ void setNoEditable(bool e = true) {no_editable = e;} protected: - virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *); - virtual void focusInEvent(QFocusEvent *); - virtual void focusOutEvent(QFocusEvent *); + void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) override; + void focusInEvent(QFocusEvent *) override; + void focusOutEvent(QFocusEvent *) override; - virtual void mouseDoubleClickEvent (QGraphicsSceneMouseEvent *event); - virtual void mousePressEvent (QGraphicsSceneMouseEvent *event); - virtual void mouseMoveEvent (QGraphicsSceneMouseEvent *event); - virtual void mouseReleaseEvent (QGraphicsSceneMouseEvent *event); + void mouseDoubleClickEvent (QGraphicsSceneMouseEvent *event) override; + void mousePressEvent (QGraphicsSceneMouseEvent *event) override; + void mouseMoveEvent (QGraphicsSceneMouseEvent *event) override; + void mouseReleaseEvent (QGraphicsSceneMouseEvent *event) override; - virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *); - virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *); - virtual void hoverMoveEvent(QGraphicsSceneHoverEvent *); + void hoverEnterEvent(QGraphicsSceneHoverEvent *) override; + void hoverLeaveEvent(QGraphicsSceneHoverEvent *) override; + void hoverMoveEvent(QGraphicsSceneHoverEvent *) override; virtual void applyRotation(const qreal &); Index: sources/qetgraphicsitem/element.cpp =================================================================== --- sources/qetgraphicsitem/element.cpp (révision 4993) +++ sources/qetgraphicsitem/element.cpp (copie de travail) @@ -334,7 +334,7 @@ // Translation de l'origine du repere de la pixmap p.translate(hotspot_coord); // L'element se dessine sur la pixmap - paint(&p, 0); + paint(&p, nullptr); } /** Index: sources/qetgraphicsitem/element.h =================================================================== --- sources/qetgraphicsitem/element.h (révision 4993) +++ sources/qetgraphicsitem/element.h (copie de travail) @@ -40,8 +40,8 @@ // constructors, destructor public: - Element(QGraphicsItem * = 0); - virtual ~Element(); + Element(QGraphicsItem * = nullptr); + ~Element() override; private: Element(const Element &); @@ -52,7 +52,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 @@ -166,13 +166,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(); @@ -185,8 +185,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 &); @@ -208,10 +208,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; Index: sources/qetgraphicsitem/elementtextitem.h =================================================================== --- sources/qetgraphicsitem/elementtextitem.h (révision 4993) +++ sources/qetgraphicsitem/elementtextitem.h (copie de travail) @@ -31,14 +31,14 @@ Q_OBJECT // constructors, destructor public: - ElementTextItem(Element * = 0); - ElementTextItem(const QString &, Element * = 0); - virtual ~ElementTextItem(); + ElementTextItem(Element * = nullptr); + ElementTextItem(const QString &, Element * = nullptr); + ~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 (); Index: sources/qetgraphicsitem/fixedelement.h =================================================================== --- sources/qetgraphicsitem/fixedelement.h (révision 4993) +++ sources/qetgraphicsitem/fixedelement.h (copie de travail) @@ -29,16 +29,16 @@ // constructors, destructor public: - FixedElement(QGraphicsItem * = 0); - virtual ~FixedElement(); + FixedElement(QGraphicsItem * = nullptr); + ~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 Index: sources/qetgraphicsitem/ghostelement.h =================================================================== --- sources/qetgraphicsitem/ghostelement.h (révision 4993) +++ sources/qetgraphicsitem/ghostelement.h (copie de travail) @@ -36,13 +36,13 @@ // constructor, destructor public: - GhostElement(const ElementsLocation &, QGraphicsItem * = 0); - virtual ~GhostElement(); + GhostElement(const ElementsLocation &, QGraphicsItem * = nullptr); + ~GhostElement() override; // methods public: - virtual bool fromXml(QDomElement &, QHash &, bool = false); - virtual kind linkType() const {return Simple;} + bool fromXml(QDomElement &, QHash &, bool = false) override; + kind linkType() const override {return Simple;} protected: QRectF minimalBoundingRect() const; Index: sources/qetgraphicsitem/independenttextitem.cpp =================================================================== --- sources/qetgraphicsitem/independenttextitem.cpp (révision 4993) +++ sources/qetgraphicsitem/independenttextitem.cpp (copie de travail) @@ -23,7 +23,7 @@ @param parent_diagram Le schema auquel est rattache le champ de texte */ IndependentTextItem::IndependentTextItem() : - DiagramTextItem(0) + DiagramTextItem(nullptr) {} /** @@ -32,7 +32,7 @@ @param parent_diagram Le schema auquel est rattache le champ de texte */ IndependentTextItem::IndependentTextItem(const QString &text) : - DiagramTextItem(text, 0) + DiagramTextItem(text, nullptr) {} /// Destructeur Index: sources/qetgraphicsitem/independenttextitem.h =================================================================== --- sources/qetgraphicsitem/independenttextitem.h (révision 4993) +++ sources/qetgraphicsitem/independenttextitem.h (copie de travail) @@ -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_; Index: sources/qetgraphicsitem/masterelement.h =================================================================== --- sources/qetgraphicsitem/masterelement.h (révision 4993) +++ sources/qetgraphicsitem/masterelement.h (copie de travail) @@ -33,13 +33,13 @@ Q_OBJECT public: - explicit MasterElement(const ElementsLocation &, QGraphicsItem * = 0, int * = 0); - ~MasterElement(); + explicit MasterElement(const ElementsLocation &, QGraphicsItem * = nullptr, int * = nullptr); + ~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); Index: sources/qetgraphicsitem/qetgraphicsitem.h =================================================================== --- sources/qetgraphicsitem/qetgraphicsitem.h (révision 4993) +++ sources/qetgraphicsitem/qetgraphicsitem.h (copie de travail) @@ -28,8 +28,8 @@ public: //constructor destructor - QetGraphicsItem(QGraphicsItem *parent = 0); - virtual ~QetGraphicsItem() = 0; + QetGraphicsItem(QGraphicsItem *parent = nullptr); + ~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_; Index: sources/qetgraphicsitem/qetshapeitem.cpp =================================================================== --- sources/qetgraphicsitem/qetshapeitem.cpp (révision 4993) +++ sources/qetgraphicsitem/qetshapeitem.cpp (copie de travail) @@ -556,14 +556,14 @@ if (m_shapeType != Polygon) { - m_P1.setX(e.attribute("x1", 0).toDouble()); - m_P1.setY(e.attribute("y1", 0).toDouble()); - m_P2.setX(e.attribute("x2", 0).toDouble()); - m_P2.setY(e.attribute("y2", 0).toDouble()); + m_P1.setX(e.attribute("x1", nullptr).toDouble()); + m_P1.setY(e.attribute("y1", nullptr).toDouble()); + m_P2.setX(e.attribute("x2", nullptr).toDouble()); + m_P2.setY(e.attribute("y2", nullptr).toDouble()); } else foreach(QDomElement de, QET::findInDomElement(e, "points", "point")) - m_polygon << QPointF(de.attribute("x", 0).toDouble(), de.attribute("y", 0).toDouble()); + m_polygon << QPointF(de.attribute("x", nullptr).toDouble(), de.attribute("y", nullptr).toDouble()); return (true); } Index: sources/qetgraphicsitem/qetshapeitem.h =================================================================== --- sources/qetgraphicsitem/qetshapeitem.h (révision 4993) +++ sources/qetgraphicsitem/qetshapeitem.h (copie de travail) @@ -55,11 +55,11 @@ enum { Type = UserType + 1008 }; - QetShapeItem(QPointF, QPointF = QPointF(0,0), ShapeType = Line, QGraphicsItem *parent = 0); - virtual ~QetShapeItem(); + QetShapeItem(QPointF, QPointF = QPointF(0,0), ShapeType = Line, QGraphicsItem *parent = nullptr); + ~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;} @@ -72,8 +72,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);} @@ -90,17 +90,17 @@ 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 hoverMoveEvent (QGraphicsSceneHoverEvent *event); - virtual void hoverLeaveEvent (QGraphicsSceneHoverEvent *event); - virtual void mousePressEvent (QGraphicsSceneMouseEvent *event); - virtual void mouseMoveEvent (QGraphicsSceneMouseEvent *event); - virtual void mouseReleaseEvent (QGraphicsSceneMouseEvent *event); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; + void hoverEnterEvent (QGraphicsSceneHoverEvent *event) override; + void hoverMoveEvent (QGraphicsSceneHoverEvent *event) override; + void hoverLeaveEvent (QGraphicsSceneHoverEvent *event) override; + void mousePressEvent (QGraphicsSceneMouseEvent *event) override; + void mouseMoveEvent (QGraphicsSceneMouseEvent *event) override; + void mouseReleaseEvent (QGraphicsSceneMouseEvent *event) override; private: void switchResizeMode(); Index: sources/qetgraphicsitem/reportelement.cpp =================================================================== --- sources/qetgraphicsitem/reportelement.cpp (révision 4993) +++ sources/qetgraphicsitem/reportelement.cpp (copie de travail) @@ -59,7 +59,7 @@ { unlinkAllElements(); if (terminals().size()) - disconnect(terminals().first(), 0, 0, 0); + disconnect(terminals().first(), nullptr, nullptr, nullptr); if (m_watched_conductor) disconnect(m_watched_conductor, &Conductor::propertiesChange, this, &ReportElement::updateLabel); } Index: sources/qetgraphicsitem/reportelement.h =================================================================== --- sources/qetgraphicsitem/reportelement.h (révision 4993) +++ sources/qetgraphicsitem/reportelement.h (copie de travail) @@ -32,11 +32,11 @@ Q_OBJECT public : - explicit ReportElement(const ElementsLocation &,QString link_type, QGraphicsItem * = 0, int * = 0); - ~ReportElement(); - virtual void linkToElement(Element *); - virtual void unlinkAllElements(); - virtual void unlinkElement(Element *elmt); + explicit ReportElement(const ElementsLocation &,QString link_type, QGraphicsItem * = nullptr, int * = nullptr); + ~ReportElement() override; + void linkToElement(Element *) override; + void unlinkAllElements() override; + void unlinkElement(Element *elmt) override; private: void conductorWasAdded(Conductor *conductor); Index: sources/qetgraphicsitem/simpleelement.h =================================================================== --- sources/qetgraphicsitem/simpleelement.h (révision 4993) +++ sources/qetgraphicsitem/simpleelement.h (copie de travail) @@ -32,10 +32,10 @@ Q_OBJECT public : - explicit SimpleElement(const ElementsLocation &, QGraphicsItem * = 0, int * = 0); - ~SimpleElement(); + explicit SimpleElement(const ElementsLocation &, QGraphicsItem * = nullptr, int * = nullptr); + ~SimpleElement() override; - virtual void initLink(QETProject *project); + void initLink(QETProject *project) override; public slots: void updateLabel(DiagramContext old_info, DiagramContext new_info); Index: sources/qetgraphicsitem/slaveelement.cpp =================================================================== --- sources/qetgraphicsitem/slaveelement.cpp (révision 4993) +++ sources/qetgraphicsitem/slaveelement.cpp (copie de travail) @@ -110,7 +110,7 @@ disconnect(elmt -> diagram(), SIGNAL(XRefPropertiesChanged()), this, SLOT(updateLabel())); disconnect(elmt, SIGNAL(updateLabel()), this, SLOT(updateLabel())); - delete m_xref_item; m_xref_item = NULL; + delete m_xref_item; m_xref_item = nullptr; if (ElementTextItem *eti = this->taggedText("label")) eti->setPlainText("_"); Index: sources/qetgraphicsitem/slaveelement.h =================================================================== --- sources/qetgraphicsitem/slaveelement.h (révision 4993) +++ sources/qetgraphicsitem/slaveelement.h (copie de travail) @@ -25,11 +25,11 @@ { Q_OBJECT public: - explicit SlaveElement (const ElementsLocation &, QGraphicsItem * = 0, int * = 0); - ~SlaveElement(); - virtual void linkToElement(Element *elmt); - virtual void unlinkAllElements(); - virtual void unlinkElement(Element *elmt); + explicit SlaveElement (const ElementsLocation &, QGraphicsItem * = nullptr, int * = nullptr); + ~SlaveElement() override; + void linkToElement(Element *elmt) override; + void unlinkAllElements() override; + void unlinkElement(Element *elmt) override; signals: Index: sources/qetgraphicsitem/terminal.cpp =================================================================== --- sources/qetgraphicsitem/terminal.cpp (révision 4993) +++ sources/qetgraphicsitem/terminal.cpp (copie de travail) @@ -62,7 +62,7 @@ // QRectF null br_ = new QRectF(); - previous_terminal_ = 0; + previous_terminal_ = nullptr; // divers setAcceptHoverEvents(true); setAcceptedMouseButtons(Qt::LeftButton); @@ -559,7 +559,7 @@ */ void Terminal::mouseReleaseEvent(QGraphicsSceneMouseEvent *e) { - previous_terminal_ = 0; + previous_terminal_ = nullptr; hovered_color_ = neutralColor; if (!diagram()) return; Index: sources/qetgraphicsitem/terminal.h =================================================================== --- sources/qetgraphicsitem/terminal.h (révision 4993) +++ sources/qetgraphicsitem/terminal.h (copie de travail) @@ -37,10 +37,10 @@ // constructors, destructor public: - Terminal(QPointF, Qet::Orientation, Element * = 0); - Terminal(qreal, qreal, Qet::Orientation, Element * = 0); - Terminal(QPointF, Qet::Orientation, QString number, QString name, bool hiddenName, Element * = 0); - virtual ~Terminal(); + 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); + ~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: Index: sources/qetgraphicsitem/terminalelement.h =================================================================== --- sources/qetgraphicsitem/terminalelement.h (révision 4993) +++ sources/qetgraphicsitem/terminalelement.h (copie de travail) @@ -27,9 +27,9 @@ { Q_OBJECT public: - TerminalElement(const ElementsLocation &, QGraphicsItem * = 0, int * = 0); - ~TerminalElement(); - virtual void initLink(QETProject *project); + TerminalElement(const ElementsLocation &, QGraphicsItem * = nullptr, int * = nullptr); + ~TerminalElement() override; + void initLink(QETProject *project) override; public slots: void updateLabel(DiagramContext old_info, DiagramContext new_info); Index: sources/qetmainwindow.cpp =================================================================== --- sources/qetmainwindow.cpp (révision 4993) +++ sources/qetmainwindow.cpp (copie de travail) @@ -33,7 +33,7 @@ */ QETMainWindow::QETMainWindow(QWidget *widget, Qt::WindowFlags flags) : QMainWindow(widget, flags), - display_toolbars_(0), + display_toolbars_(nullptr), first_activation_(true) { initCommonActions(); @@ -161,8 +161,8 @@ upgrade_M -> setVisible(false); #endif - insertMenu(0, settings_menu_); - insertMenu(0, help_menu_); + insertMenu(nullptr, settings_menu_); + insertMenu(nullptr, help_menu_); } /** @@ -185,7 +185,7 @@ @return the action returned when inserting \a menu */ QAction *QETMainWindow::actionForMenu(QMenu *menu) { - return(menu_actions_.value(menu, 0)); + return(menu_actions_.value(menu, nullptr)); } /** Index: sources/qetmainwindow.h =================================================================== --- sources/qetmainwindow.h (révision 4993) +++ sources/qetmainwindow.h (copie de travail) @@ -28,8 +28,8 @@ // constructor, destructor public: - QETMainWindow(QWidget * = 0, Qt::WindowFlags = 0); - virtual ~QETMainWindow(); + QETMainWindow(QWidget * = nullptr, Qt::WindowFlags = nullptr); + ~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 Index: sources/qetprintpreviewdialog.h =================================================================== --- sources/qetprintpreviewdialog.h (révision 4993) +++ sources/qetprintpreviewdialog.h (copie de travail) @@ -36,8 +36,8 @@ // constructors, destructor public: - QETPrintPreviewDialog(QETProject *, QPrinter *, QWidget * = 0, Qt::WindowFlags = 0); - virtual ~QETPrintPreviewDialog(); + QETPrintPreviewDialog(QETProject *, QPrinter *, QWidget * = nullptr, Qt::WindowFlags = nullptr); + ~QETPrintPreviewDialog() override; private: QETPrintPreviewDialog(const QETPrintPreviewDialog &); Index: sources/qetproject.cpp =================================================================== --- sources/qetproject.cpp (révision 4993) +++ sources/qetproject.cpp (copie de travail) @@ -1044,7 +1044,7 @@ */ Diagram *QETProject::addNewDiagram() { // ne fait rien si le projet est en lecture seule - if (isReadOnly()) return(0); + if (isReadOnly()) return(nullptr); // cree un nouveau schema Diagram *diagram = new Diagram(this); @@ -1189,7 +1189,7 @@ if (conv_ok && QET::version.toDouble() < project_qet_version_) { int ret = QET::QetMessageBox::warning( - 0, + nullptr, tr("Avertissement", "message box title"), tr( "Ce document semble avoir été enregistré avec " @@ -1636,7 +1636,7 @@ m_diagrams_list[i]->project()->addFolioAutoNum(autopagenum,nCC.next()); } else{ - m_diagrams_list[i] -> border_and_titleblock.setFolioData(i + 1, total_folio, NULL, project_wide_properties); + m_diagrams_list[i] -> border_and_titleblock.setFolioData(i + 1, total_folio, nullptr, project_wide_properties); } m_diagrams_list[i] -> update(); } Index: sources/qetproject.h =================================================================== --- sources/qetproject.h (révision 4993) +++ sources/qetproject.h (copie de travail) @@ -49,9 +49,9 @@ // constructors, destructor public: - QETProject (int = 1, QObject * = 0); - QETProject (const QString &, QObject * = 0); - virtual ~QETProject(); + QETProject (int = 1, QObject * = nullptr); + QETProject (const QString &, QObject * = nullptr); + ~QETProject() override; private: QETProject(const QETProject &); Index: sources/qetregexpvalidator.h =================================================================== --- sources/qetregexpvalidator.h (révision 4993) +++ sources/qetregexpvalidator.h (copie de travail) @@ -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; Index: sources/qetsingleapplication.h =================================================================== --- sources/qetsingleapplication.h (révision 4993) +++ sources/qetsingleapplication.h (copie de travail) @@ -29,7 +29,7 @@ // constructors, destructor public: QETSingleApplication(int &, char **, const QString); - virtual ~QETSingleApplication(); + ~QETSingleApplication() override; private: QETSingleApplication(const QETSingleApplication &); Index: sources/qfilenameedit.h =================================================================== --- sources/qfilenameedit.h (révision 4993) +++ sources/qfilenameedit.h (copie de travail) @@ -34,9 +34,9 @@ // constructors, destructor public: - QFileNameEdit(QWidget * = 0); - QFileNameEdit(const QString &, QWidget * = 0); - virtual ~QFileNameEdit(); + QFileNameEdit(QWidget * = nullptr); + QFileNameEdit(const QString &, QWidget * = nullptr); + ~QFileNameEdit() override; private: QFileNameEdit(const QFileNameEdit &); Index: sources/qtextorientationspinboxwidget.h =================================================================== --- sources/qtextorientationspinboxwidget.h (révision 4993) +++ sources/qtextorientationspinboxwidget.h (copie de travail) @@ -29,8 +29,8 @@ // constructors, destructor public: - QTextOrientationSpinBoxWidget(QWidget * = 0); - virtual ~QTextOrientationSpinBoxWidget(); + QTextOrientationSpinBoxWidget(QWidget * = nullptr); + ~QTextOrientationSpinBoxWidget() override; private: QTextOrientationSpinBoxWidget(const QTextOrientationSpinBoxWidget &); Index: sources/qtextorientationwidget.h =================================================================== --- sources/qtextorientationwidget.h (révision 4993) +++ sources/qtextorientationwidget.h (copie de travail) @@ -26,8 +26,8 @@ // constructors, destructor public: - QTextOrientationWidget(QWidget * = 0); - virtual ~QTextOrientationWidget(); + QTextOrientationWidget(QWidget * = nullptr); + ~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: /** @@ -82,6 +82,6 @@ private: QString getMostUsableStringForRadius(const qreal &); void generateTextSizeHash(); - bool positionIsASquare(const QPointF &, double * = 0); + bool positionIsASquare(const QPointF &, double * = nullptr); }; #endif Index: sources/recentfiles.cpp =================================================================== --- sources/recentfiles.cpp (révision 4993) +++ sources/recentfiles.cpp (copie de travail) @@ -30,7 +30,7 @@ QObject(parent), identifier_(identifier.isEmpty() ? "unnamed" : identifier), size_(size > 0 ? size : 10), - menu_(0) + menu_(nullptr) { mapper_ = new QSignalMapper(this); connect(mapper_, SIGNAL(mapped(const QString &)), this, SLOT(handleMenuRequest(const QString &))); Index: sources/recentfiles.h =================================================================== --- sources/recentfiles.h (révision 4993) +++ sources/recentfiles.h (copie de travail) @@ -28,8 +28,8 @@ // constructors, destructor public: - RecentFiles(const QString &, int = 10, QObject * = 0); - virtual ~RecentFiles(); + RecentFiles(const QString &, int = 10, QObject * = nullptr); + ~RecentFiles() override; private: RecentFiles(const RecentFiles &); Index: sources/richtext/richtexteditor.cpp =================================================================== --- sources/richtext/richtexteditor.cpp (révision 4993) +++ sources/richtext/richtexteditor.cpp (copie de travail) @@ -134,7 +134,7 @@ // Richtext simplification filter: Remove hard-coded font settings, //