kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-04-02 01:19:59 +02: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/ui/borderpropertieswidget.h
View File

@@ -35,7 +35,7 @@ class BorderPropertiesWidget : public QWidget
public:
explicit BorderPropertiesWidget(const BorderProperties &bp, QWidget *parent = nullptr);
~BorderPropertiesWidget();
~BorderPropertiesWidget() override;
void setProperties(const BorderProperties &bp);
const BorderProperties &properties();

2
sources/ui/conductorpropertiesdialog.h
View File

@@ -36,7 +36,7 @@ class ConductorPropertiesDialog : public QDialog
public:
explicit ConductorPropertiesDialog (Conductor *conductor, QWidget *parent = nullptr);
static void PropertiesDialog (Conductor *conductor, QWidget *parent = nullptr);
~ConductorPropertiesDialog();
~ConductorPropertiesDialog() override;
ConductorProperties properties() const;
bool applyAll() const;

4
sources/ui/conductorpropertieswidget.h
View File

@@ -35,7 +35,7 @@ class ConductorPropertiesWidget : public QWidget
public:
explicit ConductorPropertiesWidget(QWidget *parent = nullptr);
explicit ConductorPropertiesWidget(const ConductorProperties &properties, QWidget *parent = nullptr);
~ConductorPropertiesWidget();
~ConductorPropertiesWidget() override;
//METHODS
void setProperties(const ConductorProperties &properties);
@@ -54,7 +54,7 @@ class ConductorPropertiesWidget : public QWidget
void setConductorType(ConductorProperties::ConductorType type);
protected:
virtual bool event(QEvent *event);
bool event(QEvent *event) override;
//SLOTS
public slots:

2
sources/ui/diagramselection.h
View File

@@ -33,7 +33,7 @@ class diagramselection : public QWidget
public:
explicit diagramselection(QETProject *prj, QWidget *parent = nullptr);
~diagramselection();
~diagramselection() override;
QList<Diagram *> list_of_DiagramSelected();

2
sources/ui/dialogwaiting.h
View File

@@ -31,7 +31,7 @@ class DialogWaiting : public QDialog
public:
explicit DialogWaiting(QWidget *parent = nullptr);
~DialogWaiting();
~DialogWaiting() override;
void setProgressBar(int val);
void setProgressBarRange(int min, int max);

10
sources/ui/dynamicelementtextitemeditor.h
View File

@@ -35,12 +35,12 @@ class DynamicElementTextItemEditor : public AbstractElementPropertiesEditorWidge
public:
explicit DynamicElementTextItemEditor(Element *element, QWidget *parent = nullptr);
~DynamicElementTextItemEditor();
~DynamicElementTextItemEditor() override;
virtual void setElement(Element *element);
virtual QString title() const {return tr("Textes");}
virtual bool setLiveEdit(bool live_edit);
virtual void apply();
void setElement(Element *element) override;
QString title() const override {return tr("Textes");}
bool setLiveEdit(bool live_edit) override;
void apply() override;
private:
void dataEdited(QStandardItem *qsi);

6
sources/ui/dynamicelementtextmodel.h
View File

@@ -45,7 +45,7 @@ class DynamicElementTextModel : public QStandardItemModel
};
DynamicElementTextModel(QObject *parent = nullptr);
~DynamicElementTextModel();
~DynamicElementTextModel() override;
void addText(DynamicElementTextItem *deti);
void removeText(DynamicElementTextItem *deti);
@@ -69,8 +69,8 @@ class DynamicTextItemDelegate : public QStyledItemDelegate
public:
DynamicTextItemDelegate(QObject *parent = Q_NULLPTR);
virtual QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const;
virtual void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const;
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
};
#endif // DYNAMICELEMENTTEXTMODEL_H

2
sources/ui/elementinfopartwidget.h
View File

@@ -31,7 +31,7 @@ class ElementInfoPartWidget : public QWidget
//METHODS
public:
explicit ElementInfoPartWidget(QString key, QString translated_key, QWidget *parent = nullptr);
~ElementInfoPartWidget();
~ElementInfoPartWidget() override;
QString key () const {return key_;}
void setText (const QString &);

20
sources/ui/elementinfowidget.h
View File

