kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-19 14:50:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Modernize-use-override refactors code

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5009 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
scorpio810
2017-08-05 02:10:01 +00:00
parent 9f9b127c04
commit 31f36b8625
161 changed files with 857 additions and 857 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sources/ElementsCollection/elementcollectionhandler.h
View File

@@ -45,7 +45,7 @@ class ECHSFileToFile : public ECHStrategy
{ {
public: public:
ECHSFileToFile (ElementsLocation &source, ElementsLocation &destination); ECHSFileToFile (ElementsLocation &source, ElementsLocation &destination);
ElementsLocation copy(); ElementsLocation copy() override;
private: private:
ElementsLocation copyDirectory(ElementsLocation &source, ElementsLocation &destination, QString rename = QString()); ElementsLocation copyDirectory(ElementsLocation &source, ElementsLocation &destination, QString rename = QString());
@@ -60,7 +60,7 @@ class ECHSXmlToFile : public ECHStrategy
{ {
public: public:
ECHSXmlToFile (ElementsLocation &source, ElementsLocation &destination); ECHSXmlToFile (ElementsLocation &source, ElementsLocation &destination);
ElementsLocation copy(); ElementsLocation copy() override;
private: private:
ElementsLocation copyDirectory(ElementsLocation &source, ElementsLocation &destination, QString rename = QString()); ElementsLocation copyDirectory(ElementsLocation &source, ElementsLocation &destination, QString rename = QString());
@@ -76,7 +76,7 @@ class ECHSToXml : public ECHStrategy
{ {
public: public:
ECHSToXml (ElementsLocation &source, ElementsLocation &destination); ECHSToXml (ElementsLocation &source, ElementsLocation &destination);
ElementsLocation copy(); ElementsLocation copy() override;
}; };
/** /**

2
sources/ElementsCollection/elementcollectionitem.h
View File

@@ -32,7 +32,7 @@ class ElementCollectionItem : public QStandardItem
ElementCollectionItem(); ElementCollectionItem();
enum {Type = UserType+1}; enum {Type = UserType+1};
virtual int type() const { return Type; } int type() const override { return Type; }
virtual bool isDir() const = 0; virtual bool isDir() const = 0;
virtual bool isElement() const = 0; virtual bool isElement() const = 0;

10
sources/ElementsCollection/elementscollectionmodel.h
View File

@@ -35,11 +35,11 @@ class ElementsCollectionModel : public QStandardItemModel
public: public:
ElementsCollectionModel(QObject *parent = Q_NULLPTR); ElementsCollectionModel(QObject *parent = Q_NULLPTR);
virtual QVariant data(const QModelIndex &index, int role) const; QVariant data(const QModelIndex &index, int role) const override;
virtual QMimeData *mimeData(const QModelIndexList &indexes) const; QMimeData *mimeData(const QModelIndexList &indexes) const override;
virtual QStringList mimeTypes() const; QStringList mimeTypes() const override;
virtual bool canDropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) const; bool canDropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) const override;
virtual bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent); bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override;
void loadCollections(bool common_collection, bool custom_collection, QList<QETProject *> projects); void loadCollections(bool common_collection, bool custom_collection, QList<QETProject *> projects);

2
sources/ElementsCollection/elementscollectionwidget.h
View File

@@ -54,7 +54,7 @@ class ElementsCollectionWidget : public QWidget
void setCurrentLocation(const ElementsLocation &location); void setCurrentLocation(const ElementsLocation &location);
protected: protected:
virtual void leaveEvent(QEvent *event); void leaveEvent(QEvent *event) override;
private: private:
void setUpAction(); void setUpAction();

2
sources/ElementsCollection/elementstreeview.h
View File

@@ -34,7 +34,7 @@ class ElementsTreeView : public QTreeView
ElementsTreeView(QWidget *parent = nullptr); ElementsTreeView(QWidget *parent = nullptr);
protected: protected:
virtual void startDrag(Qt::DropActions supportedActions); void startDrag(Qt::DropActions supportedActions) override;
virtual void startElementDrag(const ElementsLocation &location); virtual void startElementDrag(const ElementsLocation &location);
}; };

20
sources/ElementsCollection/fileelementcollectionitem.h
View File

@@ -31,24 +31,24 @@ class FileElementCollectionItem : public ElementCollectionItem
FileElementCollectionItem(); FileElementCollectionItem();
enum { Type = UserType+2 }; 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); bool setRootPath(QString path, bool set_data = true, bool hide_element = false);
QString fileSystemPath() const; QString fileSystemPath() const;
QString dirPath() const; QString dirPath() const;
virtual bool isDir() const; bool isDir() const override;
virtual bool isElement() const; bool isElement() const override;
virtual QString localName(); QString localName() override;
virtual QString name() const; QString name() const override;
virtual QString collectionPath() const; QString collectionPath() const override;
virtual bool isCollectionRoot() const; bool isCollectionRoot() const override;
bool isCommonCollection() const; bool isCommonCollection() const;
bool isCustomCollection() const; bool isCustomCollection() const;
virtual void addChildAtPath(const QString &collection_name); void addChildAtPath(const QString &collection_name) override;
void setUpData(); void setUpData() override;
void setUpIcon(); void setUpIcon() override;
void hire(); void hire();

2
sources/ElementsCollection/ui/renamedialog.h
View File

@@ -31,7 +31,7 @@ class RenameDialog : public QDialog
public: public:
explicit RenameDialog(QString path, QWidget *parent = nullptr); explicit RenameDialog(QString path, QWidget *parent = nullptr);
~RenameDialog(); ~RenameDialog() override;
QString newName() const {return m_new_name;} QString newName() const {return m_new_name;}
QET::Action selectedAction() const {return m_action;} QET::Action selectedAction() const {return m_action;}

20
sources/ElementsCollection/xmlprojectelementcollectionitem.h
View File

@@ -33,21 +33,21 @@ class XmlProjectElementCollectionItem : public ElementCollectionItem
XmlProjectElementCollectionItem(); XmlProjectElementCollectionItem();
enum {Type = UserType+3}; enum {Type = UserType+3};
virtual int type() const { return Type; } int type() const override { return Type; }
virtual bool isDir() const; bool isDir() const override;
virtual bool isElement() const; bool isElement() const override;
virtual QString localName(); QString localName() override;
virtual QString name() const; QString name() const override;
virtual QString collectionPath() const; QString collectionPath() const override;
virtual QString embeddedPath() const; virtual QString embeddedPath() const;
virtual bool isCollectionRoot() const; bool isCollectionRoot() const override;
virtual void addChildAtPath(const QString &collection_name); void addChildAtPath(const QString &collection_name) override;
QETProject * project() const; QETProject * project() const;
void setProject (QETProject *project, bool set_data = true, bool hide_element = false); void setProject (QETProject *project, bool set_data = true, bool hide_element = false);
void setUpData(); void setUpData() override;
void setUpIcon(); void setUpIcon() override;
private: private:
void populate(bool set_data = true, bool hide_element = false); void populate(bool set_data = true, bool hide_element = false);

2
sources/PropertiesEditor/propertieseditordockwidget.h
View File

@@ -32,7 +32,7 @@ class PropertiesEditorDockWidget : public QDockWidget
public: public:
explicit PropertiesEditorDockWidget(QWidget *parent = nullptr); explicit PropertiesEditorDockWidget(QWidget *parent = nullptr);
~PropertiesEditorDockWidget(); ~PropertiesEditorDockWidget() override;
virtual void clear(); virtual void clear();
virtual void apply(); virtual void apply();

8
sources/QPropertyUndoCommand/qpropertyundocommand.h
View File

@@ -39,10 +39,10 @@ class QPropertyUndoCommand : public QUndoCommand
void setNewValue(const QVariant &new_value); void setNewValue(const QVariant &new_value);
void enableAnimation (bool animate = true); void enableAnimation (bool animate = true);
int id() const{return 10000;} int id() const override{return 10000;}
virtual bool mergeWith(const QUndoCommand *other); bool mergeWith(const QUndoCommand *other) override;
void redo(); void redo() override;
void undo(); void undo() override;
private: private:
QObject *m_object; QObject *m_object;

6
sources/QetGraphicsItemModeler/qetgraphicshandleritem.h
View File

@@ -31,15 +31,15 @@ class QetGraphicsHandlerItem : public QGraphicsItem
{ {
public: public:
QetGraphicsHandlerItem(qreal size = 15); QetGraphicsHandlerItem(qreal size = 15);
virtual QRectF boundingRect() const; QRectF boundingRect() const override;
enum { Type = UserType + 1200}; enum { Type = UserType + 1200};
virtual int type() const {return Type;} int type() const override {return Type;}
void setColor(QColor color); void setColor(QColor color);
protected: protected:
virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
private: private:
qreal m_size, qreal m_size,

2
sources/aboutqet.h
View File

@@ -28,7 +28,7 @@ class AboutQET : public QDialog {
// constructors, destructor // constructors, destructor
public: public:
AboutQET(QWidget * = nullptr); AboutQET(QWidget * = nullptr);
virtual ~AboutQET(); ~AboutQET() override;
private: private:
AboutQET(AboutQET &); AboutQET(AboutQET &);

84
sources/autoNum/numerotationcontextcommands.h
View File

@@ -64,99 +64,99 @@ class UnitNum: public NumStrategy
{ {
public: public:
UnitNum (Diagram *); UnitNum (Diagram *);
QString toRepresentedString(const QString) const; QString toRepresentedString(const QString) const override;
NumerotationContext next (const NumerotationContext &, const int) const; NumerotationContext next (const NumerotationContext &, const int) const override;
NumerotationContext previous (const NumerotationContext &, const int) const; NumerotationContext previous (const NumerotationContext &, const int) const override;
}; };
class UnitFNum: public NumStrategy class UnitFNum: public NumStrategy
{ {
public: public:
UnitFNum (Diagram *); UnitFNum (Diagram *);
QString toRepresentedString(const QString) const; QString toRepresentedString(const QString) const override;
NumerotationContext next (const NumerotationContext &, const int) const; NumerotationContext next (const NumerotationContext &, const int) const override;
NumerotationContext previous (const NumerotationContext &, const int) const; NumerotationContext previous (const NumerotationContext &, const int) const override;
}; };
class TenNum: public NumStrategy class TenNum: public NumStrategy
{ {
public: public:
TenNum (Diagram *); TenNum (Diagram *);
QString toRepresentedString(const QString) const; QString toRepresentedString(const QString) const override;
NumerotationContext next (const NumerotationContext &, const int) const; NumerotationContext next (const NumerotationContext &, const int) const override;
NumerotationContext previous (const NumerotationContext &, const int) const; NumerotationContext previous (const NumerotationContext &, const int) const override;
}; };
class TenFNum: public NumStrategy class TenFNum: public NumStrategy
{ {
public: public:
TenFNum (Diagram *); TenFNum (Diagram *);
QString toRepresentedString(const QString) const; QString toRepresentedString(const QString) const override;
NumerotationContext next (const NumerotationContext &, const int) const; NumerotationContext next (const NumerotationContext &, const int) const override;
NumerotationContext previous (const NumerotationContext &, const int) const; NumerotationContext previous (const NumerotationContext &, const int) const override;
}; };
class HundredNum: public NumStrategy class HundredNum: public NumStrategy
{ {
public: public:
HundredNum (Diagram *); HundredNum (Diagram *);
QString toRepresentedString(const QString) const; QString toRepresentedString(const QString) const override;
NumerotationContext next (const NumerotationContext &, const int) const; NumerotationContext next (const NumerotationContext &, const int) const override;
NumerotationContext previous (const NumerotationContext &, const int) const; NumerotationContext previous (const NumerotationContext &, const int) const override;
}; };
class HundredFNum: public NumStrategy class HundredFNum: public NumStrategy
{ {
public: public:
HundredFNum (Diagram *); HundredFNum (Diagram *);
QString toRepresentedString(const QString) const; QString toRepresentedString(const QString) const override;
NumerotationContext next (const NumerotationContext &, const int) const; NumerotationContext next (const NumerotationContext &, const int) const override;
NumerotationContext previous (const NumerotationContext &, const int) const; NumerotationContext previous (const NumerotationContext &, const int) const override;
}; };
class StringNum: public NumStrategy class StringNum: public NumStrategy
{ {
public: public:
StringNum (Diagram *); StringNum (Diagram *);
QString toRepresentedString(const QString) const; QString toRepresentedString(const QString) const override;
NumerotationContext next (const NumerotationContext &, const int) const; NumerotationContext next (const NumerotationContext &, const int) const override;
NumerotationContext previous (const NumerotationContext &, const int) const; NumerotationContext previous (const NumerotationContext &, const int) const override;
}; };
class IdFolioNum: public NumStrategy class IdFolioNum: public NumStrategy
{ {
public: public:
IdFolioNum (Diagram *); IdFolioNum (Diagram *);
QString toRepresentedString(const QString) const; QString toRepresentedString(const QString) const override;
NumerotationContext next (const NumerotationContext &, const int) const; NumerotationContext next (const NumerotationContext &, const int) const override;
NumerotationContext previous (const NumerotationContext &, const int) const; NumerotationContext previous (const NumerotationContext &, const int) const override;
}; };
class FolioNum: public NumStrategy class FolioNum: public NumStrategy
{ {
public: public:
FolioNum (Diagram *); FolioNum (Diagram *);
QString toRepresentedString(const QString) const; QString toRepresentedString(const QString) const override;
NumerotationContext next (const NumerotationContext &, const int) const; NumerotationContext next (const NumerotationContext &, const int) const override;
NumerotationContext previous (const NumerotationContext &, const int) const; NumerotationContext previous (const NumerotationContext &, const int) const override;
}; };
class MachineNum: public NumStrategy class MachineNum: public NumStrategy
{ {
public: public:
MachineNum (Diagram *); MachineNum (Diagram *);
QString toRepresentedString(const QString) const; QString toRepresentedString(const QString) const override;
NumerotationContext next (const NumerotationContext &, const int) const; NumerotationContext next (const NumerotationContext &, const int) const override;
NumerotationContext previous (const NumerotationContext &, const int) const; NumerotationContext previous (const NumerotationContext &, const int) const override;
}; };
class LocmachNum: public NumStrategy class LocmachNum: public NumStrategy
{ {
public: public:
LocmachNum (Diagram *); LocmachNum (Diagram *);
QString toRepresentedString(const QString) const; QString toRepresentedString(const QString) const override;
NumerotationContext next (const NumerotationContext &, const int) const; NumerotationContext next (const NumerotationContext &, const int) const override;
NumerotationContext previous (const NumerotationContext &, const int) const; NumerotationContext previous (const NumerotationContext &, const int) const override;
}; };
@@ -164,27 +164,27 @@ class ElementLineNum: public NumStrategy
{ {
public: public:
ElementLineNum (Diagram *); ElementLineNum (Diagram *);
QString toRepresentedString(const QString) const; QString toRepresentedString(const QString) const override;
NumerotationContext next (const NumerotationContext &, const int) const; NumerotationContext next (const NumerotationContext &, const int) const override;
NumerotationContext previous (const NumerotationContext &, const int) const; NumerotationContext previous (const NumerotationContext &, const int) const override;
}; };
class ElementColumnNum: public NumStrategy class ElementColumnNum: public NumStrategy
{ {
public: public:
ElementColumnNum (Diagram *); ElementColumnNum (Diagram *);
QString toRepresentedString(const QString) const; QString toRepresentedString(const QString) const override;
NumerotationContext next (const NumerotationContext &, const int) const; NumerotationContext next (const NumerotationContext &, const int) const override;
NumerotationContext previous (const NumerotationContext &, const int) const; NumerotationContext previous (const NumerotationContext &, const int) const override;
}; };
class ElementPrefixNum: public NumStrategy class ElementPrefixNum: public NumStrategy
{ {
public: public:
ElementPrefixNum (Diagram *); ElementPrefixNum (Diagram *);
QString toRepresentedString(const QString) const; QString toRepresentedString(const QString) const override;
NumerotationContext next (const NumerotationContext &, const int) const; NumerotationContext next (const NumerotationContext &, const int) const override;
NumerotationContext previous (const NumerotationContext &, const int) const; NumerotationContext previous (const NumerotationContext &, const int) const override;
}; };

2
sources/autoNum/ui/autonumberingdockwidget.h
View File

@@ -32,7 +32,7 @@ class AutoNumberingDockWidget : public QDockWidget
public: public:
explicit AutoNumberingDockWidget(QWidget *parent = nullptr); explicit AutoNumberingDockWidget(QWidget *parent = nullptr);
~AutoNumberingDockWidget(); ~AutoNumberingDockWidget() override;
void setContext(); void setContext();
void setProject(QETProject*, ProjectView*); void setProject(QETProject*, ProjectView*);

2
sources/autoNum/ui/autonumberingmanagementw.h
View File

@@ -35,7 +35,7 @@ class AutoNumberingManagementW : public QWidget
//METHODS //METHODS
public: public:
explicit AutoNumberingManagementW(QETProject *project, QWidget *parent = nullptr); explicit AutoNumberingManagementW(QETProject *project, QWidget *parent = nullptr);
~AutoNumberingManagementW(); ~AutoNumberingManagementW() override;
Ui::AutoNumberingManagementW *ui; Ui::AutoNumberingManagementW *ui;
void setProjectContext (); void setProjectContext ();
void contextToFormula (); void contextToFormula ();

2
sources/autoNum/ui/folioautonumbering.h
View File

@@ -36,7 +36,7 @@ class FolioAutonumberingW : public QWidget
//METHODS //METHODS
public: public:
explicit FolioAutonumberingW(QETProject *project, QWidget *parent = nullptr); explicit FolioAutonumberingW(QETProject *project, QWidget *parent = nullptr);
~FolioAutonumberingW(); ~FolioAutonumberingW() override;
void setContext (QList <QString> autonums); void setContext (QList <QString> autonums);
NumerotationContext toNumContext() const; NumerotationContext toNumContext() const;

2
sources/autoNum/ui/formulaautonumberingw.h
View File

@@ -39,7 +39,7 @@ class FormulaAutonumberingW : public QWidget
//METHODS //METHODS
public: public:
explicit FormulaAutonumberingW(QWidget *parent = nullptr); explicit FormulaAutonumberingW(QWidget *parent = nullptr);
~FormulaAutonumberingW(); ~FormulaAutonumberingW() override;
QString formula(); QString formula();
void setContext(QString); void setContext(QString);
void clearContext(); void clearContext();

2
sources/autoNum/ui/numparteditorw.h
View File

@@ -39,7 +39,7 @@ class NumPartEditorW : public QWidget
public: public:
explicit NumPartEditorW(int type, QWidget *parent = nullptr); explicit NumPartEditorW(int type, QWidget *parent = nullptr);
NumPartEditorW (NumerotationContext &, int, int type, QWidget *parent=nullptr); NumPartEditorW (NumerotationContext &, int, int type, QWidget *parent=nullptr);
~NumPartEditorW(); ~NumPartEditorW() override;
enum type {unit,unitfolio,ten,tenfolio, hundred, hundredfolio, enum type {unit,unitfolio,ten,tenfolio, hundred, hundredfolio,
string,idfolio,folio,machine,locmach, string,idfolio,folio,machine,locmach,

2
sources/autoNum/ui/selectautonumw.h
View File

@@ -39,7 +39,7 @@ class SelectAutonumW : public QWidget
public: public:
explicit SelectAutonumW(int type, QWidget *parent = nullptr); explicit SelectAutonumW(int type, QWidget *parent = nullptr);
explicit SelectAutonumW(const NumerotationContext &context, int type, QWidget *parent = nullptr); explicit SelectAutonumW(const NumerotationContext &context, int type, QWidget *parent = nullptr);
~SelectAutonumW(); ~SelectAutonumW() override;
void setContext (const NumerotationContext &context); void setContext (const NumerotationContext &context);
NumerotationContext toNumContext() const; NumerotationContext toNumContext() const;

2
sources/bordertitleblock.h
View File

@@ -38,7 +38,7 @@ class BorderTitleBlock : public QObject
public: public:
BorderTitleBlock(QObject * = nullptr); BorderTitleBlock(QObject * = nullptr);
virtual ~BorderTitleBlock(); ~BorderTitleBlock() override;
private: private:
BorderTitleBlock(const BorderTitleBlock &); BorderTitleBlock(const BorderTitleBlock &);

2
sources/configdialog.h
View File

@@ -33,7 +33,7 @@ class ConfigDialog : public QDialog {
// constructors, destructor // constructors, destructor
public: public:
ConfigDialog(QWidget * = nullptr); ConfigDialog(QWidget * = nullptr);
virtual ~ConfigDialog(); ~ConfigDialog() override;
private: private:
ConfigDialog(const ConfigDialog &); ConfigDialog(const ConfigDialog &);

2
sources/configpage.h
View File

@@ -33,7 +33,7 @@ class ConfigPage : public QWidget {
*/ */
ConfigPage(QWidget *parent) : QWidget(parent) {}; ConfigPage(QWidget *parent) : QWidget(parent) {};
/// Destructor /// Destructor
virtual ~ConfigPage() {}; ~ConfigPage() override {};
/// Apply the configuration after user input /// Apply the configuration after user input
virtual void applyConf() = 0; virtual void applyConf() = 0;
/// @return the configuration page title /// @return the configuration page title

32
sources/configpages.h
View File

@@ -39,7 +39,7 @@ class NewDiagramPage : public ConfigPage {
// constructors, destructor // constructors, destructor
public: public:
NewDiagramPage(QETProject *project = nullptr, QWidget * = nullptr, ProjectPropertiesDialog *teste = nullptr); NewDiagramPage(QETProject *project = nullptr, QWidget * = nullptr, ProjectPropertiesDialog *teste = nullptr);
virtual ~NewDiagramPage(); ~NewDiagramPage() override;
private: private:
NewDiagramPage(const NewDiagramPage &); NewDiagramPage(const NewDiagramPage &);
public slots: public slots:
@@ -51,9 +51,9 @@ public slots:
// methods // methods
public: public:
void applyConf(); void applyConf() override;
QString title() const; QString title() const override;
QIcon icon() const; QIcon icon() const override;
// attributes // attributes
private: private:
@@ -77,15 +77,15 @@ class GeneralConfigurationPage : public ConfigPage {
// constructors, destructor // constructors, destructor
public: public:
GeneralConfigurationPage(QWidget * = nullptr); GeneralConfigurationPage(QWidget * = nullptr);
virtual ~GeneralConfigurationPage(); ~GeneralConfigurationPage() override;
private: private:
GeneralConfigurationPage(const GeneralConfigurationPage &); GeneralConfigurationPage(const GeneralConfigurationPage &);
// methods // methods
public: public:
void applyConf(); void applyConf() override;
QString title() const; QString title() const override;
QIcon icon() const; QIcon icon() const override;
private: private:
void fillLang(QSettings &); void fillLang(QSettings &);
@@ -122,15 +122,15 @@ class ExportConfigPage : public ConfigPage {
// constructors, destructor // constructors, destructor
public: public:
ExportConfigPage(QWidget * = nullptr); ExportConfigPage(QWidget * = nullptr);
virtual ~ExportConfigPage(); ~ExportConfigPage() override;
private: private:
ExportConfigPage(const ExportConfigPage &); ExportConfigPage(const ExportConfigPage &);
// methods // methods
public: public:
void applyConf(); void applyConf() override;
QString title() const; QString title() const override;
QIcon icon() const; QIcon icon() const override;
// attributes // attributes
public: public:
@@ -145,15 +145,15 @@ class PrintConfigPage : public ConfigPage {
// constructors, destructor // constructors, destructor
public: public:
PrintConfigPage(QWidget * = nullptr); PrintConfigPage(QWidget * = nullptr);
virtual ~PrintConfigPage(); ~PrintConfigPage() override;
private: private:
PrintConfigPage(const PrintConfigPage &); PrintConfigPage(const PrintConfigPage &);
// methods // methods
public: public:
void applyConf(); void applyConf() override;
QString title() const; QString title() const override;
QIcon icon() const; QIcon icon() const override;
// attributes // attributes
public: public:

18
sources/diagram.h
View File

@@ -53,7 +53,7 @@ class Diagram : public QGraphicsScene
// constructors, destructor // constructors, destructor
public: public:
Diagram(QETProject *project); Diagram(QETProject *project);
virtual ~Diagram(); ~Diagram() override;
private: private:
Diagram(const Diagram &diagram); Diagram(const Diagram &diagram);
@@ -114,15 +114,15 @@ class Diagram : public QGraphicsScene
// METHODS // METHODS
protected: protected:
virtual void drawBackground(QPainter *, const QRectF &); void drawBackground(QPainter *, const QRectF &) override;
virtual void mouseDoubleClickEvent (QGraphicsSceneMouseEvent *event); void mouseDoubleClickEvent (QGraphicsSceneMouseEvent *event) override;
virtual void mousePressEvent (QGraphicsSceneMouseEvent *event); void mousePressEvent (QGraphicsSceneMouseEvent *event) override;
virtual void mouseMoveEvent (QGraphicsSceneMouseEvent *event); void mouseMoveEvent (QGraphicsSceneMouseEvent *event) override;
virtual void mouseReleaseEvent (QGraphicsSceneMouseEvent *event); void mouseReleaseEvent (QGraphicsSceneMouseEvent *event) override;
virtual void wheelEvent (QGraphicsSceneWheelEvent *event); void wheelEvent (QGraphicsSceneWheelEvent *event) override;
virtual void keyPressEvent (QKeyEvent *); void keyPressEvent (QKeyEvent *) override;
virtual void keyReleaseEvent (QKeyEvent *); void keyReleaseEvent (QKeyEvent *) override;
public: public:
void setEventInterface (DiagramEventInterface *event_interface); void setEventInterface (DiagramEventInterface *event_interface);

68
sources/diagramcommands.h
View File

@@ -53,17 +53,17 @@ class AddItemCommand : public QUndoCommand {
m_diagram -> qgiManager().manage(m_item); m_diagram -> qgiManager().manage(m_item);
} }
virtual ~AddItemCommand() { ~AddItemCommand() override {
m_diagram -> qgiManager().release(m_item); m_diagram -> qgiManager().release(m_item);
} }
virtual void undo() { void undo() override {
m_diagram -> showMe(); m_diagram -> showMe();
m_diagram -> removeItem(m_item); m_diagram -> removeItem(m_item);
QUndoCommand::undo(); QUndoCommand::undo();
} }
virtual void redo() { void redo() override {
m_diagram -> showMe(); m_diagram -> showMe();
m_diagram -> addItem(m_item); m_diagram -> addItem(m_item);
m_item -> setPos(m_pos); m_item -> setPos(m_pos);
@@ -88,14 +88,14 @@ class PasteDiagramCommand : public QUndoCommand {
// constructors, destructor // constructors, destructor
public: public:
PasteDiagramCommand(Diagram *, const DiagramContent &, QUndoCommand * = nullptr); PasteDiagramCommand(Diagram *, const DiagramContent &, QUndoCommand * = nullptr);
virtual ~PasteDiagramCommand(); ~PasteDiagramCommand() override;
private: private:
PasteDiagramCommand(const PasteDiagramCommand &); PasteDiagramCommand(const PasteDiagramCommand &);
// methods // methods
public: public:
virtual void undo(); void undo() override;
virtual void redo(); void redo() override;
// attributes // attributes
private: private:
@@ -116,7 +116,7 @@ class CutDiagramCommand : public DeleteQGraphicsItemCommand {
// constructors, destructor // constructors, destructor
public: public:
CutDiagramCommand(Diagram *, const DiagramContent &, QUndoCommand * = nullptr); CutDiagramCommand(Diagram *, const DiagramContent &, QUndoCommand * = nullptr);
virtual ~CutDiagramCommand(); ~CutDiagramCommand() override;
private: private:
CutDiagramCommand(const CutDiagramCommand &); CutDiagramCommand(const CutDiagramCommand &);
}; };
@@ -128,14 +128,14 @@ class MoveElementsCommand : public QUndoCommand {
// constructors, destructor // constructors, destructor
public: public:
MoveElementsCommand(Diagram *, const DiagramContent &, const QPointF &m, QUndoCommand * = nullptr); MoveElementsCommand(Diagram *, const DiagramContent &, const QPointF &m, QUndoCommand * = nullptr);
virtual ~MoveElementsCommand(); ~MoveElementsCommand() override;
private: private:
MoveElementsCommand(const MoveElementsCommand &); MoveElementsCommand(const MoveElementsCommand &);
// methods // methods
public: public:
virtual void undo(); void undo() override;
virtual void redo(); void redo() override;
virtual void move(const QPointF &); virtual void move(const QPointF &);
private: private:
@@ -163,14 +163,14 @@ class MoveConductorsTextsCommand : public QUndoCommand {
// constructors, destructor // constructors, destructor
public: public:
MoveConductorsTextsCommand(Diagram *, QUndoCommand * = nullptr); MoveConductorsTextsCommand(Diagram *, QUndoCommand * = nullptr);
virtual ~MoveConductorsTextsCommand(); ~MoveConductorsTextsCommand() override;
private: private:
MoveConductorsTextsCommand(const MoveConductorsTextsCommand &); MoveConductorsTextsCommand(const MoveConductorsTextsCommand &);
// methods // methods
public: public:
virtual void undo(); void undo() override;
virtual void redo(); void redo() override;
virtual void addTextMovement(ConductorTextItem *, const QPointF &, const QPointF &, bool = false); virtual void addTextMovement(ConductorTextItem *, const QPointF &, const QPointF &, bool = false);
private: private:
@@ -193,14 +193,14 @@ class ChangeDiagramTextCommand : public QUndoCommand {
// constructors, destructor // constructors, destructor
public: public:
ChangeDiagramTextCommand(DiagramTextItem *, const QString &before, const QString &after, QUndoCommand * = nullptr); ChangeDiagramTextCommand(DiagramTextItem *, const QString &before, const QString &after, QUndoCommand * = nullptr);
virtual ~ChangeDiagramTextCommand(); ~ChangeDiagramTextCommand() override;
private: private:
ChangeDiagramTextCommand(const ChangeDiagramTextCommand &); ChangeDiagramTextCommand(const ChangeDiagramTextCommand &);
// methods // methods
public: public:
virtual void undo(); void undo() override;
virtual void redo(); void redo() override;
// attributes // attributes
private: private:
@@ -222,14 +222,14 @@ class RotateElementsCommand : public QUndoCommand {
// constructors, destructor // constructors, destructor
public: public:
RotateElementsCommand(const QList<Element *> &elements, const QList<DiagramTextItem *> &, const QList<DiagramImageItem *> &, QUndoCommand * = nullptr); RotateElementsCommand(const QList<Element *> &elements, const QList<DiagramTextItem *> &, const QList<DiagramImageItem *> &, QUndoCommand * = nullptr);
virtual ~RotateElementsCommand(); ~RotateElementsCommand() override;
private: private:
RotateElementsCommand(const RotateElementsCommand &); RotateElementsCommand(const RotateElementsCommand &);
// methods // methods
public: public:
virtual void undo(); void undo() override;
virtual void redo(); void redo() override;
// attributes // attributes
private: private:
@@ -255,14 +255,14 @@ class RotateTextsCommand : public QUndoCommand
// constructors, destructor // constructors, destructor
public: public:
RotateTextsCommand(const QList<DiagramTextItem *> &, double, QUndoCommand * = nullptr); RotateTextsCommand(const QList<DiagramTextItem *> &, double, QUndoCommand * = nullptr);
virtual ~RotateTextsCommand() override; ~RotateTextsCommand() override;
private: private:
RotateTextsCommand(const RotateTextsCommand &); RotateTextsCommand(const RotateTextsCommand &);
// methods // methods
public: public:
virtual void undo() override; void undo() override;
virtual void redo() override; void redo() override;
private: private:
void defineCommandName(); void defineCommandName();
@@ -285,14 +285,14 @@ class ChangeConductorCommand : public QUndoCommand {
// constructors, destructor // constructors, destructor
public: public:
ChangeConductorCommand(Conductor *, const ConductorProfile &, const ConductorProfile &, Qt::Corner, QUndoCommand * = nullptr); ChangeConductorCommand(Conductor *, const ConductorProfile &, const ConductorProfile &, Qt::Corner, QUndoCommand * = nullptr);
virtual ~ChangeConductorCommand(); ~ChangeConductorCommand() override;
private: private:
ChangeConductorCommand(const ChangeConductorCommand &); ChangeConductorCommand(const ChangeConductorCommand &);
// methods // methods
public: public:
virtual void undo(); void undo() override;
virtual void redo(); void redo() override;
virtual void setConductorTextItemMove(const QPointF &, const QPointF &); virtual void setConductorTextItemMove(const QPointF &, const QPointF &);
// attributes // attributes
@@ -321,14 +321,14 @@ class ResetConductorCommand : public QUndoCommand {
// constructors, destructor // constructors, destructor
public: public:
ResetConductorCommand(const QHash<Conductor *, ConductorProfilesGroup> &, QUndoCommand * = nullptr); ResetConductorCommand(const QHash<Conductor *, ConductorProfilesGroup> &, QUndoCommand * = nullptr);
virtual ~ResetConductorCommand(); ~ResetConductorCommand() override;
private: private:
ResetConductorCommand(const ResetConductorCommand &); ResetConductorCommand(const ResetConductorCommand &);
// methods // methods
public: public:
virtual void undo(); void undo() override;
virtual void redo(); void redo() override;
// attributes // attributes
private: private:
@@ -344,14 +344,14 @@ class ChangeTitleBlockCommand : public QUndoCommand {
// constructors, destructor // constructors, destructor
public: public:
ChangeTitleBlockCommand(Diagram *, const TitleBlockProperties &, const TitleBlockProperties &, QUndoCommand * = nullptr); ChangeTitleBlockCommand(Diagram *, const TitleBlockProperties &, const TitleBlockProperties &, QUndoCommand * = nullptr);
virtual ~ChangeTitleBlockCommand(); ~ChangeTitleBlockCommand() override;
private: private:
ChangeTitleBlockCommand(const ChangeTitleBlockCommand &); ChangeTitleBlockCommand(const ChangeTitleBlockCommand &);
// methods // methods
public: public:
virtual void undo(); void undo() override;
virtual void redo(); void redo() override;
// attributes // attributes
private: private:
@@ -370,14 +370,14 @@ class ChangeBorderCommand : public QUndoCommand {
// constructors, destructor // constructors, destructor
public: public:
ChangeBorderCommand(Diagram *, const BorderProperties &, const BorderProperties &, QUndoCommand * = nullptr); ChangeBorderCommand(Diagram *, const BorderProperties &, const BorderProperties &, QUndoCommand * = nullptr);
virtual ~ChangeBorderCommand(); ~ChangeBorderCommand() override;
private: private:
ChangeBorderCommand(const ChangeBorderCommand &); ChangeBorderCommand(const ChangeBorderCommand &);
// methods // methods
public: public:
virtual void undo(); void undo() override;
virtual void redo(); void redo() override;
// attributes // attributes
private: private:

2
sources/diagramcontextwidget.h
View File

@@ -30,7 +30,7 @@ class DiagramContextWidget : public QWidget {
// Constructor, destructor // Constructor, destructor
public: public:
DiagramContextWidget(QWidget *parent = nullptr); DiagramContextWidget(QWidget *parent = nullptr);
virtual ~DiagramContextWidget(); ~DiagramContextWidget() override;
private: private:
DiagramContextWidget(const DiagramContextWidget &); DiagramContextWidget(const DiagramContextWidget &);

14
sources/diagramevent/diagrameventaddelement.h
View File

@@ -34,14 +34,14 @@ class DiagramEventAddElement : public DiagramEventInterface
public: public:
DiagramEventAddElement(ElementsLocation &location, Diagram *diagram, QPointF pos = QPointF(0,0)); DiagramEventAddElement(ElementsLocation &location, Diagram *diagram, QPointF pos = QPointF(0,0));
virtual ~DiagramEventAddElement(); ~DiagramEventAddElement() override;
virtual bool mouseMoveEvent (QGraphicsSceneMouseEvent *event); bool mouseMoveEvent (QGraphicsSceneMouseEvent *event) override;
virtual bool mousePressEvent (QGraphicsSceneMouseEvent *event); bool mousePressEvent (QGraphicsSceneMouseEvent *event) override;
virtual bool mouseReleaseEvent (QGraphicsSceneMouseEvent *event); bool mouseReleaseEvent (QGraphicsSceneMouseEvent *event) override;
virtual bool mouseDoubleClickEvent (QGraphicsSceneMouseEvent *event); bool mouseDoubleClickEvent (QGraphicsSceneMouseEvent *event) override;
virtual bool keyPressEvent (QKeyEvent *event); bool keyPressEvent (QKeyEvent *event) override;
virtual void init(); void init() override;
private: private:
bool buildElement(); bool buildElement();

10
sources/diagramevent/diagrameventaddimage.h
View File

@@ -33,12 +33,12 @@ class DiagramEventAddImage : public DiagramEventInterface
public: public:
DiagramEventAddImage(Diagram *diagram); DiagramEventAddImage(Diagram *diagram);
virtual ~DiagramEventAddImage(); ~DiagramEventAddImage() override;
virtual bool mousePressEvent (QGraphicsSceneMouseEvent *event); bool mousePressEvent (QGraphicsSceneMouseEvent *event) override;
virtual bool mouseMoveEvent (QGraphicsSceneMouseEvent *event); bool mouseMoveEvent (QGraphicsSceneMouseEvent *event) override;
virtual bool mouseDoubleClickEvent (QGraphicsSceneMouseEvent *event); bool mouseDoubleClickEvent (QGraphicsSceneMouseEvent *event) override;
virtual bool wheelEvent (QGraphicsSceneWheelEvent *event); bool wheelEvent (QGraphicsSceneWheelEvent *event) override;
bool isNull () const; bool isNull () const;
private: private:

12
sources/diagramevent/diagrameventaddshape.h
View File

@@ -32,12 +32,12 @@ class DiagramEventAddShape : public DiagramEventInterface
public: public:
DiagramEventAddShape(Diagram *diagram, QetShapeItem::ShapeType shape_type); DiagramEventAddShape(Diagram *diagram, QetShapeItem::ShapeType shape_type);
virtual ~DiagramEventAddShape(); ~DiagramEventAddShape() override;
virtual bool mousePressEvent (QGraphicsSceneMouseEvent *event); bool mousePressEvent (QGraphicsSceneMouseEvent *event) override;
virtual bool mouseMoveEvent (QGraphicsSceneMouseEvent *event); bool mouseMoveEvent (QGraphicsSceneMouseEvent *event) override;
virtual bool mouseReleaseEvent (QGraphicsSceneMouseEvent *event); bool mouseReleaseEvent (QGraphicsSceneMouseEvent *event) override;
virtual bool mouseDoubleClickEvent (QGraphicsSceneMouseEvent *event); bool mouseDoubleClickEvent (QGraphicsSceneMouseEvent *event) override;
virtual void init(); void init() override;
private: private:
void updateHelpCross (const QPointF &p); void updateHelpCross (const QPointF &p);

4
sources/diagramevent/diagrameventaddtext.h
View File

@@ -32,9 +32,9 @@ class DiagramEventAddText : public DiagramEventInterface
public: public:
DiagramEventAddText(Diagram *diagram); DiagramEventAddText(Diagram *diagram);
virtual ~DiagramEventAddText(); ~DiagramEventAddText() override;
virtual bool mousePressEvent (QGraphicsSceneMouseEvent *event); bool mousePressEvent (QGraphicsSceneMouseEvent *event) override;
}; };
#endif // DIAGRAMEVENTADDTEXT_H #endif // DIAGRAMEVENTADDTEXT_H

2
sources/diagramevent/diagrameventinterface.h
View File

@@ -51,7 +51,7 @@ class DiagramEventInterface : public QObject
public: public:
DiagramEventInterface(Diagram *diagram); DiagramEventInterface(Diagram *diagram);
virtual ~DiagramEventInterface() = 0; ~DiagramEventInterface() override = 0;
virtual bool mouseDoubleClickEvent (QGraphicsSceneMouseEvent *event); virtual bool mouseDoubleClickEvent (QGraphicsSceneMouseEvent *event);
virtual bool mousePressEvent (QGraphicsSceneMouseEvent *event); virtual bool mousePressEvent (QGraphicsSceneMouseEvent *event);
virtual bool mouseMoveEvent (QGraphicsSceneMouseEvent *event); virtual bool mouseMoveEvent (QGraphicsSceneMouseEvent *event);

4
sources/diagramfoliolist.h
View File

@@ -25,7 +25,7 @@ class DiagramFolioList : public Diagram
{ {
public: public:
DiagramFolioList(QETProject *project); DiagramFolioList(QETProject *project);
virtual ~DiagramFolioList(); ~DiagramFolioList() override;
virtual QList<QLineF *> lines() const {return list_lines_;} virtual QList<QLineF *> lines() const {return list_lines_;}
virtual QList<QRectF *> rectangles() const {return list_rectangles_;} virtual QList<QRectF *> rectangles() const {return list_rectangles_;}
void setId(int i) {id = i;} void setId(int i) {id = i;}
@@ -34,7 +34,7 @@ class DiagramFolioList : public Diagram
static qreal colWidths[7]; static qreal colWidths[7];
protected: protected:
void drawBackground(QPainter *, const QRectF &); void drawBackground(QPainter *, const QRectF &) override;
private: private:
void fillRow(QPainter *, const QRectF &, QString, QString, QString, QString, QString, QString, QString); void fillRow(QPainter *, const QRectF &, QString, QString, QString, QString, QString, QString, QString);

2
sources/diagramprintdialog.h
View File

@@ -37,7 +37,7 @@ class DiagramPrintDialog : public QWidget
// Constructors, destructor // Constructors, destructor
public: public:
DiagramPrintDialog(QETProject *, QWidget * = nullptr); DiagramPrintDialog(QETProject *, QWidget * = nullptr);
virtual ~DiagramPrintDialog(); ~DiagramPrintDialog() override;
private: private:
DiagramPrintDialog(const DiagramPrintDialog &); DiagramPrintDialog(const DiagramPrintDialog &);

2
sources/diagramschooser.h
View File

@@ -30,7 +30,7 @@ class DiagramsChooser : public QScrollArea {
// constructors, destructor // constructors, destructor
public: public:
DiagramsChooser(QETProject *, QWidget * = nullptr); DiagramsChooser(QETProject *, QWidget * = nullptr);
virtual ~DiagramsChooser(); ~DiagramsChooser() override;
private: private:
DiagramsChooser(const DiagramsChooser &); DiagramsChooser(const DiagramsChooser &);

30
sources/diagramview.h
View File

@@ -42,7 +42,7 @@ class DiagramView : public QGraphicsView
// constructors, destructor // constructors, destructor
public: public:
DiagramView(Diagram *diagram, QWidget * = nullptr); DiagramView(Diagram *diagram, QWidget * = nullptr);
virtual ~DiagramView(); ~DiagramView() override;
private: private:
DiagramView(const DiagramView &); DiagramView(const DiagramView &);
@@ -75,26 +75,26 @@ class DiagramView : public QGraphicsView
void setEventInterface (DVEventInterface *event_interface); void setEventInterface (DVEventInterface *event_interface);
protected: protected:
virtual void mouseDoubleClickEvent(QMouseEvent *); void mouseDoubleClickEvent(QMouseEvent *) override;
virtual void contextMenuEvent(QContextMenuEvent *); void contextMenuEvent(QContextMenuEvent *) override;
virtual void wheelEvent(QWheelEvent *); void wheelEvent(QWheelEvent *) override;
virtual void focusInEvent(QFocusEvent *); void focusInEvent(QFocusEvent *) override;
virtual void keyPressEvent(QKeyEvent *); void keyPressEvent(QKeyEvent *) override;
virtual void keyReleaseEvent(QKeyEvent *); void keyReleaseEvent(QKeyEvent *) override;
virtual bool event(QEvent *); bool event(QEvent *) override;
virtual bool switchToVisualisationModeIfNeeded(QInputEvent *e); virtual bool switchToVisualisationModeIfNeeded(QInputEvent *e);
virtual bool switchToSelectionModeIfNeeded(QInputEvent *e); virtual bool switchToSelectionModeIfNeeded(QInputEvent *e);
virtual bool isCtrlShifting(QInputEvent *); virtual bool isCtrlShifting(QInputEvent *);
virtual bool selectedItemHasFocus(); virtual bool selectedItemHasFocus();
private: private:
void mousePressEvent(QMouseEvent *); void mousePressEvent(QMouseEvent *) override;
void mouseMoveEvent(QMouseEvent *); void mouseMoveEvent(QMouseEvent *) override;
void mouseReleaseEvent(QMouseEvent *); void mouseReleaseEvent(QMouseEvent *) override;
void dragEnterEvent(QDragEnterEvent *); void dragEnterEvent(QDragEnterEvent *) override;
void dragLeaveEvent(QDragLeaveEvent *); void dragLeaveEvent(QDragLeaveEvent *) override;
void dragMoveEvent(QDragMoveEvent *); void dragMoveEvent(QDragMoveEvent *) override;
void dropEvent(QDropEvent *); void dropEvent(QDropEvent *) override;
void handleElementDrop(QDropEvent *); void handleElementDrop(QDropEvent *);
void handleTitleBlockDrop(QDropEvent *); void handleTitleBlockDrop(QDropEvent *);
void handleTextDrop(QDropEvent *); void handleTextDrop(QDropEvent *);

2
sources/dvevent/dveventinterface.h
View File

@@ -41,7 +41,7 @@ class DVEventInterface : public QObject
public: public:
DVEventInterface(DiagramView *dv); DVEventInterface(DiagramView *dv);
virtual ~DVEventInterface () = 0; ~DVEventInterface () override = 0;
virtual bool mouseDoubleClickEvent (QMouseEvent *event); virtual bool mouseDoubleClickEvent (QMouseEvent *event);
virtual bool mousePressEvent (QMouseEvent *event); virtual bool mousePressEvent (QMouseEvent *event);
virtual bool mouseMoveEvent (QMouseEvent *event); virtual bool mouseMoveEvent (QMouseEvent *event);

8
sources/editor/arceditor.h
View File

@@ -35,7 +35,7 @@ class ArcEditor : public ElementItemEditor
// constructors, destructor // constructors, destructor
public: public:
ArcEditor(QETElementEditor *, PartArc * = nullptr, QWidget * = nullptr); ArcEditor(QETElementEditor *, PartArc * = nullptr, QWidget * = nullptr);
virtual ~ArcEditor(); ~ArcEditor() override;
private: private:
ArcEditor(const ArcEditor &); ArcEditor(const ArcEditor &);
@@ -49,14 +49,14 @@ class ArcEditor : public ElementItemEditor
// methods // methods
public: public:
virtual bool setPart(CustomElementPart *); bool setPart(CustomElementPart *) override;
virtual CustomElementPart *currentPart() const; CustomElementPart *currentPart() const override;
public slots: public slots:
void updateArcS(); void updateArcS();
void updateArcA(); void updateArcA();
void updateArcRect(); void updateArcRect();
void updateForm(); void updateForm() override;
private: private:
void activeConnections(bool); void activeConnections(bool);

58
sources/editor/editorcommands.h
View File

@@ -35,7 +35,7 @@ class ElementEditionCommand : public QUndoCommand
public: public:
ElementEditionCommand(ElementScene * = nullptr, ElementView * = nullptr, QUndoCommand * = nullptr); ElementEditionCommand(ElementScene * = nullptr, ElementView * = nullptr, QUndoCommand * = nullptr);
ElementEditionCommand(const QString &, ElementScene * = nullptr, ElementView * = nullptr, QUndoCommand * = nullptr); ElementEditionCommand(const QString &, ElementScene * = nullptr, ElementView * = nullptr, QUndoCommand * = nullptr);
virtual ~ElementEditionCommand(); ~ElementEditionCommand() override;
private: private:
ElementEditionCommand(const ElementEditionCommand &); ElementEditionCommand(const ElementEditionCommand &);
@@ -61,14 +61,14 @@ class DeletePartsCommand : public ElementEditionCommand {
// constructors, destructor // constructors, destructor
public: public:
DeletePartsCommand(ElementScene *, const QList<QGraphicsItem *>, QUndoCommand * = nullptr); DeletePartsCommand(ElementScene *, const QList<QGraphicsItem *>, QUndoCommand * = nullptr);
virtual ~DeletePartsCommand(); ~DeletePartsCommand() override;
private: private:
DeletePartsCommand(const DeletePartsCommand &); DeletePartsCommand(const DeletePartsCommand &);
// methods // methods
public: public:
virtual void undo(); void undo() override;
virtual void redo(); void redo() override;
// attributes // attributes
private: private:
@@ -83,14 +83,14 @@ class PastePartsCommand : public ElementEditionCommand {
// constructors, destructor // constructors, destructor
public: public:
PastePartsCommand(ElementView *, const ElementContent &, QUndoCommand * = nullptr); PastePartsCommand(ElementView *, const ElementContent &, QUndoCommand * = nullptr);
virtual ~PastePartsCommand(); ~PastePartsCommand() override;
private: private:
PastePartsCommand(const PastePartsCommand &); PastePartsCommand(const PastePartsCommand &);
// methods // methods
public: public:
virtual void undo(); void undo() override;
virtual void redo(); void redo() override;
virtual void setOffset(int, const QPointF &, int, const QPointF &); virtual void setOffset(int, const QPointF &, int, const QPointF &);
// attributes // attributes
@@ -114,7 +114,7 @@ class CutPartsCommand : public DeletePartsCommand {
// constructors, destructor // constructors, destructor
public: public:
CutPartsCommand(ElementScene *, const QList<QGraphicsItem *>, QUndoCommand * = nullptr); CutPartsCommand(ElementScene *, const QList<QGraphicsItem *>, QUndoCommand * = nullptr);
virtual ~CutPartsCommand(); ~CutPartsCommand() override;
private: private:
CutPartsCommand(const CutPartsCommand &); CutPartsCommand(const CutPartsCommand &);
}; };
@@ -126,14 +126,14 @@ class MovePartsCommand : public ElementEditionCommand {
// constructors, destructor // constructors, destructor
public: public:
MovePartsCommand(const QPointF &, ElementScene *, const QList<QGraphicsItem *>, QUndoCommand * = nullptr); MovePartsCommand(const QPointF &, ElementScene *, const QList<QGraphicsItem *>, QUndoCommand * = nullptr);
virtual ~MovePartsCommand(); ~MovePartsCommand() override;
private: private:
MovePartsCommand(const MovePartsCommand &); MovePartsCommand(const MovePartsCommand &);
// methods // methods
public: public:
virtual void undo(); void undo() override;
virtual void redo(); void redo() override;
// attributes // attributes
private: private:
@@ -152,14 +152,14 @@ class AddPartCommand : public ElementEditionCommand {
// constructors, destructor // constructors, destructor
public: public:
AddPartCommand(const QString &, ElementScene *, QGraphicsItem *, QUndoCommand * = nullptr); AddPartCommand(const QString &, ElementScene *, QGraphicsItem *, QUndoCommand * = nullptr);
virtual ~AddPartCommand(); ~AddPartCommand() override;
private: private:
AddPartCommand(const AddPartCommand &); AddPartCommand(const AddPartCommand &);
// methods // methods
public: public:
virtual void undo(); void undo() override;
virtual void redo(); void redo() override;
// attributes // attributes
private: private:
@@ -176,14 +176,14 @@ class ChangeNamesCommand : public ElementEditionCommand {
// constructors, destructor // constructors, destructor
public: public:
ChangeNamesCommand(ElementScene *, const NamesList &, const NamesList &, QUndoCommand * = nullptr); ChangeNamesCommand(ElementScene *, const NamesList &, const NamesList &, QUndoCommand * = nullptr);
virtual ~ChangeNamesCommand(); ~ChangeNamesCommand() override;
private: private:
ChangeNamesCommand(const ChangeNamesCommand &); ChangeNamesCommand(const ChangeNamesCommand &);
// methods // methods
public: public:
virtual void undo(); void undo() override;
virtual void redo(); void redo() override;
// attributes // attributes
private: private:
@@ -208,14 +208,14 @@ class ChangeZValueCommand : public ElementEditionCommand {
SendBackward ///< Send primitives to the background so they have the lowest zValue SendBackward ///< Send primitives to the background so they have the lowest zValue
}; };
ChangeZValueCommand(ElementScene *, Option, QUndoCommand * = nullptr); ChangeZValueCommand(ElementScene *, Option, QUndoCommand * = nullptr);
virtual ~ChangeZValueCommand(); ~ChangeZValueCommand() override;
private: private:
ChangeZValueCommand(const ChangeZValueCommand &); ChangeZValueCommand(const ChangeZValueCommand &);
// methods // methods
public: public:
virtual void undo(); void undo() override;
virtual void redo(); void redo() override;
private: private:
void applyBringForward(const QList<QGraphicsItem *> &); void applyBringForward(const QList<QGraphicsItem *> &);
@@ -240,14 +240,14 @@ class ChangeInformationsCommand : public ElementEditionCommand {
// constructors, destructor // constructors, destructor
public: public:
ChangeInformationsCommand(ElementScene *, const QString &, const QString &, QUndoCommand * = nullptr); ChangeInformationsCommand(ElementScene *, const QString &, const QString &, QUndoCommand * = nullptr);
virtual ~ChangeInformationsCommand(); ~ChangeInformationsCommand() override;
private: private:
ChangeInformationsCommand(const ChangeInformationsCommand &); ChangeInformationsCommand(const ChangeInformationsCommand &);
// methods // methods
public: public:
virtual void undo(); void undo() override;
virtual void redo(); void redo() override;
// attributes // attributes
private: private:
@@ -264,14 +264,14 @@ class ScalePartsCommand : public ElementEditionCommand {
// constructors, destructor // constructors, destructor
public: public:
ScalePartsCommand(ElementScene * = nullptr, QUndoCommand * = nullptr); ScalePartsCommand(ElementScene * = nullptr, QUndoCommand * = nullptr);
virtual ~ScalePartsCommand(); ~ScalePartsCommand() override;
private: private:
ScalePartsCommand(const ScalePartsCommand &); ScalePartsCommand(const ScalePartsCommand &);
// methods // methods
public: public:
virtual void undo(); void undo() override;
virtual void redo(); void redo() override;
ElementScene *elementScene() const; ElementScene *elementScene() const;
void setScaledPrimitives(const QList<CustomElementPart *> &); void setScaledPrimitives(const QList<CustomElementPart *> &);
QList<CustomElementPart *> scaledPrimitives() const; QList<CustomElementPart *> scaledPrimitives() const;
@@ -297,10 +297,10 @@ class ScalePartsCommand : public ElementEditionCommand {
class ChangePropertiesCommand : public ElementEditionCommand { class ChangePropertiesCommand : public ElementEditionCommand {
public: public:
ChangePropertiesCommand (ElementScene *scene, QString type, DiagramContext info, QUndoCommand *parent=nullptr); ChangePropertiesCommand (ElementScene *scene, QString type, DiagramContext info, QUndoCommand *parent=nullptr);
virtual ~ChangePropertiesCommand (); ~ChangePropertiesCommand () override;
virtual void undo(); void undo() override;
virtual void redo(); void redo() override;
private: private:
QList <QString> m_type; QList <QString> m_type;

2
sources/editor/elementitemeditor.h
View File

@@ -36,7 +36,7 @@ class ElementItemEditor : public QWidget
// constructors, destructor // constructors, destructor
public: public:
ElementItemEditor(QETElementEditor *, QWidget * = nullptr); ElementItemEditor(QETElementEditor *, QWidget * = nullptr);
virtual ~ElementItemEditor() {}; ~ElementItemEditor() override {};
private: private:
ElementItemEditor(const ElementItemEditor &); ElementItemEditor(const ElementItemEditor &);

22
sources/editor/elementprimitivedecorator.h
View File

@@ -43,15 +43,15 @@ class ElementPrimitiveDecorator : public QGraphicsObject
public: public:
ElementPrimitiveDecorator(QGraphicsItem * = nullptr); ElementPrimitiveDecorator(QGraphicsItem * = nullptr);
virtual ~ElementPrimitiveDecorator(); ~ElementPrimitiveDecorator() override;
enum { Type = UserType + 2200 }; enum { Type = UserType + 2200 };
// methods // methods
QRectF internalBoundingRect() const; QRectF internalBoundingRect() const;
virtual QRectF boundingRect () const; QRectF boundingRect () const override;
virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr); void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr) override;
virtual int type() const { return Type; } int type() const override { return Type; }
void setItems(const QList<QGraphicsItem *> &); void setItems(const QList<QGraphicsItem *> &);
void setItems(const QList<CustomElementPart *> &); void setItems(const QList<CustomElementPart *> &);
QList<CustomElementPart *> items() const; QList<CustomElementPart *> items() const;
@@ -64,18 +64,18 @@ class ElementPrimitiveDecorator : public QGraphicsObject
void actionFinished(ElementEditionCommand *); void actionFinished(ElementEditionCommand *);
protected: protected:
void mousePressEvent(QGraphicsSceneMouseEvent *); void mousePressEvent(QGraphicsSceneMouseEvent *) override;
void mouseMoveEvent(QGraphicsSceneMouseEvent *); void mouseMoveEvent(QGraphicsSceneMouseEvent *) override;
void mouseReleaseEvent(QGraphicsSceneMouseEvent *); void mouseReleaseEvent(QGraphicsSceneMouseEvent *) override;
void keyPressEvent(QKeyEvent *); void keyPressEvent(QKeyEvent *) override;
void keyReleaseEvent(QKeyEvent *); void keyReleaseEvent(QKeyEvent *) override;
QPointF deltaForRoundScaling(const QRectF &, const QRectF &, qreal); QPointF deltaForRoundScaling(const QRectF &, const QRectF &, qreal);
QPointF snapConstPointToGrid(const QPointF &) const; QPointF snapConstPointToGrid(const QPointF &) const;
void snapPointToGrid(QPointF &) const; void snapPointToGrid(QPointF &) const;
bool mustSnapToGrid(QGraphicsSceneMouseEvent *); bool mustSnapToGrid(QGraphicsSceneMouseEvent *);
QET::ScalingMethod scalingMethod(QGraphicsSceneMouseEvent *); QET::ScalingMethod scalingMethod(QGraphicsSceneMouseEvent *);
virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value); QVariant itemChange(GraphicsItemChange change, const QVariant &value) override;
virtual bool sceneEventFilter(QGraphicsItem *watched, QEvent *event); bool sceneEventFilter(QGraphicsItem *watched, QEvent *event) override;
private: private:
void init(); void init();

16
sources/editor/elementscene.h
View File

@@ -56,7 +56,7 @@ class ElementScene : public QGraphicsScene
// constructors, destructor // constructors, destructor
public: public:
ElementScene(QETElementEditor *, QObject * = nullptr); ElementScene(QETElementEditor *, QObject * = nullptr);
virtual ~ElementScene(); ~ElementScene() override;
private: private:
ElementScene(const ElementScene &); ElementScene(const ElementScene &);
@@ -130,14 +130,14 @@ class ElementScene : public QGraphicsScene
QETElementEditor* editor() const; QETElementEditor* editor() const;
protected: protected:
virtual void mouseMoveEvent (QGraphicsSceneMouseEvent *); void mouseMoveEvent (QGraphicsSceneMouseEvent *) override;
virtual void mousePressEvent (QGraphicsSceneMouseEvent *); void mousePressEvent (QGraphicsSceneMouseEvent *) override;
virtual void mouseReleaseEvent (QGraphicsSceneMouseEvent *); void mouseReleaseEvent (QGraphicsSceneMouseEvent *) override;
virtual void mouseDoubleClickEvent (QGraphicsSceneMouseEvent *event); void mouseDoubleClickEvent (QGraphicsSceneMouseEvent *event) override;
virtual void keyPressEvent (QKeyEvent *event); void keyPressEvent (QKeyEvent *event) override;
virtual void contextMenuEvent(QGraphicsSceneContextMenuEvent *event); void contextMenuEvent(QGraphicsSceneContextMenuEvent *event) override;
virtual void drawForeground(QPainter *, const QRectF &); void drawForeground(QPainter *, const QRectF &) override;
private: private:
QRectF elementContentBoundingRect(const ElementContent &) const; QRectF elementContentBoundingRect(const ElementContent &) const;

14
sources/editor/elementview.h
View File

@@ -31,7 +31,7 @@ class ElementView : public QGraphicsView {
// constructors, destructor // constructors, destructor
public: public:
ElementView(ElementScene *, QWidget * = nullptr); ElementView(ElementScene *, QWidget * = nullptr);
virtual ~ElementView(); ~ElementView() override;
private: private:
ElementView(const ElementView &); ElementView(const ElementView &);
@@ -43,13 +43,13 @@ class ElementView : public QGraphicsView {
QRectF viewedSceneRect() const; QRectF viewedSceneRect() const;
protected: protected:
void mousePressEvent(QMouseEvent *); void mousePressEvent(QMouseEvent *) override;
void mouseMoveEvent(QMouseEvent *); void mouseMoveEvent(QMouseEvent *) override;
void mouseReleaseEvent(QMouseEvent *); void mouseReleaseEvent(QMouseEvent *) override;
bool gestureEvent(QGestureEvent *event); bool gestureEvent(QGestureEvent *event);
bool event(QEvent *event); bool event(QEvent *event) override;
void wheelEvent(QWheelEvent *); void wheelEvent(QWheelEvent *) override;
virtual void drawBackground(QPainter *, const QRectF &); void drawBackground(QPainter *, const QRectF &) override;
private: private:
QRectF applyMovement(const QRectF &, const QPointF &); QRectF applyMovement(const QRectF &, const QPointF &);

8
sources/editor/ellipseeditor.h
View File

@@ -34,7 +34,7 @@ class EllipseEditor : public ElementItemEditor
// constructors, destructor // constructors, destructor
public: public:
EllipseEditor(QETElementEditor *, PartEllipse * = nullptr, QWidget * = nullptr); EllipseEditor(QETElementEditor *, PartEllipse * = nullptr, QWidget * = nullptr);
virtual ~EllipseEditor(); ~EllipseEditor() override;
private: private:
EllipseEditor(const EllipseEditor &); EllipseEditor(const EllipseEditor &);
@@ -47,12 +47,12 @@ class EllipseEditor : public ElementItemEditor
// methods // methods
public: public:
virtual bool setPart(CustomElementPart *); bool setPart(CustomElementPart *) override;
virtual CustomElementPart *currentPart() const; CustomElementPart *currentPart() const override;
public slots: public slots:
void editingFinished(); void editingFinished();
void updateForm(); void updateForm() override;
private: private:
void activeConnections(bool); void activeConnections(bool);

10
sources/editor/esevent/eseventaddarc.h
View File

@@ -32,12 +32,12 @@ class ESEventAddArc : public ESEventInterface
{ {
public: public:
ESEventAddArc(ElementScene *scene); ESEventAddArc(ElementScene *scene);
virtual ~ESEventAddArc(); ~ESEventAddArc() override;
virtual bool mousePressEvent (QGraphicsSceneMouseEvent *event); bool mousePressEvent (QGraphicsSceneMouseEvent *event) override;
virtual bool mouseMoveEvent (QGraphicsSceneMouseEvent *event); bool mouseMoveEvent (QGraphicsSceneMouseEvent *event) override;
virtual bool mouseReleaseEvent (QGraphicsSceneMouseEvent *event); bool mouseReleaseEvent (QGraphicsSceneMouseEvent *event) override;
virtual bool keyPressEvent (QKeyEvent *event); bool keyPressEvent (QKeyEvent *event) override;
private: private:
void updateArc (); void updateArc ();

8
sources/editor/esevent/eseventaddellipse.h
View File

@@ -33,11 +33,11 @@ class ESEventAddEllipse : public ESEventInterface
{ {
public: public:
ESEventAddEllipse(ElementScene *scene); ESEventAddEllipse(ElementScene *scene);
~ESEventAddEllipse(); ~ESEventAddEllipse() override;
virtual bool mousePressEvent (QGraphicsSceneMouseEvent *event); bool mousePressEvent (QGraphicsSceneMouseEvent *event) override;
virtual bool mouseMoveEvent (QGraphicsSceneMouseEvent *event); bool mouseMoveEvent (QGraphicsSceneMouseEvent *event) override;
virtual bool mouseReleaseEvent (QGraphicsSceneMouseEvent *event); bool mouseReleaseEvent (QGraphicsSceneMouseEvent *event) override;
private: private:
PartEllipse *m_ellipse; PartEllipse *m_ellipse;

8
sources/editor/esevent/eseventaddline.h
View File

@@ -32,11 +32,11 @@ class ESEventAddLine : public ESEventInterface
{ {
public: public:
ESEventAddLine(ElementScene *scene); ESEventAddLine(ElementScene *scene);
virtual ~ESEventAddLine(); ~ESEventAddLine() override;
virtual bool mousePressEvent (QGraphicsSceneMouseEvent *event); bool mousePressEvent (QGraphicsSceneMouseEvent *event) override;
virtual bool mouseMoveEvent (QGraphicsSceneMouseEvent *event); bool mouseMoveEvent (QGraphicsSceneMouseEvent *event) override;
virtual bool mouseReleaseEvent (QGraphicsSceneMouseEvent *event); bool mouseReleaseEvent (QGraphicsSceneMouseEvent *event) override;
private: private:
PartLine *m_line; PartLine *m_line;

10
sources/editor/esevent/eseventaddpolygon.h
View File

@@ -32,12 +32,12 @@ class ESEventAddPolygon : public ESEventInterface
{ {
public: public:
ESEventAddPolygon(ElementScene *scene); ESEventAddPolygon(ElementScene *scene);
virtual ~ESEventAddPolygon(); ~ESEventAddPolygon() override;
virtual bool mousePressEvent (QGraphicsSceneMouseEvent *event); bool mousePressEvent (QGraphicsSceneMouseEvent *event) override;
virtual bool mouseMoveEvent (QGraphicsSceneMouseEvent *event); bool mouseMoveEvent (QGraphicsSceneMouseEvent *event) override;
virtual bool mouseReleaseEvent (QGraphicsSceneMouseEvent *event); bool mouseReleaseEvent (QGraphicsSceneMouseEvent *event) override;
virtual bool mouseDoubleClickEvent (QGraphicsSceneMouseEvent *event); bool mouseDoubleClickEvent (QGraphicsSceneMouseEvent *event) override;
private: private:
PartPolygon *m_polygon; PartPolygon *m_polygon;

8
sources/editor/esevent/eseventaddrect.h
View File

@@ -29,11 +29,11 @@ class ESEventAddRect : public ESEventInterface
{ {
public: public:
ESEventAddRect(ElementScene *scene); ESEventAddRect(ElementScene *scene);
virtual ~ESEventAddRect(); ~ESEventAddRect() override;
virtual bool mousePressEvent (QGraphicsSceneMouseEvent *event); bool mousePressEvent (QGraphicsSceneMouseEvent *event) override;
virtual bool mouseMoveEvent (QGraphicsSceneMouseEvent *event); bool mouseMoveEvent (QGraphicsSceneMouseEvent *event) override;
virtual bool mouseReleaseEvent (QGraphicsSceneMouseEvent *event); bool mouseReleaseEvent (QGraphicsSceneMouseEvent *event) override;
private: private:
PartRectangle *m_rect; PartRectangle *m_rect;

8
sources/editor/esevent/eseventaddterminal.h
View File

@@ -32,11 +32,11 @@ class ESEventAddTerminal : public ESEventInterface
{ {
public: public:
ESEventAddTerminal(ElementScene *scene); ESEventAddTerminal(ElementScene *scene);
virtual ~ESEventAddTerminal(); ~ESEventAddTerminal() override;
virtual bool mouseMoveEvent (QGraphicsSceneMouseEvent *event); bool mouseMoveEvent (QGraphicsSceneMouseEvent *event) override;
virtual bool mouseReleaseEvent (QGraphicsSceneMouseEvent *event); bool mouseReleaseEvent (QGraphicsSceneMouseEvent *event) override;
virtual bool keyPressEvent (QKeyEvent *event); bool keyPressEvent (QKeyEvent *event) override;
private: private:
PartTerminal *m_terminal; PartTerminal *m_terminal;

6
sources/editor/esevent/eseventaddtext.h
View File

@@ -32,10 +32,10 @@ class ESEventAddText : public ESEventInterface
{ {
public: public:
ESEventAddText(ElementScene *scene); ESEventAddText(ElementScene *scene);
virtual ~ESEventAddText(); ~ESEventAddText() override;
virtual bool mouseMoveEvent (QGraphicsSceneMouseEvent *event); bool mouseMoveEvent (QGraphicsSceneMouseEvent *event) override;
virtual bool mouseReleaseEvent (QGraphicsSceneMouseEvent *event); bool mouseReleaseEvent (QGraphicsSceneMouseEvent *event) override;
private: private:
PartText *m_text; PartText *m_text;

6
sources/editor/esevent/eseventaddtextfield.h
View File

@@ -32,10 +32,10 @@ class ESEventAddTextField : public ESEventInterface
{ {
public: public:
ESEventAddTextField(ElementScene *scene); ESEventAddTextField(ElementScene *scene);
virtual ~ESEventAddTextField(); ~ESEventAddTextField() override;
virtual bool mouseMoveEvent (QGraphicsSceneMouseEvent *event); bool mouseMoveEvent (QGraphicsSceneMouseEvent *event) override;
virtual bool mouseReleaseEvent (QGraphicsSceneMouseEvent *event); bool mouseReleaseEvent (QGraphicsSceneMouseEvent *event) override;
private: private:
PartTextField *m_text; PartTextField *m_text;

12
sources/editor/graphicspart/abstractpartellipse.h
View File

@@ -42,7 +42,7 @@ class AbstractPartEllipse : public CustomElementGraphicPart
// constructors, destructor // constructors, destructor
public: public:
AbstractPartEllipse(QETElementEditor *editor, QGraphicsItem * parent = nullptr); AbstractPartEllipse(QETElementEditor *editor, QGraphicsItem * parent = nullptr);
virtual ~AbstractPartEllipse(); ~AbstractPartEllipse() override;
private: private:
AbstractPartEllipse(const AbstractPartEllipse &); AbstractPartEllipse(const AbstractPartEllipse &);
@@ -54,17 +54,17 @@ class AbstractPartEllipse : public CustomElementGraphicPart
// methods // methods
public: public:
virtual void startUserTransformation (const QRectF &); void startUserTransformation (const QRectF &) override;
virtual void handleUserTransformation (const QRectF &, const QRectF &); void handleUserTransformation (const QRectF &, const QRectF &) override;
//Coordinates //Coordinates
virtual QRectF boundingRect() const; QRectF boundingRect() const override;
virtual QRectF sceneGeometricRect() const; QRectF sceneGeometricRect() const override;
virtual QPointF sceneTopLeft() const; virtual QPointF sceneTopLeft() const;
QRectF rect() const; QRectF rect() const;
virtual void setRect (const QRectF &rect); virtual void setRect (const QRectF &rect);
virtual bool isUseless() const; bool isUseless() const override;
int startAngle() const {return m_start_angle;} int startAngle() const {return m_start_angle;}
virtual void setStartAngle (const int &start_angle); virtual void setStartAngle (const int &start_angle);

20
sources/editor/graphicspart/customelementgraphicpart.h
View File

@@ -65,7 +65,7 @@ class CustomElementGraphicPart : public QGraphicsObject, public CustomElementPar
public: public:
CustomElementGraphicPart(QETElementEditor *editor, QGraphicsItem *parent = nullptr); CustomElementGraphicPart(QETElementEditor *editor, QGraphicsItem *parent = nullptr);
virtual ~CustomElementGraphicPart(); ~CustomElementGraphicPart() override;
static void drawCross (const QPointF &center, QPainter *painter); static void drawCross (const QPointF &center, QPainter *painter);
@@ -89,8 +89,8 @@ class CustomElementGraphicPart : public QGraphicsObject, public CustomElementPar
//Rediriged to QObject Q_PROPERTY system //Rediriged to QObject Q_PROPERTY system
virtual void setProperty (const char *name, const QVariant &value) {QObject::setProperty(name, value);} void setProperty (const char *name, const QVariant &value) override {QObject::setProperty(name, value);}
virtual QVariant property (const char *name) const {return QObject::property(name);} QVariant property (const char *name) const override {return QObject::property(name);}
virtual QPainterPath shadowShape ()const = 0; virtual QPainterPath shadowShape ()const = 0;
@@ -101,14 +101,14 @@ class CustomElementGraphicPart : public QGraphicsObject, public CustomElementPar
void applyStylesToQPainter(QPainter &) const; void applyStylesToQPainter(QPainter &) const;
void drawShadowShape (QPainter *painter); void drawShadowShape (QPainter *painter);
QVariant itemChange(GraphicsItemChange change, const QVariant &value); QVariant itemChange(GraphicsItemChange change, const QVariant &value) override;
void hoverEnterEvent(QGraphicsSceneHoverEvent *event); void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override;
void hoverMoveEvent (QGraphicsSceneHoverEvent *event); void hoverMoveEvent (QGraphicsSceneHoverEvent *event) override;
void hoverLeaveEvent(QGraphicsSceneHoverEvent *event); void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override;
virtual void mousePressEvent(QGraphicsSceneMouseEvent *event); void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event); void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
// attributes // attributes
bool m_hovered; bool m_hovered;

30
sources/editor/graphicspart/partarc.h
View File

@@ -34,7 +34,7 @@ class PartArc : public AbstractPartEllipse
public: public:
PartArc(QETElementEditor *editor, QGraphicsItem *parent = nullptr); PartArc(QETElementEditor *editor, QGraphicsItem *parent = nullptr);
virtual ~PartArc(); ~PartArc() override;
private: private:
PartArc(const PartArc &); PartArc(const PartArc &);
@@ -45,25 +45,25 @@ class PartArc : public AbstractPartEllipse
* Enable the use of qgraphicsitem_cast to safely cast a QGraphicsItem into a PartArc. * Enable the use of qgraphicsitem_cast to safely cast a QGraphicsItem into a PartArc.
* @return the QGraphicsItem type * @return the QGraphicsItem type
*/ */
virtual int type() const { return Type; } int type() const override { return Type; }
virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr); void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr) override;
//Name and XML //Name and XML
virtual QString name() const { return(QObject::tr("arc", "element part name")); } QString name() const override { return(QObject::tr("arc", "element part name")); }
virtual QString xmlName() const { return(QString("arc")); } QString xmlName() const override { return(QString("arc")); }
virtual const QDomElement toXml (QDomDocument &) const; const QDomElement toXml (QDomDocument &) const override;
virtual void fromXml (const QDomElement &); void fromXml (const QDomElement &) override;
virtual QPainterPath shape() const; QPainterPath shape() const override;
virtual QPainterPath shadowShape() const; QPainterPath shadowShape() const override;
virtual void setRect(const QRectF &rect) {AbstractPartEllipse::setRect(rect); adjusteHandlerPos();} void setRect(const QRectF &rect) override {AbstractPartEllipse::setRect(rect); adjusteHandlerPos();}
virtual void setStartAngle(const int &start_angle) {AbstractPartEllipse::setStartAngle(start_angle); adjusteHandlerPos();} void setStartAngle(const int &start_angle) override {AbstractPartEllipse::setStartAngle(start_angle); adjusteHandlerPos();}
virtual void setSpanAngle(const int &span_angle) {AbstractPartEllipse::setSpanAngle(span_angle); adjusteHandlerPos();} void setSpanAngle(const int &span_angle) override {AbstractPartEllipse::setSpanAngle(span_angle); adjusteHandlerPos();}
protected: protected:
virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value); QVariant itemChange(GraphicsItemChange change, const QVariant &value) override;
virtual bool sceneEventFilter(QGraphicsItem *watched, QEvent *event); bool sceneEventFilter(QGraphicsItem *watched, QEvent *event) override;
private: private:
void switchResizeMode(); void switchResizeMode();

26
sources/editor/graphicspart/partellipse.h
View File

@@ -34,7 +34,7 @@ class PartEllipse : public AbstractPartEllipse
// constructors, destructor // constructors, destructor
public: public:
PartEllipse(QETElementEditor *editor, QGraphicsItem * parent = nullptr); PartEllipse(QETElementEditor *editor, QGraphicsItem * parent = nullptr);
virtual ~PartEllipse(); ~PartEllipse() override;
private: private:
PartEllipse(const PartEllipse &); PartEllipse(const PartEllipse &);
@@ -46,22 +46,22 @@ class PartEllipse : public AbstractPartEllipse
* Enable the use of qgraphicsitem_cast to safely cast a QGraphicsItem into a PartEllipse. * Enable the use of qgraphicsitem_cast to safely cast a QGraphicsItem into a PartEllipse.
* @return the QGraphicsItem type * @return the QGraphicsItem type
*/ */
virtual int type() const { return Type; } int type() const override { return Type; }
virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr); void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr) override;
//Name and XML //Name and XML
virtual QString name() const { return(QObject::tr("ellipse", "element part name")); } QString name() const override { return(QObject::tr("ellipse", "element part name")); }
virtual QString xmlName() const { return(QString("ellipse")); } QString xmlName() const override { return(QString("ellipse")); }
virtual const QDomElement toXml (QDomDocument &) const; const QDomElement toXml (QDomDocument &) const override;
virtual void fromXml (const QDomElement &); void fromXml (const QDomElement &) override;
virtual QPainterPath shape() const; QPainterPath shape() const override;
virtual QPainterPath shadowShape() const; QPainterPath shadowShape() const override;
virtual void setRect(const QRectF &rect) {AbstractPartEllipse::setRect(rect); adjusteHandlerPos();} void setRect(const QRectF &rect) override {AbstractPartEllipse::setRect(rect); adjusteHandlerPos();}
protected: protected:
virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value); QVariant itemChange(GraphicsItemChange change, const QVariant &value) override;
virtual bool sceneEventFilter(QGraphicsItem *watched, QEvent *event); bool sceneEventFilter(QGraphicsItem *watched, QEvent *event) override;
private: private:
void switchResizeMode(); void switchResizeMode();

32
sources/editor/graphicspart/partline.h
View File

@@ -46,7 +46,7 @@ class PartLine : public CustomElementGraphicPart
// constructors, destructor // constructors, destructor
public: public:
PartLine(QETElementEditor *, QGraphicsItem * = nullptr); PartLine(QETElementEditor *, QGraphicsItem * = nullptr);
virtual ~PartLine(); ~PartLine() override;
private: private:
PartLine(const PartLine &); PartLine(const PartLine &);
@@ -66,21 +66,21 @@ class PartLine : public CustomElementGraphicPart
* Enable the use of qgraphicsitem_cast to safely cast a QGraphicsItem into a PartLine. * Enable the use of qgraphicsitem_cast to safely cast a QGraphicsItem into a PartLine.
* @return the QGraphicsItem type * @return the QGraphicsItem type
*/ */
virtual int type() const { return Type; } int type() const override { return Type; }
virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr); void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr) override;
virtual QString name() const { return(QObject::tr("ligne", "element part name")); } QString name() const override { return(QObject::tr("ligne", "element part name")); }
virtual QString xmlName() const { return(QString("line")); } QString xmlName() const override { return(QString("line")); }
virtual const QDomElement toXml(QDomDocument &) const; const QDomElement toXml(QDomDocument &) const override;
virtual void fromXml(const QDomElement &); void fromXml(const QDomElement &) override;
virtual QPointF sceneP1() const; virtual QPointF sceneP1() const;
virtual QPointF sceneP2() const; virtual QPointF sceneP2() const;
virtual QPainterPath shape() const; QPainterPath shape() const override;
virtual QPainterPath shadowShape() const; QPainterPath shadowShape() const override;
virtual QRectF boundingRect() const; QRectF boundingRect() const override;
virtual bool isUseless() const; bool isUseless() const override;
virtual QRectF sceneGeometricRect() const; QRectF sceneGeometricRect() const override;
virtual void startUserTransformation(const QRectF &); void startUserTransformation(const QRectF &) override;
virtual void handleUserTransformation(const QRectF &, const QRectF &); void handleUserTransformation(const QRectF &, const QRectF &) override;
static uint requiredLengthForEndType(const Qet::EndType &); static uint requiredLengthForEndType(const Qet::EndType &);
static QList<QPointF> fourEndPoints(const QPointF &, const QPointF &, const qreal &); static QList<QPointF> fourEndPoints(const QPointF &, const QPointF &, const qreal &);
@@ -96,8 +96,8 @@ class PartLine : public CustomElementGraphicPart
void setSecondEndLength(const qreal &l); void setSecondEndLength(const qreal &l);
protected: protected:
virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value); QVariant itemChange(GraphicsItemChange change, const QVariant &value) override;
virtual bool sceneEventFilter(QGraphicsItem *watched, QEvent *event); bool sceneEventFilter(QGraphicsItem *watched, QEvent *event) override;
private: private:
void adjusteHandlerPos(); void adjusteHandlerPos();

34
sources/editor/graphicspart/partpolygon.h
View File

@@ -39,7 +39,7 @@ class PartPolygon : public CustomElementGraphicPart
// constructors, destructor // constructors, destructor
public: public:
PartPolygon(QETElementEditor *editor, QGraphicsItem *parent = nullptr); PartPolygon(QETElementEditor *editor, QGraphicsItem *parent = nullptr);
virtual ~PartPolygon(); ~PartPolygon() override;
private: private:
PartPolygon(const PartPolygon &); PartPolygon(const PartPolygon &);
@@ -55,23 +55,23 @@ class PartPolygon : public CustomElementGraphicPart
* Enable the use of qgraphicsitem_cast to safely cast a QGraphicsItem into a PartPolygon. * Enable the use of qgraphicsitem_cast to safely cast a QGraphicsItem into a PartPolygon.
* @return the QGraphicsItem type * @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;
virtual QString name() const { return(QObject::tr("polygone", "element part name")); } QString name() const override { return(QObject::tr("polygone", "element part name")); }
virtual QString xmlName() const { return(QString("polygon")); } QString xmlName() const override { return(QString("polygon")); }
void fromXml(const QDomElement &); void fromXml(const QDomElement &) override;
const QDomElement toXml(QDomDocument &) const; const QDomElement toXml(QDomDocument &) const override;
virtual QPainterPath shape () const; QPainterPath shape () const override;
virtual QPainterPath shadowShape() const; QPainterPath shadowShape() const override;
virtual QRectF boundingRect() const; QRectF boundingRect() const override;
virtual bool isUseless() const; bool isUseless() const override;
virtual QRectF sceneGeometricRect() const; QRectF sceneGeometricRect() const override;
virtual void startUserTransformation(const QRectF &); void startUserTransformation(const QRectF &) override;
virtual void handleUserTransformation(const QRectF &, const QRectF &); void handleUserTransformation(const QRectF &, const QRectF &) override;
virtual QET::ScalingMethod preferredScalingMethod() const; QET::ScalingMethod preferredScalingMethod() const override;
QPolygonF polygon () const; QPolygonF polygon () const;
void setPolygon (const QPolygonF &polygon); void setPolygon (const QPolygonF &polygon);
@@ -84,8 +84,8 @@ class PartPolygon : public CustomElementGraphicPart
void setClosed (bool close); void setClosed (bool close);
protected: protected:
virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value); QVariant itemChange(GraphicsItemChange change, const QVariant &value) override;
virtual bool sceneEventFilter(QGraphicsItem *watched, QEvent *event); bool sceneEventFilter(QGraphicsItem *watched, QEvent *event) override;
private: private:
void adjusteHandlerPos(); void adjusteHandlerPos();

34
sources/editor/graphicspart/partrectangle.h
View File

@@ -37,7 +37,7 @@ class PartRectangle : public CustomElementGraphicPart
// constructors, destructor // constructors, destructor
public: public:
PartRectangle(QETElementEditor *, QGraphicsItem *parent = nullptr); PartRectangle(QETElementEditor *, QGraphicsItem *parent = nullptr);
virtual ~PartRectangle(); ~PartRectangle() override;
private: private:
PartRectangle(const PartRectangle &); PartRectangle(const PartRectangle &);
@@ -52,32 +52,32 @@ class PartRectangle : public CustomElementGraphicPart
* Enable the use of qgraphicsitem_cast to safely cast a QGraphicsItem into a PartRectangle. * Enable the use of qgraphicsitem_cast to safely cast a QGraphicsItem into a PartRectangle.
* @return the QGraphicsItem type * @return the QGraphicsItem type
*/ */
virtual int type () const { return Type; } int type () const override { return Type; }
virtual void paint (QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr); void paint (QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr) override;
virtual QString name () const { return(QObject::tr("rectangle", "element part name")); } QString name () const override { return(QObject::tr("rectangle", "element part name")); }
virtual QString xmlName () const { return(QString("rect")); } QString xmlName () const override { return(QString("rect")); }
virtual const QDomElement toXml (QDomDocument &) const; const QDomElement toXml (QDomDocument &) const override;
virtual void fromXml (const QDomElement &); void fromXml (const QDomElement &) override;
QRectF rect() const; QRectF rect() const;
void setRect(const QRectF &rect); void setRect(const QRectF &rect);
virtual QRectF sceneGeometricRect() const; QRectF sceneGeometricRect() const override;
virtual QPointF sceneTopLeft() const; virtual QPointF sceneTopLeft() const;
virtual QPainterPath shape () const; QPainterPath shape () const override;
virtual QPainterPath shadowShape() const; QPainterPath shadowShape() const override;
virtual QRectF boundingRect() const; QRectF boundingRect() const override;
virtual bool isUseless() const; bool isUseless() const override;
virtual void startUserTransformation(const QRectF &); void startUserTransformation(const QRectF &) override;
virtual void handleUserTransformation(const QRectF &, const QRectF &); void handleUserTransformation(const QRectF &, const QRectF &) override;
protected: protected:
virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value); QVariant itemChange(GraphicsItemChange change, const QVariant &value) override;
virtual bool sceneEventFilter(QGraphicsItem *watched, QEvent *event); bool sceneEventFilter(QGraphicsItem *watched, QEvent *event) override;
private: private:
void switchResizeMode(); void switchResizeMode();

28
sources/editor/graphicspart/partterminal.h
View File

@@ -36,7 +36,7 @@ class PartTerminal : public CustomElementGraphicPart
public: public:
// constructors, destructor // constructors, destructor
PartTerminal(QETElementEditor *editor, QGraphicsItem *parent = nullptr); PartTerminal(QETElementEditor *editor, QGraphicsItem *parent = nullptr);
virtual ~PartTerminal(); ~PartTerminal() override;
private: private:
PartTerminal(const PartTerminal &); PartTerminal(const PartTerminal &);
@@ -56,20 +56,20 @@ class PartTerminal : public CustomElementGraphicPart
* Enable the use of qgraphicsitem_cast to safely cast a QGraphicsItem into a PartTerminal. * Enable the use of qgraphicsitem_cast to safely cast a QGraphicsItem into a PartTerminal.
* @return the QGraphicsItem type * @return the QGraphicsItem type
*/ */
virtual int type() const { return Type; } int type() const override { return Type; }
virtual QString name() const { return(QObject::tr("borne", "element part name")); } QString name() const override { return(QObject::tr("borne", "element part name")); }
virtual QString xmlName() const { return(QString("terminal")); } QString xmlName() const override { return(QString("terminal")); }
virtual void fromXml(const QDomElement &); void fromXml(const QDomElement &) override;
virtual const QDomElement toXml(QDomDocument &) const; const QDomElement toXml(QDomDocument &) const override;
virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *); void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) override;
virtual QPainterPath shape() const; QPainterPath shape() const override;
virtual QPainterPath shadowShape() const {return shape();} QPainterPath shadowShape() const override {return shape();}
virtual QRectF boundingRect() const; QRectF boundingRect() const override;
virtual bool isUseless() const; bool isUseless() const override;
virtual QRectF sceneGeometricRect() const; QRectF sceneGeometricRect() const override;
virtual void startUserTransformation(const QRectF &); void startUserTransformation(const QRectF &) override;
virtual void handleUserTransformation(const QRectF &, const QRectF &); void handleUserTransformation(const QRectF &, const QRectF &) override;
Qet::Orientation orientation() const {return m_orientation;} Qet::Orientation orientation() const {return m_orientation;}
void setOrientation(Qet::Orientation ori); void setOrientation(Qet::Orientation ori);

42
sources/editor/graphicspart/parttext.h
View File

@@ -32,7 +32,7 @@ class PartText : public QGraphicsTextItem, public CustomElementPart {
// constructors, destructor // constructors, destructor
public: public:
PartText(QETElementEditor *, QGraphicsItem * = nullptr); PartText(QETElementEditor *, QGraphicsItem * = nullptr);
virtual ~PartText(); ~PartText() override;
private: private:
PartText(const PartText &); PartText(const PartText &);
@@ -45,20 +45,20 @@ class PartText : public QGraphicsTextItem, public CustomElementPart {
PartText. PartText.
@return the QGraphicsItem type @return the QGraphicsItem type
*/ */
virtual int type() const { return Type; } int type() const override { return Type; }
virtual QString name() const { return(QObject::tr("texte", "element part name")); } QString name() const override { return(QObject::tr("texte", "element part name")); }
virtual QString xmlName() const { return(QString("text")); } QString xmlName() const override { return(QString("text")); }
void fromXml(const QDomElement &); void fromXml(const QDomElement &) override;
const QDomElement toXml(QDomDocument &) const; const QDomElement toXml(QDomDocument &) const override;
void setRotation(qreal angle) {(QGraphicsObject::setRotation(QET::correctAngle(angle)));} void setRotation(qreal angle) {(QGraphicsObject::setRotation(QET::correctAngle(angle)));}
virtual bool isUseless() const; bool isUseless() const override;
virtual QRectF sceneGeometricRect() const; QRectF sceneGeometricRect() const override;
virtual void startUserTransformation(const QRectF &); void startUserTransformation(const QRectF &) override;
virtual void handleUserTransformation(const QRectF &, const QRectF &); void handleUserTransformation(const QRectF &, const QRectF &) override;
///PROPERTY ///PROPERTY
void setProperty(const char *name, const QVariant &value) {QGraphicsTextItem::setProperty(name, value);} void setProperty(const char *name, const QVariant &value) override {QGraphicsTextItem::setProperty(name, value);}
QVariant property(const char *name) const {return QGraphicsTextItem::property(name);} QVariant property(const char *name) const override {return QGraphicsTextItem::property(name);}
// Size value // Size value
Q_PROPERTY(qreal size READ size WRITE setSize) Q_PROPERTY(qreal size READ size WRITE setSize)
qreal size () const {return font().pointSize();} qreal size () const {return font().pointSize();}
@@ -81,15 +81,15 @@ class PartText : public QGraphicsTextItem, public CustomElementPart {
void endEdition(); void endEdition();
protected: protected:
virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event); void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
virtual void mousePressEvent(QGraphicsSceneMouseEvent *event); void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
virtual void focusInEvent(QFocusEvent *); void focusInEvent(QFocusEvent *) override;
virtual void focusOutEvent(QFocusEvent *); void focusOutEvent(QFocusEvent *) override;
virtual void keyPressEvent(QKeyEvent *); void keyPressEvent(QKeyEvent *) override;
virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *); void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *) override;
virtual QVariant itemChange(GraphicsItemChange, const QVariant &); QVariant itemChange(GraphicsItemChange, const QVariant &) override;
QRectF boundingRect() const; QRectF boundingRect() const override;
private: private:
QPointF margin() const; QPointF margin() const;

42
sources/editor/graphicspart/parttextfield.h
View File

@@ -36,7 +36,7 @@ class PartTextField : public QGraphicsTextItem, public CustomElementPart
// constructors, destructor // constructors, destructor
public: public:
PartTextField(QETElementEditor *, QGraphicsItem * = nullptr); PartTextField(QETElementEditor *, QGraphicsItem * = nullptr);
virtual ~PartTextField(); ~PartTextField() override;
private: private:
PartTextField(const PartTextField &); PartTextField(const PartTextField &);
@@ -53,19 +53,19 @@ class PartTextField : public QGraphicsTextItem, public CustomElementPart
PartTextField. PartTextField.
@return the QGraphicsItem type @return the QGraphicsItem type
*/ */
virtual int type() const { return Type; } int type() const override { return Type; }
virtual QString name() const { return(QObject::tr("champ de texte", "element part name")); } QString name() const override { return(QObject::tr("champ de texte", "element part name")); }
virtual QString xmlName() const { return(QString("input")); } QString xmlName() const override { return(QString("input")); }
void fromXml(const QDomElement &); void fromXml(const QDomElement &) override;
const QDomElement toXml(QDomDocument &) const; const QDomElement toXml(QDomDocument &) const override;
virtual bool isUseless() const; bool isUseless() const override;
virtual QRectF sceneGeometricRect() const; QRectF sceneGeometricRect() const override;
virtual void startUserTransformation(const QRectF &); void startUserTransformation(const QRectF &) override;
virtual void handleUserTransformation(const QRectF &, const QRectF &); void handleUserTransformation(const QRectF &, const QRectF &) override;
///PROPERTY ///PROPERTY
virtual void setProperty(const char *name, const QVariant &value) {QGraphicsTextItem::setProperty(name, value);} void setProperty(const char *name, const QVariant &value) override {QGraphicsTextItem::setProperty(name, value);}
virtual QVariant property(const char *name) const {return QGraphicsTextItem::property(name);} QVariant property(const char *name) const override {return QGraphicsTextItem::property(name);}
// displayed text // displayed text
Q_PROPERTY(QString text READ toPlainText WRITE setPlainText) Q_PROPERTY(QString text READ toPlainText WRITE setPlainText)
@@ -97,15 +97,15 @@ class PartTextField : public QGraphicsTextItem, public CustomElementPart
void endEdition(); void endEdition();
protected: protected:
virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event); void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
virtual void mousePressEvent(QGraphicsSceneMouseEvent *event); void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
virtual void focusInEvent(QFocusEvent *); void focusInEvent(QFocusEvent *) override;
virtual void focusOutEvent(QFocusEvent *); void focusOutEvent(QFocusEvent *) override;
virtual void keyPressEvent(QKeyEvent *); void keyPressEvent(QKeyEvent *) override;
virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *); void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *) override;
virtual QVariant itemChange(GraphicsItemChange, const QVariant &); QVariant itemChange(GraphicsItemChange, const QVariant &) override;
QRectF boundingRect() const; QRectF boundingRect() const override;
private: private:
QPointF margin() const; QPointF margin() const;

8
sources/editor/lineeditor.h
View File

@@ -34,7 +34,7 @@ class LineEditor : public ElementItemEditor
// constructors, destructor // constructors, destructor
public: public:
LineEditor(QETElementEditor *, PartLine * = nullptr, QWidget * = nullptr); LineEditor(QETElementEditor *, PartLine * = nullptr, QWidget * = nullptr);
virtual ~LineEditor(); ~LineEditor() override;
private: private:
LineEditor(const LineEditor &); LineEditor(const LineEditor &);
@@ -49,8 +49,8 @@ class LineEditor : public ElementItemEditor
// methods // methods
public: public:
virtual bool setPart(CustomElementPart *); bool setPart(CustomElementPart *) override;
virtual CustomElementPart *currentPart() const; CustomElementPart *currentPart() const override;
QPointF editedP1() const; QPointF editedP1() const;
QPointF editedP2() const; QPointF editedP2() const;
@@ -60,7 +60,7 @@ class LineEditor : public ElementItemEditor
void updateLineEndType2(); void updateLineEndType2();
void updateLineEndLength2(); void updateLineEndLength2();
void lineEditingFinished(); void lineEditingFinished();
void updateForm(); void updateForm() override;
private: private:
void activeConnections(bool); void activeConnections(bool);

8
sources/editor/polygoneditor.h
View File

@@ -36,7 +36,7 @@ class PolygonEditor : public ElementItemEditor {
// constructors, destructor // constructors, destructor
public: public:
PolygonEditor(QETElementEditor *, PartPolygon * = nullptr, QWidget * = nullptr); PolygonEditor(QETElementEditor *, PartPolygon * = nullptr, QWidget * = nullptr);
virtual ~PolygonEditor(); ~PolygonEditor() override;
private: private:
PolygonEditor(const PolygonEditor &); PolygonEditor(const PolygonEditor &);
@@ -50,8 +50,8 @@ class PolygonEditor : public ElementItemEditor {
// methods // methods
public: public:
virtual bool setPart(CustomElementPart *); bool setPart(CustomElementPart *) override;
virtual CustomElementPart *currentPart() const; CustomElementPart *currentPart() const override;
private: private:
QVector<QPointF> getPointsFromTree(); QVector<QPointF> getPointsFromTree();
@@ -59,7 +59,7 @@ class PolygonEditor : public ElementItemEditor {
public slots: public slots:
void updatePolygonPoints(); void updatePolygonPoints();
void updatePolygonClosedState(); void updatePolygonClosedState();
void updateForm(); void updateForm() override;
void validColumn(QTreeWidgetItem *qtwi, int column); void validColumn(QTreeWidgetItem *qtwi, int column);
private: private:

6
sources/editor/qetelementeditor.h
View File

@@ -37,7 +37,7 @@ class QETElementEditor : public QETMainWindow {
// constructor, destructor // constructor, destructor
public: public:
QETElementEditor(QWidget * = nullptr); QETElementEditor(QWidget * = nullptr);
virtual ~QETElementEditor(); ~QETElementEditor() override;
private: private:
QETElementEditor(const QETElementEditor &); QETElementEditor(const QETElementEditor &);
void setupActions(); void setupActions();
@@ -116,8 +116,8 @@ class QETElementEditor : public QETMainWindow {
void saveToLocation(ElementsLocation loc); void saveToLocation(ElementsLocation loc);
protected: protected:
void closeEvent(QCloseEvent *); void closeEvent(QCloseEvent *) override;
virtual void firstActivation(QEvent *); void firstActivation(QEvent *) override;
private: private:
bool canClose(); bool canClose();

8
sources/editor/rectangleeditor.h
View File

@@ -34,7 +34,7 @@ class RectangleEditor : public ElementItemEditor
// constructors, destructor // constructors, destructor
public: public:
RectangleEditor(QETElementEditor *, PartRectangle * = nullptr, QWidget * = nullptr); RectangleEditor(QETElementEditor *, PartRectangle * = nullptr, QWidget * = nullptr);
virtual ~RectangleEditor(); ~RectangleEditor() override;
private: private:
RectangleEditor(const RectangleEditor &); RectangleEditor(const RectangleEditor &);
@@ -47,12 +47,12 @@ class RectangleEditor : public ElementItemEditor
// methods // methods
public: public:
virtual bool setPart(CustomElementPart *); bool setPart(CustomElementPart *) override;
virtual CustomElementPart *currentPart() const; CustomElementPart *currentPart() const override;
QPointF editedTopLeft () const; QPointF editedTopLeft () const;
public slots: public slots:
void updateForm(); void updateForm() override;
void editingFinished(); void editingFinished();
private: private:

10
sources/editor/styleeditor.h
View File

@@ -37,7 +37,7 @@ class StyleEditor : public ElementItemEditor
// constructors, destructor // constructors, destructor
public: public:
StyleEditor(QETElementEditor *, CustomElementGraphicPart * = nullptr, QWidget * = nullptr); StyleEditor(QETElementEditor *, CustomElementGraphicPart * = nullptr, QWidget * = nullptr);
virtual ~StyleEditor(); ~StyleEditor() override;
private: private:
StyleEditor(const StyleEditor &); StyleEditor(const StyleEditor &);
@@ -53,14 +53,14 @@ class StyleEditor : public ElementItemEditor
// methods // methods
public: public:
virtual bool setPart(CustomElementPart *); bool setPart(CustomElementPart *) override;
virtual bool setParts(QList<CustomElementPart *>); bool setParts(QList<CustomElementPart *>) override;
virtual CustomElementPart *currentPart() const; CustomElementPart *currentPart() const override;
static bool isStyleEditable (QList <CustomElementPart *> cep_list); static bool isStyleEditable (QList <CustomElementPart *> cep_list);
public slots: public slots:
void updateForm(); void updateForm() override;
void updatePartAntialiasing(); void updatePartAntialiasing();
void updatePartColor(); void updatePartColor();
void updatePartLineStyle(); void updatePartLineStyle();

8
sources/editor/terminaleditor.h
View File

@@ -32,7 +32,7 @@ class TerminalEditor : public ElementItemEditor {
// Constructors, destructor // Constructors, destructor
public: public:
TerminalEditor(QETElementEditor *, PartTerminal * = nullptr, QWidget * = nullptr); TerminalEditor(QETElementEditor *, PartTerminal * = nullptr, QWidget * = nullptr);
virtual ~TerminalEditor(); ~TerminalEditor() override;
private: private:
TerminalEditor(const TerminalEditor &); TerminalEditor(const TerminalEditor &);
@@ -45,13 +45,13 @@ class TerminalEditor : public ElementItemEditor {
// methods // methods
public: public:
virtual bool setPart(CustomElementPart *); bool setPart(CustomElementPart *) override;
virtual CustomElementPart *currentPart() const; CustomElementPart *currentPart() const override;
public slots: public slots:
void updateTerminalO(); void updateTerminalO();
void updatePos(); void updatePos();
void updateForm(); void updateForm() override;
private: private:
void activeConnections(bool); void activeConnections(bool);

8
sources/editor/texteditor.h
View File

@@ -39,7 +39,7 @@ class TextEditor : public ElementItemEditor
// Constructors, destructor // Constructors, destructor
public: public:
TextEditor(QETElementEditor *, PartText * = nullptr, QWidget * = nullptr); TextEditor(QETElementEditor *, PartText * = nullptr, QWidget * = nullptr);
virtual ~TextEditor(); ~TextEditor() override;
private: private:
TextEditor(const TextEditor &); TextEditor(const TextEditor &);
@@ -56,8 +56,8 @@ class TextEditor : public ElementItemEditor
// methods // methods
public: public:
virtual bool setPart(CustomElementPart *); bool setPart(CustomElementPart *) override;
virtual CustomElementPart *currentPart() const; CustomElementPart *currentPart() const override;
public slots: public slots:
void updateTextT(); void updateTextT();
@@ -65,7 +65,7 @@ class TextEditor : public ElementItemEditor
void updateTextC(); void updateTextC();
void updateTextRotationAngle(); void updateTextRotationAngle();
void updatePos(); void updatePos();
void updateForm(); void updateForm() override;
private: private:
void activeConnections(bool); void activeConnections(bool);

8
sources/editor/textfieldeditor.h
View File

@@ -38,7 +38,7 @@ class TextFieldEditor : public ElementItemEditor
// Constructors, destructor // Constructors, destructor
public: public:
TextFieldEditor(QETElementEditor *, PartTextField * = nullptr, QWidget * = nullptr); TextFieldEditor(QETElementEditor *, PartTextField * = nullptr, QWidget * = nullptr);
virtual ~TextFieldEditor(); ~TextFieldEditor() override;
private: private:
TextFieldEditor(const TextFieldEditor &); TextFieldEditor(const TextFieldEditor &);
@@ -55,8 +55,8 @@ class TextFieldEditor : public ElementItemEditor
// methods // methods
public: public:
virtual bool setPart(CustomElementPart *); bool setPart(CustomElementPart *) override;
virtual CustomElementPart *currentPart() const; CustomElementPart *currentPart() const override;
public slots: public slots:
void updateTextFieldT(); void updateTextFieldT();
@@ -65,7 +65,7 @@ class TextFieldEditor : public ElementItemEditor
void updateTextFieldRotationAngle(); void updateTextFieldRotationAngle();
void updateTagg(); void updateTagg();
void updatePos(); void updatePos();
void updateForm(); void updateForm() override;
private: private:
void activeConnections(bool); void activeConnections(bool);

2
sources/editor/ui/elementpropertieseditorwidget.h
View File

@@ -38,7 +38,7 @@ class ElementPropertiesEditorWidget : public QDialog
//METHODS //METHODS
public: public:
explicit ElementPropertiesEditorWidget(QString &basic_type, DiagramContext &dc, QWidget *parent = nullptr); explicit ElementPropertiesEditorWidget(QString &basic_type, DiagramContext &dc, QWidget *parent = nullptr);
~ElementPropertiesEditorWidget(); ~ElementPropertiesEditorWidget() override;
void upDateInterface(); void upDateInterface();

2
sources/elementscategoryeditor.h
View File

@@ -36,7 +36,7 @@ class ElementsCategoryEditor : public QDialog
public: public:
ElementsCategoryEditor(const ElementsLocation &location, bool edit = true, QWidget *parent = nullptr); ElementsCategoryEditor(const ElementsLocation &location, bool edit = true, QWidget *parent = nullptr);
virtual ~ElementsCategoryEditor(); ~ElementsCategoryEditor() override;
ElementsLocation createdLocation() const; ElementsLocation createdLocation() const;

2
sources/elementscollectioncache.h
View File

@@ -32,7 +32,7 @@ class ElementsCollectionCache : public QObject
public: public:
// constructor, destructor // constructor, destructor
ElementsCollectionCache(const QString &database_path, QObject * = nullptr); ElementsCollectionCache(const QString &database_path, QObject * = nullptr);
virtual ~ElementsCollectionCache(); ~ElementsCollectionCache() override;
// methods // methods
public: public:

8
sources/elementspanel.h
View File

@@ -37,7 +37,7 @@ class ElementsPanel : public GenericPanel {
// constructors, destructor // constructors, destructor
public: public:
ElementsPanel(QWidget * = nullptr); ElementsPanel(QWidget * = nullptr);
virtual ~ElementsPanel(); ~ElementsPanel() override;
private: private:
ElementsPanel(const ElementsPanel &); ElementsPanel(const ElementsPanel &);
@@ -66,7 +66,7 @@ class ElementsPanel : public GenericPanel {
void ensureHierarchyIsVisible(const QList<QTreeWidgetItem *> &); void ensureHierarchyIsVisible(const QList<QTreeWidgetItem *> &);
protected: protected:
void startDrag(Qt::DropActions); void startDrag(Qt::DropActions) override;
void startTitleBlockTemplateDrag(const TitleBlockTemplateLocation &); void startTitleBlockTemplateDrag(const TitleBlockTemplateLocation &);
bool matchesFilter(const QTreeWidgetItem *, QString) const; bool matchesFilter(const QTreeWidgetItem *, QString) const;
@@ -75,8 +75,8 @@ class ElementsPanel : public GenericPanel {
private: private:
virtual QTreeWidgetItem *addProject (QETProject *); virtual QTreeWidgetItem *addProject (QETProject *);
virtual QTreeWidgetItem *updateTemplatesCollectionItem(QTreeWidgetItem *, TitleBlockTemplatesCollection *, PanelOptions = AddAllChild, bool = false); QTreeWidgetItem *updateTemplatesCollectionItem(QTreeWidgetItem *, TitleBlockTemplatesCollection *, PanelOptions = AddAllChild, bool = false) override;
virtual QTreeWidgetItem *updateTemplateItem (QTreeWidgetItem *, const TitleBlockTemplateLocation &, PanelOptions, bool = false); QTreeWidgetItem *updateTemplateItem (QTreeWidgetItem *, const TitleBlockTemplateLocation &, PanelOptions, bool = false) override;
// attributes // attributes
private: private:

4
sources/elementspanelwidget.h
View File

@@ -31,7 +31,7 @@ class ElementsPanelWidget : public QWidget {
// constructors, destructor // constructors, destructor
public: public:
ElementsPanelWidget(QWidget * = nullptr); ElementsPanelWidget(QWidget * = nullptr);
virtual ~ElementsPanelWidget(); ~ElementsPanelWidget() override;
private: private:
ElementsPanelWidget(const ElementsPanelWidget &); ElementsPanelWidget(const ElementsPanelWidget &);
@@ -86,7 +86,7 @@ class ElementsPanelWidget : public QWidget {
void filterEdited(const QString &); void filterEdited(const QString &);
protected: protected:
virtual void keyPressEvent (QKeyEvent *e); void keyPressEvent (QKeyEvent *e) override;
private: private:
QString previous_filter_; QString previous_filter_;

2
sources/exportdialog.h
View File

@@ -33,7 +33,7 @@ class ExportDialog : public QDialog {
// constructors, destructor // constructors, destructor
public: public:
ExportDialog(QETProject *, QWidget * = nullptr); ExportDialog(QETProject *, QWidget * = nullptr);
virtual ~ExportDialog(); ~ExportDialog() override;
private: private:
ExportDialog(const ExportDialog &); ExportDialog(const ExportDialog &);

2
sources/exportpropertieswidget.h
View File

@@ -30,7 +30,7 @@ class ExportPropertiesWidget : public QWidget {
public: public:
ExportPropertiesWidget(QWidget * = nullptr); ExportPropertiesWidget(QWidget * = nullptr);
ExportPropertiesWidget(const ExportProperties &, QWidget * = nullptr); ExportPropertiesWidget(const ExportProperties &, QWidget * = nullptr);
virtual ~ExportPropertiesWidget(); ~ExportPropertiesWidget() override;
private: private:
ExportPropertiesWidget(const ExportPropertiesWidget &); ExportPropertiesWidget(const ExportPropertiesWidget &);

4
sources/genericpanel.h
View File

@@ -56,7 +56,7 @@ class GenericPanel : public QTreeWidget {
// Constructors, destructor // Constructors, destructor
public: public:
GenericPanel(QWidget * = nullptr); GenericPanel(QWidget * = nullptr);
virtual ~GenericPanel(); ~GenericPanel() override;
public: public:
// convenience methods to obtain what an item represents // convenience methods to obtain what an item represents
@@ -132,7 +132,7 @@ class GenericPanel : public QTreeWidget {
template<typename T> T valueForItem(QTreeWidgetItem *) const; template<typename T> T valueForItem(QTreeWidgetItem *) const;
void unregisterItem(QTreeWidgetItem *); void unregisterItem(QTreeWidgetItem *);
bool event(QEvent *); bool event(QEvent *) override;
signals: signals:
bool firstActivated(); bool firstActivated();

2
sources/nameslistwidget.h
View File

@@ -29,7 +29,7 @@ class NamesListWidget : public QWidget {
// constructors, destructor // constructors, destructor
public: public:
NamesListWidget(QWidget * = nullptr); NamesListWidget(QWidget * = nullptr);
virtual ~NamesListWidget(); ~NamesListWidget() override;
private: private:
NamesListWidget(const NamesListWidget &); NamesListWidget(const NamesListWidget &);

4
sources/newelementwizard.h
View File

@@ -42,7 +42,7 @@ class NewElementWizard : public QWizard
// constructors, destructor // constructors, destructor
public: public:
NewElementWizard(QWidget * = nullptr, Qt::WindowFlags = nullptr); NewElementWizard(QWidget * = nullptr, Qt::WindowFlags = nullptr);
virtual ~NewElementWizard(); ~NewElementWizard() override;
void preselectedLocation(const ElementsLocation &location); void preselectedLocation(const ElementsLocation &location);
@@ -66,7 +66,7 @@ class NewElementWizard : public QWizard
QWizardPage *buildStep3(); QWizardPage *buildStep3();
bool validStep1(); bool validStep1();
bool validStep2(); bool validStep2();
bool validateCurrentPage(); bool validateCurrentPage() override;
void createNewElement(); void createNewElement();
}; };
#endif #endif

34
sources/projectconfigpages.h
View File

@@ -41,7 +41,7 @@ class ProjectConfigPage : public ConfigPage {
// Constructor, destructor // Constructor, destructor
public: public:
ProjectConfigPage(QETProject *, QWidget * = nullptr); ProjectConfigPage(QETProject *, QWidget * = nullptr);
virtual ~ProjectConfigPage(); ~ProjectConfigPage() override;
private: private:
ProjectConfigPage(const ProjectConfigPage &); ProjectConfigPage(const ProjectConfigPage &);
@@ -49,7 +49,7 @@ class ProjectConfigPage : public ConfigPage {
public: public:
virtual QETProject *project() const; virtual QETProject *project() const;
virtual QETProject *setProject(QETProject *project, bool = true); virtual QETProject *setProject(QETProject *project, bool = true);
virtual void applyConf(); void applyConf() override;
/** /**
Apply configuration to the project after user input. This method is Apply configuration to the project after user input. This method is
automatically called when the ConfigDialog is validated, and only if the automatically called when the ConfigDialog is validated, and only if the
@@ -91,22 +91,22 @@ class ProjectMainConfigPage : public ProjectConfigPage {
// Constructor, destructor // Constructor, destructor
public: public:
ProjectMainConfigPage(QETProject *, QWidget * = nullptr); ProjectMainConfigPage(QETProject *, QWidget * = nullptr);
virtual ~ProjectMainConfigPage(); ~ProjectMainConfigPage() override;
private: private:
ProjectMainConfigPage(const ProjectMainConfigPage &); ProjectMainConfigPage(const ProjectMainConfigPage &);
// methods // methods
public: public:
QString title() const; QString title() const override;
QIcon icon() const; QIcon icon() const override;
void applyProjectConf(); void applyProjectConf() override;
QString projectTitle() const; QString projectTitle() const;
protected: protected:
void initWidgets(); void initWidgets() override;
void initLayout(); void initLayout() override;
void readValuesFromProject(); void readValuesFromProject() override;
void adjustReadOnly(); void adjustReadOnly() override;
// attributes // attributes
protected: protected:
@@ -124,15 +124,15 @@ class ProjectAutoNumConfigPage : public ProjectConfigPage {
public: public:
ProjectAutoNumConfigPage (QETProject *project, QWidget *parent = nullptr); ProjectAutoNumConfigPage (QETProject *project, QWidget *parent = nullptr);
virtual QString title() const; QString title() const override;
virtual QIcon icon() const; QIcon icon() const override;
virtual void applyProjectConf(); void applyProjectConf() override;
virtual void changeToTab(int); virtual void changeToTab(int);
protected: protected:
virtual void initWidgets(); void initWidgets() override;
virtual void initLayout() {} void initLayout() override {}
virtual void readValuesFromProject(); void readValuesFromProject() override;
virtual void adjustReadOnly(); void adjustReadOnly() override;
private: private:
void buildConnections(); void buildConnections();
private slots: private slots:

4
sources/projectview.h
View File

@@ -42,7 +42,7 @@ class ProjectView : public QWidget
// constructors, destructor // constructors, destructor
public: public:
ProjectView(QETProject *, QWidget * = nullptr); ProjectView(QETProject *, QWidget * = nullptr);
virtual ~ProjectView(); ~ProjectView() override;
private: private:
ProjectView(const ProjectView &); ProjectView(const ProjectView &);
@@ -52,7 +52,7 @@ class ProjectView : public QWidget
void setProject(QETProject *); void setProject(QETProject *);
QList<DiagramView *> diagram_views() const; QList<DiagramView *> diagram_views() const;
DiagramView *currentDiagram() const; DiagramView *currentDiagram() const;
void closeEvent(QCloseEvent *); void closeEvent(QCloseEvent *) override;
void changeTabUp(); void changeTabUp();
void changeTabDown(); void changeTabDown();
void changeFirstTab(); void changeFirstTab();

8
sources/properties/xrefproperties.h
View File

@@ -40,10 +40,10 @@ class XRefProperties : public PropertiesInterface
Label Label
}; };
virtual void toSettings (QSettings &settings, const QString = QString()) const; void toSettings (QSettings &settings, const QString = QString()) const override;
virtual void fromSettings (const QSettings &settings, const QString = QString()); void fromSettings (const QSettings &settings, const QString = QString()) override;
virtual void toXml (QDomElement &xml_element) const; void toXml (QDomElement &xml_element) const override;
virtual void fromXml (const QDomElement &xml_element); void fromXml (const QDomElement &xml_element) override;
static QHash<QString, XRefProperties> defaultProperties(); static QHash<QString, XRefProperties> defaultProperties();

2
sources/qetapp.h
View File

@@ -55,7 +55,7 @@ class QETApp : public QETSingleApplication {
// constructors, destructor // constructors, destructor
public: public:
QETApp(int &, char **); QETApp(int &, char **);
virtual ~QETApp(); ~QETApp() override;
private: private:
QETApp(const QETApp &); QETApp(const QETApp &);

2
sources/qetarguments.h
View File

@@ -32,7 +32,7 @@ class QETArguments : public QObject {
QETArguments(const QList<QString> &, QObject * = nullptr); QETArguments(const QList<QString> &, QObject * = nullptr);
QETArguments(const QETArguments &); QETArguments(const QETArguments &);
QETArguments &operator=(const QETArguments &); QETArguments &operator=(const QETArguments &);
virtual ~QETArguments(); ~QETArguments() override;
// methods // methods
public: public:

6
sources/qetdiagrameditor.h
View File

@@ -44,7 +44,7 @@ class QETDiagramEditor : public QETMainWindow {
// constructors, destructor // constructors, destructor
public: public:
QETDiagramEditor(const QStringList & = QStringList(), QWidget * = nullptr); QETDiagramEditor(const QStringList & = QStringList(), QWidget * = nullptr);
virtual ~QETDiagramEditor(); ~QETDiagramEditor() override;
private: private:
QETDiagramEditor(const QETDiagramEditor &); QETDiagramEditor(const QETDiagramEditor &);
@@ -61,7 +61,7 @@ class QETDiagramEditor : public QETMainWindow {
// methods // methods
public: public:
void closeEvent (QCloseEvent *); void closeEvent (QCloseEvent *) override;
QList<ProjectView *> openedProjects () const; QList<ProjectView *> openedProjects () const;
void addProjectView (ProjectView *); void addProjectView (ProjectView *);
bool openAndAddProject (const QString &, bool = true, bool = true); bool openAndAddProject (const QString &, bool = true, bool = true);
@@ -72,7 +72,7 @@ class QETDiagramEditor : public QETMainWindow {
bool drawGrid() const; bool drawGrid() const;
protected: protected:
virtual bool event(QEvent *); bool event(QEvent *) override;
private: private:
bool addProject(QETProject *, bool = true); bool addProject(QETProject *, bool = true);

6
sources/qetgraphicsitem/commentitem.h
View File

@@ -34,7 +34,7 @@ class CommentItem : public QGraphicsObject
public: public:
explicit CommentItem(Element *elmt); explicit CommentItem(Element *elmt);
virtual QRectF boundingRect() const; QRectF boundingRect() const override;
signals: signals:
@@ -43,8 +43,8 @@ class CommentItem : public QGraphicsObject
void updateLabel(); void updateLabel();
protected: protected:
virtual void paint (QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); void paint (QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
virtual void mouseDoubleClickEvent (QGraphicsSceneMouseEvent * event ); void mouseDoubleClickEvent (QGraphicsSceneMouseEvent * event ) override;
virtual bool setTextParent (); virtual bool setTextParent ();
private: private:

24
sources/qetgraphicsitem/conductor.h
View File

@@ -53,7 +53,7 @@ class Conductor : public QObject, public QGraphicsPathItem
public: public:
Conductor(Terminal *, Terminal *); Conductor(Terminal *, Terminal *);
virtual ~Conductor(); ~Conductor() override;
bool isValid() const; bool isValid() const;
@@ -72,7 +72,7 @@ class Conductor : public QObject, public QGraphicsPathItem
* Enable the use of qgraphicsitem_cast to safely cast a QGraphicsItem into a conductor. * Enable the use of qgraphicsitem_cast to safely cast a QGraphicsItem into a conductor.
* @return the QGraphicsItem type * @return the QGraphicsItem type
*/ */
virtual int type() const { return Type; } int type() const override { return Type; }
Diagram *diagram() const; Diagram *diagram() const;
ConductorTextItem *textItem() const; ConductorTextItem *textItem() const;
void updatePath(const QRectF & = QRectF()); void updatePath(const QRectF & = QRectF());
@@ -82,9 +82,9 @@ class Conductor : public QObject, public QGraphicsPathItem
void updatePathAnimate(const int = 1) {updatePath();} void updatePathAnimate(const int = 1) {updatePath();}
int fakePath() {return 1;} int fakePath() {return 1;}
void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *); void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) override;
QRectF boundingRect() const; QRectF boundingRect() const override;
virtual QPainterPath shape() const; QPainterPath shape() const override;
virtual QPainterPath nearShape() const; virtual QPainterPath nearShape() const;
qreal length() const; qreal length() const;
ConductorSegment *middleSegment(); ConductorSegment *middleSegment();
@@ -132,13 +132,13 @@ class Conductor : public QObject, public QGraphicsPathItem
void displayedTextChanged(); void displayedTextChanged();
protected: protected:
virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event); void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override;
virtual void mousePressEvent(QGraphicsSceneMouseEvent *event); void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event); void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override;
virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event); void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override;
virtual QVariant itemChange(GraphicsItemChange, const QVariant &); QVariant itemChange(GraphicsItemChange, const QVariant &) override;
virtual bool sceneEventFilter(QGraphicsItem *watched, QEvent *event); bool sceneEventFilter(QGraphicsItem *watched, QEvent *event) override;
private: private:
void adjusteHandlerPos(); void adjusteHandlerPos();

18
sources/qetgraphicsitem/conductortextitem.h
View File

@@ -34,16 +34,16 @@ class ConductorTextItem : public DiagramTextItem
public: public:
ConductorTextItem(Conductor * = nullptr); ConductorTextItem(Conductor * = nullptr);
ConductorTextItem(const QString &, Conductor * = nullptr); ConductorTextItem(const QString &, Conductor * = nullptr);
virtual ~ConductorTextItem(); ~ConductorTextItem() override;
private: private:
ConductorTextItem(const ConductorTextItem &); ConductorTextItem(const ConductorTextItem &);
public: public:
enum { Type = UserType + 1006 }; enum { Type = UserType + 1006 };
Conductor *parentConductor() const; Conductor *parentConductor() const;
virtual void fromXml(const QDomElement &); void fromXml(const QDomElement &) override;
virtual void toXml (QDomElement &xml) const; virtual void toXml (QDomElement &xml) const;
virtual int type() const { return Type; } int type() const override { return Type; }
virtual bool wasMovedByUser() const; virtual bool wasMovedByUser() const;
virtual bool wasRotateByUser() const; virtual bool wasRotateByUser() const;
virtual void forceMovedByUser(bool); virtual void forceMovedByUser(bool);
@@ -52,12 +52,12 @@ class ConductorTextItem : public DiagramTextItem
virtual void setPos(qreal x, qreal y); virtual void setPos(qreal x, qreal y);
protected: protected:
virtual void mousePressEvent (QGraphicsSceneMouseEvent *event); void mousePressEvent (QGraphicsSceneMouseEvent *event) override;
virtual void mouseMoveEvent (QGraphicsSceneMouseEvent *event); void mouseMoveEvent (QGraphicsSceneMouseEvent *event) override;
virtual void mouseReleaseEvent (QGraphicsSceneMouseEvent *event); void mouseReleaseEvent (QGraphicsSceneMouseEvent *event) override;
virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *); void hoverEnterEvent(QGraphicsSceneHoverEvent *) override;
virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *); void hoverLeaveEvent(QGraphicsSceneHoverEvent *) override;
virtual void hoverMoveEvent(QGraphicsSceneHoverEvent *); void hoverMoveEvent(QGraphicsSceneHoverEvent *) override;
// attributes // attributes
private: private:

18
sources/qetgraphicsitem/crossrefitem.h
View File

@@ -42,10 +42,10 @@ class CrossRefItem : public QGraphicsObject
//Methods //Methods
public: public:
explicit CrossRefItem(Element *elmt); explicit CrossRefItem(Element *elmt);
~CrossRefItem(); ~CrossRefItem() override;
enum { Type = UserType + 1009 }; enum { Type = UserType + 1009 };
virtual int type() const { return Type; } int type() const override { return Type; }
enum CONTACTS { enum CONTACTS {
NO = 1, NO = 1,
@@ -58,8 +58,8 @@ class CrossRefItem : public QGraphicsObject
Delay = 48 Delay = 48
}; };
QRectF boundingRect () const; QRectF boundingRect () const override;
virtual QPainterPath shape () const; QPainterPath shape () const override;
QString elementPositionText (const Element *elmt, const bool &add_prefix = false) const; QString elementPositionText (const Element *elmt, const bool &add_prefix = false) const;
public slots: public slots:
@@ -68,11 +68,11 @@ class CrossRefItem : public QGraphicsObject
void autoPos (); void autoPos ();
protected: protected:
virtual void paint (QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); void paint (QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
virtual void mouseDoubleClickEvent (QGraphicsSceneMouseEvent * event ); void mouseDoubleClickEvent (QGraphicsSceneMouseEvent * event ) override;
virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event); void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override;
virtual void hoverMoveEvent(QGraphicsSceneHoverEvent *event); void hoverMoveEvent(QGraphicsSceneHoverEvent *event) override;
virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event); void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override;
private: private:
void buildHeaderContact (); void buildHeaderContact ();

28
sources/qetgraphicsitem/customelement.h
View File

@@ -38,7 +38,7 @@ class CustomElement : public FixedElement
public: public:
CustomElement (const ElementsLocation &, QGraphicsItem * = nullptr, int * = nullptr); CustomElement (const ElementsLocation &, QGraphicsItem * = nullptr, int * = nullptr);
virtual ~CustomElement(); ~CustomElement() override;
private: private:
CustomElement(const CustomElement &); CustomElement(const CustomElement &);
@@ -62,20 +62,20 @@ class CustomElement : public FixedElement
// methods // methods
public: public:
virtual QList<Terminal *> terminals() const; QList<Terminal *> terminals() const override;
virtual QList<Conductor *> conductors() const; QList<Conductor *> conductors() const override;
virtual QList<ElementTextItem *> texts() const; QList<ElementTextItem *> texts() const override;
virtual QList<QLineF *> lines() const; QList<QLineF *> lines() const override;
virtual QList<QRectF *> rectangles() const; QList<QRectF *> rectangles() const override;
virtual QList<QRectF *> circles() const; QList<QRectF *> circles() const override;
virtual QList<QVector<QPointF> *> polygons() const; QList<QVector<QPointF> *> polygons() const override;
virtual QList<QVector<qreal> *> arcs() const; QList<QVector<qreal> *> arcs() const override;
virtual int terminalsCount() const; int terminalsCount() const override;
virtual void paint(QPainter *, const QStyleOptionGraphicsItem *); void paint(QPainter *, const QStyleOptionGraphicsItem *) override;
QString typeId() const; QString typeId() const override;
ElementsLocation location() const; ElementsLocation location() const;
QString name() const; QString name() const override;
ElementTextItem* taggedText(const QString &tagg) const; ElementTextItem* taggedText(const QString &tagg) const override;
protected: protected:
virtual bool buildFromXml(const QDomElement &, int * = nullptr); virtual bool buildFromXml(const QDomElement &, int * = nullptr);

12
sources/qetgraphicsitem/diagramimageitem.h
View File

@@ -35,7 +35,7 @@ class DiagramImageItem : public QetGraphicsItem {
public: public:
DiagramImageItem(QetGraphicsItem * = nullptr); DiagramImageItem(QetGraphicsItem * = nullptr);
DiagramImageItem(const QPixmap &pixmap, QetGraphicsItem * = nullptr); DiagramImageItem(const QPixmap &pixmap, QetGraphicsItem * = nullptr);
virtual ~DiagramImageItem(); ~DiagramImageItem() override;
// attributes // attributes
public: public:
@@ -48,17 +48,17 @@ class DiagramImageItem : public QetGraphicsItem {
DiagramImageItem DiagramImageItem
@return the QGraphicsItem type @return the QGraphicsItem type
*/ */
virtual int type() const { return Type; } int type() const override { return Type; }
virtual bool fromXml(const QDomElement &); virtual bool fromXml(const QDomElement &);
virtual QDomElement toXml(QDomDocument &) const; virtual QDomElement toXml(QDomDocument &) const;
virtual void editProperty(); void editProperty() override;
void setPixmap(const QPixmap &pixmap); void setPixmap(const QPixmap &pixmap);
virtual QRectF boundingRect() const; QRectF boundingRect() const override;
virtual QString name() const; QString name() const override;
protected: protected:
virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *); void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) override;
protected: protected:
QPixmap pixmap_; QPixmap pixmap_;

22
sources/qetgraphicsitem/diagramtextitem.h
View File

@@ -49,7 +49,7 @@ class DiagramTextItem : public QGraphicsTextItem
public: public:
enum { Type = UserType + 1004 }; enum { Type = UserType + 1004 };
virtual int type() const override { return Type; } int type() const override { return Type; }
Diagram *diagram() const; Diagram *diagram() const;
virtual void fromXml(const QDomElement &) = 0; virtual void fromXml(const QDomElement &) = 0;
@@ -73,18 +73,18 @@ class DiagramTextItem : public QGraphicsTextItem
void setNoEditable(bool e = true) {m_no_editable = e;} void setNoEditable(bool e = true) {m_no_editable = e;}
protected: protected:
virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) override; void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) override;
virtual void focusInEvent(QFocusEvent *) override; void focusInEvent(QFocusEvent *) override;
virtual void focusOutEvent(QFocusEvent *) override; void focusOutEvent(QFocusEvent *) override;
virtual void mouseDoubleClickEvent (QGraphicsSceneMouseEvent *event) override; void mouseDoubleClickEvent (QGraphicsSceneMouseEvent *event) override;
virtual void mousePressEvent (QGraphicsSceneMouseEvent *event) override; void mousePressEvent (QGraphicsSceneMouseEvent *event) override;
virtual void mouseMoveEvent (QGraphicsSceneMouseEvent *event) override; void mouseMoveEvent (QGraphicsSceneMouseEvent *event) override;
virtual void mouseReleaseEvent (QGraphicsSceneMouseEvent *event) override; void mouseReleaseEvent (QGraphicsSceneMouseEvent *event) override;
virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *) override; void hoverEnterEvent(QGraphicsSceneHoverEvent *) override;
virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *) override; void hoverLeaveEvent(QGraphicsSceneHoverEvent *) override;
virtual void hoverMoveEvent(QGraphicsSceneHoverEvent *) override; void hoverMoveEvent(QGraphicsSceneHoverEvent *) override;
virtual void applyRotation(const qreal &); virtual void applyRotation(const qreal &);

12
sources/qetgraphicsitem/dynamicelementtextitem.h
View File

@@ -44,7 +44,7 @@ class DynamicElementTextItem : public DiagramTextItem
ElementInfo ElementInfo
}; };
enum {Type = UserType + 1010}; enum {Type = UserType + 1010};
virtual int type() const override {return Type;} int type() const override {return Type;}
signals: signals:
void taggChanged(QString tagg); void taggChanged(QString tagg);
@@ -53,13 +53,13 @@ class DynamicElementTextItem : public DiagramTextItem
public: public:
DynamicElementTextItem(Element *parent_element); DynamicElementTextItem(Element *parent_element);
virtual ~DynamicElementTextItem() override; ~DynamicElementTextItem() override;
private: private:
DynamicElementTextItem(const DynamicElementTextItem &); DynamicElementTextItem(const DynamicElementTextItem &);
public: public:
virtual QDomElement toXml(QDomDocument &dom_doc) const override; QDomElement toXml(QDomDocument &dom_doc) const override;
virtual void fromXml(const QDomElement &dom_elmt) override; void fromXml(const QDomElement &dom_elmt) override;
Element *ParentElement() const; Element *ParentElement() const;
@@ -72,8 +72,8 @@ class DynamicElementTextItem : public DiagramTextItem
static QString xmlTaggName() {return QString("dynamic_elmt_text");} static QString xmlTaggName() {return QString("dynamic_elmt_text");}
protected: protected:
virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override; void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
private: private:
Element *m_parent_element = nullptr; Element *m_parent_element = nullptr;

22
sources/qetgraphicsitem/element.h
View File

@@ -42,7 +42,7 @@ class Element : public QetGraphicsItem
// constructors, destructor // constructors, destructor
public: public:
Element(QGraphicsItem * = nullptr); Element(QGraphicsItem * = nullptr);
virtual ~Element(); ~Element() override;
private: private:
Element(const Element &); Element(const Element &);
@@ -53,7 +53,7 @@ class Element : public QetGraphicsItem
* @return the QGraphicsItem type * @return the QGraphicsItem type
*/ */
enum { Type = UserType + 1000 }; enum { Type = UserType + 1000 };
virtual int type() const { return Type; } int type() const override { return Type; }
/** /**
* @brief The kind enum * @brief The kind enum
@@ -164,13 +164,13 @@ class Element : public QetGraphicsItem
/// @return This element type ID /// @return This element type ID
virtual QString typeId() const = 0; virtual QString typeId() const = 0;
/// @return the human name for this element /// @return the human name for this element
virtual QString name() const = 0; QString name() const override = 0;
virtual bool isHighlighted() const; virtual bool isHighlighted() const;
virtual void setHighlighted(bool); virtual void setHighlighted(bool);
void displayHelpLine(bool b = true); void displayHelpLine(bool b = true);
void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *); void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) override;
QRectF boundingRect() const; QRectF boundingRect() const override;
QSize setSize(int, int); QSize setSize(int, int);
QSize size() const; QSize size() const;
QPixmap pixmap(); QPixmap pixmap();
@@ -183,8 +183,8 @@ class Element : public QetGraphicsItem
void select(); void select();
void deselect(); void deselect();
virtual void rotateBy(const qreal &); void rotateBy(const qreal &) override;
virtual void editProperty(); void editProperty() override;
// methods related to XML import/export // methods related to XML import/export
static bool valideXml(QDomElement &); static bool valideXml(QDomElement &);
@@ -210,10 +210,10 @@ class Element : public QetGraphicsItem
void etiToElementLabels(ElementTextItem*); void etiToElementLabels(ElementTextItem*);
protected: protected:
virtual void mouseMoveEvent ( QGraphicsSceneMouseEvent *event ); void mouseMoveEvent ( QGraphicsSceneMouseEvent *event ) override;
virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent *event ); void mouseReleaseEvent ( QGraphicsSceneMouseEvent *event ) override;
virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent * ); void hoverEnterEvent ( QGraphicsSceneHoverEvent * ) override;
virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * ); void hoverLeaveEvent ( QGraphicsSceneHoverEvent * ) override;
private: private:
bool m_mouse_over; bool m_mouse_over;

18
sources/qetgraphicsitem/elementtextitem.h
View File

@@ -33,12 +33,12 @@ class ElementTextItem : public DiagramTextItem {
public: public:
ElementTextItem(Element * = nullptr); ElementTextItem(Element * = nullptr);
ElementTextItem(const QString &, Element * = nullptr); ElementTextItem(const QString &, Element * = nullptr);
virtual ~ElementTextItem(); ~ElementTextItem() override;
// attributes // attributes
public: public:
enum { Type = UserType + 1003 }; enum { Type = UserType + 1003 };
virtual int type () const { return Type; } int type () const override { return Type; }
private: private:
Element *parent_element_; Element *parent_element_;
@@ -50,8 +50,8 @@ class ElementTextItem : public DiagramTextItem {
// methods // methods
public: public:
Element *parentElement () const; Element *parentElement () const;
void fromXml ( const QDomElement & ); void fromXml ( const QDomElement & ) override;
QDomElement toXml ( QDomDocument & ) const; QDomElement toXml ( QDomDocument & ) const override;
void setOriginalPos ( const QPointF & ); void setOriginalPos ( const QPointF & );
QPointF originalPos () const; QPointF originalPos () const;
void setOriginalRotationAngle ( const qreal & ); void setOriginalRotationAngle ( const qreal & );
@@ -66,11 +66,11 @@ class ElementTextItem : public DiagramTextItem {
void adjustItemPosition(int = 0); void adjustItemPosition(int = 0);
protected: protected:
virtual void mouseDoubleClickEvent ( QGraphicsSceneMouseEvent *event ); void mouseDoubleClickEvent ( QGraphicsSceneMouseEvent *event ) override;
virtual void mouseMoveEvent ( QGraphicsSceneMouseEvent *event ); void mouseMoveEvent ( QGraphicsSceneMouseEvent *event ) override;
virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent *event ); void mouseReleaseEvent ( QGraphicsSceneMouseEvent *event ) override;
virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent *event ); void hoverEnterEvent ( QGraphicsSceneHoverEvent *event ) override;
virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent *event ); void hoverLeaveEvent ( QGraphicsSceneHoverEvent *event ) override;
private: private:
void build (); void build ();

14
sources/qetgraphicsitem/fixedelement.h
View File

@@ -30,15 +30,15 @@ class FixedElement : public Element {
// constructors, destructor // constructors, destructor
public: public:
FixedElement(QGraphicsItem * = nullptr); FixedElement(QGraphicsItem * = nullptr);
virtual ~FixedElement(); ~FixedElement() override;
// methods // methods
public: public:
int minTerminalsCount() const; int minTerminalsCount() const override;
int maxTerminalsCount() const; int maxTerminalsCount() const override;
virtual int terminalsCount() const = 0; int terminalsCount() const override = 0;
virtual void paint(QPainter *, const QStyleOptionGraphicsItem *) = 0; void paint(QPainter *, const QStyleOptionGraphicsItem *) override = 0;
virtual QString typeId() const = 0; QString typeId() const override = 0;
virtual QString name() const = 0; QString name() const override = 0;
}; };
#endif #endif

6
sources/qetgraphicsitem/ghostelement.h
View File

@@ -37,12 +37,12 @@ class GhostElement : public CustomElement {
// constructor, destructor // constructor, destructor
public: public:
GhostElement(const ElementsLocation &, QGraphicsItem * = nullptr); GhostElement(const ElementsLocation &, QGraphicsItem * = nullptr);
virtual ~GhostElement(); ~GhostElement() override;
// methods // methods
public: public:
virtual bool fromXml(QDomElement &, QHash<int, Terminal *> &, bool = false); bool fromXml(QDomElement &, QHash<int, Terminal *> &, bool = false) override;
virtual kind linkType() const {return Simple;} kind linkType() const override {return Simple;}
protected: protected:
QRectF minimalBoundingRect() const; QRectF minimalBoundingRect() const;

8
sources/qetgraphicsitem/independenttextitem.h
View File

@@ -30,7 +30,7 @@ class IndependentTextItem : public DiagramTextItem {
public: public:
IndependentTextItem(); IndependentTextItem();
IndependentTextItem(const QString &); IndependentTextItem(const QString &);
virtual ~IndependentTextItem(); ~IndependentTextItem() override;
// attributes // attributes
public: public:
@@ -43,9 +43,9 @@ class IndependentTextItem : public DiagramTextItem {
IndependentTextItem. IndependentTextItem.
@return le type de QGraphicsItem @return le type de QGraphicsItem
*/ */
virtual int type() const { return Type; } int type() const override { return Type; }
virtual void fromXml(const QDomElement &); void fromXml(const QDomElement &) override;
virtual QDomElement toXml(QDomDocument &) const; QDomElement toXml(QDomDocument &) const override;
private: private:
QPointF mouse_to_origin_movement_; QPointF mouse_to_origin_movement_;

10
sources/qetgraphicsitem/masterelement.h
View File

@@ -34,12 +34,12 @@ class MasterElement : public CustomElement
public: public:
explicit MasterElement(const ElementsLocation &, QGraphicsItem * = nullptr, int * = nullptr); explicit MasterElement(const ElementsLocation &, QGraphicsItem * = nullptr, int * = nullptr);
~MasterElement(); ~MasterElement() override;
virtual void linkToElement (Element *elmt); void linkToElement (Element *elmt) override;
virtual void unlinkAllElements (); void unlinkAllElements () override;
virtual void unlinkElement (Element *elmt); void unlinkElement (Element *elmt) override;
virtual void initLink (QETProject *project); void initLink (QETProject *project) override;
public slots: public slots:
void updateLabel(DiagramContext old_info, DiagramContext new_info); void updateLabel(DiagramContext old_info, DiagramContext new_info);

10
sources/qetgraphicsitem/qetgraphicsitem.h
View File

@@ -29,7 +29,7 @@ class QetGraphicsItem : public QGraphicsObject
public: public:
//constructor destructor //constructor destructor
QetGraphicsItem(QGraphicsItem *parent = nullptr); QetGraphicsItem(QGraphicsItem *parent = nullptr);
virtual ~QetGraphicsItem() = 0; ~QetGraphicsItem() override = 0;
//public methode //public methode
Diagram *diagram () const; Diagram *diagram () const;
@@ -46,10 +46,10 @@ class QetGraphicsItem : public QGraphicsObject
//protected method //protected method
protected: protected:
virtual void mousePressEvent(QGraphicsSceneMouseEvent *e); void mousePressEvent(QGraphicsSceneMouseEvent *e) override;
virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *e); void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *e) override;
virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *e); void mouseMoveEvent(QGraphicsSceneMouseEvent *e) override;
virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *e); void mouseReleaseEvent(QGraphicsSceneMouseEvent *e) override;
protected: protected:
bool is_movable_; bool is_movable_;

Some files were not shown because too many files have changed in this diff Show More