kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-02-16 23:19:59 +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

2
sources/titleblock/dimensionwidget.h
View File

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

4
sources/titleblock/gridlayoutanimation.h
View File

@@ -27,7 +27,7 @@ class GridLayoutAnimation : public QVariantAnimation {
// Constructors, destructor
public:
GridLayoutAnimation(QGraphicsGridLayout * = nullptr, QObject * = nullptr);
virtual ~GridLayoutAnimation();
~GridLayoutAnimation() override;
// methods
public:
@@ -39,7 +39,7 @@ class GridLayoutAnimation : public QVariantAnimation {
void setActsOnRows(bool);
protected:
void updateCurrentValue(const QVariant &);
void updateCurrentValue(const QVariant &) override;
// attributes
private:

14
sources/titleblock/helpercell.h
View File

@@ -31,7 +31,7 @@ class HelperCell : public QGraphicsObject, public QGraphicsLayoutItem {
// constructor, destructor
public:
HelperCell(QGraphicsItem * = nullptr);
virtual ~HelperCell();
~HelperCell() override;
private:
HelperCell(const HelperCell &);
@@ -45,18 +45,18 @@ class HelperCell : public QGraphicsObject, public QGraphicsLayoutItem {
// methods
public:
virtual void setGeometry(const QRectF &);
virtual QSizeF sizeHint(Qt::SizeHint, const QSizeF & = QSizeF()) const;
virtual QRectF boundingRect() const;
void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr);
void setGeometry(const QRectF &) override;
QSizeF sizeHint(Qt::SizeHint, const QSizeF & = QSizeF()) const override;
QRectF boundingRect() const override;
void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr) override;
virtual void setType(QET::TitleBlockColumnLength);
virtual void setActions(const QList<QAction *> &);
virtual QList<QAction *> actions() const;
virtual void setLabel(const QString &text, bool = true);
protected:
void contextMenuEvent(QGraphicsSceneContextMenuEvent *);
void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *);
void contextMenuEvent(QGraphicsSceneContextMenuEvent *) override;
void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *) override;
signals:
void contextMenuTriggered(HelperCell *);

8
sources/titleblock/integrationmovetemplateshandler.h
View File

@@ -30,15 +30,15 @@ class IntegrationMoveTitleBlockTemplatesHandler : public MoveTitleBlockTemplates
// constructors, destructor
public:
IntegrationMoveTitleBlockTemplatesHandler(QWidget * = nullptr);
virtual ~IntegrationMoveTitleBlockTemplatesHandler();
~IntegrationMoveTitleBlockTemplatesHandler() override;
private:
IntegrationMoveTitleBlockTemplatesHandler(const IntegrationMoveTitleBlockTemplatesHandler &);
// methods
public:
virtual QET::Action templateAlreadyExists(const TitleBlockTemplateLocation &src, const TitleBlockTemplateLocation &dst);
virtual QET::Action errorWithATemplate(const TitleBlockTemplateLocation &, const QString &);
virtual QString nameForRenamingOperation();
QET::Action templateAlreadyExists(const TitleBlockTemplateLocation &src, const TitleBlockTemplateLocation &dst) override;
QET::Action errorWithATemplate(const TitleBlockTemplateLocation &, const QString &) override;
QString nameForRenamingOperation() override;
private:
QString dateString() const;

2
sources/titleblock/movetemplateshandler.h
View File