@@ -42,21 +42,21 @@ class ElementInfoWidget : public AbstractElementPropertiesEditorWidget
//METHODS
public:
explicit ElementInfoWidget(Element *elmt, QWidget *parent = nullptr);
~ElementInfoWidget();
~ElementInfoWidget() override;
void setElement(Element *element);
void apply();
QUndoCommand *associatedUndo () const;
QString title() const {return tr("Informations");}
bool setLiveEdit(bool live_edit);
virtual void updateUi();
void setElement(Element *element) override;
void apply() override;
QUndoCommand *associatedUndo () const override;
QString title() const override {return tr("Informations");}
bool setLiveEdit(bool live_edit) override;
void updateUi() override;
DiagramContext currentInfo() const;
protected:
virtual bool event(QEvent *event);
virtual void enableLiveEdit();
virtual void disableLiveEdit();
bool event(QEvent *event) override;
void enableLiveEdit() override;
void disableLiveEdit() override;
private:
void buildInterface();

10
sources/ui/elementpropertieswidget.h
View File

@@ -32,10 +32,10 @@ class ElementPropertiesWidget : public AbstractElementPropertiesEditorWidget
public:
explicit ElementPropertiesWidget(Element *elmt, QWidget *parent = nullptr);
void setElement(Element *element);
void apply();
void reset();
bool setLiveEdit(bool live_edit);
void setElement(Element *element) override;
void apply() override;
void reset() override;
bool setLiveEdit(bool live_edit) override;
public slots:
void findInPanel ();
@@ -43,7 +43,7 @@ class ElementPropertiesWidget : public AbstractElementPropertiesEditorWidget
private:
void buildGui();
void updateUi();
void updateUi() override;
void addGeneralWidget();
QWidget *generalWidget();

2
sources/ui/formulaassistantdialog.h
View File

@@ -31,7 +31,7 @@ class FormulaAssistantDialog : public QDialog
public:
FormulaAssistantDialog(QWidget *parent = nullptr);
~FormulaAssistantDialog();
~FormulaAssistantDialog() override;
void setForbiddenVariables(QStringList list);
void setText(QString text);

10
sources/ui/imagepropertieswidget.h
View File

@@ -36,16 +36,16 @@ class ImagePropertiesWidget : public PropertiesEditorWidget
public:
explicit ImagePropertiesWidget(DiagramImageItem *image = nullptr, QWidget *parent = nullptr);
~ImagePropertiesWidget();
~ImagePropertiesWidget() override;
void setImageItem (DiagramImageItem *image);
void apply();
void reset();
bool setLiveEdit(bool live_edit);
void apply() override;
void reset() override;
bool setLiveEdit(bool live_edit) override;
QUndoCommand* associatedUndo();
private:
void updateUi();
void updateUi() override;
private slots:
void on_m_scale_slider_valueChanged(int value);

2
sources/ui/importelementdialog.h
View File

@@ -31,7 +31,7 @@ class ImportElementDialog : public QDialog
public:
explicit ImportElementDialog(QWidget *parent = nullptr);
~ImportElementDialog();
~ImportElementDialog() override;
QET::Action action() const;

14
sources/ui/linksingleelementwidget.h
View File

@@ -44,19 +44,19 @@ class LinkSingleElementWidget : public AbstractElementPropertiesEditorWidget
///Methods
public:
explicit LinkSingleElementWidget(Element *elmt, QWidget *parent = nullptr);
~LinkSingleElementWidget();
~LinkSingleElementWidget() override;
void setElement (Element *element);
void apply();
QUndoCommand *associatedUndo() const;
QString title() const;
void setElement (Element *element) override;
void apply() override;
QUndoCommand *associatedUndo() const override;
QString title() const override;
public slots:
void updateUi();
void updateUi() override;
void buildTree();
public:
bool setLiveEdit(bool live_edit);
bool setLiveEdit(bool live_edit) override;
private :
QList <Element *> availableElements();

16
sources/ui/masterpropertieswidget.h
View File

@@ -46,17 +46,17 @@ class MasterPropertiesWidget : public AbstractElementPropertiesEditorWidget
public:
explicit MasterPropertiesWidget(Element *elmt, QWidget *parent = nullptr);
~MasterPropertiesWidget();
~MasterPropertiesWidget() override;
void setElement (Element *element);
void apply();
void reset();
QUndoCommand *associatedUndo () const;
QString title() const {return tr("Référence croisée (maître)");}
bool setLiveEdit(bool live_edit);
void setElement (Element *element) override;
void apply() override;
void reset() override;
QUndoCommand *associatedUndo () const override;
QString title() const override {return tr("Référence croisée (maître)");}
bool setLiveEdit(bool live_edit) override;
public slots:
void updateUi();
void updateUi() override;
private slots:
void headerCustomContextMenuRequested(const QPoint &pos);

8
sources/ui/potentialselectordialog.cpp
View File

@@ -57,7 +57,7 @@ class NewConductorPotentialSelector : public AbstractPotentialSelector
m_is_valid = true;
}
bool isValid() const {return m_is_valid;}
bool isValid() const override {return m_is_valid;}
/**
* @brief getPotential
@@ -110,7 +110,7 @@ class NewConductorPotentialSelector : public AbstractPotentialSelector
properties_list.append(c->properties());
}
~NewConductorPotentialSelector() {}
~NewConductorPotentialSelector() override {}
private :
bool m_is_valid;
@@ -155,9 +155,9 @@ class LinkReportPotentialSelector : public AbstractPotentialSelector
}
}
~LinkReportPotentialSelector() {}
~LinkReportPotentialSelector() override {}
bool isValid() const {return m_is_valid;}
bool isValid() const override {return m_is_valid;}
private:
bool m_is_valid;

2
sources/ui/potentialselectordialog.h
View File

@@ -61,7 +61,7 @@ class PotentialSelectorDialog : public QDialog
public:
explicit PotentialSelectorDialog(Conductor *conductor, QUndoCommand *parent_undo = nullptr, QWidget *parent = nullptr);
explicit PotentialSelectorDialog(Element *report, QUndoCommand *parent_undo = nullptr, QWidget *parent = nullptr);
~PotentialSelectorDialog();
~PotentialSelectorDialog() override;
private slots:
void on_buttonBox_accepted();

2
sources/ui/projectpropertiesdialog.h
View File

@@ -36,7 +36,7 @@ class ProjectPropertiesDialog : public QObject {
};
ProjectPropertiesDialog(QETProject *project, QWidget *parent = nullptr);
~ProjectPropertiesDialog();
~ProjectPropertiesDialog() override;
void exec();
void setCurrentPage(ProjectPropertiesDialog::Page);
void changeToFolio();

2
sources/ui/reportpropertiewidget.h
View File

@@ -32,7 +32,7 @@ class ReportPropertieWidget : public QWidget
public:
explicit ReportPropertieWidget(QString value, QWidget *parent = nullptr);
~ReportPropertieWidget();
~ReportPropertieWidget() override;
void toSettings (QSettings &settings, const QString &prefix);
void setReportProperties (QString label);
QString ReportProperties () const;

14
sources/ui/shapegraphicsitempropertieswidget.h
View File

@@ -36,18 +36,18 @@ class ShapeGraphicsItemPropertiesWidget : public PropertiesEditorWidget
public:
explicit ShapeGraphicsItemPropertiesWidget(QetShapeItem *item, QWidget *parent = nullptr);
~ShapeGraphicsItemPropertiesWidget();
~ShapeGraphicsItemPropertiesWidget() override;
void setItem(QetShapeItem *shape);
public slots:
virtual void apply();
virtual void reset();
void apply() override;
void reset() override;
public:
virtual QUndoCommand* associatedUndo() const;
virtual QString title() const { return tr("Éditer les propriétés d'une primitive "); }
virtual void updateUi();
virtual bool setLiveEdit(bool live_edit);
QUndoCommand* associatedUndo() const override;
QString title() const override { return tr("Éditer les propriétés d'une primitive "); }
void updateUi() override;
bool setLiveEdit(bool live_edit) override;
private:
void setPenColorButton(const QColor &color);

2
sources/ui/titleblockpropertieswidget.h
View File

@@ -42,7 +42,7 @@ class TitleBlockPropertiesWidget : public QWidget
explicit TitleBlockPropertiesWidget(const TitleBlockProperties &titleblock = TitleBlockProperties(), bool current_date = false, QETProject *project = nullptr, QWidget *parent = nullptr);
explicit TitleBlockPropertiesWidget(TitleBlockTemplatesCollection *tbt_collection, const TitleBlockProperties &titleblock = TitleBlockProperties(), bool current_date = false, QETProject *project = nullptr, QWidget *parent = nullptr);
explicit TitleBlockPropertiesWidget(QList <TitleBlockTemplatesCollection *> tbt_collection, const TitleBlockProperties &titleblock = TitleBlockProperties(), bool current_date = false, QETProject *project = nullptr, QWidget *parent = nullptr);
~TitleBlockPropertiesWidget();
~TitleBlockPropertiesWidget() override;
void setProperties(const TitleBlockProperties &properties);
TitleBlockProperties properties() const;

2
sources/ui/xrefpropertieswidget.h
View File

@@ -35,7 +35,7 @@ class XRefPropertiesWidget : public QWidget
public:
XRefPropertiesWidget(QHash <QString, XRefProperties> properties = QHash <QString, XRefProperties>(), QWidget *parent = nullptr);
~XRefPropertiesWidget();
~XRefPropertiesWidget() override;
void setProperties (const QHash <QString, XRefProperties> &properties);
QHash <QString, XRefProperties> properties();