@@ -33,7 +33,7 @@ class MoveTitleBlockTemplatesHandler : public QObject {
// Constructors, destructor
public:
MoveTitleBlockTemplatesHandler(QObject * = nullptr) {}
virtual ~MoveTitleBlockTemplatesHandler() {}
~MoveTitleBlockTemplatesHandler() override {}
private:
MoveTitleBlockTemplatesHandler(const MoveTitleBlockTemplatesHandler &);

6
sources/titleblock/qettemplateeditor.h
View File

@@ -39,7 +39,7 @@ class QETTitleBlockTemplateEditor : public QETMainWindow {
// constructor, destructor
public:
QETTitleBlockTemplateEditor(QWidget * = nullptr);
virtual ~QETTitleBlockTemplateEditor();
~QETTitleBlockTemplateEditor() override;
private:
QETTitleBlockTemplateEditor(const QETTitleBlockTemplateEditor &);
@@ -90,8 +90,8 @@ class QETTitleBlockTemplateEditor : public QETMainWindow {
protected:
bool canClose();
virtual void firstActivation(QEvent *);
void closeEvent(QCloseEvent *);
void firstActivation(QEvent *) override;
void closeEvent(QCloseEvent *) override;
private:
void initActions();

4
sources/titleblock/splittedhelpercell.h
View File

@@ -27,13 +27,13 @@ class SplittedHelperCell : public HelperCell {
Q_OBJECT
public:
SplittedHelperCell(QGraphicsItem * = nullptr);
virtual ~SplittedHelperCell();
~SplittedHelperCell() override;
private:
SplittedHelperCell(const SplittedHelperCell &);
// methods
public:
void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr);
void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr) override;
// attributes
QColor split_background_color; ///< Background color on the split side

2
sources/titleblock/templatecellwidget.h
View File

@@ -34,7 +34,7 @@ class TitleBlockTemplateCellWidget : public QWidget {
// constructor, destructor
public:
TitleBlockTemplateCellWidget(TitleBlockTemplate * = nullptr, QWidget * = nullptr);
virtual ~TitleBlockTemplateCellWidget();
~TitleBlockTemplateCellWidget() override;
private:
TitleBlockTemplateCellWidget(const TitleBlockTemplateCellWidget &);

54
sources/titleblock/templatecommands.h
View File

@@ -34,16 +34,16 @@ class ModifyTitleBlockCellCommand : public QUndoCommand {
// constructor, destructor
public:
ModifyTitleBlockCellCommand(TitleBlockCell *, QUndoCommand * = nullptr);
virtual ~ModifyTitleBlockCellCommand();
~ModifyTitleBlockCellCommand() override;
private:
ModifyTitleBlockCellCommand(const ModifyTitleBlockCellCommand &);
// methods
public:
virtual int id() const;
virtual bool mergeWith(const QUndoCommand *);
virtual void undo();
virtual void redo();
int id() const override;
bool mergeWith(const QUndoCommand *) override;
void undo() override;
void redo() override;
TitleBlockCell *cell() const;
void setCell(TitleBlockCell *);
TitleBlockTemplateView *view() const;
@@ -67,7 +67,7 @@ class TitleBlockTemplateCommand : public QUndoCommand {
// Constructors, destructor
public:
TitleBlockTemplateCommand(TitleBlockTemplate * = nullptr, QUndoCommand * = nullptr);
virtual ~TitleBlockTemplateCommand();
~TitleBlockTemplateCommand() override;
private:
TitleBlockTemplateCommand(const TitleBlockTemplateCommand &);
@@ -101,7 +101,7 @@ class ModifyTemplateGridCommand : public TitleBlockTemplateCommand {
// Constructors, destructor
public:
ModifyTemplateGridCommand(TitleBlockTemplate * = nullptr, QUndoCommand * = nullptr);
virtual ~ModifyTemplateGridCommand();
~ModifyTemplateGridCommand() override;
private:
ModifyTemplateGridCommand(const ModifyTemplateGridCommand &);
@@ -117,8 +117,8 @@ class ModifyTemplateGridCommand : public TitleBlockTemplateCommand {
void setType(bool);
bool isInsertion() const;
void setInsertion(bool);
virtual void undo();
virtual void redo();
void undo() override;
void redo() override;
private:
void updateText();
@@ -141,7 +141,7 @@ class ModifyTemplateDimension : public TitleBlockTemplateCommand {
// Constructor, destructor
public:
ModifyTemplateDimension(TitleBlockTemplate * = nullptr, QUndoCommand * = nullptr);
virtual ~ModifyTemplateDimension();
~ModifyTemplateDimension() override;
private:
ModifyTemplateDimension(const ModifyTemplateDimension &);
@@ -155,8 +155,8 @@ class ModifyTemplateDimension : public TitleBlockTemplateCommand {
void setDimensionBefore(const TitleBlockDimension &);
TitleBlockDimension dimensionAfter() const;
void setDimensionAfter(const TitleBlockDimension &);
virtual void undo();
virtual void redo();
void undo() override;
void redo() override;
private:
void updateText();
@@ -178,14 +178,14 @@ class MergeCellsCommand : public TitleBlockTemplateCommand {
// Constructor, destructor
public:
MergeCellsCommand(const TitleBlockTemplateCellsSet &, TitleBlockTemplate * = nullptr, QUndoCommand * = nullptr);
virtual ~MergeCellsCommand();
~MergeCellsCommand() override;
// methods
public:
static bool canMerge(const TitleBlockTemplateCellsSet &, TitleBlockTemplate *);
bool isValid() const;
virtual void undo();
virtual void redo();
void undo() override;
void redo() override;
private:
static TitleBlockCell *getBottomRightCell(const TitleBlockTemplateCellsSet &);
@@ -212,14 +212,14 @@ class SplitCellsCommand : public TitleBlockTemplateCommand {
// Constructor, destructor
public:
SplitCellsCommand(const TitleBlockTemplateCellsSet &, TitleBlockTemplate * = nullptr, QUndoCommand * = nullptr);
virtual ~SplitCellsCommand();
~SplitCellsCommand() override;
// methods
public:
static bool canSplit(const TitleBlockTemplateCellsSet &splitted_cells, TitleBlockTemplate *tbtemplate);
bool isValid() const;
virtual void undo();
virtual void redo();
void undo() override;
void redo() override;
// attributes
private:
@@ -240,14 +240,14 @@ class ChangeTemplateInformationsCommand : public QUndoCommand {
// constructors, destructor
public:
ChangeTemplateInformationsCommand(TitleBlockTemplate *, const QString &, const QString &, QUndoCommand * = nullptr);
virtual ~ChangeTemplateInformationsCommand();
~ChangeTemplateInformationsCommand() override;
private:
ChangeTemplateInformationsCommand(const ChangeTemplateInformationsCommand &);
// methods
public:
virtual void undo();
virtual void redo();
void undo() override;
void redo() override;
// attributes
private:
@@ -266,14 +266,14 @@ class CutTemplateCellsCommand : public TitleBlockTemplateCommand {
// constructors, destructor
public:
CutTemplateCellsCommand(TitleBlockTemplate *, QUndoCommand * = nullptr);
virtual ~CutTemplateCellsCommand();
~CutTemplateCellsCommand() override;
private:
CutTemplateCellsCommand(const CutTemplateCellsCommand &);
// methods
public:
virtual void undo();
virtual void redo();
void undo() override;
void redo() override;
virtual void setCutCells(const QList<TitleBlockCell *> &);
protected:
virtual void updateText();
@@ -291,14 +291,14 @@ class PasteTemplateCellsCommand : public TitleBlockTemplateCommand {
// constructors, destructor
public:
PasteTemplateCellsCommand(TitleBlockTemplate *, QUndoCommand * = nullptr);
virtual ~PasteTemplateCellsCommand();
~PasteTemplateCellsCommand() override;
private:
PasteTemplateCellsCommand(const PasteTemplateCellsCommand &);
// methods
public:
virtual void undo();
virtual void redo();
void undo() override;
void redo() override;
virtual void addPastedCell(TitleBlockCell *, const TitleBlockCell &);
virtual void addErasedCell(TitleBlockCell *, const TitleBlockCell &);
virtual void addCell(TitleBlockCell *, const TitleBlockCell &, const TitleBlockCell &);

2
sources/titleblock/templatedeleter.h
View File

@@ -28,7 +28,7 @@ class TitleBlockTemplateDeleter : public QWidget {
// Constructors, destructor
public:
TitleBlockTemplateDeleter(const TitleBlockTemplateLocation &, QWidget * = nullptr);
virtual ~TitleBlockTemplateDeleter();
~TitleBlockTemplateDeleter() override;
private:
TitleBlockTemplateDeleter(const TitleBlockTemplateDeleter &);

2
sources/titleblock/templatelocationchooser.h
View File

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

8
sources/titleblock/templatelocationsaver.h
View File

@@ -32,20 +32,20 @@ class TitleBlockTemplateLocationSaver : public TitleBlockTemplateLocationChooser
// Constructor, destructor
public:
TitleBlockTemplateLocationSaver(const TitleBlockTemplateLocation &, QWidget * = nullptr);
~TitleBlockTemplateLocationSaver();
~TitleBlockTemplateLocationSaver() override;
private:
TitleBlockTemplateLocationSaver(const TitleBlockTemplateLocationSaver &);
// methods
virtual QString name() const;
virtual void setLocation(const TitleBlockTemplateLocation &);
QString name() const override;
void setLocation(const TitleBlockTemplateLocation &) override;
private:
void init();
// slots
protected slots:
virtual void updateTemplates();
void updateTemplates() override;
virtual void updateNewName();
// attributes

2
sources/titleblock/templatelogomanager.h
View File

@@ -29,7 +29,7 @@ class TitleBlockTemplateLogoManager : public QWidget {
// Constructor, destructor
public:
TitleBlockTemplateLogoManager(TitleBlockTemplate *, QWidget * = nullptr);
virtual ~TitleBlockTemplateLogoManager();
~TitleBlockTemplateLogoManager() override;
// methods
public:

48
sources/titleblock/templatescollection.h
View File

@@ -37,7 +37,7 @@ class TitleBlockTemplatesCollection : public QObject {
// Constructors, destructor
public:
TitleBlockTemplatesCollection(QObject *parent);
virtual ~TitleBlockTemplatesCollection();
~TitleBlockTemplatesCollection() override;
private:
TitleBlockTemplatesCollection(const TitleBlockTemplatesCollection &);
@@ -86,24 +86,24 @@ class TitleBlockTemplatesProjectCollection : public TitleBlockTemplatesCollectio
// Constructors, destructor
public:
TitleBlockTemplatesProjectCollection(QETProject *, QObject *parent = nullptr);
virtual ~TitleBlockTemplatesProjectCollection();
~TitleBlockTemplatesProjectCollection() override;
private:
TitleBlockTemplatesProjectCollection(const TitleBlockTemplatesProjectCollection &);
// methods
public:
virtual QString title() const;
virtual QString protocol() const;
virtual QETProject *parentProject();
virtual QStringList templates();
virtual TitleBlockTemplate *getTemplate(const QString &);
virtual QDomElement getTemplateXmlDescription(const QString &);
virtual bool setTemplateXmlDescription(const QString &, const QDomElement &);
virtual void removeTemplate(const QString &);
virtual TitleBlockTemplateLocation location(const QString & = QString());
virtual bool hasFilePath();
virtual QString filePath();
virtual bool isReadOnly(const QString & = QString()) const;
QString title() const override;
QString protocol() const override;
QETProject *parentProject() override;
QStringList templates() override;
TitleBlockTemplate *getTemplate(const QString &) override;
QDomElement getTemplateXmlDescription(const QString &) override;
bool setTemplateXmlDescription(const QString &, const QDomElement &) override;
void removeTemplate(const QString &) override;
TitleBlockTemplateLocation location(const QString & = QString()) override;
bool hasFilePath() override;
QString filePath() override;
bool isReadOnly(const QString & = QString()) const override;
virtual void fromXml(const QDomElement &);
virtual void deleteUnusedTitleBlocKTemplates();
@@ -127,22 +127,22 @@ class TitleBlockTemplatesFilesCollection : public TitleBlockTemplatesCollection
// Constructors, destructor
public:
TitleBlockTemplatesFilesCollection(const QString &, QObject * = nullptr);
virtual ~TitleBlockTemplatesFilesCollection();
~TitleBlockTemplatesFilesCollection() override;
private:
TitleBlockTemplatesFilesCollection(const TitleBlockTemplatesFilesCollection &);
// methods
public:
QString path(const QString & = QString()) const;
virtual QStringList templates();
virtual TitleBlockTemplate *getTemplate(const QString &);
virtual QDomElement getTemplateXmlDescription(const QString &);
virtual bool setTemplateXmlDescription(const QString &, const QDomElement &);
virtual void removeTemplate(const QString &);
virtual TitleBlockTemplateLocation location(const QString & = QString());
virtual bool hasFilePath();
virtual QString filePath();
virtual bool isReadOnly(const QString & = QString()) const;
QStringList templates() override;
TitleBlockTemplate *getTemplate(const QString &) override;
QDomElement getTemplateXmlDescription(const QString &) override;
bool setTemplateXmlDescription(const QString &, const QDomElement &) override;
void removeTemplate(const QString &) override;
TitleBlockTemplateLocation location(const QString & = QString()) override;
bool hasFilePath() override;
QString filePath() override;
bool isReadOnly(const QString & = QString()) const override;
static QString toTemplateName(const QString &);
static QString toFileName(const QString &);

8
sources/titleblock/templateview.h
View File

@@ -36,7 +36,7 @@ class TitleBlockTemplateView : public QGraphicsView {
public:
TitleBlockTemplateView(QWidget * = nullptr);
TitleBlockTemplateView(QGraphicsScene *, QWidget * = nullptr);
virtual ~TitleBlockTemplateView();
~TitleBlockTemplateView() override;
private:
TitleBlockTemplateView(const TitleBlockTemplateView &);
@@ -91,14 +91,14 @@ class TitleBlockTemplateView : public QGraphicsView {
virtual void updateColumnsHelperCells();
protected:
virtual void drawBackground(QPainter *, const QRectF &);
void drawBackground(QPainter *, const QRectF &) override;
virtual void addCells();
virtual void loadTemplate(TitleBlockTemplate *);
virtual void init();
virtual void wheelEvent(QWheelEvent *);
void wheelEvent(QWheelEvent *) override;
virtual qreal zoomFactor() const;
virtual void fillWithEmptyCells();
virtual bool event(QEvent *);
bool event(QEvent *) override;
virtual void normalizeCells(QList<TitleBlockCell> &, int x = 0, int y = 0) const;
signals:

10
sources/titleblock/templatevisualcell.h
View File

@@ -30,16 +30,16 @@ class TitleBlockTemplateVisualCell : public QGraphicsLayoutItem, public QGraphic
// constructor, destructor
public:
TitleBlockTemplateVisualCell(QGraphicsItem * parent = nullptr);
virtual ~TitleBlockTemplateVisualCell();
~TitleBlockTemplateVisualCell() override;
private:
TitleBlockTemplateVisualCell(const TitleBlockTemplateVisualCell &);
// methods
public:
virtual void setGeometry(const QRectF &);
virtual QSizeF sizeHint(Qt::SizeHint, const QSizeF & = QSizeF()) const;
virtual QRectF boundingRect() const;
void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr);
void setGeometry(const QRectF &) override;
QSizeF sizeHint(Qt::SizeHint, const QSizeF & = QSizeF()) const override;
QRectF boundingRect() const override;
void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr) override;
public slots:
void setTemplateCell(TitleBlockTemplate *, TitleBlockCell *);