diff --git a/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.h b/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.h index 8ace3a901..87187873b 100644 --- a/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.h +++ b/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.h @@ -46,7 +46,7 @@ public: void Apply(); protected: - virtual void changeEvent(QEvent* event) Q_DECL_OVERRIDE; + virtual void changeEvent(QEvent* event) override; private: Q_DISABLE_COPY(TapePreferencesConfigurationPage) Ui::TapePreferencesConfigurationPage *ui; diff --git a/src/app/tape/dialogs/configpages/tapepreferencespathpage.h b/src/app/tape/dialogs/configpages/tapepreferencespathpage.h index d17b54199..6abc41cb1 100644 --- a/src/app/tape/dialogs/configpages/tapepreferencespathpage.h +++ b/src/app/tape/dialogs/configpages/tapepreferencespathpage.h @@ -46,7 +46,7 @@ public: void Apply(); protected: - virtual void changeEvent(QEvent* event) Q_DECL_OVERRIDE; + virtual void changeEvent(QEvent* event) override; private slots: void DefaultPath(); void EditPath(); diff --git a/src/app/tape/dialogs/dialogabouttape.h b/src/app/tape/dialogs/dialogabouttape.h index 8d609c5b2..94c2863b0 100644 --- a/src/app/tape/dialogs/dialogabouttape.h +++ b/src/app/tape/dialogs/dialogabouttape.h @@ -45,8 +45,8 @@ public: virtual ~DialogAboutTape(); protected: - virtual void changeEvent(QEvent* event) Q_DECL_OVERRIDE; - virtual void showEvent(QShowEvent *event) Q_DECL_OVERRIDE; + virtual void changeEvent(QEvent* event) override; + virtual void showEvent(QShowEvent *event) override; private: Q_DISABLE_COPY(DialogAboutTape) diff --git a/src/app/tape/dialogs/dialogmdatabase.h b/src/app/tape/dialogs/dialogmdatabase.h index a9e8f33ea..cc8eccccb 100644 --- a/src/app/tape/dialogs/dialogmdatabase.h +++ b/src/app/tape/dialogs/dialogmdatabase.h @@ -45,7 +45,7 @@ class DialogMDataBase : public QDialog public: explicit DialogMDataBase(const QStringList &list, QWidget *parent = nullptr); explicit DialogMDataBase(QWidget *parent = nullptr); - virtual ~DialogMDataBase() Q_DECL_OVERRIDE; + virtual ~DialogMDataBase() override; QStringList GetNewNames() const; @@ -54,8 +54,8 @@ public: static QString ImgTag(const QString &number); protected: - virtual void changeEvent(QEvent* event) Q_DECL_OVERRIDE; - virtual bool eventFilter(QObject *target, QEvent *event) Q_DECL_OVERRIDE; + virtual void changeEvent(QEvent* event) override; + virtual bool eventFilter(QObject *target, QEvent *event) override; private slots: void UpdateChecks(QTreeWidgetItem *item, int column); diff --git a/src/app/tape/dialogs/dialognewmeasurements.h b/src/app/tape/dialogs/dialognewmeasurements.h index f090b93f7..3c5c3ef69 100644 --- a/src/app/tape/dialogs/dialognewmeasurements.h +++ b/src/app/tape/dialogs/dialognewmeasurements.h @@ -52,8 +52,8 @@ public: int BaseHeight() const; protected: - virtual void changeEvent(QEvent* event) Q_DECL_OVERRIDE; - virtual void showEvent(QShowEvent *event) Q_DECL_OVERRIDE; + virtual void changeEvent(QEvent* event) override; + virtual void showEvent(QShowEvent *event) override; private slots: void CurrentTypeChanged(int index); diff --git a/src/app/tape/dialogs/dialogtapepreferences.h b/src/app/tape/dialogs/dialogtapepreferences.h index ce86829df..e7b04f755 100644 --- a/src/app/tape/dialogs/dialogtapepreferences.h +++ b/src/app/tape/dialogs/dialogtapepreferences.h @@ -50,9 +50,9 @@ public: signals: void UpdateProperties(); protected: - virtual void showEvent(QShowEvent *event) Q_DECL_OVERRIDE; - virtual void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE; - virtual void changeEvent(QEvent* event) Q_DECL_OVERRIDE; + virtual void showEvent(QShowEvent *event) override; + virtual void resizeEvent(QResizeEvent *event) override; + virtual void changeEvent(QEvent* event) override; private slots: void Apply(); void Ok(); diff --git a/src/app/tape/mapplication.h b/src/app/tape/mapplication.h index f9f0b98c0..22ff9dafb 100644 --- a/src/app/tape/mapplication.h +++ b/src/app/tape/mapplication.h @@ -52,21 +52,21 @@ class MApplication : public VAbstractApplication public: MApplication(int &argc, char **argv); - virtual ~MApplication() Q_DECL_OVERRIDE; + virtual ~MApplication() override; - virtual bool notify(QObject * receiver, QEvent * event) Q_DECL_OVERRIDE; + virtual bool notify(QObject * receiver, QEvent * event) override; bool IsTestMode() const; - virtual bool IsAppInGUIMode() const Q_DECL_OVERRIDE; + virtual bool IsAppInGUIMode() const override; TMainWindow *MainWindow(); QList MainWindows(); TMainWindow *NewMainWindow(); void InitOptions(); - virtual const VTranslateVars *TrVars() Q_DECL_OVERRIDE; + virtual const VTranslateVars *TrVars() override; - virtual void OpenSettings() Q_DECL_OVERRIDE; + virtual void OpenSettings() override; VTapeSettings *TapeSettings(); QString diagramsPath() const; @@ -81,8 +81,8 @@ public slots: void ProcessCMD(); protected: - virtual void InitTrVars() Q_DECL_OVERRIDE; - virtual bool event(QEvent *e) Q_DECL_OVERRIDE; + virtual void InitTrVars() override; + virtual bool event(QEvent *e) override; private slots: void NewLocalSocketConnection(); diff --git a/src/app/tape/tmainwindow.h b/src/app/tape/tmainwindow.h index a6139a259..8228d1422 100644 --- a/src/app/tape/tmainwindow.h +++ b/src/app/tape/tmainwindow.h @@ -51,7 +51,7 @@ class TMainWindow : public VAbstractMainWindow public: explicit TMainWindow(QWidget *parent = nullptr); - virtual ~TMainWindow() Q_DECL_OVERRIDE; + virtual ~TMainWindow() override; QString CurrentFile() const; @@ -64,15 +64,15 @@ public: bool LoadFile(const QString &path); public slots: - virtual void ShowToolTip(const QString &toolTip) Q_DECL_OVERRIDE; + virtual void ShowToolTip(const QString &toolTip) override; protected: - virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; - virtual void changeEvent(QEvent* event) Q_DECL_OVERRIDE; - virtual void showEvent(QShowEvent *event) Q_DECL_OVERRIDE; - virtual bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE; + virtual void closeEvent(QCloseEvent *event) override; + virtual void changeEvent(QEvent* event) override; + virtual void showEvent(QShowEvent *event) override; + virtual bool eventFilter(QObject *object, QEvent *event) override; virtual void ExportToCSVData(const QString &fileName, bool withHeader, int mib, - const QChar &separator) Q_DECL_FINAL; + const QChar &separator) final; private slots: void FileNew(); diff --git a/src/app/tape/vlitepattern.h b/src/app/tape/vlitepattern.h index 6ad438943..2ed6c6502 100644 --- a/src/app/tape/vlitepattern.h +++ b/src/app/tape/vlitepattern.h @@ -37,18 +37,18 @@ class VLitePattern : public VAbstractPattern public: explicit VLitePattern(QObject *parent = nullptr); - virtual void CreateEmptyFile() Q_DECL_OVERRIDE; + virtual void CreateEmptyFile() override; - virtual void IncrementReferens(quint32 id) const Q_DECL_OVERRIDE; - virtual void DecrementReferens(quint32 id) const Q_DECL_OVERRIDE; + virtual void IncrementReferens(quint32 id) const override; + virtual void DecrementReferens(quint32 id) const override; - virtual QString GenerateLabel(const LabelType &type, const QString &reservedName = QString())const Q_DECL_OVERRIDE; - virtual QString GenerateSuffix() const Q_DECL_OVERRIDE; + virtual QString GenerateLabel(const LabelType &type, const QString &reservedName = QString())const override; + virtual QString GenerateSuffix() const override; - virtual void UpdateToolData(const quint32 &id, VContainer *data) Q_DECL_OVERRIDE; + virtual void UpdateToolData(const quint32 &id, VContainer *data) override; public slots: - virtual void LiteParseTree(const Document &parse) Q_DECL_OVERRIDE; + virtual void LiteParseTree(const Document &parse) override; private: Q_DISABLE_COPY(VLitePattern) diff --git a/src/app/valentina/core/vapplication.h b/src/app/valentina/core/vapplication.h index 419439668..2e5a864d6 100644 --- a/src/app/valentina/core/vapplication.h +++ b/src/app/valentina/core/vapplication.h @@ -52,9 +52,9 @@ class VApplication : public VAbstractApplication public: VApplication(int &argc, char ** argv); - virtual ~VApplication() Q_DECL_OVERRIDE; + virtual ~VApplication() override; static void NewValentina(const QString &fileName = QString()); - virtual bool notify(QObject * receiver, QEvent * event) Q_DECL_OVERRIDE; + virtual bool notify(QObject * receiver, QEvent * event) override; void InitOptions(); @@ -68,17 +68,17 @@ public: void StartLogging(); QTextStream *LogFile(); - virtual const VTranslateVars *TrVars() Q_DECL_OVERRIDE; + virtual const VTranslateVars *TrVars() override; bool static IsGUIMode(); - virtual bool IsAppInGUIMode() const Q_DECL_OVERRIDE; + virtual bool IsAppInGUIMode() const override; - virtual void OpenSettings() Q_DECL_OVERRIDE; + virtual void OpenSettings() override; VSettings *ValentinaSettings(); protected: - virtual void InitTrVars() Q_DECL_OVERRIDE; - virtual bool event(QEvent *e) Q_DECL_OVERRIDE; + virtual void InitTrVars() override; + virtual bool event(QEvent *e) override; private: Q_DISABLE_COPY(VApplication) diff --git a/src/app/valentina/core/vformulaproperty.h b/src/app/valentina/core/vformulaproperty.h index 425b30e5b..d160b0a1d 100644 --- a/src/app/valentina/core/vformulaproperty.h +++ b/src/app/valentina/core/vformulaproperty.h @@ -40,10 +40,10 @@ public: explicit VFormulaProperty(const QString &name); //! Get the data how it should be displayed - virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const override; //! Returns item flags - virtual Qt::ItemFlags flags(int column = DPC_Name) const Q_DECL_OVERRIDE; + virtual Qt::ItemFlags flags(int column = DPC_Name) const override; //! Returns an editor widget, or NULL if it doesn't supply one //! \param parent The widget to which the editor will be added as a child @@ -51,16 +51,16 @@ public: //! \delegate A pointer to the QAbstractItemDelegate requesting the editor. This can be used to connect signals and //! slots. virtual QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& options, - const QAbstractItemDelegate* delegate) Q_DECL_OVERRIDE; + const QAbstractItemDelegate* delegate) override; //! Sets the property's data to the editor (returns false, if the standard delegate should do that) - virtual bool setEditorData(QWidget* editor) Q_DECL_OVERRIDE; + virtual bool setEditorData(QWidget* editor) override; //! Gets the data from the widget - virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE; + virtual QVariant getEditorData(const QWidget* editor) const override; //! Returns a string containing the type of the property - virtual QString type() const Q_DECL_OVERRIDE; + virtual QString type() const override; //! Clones this property //! \param include_children Indicates whether to also clone the children @@ -68,13 +68,13 @@ public: //! to fill all the data into container. This can also be used when subclassing this function. //! \return Returns the newly created property (or container, if it was not NULL) Q_REQUIRED_RESULT virtual VProperty* clone(bool include_children = true, - VProperty* container = nullptr) const Q_DECL_OVERRIDE; + VProperty* container = nullptr) const override; //! Sets the value of the property - virtual void setValue(const QVariant& value) Q_DECL_OVERRIDE; + virtual void setValue(const QVariant& value) override; //! Returns the value of the property as a QVariant - virtual QVariant getValue() const Q_DECL_OVERRIDE; + virtual QVariant getValue() const override; //! Returns the formula VFormula GetFormula() const; @@ -83,7 +83,7 @@ public: void SetFormula(const VFormula &formula); public slots: - virtual void ValueChildChanged(const QVariant &value, int typeForParent) Q_DECL_OVERRIDE; + virtual void ValueChildChanged(const QVariant &value, int typeForParent) override; }; diff --git a/src/app/valentina/core/vformulapropertyeditor.h b/src/app/valentina/core/vformulapropertyeditor.h index 98fe6b089..2c7e96241 100644 --- a/src/app/valentina/core/vformulapropertyeditor.h +++ b/src/app/valentina/core/vformulapropertyeditor.h @@ -51,7 +51,7 @@ public: VFormula GetFormula() const; //! Needed for proper event handling - virtual bool eventFilter(QObject *obj, QEvent *ev) Q_DECL_OVERRIDE; + virtual bool eventFilter(QObject *obj, QEvent *ev) override; signals: //! This is emitted, when the user changes the color diff --git a/src/app/valentina/dialogs/configpages/preferencesconfigurationpage.h b/src/app/valentina/dialogs/configpages/preferencesconfigurationpage.h index e0db9a2a7..f2ef031a8 100644 --- a/src/app/valentina/dialogs/configpages/preferencesconfigurationpage.h +++ b/src/app/valentina/dialogs/configpages/preferencesconfigurationpage.h @@ -46,7 +46,7 @@ public: QStringList Apply(); protected: - virtual void changeEvent(QEvent* event) Q_DECL_OVERRIDE; + virtual void changeEvent(QEvent* event) override; private: Q_DISABLE_COPY(PreferencesConfigurationPage) Ui::PreferencesConfigurationPage *ui; diff --git a/src/app/valentina/dialogs/configpages/preferencespathpage.h b/src/app/valentina/dialogs/configpages/preferencespathpage.h index 499d001e6..ba58aad37 100644 --- a/src/app/valentina/dialogs/configpages/preferencespathpage.h +++ b/src/app/valentina/dialogs/configpages/preferencespathpage.h @@ -47,7 +47,7 @@ public: QStringList Apply(); protected: - virtual void changeEvent(QEvent* event) Q_DECL_OVERRIDE; + virtual void changeEvent(QEvent* event) override; private slots: void DefaultPath(); diff --git a/src/app/valentina/dialogs/configpages/preferencespatternpage.h b/src/app/valentina/dialogs/configpages/preferencespatternpage.h index 82de2d184..0e229bfe1 100644 --- a/src/app/valentina/dialogs/configpages/preferencespatternpage.h +++ b/src/app/valentina/dialogs/configpages/preferencespatternpage.h @@ -51,7 +51,7 @@ public: void InitDefaultSeamAllowance(); protected: - virtual void changeEvent(QEvent* event) Q_DECL_OVERRIDE; + virtual void changeEvent(QEvent* event) override; private slots: void EditDateTimeFormats(); diff --git a/src/app/valentina/dialogs/dialogaboutapp.h b/src/app/valentina/dialogs/dialogaboutapp.h index 412f2bf2e..2cb9c90f8 100644 --- a/src/app/valentina/dialogs/dialogaboutapp.h +++ b/src/app/valentina/dialogs/dialogaboutapp.h @@ -45,7 +45,7 @@ public: virtual ~DialogAboutApp(); protected: - virtual void showEvent(QShowEvent *event) Q_DECL_OVERRIDE; + virtual void showEvent(QShowEvent *event) override; private: Ui::DialogAboutApp *ui; diff --git a/src/app/valentina/dialogs/dialogfinalmeasurements.h b/src/app/valentina/dialogs/dialogfinalmeasurements.h index 76a00e7f1..7359cfe7a 100644 --- a/src/app/valentina/dialogs/dialogfinalmeasurements.h +++ b/src/app/valentina/dialogs/dialogfinalmeasurements.h @@ -51,11 +51,11 @@ public: QVector FinalMeasurements() const; protected: - virtual void closeEvent ( QCloseEvent * event ) Q_DECL_OVERRIDE; - virtual void changeEvent ( QEvent * event) Q_DECL_OVERRIDE; - virtual bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE; - virtual void showEvent( QShowEvent *event ) Q_DECL_OVERRIDE; - virtual void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE; + virtual void closeEvent ( QCloseEvent * event ) override; + virtual void changeEvent ( QEvent * event) override; + virtual bool eventFilter(QObject *object, QEvent *event) override; + virtual void showEvent( QShowEvent *event ) override; + virtual void resizeEvent(QResizeEvent *event) override; private slots: void ShowFinalMeasurementDetails(); void Add(); diff --git a/src/app/valentina/dialogs/dialoghistory.h b/src/app/valentina/dialogs/dialoghistory.h index 8696903d0..af122a73d 100644 --- a/src/app/valentina/dialogs/dialoghistory.h +++ b/src/app/valentina/dialogs/dialoghistory.h @@ -48,13 +48,13 @@ class DialogHistory : public DialogTool Q_OBJECT public: DialogHistory(VContainer *data, VPattern *doc, QWidget *parent = nullptr); - virtual ~DialogHistory() Q_DECL_OVERRIDE; + virtual ~DialogHistory() override; public slots: - virtual void DialogAccepted() Q_DECL_OVERRIDE; + virtual void DialogAccepted() override; /** TODO ISSUE 79 : create real function * @brief DialogApply apply data and emit signal about applied dialog. */ - virtual void DialogApply() Q_DECL_OVERRIDE {} + virtual void DialogApply() override {} void cellClicked(int row, int column); void ChangedCursor(quint32 id); void UpdateHistory(); @@ -66,8 +66,8 @@ signals: */ void ShowHistoryTool(quint32 id, bool enable); protected: - virtual void closeEvent ( QCloseEvent * event ) Q_DECL_OVERRIDE; - virtual void changeEvent(QEvent* event) Q_DECL_OVERRIDE; + virtual void closeEvent ( QCloseEvent * event ) override; + virtual void changeEvent(QEvent* event) override; private: Q_DISABLE_COPY(DialogHistory) diff --git a/src/app/valentina/dialogs/dialogincrements.h b/src/app/valentina/dialogs/dialogincrements.h index d52bffcfa..b96ac4407 100644 --- a/src/app/valentina/dialogs/dialogincrements.h +++ b/src/app/valentina/dialogs/dialogincrements.h @@ -50,17 +50,17 @@ class DialogIncrements : public DialogTool Q_OBJECT public: DialogIncrements(VContainer *data, VPattern *doc, QWidget *parent = nullptr); - virtual ~DialogIncrements() Q_DECL_OVERRIDE; + virtual ~DialogIncrements() override; signals: void UpdateProperties(); protected: - virtual void closeEvent ( QCloseEvent * event ) Q_DECL_OVERRIDE; - virtual void changeEvent ( QEvent * event) Q_DECL_OVERRIDE; - virtual bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE; - virtual void showEvent( QShowEvent *event ) Q_DECL_OVERRIDE; - virtual void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE; + virtual void closeEvent ( QCloseEvent * event ) override; + virtual void changeEvent ( QEvent * event) override; + virtual bool eventFilter(QObject *object, QEvent *event) override; + virtual void showEvent( QShowEvent *event ) override; + virtual void resizeEvent(QResizeEvent *event) override; private slots: void ShowIncrementDetails(); void AddIncrement(); diff --git a/src/app/valentina/dialogs/dialoglayoutprogress.h b/src/app/valentina/dialogs/dialoglayoutprogress.h index 87ccc2319..13d09497a 100644 --- a/src/app/valentina/dialogs/dialoglayoutprogress.h +++ b/src/app/valentina/dialogs/dialoglayoutprogress.h @@ -56,7 +56,7 @@ public slots: void Finished(); protected: - virtual void showEvent(QShowEvent *event) Q_DECL_OVERRIDE; + virtual void showEvent(QShowEvent *event) override; private: Q_DISABLE_COPY(DialogLayoutProgress) diff --git a/src/app/valentina/dialogs/dialoglayoutsettings.h b/src/app/valentina/dialogs/dialoglayoutsettings.h index 50143bd1f..204507873 100644 --- a/src/app/valentina/dialogs/dialoglayoutsettings.h +++ b/src/app/valentina/dialogs/dialoglayoutsettings.h @@ -112,7 +112,7 @@ public: qreal PageToPixels(qreal value) const; static QString MakeGroupsHelp(); protected: - virtual void showEvent(QShowEvent *event) Q_DECL_OVERRIDE; + virtual void showEvent(QShowEvent *event) override; QSizeF GetTemplateSize(const PaperSizeTemplate &tmpl, const Unit &unit) const; public slots: diff --git a/src/app/valentina/dialogs/dialognewpattern.h b/src/app/valentina/dialogs/dialognewpattern.h index 8ddf618a1..c1b6dc55b 100644 --- a/src/app/valentina/dialogs/dialognewpattern.h +++ b/src/app/valentina/dialogs/dialognewpattern.h @@ -49,7 +49,7 @@ public: QString name() const; Unit PatternUnit() const; protected: - virtual void showEvent(QShowEvent *event) Q_DECL_OVERRIDE; + virtual void showEvent(QShowEvent *event) override; private slots: void CheckState(); private: diff --git a/src/app/valentina/dialogs/dialogpatternmaterials.cpp b/src/app/valentina/dialogs/dialogpatternmaterials.cpp index ae67e87ef..2364b5d9c 100644 --- a/src/app/valentina/dialogs/dialogpatternmaterials.cpp +++ b/src/app/valentina/dialogs/dialogpatternmaterials.cpp @@ -67,7 +67,7 @@ public: } virtual QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, - const QModelIndex &index) const Q_DECL_OVERRIDE + const QModelIndex &index) const override { Q_UNUSED(option) Q_UNUSED(index) @@ -78,7 +78,7 @@ public: return editor; } - virtual void setEditorData(QWidget *editor, const QModelIndex &index) const Q_DECL_OVERRIDE + virtual void setEditorData(QWidget *editor, const QModelIndex &index) const override { const QString value = index.model()->data(index, Qt::EditRole).toString(); @@ -92,7 +92,7 @@ public: } virtual void setModelData(QWidget *editor, QAbstractItemModel *model, - const QModelIndex &index) const Q_DECL_OVERRIDE + const QModelIndex &index) const override { QComboBox *comboBox = static_cast(editor); QString value; @@ -107,7 +107,7 @@ public: } virtual void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, - const QModelIndex &index) const Q_DECL_OVERRIDE + const QModelIndex &index) const override { Q_UNUSED(index) editor->setGeometry(option.rect); diff --git a/src/app/valentina/dialogs/dialogpatternproperties.h b/src/app/valentina/dialogs/dialogpatternproperties.h index 28bc41036..3d5b3f0a6 100644 --- a/src/app/valentina/dialogs/dialogpatternproperties.h +++ b/src/app/valentina/dialogs/dialogpatternproperties.h @@ -47,7 +47,7 @@ class DialogPatternProperties : public QDialog Q_OBJECT public: explicit DialogPatternProperties(VPattern *doc, VContainer *pattern, QWidget *parent = nullptr); - virtual ~DialogPatternProperties() Q_DECL_OVERRIDE; + virtual ~DialogPatternProperties() override; signals: void UpdateGradation(); private slots: diff --git a/src/app/valentina/dialogs/dialogpreferences.h b/src/app/valentina/dialogs/dialogpreferences.h index 6db49fca6..02305998d 100644 --- a/src/app/valentina/dialogs/dialogpreferences.h +++ b/src/app/valentina/dialogs/dialogpreferences.h @@ -52,9 +52,9 @@ public: signals: void UpdateProperties(); protected: - virtual void showEvent(QShowEvent *event) Q_DECL_OVERRIDE; - virtual void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE; - virtual void changeEvent(QEvent* event) Q_DECL_OVERRIDE; + virtual void showEvent(QShowEvent *event) override; + virtual void resizeEvent(QResizeEvent *event) override; + virtual void changeEvent(QEvent* event) override; private slots: void PageChanged(QListWidgetItem *current, QListWidgetItem *previous); private: diff --git a/src/app/valentina/dialogs/dialogsavelayout.h b/src/app/valentina/dialogs/dialogsavelayout.h index 0aa3dae4c..8999d88c4 100644 --- a/src/app/valentina/dialogs/dialogsavelayout.h +++ b/src/app/valentina/dialogs/dialogsavelayout.h @@ -123,7 +123,7 @@ public: PageOrientation GetTiledPageOrientation() const; protected: - virtual void showEvent(QShowEvent *event) Q_DECL_OVERRIDE; + virtual void showEvent(QShowEvent *event) override; void InitTemplates(QComboBox *comboBoxTemplates); private slots: diff --git a/src/app/valentina/mainwindow.h b/src/app/valentina/mainwindow.h index 93db26146..f18d91aaf 100644 --- a/src/app/valentina/mainwindow.h +++ b/src/app/valentina/mainwindow.h @@ -62,16 +62,16 @@ class MainWindow : public MainWindowsNoGUI Q_OBJECT public: explicit MainWindow(QWidget *parent = nullptr); - virtual ~MainWindow() Q_DECL_OVERRIDE; + virtual ~MainWindow() override; bool LoadPattern(QString fileName, const QString &customMeasureFile = QString()); public slots: void ProcessCMD(); - virtual void ShowToolTip(const QString &toolTip) Q_DECL_OVERRIDE; - virtual void UpdateVisibilityGroups() Q_DECL_OVERRIDE; - virtual void UpdateDetailsList() Q_DECL_OVERRIDE; - virtual void ZoomFitBestCurrent() Q_DECL_OVERRIDE; + virtual void ShowToolTip(const QString &toolTip) override; + virtual void UpdateVisibilityGroups() override; + virtual void UpdateDetailsList() override; + virtual void ZoomFitBestCurrent() override; signals: void RefreshHistory(); @@ -100,15 +100,15 @@ signals: void EnableNodePointHover(bool enable); void EnableDetailHover(bool enable); protected: - virtual void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - virtual void showEvent(QShowEvent *event) Q_DECL_OVERRIDE; - virtual void changeEvent(QEvent* event) Q_DECL_OVERRIDE; - virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; - virtual void customEvent(QEvent * event) Q_DECL_OVERRIDE; - virtual void CleanLayout() Q_DECL_OVERRIDE; - virtual void PrepareSceneList() Q_DECL_OVERRIDE; + virtual void keyPressEvent(QKeyEvent *event) override; + virtual void showEvent(QShowEvent *event) override; + virtual void changeEvent(QEvent* event) override; + virtual void closeEvent(QCloseEvent *event) override; + virtual void customEvent(QEvent * event) override; + virtual void CleanLayout() override; + virtual void PrepareSceneList() override; virtual void ExportToCSVData(const QString &fileName, bool withHeader, int mib, - const QChar &separator) Q_DECL_FINAL; + const QChar &separator) final; private slots: void ScaleChanged(qreal scale); void MouseMove(const QPointF &scenePos); diff --git a/src/app/valentina/mainwindowsnogui.h b/src/app/valentina/mainwindowsnogui.h index bdc541119..635afbb3f 100644 --- a/src/app/valentina/mainwindowsnogui.h +++ b/src/app/valentina/mainwindowsnogui.h @@ -52,7 +52,7 @@ class MainWindowsNoGUI : public VAbstractMainWindow Q_OBJECT public: explicit MainWindowsNoGUI(QWidget *parent = nullptr); - virtual ~MainWindowsNoGUI() Q_DECL_OVERRIDE; + virtual ~MainWindowsNoGUI() override; public slots: void ToolLayoutSettings(bool checked); diff --git a/src/app/valentina/xml/vpattern.h b/src/app/valentina/xml/vpattern.h index 30fb52d9d..3fddcf593 100644 --- a/src/app/valentina/xml/vpattern.h +++ b/src/app/valentina/xml/vpattern.h @@ -49,25 +49,25 @@ public: VPattern(VContainer *data, Draw *mode, VMainGraphicsScene *sceneDraw, VMainGraphicsScene *sceneDetail, QObject *parent = nullptr); - virtual void CreateEmptyFile() Q_DECL_OVERRIDE; + virtual void CreateEmptyFile() override; void Parse(const Document &parse); void GarbageCollector(bool commit = false); void setCurrentData(); - virtual void UpdateToolData(const quint32 &id, VContainer *data) Q_DECL_OVERRIDE; + virtual void UpdateToolData(const quint32 &id, VContainer *data) override; VContainer GetCompleteData() const; - virtual void IncrementReferens(quint32 id) const Q_DECL_OVERRIDE; - virtual void DecrementReferens(quint32 id) const Q_DECL_OVERRIDE; + virtual void IncrementReferens(quint32 id) const override; + virtual void DecrementReferens(quint32 id) const override; quint32 SPointActiveDraw(); QVector GetActivePPPieces() const; - virtual void setXMLContent(const QString &fileName) Q_DECL_OVERRIDE; - virtual bool SaveDocument(const QString &fileName, QString &error) Q_DECL_OVERRIDE; + virtual void setXMLContent(const QString &fileName) override; + virtual bool SaveDocument(const QString &fileName, QString &error) override; QRectF ActiveDrawBoundingRect() const; @@ -92,8 +92,8 @@ public: void ReplaceNameInFormula(QVector &expressions, const QString &name, const QString &newName); - virtual QString GenerateLabel(const LabelType &type, const QString &reservedName = QString())const Q_DECL_OVERRIDE; - virtual QString GenerateSuffix() const Q_DECL_OVERRIDE; + virtual QString GenerateLabel(const LabelType &type, const QString &reservedName = QString())const override; + virtual QString GenerateSuffix() const override; bool IsDefCustom() const; void SetDefCustom(bool value); @@ -114,10 +114,10 @@ public: int ElementsToParse() const; public slots: - virtual void LiteParseTree(const Document &parse) Q_DECL_OVERRIDE; + virtual void LiteParseTree(const Document &parse) override; protected: - virtual void customEvent(QEvent * event) Q_DECL_OVERRIDE; + virtual void customEvent(QEvent * event) override; private: Q_DISABLE_COPY(VPattern) diff --git a/src/libs/ifc/exception/vexception.h b/src/libs/ifc/exception/vexception.h index 612eecf11..815ad0a44 100644 --- a/src/libs/ifc/exception/vexception.h +++ b/src/libs/ifc/exception/vexception.h @@ -48,10 +48,10 @@ public: VException &operator=(const VException &e); virtual ~VException() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT; - Q_NORETURN virtual void raise() const Q_DECL_OVERRIDE; + Q_NORETURN virtual void raise() const override; // cppcheck-suppress unusedFunction - Q_REQUIRED_RESULT virtual VException *clone() const Q_DECL_OVERRIDE; + Q_REQUIRED_RESULT virtual VException *clone() const override; virtual QString ErrorMessage() const; virtual QString DetailedInformation() const; @@ -99,9 +99,9 @@ public: VExceptionToolWasDeleted &operator=(const VExceptionToolWasDeleted &e); virtual ~VExceptionToolWasDeleted() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT; - Q_NORETURN virtual void raise() const Q_DECL_OVERRIDE; + Q_NORETURN virtual void raise() const override; // cppcheck-suppress unusedFunction - virtual VExceptionToolWasDeleted *clone() const Q_DECL_OVERRIDE; + virtual VExceptionToolWasDeleted *clone() const override; }; #endif // VEXCEPTION_H diff --git a/src/libs/ifc/exception/vexceptionbadid.h b/src/libs/ifc/exception/vexceptionbadid.h index 18424a3b4..712feb572 100644 --- a/src/libs/ifc/exception/vexceptionbadid.h +++ b/src/libs/ifc/exception/vexceptionbadid.h @@ -47,7 +47,7 @@ public: VExceptionBadId(const VExceptionBadId &e); VExceptionBadId &operator=(const VExceptionBadId &e); virtual ~VExceptionBadId() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT; - virtual QString ErrorMessage() const Q_DECL_OVERRIDE; + virtual QString ErrorMessage() const override; quint32 BadId() const; QString BadKey() const; protected: diff --git a/src/libs/ifc/exception/vexceptionconversionerror.h b/src/libs/ifc/exception/vexceptionconversionerror.h index d982a386a..44eb367ac 100644 --- a/src/libs/ifc/exception/vexceptionconversionerror.h +++ b/src/libs/ifc/exception/vexceptionconversionerror.h @@ -45,7 +45,7 @@ public: VExceptionConversionError(const VExceptionConversionError &e); VExceptionConversionError &operator=(const VExceptionConversionError &e); virtual ~VExceptionConversionError() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT; - virtual QString ErrorMessage() const Q_DECL_OVERRIDE; + virtual QString ErrorMessage() const override; QString String() const; protected: /** @brief str string, where happend error */ diff --git a/src/libs/ifc/exception/vexceptionemptyparameter.h b/src/libs/ifc/exception/vexceptionemptyparameter.h index 57fbdb138..b81cc4613 100644 --- a/src/libs/ifc/exception/vexceptionemptyparameter.h +++ b/src/libs/ifc/exception/vexceptionemptyparameter.h @@ -48,8 +48,8 @@ public: VExceptionEmptyParameter(const VExceptionEmptyParameter &e); VExceptionEmptyParameter &operator=(const VExceptionEmptyParameter &e); virtual ~VExceptionEmptyParameter() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT; - virtual QString ErrorMessage() const Q_DECL_OVERRIDE; - virtual QString DetailedInformation() const Q_DECL_OVERRIDE; + virtual QString ErrorMessage() const override; + virtual QString DetailedInformation() const override; QString Name() const; QString TagText() const; QString TagName() const; diff --git a/src/libs/ifc/exception/vexceptionobjecterror.h b/src/libs/ifc/exception/vexceptionobjecterror.h index a20a746b5..d24da83df 100644 --- a/src/libs/ifc/exception/vexceptionobjecterror.h +++ b/src/libs/ifc/exception/vexceptionobjecterror.h @@ -48,8 +48,8 @@ public: VExceptionObjectError(const VExceptionObjectError &e); VExceptionObjectError &operator=(const VExceptionObjectError &e); virtual ~VExceptionObjectError() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT; - virtual QString ErrorMessage() const Q_DECL_OVERRIDE; - virtual QString DetailedInformation() const Q_DECL_OVERRIDE; + virtual QString ErrorMessage() const override; + virtual QString DetailedInformation() const override; QString TagText() const; QString TagName() const; qint32 LineNumber() const; diff --git a/src/libs/ifc/exception/vexceptionwrongid.h b/src/libs/ifc/exception/vexceptionwrongid.h index 8a5f2bee0..7e53b97f2 100644 --- a/src/libs/ifc/exception/vexceptionwrongid.h +++ b/src/libs/ifc/exception/vexceptionwrongid.h @@ -48,8 +48,8 @@ public: VExceptionWrongId(const VExceptionWrongId &e); VExceptionWrongId &operator=(const VExceptionWrongId &e); virtual ~VExceptionWrongId() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT; - virtual QString ErrorMessage() const Q_DECL_OVERRIDE; - virtual QString DetailedInformation() const Q_DECL_OVERRIDE; + virtual QString ErrorMessage() const override; + virtual QString DetailedInformation() const override; QString TagText() const; QString TagName() const; qint32 LineNumber() const; diff --git a/src/libs/ifc/xml/vdomdocument.cpp b/src/libs/ifc/xml/vdomdocument.cpp index 24a4c8132..0533fe49b 100644 --- a/src/libs/ifc/xml/vdomdocument.cpp +++ b/src/libs/ifc/xml/vdomdocument.cpp @@ -139,7 +139,7 @@ public: protected: // cppcheck-suppress unusedFunction virtual void handleMessage(QtMsgType type, const QString &description, - const QUrl &identifier, const QSourceLocation &sourceLocation) Q_DECL_OVERRIDE; + const QUrl &identifier, const QSourceLocation &sourceLocation) override; private: QtMsgType m_messageType; QString m_description; diff --git a/src/libs/ifc/xml/vlabeltemplateconverter.h b/src/libs/ifc/xml/vlabeltemplateconverter.h index edc1a64ae..f7b52ae14 100644 --- a/src/libs/ifc/xml/vlabeltemplateconverter.h +++ b/src/libs/ifc/xml/vlabeltemplateconverter.h @@ -43,17 +43,17 @@ public: static Q_DECL_CONSTEXPR const int LabelTemplateMaxVer = CONVERTER_VERSION_CHECK(1, 0, 0); protected: - virtual int MinVer() const Q_DECL_OVERRIDE; - virtual int MaxVer() const Q_DECL_OVERRIDE; + virtual int MinVer() const override; + virtual int MaxVer() const override; - virtual QString MinVerStr() const Q_DECL_OVERRIDE; - virtual QString MaxVerStr() const Q_DECL_OVERRIDE; + virtual QString MinVerStr() const override; + virtual QString MaxVerStr() const override; - virtual QString XSDSchema(int ver) const Q_DECL_OVERRIDE; - virtual void ApplyPatches() Q_DECL_OVERRIDE; - virtual void DowngradeToCurrentMaxVersion() Q_DECL_OVERRIDE; + virtual QString XSDSchema(int ver) const override; + virtual void ApplyPatches() override; + virtual void DowngradeToCurrentMaxVersion() override; - virtual bool IsReadOnly() const Q_DECL_OVERRIDE {return false;} + virtual bool IsReadOnly() const override {return false;} private: Q_DISABLE_COPY(VLabelTemplateConverter) diff --git a/src/libs/ifc/xml/vpatternconverter.h b/src/libs/ifc/xml/vpatternconverter.h index 989e53cec..9a6bb750b 100644 --- a/src/libs/ifc/xml/vpatternconverter.h +++ b/src/libs/ifc/xml/vpatternconverter.h @@ -56,17 +56,17 @@ public: static Q_DECL_CONSTEXPR const int PatternMaxVer = CONVERTER_VERSION_CHECK(0, 7, 8); protected: - virtual int MinVer() const Q_DECL_OVERRIDE; - virtual int MaxVer() const Q_DECL_OVERRIDE; + virtual int MinVer() const override; + virtual int MaxVer() const override; - virtual QString MinVerStr() const Q_DECL_OVERRIDE; - virtual QString MaxVerStr() const Q_DECL_OVERRIDE; + virtual QString MinVerStr() const override; + virtual QString MaxVerStr() const override; - virtual QString XSDSchema(int ver) const Q_DECL_OVERRIDE; - virtual void ApplyPatches() Q_DECL_OVERRIDE; - virtual void DowngradeToCurrentMaxVersion() Q_DECL_OVERRIDE; + virtual QString XSDSchema(int ver) const override; + virtual void ApplyPatches() override; + virtual void DowngradeToCurrentMaxVersion() override; - virtual bool IsReadOnly() const Q_DECL_OVERRIDE; + virtual bool IsReadOnly() const override; private: Q_DISABLE_COPY(VPatternConverter) diff --git a/src/libs/ifc/xml/vvitconverter.h b/src/libs/ifc/xml/vvitconverter.h index d203c0e3e..cb7f71ce4 100644 --- a/src/libs/ifc/xml/vvitconverter.h +++ b/src/libs/ifc/xml/vvitconverter.h @@ -52,16 +52,16 @@ public: static Q_DECL_CONSTEXPR const int MeasurementMaxVer = CONVERTER_VERSION_CHECK(0, 4, 0); protected: - virtual int MinVer() const Q_DECL_OVERRIDE; - virtual int MaxVer() const Q_DECL_OVERRIDE; + virtual int MinVer() const override; + virtual int MaxVer() const override; - virtual QString MinVerStr() const Q_DECL_OVERRIDE; - virtual QString MaxVerStr() const Q_DECL_OVERRIDE; + virtual QString MinVerStr() const override; + virtual QString MaxVerStr() const override; - virtual QString XSDSchema(int ver) const Q_DECL_OVERRIDE; - virtual void ApplyPatches() Q_DECL_OVERRIDE; - virtual void DowngradeToCurrentMaxVersion() Q_DECL_OVERRIDE; - virtual bool IsReadOnly() const Q_DECL_OVERRIDE; + virtual QString XSDSchema(int ver) const override; + virtual void ApplyPatches() override; + virtual void DowngradeToCurrentMaxVersion() override; + virtual bool IsReadOnly() const override; private: Q_DISABLE_COPY(VVITConverter) diff --git a/src/libs/ifc/xml/vvstconverter.h b/src/libs/ifc/xml/vvstconverter.h index 7da67c038..36929e437 100644 --- a/src/libs/ifc/xml/vvstconverter.h +++ b/src/libs/ifc/xml/vvstconverter.h @@ -58,16 +58,16 @@ public: #endif protected: - virtual int MinVer() const Q_DECL_OVERRIDE; - virtual int MaxVer() const Q_DECL_OVERRIDE; + virtual int MinVer() const override; + virtual int MaxVer() const override; - virtual QString MinVerStr() const Q_DECL_OVERRIDE; - virtual QString MaxVerStr() const Q_DECL_OVERRIDE; + virtual QString MinVerStr() const override; + virtual QString MaxVerStr() const override; - virtual QString XSDSchema(int ver) const Q_DECL_OVERRIDE; - virtual void ApplyPatches() Q_DECL_OVERRIDE; - virtual void DowngradeToCurrentMaxVersion() Q_DECL_OVERRIDE; - virtual bool IsReadOnly() const Q_DECL_OVERRIDE; + virtual QString XSDSchema(int ver) const override; + virtual void ApplyPatches() override; + virtual void DowngradeToCurrentMaxVersion() override; + virtual bool IsReadOnly() const override; private: Q_DISABLE_COPY(VVSTConverter) diff --git a/src/libs/qmuparser/qmuformulabase.h b/src/libs/qmuparser/qmuformulabase.h index 6324f4cc8..c74041ca3 100644 --- a/src/libs/qmuparser/qmuformulabase.h +++ b/src/libs/qmuparser/qmuformulabase.h @@ -39,9 +39,9 @@ class QMUPARSERSHARED_EXPORT QmuFormulaBase : public QmuParser { public: QmuFormulaBase(); - virtual ~QmuFormulaBase() Q_DECL_OVERRIDE; + virtual ~QmuFormulaBase() override; - virtual void InitCharSets() Q_DECL_OVERRIDE; + virtual void InitCharSets() override; static void RemoveAll(QMap &map, const QString &val); diff --git a/src/libs/qmuparser/qmuparser.h b/src/libs/qmuparser/qmuparser.h index 3b873b9d4..d06abe518 100644 --- a/src/libs/qmuparser/qmuparser.h +++ b/src/libs/qmuparser/qmuparser.h @@ -51,11 +51,11 @@ namespace qmu { public: QmuParser(); - virtual void InitCharSets() Q_DECL_OVERRIDE; - virtual void InitFun() Q_DECL_OVERRIDE; - virtual void InitConst() Q_DECL_OVERRIDE; - virtual void InitOprt() Q_DECL_OVERRIDE; - virtual void OnDetectVar(const QString &pExpr, int &nStart, int &nEnd) Q_DECL_OVERRIDE; + virtual void InitCharSets() override; + virtual void InitFun() override; + virtual void InitConst() override; + virtual void InitOprt() override; + virtual void OnDetectVar(const QString &pExpr, int &nStart, int &nEnd) override; qreal Diff(qreal *a_Var, qreal a_fPos, qreal a_fEpsilon = 0) const; protected: static int IsVal(const QString &a_szExpr, int *a_iPos, qreal *a_fVal, const QLocale &locale, diff --git a/src/libs/qmuparser/qmuparserbase.h b/src/libs/qmuparser/qmuparserbase.h index e2f61cb0b..5332b909a 100644 --- a/src/libs/qmuparser/qmuparserbase.h +++ b/src/libs/qmuparser/qmuparserbase.h @@ -166,17 +166,17 @@ protected: :std::numpunct(), m_nGroup(nGroup), m_cDecPoint(cDecSep), m_cThousandsSep(cThousandsSep) {} protected: - virtual char_type do_decimal_point() const Q_DECL_OVERRIDE + virtual char_type do_decimal_point() const override { return m_cDecPoint; } - virtual char_type do_thousands_sep() const Q_DECL_OVERRIDE + virtual char_type do_thousands_sep() const override { return m_cThousandsSep; } - virtual std::string do_grouping() const Q_DECL_OVERRIDE + virtual std::string do_grouping() const override { // fix for issue 4: https://code.google.com/p/muparser/issues/detail?id=4 // courtesy of Jens Bartsch diff --git a/src/libs/qmuparser/qmuparsererror.h b/src/libs/qmuparser/qmuparsererror.h index 8453b1a19..41dad2400 100644 --- a/src/libs/qmuparser/qmuparsererror.h +++ b/src/libs/qmuparser/qmuparsererror.h @@ -146,7 +146,7 @@ public: QmuParserError ( const QString &szMsg, int iPos, const QString &sTok = QString() ); QmuParserError ( const QmuParserError &a_Obj ); QmuParserError& operator= ( const QmuParserError &a_Obj ); - virtual ~QmuParserError() QMUP_NOEXCEPT_EXPR (true) Q_DECL_OVERRIDE {} + virtual ~QmuParserError() QMUP_NOEXCEPT_EXPR (true) override {} void SetFormula ( const QString &a_strFormula ); const QString& GetExpr() const; @@ -154,8 +154,8 @@ public: int GetPos() const; const QString& GetToken() const; EErrorCodes GetCode() const; - Q_NORETURN virtual void raise() const Q_DECL_OVERRIDE; - Q_REQUIRED_RESULT virtual QmuParserError *clone() const Q_DECL_OVERRIDE; + Q_NORETURN virtual void raise() const override; + Q_REQUIRED_RESULT virtual QmuParserError *clone() const override; private: QString m_sMsg; ///< The message string QString m_sExpr; ///< Formula string diff --git a/src/libs/vdxf/dxiface.h b/src/libs/vdxf/dxiface.h index bb58a8f03..9a70b8e0c 100644 --- a/src/libs/vdxf/dxiface.h +++ b/src/libs/vdxf/dxiface.h @@ -103,18 +103,18 @@ public: //reimplement virtual DRW_Interface functions //writer part, send all in class dx_data to writer - virtual void writeHeader(DRW_Header& data); - virtual void writeBlocks(); + virtual void writeHeader(DRW_Header& data) override; + virtual void writeBlocks() override; //only send the name, needed by the reader to prepare handles of blocks & blockRecords - virtual void writeBlockRecords(); + virtual void writeBlockRecords() override; //write entities of model space and first paper_space - virtual void writeEntities(); - virtual void writeLTypes(); - virtual void writeLayers(); - virtual void writeTextstyles(); - virtual void writeVports(); - virtual void writeDimstyles(); - virtual void writeAppId(); + virtual void writeEntities() override; + virtual void writeLTypes() override; + virtual void writeLayers() override; + virtual void writeTextstyles() override; + virtual void writeVports() override; + virtual void writeDimstyles() override; + virtual void writeAppId() override; void AddEntity(DRW_Entity* e); UTF8STRING AddFont(const QFont &f); diff --git a/src/libs/vdxf/libdxfrw/drw_entities.h b/src/libs/vdxf/libdxfrw/drw_entities.h index c93d3da3f..1b4719a94 100644 --- a/src/libs/vdxf/libdxfrw/drw_entities.h +++ b/src/libs/vdxf/libdxfrw/drw_entities.h @@ -238,7 +238,7 @@ public: eType = DRW::POINT; } - virtual void applyExtrusion(){} + virtual void applyExtrusion() override{} protected: void parseCode(int code, dxfReader *reader); @@ -265,7 +265,7 @@ public: eType = DRW::LINE; } - virtual void applyExtrusion(){} + virtual void applyExtrusion() override{} protected: void parseCode(int code, dxfReader *reader); @@ -313,7 +313,7 @@ public: eType = DRW::CIRCLE; } - virtual void applyExtrusion(); + virtual void applyExtrusion() override; protected: void parseCode(int code, dxfReader *reader); @@ -338,7 +338,7 @@ public: eType = DRW::ARC; } - virtual void applyExtrusion(); + virtual void applyExtrusion() override; //! center point in OCS const DRW_Coord & center() const { return basePoint; } @@ -383,7 +383,7 @@ public: } void toPolyline(DRW_Polyline *pol, int parts = 128); - virtual void applyExtrusion(); + virtual void applyExtrusion() override; protected: //! interpret code in dxf reading process or dispatch to inherited class @@ -414,7 +414,7 @@ public: eType = DRW::TRACE; } - virtual void applyExtrusion(); + virtual void applyExtrusion() override; protected: void parseCode(int code, dxfReader *reader); @@ -481,7 +481,7 @@ public: eType = DRW::E3DFACE; } - virtual void applyExtrusion() {} + virtual void applyExtrusion() override {} //! first corner in WCS const DRW_Coord & firstCorner() const { return basePoint; } @@ -519,7 +519,7 @@ public: layer = '0'; } - virtual void applyExtrusion(){} + virtual void applyExtrusion() override {} protected: void parseCode(int code, dxfReader *reader); @@ -607,7 +607,7 @@ public: ~DRW_LWPolyline() { for(DRW_Vertex2D *item : vertlist) delete item; } - virtual void applyExtrusion(); + virtual void applyExtrusion() override; void addVertex (DRW_Vertex2D v) { DRW_Vertex2D *vert = new DRW_Vertex2D(); vert->x = v.x; @@ -682,7 +682,7 @@ public: eType = DRW::TEXT; } - virtual void applyExtrusion(){} //RLZ TODO + virtual void applyExtrusion() override {} //RLZ TODO protected: void parseCode(int code, dxfReader *reader); @@ -943,7 +943,7 @@ public: for(DRW_Coord *item : controllist) delete item; for(DRW_Coord *item : fitlist) delete item; } - virtual void applyExtrusion(){} + virtual void applyExtrusion() override {} protected: void parseCode(int code, dxfReader *reader); @@ -1057,7 +1057,7 @@ public: looplist.push_back(v); } - virtual void applyExtrusion(){} + virtual void applyExtrusion() override {} protected: void parseCode(int code, dxfReader *reader); @@ -1238,7 +1238,7 @@ public: } virtual ~DRW_Dimension() = default; - virtual void applyExtrusion(){} + virtual void applyExtrusion() override {} protected: void parseCode(int code, dxfReader *reader); @@ -1544,7 +1544,7 @@ public: for(DRW_Coord *item : vertexlist) delete item; } - virtual void applyExtrusion(){} + virtual void applyExtrusion() override {} protected: void parseCode(int code, dxfReader *reader); @@ -1606,7 +1606,7 @@ public: eType = DRW::VIEWPORT; } - virtual void applyExtrusion(){} + virtual void applyExtrusion() override {} protected: void parseCode(int code, dxfReader *reader); diff --git a/src/libs/vdxf/libdxfrw/intern/drw_dbg.cpp b/src/libs/vdxf/libdxfrw/intern/drw_dbg.cpp index 0456d48a1..58042c4b1 100644 --- a/src/libs/vdxf/libdxfrw/intern/drw_dbg.cpp +++ b/src/libs/vdxf/libdxfrw/intern/drw_dbg.cpp @@ -19,7 +19,7 @@ DRW_dbg *DRW_dbg::instance= NULL; /*********private clases*************/ class print_none { public: - virtual void printS(std::string s){(void)s;} + virtual void printS(const std::string &s){(void)s;} virtual void printI(long long int i){(void)i;} virtual void printUI(long long unsigned int i){(void)i;} virtual void printD(double d){(void)d;} @@ -33,14 +33,14 @@ public: class print_debug : public print_none { public: - virtual void printS(std::string s); - virtual void printI(long long int i); - virtual void printUI(long long unsigned int i); - virtual void printD(double d); - virtual void printH(long long int i); - virtual void printB(int i); - virtual void printHL(int c, int s, int h); - virtual void printPT(double x, double y, double z); + virtual void printS(const std::string &s) override; + virtual void printI(long long int i) override; + virtual void printUI(long long unsigned int i) override; + virtual void printD(double d) override; + virtual void printH(long long int i) override; + virtual void printB(int i) override; + virtual void printHL(int c, int s, int h) override; + virtual void printPT(double x, double y, double z) override; print_debug(); virtual ~print_debug() = default; private: @@ -82,7 +82,7 @@ DRW_dbg::LEVEL DRW_dbg::getLevel() const{ return level; } -void DRW_dbg::print(std::string s){ +void DRW_dbg::print(const std::string &s){ prClass->printS(s); } @@ -129,7 +129,7 @@ print_debug::print_debug() : flags(std::cerr.flags()) {} -void print_debug::printS(std::string s){ +void print_debug::printS(const std::string &s){ std::cerr << s; } diff --git a/src/libs/vdxf/libdxfrw/intern/drw_dbg.h b/src/libs/vdxf/libdxfrw/intern/drw_dbg.h index f1d95404c..e04b9c959 100644 --- a/src/libs/vdxf/libdxfrw/intern/drw_dbg.h +++ b/src/libs/vdxf/libdxfrw/intern/drw_dbg.h @@ -38,7 +38,7 @@ public: void setLevel(LEVEL lvl); LEVEL getLevel() const; static DRW_dbg *getInstance(); - void print(std::string s); + void print(const std::string &s); void print(int i); void print(unsigned int i); void print(long long int i); diff --git a/src/libs/vdxf/libdxfrw/intern/dxfreader.h b/src/libs/vdxf/libdxfrw/intern/dxfreader.h index f33416a23..3593b018f 100644 --- a/src/libs/vdxf/libdxfrw/intern/dxfreader.h +++ b/src/libs/vdxf/libdxfrw/intern/dxfreader.h @@ -43,7 +43,7 @@ public: std::string getString() const {return strData;} int getHandleString();//Convert hex string to int - std::string toUtf8String(std::string t) {return decoder.toUtf8(t);} + std::string toUtf8String(const std::string &t) {return decoder.toUtf8(t);} std::string getUtf8String() {return decoder.toUtf8(strData);} double getDouble() const {return doubleData;} int getInt32() const {return intData;} @@ -83,14 +83,14 @@ public: {skip = false; } virtual ~dxfReaderBinary() = default; - virtual bool readCode(int *code); - virtual bool readString(std::string *text); - virtual bool readString(); - virtual bool readInt16(); - virtual bool readInt32(); - virtual bool readInt64(); - virtual bool readDouble(); - virtual bool readBool(); + virtual bool readCode(int *code) override; + virtual bool readString(std::string *text) override; + virtual bool readString() override; + virtual bool readInt16() override; + virtual bool readInt32() override; + virtual bool readInt64() override; + virtual bool readDouble() override; + virtual bool readBool() override; }; class dxfReaderAscii : public dxfReader { @@ -100,14 +100,14 @@ public: {skip = true; } virtual ~dxfReaderAscii() = default; - virtual bool readCode(int *code); - virtual bool readString(std::string *text); - virtual bool readString(); - virtual bool readInt16(); - virtual bool readDouble(); - virtual bool readInt32(); - virtual bool readInt64(); - virtual bool readBool(); + virtual bool readCode(int *code) override; + virtual bool readString(std::string *text) override; + virtual bool readString() override; + virtual bool readInt16() override; + virtual bool readDouble() override; + virtual bool readInt32() override; + virtual bool readInt64() override; + virtual bool readBool() override; }; #endif // DXFREADER_H diff --git a/src/libs/vdxf/libdxfrw/intern/dxfwriter.h b/src/libs/vdxf/libdxfrw/intern/dxfwriter.h index 7a6c0fde8..831d88358 100644 --- a/src/libs/vdxf/libdxfrw/intern/dxfwriter.h +++ b/src/libs/vdxf/libdxfrw/intern/dxfwriter.h @@ -26,7 +26,7 @@ public: virtual bool writeString(int code, std::string text) = 0; bool writeUtf8String(int code, const std::string &text); bool writeUtf8Caps(int code, const std::string &text); - std::string fromUtf8String(std::string t) {return encoder.fromUtf8(t);} + std::string fromUtf8String(const std::string &t) {return encoder.fromUtf8(t);} virtual bool writeInt16(int code, int data) = 0; virtual bool writeInt32(int code, int data) = 0; virtual bool writeInt64(int code, unsigned long long int data) = 0; @@ -48,24 +48,24 @@ public: : dxfWriter(stream) {} virtual ~dxfWriterBinary() = default; - virtual bool writeString(int code, std::string text); - virtual bool writeInt16(int code, int data); - virtual bool writeInt32(int code, int data); - virtual bool writeInt64(int code, unsigned long long int data); - virtual bool writeDouble(int code, double data); - virtual bool writeBool(int code, bool data); + virtual bool writeString(int code, std::string text) override; + virtual bool writeInt16(int code, int data) override; + virtual bool writeInt32(int code, int data) override; + virtual bool writeInt64(int code, unsigned long long int data) override; + virtual bool writeDouble(int code, double data) override; + virtual bool writeBool(int code, bool data) override; }; class dxfWriterAscii : public dxfWriter { public: explicit dxfWriterAscii(std::ofstream *stream); virtual ~dxfWriterAscii() = default; - virtual bool writeString(int code, std::string text); - virtual bool writeInt16(int code, int data); - virtual bool writeInt32(int code, int data); - virtual bool writeInt64(int code, unsigned long long int data); - virtual bool writeDouble(int code, double data); - virtual bool writeBool(int code, bool data); + virtual bool writeString(int code, std::string text) override; + virtual bool writeInt16(int code, int data) override; + virtual bool writeInt32(int code, int data) override; + virtual bool writeInt64(int code, unsigned long long int data) override; + virtual bool writeDouble(int code, double data) override; + virtual bool writeBool(int code, bool data) override; }; #endif // DXFWRITER_H diff --git a/src/libs/vdxf/vdxfengine.h b/src/libs/vdxf/vdxfengine.h index c09a12fb8..414d9bf82 100644 --- a/src/libs/vdxf/vdxfengine.h +++ b/src/libs/vdxf/vdxfengine.h @@ -57,19 +57,19 @@ public: VDxfEngine(); virtual ~VDxfEngine(); - virtual bool begin(QPaintDevice *pdev) Q_DECL_OVERRIDE; - virtual bool end() Q_DECL_OVERRIDE; - virtual void updateState(const QPaintEngineState &state) Q_DECL_OVERRIDE; - virtual void drawPath(const QPainterPath &path) Q_DECL_OVERRIDE; - virtual void drawLines(const QLineF * lines, int lineCount) Q_DECL_OVERRIDE; - virtual void drawLines(const QLine * lines, int lineCount) Q_DECL_OVERRIDE; - virtual void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode) Q_DECL_OVERRIDE; - virtual void drawPolygon(const QPoint *points, int pointCount, PolygonDrawMode mode) Q_DECL_OVERRIDE; - virtual void drawEllipse(const QRectF & rect) Q_DECL_OVERRIDE; - virtual void drawEllipse(const QRect & rect) Q_DECL_OVERRIDE; - virtual void drawTextItem(const QPointF & p, const QTextItem & textItem) Q_DECL_OVERRIDE; - virtual Type type() const Q_DECL_OVERRIDE; - virtual void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) Q_DECL_OVERRIDE; + virtual bool begin(QPaintDevice *pdev) override; + virtual bool end() override; + virtual void updateState(const QPaintEngineState &state) override; + virtual void drawPath(const QPainterPath &path) override; + virtual void drawLines(const QLineF * lines, int lineCount) override; + virtual void drawLines(const QLine * lines, int lineCount) override; + virtual void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode) override; + virtual void drawPolygon(const QPoint *points, int pointCount, PolygonDrawMode mode) override; + virtual void drawEllipse(const QRectF & rect) override; + virtual void drawEllipse(const QRect & rect) override; + virtual void drawTextItem(const QPointF & p, const QTextItem & textItem) override; + virtual Type type() const override; + virtual void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) override; QSize getSize() const; void setSize(const QSize &value); diff --git a/src/libs/vdxf/vdxfpaintdevice.h b/src/libs/vdxf/vdxfpaintdevice.h index 44caa7950..70bf0d71d 100644 --- a/src/libs/vdxf/vdxfpaintdevice.h +++ b/src/libs/vdxf/vdxfpaintdevice.h @@ -45,8 +45,8 @@ class VDxfPaintDevice : public QPaintDevice { public: VDxfPaintDevice(); - virtual ~VDxfPaintDevice() Q_DECL_OVERRIDE; - virtual QPaintEngine *paintEngine() const Q_DECL_OVERRIDE; + virtual ~VDxfPaintDevice() override; + virtual QPaintEngine *paintEngine() const override; QString getFileName() const; void setFileName(const QString &value); @@ -69,7 +69,7 @@ public: bool ExportToAAMA(const QVector &details) const; protected: - virtual int metric(PaintDeviceMetric metric) const Q_DECL_OVERRIDE; + virtual int metric(PaintDeviceMetric metric) const override; private: Q_DISABLE_COPY(VDxfPaintDevice) VDxfEngine *engine; diff --git a/src/libs/vformat/vmeasurements.h b/src/libs/vformat/vmeasurements.h index 67c33defa..941257c5b 100644 --- a/src/libs/vformat/vmeasurements.h +++ b/src/libs/vformat/vmeasurements.h @@ -51,8 +51,8 @@ public: VMeasurements(Unit unit, int baseSize, int baseHeight, VContainer *data); virtual ~VMeasurements() Q_DECL_EQ_DEFAULT; - virtual void setXMLContent(const QString &fileName) Q_DECL_OVERRIDE; - virtual bool SaveDocument(const QString &fileName, QString &error) Q_DECL_OVERRIDE; + virtual void setXMLContent(const QString &fileName) override; + virtual bool SaveDocument(const QString &fileName, QString &error) override; void AddEmpty(const QString &name, const QString &formula = QString()); void AddEmptyAfter(const QString &after, const QString &name, const QString &formula = QString()); diff --git a/src/libs/vgeometry/vabstractarc.h b/src/libs/vgeometry/vabstractarc.h index a6ff51f93..be750f9c6 100644 --- a/src/libs/vgeometry/vabstractarc.h +++ b/src/libs/vgeometry/vabstractarc.h @@ -66,11 +66,11 @@ public: QString GetFormulaF1 () const; void SetFormulaF1 (const QString &formula, qreal value); - virtual qreal GetStartAngle () const Q_DECL_OVERRIDE; + virtual qreal GetStartAngle () const override; QString GetFormulaF2 () const; void SetFormulaF2 (const QString &formula, qreal value); - virtual qreal GetEndAngle () const Q_DECL_OVERRIDE; + virtual qreal GetEndAngle () const override; virtual VPointF GetCenter () const; void SetCenter (const VPointF &point); @@ -78,8 +78,8 @@ public: QString GetFormulaLength () const; void SetFormulaLength (const QString &formula, qreal value); - virtual void setId(const quint32 &id) Q_DECL_OVERRIDE; - virtual QString NameForHistory(const QString &toolName) const Q_DECL_OVERRIDE; + virtual void setId(const quint32 &id) override; + virtual QString NameForHistory(const QString &toolName) const override; bool IsFlipped() const; qreal AngleArc() const; diff --git a/src/libs/vgeometry/vabstractcubicbezier.h b/src/libs/vgeometry/vabstractcubicbezier.h index 2f235f66e..723625248 100644 --- a/src/libs/vgeometry/vabstractcubicbezier.h +++ b/src/libs/vgeometry/vabstractcubicbezier.h @@ -56,13 +56,13 @@ public: QPointF CutSpline ( qreal length, QPointF &spl1p2, QPointF &spl1p3, QPointF &spl2p2, QPointF &spl2p3) const; - virtual QString NameForHistory(const QString &toolName) const Q_DECL_OVERRIDE; + virtual QString NameForHistory(const QString &toolName) const override; qreal GetParmT(qreal length) const; qreal LengthT(qreal t) const; protected: - virtual void CreateName() Q_DECL_OVERRIDE; + virtual void CreateName() override; static qreal CalcSqDistance(qreal x1, qreal y1, qreal x2, qreal y2); static void PointBezier_r(qreal x1, qreal y1, qreal x2, qreal y2, qreal x3, qreal y3, qreal x4, diff --git a/src/libs/vgeometry/vabstractcubicbezierpath.h b/src/libs/vgeometry/vabstractcubicbezierpath.h index 3f0b71684..a5f93cf9d 100644 --- a/src/libs/vgeometry/vabstractcubicbezierpath.h +++ b/src/libs/vgeometry/vabstractcubicbezierpath.h @@ -59,21 +59,21 @@ public: virtual VSpline GetSpline(qint32 index) const =0; virtual QVector GetSplinePath() const =0; - virtual QPainterPath GetPath() const Q_DECL_OVERRIDE; - virtual QVector GetPoints() const Q_DECL_OVERRIDE; - virtual qreal GetLength() const Q_DECL_OVERRIDE; + virtual QPainterPath GetPath() const override; + virtual QVector GetPoints() const override; + virtual qreal GetLength() const override; - virtual QVector DirectionArrows() const Q_DECL_OVERRIDE; + virtual QVector DirectionArrows() const override; int Segment(const QPointF &p) const; QPointF CutSplinePath(qreal length, qint32 &p1, qint32 &p2, QPointF &spl1p2, QPointF &spl1p3, QPointF &spl2p2, QPointF &spl2p3) const; - virtual QString NameForHistory(const QString &toolName) const Q_DECL_OVERRIDE; + virtual QString NameForHistory(const QString &toolName) const override; protected: - virtual void CreateName() Q_DECL_OVERRIDE; + virtual void CreateName() override; virtual VPointF FirstPoint() const =0; virtual VPointF LastPoint() const =0; diff --git a/src/libs/vgeometry/vabstractcurve.h b/src/libs/vgeometry/vabstractcurve.h index e91514e26..84495e1ef 100644 --- a/src/libs/vgeometry/vabstractcurve.h +++ b/src/libs/vgeometry/vabstractcurve.h @@ -53,7 +53,7 @@ public: explicit VAbstractCurve(const GOType &type, const quint32 &idObject = NULL_ID, const Draw &mode = Draw::Calculation); explicit VAbstractCurve(const VAbstractCurve &curve); - virtual ~VAbstractCurve() Q_DECL_OVERRIDE; + virtual ~VAbstractCurve() override; VAbstractCurve& operator= (const VAbstractCurve &curve); #ifdef Q_COMPILER_RVALUE_REFS diff --git a/src/libs/vgeometry/varc.h b/src/libs/vgeometry/varc.h index 7c17504e4..33cf9d790 100644 --- a/src/libs/vgeometry/varc.h +++ b/src/libs/vgeometry/varc.h @@ -62,7 +62,7 @@ public: VArc Rotate(const QPointF &originPoint, qreal degrees, const QString &prefix = QString()) const; VArc Flip(const QLineF &axis, const QString &prefix = QString()) const; VArc Move(qreal length, qreal angle, const QString &prefix = QString()) const; - virtual ~VArc() Q_DECL_OVERRIDE; + virtual ~VArc() override; VArc& operator= (const VArc &arc); #ifdef Q_COMPILER_RVALUE_REFS @@ -76,18 +76,18 @@ public: void SetFormulaRadius (const QString &formula, qreal value); qreal GetRadius () const; - virtual qreal GetLength () const Q_DECL_OVERRIDE; + virtual qreal GetLength () const override; QPointF GetP1() const; QPointF GetP2 () const; - virtual QVector GetPoints () const Q_DECL_OVERRIDE; + virtual QVector GetPoints () const override; QPointF CutArc (const qreal &length, VArc &arc1, VArc &arc2) const; QPointF CutArc (const qreal &length) const; protected: - virtual void CreateName() Q_DECL_OVERRIDE; - virtual void FindF2(qreal length) Q_DECL_OVERRIDE; + virtual void CreateName() override; + virtual void FindF2(qreal length) override; private: QSharedDataPointer d; diff --git a/src/libs/vgeometry/vcubicbezier.h b/src/libs/vgeometry/vcubicbezier.h index 392cf9880..cd1562a8a 100644 --- a/src/libs/vgeometry/vcubicbezier.h +++ b/src/libs/vgeometry/vcubicbezier.h @@ -63,29 +63,29 @@ public: inline void Swap(VCubicBezier &curve) Q_DECL_NOTHROW { VAbstractCubicBezier::Swap(curve); std::swap(d, curve.d); } - virtual VPointF GetP1() const Q_DECL_OVERRIDE; + virtual VPointF GetP1() const override; void SetP1(const VPointF &p); - virtual VPointF GetP2() const Q_DECL_OVERRIDE; + virtual VPointF GetP2() const override; void SetP2(const VPointF &p); - virtual VPointF GetP3() const Q_DECL_OVERRIDE; + virtual VPointF GetP3() const override; void SetP3(const VPointF &p); - virtual VPointF GetP4() const Q_DECL_OVERRIDE; + virtual VPointF GetP4() const override; void SetP4(const VPointF &p); - virtual qreal GetStartAngle() const Q_DECL_OVERRIDE; - virtual qreal GetEndAngle() const Q_DECL_OVERRIDE; - virtual qreal GetLength() const Q_DECL_OVERRIDE; - virtual QVector GetPoints() const Q_DECL_OVERRIDE; + virtual qreal GetStartAngle() const override; + virtual qreal GetEndAngle() const override; + virtual qreal GetLength() const override; + virtual QVector GetPoints() const override; - virtual qreal GetC1Length() const Q_DECL_OVERRIDE; - virtual qreal GetC2Length() const Q_DECL_OVERRIDE; + virtual qreal GetC1Length() const override; + virtual qreal GetC2Length() const override; protected: - virtual QPointF GetControlPoint1() const Q_DECL_OVERRIDE; - virtual QPointF GetControlPoint2() const Q_DECL_OVERRIDE; + virtual QPointF GetControlPoint1() const override; + virtual QPointF GetControlPoint2() const override; private: QSharedDataPointer d; diff --git a/src/libs/vgeometry/vcubicbezierpath.h b/src/libs/vgeometry/vcubicbezierpath.h index d3f6d7502..c2b3f1df5 100644 --- a/src/libs/vgeometry/vcubicbezierpath.h +++ b/src/libs/vgeometry/vcubicbezierpath.h @@ -70,25 +70,25 @@ public: void append(const VPointF &point); - virtual qint32 CountSubSpl() const Q_DECL_OVERRIDE; - virtual qint32 CountPoints() const Q_DECL_OVERRIDE; - virtual void Clear() Q_DECL_OVERRIDE; - virtual VSpline GetSpline(qint32 index) const Q_DECL_OVERRIDE; - virtual qreal GetStartAngle () const Q_DECL_OVERRIDE; - virtual qreal GetEndAngle () const Q_DECL_OVERRIDE; + virtual qint32 CountSubSpl() const override; + virtual qint32 CountPoints() const override; + virtual void Clear() override; + virtual VSpline GetSpline(qint32 index) const override; + virtual qreal GetStartAngle () const override; + virtual qreal GetEndAngle () const override; - virtual qreal GetC1Length() const Q_DECL_OVERRIDE; - virtual qreal GetC2Length() const Q_DECL_OVERRIDE; + virtual qreal GetC1Length() const override; + virtual qreal GetC2Length() const override; - virtual QVector GetSplinePath() const Q_DECL_OVERRIDE; + virtual QVector GetSplinePath() const override; QVector GetCubicPath() const; static qint32 CountSubSpl(qint32 size); static qint32 SubSplOffset(qint32 subSplIndex); static qint32 SubSplPointsCount(qint32 countSubSpl); protected: - virtual VPointF FirstPoint() const Q_DECL_OVERRIDE; - virtual VPointF LastPoint() const Q_DECL_OVERRIDE; + virtual VPointF FirstPoint() const override; + virtual VPointF LastPoint() const override; private: QSharedDataPointer d; }; diff --git a/src/libs/vgeometry/vellipticalarc.h b/src/libs/vgeometry/vellipticalarc.h index b41013123..0821a8a20 100644 --- a/src/libs/vgeometry/vellipticalarc.h +++ b/src/libs/vgeometry/vellipticalarc.h @@ -65,7 +65,7 @@ public: VEllipticalArc Flip(const QLineF &axis, const QString &prefix = QString()) const; VEllipticalArc Move(qreal length, qreal angle, const QString &prefix = QString()) const; - virtual ~VEllipticalArc() Q_DECL_OVERRIDE; + virtual ~VEllipticalArc() override; VEllipticalArc& operator= (const VEllipticalArc &arc); #ifdef Q_COMPILER_RVALUE_REFS @@ -87,7 +87,7 @@ public: void SetFormulaRadius2 (const QString &formula, qreal value); qreal GetRadius2 () const; - virtual qreal GetLength () const Q_DECL_OVERRIDE; + virtual qreal GetLength () const override; QPointF GetP1() const; QPointF GetP2() const; @@ -95,18 +95,18 @@ public: QTransform GetTransform() const; void SetTransform(const QTransform &matrix, bool combine = false); - virtual VPointF GetCenter () const Q_DECL_OVERRIDE; - virtual QVector GetPoints () const Q_DECL_OVERRIDE; - virtual qreal GetStartAngle () const Q_DECL_OVERRIDE; - virtual qreal GetEndAngle () const Q_DECL_OVERRIDE; + virtual VPointF GetCenter () const override; + virtual QVector GetPoints () const override; + virtual qreal GetStartAngle () const override; + virtual qreal GetEndAngle () const override; QPointF CutArc (const qreal &length, VEllipticalArc &arc1, VEllipticalArc &arc2) const; QPointF CutArc (const qreal &length) const; static qreal OptimizeAngle(qreal angle); protected: - virtual void CreateName() Q_DECL_OVERRIDE; - virtual void FindF2(qreal length) Q_DECL_OVERRIDE; + virtual void CreateName() override; + virtual void FindF2(qreal length) override; private: QSharedDataPointer d; diff --git a/src/libs/vgeometry/vplacelabelitem.h b/src/libs/vgeometry/vplacelabelitem.h index e5e3cb7bb..0a4df1c17 100644 --- a/src/libs/vgeometry/vplacelabelitem.h +++ b/src/libs/vgeometry/vplacelabelitem.h @@ -43,7 +43,7 @@ class VPlaceLabelItem : public VPointF public: VPlaceLabelItem(); VPlaceLabelItem(const VPlaceLabelItem &item); - virtual ~VPlaceLabelItem() Q_DECL_OVERRIDE; + virtual ~VPlaceLabelItem() override; VPlaceLabelItem &operator=(const VPlaceLabelItem &item); #ifdef Q_COMPILER_RVALUE_REFS diff --git a/src/libs/vgeometry/vpointf.h b/src/libs/vgeometry/vpointf.h index f30c77d6b..91ec714db 100644 --- a/src/libs/vgeometry/vpointf.h +++ b/src/libs/vgeometry/vpointf.h @@ -58,7 +58,7 @@ public: const Draw &mode = Draw::Calculation); VPointF (const QPointF &point, const QString &name, qreal mx, qreal my, quint32 idObject = 0, const Draw &mode = Draw::Calculation); - virtual ~VPointF() Q_DECL_OVERRIDE; + virtual ~VPointF() override; VPointF &operator=(const VPointF &point); #ifdef Q_COMPILER_RVALUE_REFS diff --git a/src/libs/vgeometry/vspline.h b/src/libs/vgeometry/vspline.h index ead44bfd6..e2da2bb75 100644 --- a/src/libs/vgeometry/vspline.h +++ b/src/libs/vgeometry/vspline.h @@ -73,17 +73,17 @@ public: inline void Swap(VSpline &spline) Q_DECL_NOTHROW { VAbstractCubicBezier::Swap(spline); std::swap(d, spline.d); } - virtual VPointF GetP1 () const Q_DECL_OVERRIDE; + virtual VPointF GetP1 () const override; void SetP1 (const VPointF &p); - virtual VPointF GetP2 () const Q_DECL_OVERRIDE; - virtual VPointF GetP3 () const Q_DECL_OVERRIDE; + virtual VPointF GetP2 () const override; + virtual VPointF GetP3 () const override; - virtual VPointF GetP4 () const Q_DECL_OVERRIDE; + virtual VPointF GetP4 () const override; void SetP4 (const VPointF &p); - virtual qreal GetStartAngle () const Q_DECL_OVERRIDE; - virtual qreal GetEndAngle() const Q_DECL_OVERRIDE; + virtual qreal GetStartAngle () const override; + virtual qreal GetEndAngle() const override; QString GetStartAngleFormula () const; QString GetEndAngleFormula() const; @@ -91,8 +91,8 @@ public: void SetStartAngle(qreal angle, const QString &formula); void SetEndAngle(qreal angle, const QString &formula); - virtual qreal GetC1Length() const Q_DECL_OVERRIDE; - virtual qreal GetC2Length() const Q_DECL_OVERRIDE; + virtual qreal GetC1Length() const override; + virtual qreal GetC2Length() const override; QString GetC1LengthFormula() const; QString GetC2LengthFormula() const; @@ -100,7 +100,7 @@ public: void SetC1Length(qreal length, const QString &formula); void SetC2Length(qreal length, const QString &formula); - virtual qreal GetLength () const Q_DECL_OVERRIDE; + virtual qreal GetLength () const override; qreal GetKasm1() const; qreal GetKasm2() const; qreal GetKcurve() const; @@ -108,15 +108,15 @@ public: using VAbstractCubicBezier::CutSpline; QPointF CutSpline ( qreal length, VSpline &spl1, VSpline &spl2) const; - virtual QVector GetPoints () const Q_DECL_OVERRIDE; + virtual QVector GetPoints () const override; // cppcheck-suppress unusedFunction static QVector SplinePoints(const QPointF &p1, const QPointF &p4, qreal angle1, qreal angle2, qreal kAsm1, qreal kAsm2, qreal kCurve, qreal approximationScale); qreal ParamT(const QPointF &pBt) const; protected: - virtual QPointF GetControlPoint1() const Q_DECL_OVERRIDE; - virtual QPointF GetControlPoint2() const Q_DECL_OVERRIDE; + virtual QPointF GetControlPoint1() const override; + virtual QPointF GetControlPoint2() const override; private: QSharedDataPointer d; QVector CalcT(qreal curveCoord1, qreal curveCoord2, qreal curveCoord3, qreal curveCoord4, diff --git a/src/libs/vgeometry/vsplinepath.h b/src/libs/vgeometry/vsplinepath.h index be5c75890..ce28e55b3 100644 --- a/src/libs/vgeometry/vsplinepath.h +++ b/src/libs/vgeometry/vsplinepath.h @@ -62,7 +62,7 @@ public: VSplinePath Rotate(const QPointF &originPoint, qreal degrees, const QString &prefix = QString()) const; VSplinePath Flip(const QLineF &axis, const QString &prefix = QString()) const; VSplinePath Move(qreal length, qreal angle, const QString &prefix = QString()) const; - virtual ~VSplinePath() Q_DECL_OVERRIDE; + virtual ~VSplinePath() override; VSplinePoint &operator[](int indx); VSplinePath &operator=(const VSplinePath &path); @@ -75,27 +75,27 @@ public: void append(const VSplinePoint &point); - virtual qint32 CountSubSpl() const Q_DECL_OVERRIDE; - virtual qint32 CountPoints() const Q_DECL_OVERRIDE; - virtual void Clear() Q_DECL_OVERRIDE; - virtual VSpline GetSpline(qint32 index) const Q_DECL_OVERRIDE; + virtual qint32 CountSubSpl() const override; + virtual qint32 CountPoints() const override; + virtual void Clear() override; + virtual VSpline GetSpline(qint32 index) const override; - virtual QVector GetSplinePath() const Q_DECL_OVERRIDE; + virtual QVector GetSplinePath() const override; QVector GetFSplinePath() const; - virtual qreal GetStartAngle () const Q_DECL_OVERRIDE; - virtual qreal GetEndAngle () const Q_DECL_OVERRIDE; + virtual qreal GetStartAngle () const override; + virtual qreal GetEndAngle () const override; - virtual qreal GetC1Length() const Q_DECL_OVERRIDE; - virtual qreal GetC2Length() const Q_DECL_OVERRIDE; + virtual qreal GetC1Length() const override; + virtual qreal GetC2Length() const override; void UpdatePoint(qint32 indexSpline, const SplinePointPosition &pos, const VSplinePoint &point); VSplinePoint GetSplinePoint(qint32 indexSpline, SplinePointPosition pos) const; const VSplinePoint &at(int indx) const; protected: - virtual VPointF FirstPoint() const Q_DECL_OVERRIDE; - virtual VPointF LastPoint() const Q_DECL_OVERRIDE; + virtual VPointF FirstPoint() const override; + virtual VPointF LastPoint() const override; private: QSharedDataPointer d; }; diff --git a/src/libs/vlayout/vlayoutgenerator.h b/src/libs/vlayout/vlayoutgenerator.h index d02a5641f..86a4c7903 100644 --- a/src/libs/vlayout/vlayoutgenerator.h +++ b/src/libs/vlayout/vlayoutgenerator.h @@ -58,7 +58,7 @@ class VLayoutGenerator :public QObject Q_OBJECT public: explicit VLayoutGenerator(QObject *parent = nullptr); - virtual ~VLayoutGenerator() Q_DECL_OVERRIDE; + virtual ~VLayoutGenerator() override; void SetDetails(const QVector &details); void SetLayoutWidth(qreal width); diff --git a/src/libs/vlayout/vlayoutpiece.h b/src/libs/vlayout/vlayoutpiece.h index 20e6209ad..c5a357c2e 100644 --- a/src/libs/vlayout/vlayoutpiece.h +++ b/src/libs/vlayout/vlayoutpiece.h @@ -61,7 +61,7 @@ public: VLayoutPiece(); VLayoutPiece(const VLayoutPiece &detail); - virtual ~VLayoutPiece() Q_DECL_OVERRIDE; + virtual ~VLayoutPiece() override; VLayoutPiece &operator=(const VLayoutPiece &detail); #ifdef Q_COMPILER_RVALUE_REFS diff --git a/src/libs/vlayout/vposition.h b/src/libs/vlayout/vposition.h index 14b658f9b..f764d514e 100644 --- a/src/libs/vlayout/vposition.h +++ b/src/libs/vlayout/vposition.h @@ -45,7 +45,7 @@ class VPosition : public QRunnable public: VPosition(const VContour &gContour, int j, const VLayoutPiece &detail, int i, std::atomic_bool *stop, bool rotate, int rotationIncrease, bool saveLength); - virtual ~VPosition() Q_DECL_OVERRIDE{} + virtual ~VPosition() override{} quint32 getPaperIndex() const; void setPaperIndex(const quint32 &value); @@ -98,7 +98,7 @@ private: EdgeError = 2 }; - virtual void run() Q_DECL_OVERRIDE; + virtual void run() override; void SaveCandidate(VBestSquare &bestResult, const VLayoutPiece &detail, int globalI, int detJ, BestFrom type); diff --git a/src/libs/vmisc/dialogs/dialogexporttocsv.h b/src/libs/vmisc/dialogs/dialogexporttocsv.h index baa993d58..64222a023 100644 --- a/src/libs/vmisc/dialogs/dialogexporttocsv.h +++ b/src/libs/vmisc/dialogs/dialogexporttocsv.h @@ -59,8 +59,8 @@ public: static QString MakeHelpSeparatorList(); protected: - virtual void changeEvent(QEvent* event) Q_DECL_OVERRIDE; - virtual void showEvent(QShowEvent *event) Q_DECL_OVERRIDE; + virtual void changeEvent(QEvent* event) override; + virtual void showEvent(QShowEvent *event) override; private: Q_DISABLE_COPY(DialogExportToCSV) diff --git a/src/libs/vmisc/qxtcsvmodel.h b/src/libs/vmisc/qxtcsvmodel.h index 5f617e2ae..6abb0526a 100644 --- a/src/libs/vmisc/qxtcsvmodel.h +++ b/src/libs/vmisc/qxtcsvmodel.h @@ -61,14 +61,14 @@ public: QChar separator = ',', QTextCodec *codec = nullptr); virtual ~QxtCsvModel() Q_DECL_EQ_DEFAULT; - virtual int rowCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE; - virtual int columnCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE; - virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; - virtual bool setData(const QModelIndex& index, const QVariant& data, int role = Qt::EditRole) Q_DECL_OVERRIDE; + virtual int rowCount(const QModelIndex& parent = QModelIndex()) const override; + virtual int columnCount(const QModelIndex& parent = QModelIndex()) const override; + virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override; + virtual bool setData(const QModelIndex& index, const QVariant& data, int role = Qt::EditRole) override; virtual QVariant headerData(int section, Qt::Orientation orientation, - int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + int role = Qt::DisplayRole) const override; virtual bool setHeaderData(int section, Qt::Orientation orientation, const QVariant& value, - int role = Qt::DisplayRole) Q_DECL_OVERRIDE; + int role = Qt::DisplayRole) override; void setHeaderData(const QStringList& data); QString text(int row, int column) const; @@ -79,16 +79,16 @@ public: bool insertRow(int row, const QModelIndex& parent = QModelIndex()); - virtual bool insertRows(int row, int count, const QModelIndex& parent = QModelIndex()) Q_DECL_OVERRIDE; + virtual bool insertRows(int row, int count, const QModelIndex& parent = QModelIndex()) override; bool removeRow(int row, const QModelIndex& parent = QModelIndex()); - virtual bool removeRows(int row, int count, const QModelIndex& parent = QModelIndex()) Q_DECL_OVERRIDE; + virtual bool removeRows(int row, int count, const QModelIndex& parent = QModelIndex()) override; bool insertColumn(int col, const QModelIndex& parent = QModelIndex()); - virtual bool insertColumns(int col, int count, const QModelIndex& parent = QModelIndex()) Q_DECL_OVERRIDE; + virtual bool insertColumns(int col, int count, const QModelIndex& parent = QModelIndex()) override; bool removeColumn(int col, const QModelIndex& parent = QModelIndex()); - virtual bool removeColumns(int col, int count, const QModelIndex& parent = QModelIndex()) Q_DECL_OVERRIDE; + virtual bool removeColumns(int col, int count, const QModelIndex& parent = QModelIndex()) override; void setSource(QIODevice *file, bool withHeader = false, QChar separator = ',', QTextCodec* codec = nullptr); void setSource(const QString &filename, bool withHeader = false, QChar separator = ',', @@ -113,7 +113,7 @@ public: QuoteMode quoteMode() const; void setQuoteMode(QuoteMode mode); - virtual Qt::ItemFlags flags(const QModelIndex& index) const Q_DECL_OVERRIDE; + virtual Qt::ItemFlags flags(const QModelIndex& index) const override; private: Q_DISABLE_COPY(QxtCsvModel) diff --git a/src/libs/vmisc/testvapplication.h b/src/libs/vmisc/testvapplication.h index deb3dcbbf..59f6455a2 100644 --- a/src/libs/vmisc/testvapplication.h +++ b/src/libs/vmisc/testvapplication.h @@ -54,23 +54,23 @@ public: virtual ~TestVApplication() Q_DECL_EQ_DEFAULT; - virtual const VTranslateVars *TrVars() Q_DECL_OVERRIDE + virtual const VTranslateVars *TrVars() override { return m_trVars; } - virtual void OpenSettings() Q_DECL_OVERRIDE + virtual void OpenSettings() override { settings = new VSettings(QSettings::IniFormat, QSettings::UserScope, QCoreApplication::organizationName(), QCoreApplication::applicationName(), this); } - virtual bool IsAppInGUIMode() const Q_DECL_OVERRIDE + virtual bool IsAppInGUIMode() const override { return false; } - virtual void InitTrVars() Q_DECL_OVERRIDE + virtual void InitTrVars() override {} void SetTrVars(VTranslateVars *trVars) diff --git a/src/libs/vmisc/vabstractapplication.h b/src/libs/vmisc/vabstractapplication.h index 6c23ad3d8..67d0a0ff8 100644 --- a/src/libs/vmisc/vabstractapplication.h +++ b/src/libs/vmisc/vabstractapplication.h @@ -62,7 +62,7 @@ class VAbstractApplication : public QApplication Q_OBJECT public: VAbstractApplication(int &argc, char ** argv); - virtual ~VAbstractApplication() Q_DECL_OVERRIDE; + virtual ~VAbstractApplication() override; virtual const VTranslateVars *TrVars()=0; diff --git a/src/libs/vobj/vobjengine.h b/src/libs/vobj/vobjengine.h index f3d3b4b99..8b58de3cc 100644 --- a/src/libs/vobj/vobjengine.h +++ b/src/libs/vobj/vobjengine.h @@ -48,18 +48,18 @@ class VObjEngine : public QPaintEngine { public: VObjEngine(); - virtual ~VObjEngine() Q_DECL_OVERRIDE; + virtual ~VObjEngine() override; - virtual bool begin(QPaintDevice *pdev) Q_DECL_OVERRIDE; - virtual bool end() Q_DECL_OVERRIDE; - virtual void updateState(const QPaintEngineState &state) Q_DECL_OVERRIDE; - virtual void drawPath(const QPainterPath &path) Q_DECL_OVERRIDE; - virtual Type type() const Q_DECL_OVERRIDE; - virtual void drawPoints(const QPointF *points, int pointCount) Q_DECL_OVERRIDE; - virtual void drawPoints(const QPoint *points, int pointCount) Q_DECL_OVERRIDE; - virtual void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) Q_DECL_OVERRIDE; - virtual void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode) Q_DECL_OVERRIDE; - virtual void drawPolygon(const QPoint *points, int pointCount, PolygonDrawMode mode) Q_DECL_OVERRIDE; + virtual bool begin(QPaintDevice *pdev) override; + virtual bool end() override; + virtual void updateState(const QPaintEngineState &state) override; + virtual void drawPath(const QPainterPath &path) override; + virtual Type type() const override; + virtual void drawPoints(const QPointF *points, int pointCount) override; + virtual void drawPoints(const QPoint *points, int pointCount) override; + virtual void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) override; + virtual void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode) override; + virtual void drawPolygon(const QPoint *points, int pointCount, PolygonDrawMode mode) override; QSize getSize() const; void setSize(const QSize &value); diff --git a/src/libs/vobj/vobjpaintdevice.h b/src/libs/vobj/vobjpaintdevice.h index 042b62184..1cf080314 100644 --- a/src/libs/vobj/vobjpaintdevice.h +++ b/src/libs/vobj/vobjpaintdevice.h @@ -43,8 +43,8 @@ class VObjPaintDevice : public QPaintDevice { public: VObjPaintDevice(); - virtual ~VObjPaintDevice() Q_DECL_OVERRIDE; - virtual QPaintEngine *paintEngine() const Q_DECL_OVERRIDE; + virtual ~VObjPaintDevice() override; + virtual QPaintEngine *paintEngine() const override; QString getFileName() const; void setFileName(const QString &value); @@ -59,7 +59,7 @@ public: void setResolution(int dpi); protected: - virtual int metric(PaintDeviceMetric metric) const Q_DECL_OVERRIDE; + virtual int metric(PaintDeviceMetric metric) const override; private: Q_DISABLE_COPY(VObjPaintDevice) QSharedPointer engine; diff --git a/src/libs/vpatterndb/variables/varcradius.h b/src/libs/vpatterndb/variables/varcradius.h index 2304e9196..b6a841602 100644 --- a/src/libs/vpatterndb/variables/varcradius.h +++ b/src/libs/vpatterndb/variables/varcradius.h @@ -48,7 +48,7 @@ public: Unit patternUnit); VArcRadius(const VArcRadius &var); VArcRadius &operator=(const VArcRadius &var); - virtual ~VArcRadius() Q_DECL_OVERRIDE; + virtual ~VArcRadius() override; }; #endif // VARCRADIUS_H diff --git a/src/libs/vpatterndb/variables/varcradius_p.h b/src/libs/vpatterndb/variables/varcradius_p.h index b51a7656a..53a22d796 100644 --- a/src/libs/vpatterndb/variables/varcradius_p.h +++ b/src/libs/vpatterndb/variables/varcradius_p.h @@ -53,7 +53,7 @@ public: :QSharedData(var), arcId(var.arcId) {} - virtual ~VArcRadiusData() Q_DECL_OVERRIDE; + virtual ~VArcRadiusData() override; quint32 arcId; diff --git a/src/libs/vpatterndb/variables/vcurveclength.h b/src/libs/vpatterndb/variables/vcurveclength.h index 7abcaff97..a5a165a93 100644 --- a/src/libs/vpatterndb/variables/vcurveclength.h +++ b/src/libs/vpatterndb/variables/vcurveclength.h @@ -50,7 +50,7 @@ public: CurveCLength cType, Unit patternUnit, qint32 segment); VCurveCLength(const VCurveCLength &var); VCurveCLength &operator=(const VCurveCLength &var); - virtual ~VCurveCLength() Q_DECL_OVERRIDE; + virtual ~VCurveCLength() override; }; #endif // VCURVECLENGTH_H diff --git a/src/libs/vpatterndb/variables/vcurvelength.h b/src/libs/vpatterndb/variables/vcurvelength.h index 68b218d55..c62d688c4 100644 --- a/src/libs/vpatterndb/variables/vcurvelength.h +++ b/src/libs/vpatterndb/variables/vcurvelength.h @@ -49,7 +49,7 @@ public: Unit patternUnit, qint32 segment); VCurveLength(const VCurveLength &var); VCurveLength &operator=(const VCurveLength &var); - virtual ~VCurveLength() Q_DECL_OVERRIDE; + virtual ~VCurveLength() override; }; #endif // VCURVELENGTH_H diff --git a/src/libs/vpatterndb/variables/vcurvevariable.h b/src/libs/vpatterndb/variables/vcurvevariable.h index a54e7fe6b..505a6e046 100644 --- a/src/libs/vpatterndb/variables/vcurvevariable.h +++ b/src/libs/vpatterndb/variables/vcurvevariable.h @@ -45,7 +45,7 @@ public: VCurveVariable(const quint32 &id, const quint32 &parentId); VCurveVariable(const VCurveVariable &var); - virtual ~VCurveVariable() Q_DECL_OVERRIDE; + virtual ~VCurveVariable() override; VCurveVariable &operator=(const VCurveVariable &var); #ifdef Q_COMPILER_RVALUE_REFS @@ -55,7 +55,7 @@ public: inline void Swap(VCurveVariable &var) Q_DECL_NOTHROW { VInternalVariable::Swap(var); std::swap(d, var.d); } - virtual bool Filter(quint32 id) Q_DECL_OVERRIDE; + virtual bool Filter(quint32 id) override; quint32 GetId() const; void SetId(const quint32 &id); diff --git a/src/libs/vpatterndb/variables/vincrement.h b/src/libs/vpatterndb/variables/vincrement.h index 7af5e3ea7..dc430d3b3 100644 --- a/src/libs/vpatterndb/variables/vincrement.h +++ b/src/libs/vpatterndb/variables/vincrement.h @@ -51,7 +51,7 @@ public: const QString &description = QString()); VIncrement(const VIncrement &incr); - virtual ~VIncrement() Q_DECL_OVERRIDE; + virtual ~VIncrement() override; VIncrement &operator=(const VIncrement &incr); #ifdef Q_COMPILER_RVALUE_REFS diff --git a/src/libs/vpatterndb/variables/vlineangle.h b/src/libs/vpatterndb/variables/vlineangle.h index faeb38497..874870678 100644 --- a/src/libs/vpatterndb/variables/vlineangle.h +++ b/src/libs/vpatterndb/variables/vlineangle.h @@ -46,7 +46,7 @@ public: VLineAngle(const VPointF *p1, const quint32 &p1Id, const VPointF *p2, const quint32 &p2Id); VLineAngle(const VLineAngle &var); - virtual ~VLineAngle() Q_DECL_OVERRIDE; + virtual ~VLineAngle() override; VLineAngle &operator=(const VLineAngle &var); #ifdef Q_COMPILER_RVALUE_REFS @@ -56,7 +56,7 @@ public: inline void Swap(VLineAngle &var) Q_DECL_NOTHROW { VInternalVariable::Swap(var); std::swap(d, var.d); } - virtual bool Filter(quint32 id) Q_DECL_OVERRIDE; + virtual bool Filter(quint32 id) override; void SetValue(const VPointF *p1, const VPointF *p2); quint32 GetP1Id() const; quint32 GetP2Id() const; diff --git a/src/libs/vpatterndb/variables/vlinelength.h b/src/libs/vpatterndb/variables/vlinelength.h index fdb012453..31b787946 100644 --- a/src/libs/vpatterndb/variables/vlinelength.h +++ b/src/libs/vpatterndb/variables/vlinelength.h @@ -48,7 +48,7 @@ public: VLengthLine(const VPointF *p1, const quint32 &p1Id, const VPointF *p2, const quint32 &p2Id, Unit patternUnit); VLengthLine(const VLengthLine &var); - virtual ~VLengthLine() Q_DECL_OVERRIDE; + virtual ~VLengthLine() override; VLengthLine &operator=(const VLengthLine &var); #ifdef Q_COMPILER_RVALUE_REFS @@ -58,7 +58,7 @@ public: inline void Swap(VLengthLine &var) Q_DECL_NOTHROW { VInternalVariable::Swap(var); std::swap(d, var.d); } - virtual bool Filter(quint32 id) Q_DECL_OVERRIDE; + virtual bool Filter(quint32 id) override; void SetValue(const VPointF *p1, const VPointF *p2); quint32 GetP1Id() const; quint32 GetP2Id() const; diff --git a/src/libs/vpatterndb/variables/vmeasurement.h b/src/libs/vpatterndb/variables/vmeasurement.h index a8100976f..9e9dea817 100644 --- a/src/libs/vpatterndb/variables/vmeasurement.h +++ b/src/libs/vpatterndb/variables/vmeasurement.h @@ -58,7 +58,7 @@ public: const QString &tagName = QString()); VMeasurement(const VMeasurement &m); - virtual ~VMeasurement() Q_DECL_OVERRIDE; + virtual ~VMeasurement() override; VMeasurement &operator=(const VMeasurement &m); #ifdef Q_COMPILER_RVALUE_REFS @@ -80,10 +80,10 @@ public: int Index() const; bool IsFormulaOk() const; - virtual bool IsNotUsed() const Q_DECL_OVERRIDE; + virtual bool IsNotUsed() const override; - virtual qreal GetValue() const Q_DECL_OVERRIDE; - virtual qreal* GetValue() Q_DECL_OVERRIDE; + virtual qreal GetValue() const override; + virtual qreal* GetValue() override; VContainer *GetData(); diff --git a/src/libs/vpatterndb/variables/vvariable.h b/src/libs/vpatterndb/variables/vvariable.h index 74e0f00e0..1ebb5ae7e 100644 --- a/src/libs/vpatterndb/variables/vvariable.h +++ b/src/libs/vpatterndb/variables/vvariable.h @@ -48,7 +48,7 @@ public: VVariable(const QString &name, const QString &description = QString()); VVariable(const VVariable &var); - virtual ~VVariable() Q_DECL_OVERRIDE; + virtual ~VVariable() override; VVariable &operator=(const VVariable &var); #ifdef Q_COMPILER_RVALUE_REFS diff --git a/src/libs/vpatterndb/vtranslatevars.h b/src/libs/vpatterndb/vtranslatevars.h index 8e284b58a..37aaa1cc4 100644 --- a/src/libs/vpatterndb/vtranslatevars.h +++ b/src/libs/vpatterndb/vtranslatevars.h @@ -63,7 +63,7 @@ public: QString FormulaToUser(const QString &formula, bool osSeparator) const; static QString TryFormulaToUser(const QString &formula, bool osSeparator); - virtual void Retranslate() Q_DECL_OVERRIDE; + virtual void Retranslate() override; QMap GetTranslatedFunctions() const; QMap GetFunctions() const; diff --git a/src/libs/vpropertyexplorer/checkablemessagebox.h b/src/libs/vpropertyexplorer/checkablemessagebox.h index e07e95699..cad6efe62 100644 --- a/src/libs/vpropertyexplorer/checkablemessagebox.h +++ b/src/libs/vpropertyexplorer/checkablemessagebox.h @@ -50,7 +50,7 @@ class VPROPERTYEXPLORERSHARED_EXPORT CheckableMessageBox : public QDialog public: explicit CheckableMessageBox(QWidget *parent); - virtual ~CheckableMessageBox() Q_DECL_OVERRIDE; + virtual ~CheckableMessageBox() override; static QDialogButtonBox::StandardButton question(QWidget *parent, diff --git a/src/libs/vpropertyexplorer/plugins/Vector3d/vvector3dproperty.h b/src/libs/vpropertyexplorer/plugins/Vector3d/vvector3dproperty.h index fe5e3cb0b..54eeec0f1 100644 --- a/src/libs/vpropertyexplorer/plugins/Vector3d/vvector3dproperty.h +++ b/src/libs/vpropertyexplorer/plugins/Vector3d/vvector3dproperty.h @@ -76,13 +76,13 @@ class VPROPERTYEXPLORERSHARED_EXPORT QVector3DProperty : public VProperty public: explicit QVector3DProperty(const QString& name); - virtual ~QVector3DProperty() Q_DECL_OVERRIDE {} + virtual ~QVector3DProperty() override {} //! Get the data how it should be displayed - virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const override; //! Returns item flags - virtual Qt::ItemFlags flags(int column = DPC_Name) const Q_DECL_OVERRIDE; + virtual Qt::ItemFlags flags(int column = DPC_Name) const override; //! Returns the Vector3d virtual Vector3D getVector() const; @@ -94,20 +94,20 @@ public: virtual void setVector(double x, double y, double z); //! Returns a string containing the type of the property - virtual QString type() const Q_DECL_OVERRIDE; + virtual QString type() const override; //! Clones this property //! \param include_children Indicates whether to also clone the children //! \param container If a property is being passed here, no new VProperty is being created but instead it is tried //! to fill all the data into container. This can also be used when subclassing this function. //! \return Returns the newly created property (or container, if it was not NULL) - virtual VProperty* clone(bool include_children = true, VProperty* container = NULL) const Q_DECL_OVERRIDE; + virtual VProperty* clone(bool include_children = true, VProperty* container = NULL) const override; //! Sets the value of the property - virtual void setValue(const QVariant& value) Q_DECL_OVERRIDE; + virtual void setValue(const QVariant& value) override; //! Returns the value of the property as a QVariant - virtual QVariant getValue() const Q_DECL_OVERRIDE; + virtual QVariant getValue() const override; private: Q_DISABLE_COPY(QVector3DProperty) diff --git a/src/libs/vpropertyexplorer/plugins/vboolproperty.h b/src/libs/vpropertyexplorer/plugins/vboolproperty.h index b7578d51b..b4b6cc40b 100644 --- a/src/libs/vpropertyexplorer/plugins/vboolproperty.h +++ b/src/libs/vpropertyexplorer/plugins/vboolproperty.h @@ -45,29 +45,29 @@ public: explicit VBoolProperty(const QString& name); //! Destructor - virtual ~VBoolProperty() Q_DECL_OVERRIDE {} + virtual ~VBoolProperty() override {} //! Get the data how it should be displayed - virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const override; //! This is used by the model to set the data //! \param data The data to set //! \param role The role. Default is Qt::EditRole //! \return Returns true, if the data was changed, false if not. - virtual bool setData (const QVariant& data, int role = Qt::EditRole) Q_DECL_OVERRIDE; + virtual bool setData (const QVariant& data, int role = Qt::EditRole) override; //! Returns item flags - virtual Qt::ItemFlags flags(int column = DPC_Name) const Q_DECL_OVERRIDE; + virtual Qt::ItemFlags flags(int column = DPC_Name) const override; //! Returns a string containing the type of the property - virtual QString type() const Q_DECL_OVERRIDE; + virtual QString type() const override; //! Clones this property //! \param include_children Indicates whether to also clone the children //! \param container If a property is being passed here, no new VProperty is being created but instead it is tried //! to fill all the data into container. This can also be used when subclassing this function. //! \return Returns the newly created property (or container, if it was not NULL) - virtual VProperty* clone(bool include_children = true, VProperty* container = NULL) const Q_DECL_OVERRIDE; + virtual VProperty* clone(bool include_children = true, VProperty* container = NULL) const override; protected: //! The (translatable) text displayed when the property is set to true (default: "True") diff --git a/src/libs/vpropertyexplorer/plugins/vcolorproperty.h b/src/libs/vpropertyexplorer/plugins/vcolorproperty.h index e844ee248..1928487d2 100644 --- a/src/libs/vpropertyexplorer/plugins/vcolorproperty.h +++ b/src/libs/vpropertyexplorer/plugins/vcolorproperty.h @@ -44,7 +44,7 @@ public: explicit VColorProperty(const QString &name); //! Get the data how it should be displayed - virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const override; //! Returns an editor widget, or NULL if it doesn't supply one //! \param parent The widget to which the editor will be added as a child @@ -52,23 +52,23 @@ public: //! \delegate A pointer to the QAbstractItemDelegate requesting the editor. This can be used to connect signals and //! slots. virtual QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& options, - const QAbstractItemDelegate* delegate) Q_DECL_OVERRIDE; + const QAbstractItemDelegate* delegate) override; //! Sets the property's data to the editor (returns false, if the standard delegate should do that) - virtual bool setEditorData(QWidget* editor) Q_DECL_OVERRIDE; + virtual bool setEditorData(QWidget* editor) override; //! Gets the data from the widget - virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE; + virtual QVariant getEditorData(const QWidget* editor) const override; //! Returns a string containing the type of the property - virtual QString type() const Q_DECL_OVERRIDE; + virtual QString type() const override; //! Clones this property //! \param include_children Indicates whether to also clone the children //! \param container If a property is being passed here, no new VProperty is being created but instead it is tried //! to fill all the data into container. This can also be used when subclassing this function. //! \return Returns the newly created property (or container, if it was not NULL) - virtual VProperty* clone(bool include_children = true, VProperty* container = NULL) const Q_DECL_OVERRIDE; + virtual VProperty* clone(bool include_children = true, VProperty* container = NULL) const override; private: Q_DISABLE_COPY(VColorProperty) diff --git a/src/libs/vpropertyexplorer/plugins/vcolorpropertyeditor.h b/src/libs/vpropertyexplorer/plugins/vcolorpropertyeditor.h index d01e8a07a..44bafb1e2 100644 --- a/src/libs/vpropertyexplorer/plugins/vcolorpropertyeditor.h +++ b/src/libs/vpropertyexplorer/plugins/vcolorpropertyeditor.h @@ -48,7 +48,7 @@ public: explicit VColorPropertyEditor(QWidget *parent); //! Destructor - virtual ~VColorPropertyEditor() Q_DECL_OVERRIDE; + virtual ~VColorPropertyEditor() override; //! Returns the color currently set @@ -66,7 +66,7 @@ public: static QString GetColorString(const QColor& color); //! Needed for proper event handling - virtual bool eventFilter(QObject *obj, QEvent *ev) Q_DECL_OVERRIDE; + virtual bool eventFilter(QObject *obj, QEvent *ev) override; signals: //! This is emitted, when the user changes the color diff --git a/src/libs/vpropertyexplorer/plugins/vemptyproperty.h b/src/libs/vpropertyexplorer/plugins/vemptyproperty.h index 6305b0033..99fbdba3e 100644 --- a/src/libs/vpropertyexplorer/plugins/vemptyproperty.h +++ b/src/libs/vpropertyexplorer/plugins/vemptyproperty.h @@ -49,10 +49,10 @@ public: explicit VEmptyProperty(const QString& name); //! Destructor - virtual ~VEmptyProperty() Q_DECL_OVERRIDE; + virtual ~VEmptyProperty() override; //! Get the data how it should be displayed - virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const override; //! Returns an editor widget, or NULL if it doesn't supply one //! \param parent The widget to which the editor will be added as a child @@ -60,16 +60,16 @@ public: //! \delegate A pointer to the QAbstractItemDelegate requesting the editor. This can be used to connect signals and //! slots. virtual QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& options, - const QAbstractItemDelegate* delegate) Q_DECL_OVERRIDE; + const QAbstractItemDelegate* delegate) override; //! Gets the data from the widget - virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE; + virtual QVariant getEditorData(const QWidget* editor) const override; //! Returns item flags - virtual Qt::ItemFlags flags(int column = DPC_Name) const Q_DECL_OVERRIDE; + virtual Qt::ItemFlags flags(int column = DPC_Name) const override; //! Returns a string containing the type of the property - virtual QString type() const Q_DECL_OVERRIDE; + virtual QString type() const override; //! Clones this property //! \param include_children Indicates whether to also clone the children @@ -77,7 +77,7 @@ public: //! to fill all the data into container. This can also be used when subclassing this function. //! \return Returns the newly created property (or container, if it was not NULL) Q_REQUIRED_RESULT virtual VProperty* clone(bool include_children = true, - VProperty* container = nullptr) const Q_DECL_OVERRIDE; + VProperty* container = nullptr) const override; protected: //! Protected constructor diff --git a/src/libs/vpropertyexplorer/plugins/venumproperty.h b/src/libs/vpropertyexplorer/plugins/venumproperty.h index 9f8857c01..7966bb0dd 100644 --- a/src/libs/vpropertyexplorer/plugins/venumproperty.h +++ b/src/libs/vpropertyexplorer/plugins/venumproperty.h @@ -45,10 +45,10 @@ public: explicit VEnumProperty(const QString& name); //! Destructor - virtual ~VEnumProperty() Q_DECL_OVERRIDE {} + virtual ~VEnumProperty() override {} //! Get the data how it should be displayed - virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const override; //! Returns an editor widget, or NULL if it doesn't supply one //! \param parent The widget to which the editor will be added as a child @@ -56,10 +56,10 @@ public: //! \delegate A pointer to the QAbstractItemDelegate requesting the editor. This can be used to connect signals and //! slots. virtual QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& options, - const QAbstractItemDelegate* delegate) Q_DECL_OVERRIDE; + const QAbstractItemDelegate* delegate) override; //! Gets the data from the widget - virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE; + virtual QVariant getEditorData(const QWidget* editor) const override; //! Sets the enumeration literals virtual void setLiterals(const QStringList &literals); @@ -68,10 +68,10 @@ public: virtual QStringList getLiterals() const; //! Sets the value of the property - virtual void setValue(const QVariant& value) Q_DECL_OVERRIDE; + virtual void setValue(const QVariant& value) override; //! Returns a string containing the type of the property - virtual QString type() const Q_DECL_OVERRIDE; + virtual QString type() const override; //! Clones this property //! \param include_children Indicates whether to also clone the children @@ -79,18 +79,18 @@ public: //! to fill all the data into container. This can also be used when subclassing this function. //! \return Returns the newly created property (or container, if it was not NULL) Q_REQUIRED_RESULT virtual VProperty* clone(bool include_children = true, - VProperty* container = nullptr) const Q_DECL_OVERRIDE; + VProperty* container = nullptr) const override; //! Sets the settings. Available settings: //! //! key: "literals" - value: "item1;;item2;;item3" - virtual void setSetting(const QString& key, const QVariant& value) Q_DECL_OVERRIDE; + virtual void setSetting(const QString& key, const QVariant& value) override; //! Get the settings. This function has to be implemented in a subclass in order to have an effect - virtual QVariant getSetting(const QString& key) const Q_DECL_OVERRIDE; + virtual QVariant getSetting(const QString& key) const override; //! Returns the list of keys of the property's settings - virtual QStringList getSettingKeys() const Q_DECL_OVERRIDE; + virtual QStringList getSettingKeys() const override; public slots: void currentIndexChanged(int index); diff --git a/src/libs/vpropertyexplorer/plugins/vfileproperty.h b/src/libs/vpropertyexplorer/plugins/vfileproperty.h index 9fa88cc3c..e81785231 100644 --- a/src/libs/vpropertyexplorer/plugins/vfileproperty.h +++ b/src/libs/vpropertyexplorer/plugins/vfileproperty.h @@ -45,7 +45,7 @@ public: explicit VFileProperty(const QString &name); //! The destructor - virtual ~VFileProperty() Q_DECL_OVERRIDE; + virtual ~VFileProperty() override; //! Sets the file filters. The file filters have to be like the ones passed a QFileOpenDialog. virtual void setFileFilters(const QString& filefilters); @@ -60,7 +60,7 @@ public: virtual QString getFile() const; //! Get the data how it should be displayed - virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const override; //! Returns an editor widget, or NULL if it doesn't supply one //! \param parent The widget to which the editor will be added as a child @@ -68,27 +68,27 @@ public: //! \delegate A pointer to the QAbstractItemDelegate requesting the editor. This can be used to connect signals and //! slots. virtual QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& options, - const QAbstractItemDelegate* delegate) Q_DECL_OVERRIDE; + const QAbstractItemDelegate* delegate) override; //! Sets the property's data to the editor (returns false, if the standard delegate should do that) - virtual bool setEditorData(QWidget* editor) Q_DECL_OVERRIDE; + virtual bool setEditorData(QWidget* editor) override; //! Gets the data from the widget - virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE; + virtual QVariant getEditorData(const QWidget* editor) const override; //! Sets the settings. Available settings: //! //! key: "FileFilters" - value: File filters in the same format the QFileDialog expects it - virtual void setSetting(const QString& key, const QVariant& value) Q_DECL_OVERRIDE; + virtual void setSetting(const QString& key, const QVariant& value) override; //! Get the settings. This function has to be implemented in a subclass in order to have an effect - virtual QVariant getSetting(const QString& key) const Q_DECL_OVERRIDE; + virtual QVariant getSetting(const QString& key) const override; //! Returns the list of keys of the property's settings - virtual QStringList getSettingKeys() const Q_DECL_OVERRIDE; + virtual QStringList getSettingKeys() const override; //! Returns a string containing the type of the property - virtual QString type() const Q_DECL_OVERRIDE; + virtual QString type() const override; //! Clones this property //! \param include_children Indicates whether to also clone the children @@ -96,7 +96,7 @@ public: //! to fill all the data into container. This can also be used when subclassing this function. //! \return Returns the newly created property (or container, if it was not NULL) Q_REQUIRED_RESULT virtual VProperty* clone(bool include_children = true, - VProperty* container = nullptr) const Q_DECL_OVERRIDE; + VProperty* container = nullptr) const override; //! Returns whether this is a file (false) or a directory (true) virtual bool isDirectory() const; diff --git a/src/libs/vpropertyexplorer/plugins/vfilepropertyeditor.h b/src/libs/vpropertyexplorer/plugins/vfilepropertyeditor.h index caf7acf17..95b31ec30 100644 --- a/src/libs/vpropertyexplorer/plugins/vfilepropertyeditor.h +++ b/src/libs/vpropertyexplorer/plugins/vfilepropertyeditor.h @@ -44,14 +44,14 @@ class VPROPERTYEXPLORERSHARED_EXPORT VFileEditWidget : public QWidget public: explicit VFileEditWidget(QWidget* parent, bool is_directory = false); - virtual ~VFileEditWidget() Q_DECL_OVERRIDE; + virtual ~VFileEditWidget() override; //! This function returns the file currently set to this editor QString getFile() const; //! Needed for proper event handling - virtual bool eventFilter(QObject* obj, QEvent* ev) Q_DECL_OVERRIDE; + virtual bool eventFilter(QObject* obj, QEvent* ev) override; //! Returns the directory/file setting //! \return True, if a directory dialog is being shown, false if a file dialog @@ -88,10 +88,10 @@ private slots: void onToolButtonClicked(); protected: - virtual void dragEnterEvent(QDragEnterEvent* event) Q_DECL_OVERRIDE; - virtual void dragMoveEvent(QDragMoveEvent* event) Q_DECL_OVERRIDE; - virtual void dragLeaveEvent(QDragLeaveEvent* event) Q_DECL_OVERRIDE; - virtual void dropEvent(QDropEvent* event) Q_DECL_OVERRIDE; + virtual void dragEnterEvent(QDragEnterEvent* event) override; + virtual void dragMoveEvent(QDragMoveEvent* event) override; + virtual void dragLeaveEvent(QDragLeaveEvent* event) override; + virtual void dropEvent(QDropEvent* event) override; //! This function checks the mime data, if it is compatible with the filters virtual bool checkMimeData(const QMimeData* data, QString& file) const; diff --git a/src/libs/vpropertyexplorer/plugins/vlabelproperty.h b/src/libs/vpropertyexplorer/plugins/vlabelproperty.h index 586fe6f43..c1bfee4a7 100644 --- a/src/libs/vpropertyexplorer/plugins/vlabelproperty.h +++ b/src/libs/vpropertyexplorer/plugins/vlabelproperty.h @@ -61,22 +61,22 @@ public: //! \delegate A pointer to the QAbstractItemDelegate requesting the editor. This can be used to connect signals and //! slots. virtual QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& options, - const QAbstractItemDelegate* delegate) Q_DECL_OVERRIDE; + const QAbstractItemDelegate* delegate) override; //! Gets the data from the widget - virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE; + virtual QVariant getEditorData(const QWidget* editor) const override; //! Sets the settings. - virtual void setSetting(const QString& key, const QVariant& value) Q_DECL_OVERRIDE; + virtual void setSetting(const QString& key, const QVariant& value) override; //! Get the settings. This function has to be implemented in a subclass in order to have an effect - virtual QVariant getSetting(const QString& key) const Q_DECL_OVERRIDE; + virtual QVariant getSetting(const QString& key) const override; //! Returns the list of keys of the property's settings - virtual QStringList getSettingKeys() const Q_DECL_OVERRIDE; + virtual QStringList getSettingKeys() const override; //! Returns a string containing the type of the property - virtual QString type() const Q_DECL_OVERRIDE; + virtual QString type() const override; //! Clones this property //! \param include_children Indicates whether to also clone the children @@ -84,9 +84,9 @@ public: //! to fill all the data into container. This can also be used when subclassing this function. //! \return Returns the newly created property (or container, if it was not NULL) Q_REQUIRED_RESULT virtual VProperty* clone(bool include_children = true, - VProperty* container = nullptr) const Q_DECL_OVERRIDE; + VProperty* container = nullptr) const override; - virtual void UpdateParent(const QVariant &value) Q_DECL_OVERRIDE; + virtual void UpdateParent(const QVariant &value) override; int getTypeForParent() const; void setTypeForParent(int value); diff --git a/src/libs/vpropertyexplorer/plugins/vlinecolorproperty.h b/src/libs/vpropertyexplorer/plugins/vlinecolorproperty.h index 9c0bf5eb7..a91366cfd 100644 --- a/src/libs/vpropertyexplorer/plugins/vlinecolorproperty.h +++ b/src/libs/vpropertyexplorer/plugins/vlinecolorproperty.h @@ -54,10 +54,10 @@ public: explicit VLineColorProperty(const QString& name); //! Destructor - virtual ~VLineColorProperty() Q_DECL_OVERRIDE {} + virtual ~VLineColorProperty() override {} //! Get the data how it should be displayed - virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const override; //! Returns an editor widget, or NULL if it doesn't supply one //! \param parent The widget to which the editor will be added as a child @@ -65,10 +65,10 @@ public: //! \delegate A pointer to the QAbstractItemDelegate requesting the editor. This can be used to connect signals and //! slots. virtual QWidget *createEditor(QWidget* parent, const QStyleOptionViewItem& options, - const QAbstractItemDelegate* delegate) Q_DECL_OVERRIDE; + const QAbstractItemDelegate* delegate) override; //! Gets the data from the widget - virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE; + virtual QVariant getEditorData(const QWidget* editor) const override; //! Sets the colors virtual void setColors(const QMap &colors); @@ -77,10 +77,10 @@ public: virtual QMap getColors() const; //! Sets the value of the property - virtual void setValue(const QVariant& value) Q_DECL_OVERRIDE; + virtual void setValue(const QVariant& value) override; //! Returns a string containing the type of the property - virtual QString type() const Q_DECL_OVERRIDE; + virtual QString type() const override; //! Clones this property //! \param include_children Indicates whether to also clone the children @@ -88,7 +88,7 @@ public: //! to fill all the data into container. This can also be used when subclassing this function. //! \return Returns the newly created property (or container, if it was not NULL) Q_REQUIRED_RESULT virtual VProperty* clone(bool include_children = true, - VProperty* container = nullptr) const Q_DECL_OVERRIDE; + VProperty* container = nullptr) const override; static int IndexOfColor(const QMap &colors, const QString &color); diff --git a/src/libs/vpropertyexplorer/plugins/vlinetypeproperty.h b/src/libs/vpropertyexplorer/plugins/vlinetypeproperty.h index 12d6ca731..7c01b5047 100644 --- a/src/libs/vpropertyexplorer/plugins/vlinetypeproperty.h +++ b/src/libs/vpropertyexplorer/plugins/vlinetypeproperty.h @@ -55,10 +55,10 @@ public: explicit VLineTypeProperty(const QString& name); //! Destructor - virtual ~VLineTypeProperty() Q_DECL_OVERRIDE {} + virtual ~VLineTypeProperty() override {} //! Get the data how it should be displayed - virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const override; //! Returns an editor widget, or NULL if it doesn't supply one //! \param parent The widget to which the editor will be added as a child @@ -66,10 +66,10 @@ public: //! \delegate A pointer to the QAbstractItemDelegate requesting the editor. This can be used to connect signals and //! slots. virtual QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& options, - const QAbstractItemDelegate* delegate) Q_DECL_OVERRIDE; + const QAbstractItemDelegate* delegate) override; //! Gets the data from the widget - virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE; + virtual QVariant getEditorData(const QWidget* editor) const override; //! Sets the line styles virtual void setStyles(const QMap &styles); @@ -78,10 +78,10 @@ public: virtual QMap getStyles() const; //! Sets the value of the property - virtual void setValue(const QVariant& value) Q_DECL_OVERRIDE; + virtual void setValue(const QVariant& value) override; //! Returns a string containing the type of the property - virtual QString type() const Q_DECL_OVERRIDE; + virtual QString type() const override; //! Clones this property //! \param include_children Indicates whether to also clone the children @@ -89,7 +89,7 @@ public: //! to fill all the data into container. This can also be used when subclassing this function. //! \return Returns the newly created property (or container, if it was not NULL) Q_REQUIRED_RESULT virtual VProperty* clone(bool include_children = true, - VProperty* container = nullptr) const Q_DECL_OVERRIDE; + VProperty* container = nullptr) const override; static int IndexOfStyle(const QMap &styles, const QString &style); diff --git a/src/libs/vpropertyexplorer/plugins/vnumberproperty.h b/src/libs/vpropertyexplorer/plugins/vnumberproperty.h index ecd4e8760..1c4f41aa9 100644 --- a/src/libs/vpropertyexplorer/plugins/vnumberproperty.h +++ b/src/libs/vpropertyexplorer/plugins/vnumberproperty.h @@ -54,25 +54,25 @@ public: //! \delegate A pointer to the QAbstractItemDelegate requesting the editor. This can be used to connect signals and //! slots. virtual QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& options, - const QAbstractItemDelegate* delegate) Q_DECL_OVERRIDE; + const QAbstractItemDelegate* delegate) override; //! Gets the data from the widget - virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE; + virtual QVariant getEditorData(const QWidget* editor) const override; //! Sets the settings. Available settings: //! //! key: "Min" - value: Minimum number as integer //! key: "Max" - value: Maximum number as integer - virtual void setSetting(const QString& key, const QVariant& value) Q_DECL_OVERRIDE; + virtual void setSetting(const QString& key, const QVariant& value) override; //! Get the settings. This function has to be implemented in a subclass in order to have an effect - virtual QVariant getSetting(const QString& key) const Q_DECL_OVERRIDE; + virtual QVariant getSetting(const QString& key) const override; //! Returns the list of keys of the property's settings - virtual QStringList getSettingKeys() const Q_DECL_OVERRIDE; + virtual QStringList getSettingKeys() const override; //! Returns a string containing the type of the property - virtual QString type() const Q_DECL_OVERRIDE; + virtual QString type() const override; //! Clones this property //! \param include_children Indicates whether to also clone the children @@ -80,7 +80,7 @@ public: //! to fill all the data into container. This can also be used when subclassing this function. //! \return Returns the newly created property (or container, if it was not NULL) Q_REQUIRED_RESULT virtual VProperty* clone(bool include_children = true, - VProperty* container = nullptr) const Q_DECL_OVERRIDE; + VProperty* container = nullptr) const override; public slots: void valueChanged(int i); protected: @@ -109,32 +109,32 @@ public: //! \delegate A pointer to the QAbstractItemDelegate requesting the editor. This can be used to connect signals and //! slots. virtual QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& options, - const QAbstractItemDelegate* delegate); + const QAbstractItemDelegate* delegate) override; //! Gets the data from the widget - virtual QVariant getEditorData(const QWidget* editor) const; + virtual QVariant getEditorData(const QWidget* editor) const override; //! Sets the settings. Available settings: //! //! key: "Min" - value: Minimum number as integer //! key: "Max" - value: Maximum number as integer - virtual void setSetting(const QString& key, const QVariant& value); + virtual void setSetting(const QString& key, const QVariant& value) override; //! Get the settings. This function has to be implemented in a subclass in order to have an effect - virtual QVariant getSetting(const QString& key) const; + virtual QVariant getSetting(const QString& key) const override; //! Returns the list of keys of the property's settings - virtual QStringList getSettingKeys() const; + virtual QStringList getSettingKeys() const override; //! Returns a string containing the type of the property - virtual QString type() const; + virtual QString type() const override; //! Clones this property //! \param include_children Indicates whether to also clone the children //! \param container If a property is being passed here, no new VProperty is being created but instead it is tried //! to fill all the data into container. This can also be used when subclassing this function. //! \return Returns the newly created property (or container, if it was not NULL) - virtual VProperty* clone(bool include_children = true, VProperty* container = NULL) const; + virtual VProperty* clone(bool include_children = true, VProperty* container = NULL) const override; protected: //! Number of decimals after the decimal point diff --git a/src/libs/vpropertyexplorer/plugins/vobjectproperty.h b/src/libs/vpropertyexplorer/plugins/vobjectproperty.h index bd0387bf3..d6b8654e0 100644 --- a/src/libs/vpropertyexplorer/plugins/vobjectproperty.h +++ b/src/libs/vpropertyexplorer/plugins/vobjectproperty.h @@ -48,10 +48,10 @@ public: explicit VObjectProperty(const QString& name); //! Destructor - virtual ~VObjectProperty() Q_DECL_OVERRIDE {} + virtual ~VObjectProperty() override {} //! Get the data how it should be displayed - virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const override; //! Returns an editor widget, or NULL if it doesn't supply one //! \param parent The widget to which the editor will be added as a child @@ -59,13 +59,13 @@ public: //! \delegate A pointer to the QAbstractItemDelegate requesting the editor. This can be used to connect signals and //! slots. virtual QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& options, - const QAbstractItemDelegate* delegate) Q_DECL_OVERRIDE; + const QAbstractItemDelegate* delegate) override; //! Sets the property's data to the editor (returns false, if the standard delegate should do that) - virtual bool setEditorData(QWidget* editor) Q_DECL_OVERRIDE; + virtual bool setEditorData(QWidget* editor) override; //! Gets the data from the widget - virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE; + virtual QVariant getEditorData(const QWidget* editor) const override; //! Sets the objects list void setObjectsList(const QMap &objects); @@ -74,10 +74,10 @@ public: virtual QMap getObjects() const; //! Sets the value of the property - virtual void setValue(const QVariant& value) Q_DECL_OVERRIDE; + virtual void setValue(const QVariant& value) override; //! Returns a string containing the type of the property - virtual QString type() const Q_DECL_OVERRIDE; + virtual QString type() const override; //! Clones this property //! \param include_children Indicates whether to also clone the children @@ -85,7 +85,7 @@ public: //! to fill all the data into container. This can also be used when subclassing this function. //! \return Returns the newly created property (or container, if it was not NULL) Q_REQUIRED_RESULT virtual VProperty* clone(bool include_children = true, - VProperty* container = nullptr) const Q_DECL_OVERRIDE; + VProperty* container = nullptr) const override; public slots: void currentIndexChanged(int index); diff --git a/src/libs/vpropertyexplorer/plugins/vpointfproperty.h b/src/libs/vpropertyexplorer/plugins/vpointfproperty.h index a45d1272f..5e3783d76 100644 --- a/src/libs/vpropertyexplorer/plugins/vpointfproperty.h +++ b/src/libs/vpropertyexplorer/plugins/vpointfproperty.h @@ -42,13 +42,13 @@ class VPROPERTYEXPLORERSHARED_EXPORT VPointFProperty : public VProperty public: explicit VPointFProperty(const QString& name); - virtual ~VPointFProperty() Q_DECL_OVERRIDE {} + virtual ~VPointFProperty() override {} //! Get the data how it should be displayed - virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const override; //! Returns item flags - Qt::ItemFlags flags(int column = DPC_Name) const Q_DECL_OVERRIDE; + Qt::ItemFlags flags(int column = DPC_Name) const override; //! Returns the QPointF virtual QPointF getPointF() const; @@ -60,7 +60,7 @@ public: virtual void setPointF(qreal x, qreal y); //! Returns a string containing the type of the property - virtual QString type() const Q_DECL_OVERRIDE; + virtual QString type() const override; //! Clones this property //! \param include_children Indicates whether to also clone the children @@ -68,13 +68,13 @@ public: //! to fill all the data into container. This can also be used when subclassing this function. //! \return Returns the newly created property (or container, if it was not NULL) Q_REQUIRED_RESULT virtual VProperty* clone(bool include_children = true, - VProperty* container = nullptr) const Q_DECL_OVERRIDE; + VProperty* container = nullptr) const override; //! Sets the value of the property - virtual void setValue(const QVariant& value) Q_DECL_OVERRIDE; + virtual void setValue(const QVariant& value) override; //! Returns the value of the property as a QVariant - virtual QVariant getValue() const Q_DECL_OVERRIDE; + virtual QVariant getValue() const override; private: Q_DISABLE_COPY(VPointFProperty) diff --git a/src/libs/vpropertyexplorer/plugins/vshortcutproperty.h b/src/libs/vpropertyexplorer/plugins/vshortcutproperty.h index a04329096..434617344 100644 --- a/src/libs/vpropertyexplorer/plugins/vshortcutproperty.h +++ b/src/libs/vpropertyexplorer/plugins/vshortcutproperty.h @@ -44,10 +44,10 @@ public: explicit VShortcutProperty(const QString &name); //! The destructor - virtual ~VShortcutProperty() Q_DECL_OVERRIDE; + virtual ~VShortcutProperty() override; //! Get the data how it should be displayed - virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const override; //! Returns an editor widget, or NULL if it doesn't supply one //! \param parent The widget to which the editor will be added as a child @@ -55,16 +55,16 @@ public: //! \delegate A pointer to the QAbstractItemDelegate requesting the editor. This can be used to connect signals and //! slots. virtual QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& options, - const QAbstractItemDelegate* delegate) Q_DECL_OVERRIDE; + const QAbstractItemDelegate* delegate) override; //! Sets the property's data to the editor (returns false, if the standard delegate should do that) - virtual bool setEditorData(QWidget* editor) Q_DECL_OVERRIDE; + virtual bool setEditorData(QWidget* editor) override; //! Gets the data from the widget - virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE; + virtual QVariant getEditorData(const QWidget* editor) const override; //! Returns a string containing the type of the property - virtual QString type() const Q_DECL_OVERRIDE; + virtual QString type() const override; //! Clones this property //! \param include_children Indicates whether to also clone the children @@ -72,10 +72,10 @@ public: //! to fill all the data into container. This can also be used when subclassing this function. //! \return Returns the newly created property (or container, if it was not NULL) Q_REQUIRED_RESULT virtual VProperty* clone(bool include_children = true, - VProperty* container = nullptr) const Q_DECL_OVERRIDE; + VProperty* container = nullptr) const override; //! Sets the value of the property - virtual void setValue(const QVariant& value) Q_DECL_OVERRIDE; + virtual void setValue(const QVariant& value) override; private: Q_DISABLE_COPY(VShortcutProperty) diff --git a/src/libs/vpropertyexplorer/plugins/vshortcutpropertyeditor.h b/src/libs/vpropertyexplorer/plugins/vshortcutpropertyeditor.h index 68db3545e..8f845baad 100644 --- a/src/libs/vpropertyexplorer/plugins/vshortcutpropertyeditor.h +++ b/src/libs/vpropertyexplorer/plugins/vshortcutpropertyeditor.h @@ -44,10 +44,10 @@ class VPROPERTYEXPLORERSHARED_EXPORT VShortcutEditWidget : public QWidget public: explicit VShortcutEditWidget(QWidget* parent); - virtual ~VShortcutEditWidget() Q_DECL_OVERRIDE; + virtual ~VShortcutEditWidget() override; //! Needed for proper event handling - virtual bool eventFilter(QObject* obj, QEvent* event) Q_DECL_OVERRIDE; + virtual bool eventFilter(QObject* obj, QEvent* event) override; //! Returns the currently set shortcut QString getShortcutAsString() const; diff --git a/src/libs/vpropertyexplorer/plugins/vstringproperty.h b/src/libs/vpropertyexplorer/plugins/vstringproperty.h index fe4bb9e6f..ad0959ce1 100644 --- a/src/libs/vpropertyexplorer/plugins/vstringproperty.h +++ b/src/libs/vpropertyexplorer/plugins/vstringproperty.h @@ -53,26 +53,26 @@ public: //! \delegate A pointer to the QAbstractItemDelegate requesting the editor. This can be used to connect signals and //! slots. virtual QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& options, - const QAbstractItemDelegate* delegate) Q_DECL_OVERRIDE; + const QAbstractItemDelegate* delegate) override; //! Gets the data from the widget - virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE; + virtual QVariant getEditorData(const QWidget* editor) const override; void setReadOnly(bool readOnly); void setOsSeparator(bool separator); void setClearButtonEnable(bool value); //! Sets the settings. - virtual void setSetting(const QString& key, const QVariant& value) Q_DECL_OVERRIDE; + virtual void setSetting(const QString& key, const QVariant& value) override; //! Get the settings. This function has to be implemented in a subclass in order to have an effect - virtual QVariant getSetting(const QString& key) const Q_DECL_OVERRIDE; + virtual QVariant getSetting(const QString& key) const override; //! Returns the list of keys of the property's settings - virtual QStringList getSettingKeys() const Q_DECL_OVERRIDE; + virtual QStringList getSettingKeys() const override; //! Returns a string containing the type of the property - virtual QString type() const Q_DECL_OVERRIDE; + virtual QString type() const override; //! Clones this property //! \param include_children Indicates whether to also clone the children @@ -80,9 +80,9 @@ public: //! to fill all the data into container. This can also be used when subclassing this function. //! \return Returns the newly created property (or container, if it was not NULL) Q_REQUIRED_RESULT virtual VProperty* clone(bool include_children = true, - VProperty* container = nullptr) const Q_DECL_OVERRIDE; + VProperty* container = nullptr) const override; - virtual void UpdateParent(const QVariant &value) Q_DECL_OVERRIDE; + virtual void UpdateParent(const QVariant &value) override; int getTypeForParent() const; void setTypeForParent(int value); @@ -93,7 +93,7 @@ protected: bool clearButton; bool m_osSeparator; - virtual bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE; + virtual bool eventFilter(QObject *object, QEvent *event) override; private: Q_DISABLE_COPY(VStringProperty) diff --git a/src/libs/vpropertyexplorer/plugins/vwidgetproperty.h b/src/libs/vpropertyexplorer/plugins/vwidgetproperty.h index 0b27c3c85..9554d7d9d 100644 --- a/src/libs/vpropertyexplorer/plugins/vwidgetproperty.h +++ b/src/libs/vpropertyexplorer/plugins/vwidgetproperty.h @@ -47,7 +47,7 @@ public: explicit VWidgetProperty(const QString &name, QWidget* widget = nullptr); //! The destructor - virtual ~VWidgetProperty() Q_DECL_OVERRIDE; + virtual ~VWidgetProperty() override; //! Returns the widget held by this property QWidget* getWidget() const; @@ -56,7 +56,7 @@ public: void setWidget(QWidget* widget); //! Returns a string containing the type of the property - virtual QString type() const Q_DECL_OVERRIDE; + virtual QString type() const override; //! Clones this property //! \param include_children Indicates whether to also clone the children @@ -64,7 +64,7 @@ public: //! to fill all the data into container. This can also be used when subclassing this function. //! \return Returns the newly created property (or container, if it was not NULL) Q_REQUIRED_RESULT virtual VProperty* clone(bool include_children = true, - VProperty* container = nullptr) const Q_DECL_OVERRIDE; + VProperty* container = nullptr) const override; }; } diff --git a/src/libs/vpropertyexplorer/vfileproperty_p.h b/src/libs/vpropertyexplorer/vfileproperty_p.h index 0b22604bc..839d05e86 100644 --- a/src/libs/vpropertyexplorer/vfileproperty_p.h +++ b/src/libs/vpropertyexplorer/vfileproperty_p.h @@ -46,7 +46,7 @@ public: VFilePropertyPrivate() : VPropertyPrivate(), FileFilters(), Directory(false) {} - virtual ~VFilePropertyPrivate() Q_DECL_OVERRIDE; + virtual ~VFilePropertyPrivate() override; }; VFilePropertyPrivate::~VFilePropertyPrivate() diff --git a/src/libs/vpropertyexplorer/vproperty.h b/src/libs/vpropertyexplorer/vproperty.h index 3c23f679d..ee6343513 100644 --- a/src/libs/vpropertyexplorer/vproperty.h +++ b/src/libs/vpropertyexplorer/vproperty.h @@ -51,7 +51,7 @@ class VPROPERTYEXPLORERSHARED_EXPORT UserChangeEvent : public QEvent { public: UserChangeEvent() : QEvent(static_cast(MyCustomEventType)) {} - virtual ~UserChangeEvent() Q_DECL_OVERRIDE; + virtual ~UserChangeEvent() override; }; class VPropertyPrivate; @@ -70,7 +70,7 @@ public: explicit VProperty(const QString& name, QVariant::Type type = QVariant::String); //! Destructor - virtual ~VProperty() Q_DECL_OVERRIDE; + virtual ~VProperty() override; //! Returns a string containing the type of the property virtual QString type() const; diff --git a/src/libs/vpropertyexplorer/vpropertydelegate.h b/src/libs/vpropertyexplorer/vpropertydelegate.h index 17363fa33..6ec47defd 100644 --- a/src/libs/vpropertyexplorer/vpropertydelegate.h +++ b/src/libs/vpropertyexplorer/vpropertydelegate.h @@ -39,28 +39,28 @@ class VPROPERTYEXPLORERSHARED_EXPORT VPropertyDelegate : public QStyledItemDeleg Q_OBJECT public: explicit VPropertyDelegate(QObject *parent = nullptr); - virtual ~VPropertyDelegate() Q_DECL_OVERRIDE; + virtual ~VPropertyDelegate() override; //! Creates the editor widget virtual QWidget* createEditor (QWidget* parent, const QStyleOptionViewItem& option, - const QModelIndex& index) const Q_DECL_OVERRIDE; + const QModelIndex& index) const override; //! Sets the index data to the editor - virtual void setEditorData (QWidget * editor, const QModelIndex & index) const Q_DECL_OVERRIDE; + virtual void setEditorData (QWidget * editor, const QModelIndex & index) const override; //! Updates the index data virtual void setModelData (QWidget * editor, QAbstractItemModel * model, - const QModelIndex & index) const Q_DECL_OVERRIDE; + const QModelIndex & index) const override; //! Returns the size hint - virtual QSize sizeHint (const QStyleOptionViewItem& option, const QModelIndex& index) const Q_DECL_OVERRIDE; + virtual QSize sizeHint (const QStyleOptionViewItem& option, const QModelIndex& index) const override; //! Sets the row height. Set this to 0 and the standard will be taken void setRowHeight(int height = 0, bool add_to_standard = false); //! Renders the delegate using the given painter and style option for the item specified by index. virtual void paint (QPainter* painter, const QStyleOptionViewItem& option, - const QModelIndex& index ) const Q_DECL_OVERRIDE; + const QModelIndex& index ) const override; protected: int RowHeight; diff --git a/src/libs/vpropertyexplorer/vpropertyfactorymanager.h b/src/libs/vpropertyexplorer/vpropertyfactorymanager.h index 264f77fe7..bfe9965fa 100644 --- a/src/libs/vpropertyexplorer/vpropertyfactorymanager.h +++ b/src/libs/vpropertyexplorer/vpropertyfactorymanager.h @@ -44,7 +44,7 @@ public: explicit VPropertyFactoryManager(QObject* parent = nullptr); //! Destructor - virtual ~VPropertyFactoryManager() Q_DECL_OVERRIDE; + virtual ~VPropertyFactoryManager() override; //! Register a factory to the factory manager //! Note that the manager takes ownership of the factory, so don't delete it. diff --git a/src/libs/vpropertyexplorer/vpropertyformview.h b/src/libs/vpropertyexplorer/vpropertyformview.h index a55784be2..ea3aa49db 100644 --- a/src/libs/vpropertyexplorer/vpropertyformview.h +++ b/src/libs/vpropertyexplorer/vpropertyformview.h @@ -51,12 +51,12 @@ public: explicit VPropertyFormView(VPropertySet* property_set, QWidget *parent = nullptr); //! Destructor - virtual ~VPropertyFormView() Q_DECL_OVERRIDE; + virtual ~VPropertyFormView() override; public slots: //! Rebuilds the whole form - virtual void build() Q_DECL_OVERRIDE; + virtual void build() override; //! Set the source model. Leads to the rebuild of the form //! \param model The model to use @@ -88,7 +88,7 @@ private slots: void dataSubmitted(VProperty* property); protected: - virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; + virtual void showEvent(QShowEvent* event) override; //! Rebuilds the widegt only if it is visible void updatePropertyList(); diff --git a/src/libs/vpropertyexplorer/vpropertyformview_p.h b/src/libs/vpropertyexplorer/vpropertyformview_p.h index 1c287275f..2bd6ee159 100644 --- a/src/libs/vpropertyexplorer/vpropertyformview_p.h +++ b/src/libs/vpropertyexplorer/vpropertyformview_p.h @@ -62,7 +62,7 @@ public: IgnoreDataChangedSignal(false) {} - virtual ~VPropertyFormViewPrivate() Q_DECL_OVERRIDE {} + virtual ~VPropertyFormViewPrivate() override {} private: Q_DISABLE_COPY(VPropertyFormViewPrivate) diff --git a/src/libs/vpropertyexplorer/vpropertymodel.h b/src/libs/vpropertyexplorer/vpropertymodel.h index 23a6c9324..f4db12a76 100644 --- a/src/libs/vpropertyexplorer/vpropertymodel.h +++ b/src/libs/vpropertyexplorer/vpropertymodel.h @@ -65,7 +65,7 @@ class VPROPERTYEXPLORERSHARED_EXPORT VPropertyModel : public QAbstractItemModel Q_OBJECT public: explicit VPropertyModel(QObject * parent = nullptr); - virtual ~VPropertyModel() Q_DECL_OVERRIDE; + virtual ~VPropertyModel() override; //! Adds the property to the model and attaches it to the parentid //! \param emitsignals If this is set to false, this function will not call beginInsertRows() and endInsertRows(), @@ -81,29 +81,29 @@ public: virtual VProperty* getProperty(const QString& id); //! Returns the item flags for the given index - virtual Qt::ItemFlags flags (const QModelIndex& index) const Q_DECL_OVERRIDE; + virtual Qt::ItemFlags flags (const QModelIndex& index) const override; //! Sets the role data for the item at index to value - virtual bool setData (const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) Q_DECL_OVERRIDE; + virtual bool setData (const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override; //! Returns the model index at row/column - virtual QModelIndex index (int row, int column, const QModelIndex & parent = QModelIndex() ) const Q_DECL_OVERRIDE; + virtual QModelIndex index (int row, int column, const QModelIndex & parent = QModelIndex() ) const override; //! Returns the parent of one model index - virtual QModelIndex parent (const QModelIndex& index) const Q_DECL_OVERRIDE; + virtual QModelIndex parent (const QModelIndex& index) const override; //! Returns the data of an model index - virtual QVariant data (const QModelIndex& index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + virtual QVariant data (const QModelIndex& index, int role = Qt::DisplayRole) const override; //! Returns the data for the given role and section in the header with the specified orientation. virtual QVariant headerData (int section, Qt::Orientation orientation, - int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + int role = Qt::DisplayRole) const override; //! Returns the number of rows - virtual int rowCount ( const QModelIndex & parent = QModelIndex() ) const Q_DECL_OVERRIDE; + virtual int rowCount ( const QModelIndex & parent = QModelIndex() ) const override; //! Returns the number of columns - virtual int columnCount ( const QModelIndex & parent = QModelIndex() ) const Q_DECL_OVERRIDE; + virtual int columnCount ( const QModelIndex & parent = QModelIndex() ) const override; //! Gets a property by its ModelIndex //! \param index The modelIndex of the property. diff --git a/src/libs/vpropertyexplorer/vpropertytreeview.h b/src/libs/vpropertyexplorer/vpropertytreeview.h index 04d1442f2..90b0dc6e5 100644 --- a/src/libs/vpropertyexplorer/vpropertytreeview.h +++ b/src/libs/vpropertyexplorer/vpropertytreeview.h @@ -49,7 +49,7 @@ public: explicit VPropertyTreeView(VPropertyModel* model, QWidget *parent = nullptr); //! Destructor - virtual ~VPropertyTreeView() Q_DECL_OVERRIDE; + virtual ~VPropertyTreeView() override; //! Sets the height for each row. Set this to 0 in order to let the standard delegate decide void setRowHeight(int height = 0, bool add_to_standard = false); diff --git a/src/libs/vpropertyexplorer/vstandardpropertyfactory.h b/src/libs/vpropertyexplorer/vstandardpropertyfactory.h index 9f97e8b0d..bf7249be8 100644 --- a/src/libs/vpropertyexplorer/vstandardpropertyfactory.h +++ b/src/libs/vpropertyexplorer/vstandardpropertyfactory.h @@ -47,7 +47,7 @@ public: //! Creates a new property of a certain type and assigns a name and description (otionally) //! \param type The type of the property as string //! \return Returns the created property or NULL if it couldn't be be created - Q_REQUIRED_RESULT virtual VProperty* createProperty(const QString& type, const QString &name) Q_DECL_OVERRIDE; + Q_REQUIRED_RESULT virtual VProperty* createProperty(const QString& type, const QString &name) override; }; } diff --git a/src/libs/vpropertyexplorer/vwidgetproperty_p.h b/src/libs/vpropertyexplorer/vwidgetproperty_p.h index 8925ac872..b583ffa7f 100644 --- a/src/libs/vpropertyexplorer/vwidgetproperty_p.h +++ b/src/libs/vpropertyexplorer/vwidgetproperty_p.h @@ -50,7 +50,7 @@ public: : VPropertyPrivate(), Widget(nullptr) {} //! Destructor - virtual ~VWidgetPropertyPrivate() Q_DECL_OVERRIDE + virtual ~VWidgetPropertyPrivate() override { if (Widget) { diff --git a/src/libs/vtools/dialogs/support/dialogeditwrongformula.h b/src/libs/vtools/dialogs/support/dialogeditwrongformula.h index 9777bb0b8..4144e7623 100644 --- a/src/libs/vtools/dialogs/support/dialogeditwrongformula.h +++ b/src/libs/vtools/dialogs/support/dialogeditwrongformula.h @@ -60,7 +60,7 @@ class DialogEditWrongFormula : public DialogTool Q_OBJECT public: DialogEditWrongFormula(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogEditWrongFormula() Q_DECL_OVERRIDE; + virtual ~DialogEditWrongFormula() override; QString GetFormula() const; void SetFormula(const QString &value); @@ -71,9 +71,9 @@ public: void SetIncrementsMode(); void SetPreviewCalculationsMode(); public slots: - virtual void DialogAccepted() Q_DECL_OVERRIDE; - virtual void DialogRejected() Q_DECL_OVERRIDE; - virtual void EvalFormula() Q_DECL_OVERRIDE; + virtual void DialogAccepted() override; + virtual void DialogRejected() override; + virtual void EvalFormula() override; void ValChanged(int row); void PutHere(); void PutVal(QTableWidgetItem * item); @@ -89,10 +89,10 @@ public slots: void PreviewCalculations(); void Functions(); protected: - virtual void CheckState() Q_DECL_FINAL; - virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; - virtual void showEvent( QShowEvent *event ) Q_DECL_OVERRIDE; - virtual void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE; + virtual void CheckState() final; + virtual void closeEvent(QCloseEvent *event) override; + virtual void showEvent( QShowEvent *event ) override; + virtual void resizeEvent(QResizeEvent *event) override; private slots: void FilterVariablesEdited(const QString &filter); private: diff --git a/src/libs/vtools/dialogs/support/dialogundo.h b/src/libs/vtools/dialogs/support/dialogundo.h index 72d2c9716..19b1c8c2e 100644 --- a/src/libs/vtools/dialogs/support/dialogundo.h +++ b/src/libs/vtools/dialogs/support/dialogundo.h @@ -49,9 +49,9 @@ class DialogUndo : public QDialog public: explicit DialogUndo(QWidget *parent = nullptr); UndoButton Result() const; - virtual ~DialogUndo() Q_DECL_OVERRIDE; + virtual ~DialogUndo() override; protected: - virtual void closeEvent ( QCloseEvent *event ) Q_DECL_OVERRIDE; + virtual void closeEvent ( QCloseEvent *event ) override; private slots: void Cancel(); private: diff --git a/src/libs/vtools/dialogs/tools/dialogalongline.h b/src/libs/vtools/dialogs/tools/dialogalongline.h index 7995816ee..38c12dced 100644 --- a/src/libs/vtools/dialogs/tools/dialogalongline.h +++ b/src/libs/vtools/dialogs/tools/dialogalongline.h @@ -51,7 +51,7 @@ class DialogAlongLine : public DialogTool Q_OBJECT public: DialogAlongLine(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogAlongLine() Q_DECL_OVERRIDE; + virtual ~DialogAlongLine() override; void SetPointName(const QString &value); @@ -70,9 +70,9 @@ public: quint32 GetSecondPointId() const; void SetSecondPointId(const quint32 &value); - virtual void Build(const Tool &type) Q_DECL_OVERRIDE; + virtual void Build(const Tool &type) override; public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; + virtual void ChosenObject(quint32 id, const SceneObject &type) override; /** * @brief DeployFormulaTextEdit grow or shrink formula input */ @@ -85,12 +85,12 @@ public slots: void FXLength(); protected: - virtual void ShowVisualization() Q_DECL_OVERRIDE; + virtual void ShowVisualization() override; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData() Q_DECL_OVERRIDE; - virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; + virtual void SaveData() override; + virtual void closeEvent(QCloseEvent *event) override; private: Q_DISABLE_COPY(DialogAlongLine) diff --git a/src/libs/vtools/dialogs/tools/dialogarc.h b/src/libs/vtools/dialogs/tools/dialogarc.h index 2f444f4a4..5cbd4d8e0 100644 --- a/src/libs/vtools/dialogs/tools/dialogarc.h +++ b/src/libs/vtools/dialogs/tools/dialogarc.h @@ -51,7 +51,7 @@ class DialogArc : public DialogTool Q_OBJECT public: DialogArc(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogArc() Q_DECL_OVERRIDE; + virtual ~DialogArc() override; quint32 GetCenter() const; void SetCenter(const quint32 &value); @@ -74,7 +74,7 @@ public: qreal GetApproximationScale() const; void SetApproximationScale(qreal value); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; + virtual void ChosenObject(quint32 id, const SceneObject &type) override; /** * @brief DeployFormulaTextEdit grow or shrink formula input */ @@ -89,13 +89,13 @@ public slots: void FXF1(); void FXF2(); protected: - virtual void CheckState() Q_DECL_FINAL; - virtual void ShowVisualization() Q_DECL_OVERRIDE; + virtual void CheckState() final; + virtual void ShowVisualization() override; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData() Q_DECL_OVERRIDE; - virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; + virtual void SaveData() override; + virtual void closeEvent(QCloseEvent *event) override; private: Q_DISABLE_COPY(DialogArc) diff --git a/src/libs/vtools/dialogs/tools/dialogarcwithlength.h b/src/libs/vtools/dialogs/tools/dialogarcwithlength.h index a603b4ea6..56fd39e13 100644 --- a/src/libs/vtools/dialogs/tools/dialogarcwithlength.h +++ b/src/libs/vtools/dialogs/tools/dialogarcwithlength.h @@ -72,7 +72,7 @@ public: qreal GetApproximationScale() const; void SetApproximationScale(qreal value); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; + virtual void ChosenObject(quint32 id, const SceneObject &type) override; /** * @brief DeployFormulaTextEdit grow or shrink formula input */ @@ -89,13 +89,13 @@ public slots: void FXLength(); protected: - virtual void CheckState() Q_DECL_FINAL; - virtual void ShowVisualization() Q_DECL_OVERRIDE; + virtual void CheckState() final; + virtual void ShowVisualization() override; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData() Q_DECL_OVERRIDE; - virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; + virtual void SaveData() override; + virtual void closeEvent(QCloseEvent *event) override; private: Q_DISABLE_COPY(DialogArcWithLength) diff --git a/src/libs/vtools/dialogs/tools/dialogbisector.h b/src/libs/vtools/dialogs/tools/dialogbisector.h index fb09147bd..038b3a1e9 100644 --- a/src/libs/vtools/dialogs/tools/dialogbisector.h +++ b/src/libs/vtools/dialogs/tools/dialogbisector.h @@ -52,7 +52,7 @@ class DialogBisector : public DialogTool public: DialogBisector(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogBisector() Q_DECL_OVERRIDE; + virtual ~DialogBisector() override; void SetPointName(const QString &value); @@ -74,7 +74,7 @@ public: QString GetLineColor() const; void SetLineColor(const QString &value); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; + virtual void ChosenObject(quint32 id, const SceneObject &type) override; /** * @brief DeployFormulaTextEdit grow or shrink formula input */ @@ -83,15 +83,15 @@ public slots: * @brief FormulaTextChanged when formula text changes for validation and calc */ void FormulaTextChanged(); - virtual void PointNameChanged() Q_DECL_OVERRIDE; + virtual void PointNameChanged() override; void FXLength(); protected: - virtual void ShowVisualization() Q_DECL_OVERRIDE; + virtual void ShowVisualization() override; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData() Q_DECL_OVERRIDE; - virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; + virtual void SaveData() override; + virtual void closeEvent(QCloseEvent *event) override; private: Q_DISABLE_COPY(DialogBisector) diff --git a/src/libs/vtools/dialogs/tools/dialogcubicbezier.h b/src/libs/vtools/dialogs/tools/dialogcubicbezier.h index 222edd2c4..a92680506 100644 --- a/src/libs/vtools/dialogs/tools/dialogcubicbezier.h +++ b/src/libs/vtools/dialogs/tools/dialogcubicbezier.h @@ -58,14 +58,14 @@ public: VCubicBezier GetSpline() const; void SetSpline(const VCubicBezier &spline); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; - virtual void PointNameChanged() Q_DECL_OVERRIDE; + virtual void ChosenObject(quint32 id, const SceneObject &type) override; + virtual void PointNameChanged() override; protected: - virtual void ShowVisualization() Q_DECL_OVERRIDE; + virtual void ShowVisualization() override; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData() Q_DECL_OVERRIDE; + virtual void SaveData() override; private: Q_DISABLE_COPY(DialogCubicBezier) Ui::DialogCubicBezier *ui; diff --git a/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.h b/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.h index fdcc48eaa..b455fe442 100644 --- a/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.h +++ b/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.h @@ -57,11 +57,11 @@ public: VCubicBezierPath GetPath() const; void SetPath(const VCubicBezierPath &value); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; - virtual void ShowDialog(bool click) Q_DECL_OVERRIDE; + virtual void ChosenObject(quint32 id, const SceneObject &type) override; + virtual void ShowDialog(bool click) override; protected: - virtual void ShowVisualization() Q_DECL_OVERRIDE; - virtual void SaveData() Q_DECL_OVERRIDE; + virtual void ShowVisualization() override; + virtual void SaveData() override; private slots: void PointChanged(int row); void currentPointChanged(int index); diff --git a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.h b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.h index 15587fdbe..e508e076b 100644 --- a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.h +++ b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.h @@ -49,7 +49,7 @@ class DialogCurveIntersectAxis : public DialogTool public: DialogCurveIntersectAxis(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogCurveIntersectAxis() Q_DECL_OVERRIDE; + virtual ~DialogCurveIntersectAxis() override; void SetPointName(const QString &value); @@ -68,20 +68,20 @@ public: QString GetLineColor() const; void SetLineColor(const QString &value); - virtual void ShowDialog(bool click) Q_DECL_OVERRIDE; + virtual void ShowDialog(bool click) override; public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; + virtual void ChosenObject(quint32 id, const SceneObject &type) override; void EvalAngle(); void AngleTextChanged(); void DeployAngleTextEdit(); void FXAngle(); protected: - virtual void ShowVisualization() Q_DECL_OVERRIDE; + virtual void ShowVisualization() override; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData() Q_DECL_OVERRIDE; - virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; + virtual void SaveData() override; + virtual void closeEvent(QCloseEvent *event) override; private: Q_DISABLE_COPY(DialogCurveIntersectAxis) Ui::DialogCurveIntersectAxis *ui; diff --git a/src/libs/vtools/dialogs/tools/dialogcutarc.h b/src/libs/vtools/dialogs/tools/dialogcutarc.h index 47f1a0e1f..3cede13dd 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutarc.h +++ b/src/libs/vtools/dialogs/tools/dialogcutarc.h @@ -52,7 +52,7 @@ class DialogCutArc : public DialogTool public: DialogCutArc(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogCutArc() Q_DECL_OVERRIDE; + virtual ~DialogCutArc() override; void SetPointName(const QString &value); @@ -62,7 +62,7 @@ public: quint32 getArcId() const; void setArcId(const quint32 &value); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; + virtual void ChosenObject(quint32 id, const SceneObject &type) override; /** * @brief DeployFormulaTextEdit grow or shrink formula input */ @@ -73,12 +73,12 @@ public slots: void FormulaTextChanged(); void FXLength(); protected: - virtual void ShowVisualization() Q_DECL_OVERRIDE; + virtual void ShowVisualization() override; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData() Q_DECL_OVERRIDE; - virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; + virtual void SaveData() override; + virtual void closeEvent(QCloseEvent *event) override; private: Q_DISABLE_COPY(DialogCutArc) /** @brief ui keeps information about user interface */ diff --git a/src/libs/vtools/dialogs/tools/dialogcutspline.h b/src/libs/vtools/dialogs/tools/dialogcutspline.h index f7da009f1..342c88744 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutspline.h +++ b/src/libs/vtools/dialogs/tools/dialogcutspline.h @@ -51,7 +51,7 @@ class DialogCutSpline : public DialogTool Q_OBJECT public: DialogCutSpline(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogCutSpline() Q_DECL_OVERRIDE; + virtual ~DialogCutSpline() override; void SetPointName(const QString &value); @@ -61,19 +61,19 @@ public: quint32 getSplineId() const; void setSplineId(const quint32 &value); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; + virtual void ChosenObject(quint32 id, const SceneObject &type) override; /** * @brief DeployFormulaTextEdit grow or shrink formula input */ void DeployFormulaTextEdit(); void FXLength(); protected: - virtual void ShowVisualization() Q_DECL_OVERRIDE; + virtual void ShowVisualization() override; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData() Q_DECL_OVERRIDE; - virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; + virtual void SaveData() override; + virtual void closeEvent(QCloseEvent *event) override; private: Q_DISABLE_COPY(DialogCutSpline) diff --git a/src/libs/vtools/dialogs/tools/dialogcutsplinepath.h b/src/libs/vtools/dialogs/tools/dialogcutsplinepath.h index 0c460e67d..b1dc2dc94 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutsplinepath.h +++ b/src/libs/vtools/dialogs/tools/dialogcutsplinepath.h @@ -51,7 +51,7 @@ class DialogCutSplinePath : public DialogTool Q_OBJECT public: DialogCutSplinePath(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogCutSplinePath() Q_DECL_OVERRIDE; + virtual ~DialogCutSplinePath() override; void SetPointName(const QString &value); @@ -61,19 +61,19 @@ public: quint32 getSplinePathId() const; void setSplinePathId(const quint32 &value); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; + virtual void ChosenObject(quint32 id, const SceneObject &type) override; /** * @brief DeployFormulaTextEdit grow or shrink formula input */ void DeployFormulaTextEdit(); void FXLength(); protected: - virtual void ShowVisualization() Q_DECL_OVERRIDE; + virtual void ShowVisualization() override; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData() Q_DECL_OVERRIDE; - virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; + virtual void SaveData() override; + virtual void closeEvent(QCloseEvent *event) override; private: Q_DISABLE_COPY(DialogCutSplinePath) diff --git a/src/libs/vtools/dialogs/tools/dialogellipticalarc.h b/src/libs/vtools/dialogs/tools/dialogellipticalarc.h index 2df6e0017..3c1122b48 100644 --- a/src/libs/vtools/dialogs/tools/dialogellipticalarc.h +++ b/src/libs/vtools/dialogs/tools/dialogellipticalarc.h @@ -48,7 +48,7 @@ class DialogEllipticalArc : public DialogTool Q_OBJECT public: DialogEllipticalArc(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogEllipticalArc() Q_DECL_OVERRIDE; + virtual ~DialogEllipticalArc() override; quint32 GetCenter() const; void SetCenter(const quint32 &value); @@ -75,7 +75,7 @@ public: void SetColor(const QString &value); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; + virtual void ChosenObject(quint32 id, const SceneObject &type) override; /** * @brief DeployFormulaTextEdit grow or shrink formula input */ @@ -98,13 +98,13 @@ public slots: void FXRotationAngle(); protected: - virtual void CheckState() Q_DECL_FINAL; - virtual void ShowVisualization() Q_DECL_OVERRIDE; + virtual void CheckState() final; + virtual void ShowVisualization() override; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData() Q_DECL_OVERRIDE; - virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; + virtual void SaveData() override; + virtual void closeEvent(QCloseEvent *event) override; private: Q_DISABLE_COPY(DialogEllipticalArc) diff --git a/src/libs/vtools/dialogs/tools/dialogendline.h b/src/libs/vtools/dialogs/tools/dialogendline.h index 08489388f..60e36f00b 100644 --- a/src/libs/vtools/dialogs/tools/dialogendline.h +++ b/src/libs/vtools/dialogs/tools/dialogendline.h @@ -51,7 +51,7 @@ class DialogEndLine : public DialogTool Q_OBJECT public: DialogEndLine(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogEndLine() Q_DECL_OVERRIDE; + virtual ~DialogEndLine() override; void SetPointName(const QString &value); @@ -70,9 +70,9 @@ public: QString GetLineColor() const; void SetLineColor(const QString &value); - virtual void ShowDialog(bool click) Q_DECL_OVERRIDE; + virtual void ShowDialog(bool click) override; public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; + virtual void ChosenObject(quint32 id, const SceneObject &type) override; /** * @brief DeployFormulaTextEdit grow or shrink formula input */ @@ -89,12 +89,12 @@ public slots: void FXAngle(); void FXLength(); protected: - virtual void ShowVisualization() Q_DECL_OVERRIDE; + virtual void ShowVisualization() override; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData() Q_DECL_OVERRIDE; - virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; + virtual void SaveData() override; + virtual void closeEvent(QCloseEvent *event) override; private: Q_DISABLE_COPY(DialogEndLine) diff --git a/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.h b/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.h index be5d4550c..d35acd1ba 100644 --- a/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.h +++ b/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.h @@ -65,21 +65,21 @@ public: QVector GetObjects() const; - virtual void ShowDialog(bool click) Q_DECL_OVERRIDE; + virtual void ShowDialog(bool click) override; public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; - virtual void SelectedObject(bool selected, quint32 object, quint32 tool) Q_DECL_OVERRIDE; + virtual void ChosenObject(quint32 id, const SceneObject &type) override; + virtual void SelectedObject(bool selected, quint32 object, quint32 tool) override; private slots: void SuffixChanged(); protected: - virtual void CheckState() Q_DECL_FINAL; - virtual void ShowVisualization() Q_DECL_OVERRIDE; + virtual void CheckState() final; + virtual void ShowVisualization() override; /** @brief SaveData Put dialog data in local variables */ - virtual void SaveData() Q_DECL_OVERRIDE; + virtual void SaveData() override; private slots: void PointChanged(); diff --git a/src/libs/vtools/dialogs/tools/dialogflippingbyline.h b/src/libs/vtools/dialogs/tools/dialogflippingbyline.h index 8c36ca239..5e6197828 100644 --- a/src/libs/vtools/dialogs/tools/dialogflippingbyline.h +++ b/src/libs/vtools/dialogs/tools/dialogflippingbyline.h @@ -65,21 +65,21 @@ public: QVector GetObjects() const; - virtual void ShowDialog(bool click) Q_DECL_OVERRIDE; + virtual void ShowDialog(bool click) override; public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; - virtual void SelectedObject(bool selected, quint32 object, quint32 tool) Q_DECL_OVERRIDE; + virtual void ChosenObject(quint32 id, const SceneObject &type) override; + virtual void SelectedObject(bool selected, quint32 object, quint32 tool) override; private slots: void SuffixChanged(); protected: - virtual void CheckState() Q_DECL_FINAL; - virtual void ShowVisualization() Q_DECL_OVERRIDE; + virtual void CheckState() final; + virtual void ShowVisualization() override; /** @brief SaveData Put dialog data in local variables */ - virtual void SaveData() Q_DECL_OVERRIDE; + virtual void SaveData() override; private slots: void PointChanged(); diff --git a/src/libs/vtools/dialogs/tools/dialoggroup.h b/src/libs/vtools/dialogs/tools/dialoggroup.h index fb8a03efb..c81a9d3d7 100644 --- a/src/libs/vtools/dialogs/tools/dialoggroup.h +++ b/src/libs/vtools/dialogs/tools/dialoggroup.h @@ -56,10 +56,10 @@ public: QMap GetGroup() const; - virtual void ShowDialog(bool click) Q_DECL_OVERRIDE; + virtual void ShowDialog(bool click) override; public slots: - virtual void SelectedObject(bool selected, quint32 object, quint32 tool) Q_DECL_OVERRIDE; + virtual void SelectedObject(bool selected, quint32 object, quint32 tool) override; private slots: void NameChanged(); diff --git a/src/libs/vtools/dialogs/tools/dialogheight.h b/src/libs/vtools/dialogs/tools/dialogheight.h index 46f4bc54e..82460a9de 100644 --- a/src/libs/vtools/dialogs/tools/dialogheight.h +++ b/src/libs/vtools/dialogs/tools/dialogheight.h @@ -51,7 +51,7 @@ class DialogHeight : public DialogTool Q_OBJECT public: DialogHeight(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogHeight() Q_DECL_OVERRIDE; + virtual ~DialogHeight() override; void SetPointName(const QString &value); @@ -70,14 +70,14 @@ public: QString GetLineColor() const; void SetLineColor(const QString &value); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; - virtual void PointNameChanged() Q_DECL_OVERRIDE; + virtual void ChosenObject(quint32 id, const SceneObject &type) override; + virtual void PointNameChanged() override; protected: - virtual void ShowVisualization() Q_DECL_OVERRIDE; + virtual void ShowVisualization() override; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData() Q_DECL_OVERRIDE; + virtual void SaveData() override; private: Q_DISABLE_COPY(DialogHeight) diff --git a/src/libs/vtools/dialogs/tools/dialogline.h b/src/libs/vtools/dialogs/tools/dialogline.h index eb9e839f1..5c3403140 100644 --- a/src/libs/vtools/dialogs/tools/dialogline.h +++ b/src/libs/vtools/dialogs/tools/dialogline.h @@ -51,7 +51,7 @@ class DialogLine : public DialogTool Q_OBJECT public: DialogLine(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogLine() Q_DECL_OVERRIDE; + virtual ~DialogLine() override; quint32 GetFirstPoint() const; void SetFirstPoint(const quint32 &value); @@ -65,14 +65,14 @@ public: QString GetLineColor() const; void SetLineColor(const QString &value); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; - virtual void PointNameChanged() Q_DECL_OVERRIDE; + virtual void ChosenObject(quint32 id, const SceneObject &type) override; + virtual void PointNameChanged() override; protected: - virtual void ShowVisualization() Q_DECL_OVERRIDE; + virtual void ShowVisualization() override; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData() Q_DECL_OVERRIDE; + virtual void SaveData() override; private: Q_DISABLE_COPY(DialogLine) diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersect.h b/src/libs/vtools/dialogs/tools/dialoglineintersect.h index 47bae04ee..ffb3d1a76 100644 --- a/src/libs/vtools/dialogs/tools/dialoglineintersect.h +++ b/src/libs/vtools/dialogs/tools/dialoglineintersect.h @@ -51,7 +51,7 @@ class DialogLineIntersect : public DialogTool Q_OBJECT public: DialogLineIntersect(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogLineIntersect() Q_DECL_OVERRIDE; + virtual ~DialogLineIntersect() override; quint32 GetP1Line1() const; void SetP1Line1(const quint32 &value); @@ -67,15 +67,15 @@ public: void SetPointName(const QString &value); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; + virtual void ChosenObject(quint32 id, const SceneObject &type) override; void PointChanged(); - virtual void PointNameChanged() Q_DECL_OVERRIDE; + virtual void PointNameChanged() override; protected: - virtual void ShowVisualization() Q_DECL_OVERRIDE; + virtual void ShowVisualization() override; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData() Q_DECL_OVERRIDE; + virtual void SaveData() override; private: Q_DISABLE_COPY(DialogLineIntersect) @@ -85,7 +85,7 @@ private: /** @brief flagPoint keep state of point */ bool flagPoint; - virtual void CheckState() Q_DECL_FINAL; + virtual void CheckState() final; bool CheckIntersecion(); }; diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.h b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.h index 492dc733e..b2e660236 100644 --- a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.h +++ b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.h @@ -49,7 +49,7 @@ class DialogLineIntersectAxis : public DialogTool public: DialogLineIntersectAxis(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogLineIntersectAxis() Q_DECL_OVERRIDE; + virtual ~DialogLineIntersectAxis() override; void SetPointName(const QString &value); @@ -71,21 +71,21 @@ public: QString GetLineColor() const; void SetLineColor(const QString &value); - virtual void ShowDialog(bool click) Q_DECL_OVERRIDE; + virtual void ShowDialog(bool click) override; public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; + virtual void ChosenObject(quint32 id, const SceneObject &type) override; void EvalAngle(); void AngleTextChanged(); void DeployAngleTextEdit(); - virtual void PointNameChanged() Q_DECL_OVERRIDE; + virtual void PointNameChanged() override; void FXAngle(); protected: - virtual void ShowVisualization() Q_DECL_OVERRIDE; + virtual void ShowVisualization() override; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData() Q_DECL_OVERRIDE; - virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; + virtual void SaveData() override; + virtual void closeEvent(QCloseEvent *event) override; private: Q_DISABLE_COPY(DialogLineIntersectAxis) Ui::DialogLineIntersectAxis *ui; diff --git a/src/libs/vtools/dialogs/tools/dialogmove.h b/src/libs/vtools/dialogs/tools/dialogmove.h index ba533adea..c25520181 100644 --- a/src/libs/vtools/dialogs/tools/dialogmove.h +++ b/src/libs/vtools/dialogs/tools/dialogmove.h @@ -70,11 +70,11 @@ public: QVector GetObjects() const; - virtual void ShowDialog(bool click) Q_DECL_OVERRIDE; + virtual void ShowDialog(bool click) override; public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; - virtual void SelectedObject(bool selected, quint32 object, quint32 tool) Q_DECL_OVERRIDE; + virtual void ChosenObject(quint32 id, const SceneObject &type) override; + virtual void SelectedObject(bool selected, quint32 object, quint32 tool) override; private slots: /** @brief DeployAngleTextEdit grow or shrink formula input */ @@ -93,12 +93,12 @@ private slots: void SuffixChanged(); protected: - virtual void CheckState() Q_DECL_FINAL; - virtual void ShowVisualization() Q_DECL_OVERRIDE; + virtual void CheckState() final; + virtual void ShowVisualization() override; /** @brief SaveData Put dialog data in local variables */ - virtual void SaveData() Q_DECL_OVERRIDE; - virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; + virtual void SaveData() override; + virtual void closeEvent(QCloseEvent *event) override; private: Q_DISABLE_COPY(DialogMove) diff --git a/src/libs/vtools/dialogs/tools/dialognormal.h b/src/libs/vtools/dialogs/tools/dialognormal.h index 23411c9b5..6b2bc04c4 100644 --- a/src/libs/vtools/dialogs/tools/dialognormal.h +++ b/src/libs/vtools/dialogs/tools/dialognormal.h @@ -51,7 +51,7 @@ class DialogNormal : public DialogTool Q_OBJECT public: DialogNormal(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogNormal() Q_DECL_OVERRIDE; + virtual ~DialogNormal() override; void SetPointName(const QString &value); @@ -73,7 +73,7 @@ public: QString GetLineColor() const; void SetLineColor(const QString &value); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; + virtual void ChosenObject(quint32 id, const SceneObject &type) override; /** * @brief DeployFormulaTextEdit grow or shrink formula input */ @@ -82,15 +82,15 @@ public slots: * @brief FormulaTextChanged when formula text changes for validation and calc */ void FormulaTextChanged(); - virtual void PointNameChanged() Q_DECL_OVERRIDE; + virtual void PointNameChanged() override; void FXLength(); protected: - virtual void ShowVisualization() Q_DECL_OVERRIDE; + virtual void ShowVisualization() override; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData() Q_DECL_OVERRIDE; - virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; + virtual void SaveData() override; + virtual void closeEvent(QCloseEvent *event) override; private: Q_DISABLE_COPY(DialogNormal) diff --git a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.h b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.h index d32ea3da4..30b3aeb13 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.h +++ b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.h @@ -65,14 +65,14 @@ public: void SetCrossCirclesPoint(const CrossCirclesPoint &p); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; + virtual void ChosenObject(quint32 id, const SceneObject &type) override; protected: - virtual void ShowVisualization() Q_DECL_OVERRIDE; + virtual void ShowVisualization() override; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData() Q_DECL_OVERRIDE; + virtual void SaveData() override; private: Q_DISABLE_COPY(DialogPointFromArcAndTangent) diff --git a/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.h b/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.h index 8960e60fc..52b2a302c 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.h +++ b/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.h @@ -67,7 +67,7 @@ public: void SetCrossCirclesPoint(const CrossCirclesPoint &p); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; + virtual void ChosenObject(quint32 id, const SceneObject &type) override; void PointChanged(); void DeployCircleRadiusTextEdit(); @@ -76,13 +76,13 @@ public slots: void EvalCircleRadius(); protected: - virtual void ShowVisualization() Q_DECL_OVERRIDE; + virtual void ShowVisualization() override; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData() Q_DECL_OVERRIDE; - virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; - virtual void CheckState() Q_DECL_FINAL; + virtual void SaveData() override; + virtual void closeEvent(QCloseEvent *event) override; + virtual void CheckState() final; private: Q_DISABLE_COPY(DialogPointFromCircleAndTangent) diff --git a/src/libs/vtools/dialogs/tools/dialogpointofcontact.h b/src/libs/vtools/dialogs/tools/dialogpointofcontact.h index 29930ef45..46664f548 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofcontact.h +++ b/src/libs/vtools/dialogs/tools/dialogpointofcontact.h @@ -52,7 +52,7 @@ class DialogPointOfContact : public DialogTool Q_OBJECT public: DialogPointOfContact(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogPointOfContact() Q_DECL_OVERRIDE; + virtual ~DialogPointOfContact() override; void SetPointName(const QString &value); @@ -68,7 +68,7 @@ public: quint32 GetSecondPoint() const; void SetSecondPoint(const quint32 &value); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; + virtual void ChosenObject(quint32 id, const SceneObject &type) override; /** * @brief DeployFormulaTextEdit grow or shrink formula input */ @@ -77,15 +77,15 @@ public slots: * @brief FormulaTextChanged when formula text changes for validation and calc */ void FormulaTextChanged(); - virtual void PointNameChanged() Q_DECL_OVERRIDE; + virtual void PointNameChanged() override; void FXRadius(); protected: - virtual void ShowVisualization() Q_DECL_OVERRIDE; + virtual void ShowVisualization() override; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData() Q_DECL_OVERRIDE; - virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; + virtual void SaveData() override; + virtual void closeEvent(QCloseEvent *event) override; private: Q_DISABLE_COPY(DialogPointOfContact) diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersection.h b/src/libs/vtools/dialogs/tools/dialogpointofintersection.h index e3b9378f2..8fec35c11 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersection.h +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersection.h @@ -51,7 +51,7 @@ class DialogPointOfIntersection : public DialogTool Q_OBJECT public: DialogPointOfIntersection(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogPointOfIntersection() Q_DECL_OVERRIDE; + virtual ~DialogPointOfIntersection() override; void SetPointName(const QString &value); @@ -61,14 +61,14 @@ public: quint32 GetSecondPointId() const; void SetSecondPointId(const quint32 &value); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; - virtual void PointNameChanged() Q_DECL_OVERRIDE; + virtual void ChosenObject(quint32 id, const SceneObject &type) override; + virtual void PointNameChanged() override; protected: - virtual void ShowVisualization() Q_DECL_OVERRIDE; + virtual void ShowVisualization() override; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData() Q_DECL_OVERRIDE; + virtual void SaveData() override; private: Q_DISABLE_COPY(DialogPointOfIntersection) diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.h b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.h index 2f22883e0..0b799913f 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.h +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.h @@ -50,7 +50,7 @@ class DialogPointOfIntersectionArcs : public DialogTool public: DialogPointOfIntersectionArcs(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogPointOfIntersectionArcs() Q_DECL_OVERRIDE; + virtual ~DialogPointOfIntersectionArcs() override; void SetPointName(const QString &value); @@ -64,15 +64,15 @@ public: void SetCrossArcPoint(const CrossCirclesPoint &p); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; + virtual void ChosenObject(quint32 id, const SceneObject &type) override; virtual void ArcChanged(); protected: - virtual void ShowVisualization() Q_DECL_OVERRIDE; + virtual void ShowVisualization() override; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData() Q_DECL_OVERRIDE; + virtual void SaveData() override; private: Q_DISABLE_COPY(DialogPointOfIntersectionArcs) diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.h b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.h index 488185f5d..4ff0a0c72 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.h +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.h @@ -50,7 +50,7 @@ class DialogPointOfIntersectionCircles : public DialogTool public: DialogPointOfIntersectionCircles(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogPointOfIntersectionCircles() Q_DECL_OVERRIDE; + virtual ~DialogPointOfIntersectionCircles() override; void SetPointName(const QString &value); @@ -70,7 +70,7 @@ public: void SetCrossCirclesPoint(const CrossCirclesPoint &p); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; + virtual void ChosenObject(quint32 id, const SceneObject &type) override; void PointChanged(); void DeployCircle1RadiusTextEdit(); @@ -86,13 +86,13 @@ public slots: void EvalCircle2Radius(); protected: - virtual void ShowVisualization() Q_DECL_OVERRIDE; + virtual void ShowVisualization() override; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData() Q_DECL_OVERRIDE; - virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; - virtual void CheckState() Q_DECL_FINAL; + virtual void SaveData() override; + virtual void closeEvent(QCloseEvent *event) override; + virtual void CheckState() final; private: Q_DISABLE_COPY(DialogPointOfIntersectionCircles) diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.h b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.h index 6cd45a244..b34174876 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.h +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.h @@ -49,7 +49,7 @@ class DialogPointOfIntersectionCurves : public DialogTool public: explicit DialogPointOfIntersectionCurves(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogPointOfIntersectionCurves() Q_DECL_OVERRIDE; + virtual ~DialogPointOfIntersectionCurves() override; void SetPointName(const QString &value); @@ -66,16 +66,16 @@ public: void SetHCrossPoint(const HCrossCurvesPoint &hP); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; + virtual void ChosenObject(quint32 id, const SceneObject &type) override; protected: - virtual void ShowVisualization() Q_DECL_OVERRIDE; + virtual void ShowVisualization() override; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData() Q_DECL_OVERRIDE; - virtual void CheckState() Q_DECL_FINAL; + virtual void SaveData() override; + virtual void CheckState() final; private slots: void CurveChanged(); diff --git a/src/libs/vtools/dialogs/tools/dialogrotation.h b/src/libs/vtools/dialogs/tools/dialogrotation.h index 1632b200e..b45f74227 100644 --- a/src/libs/vtools/dialogs/tools/dialogrotation.h +++ b/src/libs/vtools/dialogs/tools/dialogrotation.h @@ -63,11 +63,11 @@ public: QVector GetObjects() const; - virtual void ShowDialog(bool click) Q_DECL_OVERRIDE; + virtual void ShowDialog(bool click) override; public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; - virtual void SelectedObject(bool selected, quint32 object, quint32 tool) Q_DECL_OVERRIDE; + virtual void ChosenObject(quint32 id, const SceneObject &type) override; + virtual void SelectedObject(bool selected, quint32 object, quint32 tool) override; private slots: /** @brief DeployAngleTextEdit grow or shrink formula input */ @@ -77,12 +77,12 @@ private slots: void SuffixChanged(); protected: - virtual void CheckState() Q_DECL_FINAL; - virtual void ShowVisualization() Q_DECL_OVERRIDE; + virtual void CheckState() final; + virtual void ShowVisualization() override; /** @brief SaveData Put dialog data in local variables */ - virtual void SaveData() Q_DECL_OVERRIDE; - virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; + virtual void SaveData() override; + virtual void closeEvent(QCloseEvent *event) override; private slots: void PointChanged(); diff --git a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.h b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.h index 6428ee76c..acd8296ea 100644 --- a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.h +++ b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.h @@ -51,7 +51,7 @@ class DialogShoulderPoint : public DialogTool Q_OBJECT public: DialogShoulderPoint(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogShoulderPoint() Q_DECL_OVERRIDE; + virtual ~DialogShoulderPoint() override; void SetPointName(const QString &value); @@ -73,7 +73,7 @@ public: QString GetLineColor() const; void SetLineColor(const QString &value); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; + virtual void ChosenObject(quint32 id, const SceneObject &type) override; /** * @brief DeployFormulaTextEdit grow or shrink formula input */ @@ -82,15 +82,15 @@ public slots: * @brief FormulaTextChanged when formula text changes for validation and calc */ void FormulaTextChanged(); - virtual void PointNameChanged() Q_DECL_OVERRIDE; + virtual void PointNameChanged() override; void FXLength(); protected: - virtual void ShowVisualization() Q_DECL_OVERRIDE; + virtual void ShowVisualization() override; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData() Q_DECL_OVERRIDE; - virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; + virtual void SaveData() override; + virtual void closeEvent(QCloseEvent *event) override; private: Q_DISABLE_COPY(DialogShoulderPoint) diff --git a/src/libs/vtools/dialogs/tools/dialogsinglepoint.h b/src/libs/vtools/dialogs/tools/dialogsinglepoint.h index fb960e6f1..a2ffa6f67 100644 --- a/src/libs/vtools/dialogs/tools/dialogsinglepoint.h +++ b/src/libs/vtools/dialogs/tools/dialogsinglepoint.h @@ -51,7 +51,7 @@ class DialogSinglePoint : public DialogTool Q_OBJECT public: DialogSinglePoint(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogSinglePoint() Q_DECL_OVERRIDE; + virtual ~DialogSinglePoint() override; void SetData(const QString &name, const QPointF &point); QPointF GetPoint()const; @@ -62,7 +62,7 @@ protected: /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData() Q_DECL_OVERRIDE; + virtual void SaveData() override; private: Q_DISABLE_COPY(DialogSinglePoint) diff --git a/src/libs/vtools/dialogs/tools/dialogspline.h b/src/libs/vtools/dialogs/tools/dialogspline.h index 8ef4768f7..fbf7e1bdb 100644 --- a/src/libs/vtools/dialogs/tools/dialogspline.h +++ b/src/libs/vtools/dialogs/tools/dialogspline.h @@ -55,23 +55,23 @@ class DialogSpline : public DialogTool Q_OBJECT public: DialogSpline(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogSpline() Q_DECL_OVERRIDE; + virtual ~DialogSpline() override; VSpline GetSpline() const; void SetSpline(const VSpline &spline); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; - virtual void PointNameChanged() Q_DECL_OVERRIDE; - virtual void ShowDialog(bool click) Q_DECL_OVERRIDE; + virtual void ChosenObject(quint32 id, const SceneObject &type) override; + virtual void PointNameChanged() override; + virtual void ShowDialog(bool click) override; protected: - virtual void CheckState() Q_DECL_FINAL; - virtual void ShowVisualization() Q_DECL_OVERRIDE; + virtual void CheckState() final; + virtual void ShowVisualization() override; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData() Q_DECL_OVERRIDE; - virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; + virtual void SaveData() override; + virtual void closeEvent(QCloseEvent *event) override; private slots: void DeployAngle1TextEdit(); void DeployAngle2TextEdit(); diff --git a/src/libs/vtools/dialogs/tools/dialogsplinepath.h b/src/libs/vtools/dialogs/tools/dialogsplinepath.h index 0c306846d..133fed1a3 100644 --- a/src/libs/vtools/dialogs/tools/dialogsplinepath.h +++ b/src/libs/vtools/dialogs/tools/dialogsplinepath.h @@ -54,19 +54,19 @@ class DialogSplinePath : public DialogTool Q_OBJECT public: DialogSplinePath(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogSplinePath() Q_DECL_OVERRIDE; + virtual ~DialogSplinePath() override; VSplinePath GetPath() const; void SetPath(const VSplinePath &value); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; - virtual void ShowDialog(bool click) Q_DECL_OVERRIDE; + virtual void ChosenObject(quint32 id, const SceneObject &type) override; + virtual void ShowDialog(bool click) override; void PathUpdated(const VSplinePath &path); protected: - virtual void ShowVisualization() Q_DECL_OVERRIDE; - virtual void SaveData() Q_DECL_OVERRIDE; - virtual void CheckState() Q_DECL_FINAL; - virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; + virtual void ShowVisualization() override; + virtual void SaveData() override; + virtual void CheckState() final; + virtual void closeEvent(QCloseEvent *event) override; private slots: void PointChanged(int row); void currentPointChanged(int index); diff --git a/src/libs/vtools/dialogs/tools/dialogtool.h b/src/libs/vtools/dialogs/tools/dialogtool.h index e8f1e948f..fc34160e9 100644 --- a/src/libs/vtools/dialogs/tools/dialogtool.h +++ b/src/libs/vtools/dialogs/tools/dialogtool.h @@ -78,7 +78,7 @@ class DialogTool : public QDialog Q_OBJECT public: DialogTool(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogTool() Q_DECL_OVERRIDE; + virtual ~DialogTool() override; VAbstractTool* GetAssociatedTool(); void SetAssociatedTool(VAbstractTool* tool); @@ -203,9 +203,9 @@ protected: QPointer vis; - virtual void closeEvent ( QCloseEvent * event ) Q_DECL_OVERRIDE; - virtual void showEvent( QShowEvent *event ) Q_DECL_OVERRIDE; - virtual void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; + virtual void closeEvent ( QCloseEvent * event ) override; + virtual void showEvent( QShowEvent *event ) override; + virtual void keyPressEvent(QKeyEvent *event) override; void FillComboBoxPiecesList(QComboBox *box, const QVector &list); void FillComboBoxPoints(QComboBox *box, FillComboBox rule = FillComboBox::Whole, @@ -273,7 +273,7 @@ protected: */ virtual void SaveData() {} void MoveCursorToEnd(QPlainTextEdit *plainTextEdit) const; - virtual bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE; + virtual bool eventFilter(QObject *object, QEvent *event) override; quint32 DNumber(const QString &baseName) const; static int FindNotExcludedNodeDown(QListWidget *listWidget, int candidate); diff --git a/src/libs/vtools/dialogs/tools/dialogtriangle.h b/src/libs/vtools/dialogs/tools/dialogtriangle.h index c2a56c8b4..e262d0848 100644 --- a/src/libs/vtools/dialogs/tools/dialogtriangle.h +++ b/src/libs/vtools/dialogs/tools/dialogtriangle.h @@ -51,7 +51,7 @@ class DialogTriangle : public DialogTool Q_OBJECT public: DialogTriangle(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogTriangle() Q_DECL_OVERRIDE; + virtual ~DialogTriangle() override; quint32 GetAxisP1Id() const; void SetAxisP1Id(const quint32 &value); @@ -67,14 +67,14 @@ public: void SetPointName(const QString &value); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; - virtual void PointNameChanged() Q_DECL_OVERRIDE; + virtual void ChosenObject(quint32 id, const SceneObject &type) override; + virtual void PointNameChanged() override; protected: - virtual void ShowVisualization() Q_DECL_OVERRIDE; + virtual void ShowVisualization() override; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData() Q_DECL_OVERRIDE; + virtual void SaveData() override; private: Q_DISABLE_COPY(DialogTriangle) diff --git a/src/libs/vtools/dialogs/tools/dialogtruedarts.h b/src/libs/vtools/dialogs/tools/dialogtruedarts.h index 52a61d142..062c910f2 100644 --- a/src/libs/vtools/dialogs/tools/dialogtruedarts.h +++ b/src/libs/vtools/dialogs/tools/dialogtruedarts.h @@ -72,17 +72,17 @@ public: void SetChildrenId(const quint32 &ch1, const quint32 &ch2); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; - virtual void PointNameChanged() Q_DECL_OVERRIDE; + virtual void ChosenObject(quint32 id, const SceneObject &type) override; + virtual void PointNameChanged() override; void NameDartPoint1Changed(); void NameDartPoint2Changed(); protected: - virtual void ShowVisualization() Q_DECL_OVERRIDE; + virtual void ShowVisualization() override; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData() Q_DECL_OVERRIDE; - virtual void CheckState() Q_DECL_FINAL; + virtual void SaveData() override; + virtual void CheckState() final; private: Q_DISABLE_COPY(DialogTrueDarts) diff --git a/src/libs/vtools/dialogs/tools/dialoguniondetails.h b/src/libs/vtools/dialogs/tools/dialoguniondetails.h index 26c5117fd..432747c1c 100644 --- a/src/libs/vtools/dialogs/tools/dialoguniondetails.h +++ b/src/libs/vtools/dialogs/tools/dialoguniondetails.h @@ -51,7 +51,7 @@ class DialogUnionDetails : public DialogTool Q_OBJECT public: DialogUnionDetails(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogUnionDetails() Q_DECL_OVERRIDE; + virtual ~DialogUnionDetails() override; quint32 getD1() const; quint32 getD2() const; @@ -60,7 +60,7 @@ public: bool RetainPieces() const; public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; + virtual void ChosenObject(quint32 id, const SceneObject &type) override; private: Q_DISABLE_COPY(DialogUnionDetails) diff --git a/src/libs/vtools/dialogs/tools/piece/dialogduplicatedetail.h b/src/libs/vtools/dialogs/tools/piece/dialogduplicatedetail.h index d36a0186b..406c524a5 100644 --- a/src/libs/vtools/dialogs/tools/piece/dialogduplicatedetail.h +++ b/src/libs/vtools/dialogs/tools/piece/dialogduplicatedetail.h @@ -47,9 +47,9 @@ public: qreal MoveDuplicateX() const; qreal MoveDuplicateY() const; - virtual void ShowDialog(bool click) Q_DECL_OVERRIDE; + virtual void ShowDialog(bool click) override; public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; + virtual void ChosenObject(quint32 id, const SceneObject &type) override; private: Q_DISABLE_COPY(DialogDuplicateDetail) Ui::DialogDuplicateDetail *ui; diff --git a/src/libs/vtools/dialogs/tools/piece/dialoginsertnode.h b/src/libs/vtools/dialogs/tools/piece/dialoginsertnode.h index 840582f5f..8231e683d 100644 --- a/src/libs/vtools/dialogs/tools/piece/dialoginsertnode.h +++ b/src/libs/vtools/dialogs/tools/piece/dialoginsertnode.h @@ -45,7 +45,7 @@ public: explicit DialogInsertNode(const VContainer *data, quint32 toolId, QWidget *parent = nullptr); virtual ~DialogInsertNode(); - virtual void SetPiecesList(const QVector &list) Q_DECL_OVERRIDE; + virtual void SetPiecesList(const QVector &list) override; quint32 GetPieceId() const; void SetPieceId(quint32 id); @@ -54,10 +54,10 @@ public: void SetNode(const VPieceNode &node); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; + virtual void ChosenObject(quint32 id, const SceneObject &type) override; protected: - virtual void CheckState() Q_DECL_FINAL; + virtual void CheckState() final; private: Q_DISABLE_COPY(DialogInsertNode) diff --git a/src/libs/vtools/dialogs/tools/piece/dialogpiecepath.h b/src/libs/vtools/dialogs/tools/piece/dialogpiecepath.h index ce38ba7c9..10a54d91b 100644 --- a/src/libs/vtools/dialogs/tools/piece/dialogpiecepath.h +++ b/src/libs/vtools/dialogs/tools/piece/dialogpiecepath.h @@ -55,16 +55,16 @@ public: QString GetFormulaSAWidth() const; void SetFormulaSAWidth(const QString &formula); - virtual void SetPiecesList(const QVector &list) Q_DECL_OVERRIDE; + virtual void SetPiecesList(const QVector &list) override; public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; - virtual void ShowDialog(bool click) Q_DECL_OVERRIDE; + virtual void ChosenObject(quint32 id, const SceneObject &type) override; + virtual void ShowDialog(bool click) override; protected: - virtual void CheckState() Q_DECL_FINAL; - virtual void ShowVisualization() Q_DECL_OVERRIDE; - virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; + virtual void CheckState() final; + virtual void ShowVisualization() override; + virtual void closeEvent(QCloseEvent *event) override; private slots: void ShowContextMenu(const QPoint &pos); diff --git a/src/libs/vtools/dialogs/tools/piece/dialogpin.h b/src/libs/vtools/dialogs/tools/piece/dialogpin.h index 80d57b434..f47738ca3 100644 --- a/src/libs/vtools/dialogs/tools/piece/dialogpin.h +++ b/src/libs/vtools/dialogs/tools/piece/dialogpin.h @@ -51,14 +51,14 @@ public: quint32 GetPointId() const; void SetPointId(quint32 id); - virtual void SetPiecesList(const QVector &list) Q_DECL_OVERRIDE; + virtual void SetPiecesList(const QVector &list) override; public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; + virtual void ChosenObject(quint32 id, const SceneObject &type) override; protected: - virtual void CheckState() Q_DECL_FINAL; - virtual void ShowVisualization() Q_DECL_OVERRIDE; + virtual void CheckState() final; + virtual void ShowVisualization() override; private: Q_DISABLE_COPY(DialogPin) diff --git a/src/libs/vtools/dialogs/tools/piece/dialogplacelabel.h b/src/libs/vtools/dialogs/tools/piece/dialogplacelabel.h index 8346e2470..145ed5830 100644 --- a/src/libs/vtools/dialogs/tools/piece/dialogplacelabel.h +++ b/src/libs/vtools/dialogs/tools/piece/dialogplacelabel.h @@ -65,15 +65,15 @@ public: quint32 GetPieceId() const; void SetPieceId(quint32 id); - virtual void SetPiecesList(const QVector &list) Q_DECL_OVERRIDE; + virtual void SetPiecesList(const QVector &list) override; public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; + virtual void ChosenObject(quint32 id, const SceneObject &type) override; protected: - virtual void CheckState() Q_DECL_FINAL; - virtual void ShowVisualization() Q_DECL_OVERRIDE; - virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; + virtual void CheckState() final; + virtual void ShowVisualization() override; + virtual void closeEvent(QCloseEvent *event) override; private slots: void DeployFormulaWidthEdit(); diff --git a/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.h b/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.h index 99c258bdc..7459dc083 100644 --- a/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.h +++ b/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.h @@ -71,16 +71,16 @@ public: QVector &UndoStack(); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; - virtual void ShowDialog(bool click) Q_DECL_OVERRIDE; + virtual void ChosenObject(quint32 id, const SceneObject &type) override; + virtual void ShowDialog(bool click) override; protected: /** @brief SaveData Put dialog data in local variables */ - virtual void SaveData() Q_DECL_OVERRIDE; - virtual void CheckState() Q_DECL_FINAL; - virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; - virtual void showEvent( QShowEvent *event ) Q_DECL_OVERRIDE; - virtual void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE; + virtual void SaveData() override; + virtual void CheckState() final; + virtual void closeEvent(QCloseEvent *event) override; + virtual void showEvent( QShowEvent *event ) override; + virtual void resizeEvent(QResizeEvent *event) override; private slots: void NameDetailChanged(); diff --git a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.h b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.h index 2834a9693..524257efd 100644 --- a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.h +++ b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.h @@ -50,14 +50,14 @@ class VToolFlippingByAxis : public VAbstractFlipping Q_OBJECT public: virtual ~VToolFlippingByAxis() Q_DECL_EQ_DEFAULT; - virtual void setDialog() Q_DECL_OVERRIDE; + virtual void setDialog() override; static VToolFlippingByAxis* Create(QSharedPointer dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolFlippingByAxis* Create(VToolFlippingByAxisInitData initData); static const QString ToolType; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::FlippingByAxis)}; AxisType GetAxisType() const; @@ -65,16 +65,16 @@ public: QString OriginPointName() const; - virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; + virtual void ShowVisualization(bool show) override; protected slots: - virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) Q_DECL_OVERRIDE; + virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) override; protected: - virtual void SetVisualization() Q_DECL_OVERRIDE; + virtual void SetVisualization() override; virtual void SaveDialog(QDomElement &domElement, QList &oldDependencies, - QList &newDependencies) Q_DECL_OVERRIDE; - virtual void ReadToolAttributes(const QDomElement &domElement) Q_DECL_OVERRIDE; - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; - virtual QString MakeToolTip() const Q_DECL_OVERRIDE; + QList &newDependencies) override; + virtual void ReadToolAttributes(const QDomElement &domElement) override; + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) override; + virtual QString MakeToolTip() const override; private: Q_DISABLE_COPY(VToolFlippingByAxis) diff --git a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.h b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.h index b4700f404..069cfdac1 100644 --- a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.h +++ b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.h @@ -51,29 +51,29 @@ class VToolFlippingByLine : public VAbstractFlipping Q_OBJECT public: virtual ~VToolFlippingByLine() Q_DECL_EQ_DEFAULT; - virtual void setDialog() Q_DECL_OVERRIDE; + virtual void setDialog() override; static VToolFlippingByLine* Create(QSharedPointer dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolFlippingByLine* Create(VToolFlippingByLineInitData initData); static const QString ToolType; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::FlippingByLine)}; QString FirstLinePointName() const; QString SecondLinePointName() const; - virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; + virtual void ShowVisualization(bool show) override; protected slots: - virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) Q_DECL_OVERRIDE; + virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) override; protected: - virtual void SetVisualization() Q_DECL_OVERRIDE; + virtual void SetVisualization() override; virtual void SaveDialog(QDomElement &domElement, QList &oldDependencies, - QList &newDependencies) Q_DECL_OVERRIDE; - virtual void ReadToolAttributes(const QDomElement &domElement) Q_DECL_OVERRIDE; - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; - virtual QString MakeToolTip() const Q_DECL_OVERRIDE; + QList &newDependencies) override; + virtual void ReadToolAttributes(const QDomElement &domElement) override; + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) override; + virtual QString MakeToolTip() const override; private: Q_DISABLE_COPY(VToolFlippingByLine) diff --git a/src/libs/vtools/tools/drawTools/operation/vabstractoperation.h b/src/libs/vtools/tools/drawTools/operation/vabstractoperation.h index ea1c1fd29..f922751f3 100644 --- a/src/libs/vtools/tools/drawTools/operation/vabstractoperation.h +++ b/src/libs/vtools/tools/drawTools/operation/vabstractoperation.h @@ -80,25 +80,25 @@ public: static const QString TagSource; static const QString TagDestination; - virtual QString getTagName() const Q_DECL_OVERRIDE; + virtual QString getTagName() const override; QString Suffix() const; void SetSuffix(const QString &suffix); - virtual void GroupVisibility(quint32 object, bool visible) Q_DECL_OVERRIDE; - virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) Q_DECL_OVERRIDE; - virtual void ChangeLabelPosition(quint32 id, const QPointF &pos) Q_DECL_OVERRIDE; + virtual void GroupVisibility(quint32 object, bool visible) override; + virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; + virtual void ChangeLabelPosition(quint32 id, const QPointF &pos) override; - virtual bool IsLabelVisible(quint32 id) const Q_DECL_OVERRIDE; - virtual void SetLabelVisible(quint32 id, bool visible) Q_DECL_OVERRIDE; + virtual bool IsLabelVisible(quint32 id) const override; + virtual void SetLabelVisible(quint32 id, bool visible) override; static void ExtractData(const QDomElement &domElement, VAbstractOperationInitData &initData); public slots: - virtual void FullUpdateFromFile() Q_DECL_OVERRIDE; + virtual void FullUpdateFromFile() override; - virtual void AllowHover(bool enabled) Q_DECL_OVERRIDE; - virtual void AllowSelecting(bool enabled) Q_DECL_OVERRIDE; - virtual void EnableToolMove(bool move) Q_DECL_OVERRIDE; + virtual void AllowHover(bool enabled) override; + virtual void AllowSelecting(bool enabled) override; + virtual void EnableToolMove(bool move) override; void AllowPointHover(bool enabled); void AllowPointSelecting(bool enabled); @@ -118,8 +118,8 @@ public slots: void AllowElArcHover(bool enabled); void AllowElArcSelecting(bool enabled); - virtual void ToolSelectionType(const SelectionType &type) Q_DECL_OVERRIDE; - virtual void Disable(bool disable, const QString &namePP) Q_DECL_OVERRIDE; + virtual void ToolSelectionType(const SelectionType &type) override; + virtual void Disable(bool disable, const QString &namePP) override; void ObjectSelected(bool selected, quint32 objId); void DeleteFromLabel(); void LabelChangePosition(const QPointF &pos, quint32 labelId); @@ -135,8 +135,8 @@ protected: const QVector &source, const QVector &destination, QGraphicsItem *parent = nullptr); - virtual void AddToFile() Q_DECL_OVERRIDE; - virtual void ChangeLabelVisibility(quint32 id, bool visible) Q_DECL_OVERRIDE; + virtual void AddToFile() override; + virtual void ChangeLabelVisibility(quint32 id, bool visible) override; void UpdateNamePosition(quint32 id, const QPointF &pos); void SaveSourceDestination(QDomElement &tag); diff --git a/src/libs/vtools/tools/drawTools/operation/vtoolmove.h b/src/libs/vtools/tools/drawTools/operation/vtoolmove.h index aeefd5320..120b5a320 100644 --- a/src/libs/vtools/tools/drawTools/operation/vtoolmove.h +++ b/src/libs/vtools/tools/drawTools/operation/vtoolmove.h @@ -66,14 +66,14 @@ class VToolMove : public VAbstractOperation Q_OBJECT public: virtual ~VToolMove() Q_DECL_EQ_DEFAULT; - virtual void setDialog() Q_DECL_OVERRIDE; + virtual void setDialog() override; static VToolMove* Create(QSharedPointer dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolMove* Create(VToolMoveInitData &initData); static const QString ToolType; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::Move)}; VFormula GetFormulaAngle() const; @@ -87,16 +87,16 @@ public: QString OriginPointName() const; - virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; + virtual void ShowVisualization(bool show) override; protected slots: - virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) Q_DECL_OVERRIDE; + virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) override; protected: - virtual void SetVisualization() Q_DECL_OVERRIDE; + virtual void SetVisualization() override; virtual void SaveDialog(QDomElement &domElement, QList &oldDependencies, - QList &newDependencies) Q_DECL_OVERRIDE; - virtual void ReadToolAttributes(const QDomElement &domElement) Q_DECL_OVERRIDE; - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; - virtual QString MakeToolTip() const Q_DECL_OVERRIDE; + QList &newDependencies) override; + virtual void ReadToolAttributes(const QDomElement &domElement) override; + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) override; + virtual QString MakeToolTip() const override; private: Q_DISABLE_COPY(VToolMove) QString formulaAngle; diff --git a/src/libs/vtools/tools/drawTools/operation/vtoolrotation.h b/src/libs/vtools/tools/drawTools/operation/vtoolrotation.h index 433a74a58..9acebfb8e 100644 --- a/src/libs/vtools/tools/drawTools/operation/vtoolrotation.h +++ b/src/libs/vtools/tools/drawTools/operation/vtoolrotation.h @@ -62,14 +62,14 @@ class VToolRotation : public VAbstractOperation Q_OBJECT public: virtual ~VToolRotation() Q_DECL_EQ_DEFAULT; - virtual void setDialog() Q_DECL_OVERRIDE; + virtual void setDialog() override; static VToolRotation* Create(QSharedPointer dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolRotation* Create(VToolRotationInitData &initData); static const QString ToolType; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::Rotation)}; QString OriginPointName() const; @@ -77,16 +77,16 @@ public: VFormula GetFormulaAngle() const; void SetFormulaAngle(const VFormula &value); - virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; + virtual void ShowVisualization(bool show) override; protected slots: - virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) Q_DECL_OVERRIDE; + virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) override; protected: - virtual void SetVisualization() Q_DECL_OVERRIDE; + virtual void SetVisualization() override; virtual void SaveDialog(QDomElement &domElement, QList &oldDependencies, - QList &newDependencies) Q_DECL_OVERRIDE; - virtual void ReadToolAttributes(const QDomElement &domElement) Q_DECL_OVERRIDE; - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; - virtual QString MakeToolTip() const Q_DECL_OVERRIDE; + QList &newDependencies) override; + virtual void ReadToolAttributes(const QDomElement &domElement) override; + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) override; + virtual QString MakeToolTip() const override; private: Q_DISABLE_COPY(VToolRotation) diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h index 1e8f42042..3c3c25811 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h +++ b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h @@ -75,11 +75,11 @@ public: VAbstractSpline(VAbstractPattern *doc, VContainer *data, quint32 id, QGraphicsItem * parent = nullptr); virtual ~VAbstractSpline() Q_DECL_EQ_DEFAULT; - virtual QPainterPath shape() const Q_DECL_OVERRIDE; - virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) Q_DECL_OVERRIDE; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual QPainterPath shape() const override; + virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::AbstractSpline)}; - virtual QString getTagName() const Q_DECL_OVERRIDE; + virtual QString getTagName() const override; void ShowHandles(bool show); QString GetLineColor() const; @@ -90,13 +90,13 @@ public: QString name() const; - virtual void GroupVisibility(quint32 object, bool visible) Q_DECL_OVERRIDE; + virtual void GroupVisibility(quint32 object, bool visible) override; public slots: - virtual void FullUpdateFromFile () Q_DECL_OVERRIDE; - virtual void Disable(bool disable, const QString &namePP) Q_DECL_OVERRIDE; - virtual void DetailsMode(bool mode) Q_DECL_OVERRIDE; - virtual void AllowHover(bool enabled) Q_DECL_OVERRIDE; - virtual void AllowSelecting(bool enabled) Q_DECL_OVERRIDE; + virtual void FullUpdateFromFile () override; + virtual void Disable(bool disable, const QString &namePP) override; + virtual void DetailsMode(bool mode) override; + virtual void AllowHover(bool enabled) override; + virtual void AllowSelecting(bool enabled) override; signals: /** * @brief setEnabledPoint disable control points. @@ -118,18 +118,18 @@ protected: * @brief RefreshGeometry refresh item on scene. */ virtual void RefreshGeometry(); - virtual void ShowTool(quint32 id, bool enable) Q_DECL_OVERRIDE; - virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent * event ) Q_DECL_OVERRIDE; - virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ) Q_DECL_OVERRIDE; - virtual QVariant itemChange ( GraphicsItemChange change, const QVariant &value ) Q_DECL_OVERRIDE; - virtual void keyReleaseEvent(QKeyEvent * event) Q_DECL_OVERRIDE; - virtual void mousePressEvent(QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; - virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ) Q_DECL_OVERRIDE; - virtual void ReadToolAttributes(const QDomElement &domElement) Q_DECL_OVERRIDE; - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; + virtual void ShowTool(quint32 id, bool enable) override; + virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent * event ) override; + virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ) override; + virtual QVariant itemChange ( GraphicsItemChange change, const QVariant &value ) override; + virtual void keyReleaseEvent(QKeyEvent * event) override; + virtual void mousePressEvent(QGraphicsSceneMouseEvent *event) override; + virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ) override; + virtual void ReadToolAttributes(const QDomElement &domElement) override; + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) override; virtual void RefreshCtrlPoints(); - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) Q_DECL_OVERRIDE; - virtual QString MakeToolTip() const Q_DECL_OVERRIDE; + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) override; + virtual QString MakeToolTip() const override; VSpline CorrectedSpline(const VSpline &spline, const SplinePointPosition &position, const QPointF &pos) const; diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.h index 7b55664f2..4aa06675e 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.h +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.h @@ -66,15 +66,15 @@ class VToolArc :public VToolAbstractArc { Q_OBJECT public: - virtual void setDialog() Q_DECL_OVERRIDE; + virtual void setDialog() override; static VToolArc* Create(QSharedPointer dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolArc* Create(VToolArcInitData &initData); static const QString ToolType; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::Arc)}; - virtual QString getTagName() const Q_DECL_OVERRIDE; + virtual QString getTagName() const override; VFormula GetFormulaRadius() const; void SetFormulaRadius(const VFormula &value); @@ -88,16 +88,16 @@ public: qreal GetApproximationScale() const; void SetApproximationScale(qreal value); - virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; + virtual void ShowVisualization(bool show) override; protected slots: - virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) Q_DECL_OVERRIDE; + virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) override; protected: - virtual void RemoveReferens() Q_DECL_OVERRIDE; + virtual void RemoveReferens() override; virtual void SaveDialog(QDomElement &domElement, QList &oldDependencies, - QList &newDependencies) Q_DECL_OVERRIDE; - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; - virtual void SetVisualization() Q_DECL_OVERRIDE; - virtual QString MakeToolTip() const Q_DECL_OVERRIDE; + QList &newDependencies) override; + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) override; + virtual void SetVisualization() override; + virtual QString MakeToolTip() const override; private: Q_DISABLE_COPY(VToolArc) diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.h index 6a78b7019..e98b9b647 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.h +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.h @@ -63,15 +63,15 @@ class VToolArcWithLength : public VToolAbstractArc { Q_OBJECT public: - virtual void setDialog() Q_DECL_OVERRIDE; + virtual void setDialog() override; static VToolArcWithLength* Create(QSharedPointer dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolArcWithLength* Create(VToolArcWithLengthInitData &initData); static const QString ToolType; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::ArcWithLength)}; - virtual QString getTagName() const Q_DECL_OVERRIDE; + virtual QString getTagName() const override; VFormula GetFormulaRadius() const; void SetFormulaRadius(const VFormula &value); @@ -85,16 +85,16 @@ public: qreal GetApproximationScale() const; void SetApproximationScale(qreal value); - virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; + virtual void ShowVisualization(bool show) override; protected slots: - virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) Q_DECL_OVERRIDE; + virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) override; protected: - virtual void RemoveReferens() Q_DECL_OVERRIDE; + virtual void RemoveReferens() override; virtual void SaveDialog(QDomElement &domElement, QList &oldDependencies, - QList &newDependencies) Q_DECL_OVERRIDE; - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; - virtual void SetVisualization() Q_DECL_OVERRIDE; - virtual QString MakeToolTip() const Q_DECL_OVERRIDE; + QList &newDependencies) override; + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) override; + virtual void SetVisualization() override; + virtual QString MakeToolTip() const override; private: Q_DISABLE_COPY(VToolArcWithLength) diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.h index a28113b37..c27f4b23d 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.h +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.h @@ -63,12 +63,12 @@ class VToolCubicBezier : public VAbstractSpline Q_OBJECT public: virtual ~VToolCubicBezier() Q_DECL_EQ_DEFAULT; - virtual void setDialog() Q_DECL_OVERRIDE; + virtual void setDialog() override; static VToolCubicBezier *Create(QSharedPointer dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolCubicBezier *Create(VToolCubicBezierInitData initData); static const QString ToolType; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::CubicBezier)}; QString FirstPointName() const; @@ -79,16 +79,16 @@ public: VCubicBezier getSpline()const; void setSpline(const VCubicBezier &spl); - virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; + virtual void ShowVisualization(bool show) override; protected slots: - virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) Q_DECL_OVERRIDE; + virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) override; protected: - virtual void RemoveReferens() Q_DECL_OVERRIDE; + virtual void RemoveReferens() override; virtual void SaveDialog(QDomElement &domElement, QList &oldDependencies, - QList &newDependencies) Q_DECL_OVERRIDE; - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; - virtual void SetVisualization() Q_DECL_OVERRIDE; - virtual void RefreshGeometry() Q_DECL_OVERRIDE; + QList &newDependencies) override; + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) override; + virtual void SetVisualization() override; + virtual void RefreshGeometry() override; private: Q_DISABLE_COPY(VToolCubicBezier) diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.h index 572916fea..f28451330 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.h +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.h @@ -63,29 +63,29 @@ class VToolCubicBezierPath:public VAbstractSpline Q_OBJECT public: virtual ~VToolCubicBezierPath() Q_DECL_EQ_DEFAULT; - virtual void setDialog() Q_DECL_OVERRIDE; + virtual void setDialog() override; static VToolCubicBezierPath *Create(QSharedPointer dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolCubicBezierPath *Create(VToolCubicBezierPathInitData initData); static const QString ToolType; static void UpdatePathPoints(VAbstractPattern *doc, QDomElement &element, const VCubicBezierPath &path); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::CubicBezierPath)}; VCubicBezierPath getSplinePath()const; void setSplinePath(const VCubicBezierPath &splPath); - virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; + virtual void ShowVisualization(bool show) override; protected slots: - virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) Q_DECL_OVERRIDE; + virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) override; protected: - virtual void RemoveReferens() Q_DECL_OVERRIDE; + virtual void RemoveReferens() override; virtual void SaveDialog(QDomElement &domElement, QList &oldDependencies, - QList &newDependencies) Q_DECL_OVERRIDE; - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; - virtual void SetVisualization() Q_DECL_OVERRIDE; - virtual void RefreshGeometry() Q_DECL_OVERRIDE; + QList &newDependencies) override; + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) override; + virtual void SetVisualization() override; + virtual void RefreshGeometry() override; private: Q_DISABLE_COPY(VToolCubicBezierPath) diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.h index 5928b70fe..e5e7d43e9 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.h +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.h @@ -70,14 +70,14 @@ class VToolEllipticalArc : public VToolAbstractArc { Q_OBJECT public: - virtual void setDialog() Q_DECL_OVERRIDE; + virtual void setDialog() override; static VToolEllipticalArc* Create(QSharedPointer dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolEllipticalArc* Create(VToolEllipticalArcInitData &initData); static const QString ToolType; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::EllipticalArc)}; - virtual QString getTagName() const Q_DECL_OVERRIDE; + virtual QString getTagName() const override; VFormula GetFormulaRadius1() const; void SetFormulaRadius1(const VFormula &value); @@ -94,16 +94,16 @@ public: VFormula GetFormulaRotationAngle() const; void SetFormulaRotationAngle(const VFormula &value); - virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; + virtual void ShowVisualization(bool show) override; protected slots: - virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) Q_DECL_OVERRIDE; + virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) override; protected: - virtual void RemoveReferens() Q_DECL_OVERRIDE; + virtual void RemoveReferens() override; virtual void SaveDialog(QDomElement &domElement, QList &oldDependencies, - QList &newDependencies) Q_DECL_OVERRIDE; - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; - virtual void SetVisualization() Q_DECL_OVERRIDE; - virtual QString MakeToolTip() const Q_DECL_OVERRIDE; + QList &newDependencies) override; + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) override; + virtual void SetVisualization() override; + virtual QString MakeToolTip() const override; private: Q_DISABLE_COPY(VToolEllipticalArc) diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.h index 9e2d12975..387d459c7 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.h +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.h @@ -75,38 +75,38 @@ class VToolSpline:public VAbstractSpline Q_OBJECT public: virtual ~VToolSpline() =default; - virtual void setDialog() Q_DECL_OVERRIDE; + virtual void setDialog() override; static VToolSpline *Create(QSharedPointer dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolSpline *Create(VToolSplineInitData &initData, VSpline *spline); static VToolSpline *Create(VToolSplineInitData &initData); static const QString ToolType; static const QString OldToolType; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::Spline)}; VSpline getSpline()const; void setSpline(const VSpline &spl); - virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; + virtual void ShowVisualization(bool show) override; public slots: void ControlPointChangePosition (const qint32 &indexSpline, const SplinePointPosition &position, const QPointF &pos); - virtual void EnableToolMove(bool move) Q_DECL_OVERRIDE; + virtual void EnableToolMove(bool move) override; protected slots: - virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) Q_DECL_OVERRIDE; + virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) override; protected: - virtual void RemoveReferens() Q_DECL_OVERRIDE; + virtual void RemoveReferens() override; virtual void SaveDialog(QDomElement &domElement, QList &oldDependencies, - QList &newDependencies) Q_DECL_OVERRIDE; - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; - virtual void mousePressEvent(QGraphicsSceneMouseEvent * event) Q_DECL_OVERRIDE; - virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ) Q_DECL_OVERRIDE; - virtual void mouseMoveEvent(QGraphicsSceneMouseEvent * event) Q_DECL_OVERRIDE; - virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent * event ) Q_DECL_OVERRIDE; - virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ) Q_DECL_OVERRIDE; - virtual void SetVisualization() Q_DECL_OVERRIDE; - virtual void RefreshCtrlPoints() Q_DECL_OVERRIDE; + QList &newDependencies) override; + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) override; + virtual void mousePressEvent(QGraphicsSceneMouseEvent * event) override; + virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ) override; + virtual void mouseMoveEvent(QGraphicsSceneMouseEvent * event) override; + virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent * event ) override; + virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ) override; + virtual void SetVisualization() override; + virtual void RefreshCtrlPoints() override; private slots: void CurveReleased(); private: diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.h index fad103440..e8176c302 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.h +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.h @@ -74,7 +74,7 @@ class VToolSplinePath:public VAbstractSpline Q_OBJECT public: virtual ~VToolSplinePath() =default; - virtual void setDialog() Q_DECL_OVERRIDE; + virtual void setDialog() override; static VToolSplinePath *Create(QSharedPointer dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolSplinePath *Create(VToolSplinePathInitData &initData, VSplinePath *path); @@ -82,13 +82,13 @@ public: static const QString ToolType; static const QString OldToolType; static void UpdatePathPoints(VAbstractPattern *doc, QDomElement &element, const VSplinePath &path); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::SplinePath)}; VSplinePath getSplinePath()const; void setSplinePath(const VSplinePath &splPath); - virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; + virtual void ShowVisualization(bool show) override; signals: /** * @brief RefreshLine refresh control line. @@ -103,21 +103,21 @@ public slots: void ControlPointChangePosition(const qint32 &indexSpline, const SplinePointPosition &position, const QPointF &pos); - virtual void EnableToolMove(bool move) Q_DECL_OVERRIDE; + virtual void EnableToolMove(bool move) override; protected slots: - virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) Q_DECL_OVERRIDE; + virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) override; protected: - virtual void RemoveReferens() Q_DECL_OVERRIDE; + virtual void RemoveReferens() override; virtual void SaveDialog(QDomElement &domElement, QList &oldDependencies, - QList &newDependencies) Q_DECL_OVERRIDE; - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; - virtual void mousePressEvent(QGraphicsSceneMouseEvent * event) Q_DECL_OVERRIDE; - virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ) Q_DECL_OVERRIDE; - virtual void mouseMoveEvent(QGraphicsSceneMouseEvent * event) Q_DECL_OVERRIDE; - virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent * event ) Q_DECL_OVERRIDE; - virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ) Q_DECL_OVERRIDE; - virtual void SetVisualization() Q_DECL_OVERRIDE; - virtual void RefreshCtrlPoints() Q_DECL_OVERRIDE; + QList &newDependencies) override; + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) override; + virtual void mousePressEvent(QGraphicsSceneMouseEvent * event) override; + virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ) override; + virtual void mouseMoveEvent(QGraphicsSceneMouseEvent * event) override; + virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent * event ) override; + virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ) override; + virtual void SetVisualization() override; + virtual void RefreshCtrlPoints() override; private slots: void CurveReleased(); private: diff --git a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.h b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.h index f384d47fa..96b3dc2a3 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.h @@ -53,7 +53,7 @@ public: QGraphicsItem * parent = nullptr); virtual ~VToolDoublePoint() Q_DECL_EQ_DEFAULT; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::DoublePoint)}; QString nameP1() const; @@ -62,26 +62,26 @@ public: QString nameP2() const; void setNameP2(const QString &name); - virtual void GroupVisibility(quint32 object, bool visible) Q_DECL_OVERRIDE; - virtual void ChangeLabelPosition(quint32 id, const QPointF &pos) Q_DECL_OVERRIDE; + virtual void GroupVisibility(quint32 object, bool visible) override; + virtual void ChangeLabelPosition(quint32 id, const QPointF &pos) override; - virtual bool IsLabelVisible(quint32 id) const Q_DECL_OVERRIDE; - virtual void SetLabelVisible(quint32 id, bool visible) Q_DECL_OVERRIDE; + virtual bool IsLabelVisible(quint32 id) const override; + virtual void SetLabelVisible(quint32 id, bool visible) override; public slots: void Label1ChangePosition(const QPointF &pos); void Label2ChangePosition(const QPointF &pos); - virtual void Disable(bool disable, const QString &namePP) Q_DECL_OVERRIDE; - virtual void EnableToolMove(bool move) Q_DECL_OVERRIDE; + virtual void Disable(bool disable, const QString &namePP) override; + virtual void EnableToolMove(bool move) override; void Point1Choosed(); void Point2Choosed(); void Point1Selected(bool selected); void Point2Selected(bool selected); - virtual void FullUpdateFromFile() Q_DECL_OVERRIDE; - virtual void AllowHover(bool enabled) Q_DECL_OVERRIDE; - virtual void AllowSelecting(bool enabled) Q_DECL_OVERRIDE; + virtual void FullUpdateFromFile() override; + virtual void AllowHover(bool enabled) override; + virtual void AllowSelecting(bool enabled) override; void AllowLabelHover(bool enabled); void AllowLabelSelecting(bool enabled); - virtual void ToolSelectionType(const SelectionType &type) Q_DECL_OVERRIDE; + virtual void ToolSelectionType(const SelectionType &type) override; protected: VSimplePoint *firstPoint; @@ -90,13 +90,13 @@ protected: quint32 p1id; quint32 p2id; - virtual void UpdateNamePosition(quint32 id, const QPointF &pos) Q_DECL_OVERRIDE; - virtual QVariant itemChange ( GraphicsItemChange change, const QVariant &value ) Q_DECL_OVERRIDE; - virtual void keyReleaseEvent(QKeyEvent * event) Q_DECL_OVERRIDE; - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) Q_DECL_OVERRIDE; - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; - virtual void AddToFile() Q_DECL_OVERRIDE; - virtual void ChangeLabelVisibility(quint32 id, bool visible) Q_DECL_OVERRIDE; + virtual void UpdateNamePosition(quint32 id, const QPointF &pos) override; + virtual QVariant itemChange ( GraphicsItemChange change, const QVariant &value ) override; + virtual void keyReleaseEvent(QKeyEvent * event) override; + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) override; + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) override; + virtual void AddToFile() override; + virtual void ChangeLabelVisibility(quint32 id, bool visible) override; QString ComplexToolTip(quint32 itemId) const; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.h b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.h index f3f17518d..56ef6dbd1 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.h @@ -88,15 +88,15 @@ class VToolTrueDarts : public VToolDoublePoint public: static void FindPoint(const QPointF &baseLineP1, const QPointF &baseLineP2, const QPointF &dartP1, const QPointF &dartP2, const QPointF &dartP3, QPointF &p1, QPointF &p2); - virtual void setDialog() Q_DECL_OVERRIDE; + virtual void setDialog() override; static VToolTrueDarts* Create(QSharedPointer dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolTrueDarts* Create(VToolTrueDartsInitData initData); static const QString ToolType; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::TrueDarts)}; - virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; + virtual void ShowVisualization(bool show) override; QString BaseLineP1Name() const; QString BaseLineP2Name() const; @@ -105,14 +105,14 @@ public: QString DartP3Name() const; protected slots: - virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) Q_DECL_OVERRIDE; + virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) override; protected: - virtual void RemoveReferens() Q_DECL_OVERRIDE; + virtual void RemoveReferens() override; virtual void SaveDialog(QDomElement &domElement, QList &oldDependencies, - QList &newDependencies) Q_DECL_OVERRIDE; - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; - virtual void ReadToolAttributes(const QDomElement &domElement) Q_DECL_OVERRIDE; - virtual void SetVisualization() Q_DECL_OVERRIDE; + QList &newDependencies) override; + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) override; + virtual void ReadToolAttributes(const QDomElement &domElement) override; + virtual void SetVisualization() override; private: Q_DISABLE_COPY(VToolTrueDarts) diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.h index d318b6155..1322c3409 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.h @@ -51,7 +51,7 @@ class VToolCut : public VToolSinglePoint public: VToolCut(VAbstractPattern *doc, VContainer *data, const quint32 &id, const QString &formula, const quint32 &curveCutId, QGraphicsItem * parent = nullptr); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::Cut)}; VFormula GetFormula() const; @@ -60,9 +60,9 @@ public: QString CurveName() const; public slots: - virtual void Disable(bool disable, const QString &namePP) Q_DECL_OVERRIDE; - virtual void DetailsMode(bool mode) Q_DECL_OVERRIDE; - virtual void FullUpdateFromFile() Q_DECL_OVERRIDE; + virtual void Disable(bool disable, const QString &namePP) override; + virtual void DetailsMode(bool mode) override; + virtual void FullUpdateFromFile() override; protected: /** @brief formula keep formula of length */ QString formula; @@ -71,7 +71,7 @@ protected: bool detailsMode; void RefreshGeometry(); - virtual void RemoveReferens() Q_DECL_OVERRIDE; + virtual void RemoveReferens() override; template void ShowToolVisualization(bool show); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.h index c800d892b..201675d07 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.h @@ -62,23 +62,23 @@ class VToolCutArc : public VToolCut { Q_OBJECT public: - virtual void setDialog() Q_DECL_OVERRIDE; + virtual void setDialog() override; static VToolCutArc* Create(QSharedPointer dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolCutArc* Create(VToolCutArcInitData &initData); static const QString ToolType; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::CutArc)}; - virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; + virtual void ShowVisualization(bool show) override; protected slots: - virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) Q_DECL_OVERRIDE; + virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) override; protected: virtual void SaveDialog(QDomElement &domElement, QList &oldDependencies, - QList &newDependencies) Q_DECL_OVERRIDE; - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; - virtual void ReadToolAttributes(const QDomElement &domElement) Q_DECL_OVERRIDE; - virtual void SetVisualization() Q_DECL_OVERRIDE; - virtual QString MakeToolTip() const Q_DECL_OVERRIDE; + QList &newDependencies) override; + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) override; + virtual void ReadToolAttributes(const QDomElement &domElement) override; + virtual void SetVisualization() override; + virtual QString MakeToolTip() const override; private: Q_DISABLE_COPY(VToolCutArc) diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.h index e87a62b01..3652b57f5 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.h @@ -62,24 +62,24 @@ class VToolCutSpline : public VToolCut { Q_OBJECT public: - virtual void setDialog() Q_DECL_OVERRIDE; + virtual void setDialog() override; static VToolCutSpline *Create(QSharedPointer dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolCutSpline *Create(VToolCutSplineInitData &initData); static const QString ToolType; static const QString AttrSpline; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::CutSpline)}; - virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; + virtual void ShowVisualization(bool show) override; protected slots: - virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) Q_DECL_OVERRIDE; + virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) override; protected: virtual void SaveDialog(QDomElement &domElement, QList &oldDependencies, - QList &newDependencies) Q_DECL_OVERRIDE; - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; - virtual void ReadToolAttributes(const QDomElement &domElement) Q_DECL_OVERRIDE; - virtual void SetVisualization() Q_DECL_OVERRIDE; - virtual QString MakeToolTip() const Q_DECL_OVERRIDE; + QList &newDependencies) override; + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) override; + virtual void ReadToolAttributes(const QDomElement &domElement) override; + virtual void SetVisualization() override; + virtual QString MakeToolTip() const override; private: Q_DISABLE_COPY(VToolCutSpline) diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h index 74c9532c3..cf5d1e3a9 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h @@ -64,29 +64,29 @@ class VToolCutSplinePath : public VToolCut { Q_OBJECT public: - virtual void setDialog() Q_DECL_OVERRIDE; + virtual void setDialog() override; static VToolCutSplinePath *Create(QSharedPointer dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolCutSplinePath *Create(VToolCutSplinePathInitData &initData); static const QString ToolType; static const QString AttrSplinePath; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::CutSplinePath)}; - virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; + virtual void ShowVisualization(bool show) override; Q_REQUIRED_RESULT static VPointF *CutSplinePath(qreal length, const QSharedPointer &splPath, const QString &pName, VSplinePath **splPath1, VSplinePath **splPath2); protected slots: - virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) Q_DECL_OVERRIDE; + virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) override; protected: virtual void SaveDialog(QDomElement &domElement, QList &oldDependencies, - QList &newDependencies) Q_DECL_OVERRIDE; - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; - virtual void ReadToolAttributes(const QDomElement &domElement) Q_DECL_OVERRIDE; - virtual void SetVisualization() Q_DECL_OVERRIDE; - virtual QString MakeToolTip() const Q_DECL_OVERRIDE; + QList &newDependencies) override; + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) override; + virtual void ReadToolAttributes(const QDomElement &domElement) override; + virtual void SetVisualization() override; + virtual QString MakeToolTip() const override; private: Q_DISABLE_COPY(VToolCutSplinePath) diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.h index 28ee35785..7545348c0 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.h @@ -64,27 +64,27 @@ class VToolAlongLine : public VToolLinePoint { Q_OBJECT public: - virtual void setDialog() Q_DECL_OVERRIDE; + virtual void setDialog() override; static VToolAlongLine* Create(QSharedPointer dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolAlongLine* Create(VToolAlongLineInitData &initData); static const QString ToolType; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::AlongLine)}; QString SecondPointName() const; - virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; + virtual void ShowVisualization(bool show) override; protected slots: - virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) Q_DECL_OVERRIDE; + virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) override; protected: - virtual void RemoveReferens() Q_DECL_OVERRIDE; + virtual void RemoveReferens() override; virtual void SaveDialog(QDomElement &domElement, QList &oldDependencies, - QList &newDependencies) Q_DECL_OVERRIDE; - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; - virtual void ReadToolAttributes(const QDomElement &domElement) Q_DECL_OVERRIDE; - virtual void SetVisualization() Q_DECL_OVERRIDE; - virtual QString MakeToolTip() const Q_DECL_OVERRIDE; + QList &newDependencies) override; + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) override; + virtual void ReadToolAttributes(const QDomElement &domElement) override; + virtual void SetVisualization() override; + virtual QString MakeToolTip() const override; private: Q_DISABLE_COPY(VToolAlongLine) diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.h index 503b4ed51..5347f180d 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.h @@ -70,27 +70,27 @@ public: static qreal BisectorAngle(const QPointF &firstPoint, const QPointF &secondPoint, const QPointF &thirdPoint); static QPointF FindPoint(const QPointF &firstPoint, const QPointF &secondPoint, const QPointF &thirdPoint, const qreal& length); - virtual void setDialog() Q_DECL_OVERRIDE; + virtual void setDialog() override; static VToolBisector* Create(QSharedPointer dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolBisector* Create(VToolBisectorInitData &initData); static const QString ToolType; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::Bisector)}; QString FirstPointName() const; QString ThirdPointName() const; - virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; + virtual void ShowVisualization(bool show) override; protected slots: - virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) Q_DECL_OVERRIDE; + virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) override; protected: - virtual void RemoveReferens() Q_DECL_OVERRIDE; + virtual void RemoveReferens() override; virtual void SaveDialog(QDomElement &domElement, QList &oldDependencies, - QList &newDependencies) Q_DECL_OVERRIDE; - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; - virtual void ReadToolAttributes(const QDomElement &domElement) Q_DECL_OVERRIDE; - virtual void SetVisualization() Q_DECL_OVERRIDE; + QList &newDependencies) override; + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) override; + virtual void ReadToolAttributes(const QDomElement &domElement) override; + virtual void SetVisualization() override; private: Q_DISABLE_COPY(VToolBisector) diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.h index 6b7b948a9..e526355ea 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.h @@ -65,7 +65,7 @@ class VToolCurveIntersectAxis : public VToolLinePoint Q_OBJECT public: virtual ~VToolCurveIntersectAxis() Q_DECL_EQ_DEFAULT; - virtual void setDialog() Q_DECL_OVERRIDE; + virtual void setDialog() override; static VToolCurveIntersectAxis *Create(QSharedPointer dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); @@ -75,7 +75,7 @@ public: QPointF *intersectionPoint); static const QString ToolType; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::CurveIntersectAxis)}; VFormula GetFormulaAngle() const; @@ -83,15 +83,15 @@ public: QString CurveName() const; - virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; + virtual void ShowVisualization(bool show) override; protected slots: - virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) Q_DECL_OVERRIDE; + virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) override; protected: virtual void SaveDialog(QDomElement &domElement, QList &oldDependencies, - QList &newDependencies) Q_DECL_OVERRIDE; - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; - virtual void ReadToolAttributes(const QDomElement &domElement) Q_DECL_OVERRIDE; - virtual void SetVisualization() Q_DECL_OVERRIDE; + QList &newDependencies) override; + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) override; + virtual void ReadToolAttributes(const QDomElement &domElement) override; + virtual void SetVisualization() override; private: Q_DISABLE_COPY(VToolCurveIntersectAxis) QString formulaAngle; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.h index d92848c07..bca6c651d 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.h @@ -66,25 +66,25 @@ class VToolEndLine : public VToolLinePoint Q_OBJECT public: virtual ~VToolEndLine() Q_DECL_EQ_DEFAULT; - virtual void setDialog() Q_DECL_OVERRIDE; + virtual void setDialog() override; static VToolEndLine *Create(QSharedPointer dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolEndLine *Create(VToolEndLineInitData &initData); static const QString ToolType; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::EndLine)}; VFormula GetFormulaAngle() const; void SetFormulaAngle(const VFormula &value); - virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; + virtual void ShowVisualization(bool show) override; protected slots: - virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) Q_DECL_OVERRIDE; + virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) override; protected: virtual void SaveDialog(QDomElement &domElement, QList &oldDependencies, - QList &newDependencies) Q_DECL_OVERRIDE; - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; - virtual void ReadToolAttributes(const QDomElement &domElement) Q_DECL_OVERRIDE; - virtual void SetVisualization() Q_DECL_OVERRIDE; + QList &newDependencies) override; + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) override; + virtual void ReadToolAttributes(const QDomElement &domElement) override; + virtual void SetVisualization() override; private: Q_DISABLE_COPY(VToolEndLine) diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.h index 2062d20ef..c8c66c9ca 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.h @@ -66,28 +66,28 @@ class VToolHeight: public VToolLinePoint { Q_OBJECT public: - virtual void setDialog() Q_DECL_OVERRIDE; + virtual void setDialog() override; static VToolHeight *Create(QSharedPointer dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolHeight *Create(VToolHeightInitData initData); static QPointF FindPoint(const QLineF &line, const QPointF &point); static const QString ToolType; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::Height)}; QString FirstLinePointName() const; QString SecondLinePointName() const; - virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; + virtual void ShowVisualization(bool show) override; protected slots: - virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) Q_DECL_OVERRIDE; + virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) override; protected: virtual void SaveDialog(QDomElement &domElement, QList &oldDependencies, - QList &newDependencies) Q_DECL_OVERRIDE; - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; - virtual void ReadToolAttributes(const QDomElement &domElement) Q_DECL_OVERRIDE; - virtual void SetVisualization() Q_DECL_OVERRIDE; - virtual QString MakeToolTip() const Q_DECL_OVERRIDE; + QList &newDependencies) override; + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) override; + virtual void ReadToolAttributes(const QDomElement &domElement) override; + virtual void SetVisualization() override; + virtual QString MakeToolTip() const override; private: Q_DISABLE_COPY(VToolHeight) diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.h index 4c4f633c0..e551ada26 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.h @@ -67,7 +67,7 @@ class VToolLineIntersectAxis : public VToolLinePoint Q_OBJECT public: virtual ~VToolLineIntersectAxis() Q_DECL_EQ_DEFAULT; - virtual void setDialog() Q_DECL_OVERRIDE; + virtual void setDialog() override; static VToolLineIntersectAxis *Create(QSharedPointer dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); @@ -76,7 +76,7 @@ public: static bool FindPoint(const QLineF &axis, const QLineF &line, QPointF *intersectionPoint); static const QString ToolType; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::LineIntersectAxis)}; QString FirstLinePoint() const; @@ -85,16 +85,16 @@ public: VFormula GetFormulaAngle() const; void SetFormulaAngle(const VFormula &value); - virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; + virtual void ShowVisualization(bool show) override; protected slots: - virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) Q_DECL_OVERRIDE; + virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) override; protected: virtual void SaveDialog(QDomElement &domElement, QList &oldDependencies, - QList &newDependencies) Q_DECL_OVERRIDE; - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; - virtual void ReadToolAttributes(const QDomElement &domElement) Q_DECL_OVERRIDE; - virtual void SetVisualization() Q_DECL_OVERRIDE; - virtual QString MakeToolTip() const Q_DECL_OVERRIDE; + QList &newDependencies) override; + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) override; + virtual void ReadToolAttributes(const QDomElement &domElement) override; + virtual void SetVisualization() override; + virtual QString MakeToolTip() const override; private: Q_DISABLE_COPY(VToolLineIntersectAxis) diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h index d78947846..c66de188f 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h @@ -64,12 +64,12 @@ public: VToolLinePoint(VAbstractPattern *doc, VContainer *data, const quint32 &id, const QString &typeLine, const QString &lineColor, const QString &formula, const quint32 &basePointId, const qreal &angle, QGraphicsItem * parent = nullptr); - virtual ~VToolLinePoint() Q_DECL_OVERRIDE; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual ~VToolLinePoint() override; + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::LinePoint)}; virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = nullptr) Q_DECL_OVERRIDE; + QWidget *widget = nullptr) override; VFormula GetFormulaLength() const; void SetFormulaLength(const VFormula &value); @@ -83,8 +83,8 @@ public: void SetLineColor(const QString &value); public slots: - virtual void Disable(bool disable, const QString &namePP) Q_DECL_OVERRIDE; - virtual void FullUpdateFromFile() Q_DECL_OVERRIDE; + virtual void Disable(bool disable, const QString &namePP) override; + virtual void FullUpdateFromFile() override; protected: /** @brief formula string with length formula. */ QString formulaLength; @@ -102,11 +102,11 @@ protected: QString lineColor; virtual void RefreshGeometry(); - virtual void RemoveReferens() Q_DECL_OVERRIDE; - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; - virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event) Q_DECL_OVERRIDE; - virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) Q_DECL_OVERRIDE; - virtual QString MakeToolTip() const Q_DECL_OVERRIDE; + virtual void RemoveReferens() override; + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) override; + virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; + virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; + virtual QString MakeToolTip() const override; private: Q_DISABLE_COPY(VToolLinePoint) }; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.h index 4dc0b8af9..6a0dd533b 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.h @@ -67,28 +67,28 @@ class VToolNormal : public VToolLinePoint { Q_OBJECT public: - virtual void setDialog() Q_DECL_OVERRIDE; + virtual void setDialog() override; static VToolNormal* Create(QSharedPointer dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolNormal* Create(VToolNormalInitData initData); static QPointF FindPoint(const QPointF &firstPoint, const QPointF &secondPoint, const qreal &length, const qreal &angle = 0); static const QString ToolType; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::Normal)}; QString SecondPointName() const; - virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; + virtual void ShowVisualization(bool show) override; protected slots: - virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) Q_DECL_OVERRIDE; + virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) override; protected: - virtual void RemoveReferens() Q_DECL_OVERRIDE; + virtual void RemoveReferens() override; virtual void SaveDialog(QDomElement &domElement, QList &oldDependencies, - QList &newDependencies) Q_DECL_OVERRIDE; - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; - virtual void ReadToolAttributes(const QDomElement &domElement) Q_DECL_OVERRIDE; - virtual void SetVisualization() Q_DECL_OVERRIDE; + QList &newDependencies) override; + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) override; + virtual void ReadToolAttributes(const QDomElement &domElement) override; + virtual void SetVisualization() override; private: Q_DISABLE_COPY(VToolNormal) diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.h index fb6df7a8f..f122ee8bc 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.h @@ -68,14 +68,14 @@ class VToolShoulderPoint : public VToolLinePoint { Q_OBJECT public: - virtual void setDialog() Q_DECL_OVERRIDE; + virtual void setDialog() override; static QPointF FindPoint(const QPointF &p1Line, const QPointF &p2Line, const QPointF &pShoulder, const qreal &length); static VToolShoulderPoint* Create(QSharedPointer dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolShoulderPoint* Create(VToolShoulderPointInitData &initData); static const QString ToolType; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::ShoulderPoint) }; QString SecondPointName() const; @@ -87,17 +87,17 @@ public: quint32 getPShoulder() const; void setPShoulder(const quint32 &value); - virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; + virtual void ShowVisualization(bool show) override; protected: - virtual void RemoveReferens() Q_DECL_OVERRIDE; + virtual void RemoveReferens() override; virtual void SaveDialog(QDomElement &domElement, QList &oldDependencies, - QList &newDependencies) Q_DECL_OVERRIDE; - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; - virtual void ReadToolAttributes(const QDomElement &domElement) Q_DECL_OVERRIDE; - virtual void SetVisualization() Q_DECL_OVERRIDE; - virtual QString MakeToolTip() const Q_DECL_OVERRIDE; + QList &newDependencies) override; + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) override; + virtual void ReadToolAttributes(const QDomElement &domElement) override; + virtual void SetVisualization() override; + virtual QString MakeToolTip() const override; private slots: - virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) Q_DECL_OVERRIDE; + virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) override; private: Q_DISABLE_COPY(VToolShoulderPoint) diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.h index 0552bf33a..016f44b93 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.h @@ -68,39 +68,39 @@ class VToolBasePoint : public VToolSinglePoint Q_OBJECT public: virtual ~VToolBasePoint() =default; - virtual void setDialog() Q_DECL_OVERRIDE; + virtual void setDialog() override; static VToolBasePoint *Create(VToolBasePointInitData initData); static const QString ToolType; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::BasePoint)}; - virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; - virtual void decrementReferens() Q_DECL_OVERRIDE; + virtual void ShowVisualization(bool show) override; + virtual void decrementReferens() override; QPointF GetBasePointPos() const; void SetBasePointPos(const QPointF &pos); public slots: - virtual void FullUpdateFromFile() Q_DECL_OVERRIDE; - virtual void EnableToolMove(bool move) Q_DECL_OVERRIDE; + virtual void FullUpdateFromFile() override; + virtual void EnableToolMove(bool move) override; signals: /** * @brief FullUpdateTree handle if need update pattern file. */ void LiteUpdateTree(); protected: - virtual void AddToFile() Q_DECL_OVERRIDE; - virtual QVariant itemChange ( GraphicsItemChange change, const QVariant &value ) Q_DECL_OVERRIDE; - virtual void DeleteToolWithConfirm(bool ask = true) Q_DECL_OVERRIDE; + virtual void AddToFile() override; + virtual QVariant itemChange ( GraphicsItemChange change, const QVariant &value ) override; + virtual void DeleteToolWithConfirm(bool ask = true) override; virtual void SaveDialog(QDomElement &domElement, QList &oldDependencies, - QList &newDependencies) Q_DECL_OVERRIDE; - virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent * event ) Q_DECL_OVERRIDE; - virtual void mousePressEvent( QGraphicsSceneMouseEvent * event ) Q_DECL_OVERRIDE; - virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ) Q_DECL_OVERRIDE; - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; - virtual void ReadToolAttributes(const QDomElement &domElement) Q_DECL_OVERRIDE; - virtual void SetVisualization() Q_DECL_OVERRIDE {} - virtual QString MakeToolTip() const Q_DECL_OVERRIDE; + QList &newDependencies) override; + virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent * event ) override; + virtual void mousePressEvent( QGraphicsSceneMouseEvent * event ) override; + virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ) override; + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) override; + virtual void ReadToolAttributes(const QDomElement &domElement) override; + virtual void SetVisualization() override {} + virtual QString MakeToolTip() const override; private slots: - virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) Q_DECL_OVERRIDE; + virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) override; private: Q_DISABLE_COPY(VToolBasePoint) diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.h index 8aabe7176..deab65ea0 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.h @@ -66,12 +66,12 @@ class VToolLineIntersect:public VToolSinglePoint { Q_OBJECT public: - virtual void setDialog() Q_DECL_OVERRIDE; + virtual void setDialog() override; static VToolLineIntersect *Create(QSharedPointer dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolLineIntersect *Create(VToolLineIntersectInitData initData); static const QString ToolType; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::LineIntersect)}; QString Line1P1Name() const; @@ -79,17 +79,17 @@ public: QString Line2P1Name() const; QString Line2P2Name() const; - virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; + virtual void ShowVisualization(bool show) override; protected slots: - virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) Q_DECL_OVERRIDE; + virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) override; protected: - virtual void RemoveReferens() Q_DECL_OVERRIDE; + virtual void RemoveReferens() override; virtual void SaveDialog(QDomElement &domElement, QList &oldDependencies, - QList &newDependencies) Q_DECL_OVERRIDE; - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; - virtual void ReadToolAttributes(const QDomElement &domElement) Q_DECL_OVERRIDE; - virtual void SetVisualization() Q_DECL_OVERRIDE; - virtual QString MakeToolTip() const Q_DECL_OVERRIDE; + QList &newDependencies) override; + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) override; + virtual void ReadToolAttributes(const QDomElement &domElement) override; + virtual void SetVisualization() override; + virtual QString MakeToolTip() const override; private: Q_DISABLE_COPY(VToolLineIntersect) diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.h index 29b35373a..dc5f79c88 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.h @@ -62,13 +62,13 @@ class VToolPointFromArcAndTangent : public VToolSinglePoint { Q_OBJECT public: - virtual void setDialog() Q_DECL_OVERRIDE; + virtual void setDialog() override; static VToolPointFromArcAndTangent *Create(QSharedPointer dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolPointFromArcAndTangent *Create(VToolPointFromArcAndTangentInitData initData); static bool FindPoint(const QPointF &p, const VArc *arc, const CrossCirclesPoint pType, QPointF *intersectionPoint); static const QString ToolType; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::PointFromArcAndTangent) }; QString TangentPointName() const; @@ -77,16 +77,16 @@ public: CrossCirclesPoint GetCrossCirclesPoint() const; void SetCrossCirclesPoint(const CrossCirclesPoint &value); - virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; + virtual void ShowVisualization(bool show) override; protected slots: - virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) Q_DECL_OVERRIDE; + virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) override; protected: - virtual void RemoveReferens() Q_DECL_OVERRIDE; + virtual void RemoveReferens() override; virtual void SaveDialog(QDomElement &domElement, QList &oldDependencies, - QList &newDependencies) Q_DECL_OVERRIDE; - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; - virtual void ReadToolAttributes(const QDomElement &domElement) Q_DECL_OVERRIDE; - virtual void SetVisualization() Q_DECL_OVERRIDE; + QList &newDependencies) override; + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) override; + virtual void ReadToolAttributes(const QDomElement &domElement) override; + virtual void SetVisualization() override; private: Q_DISABLE_COPY(VToolPointFromArcAndTangent) diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.h index 3fecca8ba..72253691e 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.h @@ -65,14 +65,14 @@ class VToolPointFromCircleAndTangent : public VToolSinglePoint { Q_OBJECT public: - virtual void setDialog() Q_DECL_OVERRIDE; + virtual void setDialog() override; static VToolPointFromCircleAndTangent *Create(QSharedPointer dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolPointFromCircleAndTangent *Create(VToolPointFromCircleAndTangentInitData &initData); static bool FindPoint(const QPointF &p, const QPointF ¢er, qreal radius, const CrossCirclesPoint crossPoint, QPointF *intersectionPoint); static const QString ToolType; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::PointFromCircleAndTangent) }; QString TangentPointName() const; @@ -84,16 +84,16 @@ public: CrossCirclesPoint GetCrossCirclesPoint() const; void SetCrossCirclesPoint(const CrossCirclesPoint &value); - virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; + virtual void ShowVisualization(bool show) override; protected slots: - virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) Q_DECL_OVERRIDE; + virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) override; protected: - virtual void RemoveReferens() Q_DECL_OVERRIDE; + virtual void RemoveReferens() override; virtual void SaveDialog(QDomElement &domElement, QList &oldDependencies, - QList &newDependencies) Q_DECL_OVERRIDE; - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; - virtual void ReadToolAttributes(const QDomElement &domElement) Q_DECL_OVERRIDE; - virtual void SetVisualization() Q_DECL_OVERRIDE; + QList &newDependencies) override; + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) override; + virtual void ReadToolAttributes(const QDomElement &domElement) override; + virtual void SetVisualization() override; private: Q_DISABLE_COPY(VToolPointFromCircleAndTangent) diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.h index 4f8327798..a3d77f48a 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.h @@ -68,14 +68,14 @@ class VToolPointOfContact : public VToolSinglePoint { Q_OBJECT public: - virtual void setDialog() Q_DECL_OVERRIDE; + virtual void setDialog() override; static bool FindPoint(qreal radius, const QPointF ¢er, const QPointF &firstPoint, const QPointF &secondPoint, QPointF *intersectionPoint); static VToolPointOfContact* Create(QSharedPointer dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolPointOfContact* Create(VToolPointOfContactInitData &initData); static const QString ToolType; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::PointOfContact) }; QString ArcCenterPointName() const; @@ -85,17 +85,17 @@ public: VFormula getArcRadius() const; void setArcRadius(const VFormula &value); - virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; + virtual void ShowVisualization(bool show) override; protected slots: - virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) Q_DECL_OVERRIDE; + virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) override; protected: - virtual void RemoveReferens() Q_DECL_OVERRIDE; + virtual void RemoveReferens() override; virtual void SaveDialog(QDomElement &domElement, QList &oldDependencies, - QList &newDependencies) Q_DECL_OVERRIDE; - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; - virtual void ReadToolAttributes(const QDomElement &domElement) Q_DECL_OVERRIDE; - virtual void SetVisualization() Q_DECL_OVERRIDE; - virtual QString MakeToolTip() const Q_DECL_OVERRIDE; + QList &newDependencies) override; + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) override; + virtual void ReadToolAttributes(const QDomElement &domElement) override; + virtual void SetVisualization() override; + virtual QString MakeToolTip() const override; private: Q_DISABLE_COPY(VToolPointOfContact) diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.h index 39903c1ee..54e9c247f 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.h @@ -62,27 +62,27 @@ class VToolPointOfIntersection : public VToolSinglePoint { Q_OBJECT public: - virtual void setDialog() Q_DECL_OVERRIDE; + virtual void setDialog() override; static VToolPointOfIntersection *Create(QSharedPointer dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolPointOfIntersection *Create(VToolPointOfIntersectionInitData initData); static const QString ToolType; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::PointOfIntersection) }; QString FirstPointName() const; QString SecondPointName() const; - virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; + virtual void ShowVisualization(bool show) override; protected: - virtual void RemoveReferens() Q_DECL_OVERRIDE; + virtual void RemoveReferens() override; virtual void SaveDialog(QDomElement &domElement, QList &oldDependencies, - QList &newDependencies) Q_DECL_OVERRIDE; - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; - virtual void ReadToolAttributes(const QDomElement &domElement) Q_DECL_OVERRIDE; - virtual void SetVisualization() Q_DECL_OVERRIDE; + QList &newDependencies) override; + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) override; + virtual void ReadToolAttributes(const QDomElement &domElement) override; + virtual void SetVisualization() override; private slots: - virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) Q_DECL_OVERRIDE; + virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) override; private: Q_DISABLE_COPY(VToolPointOfIntersection) diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.h index d03193ea7..9e1630c72 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.h @@ -63,14 +63,14 @@ class VToolPointOfIntersectionArcs : public VToolSinglePoint Q_OBJECT public: - virtual void setDialog() Q_DECL_OVERRIDE; + virtual void setDialog() override; static VToolPointOfIntersectionArcs *Create(QSharedPointer dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolPointOfIntersectionArcs *Create(VToolPointOfIntersectionArcsInitData initData); static bool FindPoint(const VArc *arc1, const VArc *arc2, const CrossCirclesPoint pType, QPointF *intersectionPoint); static const QString ToolType; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::PointOfIntersectionArcs) }; QString FirstArcName() const; @@ -79,16 +79,16 @@ public: CrossCirclesPoint GetCrossCirclesPoint() const; void SetCrossCirclesPoint(const CrossCirclesPoint &value); - virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; + virtual void ShowVisualization(bool show) override; protected slots: - virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) Q_DECL_OVERRIDE; + virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) override; protected: - virtual void RemoveReferens() Q_DECL_OVERRIDE; + virtual void RemoveReferens() override; virtual void SaveDialog(QDomElement &domElement, QList &oldDependencies, - QList &newDependencies) Q_DECL_OVERRIDE; - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; - virtual void ReadToolAttributes(const QDomElement &domElement) Q_DECL_OVERRIDE; - virtual void SetVisualization() Q_DECL_OVERRIDE; + QList &newDependencies) override; + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) override; + virtual void ReadToolAttributes(const QDomElement &domElement) override; + virtual void SetVisualization() override; private: Q_DISABLE_COPY(VToolPointOfIntersectionArcs) diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.h index af7369852..c14e8b11e 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.h @@ -67,14 +67,14 @@ class VToolPointOfIntersectionCircles : public VToolSinglePoint { Q_OBJECT public: - virtual void setDialog() Q_DECL_OVERRIDE; + virtual void setDialog() override; static VToolPointOfIntersectionCircles *Create(QSharedPointer dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolPointOfIntersectionCircles *Create(VToolPointOfIntersectionCirclesInitData &initData); static bool FindPoint(const QPointF &c1Point, const QPointF &c2Point, qreal c1Radius, qreal c2Radius, const CrossCirclesPoint crossPoint, QPointF *intersectionPoint); static const QString ToolType; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::PointOfIntersectionCircles) }; QString FirstCircleCenterPointName() const; @@ -89,16 +89,16 @@ public: CrossCirclesPoint GetCrossCirclesPoint() const; void SetCrossCirclesPoint(const CrossCirclesPoint &value); - virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; + virtual void ShowVisualization(bool show) override; protected slots: - virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) Q_DECL_OVERRIDE; + virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) override; protected: - virtual void RemoveReferens() Q_DECL_OVERRIDE; + virtual void RemoveReferens() override; virtual void SaveDialog(QDomElement &domElement, QList &oldDependencies, - QList &newDependencies) Q_DECL_OVERRIDE; - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; - virtual void ReadToolAttributes(const QDomElement &domElement) Q_DECL_OVERRIDE; - virtual void SetVisualization() Q_DECL_OVERRIDE; + QList &newDependencies) override; + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) override; + virtual void ReadToolAttributes(const QDomElement &domElement) override; + virtual void SetVisualization() override; private: Q_DISABLE_COPY(VToolPointOfIntersectionCircles) diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.h index c86c1f2e5..8ed555fea 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.h @@ -65,14 +65,14 @@ class VToolPointOfIntersectionCurves : public VToolSinglePoint { Q_OBJECT public: - virtual void setDialog() Q_DECL_OVERRIDE; + virtual void setDialog() override; static VToolPointOfIntersectionCurves *Create(QSharedPointer dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolPointOfIntersectionCurves *Create(VToolPointOfIntersectionCurvesInitData initData); static bool FindPoint(const QVector &curve1Points, const QVector &curve2Points, VCrossCurvesPoint vCrossPoint, HCrossCurvesPoint hCrossPoint, QPointF *intersectionPoint); static const QString ToolType; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::PointOfIntersectionCurves) }; QString FirstCurveName() const; @@ -84,16 +84,16 @@ public: HCrossCurvesPoint GetHCrossPoint() const; void SetHCrossPoint(const HCrossCurvesPoint &value); - virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; + virtual void ShowVisualization(bool show) override; protected slots: - virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) Q_DECL_OVERRIDE; + virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) override; protected: - virtual void RemoveReferens() Q_DECL_OVERRIDE; + virtual void RemoveReferens() override; virtual void SaveDialog(QDomElement &domElement, QList &oldDependencies, - QList &newDependencies) Q_DECL_OVERRIDE; - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; - virtual void ReadToolAttributes(const QDomElement &domElement) Q_DECL_OVERRIDE; - virtual void SetVisualization() Q_DECL_OVERRIDE; + QList &newDependencies) override; + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) override; + virtual void ReadToolAttributes(const QDomElement &domElement) override; + virtual void SetVisualization() override; private: Q_DISABLE_COPY(VToolPointOfIntersectionCurves) diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h index 51c195fe5..4625c16e4 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h @@ -70,7 +70,7 @@ public: VToolSinglePoint(VAbstractPattern *doc, VContainer *data, quint32 id, QGraphicsItem * parent = nullptr); virtual ~VToolSinglePoint() Q_DECL_EQ_DEFAULT; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::SinglePoint)}; QString name() const; @@ -78,33 +78,33 @@ public: void SetEnabled(bool enabled); - virtual void GroupVisibility(quint32 object, bool visible) Q_DECL_OVERRIDE; - virtual void ChangeLabelPosition(quint32 id, const QPointF &pos) Q_DECL_OVERRIDE; + virtual void GroupVisibility(quint32 object, bool visible) override; + virtual void ChangeLabelPosition(quint32 id, const QPointF &pos) override; - virtual bool IsLabelVisible(quint32 id) const Q_DECL_OVERRIDE; - virtual void SetLabelVisible(quint32 id, bool visible) Q_DECL_OVERRIDE; + virtual bool IsLabelVisible(quint32 id) const override; + virtual void SetLabelVisible(quint32 id, bool visible) override; public slots: void NameChangePosition(const QPointF &pos); - virtual void Disable(bool disable, const QString &namePP) Q_DECL_OVERRIDE; - virtual void EnableToolMove(bool move) Q_DECL_OVERRIDE; + virtual void Disable(bool disable, const QString &namePP) override; + virtual void EnableToolMove(bool move) override; void PointChoosed(); void PointSelected(bool selected); - virtual void FullUpdateFromFile() Q_DECL_OVERRIDE; - virtual void AllowHover(bool enabled) Q_DECL_OVERRIDE; - virtual void AllowSelecting(bool enabled) Q_DECL_OVERRIDE; + virtual void FullUpdateFromFile() override; + virtual void AllowHover(bool enabled) override; + virtual void AllowSelecting(bool enabled) override; void AllowLabelHover(bool enabled); void AllowLabelSelecting(bool enabled); - virtual void ToolSelectionType(const SelectionType &type) Q_DECL_OVERRIDE; + virtual void ToolSelectionType(const SelectionType &type) override; protected: - virtual void UpdateNamePosition(quint32 id, const QPointF &pos) Q_DECL_OVERRIDE; - virtual void mousePressEvent(QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; - virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ) Q_DECL_OVERRIDE; - virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event) Q_DECL_OVERRIDE; - virtual QVariant itemChange ( GraphicsItemChange change, const QVariant &value ) Q_DECL_OVERRIDE; - virtual void keyReleaseEvent(QKeyEvent * event) Q_DECL_OVERRIDE; - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) Q_DECL_OVERRIDE; - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; - virtual void ChangeLabelVisibility(quint32 id, bool visible) Q_DECL_OVERRIDE; + virtual void UpdateNamePosition(quint32 id, const QPointF &pos) override; + virtual void mousePressEvent(QGraphicsSceneMouseEvent *event) override; + virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ) override; + virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; + virtual QVariant itemChange ( GraphicsItemChange change, const QVariant &value ) override; + virtual void keyReleaseEvent(QKeyEvent * event) override; + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) override; + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) override; + virtual void ChangeLabelVisibility(quint32 id, bool visible) override; private: Q_DISABLE_COPY(VToolSinglePoint) }; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.h index 1dafdcfd5..1d6e24048 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.h @@ -68,14 +68,14 @@ class VToolTriangle : public VToolSinglePoint { Q_OBJECT public: - virtual void setDialog() Q_DECL_OVERRIDE; + virtual void setDialog() override; static VToolTriangle *Create(QSharedPointer dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolTriangle *Create(VToolTriangleInitData initData); static bool FindPoint(const QPointF &axisP1, const QPointF &axisP2, const QPointF &firstPoint, const QPointF &secondPoint, QPointF *intersectionPoint); static const QString ToolType; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::Triangle)}; QString AxisP1Name() const; @@ -95,16 +95,16 @@ public: quint32 GetSecondPointId() const; void SetSecondPointId(const quint32 &value); - virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; + virtual void ShowVisualization(bool show) override; protected: - virtual void RemoveReferens() Q_DECL_OVERRIDE; + virtual void RemoveReferens() override; virtual void SaveDialog(QDomElement &domElement, QList &oldDependencies, - QList &newDependencies) Q_DECL_OVERRIDE; - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; - virtual void ReadToolAttributes(const QDomElement &domElement) Q_DECL_OVERRIDE; - virtual void SetVisualization() Q_DECL_OVERRIDE; + QList &newDependencies) override; + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) override; + virtual void ReadToolAttributes(const QDomElement &domElement) override; + virtual void SetVisualization() override; private slots: - virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) Q_DECL_OVERRIDE; + virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) override; private: Q_DISABLE_COPY(VToolTriangle) /** @brief axisP1Id id first axis point. */ diff --git a/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.h b/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.h index 78a1a9ea9..24698e1c0 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.h @@ -56,13 +56,13 @@ public: VAbstractPoint(VAbstractPattern *doc, VContainer *data, quint32 id); virtual ~VAbstractPoint() Q_DECL_EQ_DEFAULT; - virtual QString getTagName() const Q_DECL_OVERRIDE; + virtual QString getTagName() const override; template void ShowToolVisualization(bool show); public slots: - virtual void ShowTool(quint32 id, bool enable) Q_DECL_OVERRIDE; + virtual void ShowTool(quint32 id, bool enable) override; void DeleteFromLabel(); protected: diff --git a/src/libs/vtools/tools/drawTools/vdrawtool.h b/src/libs/vtools/tools/drawTools/vdrawtool.h index 79da4bf2e..21f9d1012 100644 --- a/src/libs/vtools/tools/drawTools/vdrawtool.h +++ b/src/libs/vtools/tools/drawTools/vdrawtool.h @@ -102,8 +102,8 @@ protected: /** @brief SaveDialog save options into file after change in dialog. */ virtual void SaveDialog(QDomElement &domElement, QList &oldDependencies, QList &newDependencies)=0; - virtual void SaveDialogChange(const QString &undoText = QString()) Q_DECL_FINAL; - virtual void AddToFile() Q_DECL_OVERRIDE; + virtual void SaveDialogChange(const QString &undoText = QString()) final; + virtual void AddToFile() override; void SaveOption(QSharedPointer &obj); virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj); virtual QString MakeToolTip() const; diff --git a/src/libs/vtools/tools/drawTools/vtoolline.h b/src/libs/vtools/tools/drawTools/vtoolline.h index 9a712157a..eb270e21f 100644 --- a/src/libs/vtools/tools/drawTools/vtoolline.h +++ b/src/libs/vtools/tools/drawTools/vtoolline.h @@ -67,17 +67,17 @@ class VToolLine: public VDrawTool, public VScaledLine { Q_OBJECT public: - virtual void setDialog() Q_DECL_OVERRIDE; + virtual void setDialog() override; static VToolLine *Create(QSharedPointer dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolLine *Create(VToolLineInitData initData); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::Line)}; - virtual QString getTagName() const Q_DECL_OVERRIDE; + virtual QString getTagName() const override; virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = nullptr) Q_DECL_OVERRIDE; + QWidget *widget = nullptr) override; QString FirstPointName() const; QString SecondPointName() const; @@ -85,32 +85,32 @@ public: QString GetLineColor() const; void SetLineColor(const QString &value); - virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; + virtual void ShowVisualization(bool show) override; - virtual void SetTypeLine(const QString &value) Q_DECL_OVERRIDE; - virtual void GroupVisibility(quint32 object, bool visible) Q_DECL_OVERRIDE; + virtual void SetTypeLine(const QString &value) override; + virtual void GroupVisibility(quint32 object, bool visible) override; public slots: - virtual void FullUpdateFromFile() Q_DECL_OVERRIDE; - virtual void ShowTool(quint32 id, bool enable) Q_DECL_OVERRIDE; - virtual void Disable(bool disable, const QString &namePP) Q_DECL_OVERRIDE; - virtual void AllowHover(bool enabled) Q_DECL_OVERRIDE; - virtual void AllowSelecting(bool enabled) Q_DECL_OVERRIDE; + virtual void FullUpdateFromFile() override; + virtual void ShowTool(quint32 id, bool enable) override; + virtual void Disable(bool disable, const QString &namePP) override; + virtual void AllowHover(bool enabled) override; + virtual void AllowSelecting(bool enabled) override; protected slots: - virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) Q_DECL_OVERRIDE; + virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) override; protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) Q_DECL_OVERRIDE; - virtual void AddToFile() Q_DECL_OVERRIDE; - virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent * event ) Q_DECL_OVERRIDE; - virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ) Q_DECL_OVERRIDE; - virtual void RemoveReferens() Q_DECL_OVERRIDE; - virtual QVariant itemChange ( GraphicsItemChange change, const QVariant &value ) Q_DECL_OVERRIDE; - virtual void keyReleaseEvent(QKeyEvent * event) Q_DECL_OVERRIDE; + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) override; + virtual void AddToFile() override; + virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent * event ) override; + virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ) override; + virtual void RemoveReferens() override; + virtual QVariant itemChange ( GraphicsItemChange change, const QVariant &value ) override; + virtual void keyReleaseEvent(QKeyEvent * event) override; virtual void SaveDialog(QDomElement &domElement, QList &oldDependencies, - QList &newDependencies) Q_DECL_OVERRIDE; - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; - virtual void ReadToolAttributes(const QDomElement &domElement) Q_DECL_OVERRIDE; - virtual void SetVisualization() Q_DECL_OVERRIDE; - virtual QString MakeToolTip() const Q_DECL_OVERRIDE; + QList &newDependencies) override; + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) override; + virtual void ReadToolAttributes(const QDomElement &domElement) override; + virtual void SetVisualization() override; + virtual QString MakeToolTip() const override; private: Q_DISABLE_COPY(VToolLine) diff --git a/src/libs/vtools/tools/nodeDetails/vabstractnode.h b/src/libs/vtools/tools/nodeDetails/vabstractnode.h index 2094291bd..d038a47bc 100644 --- a/src/libs/vtools/tools/nodeDetails/vabstractnode.h +++ b/src/libs/vtools/tools/nodeDetails/vabstractnode.h @@ -66,16 +66,16 @@ public: const QString &drawName = QString(), const quint32 &idTool = 0, QObject *parent = nullptr); virtual ~VAbstractNode() Q_DECL_EQ_DEFAULT; static const QString AttrIdTool; - virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; - virtual void incrementReferens() Q_DECL_OVERRIDE; - virtual void decrementReferens() Q_DECL_OVERRIDE; + virtual void ShowVisualization(bool show) override; + virtual void incrementReferens() override; + virtual void decrementReferens() override; ParentType GetParentType() const; void SetParentType(const ParentType &value); quint32 GetIdTool() const; - virtual void GroupVisibility(quint32 object, bool visible) Q_DECL_OVERRIDE; + virtual void GroupVisibility(quint32 object, bool visible) override; bool IsExluded() const; void SetExluded(bool exluded); @@ -94,8 +94,8 @@ protected: bool m_exluded; void AddToModeling(const QDomElement &domElement); - virtual void ToolCreation(const Source &typeCreation) Q_DECL_OVERRIDE; - virtual void SetVisualization() Q_DECL_OVERRIDE {} + virtual void ToolCreation(const Source &typeCreation) override; + virtual void SetVisualization() override {} virtual void ShowNode()=0; virtual void HideNode()=0; diff --git a/src/libs/vtools/tools/nodeDetails/vnodearc.h b/src/libs/vtools/tools/nodeDetails/vnodearc.h index b12f7c9ef..2a8bfbc22 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodearc.h +++ b/src/libs/vtools/tools/nodeDetails/vnodearc.h @@ -50,15 +50,15 @@ public: static void Create(const VAbstractNodeInitData &initData); static const QString ToolType; - virtual QString getTagName() const Q_DECL_OVERRIDE; + virtual QString getTagName() const override; public slots: - virtual void FullUpdateFromFile() Q_DECL_OVERRIDE {} - virtual void AllowHover(bool enabled) Q_DECL_OVERRIDE; - virtual void AllowSelecting(bool enabled) Q_DECL_OVERRIDE; + virtual void FullUpdateFromFile() override {} + virtual void AllowHover(bool enabled) override; + virtual void AllowSelecting(bool enabled) override; protected: - virtual void AddToFile() Q_DECL_OVERRIDE; - virtual void ShowNode() Q_DECL_OVERRIDE {} - virtual void HideNode() Q_DECL_OVERRIDE {} + virtual void AddToFile() override; + virtual void ShowNode() override {} + virtual void HideNode() override {} private: Q_DISABLE_COPY(VNodeArc) diff --git a/src/libs/vtools/tools/nodeDetails/vnodeellipticalarc.h b/src/libs/vtools/tools/nodeDetails/vnodeellipticalarc.h index 31af86c22..2f5da098b 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodeellipticalarc.h +++ b/src/libs/vtools/tools/nodeDetails/vnodeellipticalarc.h @@ -47,15 +47,15 @@ public: static void Create(const VAbstractNodeInitData &initData); static const QString ToolType; - virtual QString getTagName() const Q_DECL_OVERRIDE; + virtual QString getTagName() const override; public slots: - virtual void FullUpdateFromFile() Q_DECL_OVERRIDE {} - virtual void AllowHover(bool enabled) Q_DECL_OVERRIDE; - virtual void AllowSelecting(bool enabled) Q_DECL_OVERRIDE; + virtual void FullUpdateFromFile() override {} + virtual void AllowHover(bool enabled) override; + virtual void AllowSelecting(bool enabled) override; protected: - virtual void AddToFile() Q_DECL_OVERRIDE; - virtual void ShowNode() Q_DECL_OVERRIDE {} - virtual void HideNode() Q_DECL_OVERRIDE {} + virtual void AddToFile() override; + virtual void ShowNode() override {} + virtual void HideNode() override {} private: Q_DISABLE_COPY(VNodeEllipticalArc) diff --git a/src/libs/vtools/tools/nodeDetails/vnodepoint.h b/src/libs/vtools/tools/nodeDetails/vnodepoint.h index cec98866b..4b1395917 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodepoint.h +++ b/src/libs/vtools/tools/nodeDetails/vnodepoint.h @@ -53,12 +53,12 @@ public: static void Create(const VAbstractNodeInitData &initData); static const QString ToolType; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::NodePoint)}; - virtual QString getTagName() const Q_DECL_OVERRIDE; + virtual QString getTagName() const override; - virtual void ChangeLabelPosition(quint32 id, const QPointF &pos) Q_DECL_OVERRIDE; - virtual void SetLabelVisible(quint32 id, bool visible) Q_DECL_OVERRIDE; + virtual void ChangeLabelPosition(quint32 id, const QPointF &pos) override; + virtual void SetLabelVisible(quint32 id, bool visible) override; signals: void ShowOptions(); void ToggleInLayout(bool checked); @@ -67,21 +67,21 @@ signals: void Delete(); void ToggleExcludeState(quint32 id); public slots: - virtual void FullUpdateFromFile() Q_DECL_OVERRIDE; + virtual void FullUpdateFromFile() override; void NameChangePosition(const QPointF &pos); void PointChoosed(); void EnableToolMove(bool move); - virtual void AllowHover(bool enabled) Q_DECL_OVERRIDE; - virtual void AllowSelecting(bool enabled) Q_DECL_OVERRIDE; + virtual void AllowHover(bool enabled) override; + virtual void AllowSelecting(bool enabled) override; void AllowLabelHover(bool enabled); void AllowLabelSelecting(bool enabled); protected: - virtual void AddToFile() Q_DECL_OVERRIDE; - virtual void mousePressEvent(QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; - virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ) Q_DECL_OVERRIDE; - virtual void ShowNode() Q_DECL_OVERRIDE; - virtual void HideNode() Q_DECL_OVERRIDE; - virtual void contextMenuEvent(QGraphicsSceneContextMenuEvent *event) Q_DECL_OVERRIDE; + virtual void AddToFile() override; + virtual void mousePressEvent(QGraphicsSceneMouseEvent *event) override; + virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ) override; + virtual void ShowNode() override; + virtual void HideNode() override; + virtual void contextMenuEvent(QGraphicsSceneContextMenuEvent *event) override; private: Q_DISABLE_COPY(VNodePoint) diff --git a/src/libs/vtools/tools/nodeDetails/vnodespline.h b/src/libs/vtools/tools/nodeDetails/vnodespline.h index e7336936a..7992247bc 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodespline.h +++ b/src/libs/vtools/tools/nodeDetails/vnodespline.h @@ -50,15 +50,15 @@ public: static VNodeSpline *Create(const VAbstractNodeInitData &initData); static const QString ToolType; - virtual QString getTagName() const Q_DECL_OVERRIDE; + virtual QString getTagName() const override; public slots: - virtual void FullUpdateFromFile () Q_DECL_OVERRIDE {} - virtual void AllowHover(bool enabled) Q_DECL_OVERRIDE; - virtual void AllowSelecting(bool enabled) Q_DECL_OVERRIDE; + virtual void FullUpdateFromFile () override {} + virtual void AllowHover(bool enabled) override; + virtual void AllowSelecting(bool enabled) override; protected: - virtual void AddToFile () Q_DECL_OVERRIDE; - virtual void ShowNode() Q_DECL_OVERRIDE {} - virtual void HideNode() Q_DECL_OVERRIDE {} + virtual void AddToFile () override; + virtual void ShowNode() override {} + virtual void HideNode() override {} private: Q_DISABLE_COPY(VNodeSpline) diff --git a/src/libs/vtools/tools/nodeDetails/vnodesplinepath.h b/src/libs/vtools/tools/nodeDetails/vnodesplinepath.h index 5b71f26fb..e78b95854 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodesplinepath.h +++ b/src/libs/vtools/tools/nodeDetails/vnodesplinepath.h @@ -50,15 +50,15 @@ public: static void Create(const VAbstractNodeInitData &initData); static const QString ToolType; - virtual QString getTagName() const Q_DECL_OVERRIDE; + virtual QString getTagName() const override; public slots: - virtual void FullUpdateFromFile() Q_DECL_OVERRIDE {} - virtual void AllowHover(bool enabled) Q_DECL_OVERRIDE; - virtual void AllowSelecting(bool enabled) Q_DECL_OVERRIDE; + virtual void FullUpdateFromFile() override {} + virtual void AllowHover(bool enabled) override; + virtual void AllowSelecting(bool enabled) override; protected: - virtual void AddToFile() Q_DECL_OVERRIDE; - virtual void ShowNode() Q_DECL_OVERRIDE {} - virtual void HideNode() Q_DECL_OVERRIDE {} + virtual void AddToFile() override; + virtual void ShowNode() override {} + virtual void HideNode() override {} private: Q_DISABLE_COPY(VNodeSplinePath) diff --git a/src/libs/vtools/tools/nodeDetails/vtoolpiecepath.h b/src/libs/vtools/tools/nodeDetails/vtoolpiecepath.h index 138256aa5..a1e863eeb 100644 --- a/src/libs/vtools/tools/nodeDetails/vtoolpiecepath.h +++ b/src/libs/vtools/tools/nodeDetails/vtoolpiecepath.h @@ -53,28 +53,28 @@ public: VContainer *data); static VToolPiecePath *Create(VToolPiecePathInitData initData); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::PiecePath)}; - virtual QString getTagName() const Q_DECL_OVERRIDE; + virtual QString getTagName() const override; virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = nullptr) Q_DECL_OVERRIDE; + QWidget *widget = nullptr) override; - virtual void incrementReferens() Q_DECL_OVERRIDE; - virtual void decrementReferens() Q_DECL_OVERRIDE; + virtual void incrementReferens() override; + virtual void decrementReferens() override; void RefreshGeometry(); static void AddAttributes(VAbstractPattern *doc, QDomElement &domElement, quint32 id, const VPiecePath &path); public slots: - virtual void FullUpdateFromFile () Q_DECL_OVERRIDE; - virtual void AllowHover(bool enabled) Q_DECL_OVERRIDE; - virtual void AllowSelecting(bool enabled) Q_DECL_OVERRIDE; + virtual void FullUpdateFromFile () override; + virtual void AllowHover(bool enabled) override; + virtual void AllowSelecting(bool enabled) override; protected: - virtual void AddToFile() Q_DECL_OVERRIDE; - virtual void ShowNode() Q_DECL_OVERRIDE; - virtual void HideNode() Q_DECL_OVERRIDE; - virtual void ToolCreation(const Source &typeCreation) Q_DECL_OVERRIDE; + virtual void AddToFile() override; + virtual void ShowNode() override; + virtual void HideNode() override; + virtual void ToolCreation(const Source &typeCreation) override; private: Q_DISABLE_COPY(VToolPiecePath) diff --git a/src/libs/vtools/tools/nodeDetails/vtoolpin.h b/src/libs/vtools/tools/nodeDetails/vtoolpin.h index d3eb93177..1a3ec3d77 100644 --- a/src/libs/vtools/tools/nodeDetails/vtoolpin.h +++ b/src/libs/vtools/tools/nodeDetails/vtoolpin.h @@ -53,15 +53,15 @@ public: static VToolPin *Create(VToolPinInitData initData); static const QString ToolType; - virtual QString getTagName() const Q_DECL_OVERRIDE; + virtual QString getTagName() const override; public slots: - virtual void FullUpdateFromFile () Q_DECL_OVERRIDE {} - virtual void AllowHover(bool enabled) Q_DECL_OVERRIDE; - virtual void AllowSelecting(bool enabled) Q_DECL_OVERRIDE; + virtual void FullUpdateFromFile () override {} + virtual void AllowHover(bool enabled) override; + virtual void AllowSelecting(bool enabled) override; protected: - virtual void AddToFile() Q_DECL_OVERRIDE; - virtual void ShowNode() Q_DECL_OVERRIDE {} - virtual void HideNode() Q_DECL_OVERRIDE {} + virtual void AddToFile() override; + virtual void ShowNode() override {} + virtual void HideNode() override {} private: Q_DISABLE_COPY(VToolPin) diff --git a/src/libs/vtools/tools/nodeDetails/vtoolplacelabel.h b/src/libs/vtools/tools/nodeDetails/vtoolplacelabel.h index 5e6e474f7..16c2acc1e 100644 --- a/src/libs/vtools/tools/nodeDetails/vtoolplacelabel.h +++ b/src/libs/vtools/tools/nodeDetails/vtoolplacelabel.h @@ -61,17 +61,17 @@ public: static VToolPlaceLabel* Create(VToolPlaceLabelInitData &initData); static const QString ToolType; - virtual QString getTagName() const Q_DECL_OVERRIDE; + virtual QString getTagName() const override; static void AddAttributes(VAbstractPattern *doc, QDomElement &domElement, quint32 id, const VPlaceLabelItem &label); public slots: - virtual void FullUpdateFromFile () Q_DECL_OVERRIDE {} - virtual void AllowHover(bool enabled) Q_DECL_OVERRIDE; - virtual void AllowSelecting(bool enabled) Q_DECL_OVERRIDE; + virtual void FullUpdateFromFile () override {} + virtual void AllowHover(bool enabled) override; + virtual void AllowSelecting(bool enabled) override; protected: - virtual void AddToFile() Q_DECL_OVERRIDE; - virtual void ShowNode() Q_DECL_OVERRIDE {} - virtual void HideNode() Q_DECL_OVERRIDE {} + virtual void AddToFile() override; + virtual void ShowNode() override {} + virtual void HideNode() override {} private: Q_DISABLE_COPY(VToolPlaceLabel) diff --git a/src/libs/vtools/tools/vabstracttool.h b/src/libs/vtools/tools/vabstracttool.h index 541175384..76c11c685 100644 --- a/src/libs/vtools/tools/vabstracttool.h +++ b/src/libs/vtools/tools/vabstracttool.h @@ -86,7 +86,7 @@ class VAbstractTool: public VDataTool Q_OBJECT public: VAbstractTool(VAbstractPattern *doc, VContainer *data, quint32 id, QObject *parent = nullptr); - virtual ~VAbstractTool() Q_DECL_OVERRIDE; + virtual ~VAbstractTool() override; quint32 getId() const; static bool m_suppressContextMenu; diff --git a/src/libs/vtools/tools/vtoolseamallowance.h b/src/libs/vtools/tools/vtoolseamallowance.h index 969b19c36..417ee81c0 100644 --- a/src/libs/vtools/tools/vtoolseamallowance.h +++ b/src/libs/vtools/tools/vtoolseamallowance.h @@ -110,22 +110,22 @@ public: void ReinitInternals(const VPiece &detail, VMainGraphicsScene *scene); void RefreshGeometry(bool updateChildren = true); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::Piece)}; - virtual QString getTagName() const Q_DECL_OVERRIDE; - virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; - virtual void GroupVisibility(quint32 object, bool visible) Q_DECL_OVERRIDE; + virtual QString getTagName() const override; + virtual void ShowVisualization(bool show) override; + virtual void GroupVisibility(quint32 object, bool visible) override; virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget) Q_DECL_OVERRIDE; - virtual QRectF boundingRect() const Q_DECL_OVERRIDE; - virtual QPainterPath shape() const Q_DECL_OVERRIDE; + QWidget *widget) override; + virtual QRectF boundingRect() const override; + virtual QPainterPath shape() const override; public slots: - virtual void FullUpdateFromGuiApply() Q_DECL_OVERRIDE; - virtual void FullUpdateFromFile () Q_DECL_OVERRIDE; + virtual void FullUpdateFromGuiApply() override; + virtual void FullUpdateFromFile () override; void EnableToolMove(bool move); - virtual void AllowHover(bool enabled) Q_DECL_OVERRIDE; - virtual void AllowSelecting(bool enabled) Q_DECL_OVERRIDE; + virtual void AllowHover(bool enabled) override; + virtual void AllowSelecting(bool enabled) override; virtual void ResetChildren(QGraphicsItem* pItem); virtual void UpdateAll(); virtual void retranslateUi(); @@ -144,20 +144,20 @@ protected slots: void SaveResizeGrainline(qreal dLength); void SaveRotateGrainline(qreal dRot, const QPointF& ptPos); protected: - virtual void AddToFile () Q_DECL_OVERRIDE; - virtual void RefreshDataInFile() Q_DECL_OVERRIDE; - virtual QVariant itemChange ( GraphicsItemChange change, const QVariant &value ) Q_DECL_OVERRIDE; - virtual void mousePressEvent( QGraphicsSceneMouseEvent * event) Q_DECL_OVERRIDE; - virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ) Q_DECL_OVERRIDE; - virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent * event ) Q_DECL_OVERRIDE; - virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ) Q_DECL_OVERRIDE; - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) Q_DECL_OVERRIDE; - virtual void keyReleaseEvent(QKeyEvent * event) Q_DECL_OVERRIDE; - virtual void SetVisualization() Q_DECL_OVERRIDE {} - virtual void DeleteToolWithConfirm(bool ask = true) Q_DECL_OVERRIDE; - virtual void ToolCreation(const Source &typeCreation) Q_DECL_OVERRIDE; - virtual void SetDialog() Q_DECL_FINAL; - virtual void SaveDialogChange(const QString &undoText = QString()) Q_DECL_FINAL; + virtual void AddToFile () override; + virtual void RefreshDataInFile() override; + virtual QVariant itemChange ( GraphicsItemChange change, const QVariant &value ) override; + virtual void mousePressEvent( QGraphicsSceneMouseEvent * event) override; + virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ) override; + virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent * event ) override; + virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ) override; + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) override; + virtual void keyReleaseEvent(QKeyEvent * event) override; + virtual void SetVisualization() override {} + virtual void DeleteToolWithConfirm(bool ask = true) override; + virtual void ToolCreation(const Source &typeCreation) override; + virtual void SetDialog() final; + virtual void SaveDialogChange(const QString &undoText = QString()) final; private slots: void ShowOptions(); diff --git a/src/libs/vtools/tools/vtooluniondetails.h b/src/libs/vtools/tools/vtooluniondetails.h index 63c1e9bf3..3415a0c10 100644 --- a/src/libs/vtools/tools/vtooluniondetails.h +++ b/src/libs/vtools/tools/vtooluniondetails.h @@ -94,11 +94,11 @@ public: static const quint8 unionVersion; - virtual QString getTagName() const Q_DECL_OVERRIDE; - virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; - virtual void incrementReferens() Q_DECL_OVERRIDE; - virtual void decrementReferens() Q_DECL_OVERRIDE; - virtual void GroupVisibility(quint32 object, bool visible) Q_DECL_OVERRIDE; + virtual QString getTagName() const override; + virtual void ShowVisualization(bool show) override; + virtual void incrementReferens() override; + virtual void decrementReferens() override; + virtual void GroupVisibility(quint32 object, bool visible) override; static QVector > CalcUnitedPath(const VPiecePath &d1Path, const VPiecePath &d2Path, quint32 indexD2, quint32 pRotate); @@ -106,12 +106,12 @@ public slots: /** * @brief FullUpdateFromFile update tool data form file. */ - virtual void FullUpdateFromFile () Q_DECL_OVERRIDE {} - virtual void AllowHover(bool) Q_DECL_OVERRIDE {} - virtual void AllowSelecting(bool) Q_DECL_OVERRIDE {} + virtual void FullUpdateFromFile () override {} + virtual void AllowHover(bool) override {} + virtual void AllowSelecting(bool) override {} protected: - virtual void AddToFile() Q_DECL_OVERRIDE; - virtual void SetVisualization() Q_DECL_OVERRIDE {} + virtual void AddToFile() override; + virtual void SetVisualization() override {} private: Q_DISABLE_COPY(VToolUnionDetails) /** @brief d1 first detail id. */ diff --git a/src/libs/vtools/undocommands/addgroup.h b/src/libs/vtools/undocommands/addgroup.h index 9688602eb..b1b123e73 100644 --- a/src/libs/vtools/undocommands/addgroup.h +++ b/src/libs/vtools/undocommands/addgroup.h @@ -44,8 +44,8 @@ class AddGroup : public VUndoCommand public: AddGroup(const QDomElement &xml, VAbstractPattern *doc, QUndoCommand *parent = nullptr); virtual ~AddGroup(); - virtual void undo() Q_DECL_OVERRIDE; - virtual void redo() Q_DECL_OVERRIDE; + virtual void undo() override; + virtual void redo() override; signals: void UpdateGroups(); private: diff --git a/src/libs/vtools/undocommands/additemtogroup.h b/src/libs/vtools/undocommands/additemtogroup.h index 508898868..7b9427a8b 100644 --- a/src/libs/vtools/undocommands/additemtogroup.h +++ b/src/libs/vtools/undocommands/additemtogroup.h @@ -44,8 +44,8 @@ class AddItemToGroup : public VUndoCommand public: AddItemToGroup(const QDomElement &xml, VAbstractPattern *doc, quint32 groupId, QUndoCommand *parent = nullptr); virtual ~AddItemToGroup()=default; - virtual void undo() Q_DECL_OVERRIDE; - virtual void redo() Q_DECL_OVERRIDE; + virtual void undo() override; + virtual void redo() override; signals: void UpdateGroups(); protected: diff --git a/src/libs/vtools/undocommands/addpatternpiece.h b/src/libs/vtools/undocommands/addpatternpiece.h index 7e35f05e3..0879bf375 100644 --- a/src/libs/vtools/undocommands/addpatternpiece.h +++ b/src/libs/vtools/undocommands/addpatternpiece.h @@ -44,9 +44,9 @@ class AddPatternPiece : public VUndoCommand public: AddPatternPiece(const QDomElement &xml, VAbstractPattern *doc, const QString &namePP, QUndoCommand *parent = nullptr); - virtual ~AddPatternPiece() Q_DECL_OVERRIDE; - virtual void undo() Q_DECL_OVERRIDE; - virtual void redo() Q_DECL_OVERRIDE; + virtual ~AddPatternPiece() override; + virtual void undo() override; + virtual void redo() override; private: Q_DISABLE_COPY(AddPatternPiece) QString namePP; diff --git a/src/libs/vtools/undocommands/addpiece.h b/src/libs/vtools/undocommands/addpiece.h index 9a1bf68b5..16d8ab4de 100644 --- a/src/libs/vtools/undocommands/addpiece.h +++ b/src/libs/vtools/undocommands/addpiece.h @@ -49,9 +49,9 @@ public: virtual ~AddPiece(); // cppcheck-suppress unusedFunction - virtual void undo() Q_DECL_OVERRIDE; + virtual void undo() override; // cppcheck-suppress unusedFunction - virtual void redo() Q_DECL_OVERRIDE; + virtual void redo() override; private: Q_DISABLE_COPY(AddPiece) diff --git a/src/libs/vtools/undocommands/addtocalc.h b/src/libs/vtools/undocommands/addtocalc.h index 9509e4f75..6bd33b3b1 100644 --- a/src/libs/vtools/undocommands/addtocalc.h +++ b/src/libs/vtools/undocommands/addtocalc.h @@ -44,10 +44,10 @@ class AddToCalc : public VUndoCommand public: AddToCalc(const QDomElement &xml, VAbstractPattern *doc, QUndoCommand *parent = nullptr); virtual ~AddToCalc() =default; - virtual void undo() Q_DECL_OVERRIDE; - virtual void redo() Q_DECL_OVERRIDE; + virtual void undo() override; + virtual void redo() override; protected: - virtual void RedoFullParsing() Q_DECL_OVERRIDE; + virtual void RedoFullParsing() override; private: Q_DISABLE_COPY(AddToCalc) const QString nameActivDraw; diff --git a/src/libs/vtools/undocommands/deletepatternpiece.h b/src/libs/vtools/undocommands/deletepatternpiece.h index 91d9add58..4dede2f8a 100644 --- a/src/libs/vtools/undocommands/deletepatternpiece.h +++ b/src/libs/vtools/undocommands/deletepatternpiece.h @@ -43,9 +43,9 @@ class DeletePatternPiece : public VUndoCommand Q_OBJECT public: DeletePatternPiece(VAbstractPattern *doc, const QString &namePP, QUndoCommand *parent = nullptr); - virtual ~DeletePatternPiece() Q_DECL_OVERRIDE; - virtual void undo() Q_DECL_OVERRIDE; - virtual void redo() Q_DECL_OVERRIDE; + virtual ~DeletePatternPiece() override; + virtual void undo() override; + virtual void redo() override; private: Q_DISABLE_COPY(DeletePatternPiece) QString namePP; diff --git a/src/libs/vtools/undocommands/deletepiece.h b/src/libs/vtools/undocommands/deletepiece.h index 02b70af05..e10907958 100644 --- a/src/libs/vtools/undocommands/deletepiece.h +++ b/src/libs/vtools/undocommands/deletepiece.h @@ -43,8 +43,8 @@ public: QUndoCommand *parent = nullptr); virtual ~DeletePiece(); - virtual void undo() Q_DECL_OVERRIDE; - virtual void redo() Q_DECL_OVERRIDE; + virtual void undo() override; + virtual void redo() override; private: Q_DISABLE_COPY(DeletePiece) diff --git a/src/libs/vtools/undocommands/delgroup.h b/src/libs/vtools/undocommands/delgroup.h index a32b9e3db..4f2d108ae 100644 --- a/src/libs/vtools/undocommands/delgroup.h +++ b/src/libs/vtools/undocommands/delgroup.h @@ -43,8 +43,8 @@ class DelGroup : public VUndoCommand public: DelGroup(VAbstractPattern *doc, quint32 id, QUndoCommand *parent = nullptr); virtual ~DelGroup(); - virtual void undo() Q_DECL_OVERRIDE; - virtual void redo() Q_DECL_OVERRIDE; + virtual void undo() override; + virtual void redo() override; signals: void UpdateGroups(); private: diff --git a/src/libs/vtools/undocommands/deltool.h b/src/libs/vtools/undocommands/deltool.h index 3f240939e..ace8254ec 100644 --- a/src/libs/vtools/undocommands/deltool.h +++ b/src/libs/vtools/undocommands/deltool.h @@ -43,9 +43,9 @@ class DelTool : public VUndoCommand Q_OBJECT public: DelTool(VAbstractPattern *doc, quint32 id, QUndoCommand *parent = nullptr); - virtual ~DelTool() Q_DECL_OVERRIDE; - virtual void undo() Q_DECL_OVERRIDE; - virtual void redo() Q_DECL_OVERRIDE; + virtual ~DelTool() override; + virtual void undo() override; + virtual void redo() override; private: Q_DISABLE_COPY(DelTool) QDomNode parentNode; diff --git a/src/libs/vtools/undocommands/label/moveabstractlabel.h b/src/libs/vtools/undocommands/label/moveabstractlabel.h index e777f6b14..5b4928904 100644 --- a/src/libs/vtools/undocommands/label/moveabstractlabel.h +++ b/src/libs/vtools/undocommands/label/moveabstractlabel.h @@ -45,8 +45,8 @@ public: MoveAbstractLabel(VAbstractPattern *doc, quint32 pointId, const QPointF &pos, QUndoCommand *parent = nullptr); virtual ~MoveAbstractLabel()=default; - virtual void undo() Q_DECL_OVERRIDE; - virtual void redo() Q_DECL_OVERRIDE; + virtual void undo() override; + virtual void redo() override; quint32 GetPointId() const; QPointF GetNewPos() const; diff --git a/src/libs/vtools/undocommands/label/movedoublelabel.h b/src/libs/vtools/undocommands/label/movedoublelabel.h index 245a71c81..a71ae09d9 100644 --- a/src/libs/vtools/undocommands/label/movedoublelabel.h +++ b/src/libs/vtools/undocommands/label/movedoublelabel.h @@ -46,13 +46,13 @@ public: quint32 toolId, quint32 pointId, QUndoCommand *parent = nullptr); virtual ~MoveDoubleLabel()=default; - virtual bool mergeWith(const QUndoCommand *command) Q_DECL_OVERRIDE; - virtual int id() const Q_DECL_OVERRIDE; + virtual bool mergeWith(const QUndoCommand *command) override; + virtual int id() const override; quint32 GetToolId() const; MoveDoublePoint GetPointType() const; protected: - virtual void Do(const QPointF &pos) Q_DECL_OVERRIDE; + virtual void Do(const QPointF &pos) override; private: Q_DISABLE_COPY(MoveDoubleLabel) MoveDoublePoint m_type; diff --git a/src/libs/vtools/undocommands/label/movelabel.h b/src/libs/vtools/undocommands/label/movelabel.h index 659db7c9a..02dcaa5c8 100644 --- a/src/libs/vtools/undocommands/label/movelabel.h +++ b/src/libs/vtools/undocommands/label/movelabel.h @@ -43,10 +43,10 @@ public: MoveLabel(VAbstractPattern *doc, const QPointF &pos, const quint32 &id, QUndoCommand *parent = nullptr); virtual ~MoveLabel()=default; - virtual bool mergeWith(const QUndoCommand *command) Q_DECL_OVERRIDE; - virtual int id() const Q_DECL_OVERRIDE; + virtual bool mergeWith(const QUndoCommand *command) override; + virtual int id() const override; protected: - virtual void Do(const QPointF &pos) Q_DECL_OVERRIDE; + virtual void Do(const QPointF &pos) override; private: Q_DISABLE_COPY(MoveLabel) //Need for resizing scene rect diff --git a/src/libs/vtools/undocommands/label/operationmovelabel.h b/src/libs/vtools/undocommands/label/operationmovelabel.h index 6f4ff1b4e..790319626 100644 --- a/src/libs/vtools/undocommands/label/operationmovelabel.h +++ b/src/libs/vtools/undocommands/label/operationmovelabel.h @@ -45,12 +45,12 @@ public: QUndoCommand *parent = nullptr); virtual ~OperationMoveLabel()=default; - virtual bool mergeWith(const QUndoCommand *command) Q_DECL_OVERRIDE; - virtual int id() const Q_DECL_OVERRIDE; + virtual bool mergeWith(const QUndoCommand *command) override; + virtual int id() const override; quint32 GetToolId() const; protected: - virtual void Do(const QPointF &pos) Q_DECL_OVERRIDE; + virtual void Do(const QPointF &pos) override; private: Q_DISABLE_COPY(OperationMoveLabel) quint32 m_idTool; diff --git a/src/libs/vtools/undocommands/label/operationshowlabel.h b/src/libs/vtools/undocommands/label/operationshowlabel.h index 7ecb8eb85..c0412a115 100644 --- a/src/libs/vtools/undocommands/label/operationshowlabel.h +++ b/src/libs/vtools/undocommands/label/operationshowlabel.h @@ -40,8 +40,8 @@ public: QUndoCommand *parent = nullptr); virtual ~OperationShowLabel()=default; - virtual void undo() Q_DECL_OVERRIDE; - virtual void redo() Q_DECL_OVERRIDE; + virtual void undo() override; + virtual void redo() override; private: Q_DISABLE_COPY(OperationShowLabel) diff --git a/src/libs/vtools/undocommands/label/showdoublelabel.h b/src/libs/vtools/undocommands/label/showdoublelabel.h index f7abbb596..c21788d06 100644 --- a/src/libs/vtools/undocommands/label/showdoublelabel.h +++ b/src/libs/vtools/undocommands/label/showdoublelabel.h @@ -42,8 +42,8 @@ public: QUndoCommand *parent = nullptr); virtual ~ShowDoubleLabel()=default; - virtual void undo() Q_DECL_OVERRIDE; - virtual void redo() Q_DECL_OVERRIDE; + virtual void undo() override; + virtual void redo() override; private: Q_DISABLE_COPY(ShowDoubleLabel) bool m_visible; diff --git a/src/libs/vtools/undocommands/label/showlabel.h b/src/libs/vtools/undocommands/label/showlabel.h index ed29af36c..db630493b 100644 --- a/src/libs/vtools/undocommands/label/showlabel.h +++ b/src/libs/vtools/undocommands/label/showlabel.h @@ -39,8 +39,8 @@ public: ShowLabel(VAbstractPattern *doc, quint32 id, bool visible, QUndoCommand *parent = nullptr); virtual ~ShowLabel()=default; - virtual void undo() Q_DECL_OVERRIDE; - virtual void redo() Q_DECL_OVERRIDE; + virtual void undo() override; + virtual void redo() override; private: Q_DISABLE_COPY(ShowLabel) bool m_visible; diff --git a/src/libs/vtools/undocommands/movepiece.h b/src/libs/vtools/undocommands/movepiece.h index 7c9836b8d..4fb010aee 100644 --- a/src/libs/vtools/undocommands/movepiece.h +++ b/src/libs/vtools/undocommands/movepiece.h @@ -47,11 +47,11 @@ public: QUndoCommand *parent = nullptr); virtual ~MovePiece()=default; - virtual void undo() Q_DECL_OVERRIDE; - virtual void redo() Q_DECL_OVERRIDE; + virtual void undo() override; + virtual void redo() override; // cppcheck-suppress unusedFunction - virtual bool mergeWith(const QUndoCommand *command) Q_DECL_OVERRIDE; - virtual int id() const Q_DECL_OVERRIDE; + virtual bool mergeWith(const QUndoCommand *command) override; + virtual int id() const override; void Do(qreal x, qreal y); diff --git a/src/libs/vtools/undocommands/movespline.h b/src/libs/vtools/undocommands/movespline.h index 0bafa29ff..891b17e5c 100644 --- a/src/libs/vtools/undocommands/movespline.h +++ b/src/libs/vtools/undocommands/movespline.h @@ -46,11 +46,11 @@ class MoveSpline : public VUndoCommand public: MoveSpline(VAbstractPattern *doc, const VSpline &oldSpl, const VSpline &newSpl, const quint32 &id, QUndoCommand *parent = nullptr); - virtual ~MoveSpline() Q_DECL_OVERRIDE; - virtual void undo() Q_DECL_OVERRIDE; - virtual void redo() Q_DECL_OVERRIDE; - virtual bool mergeWith(const QUndoCommand *command) Q_DECL_OVERRIDE; - virtual int id() const Q_DECL_OVERRIDE; + virtual ~MoveSpline() override; + virtual void undo() override; + virtual void redo() override; + virtual bool mergeWith(const QUndoCommand *command) override; + virtual int id() const override; quint32 getSplineId() const; VSpline getNewSpline() const; private: diff --git a/src/libs/vtools/undocommands/movesplinepath.h b/src/libs/vtools/undocommands/movesplinepath.h index 49fdd3074..89eb86ae8 100644 --- a/src/libs/vtools/undocommands/movesplinepath.h +++ b/src/libs/vtools/undocommands/movesplinepath.h @@ -47,10 +47,10 @@ public: MoveSplinePath(VAbstractPattern *doc, const VSplinePath &oldSplPath, const VSplinePath &newSplPath, const quint32 &id, QUndoCommand *parent = nullptr); virtual ~MoveSplinePath() =default; - virtual void undo() Q_DECL_OVERRIDE; - virtual void redo() Q_DECL_OVERRIDE; - virtual bool mergeWith(const QUndoCommand *command) Q_DECL_OVERRIDE; - virtual int id() const Q_DECL_OVERRIDE; + virtual void undo() override; + virtual void redo() override; + virtual bool mergeWith(const QUndoCommand *command) override; + virtual int id() const override; quint32 getSplinePathId() const; VSplinePath getNewSplinePath() const; private: diff --git a/src/libs/vtools/undocommands/movespoint.h b/src/libs/vtools/undocommands/movespoint.h index feabb9de9..5d55edfd1 100644 --- a/src/libs/vtools/undocommands/movespoint.h +++ b/src/libs/vtools/undocommands/movespoint.h @@ -45,11 +45,11 @@ class MoveSPoint : public VUndoCommand public: MoveSPoint(VAbstractPattern *doc, const double &x, const double &y, const quint32 &id, QGraphicsScene *scene, QUndoCommand *parent = nullptr); - virtual ~MoveSPoint() Q_DECL_OVERRIDE; - virtual void undo() Q_DECL_OVERRIDE; - virtual void redo() Q_DECL_OVERRIDE; - virtual bool mergeWith(const QUndoCommand *command) Q_DECL_OVERRIDE; - virtual int id() const Q_DECL_OVERRIDE; + virtual ~MoveSPoint() override; + virtual void undo() override; + virtual void redo() override; + virtual bool mergeWith(const QUndoCommand *command) override; + virtual int id() const override; quint32 getSPointId() const; double getNewX() const; double getNewY() const; diff --git a/src/libs/vtools/undocommands/removeitemfromgroup.h b/src/libs/vtools/undocommands/removeitemfromgroup.h index 042fd1971..a29cdd76e 100644 --- a/src/libs/vtools/undocommands/removeitemfromgroup.h +++ b/src/libs/vtools/undocommands/removeitemfromgroup.h @@ -44,8 +44,8 @@ class RemoveItemFromGroup : public VUndoCommand public: RemoveItemFromGroup(const QDomElement &xml, VAbstractPattern *doc, quint32 groupId, QUndoCommand *parent = nullptr); virtual ~RemoveItemFromGroup()=default; - virtual void undo() Q_DECL_OVERRIDE; - virtual void redo() Q_DECL_OVERRIDE; + virtual void undo() override; + virtual void redo() override; signals: void UpdateGroups(); protected: diff --git a/src/libs/vtools/undocommands/renamepp.h b/src/libs/vtools/undocommands/renamepp.h index 9be533793..9896e473c 100644 --- a/src/libs/vtools/undocommands/renamepp.h +++ b/src/libs/vtools/undocommands/renamepp.h @@ -42,12 +42,12 @@ class RenamePP :public VUndoCommand Q_OBJECT public: RenamePP(VAbstractPattern *doc, const QString &newPPname, QComboBox *combo, QUndoCommand *parent = nullptr); - virtual ~RenamePP() Q_DECL_OVERRIDE; + virtual ~RenamePP() override; - virtual void undo() Q_DECL_OVERRIDE; - virtual void redo() Q_DECL_OVERRIDE; - virtual bool mergeWith(const QUndoCommand *command) Q_DECL_OVERRIDE; - virtual int id() const Q_DECL_OVERRIDE; + virtual void undo() override; + virtual void redo() override; + virtual bool mergeWith(const QUndoCommand *command) override; + virtual int id() const override; QString getNewPPname() const; QString getOldPPname() const; private: diff --git a/src/libs/vtools/undocommands/savepieceoptions.h b/src/libs/vtools/undocommands/savepieceoptions.h index 86f92ba71..f1835ce0f 100644 --- a/src/libs/vtools/undocommands/savepieceoptions.h +++ b/src/libs/vtools/undocommands/savepieceoptions.h @@ -42,10 +42,10 @@ public: QUndoCommand *parent = nullptr); virtual ~SavePieceOptions() = default; - virtual void undo() Q_DECL_OVERRIDE; - virtual void redo() Q_DECL_OVERRIDE; - virtual bool mergeWith(const QUndoCommand *command) Q_DECL_OVERRIDE; - virtual int id() const Q_DECL_OVERRIDE; + virtual void undo() override; + virtual void redo() override; + virtual bool mergeWith(const QUndoCommand *command) override; + virtual int id() const override; quint32 DetId() const; VPiece NewDet() const; signals: diff --git a/src/libs/vtools/undocommands/savepiecepathoptions.h b/src/libs/vtools/undocommands/savepiecepathoptions.h index 160fc05e6..849007e62 100644 --- a/src/libs/vtools/undocommands/savepiecepathoptions.h +++ b/src/libs/vtools/undocommands/savepiecepathoptions.h @@ -41,10 +41,10 @@ public: VContainer *data, quint32 id, QUndoCommand *parent = nullptr); virtual ~SavePiecePathOptions() = default; - virtual void undo() Q_DECL_OVERRIDE; - virtual void redo() Q_DECL_OVERRIDE; - virtual bool mergeWith(const QUndoCommand *command) Q_DECL_OVERRIDE; - virtual int id() const Q_DECL_OVERRIDE; + virtual void undo() override; + virtual void redo() override; + virtual bool mergeWith(const QUndoCommand *command) override; + virtual int id() const override; quint32 PathId() const; VPiecePath NewPath() const; private: diff --git a/src/libs/vtools/undocommands/saveplacelabeloptions.h b/src/libs/vtools/undocommands/saveplacelabeloptions.h index 828f23360..fd51291a7 100644 --- a/src/libs/vtools/undocommands/saveplacelabeloptions.h +++ b/src/libs/vtools/undocommands/saveplacelabeloptions.h @@ -38,10 +38,10 @@ public: VAbstractPattern *doc, VContainer *data, quint32 id, QUndoCommand *parent = nullptr); virtual ~SavePlaceLabelOptions()=default; - virtual void undo() Q_DECL_OVERRIDE; - virtual void redo() Q_DECL_OVERRIDE; - virtual bool mergeWith(const QUndoCommand *command) Q_DECL_OVERRIDE; - virtual int id() const Q_DECL_OVERRIDE; + virtual void undo() override; + virtual void redo() override; + virtual bool mergeWith(const QUndoCommand *command) override; + virtual int id() const override; quint32 LabelId() const; VPlaceLabelItem NewLabel() const; diff --git a/src/libs/vtools/undocommands/savetooloptions.h b/src/libs/vtools/undocommands/savetooloptions.h index f97728d94..9eaa6bae3 100644 --- a/src/libs/vtools/undocommands/savetooloptions.h +++ b/src/libs/vtools/undocommands/savetooloptions.h @@ -46,10 +46,10 @@ public: const QList &newDependencies, VAbstractPattern *doc, const quint32 &id, QUndoCommand *parent = nullptr); virtual ~SaveToolOptions() = default; - virtual void undo() Q_DECL_OVERRIDE; - virtual void redo() Q_DECL_OVERRIDE; - virtual bool mergeWith(const QUndoCommand *command) Q_DECL_OVERRIDE; - virtual int id() const Q_DECL_OVERRIDE; + virtual void undo() override; + virtual void redo() override; + virtual bool mergeWith(const QUndoCommand *command) override; + virtual int id() const override; QDomElement getNewXml() const; quint32 getToolId() const; diff --git a/src/libs/vtools/undocommands/togglepiecestate.h b/src/libs/vtools/undocommands/togglepiecestate.h index 8e9c85193..71280b875 100644 --- a/src/libs/vtools/undocommands/togglepiecestate.h +++ b/src/libs/vtools/undocommands/togglepiecestate.h @@ -44,8 +44,8 @@ public: TogglePieceState(quint32 id, bool state, VContainer *data, VAbstractPattern *doc, QUndoCommand *parent = nullptr); virtual ~TogglePieceState() = default; - virtual void undo() Q_DECL_OVERRIDE; - virtual void redo() Q_DECL_OVERRIDE; + virtual void undo() override; + virtual void redo() override; quint32 getDetId() const; bool getNewState() const; @@ -82,7 +82,7 @@ public: virtual ~TogglePieceInLayout() = default; protected: - virtual void Do(bool state) Q_DECL_OVERRIDE; + virtual void Do(bool state) override; signals: void UpdateList(); @@ -99,7 +99,7 @@ public: virtual ~TogglePieceForbidFlipping() = default; protected: - virtual void Do(bool state) Q_DECL_OVERRIDE; + virtual void Do(bool state) override; private: Q_DISABLE_COPY(TogglePieceForbidFlipping) @@ -114,7 +114,7 @@ public: virtual ~TogglePieceForceFlipping() = default; protected: - virtual void Do(bool state) Q_DECL_OVERRIDE; + virtual void Do(bool state) override; private: Q_DISABLE_COPY(TogglePieceForceFlipping) diff --git a/src/libs/vtools/visualization/line/operation/visoperation.h b/src/libs/vtools/visualization/line/operation/visoperation.h index 90ff7cd7d..0a479b7af 100644 --- a/src/libs/vtools/visualization/line/operation/visoperation.h +++ b/src/libs/vtools/visualization/line/operation/visoperation.h @@ -43,9 +43,9 @@ public: void SetObjects(QVector objects); - virtual void VisualMode(const quint32 &pointId = NULL_ID) Q_DECL_OVERRIDE; + virtual void VisualMode(const quint32 &pointId = NULL_ID) override; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::ToolRotation)}; protected: QVector objects; diff --git a/src/libs/vtools/visualization/line/operation/vistoolflippingbyaxis.h b/src/libs/vtools/visualization/line/operation/vistoolflippingbyaxis.h index 4de1a2a2f..951502919 100644 --- a/src/libs/vtools/visualization/line/operation/vistoolflippingbyaxis.h +++ b/src/libs/vtools/visualization/line/operation/vistoolflippingbyaxis.h @@ -41,12 +41,12 @@ public: explicit VisToolFlippingByAxis(const VContainer *data, QGraphicsItem *parent = nullptr); virtual ~VisToolFlippingByAxis() = default; - virtual void RefreshGeometry() Q_DECL_OVERRIDE; + virtual void RefreshGeometry() override; void SetOriginPointId(quint32 value); void SetAxisType(AxisType value); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::ToolFlippingByAxis)}; private: Q_DISABLE_COPY(VisToolFlippingByAxis) diff --git a/src/libs/vtools/visualization/line/operation/vistoolflippingbyline.h b/src/libs/vtools/visualization/line/operation/vistoolflippingbyline.h index 81584e552..d43cdd3a3 100644 --- a/src/libs/vtools/visualization/line/operation/vistoolflippingbyline.h +++ b/src/libs/vtools/visualization/line/operation/vistoolflippingbyline.h @@ -40,12 +40,12 @@ public: explicit VisToolFlippingByLine(const VContainer *data, QGraphicsItem *parent = nullptr); virtual ~VisToolFlippingByLine() = default; - virtual void RefreshGeometry() Q_DECL_OVERRIDE; + virtual void RefreshGeometry() override; void SetFirstLinePointId(quint32 value); void SetSecondLinePointId(quint32 value); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::ToolFlippingByLine)}; private: Q_DISABLE_COPY(VisToolFlippingByLine) diff --git a/src/libs/vtools/visualization/line/operation/vistoolmove.h b/src/libs/vtools/visualization/line/operation/vistoolmove.h index f43f46b77..b52556575 100644 --- a/src/libs/vtools/visualization/line/operation/vistoolmove.h +++ b/src/libs/vtools/visualization/line/operation/vistoolmove.h @@ -50,7 +50,7 @@ public: explicit VisToolMove(const VContainer *data, QGraphicsItem *parent = nullptr); virtual ~VisToolMove() = default; - virtual void RefreshGeometry() Q_DECL_OVERRIDE; + virtual void RefreshGeometry() override; QString Angle() const; void SetAngle(const QString &expression); @@ -64,7 +64,7 @@ public: void SetRotationOriginPointId(quint32 value); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::ToolMove)}; private: Q_DISABLE_COPY(VisToolMove) diff --git a/src/libs/vtools/visualization/line/operation/vistoolrotation.h b/src/libs/vtools/visualization/line/operation/vistoolrotation.h index 003c65617..d8e889fb8 100644 --- a/src/libs/vtools/visualization/line/operation/vistoolrotation.h +++ b/src/libs/vtools/visualization/line/operation/vistoolrotation.h @@ -50,14 +50,14 @@ public: explicit VisToolRotation(const VContainer *data, QGraphicsItem *parent = nullptr); virtual ~VisToolRotation(); - virtual void RefreshGeometry() Q_DECL_OVERRIDE; + virtual void RefreshGeometry() override; void SetOriginPointId(quint32 value); QString Angle() const; void SetAngle(const QString &expression); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::ToolRotation)}; private: Q_DISABLE_COPY(VisToolRotation) diff --git a/src/libs/vtools/visualization/line/visline.h b/src/libs/vtools/visualization/line/visline.h index 189ed45c3..dd6a23561 100644 --- a/src/libs/vtools/visualization/line/visline.h +++ b/src/libs/vtools/visualization/line/visline.h @@ -52,7 +52,7 @@ public: explicit VisLine(const VContainer *data, QGraphicsItem *parent = nullptr); virtual ~VisLine() = default; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::Line)}; static qreal CorrectAngle(const qreal &angle); protected: @@ -60,8 +60,8 @@ protected: QPointF Ray(const QPointF &firstPoint) const; QLineF Axis(const QPointF &p, const qreal &angle) const; QLineF Axis(const QPointF &p1, const QPointF &p2) const; - virtual void InitPen() Q_DECL_OVERRIDE; - virtual void AddOnScene() Q_DECL_OVERRIDE; + virtual void InitPen() override; + virtual void AddOnScene() override; void DrawRay(VScaledLine *lineItem, const QPointF &p, const QPointF &pTangent, const QColor &color, Qt::PenStyle style); diff --git a/src/libs/vtools/visualization/line/vistoolalongline.h b/src/libs/vtools/visualization/line/vistoolalongline.h index 63d571e8e..d87005e27 100644 --- a/src/libs/vtools/visualization/line/vistoolalongline.h +++ b/src/libs/vtools/visualization/line/vistoolalongline.h @@ -46,11 +46,11 @@ public: explicit VisToolAlongLine(const VContainer *data, QGraphicsItem *parent = nullptr); virtual ~VisToolAlongLine() = default; - virtual void RefreshGeometry() Q_DECL_OVERRIDE; + virtual void RefreshGeometry() override; void setObject2Id(const quint32 &value); void setLength(const QString &expression); void setMidPointMode(bool midPointMode); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::ToolAlongLine)}; private: Q_DISABLE_COPY(VisToolAlongLine) diff --git a/src/libs/vtools/visualization/line/vistoolbisector.h b/src/libs/vtools/visualization/line/vistoolbisector.h index e283c75ac..9378e9bc5 100644 --- a/src/libs/vtools/visualization/line/vistoolbisector.h +++ b/src/libs/vtools/visualization/line/vistoolbisector.h @@ -46,11 +46,11 @@ public: explicit VisToolBisector(const VContainer *data, QGraphicsItem *parent = nullptr); virtual ~VisToolBisector() = default; - virtual void RefreshGeometry() Q_DECL_OVERRIDE; + virtual void RefreshGeometry() override; void setObject2Id(const quint32 &value); void setObject3Id(const quint32 &value); void setLength(const QString &expression); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::ToolBisector)}; private: Q_DISABLE_COPY(VisToolBisector) diff --git a/src/libs/vtools/visualization/line/vistoolcurveintersectaxis.h b/src/libs/vtools/visualization/line/vistoolcurveintersectaxis.h index f765bf7ad..eecfdce7f 100644 --- a/src/libs/vtools/visualization/line/vistoolcurveintersectaxis.h +++ b/src/libs/vtools/visualization/line/vistoolcurveintersectaxis.h @@ -46,13 +46,13 @@ public: explicit VisToolCurveIntersectAxis(const VContainer *data, QGraphicsItem *parent = nullptr); virtual ~VisToolCurveIntersectAxis() = default; - virtual void RefreshGeometry() Q_DECL_OVERRIDE; + virtual void RefreshGeometry() override; QString Angle() const; void SetAngle(const QString &expression); void setAxisPointId(const quint32 &value); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::ToolLineIntersectAxis)}; private: Q_DISABLE_COPY(VisToolCurveIntersectAxis) diff --git a/src/libs/vtools/visualization/line/vistoolendline.h b/src/libs/vtools/visualization/line/vistoolendline.h index 8b1e1649e..bfe257447 100644 --- a/src/libs/vtools/visualization/line/vistoolendline.h +++ b/src/libs/vtools/visualization/line/vistoolendline.h @@ -46,7 +46,7 @@ public: explicit VisToolEndLine(const VContainer *data, QGraphicsItem *parent = nullptr); virtual ~VisToolEndLine() = default; - virtual void RefreshGeometry() Q_DECL_OVERRIDE; + virtual void RefreshGeometry() override; QString Angle() const; void SetAngle(const QString &expression); @@ -54,7 +54,7 @@ public: QString Length() const; void setLength(const QString &expression); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::ToolEndLine)}; private: Q_DISABLE_COPY(VisToolEndLine) diff --git a/src/libs/vtools/visualization/line/vistoolheight.h b/src/libs/vtools/visualization/line/vistoolheight.h index bab4ddf05..66ebfb9ec 100644 --- a/src/libs/vtools/visualization/line/vistoolheight.h +++ b/src/libs/vtools/visualization/line/vistoolheight.h @@ -47,11 +47,11 @@ public: explicit VisToolHeight(const VContainer *data, QGraphicsItem *parent = nullptr); virtual ~VisToolHeight() = default; - virtual void RefreshGeometry() Q_DECL_OVERRIDE; + virtual void RefreshGeometry() override; void setLineP1Id(const quint32 &value); void setLineP2Id(const quint32 &value); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::ToolHeight)}; private: Q_DISABLE_COPY(VisToolHeight) diff --git a/src/libs/vtools/visualization/line/vistoolline.h b/src/libs/vtools/visualization/line/vistoolline.h index a5221d058..3f4766a3a 100644 --- a/src/libs/vtools/visualization/line/vistoolline.h +++ b/src/libs/vtools/visualization/line/vistoolline.h @@ -49,13 +49,13 @@ public: explicit VisToolLine(const VContainer *data, QGraphicsItem *parent = nullptr); virtual ~VisToolLine() = default; - virtual void RefreshGeometry() Q_DECL_OVERRIDE; + virtual void RefreshGeometry() override; void setPoint2Id(const quint32 &value); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::ToolLine)}; protected: virtual void DrawLine(VScaledLine *lineItem, const QLineF &line, const QColor &color, - Qt::PenStyle style = Qt::SolidLine) Q_DECL_OVERRIDE; + Qt::PenStyle style = Qt::SolidLine) override; private: Q_DISABLE_COPY(VisToolLine) quint32 point2Id; diff --git a/src/libs/vtools/visualization/line/vistoollineintersect.h b/src/libs/vtools/visualization/line/vistoollineintersect.h index 40224418e..891373c87 100644 --- a/src/libs/vtools/visualization/line/vistoollineintersect.h +++ b/src/libs/vtools/visualization/line/vistoollineintersect.h @@ -46,12 +46,12 @@ public: explicit VisToolLineIntersect(const VContainer *data, QGraphicsItem *parent = nullptr); virtual ~VisToolLineIntersect() = default; - virtual void RefreshGeometry() Q_DECL_OVERRIDE; + virtual void RefreshGeometry() override; void setLine1P2Id(const quint32 &value); void setLine2P1Id(const quint32 &value); void setLine2P2Id(const quint32 &value); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::ToolLineIntersect)}; private: Q_DISABLE_COPY(VisToolLineIntersect) diff --git a/src/libs/vtools/visualization/line/vistoollineintersectaxis.h b/src/libs/vtools/visualization/line/vistoollineintersectaxis.h index dd44724d6..e814a0aa2 100644 --- a/src/libs/vtools/visualization/line/vistoollineintersectaxis.h +++ b/src/libs/vtools/visualization/line/vistoollineintersectaxis.h @@ -47,14 +47,14 @@ public: explicit VisToolLineIntersectAxis(const VContainer *data, QGraphicsItem *parent = nullptr); virtual ~VisToolLineIntersectAxis() = default; - virtual void RefreshGeometry() Q_DECL_OVERRIDE; + virtual void RefreshGeometry() override; QString Angle() const; void SetAngle(const QString &expression); void setPoint2Id(const quint32 &value); void setAxisPointId(const quint32 &value); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::ToolLineIntersectAxis)}; private: Q_DISABLE_COPY(VisToolLineIntersectAxis) diff --git a/src/libs/vtools/visualization/line/vistoolnormal.h b/src/libs/vtools/visualization/line/vistoolnormal.h index a2a29ba83..d371007c5 100644 --- a/src/libs/vtools/visualization/line/vistoolnormal.h +++ b/src/libs/vtools/visualization/line/vistoolnormal.h @@ -46,13 +46,13 @@ public: explicit VisToolNormal(const VContainer *data, QGraphicsItem *parent = nullptr); virtual ~VisToolNormal() = default; - virtual void RefreshGeometry() Q_DECL_OVERRIDE; + virtual void RefreshGeometry() override; void setObject2Id(const quint32 &value); void setLength(const QString &expression); qreal GetAngle() const; void SetAngle(const qreal &value); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::ToolNormal)}; private: diff --git a/src/libs/vtools/visualization/line/vistoolpointfromarcandtangent.h b/src/libs/vtools/visualization/line/vistoolpointfromarcandtangent.h index 51a74b5f1..d28415160 100644 --- a/src/libs/vtools/visualization/line/vistoolpointfromarcandtangent.h +++ b/src/libs/vtools/visualization/line/vistoolpointfromarcandtangent.h @@ -50,12 +50,12 @@ public: explicit VisToolPointFromArcAndTangent(const VContainer *data, QGraphicsItem *parent = nullptr); virtual ~VisToolPointFromArcAndTangent() = default; - virtual void RefreshGeometry() Q_DECL_OVERRIDE; + virtual void RefreshGeometry() override; void setArcId(const quint32 &value); void setCrossPoint(const CrossCirclesPoint &value); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::ToolPointFromArcAndTangent)}; private: Q_DISABLE_COPY(VisToolPointFromArcAndTangent) diff --git a/src/libs/vtools/visualization/line/vistoolpointfromcircleandtangent.h b/src/libs/vtools/visualization/line/vistoolpointfromcircleandtangent.h index 67af271f2..a5588207b 100644 --- a/src/libs/vtools/visualization/line/vistoolpointfromcircleandtangent.h +++ b/src/libs/vtools/visualization/line/vistoolpointfromcircleandtangent.h @@ -48,13 +48,13 @@ public: explicit VisToolPointFromCircleAndTangent(const VContainer *data, QGraphicsItem *parent = nullptr); virtual ~VisToolPointFromCircleAndTangent() = default; - virtual void RefreshGeometry() Q_DECL_OVERRIDE; + virtual void RefreshGeometry() override; void setObject2Id(const quint32 &value); void setCRadius(const QString &value); void setCrossPoint(const CrossCirclesPoint &value); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::ToolPointFromCircleAndTangent)}; private: Q_DISABLE_COPY(VisToolPointFromCircleAndTangent) diff --git a/src/libs/vtools/visualization/line/vistoolpointofcontact.h b/src/libs/vtools/visualization/line/vistoolpointofcontact.h index 67a587b44..9c999cba0 100644 --- a/src/libs/vtools/visualization/line/vistoolpointofcontact.h +++ b/src/libs/vtools/visualization/line/vistoolpointofcontact.h @@ -46,11 +46,11 @@ public: explicit VisToolPointOfContact(const VContainer *data, QGraphicsItem *parent = nullptr); virtual ~VisToolPointOfContact() = default; - virtual void RefreshGeometry() Q_DECL_OVERRIDE; + virtual void RefreshGeometry() override; void setLineP2Id(const quint32 &value); void setRadiusId(const quint32 &value); void setRadius(const QString &expression); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::ToolPointOfContact)}; private: Q_DISABLE_COPY(VisToolPointOfContact) diff --git a/src/libs/vtools/visualization/line/vistoolpointofintersection.h b/src/libs/vtools/visualization/line/vistoolpointofintersection.h index 852464edd..a506b93f5 100644 --- a/src/libs/vtools/visualization/line/vistoolpointofintersection.h +++ b/src/libs/vtools/visualization/line/vistoolpointofintersection.h @@ -48,10 +48,10 @@ public: explicit VisToolPointOfIntersection(const VContainer *data, QGraphicsItem *parent = nullptr); virtual ~VisToolPointOfIntersection() = default; - virtual void RefreshGeometry() Q_DECL_OVERRIDE; + virtual void RefreshGeometry() override; void setPoint2Id(const quint32 &value); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::ToolPointOfIntersection)}; private: Q_DISABLE_COPY(VisToolPointOfIntersection) diff --git a/src/libs/vtools/visualization/line/vistoolpointofintersectionarcs.h b/src/libs/vtools/visualization/line/vistoolpointofintersectionarcs.h index 7fecebcae..de9b5451a 100644 --- a/src/libs/vtools/visualization/line/vistoolpointofintersectionarcs.h +++ b/src/libs/vtools/visualization/line/vistoolpointofintersectionarcs.h @@ -47,14 +47,14 @@ public: explicit VisToolPointOfIntersectionArcs(const VContainer *data, QGraphicsItem *parent = nullptr); virtual ~VisToolPointOfIntersectionArcs() = default; - virtual void RefreshGeometry() Q_DECL_OVERRIDE; - virtual void VisualMode(const quint32 &id) Q_DECL_OVERRIDE; + virtual void RefreshGeometry() override; + virtual void VisualMode(const quint32 &id) override; void setArc1Id(const quint32 &value); void setArc2Id(const quint32 &value); void setCrossPoint(const CrossCirclesPoint &value); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::ToolPointOfIntersectionArcs)}; private: Q_DISABLE_COPY(VisToolPointOfIntersectionArcs) diff --git a/src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.h b/src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.h index 94d95a28d..0e0f3372c 100644 --- a/src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.h +++ b/src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.h @@ -47,15 +47,15 @@ public: explicit VisToolPointOfIntersectionCircles(const VContainer *data, QGraphicsItem *parent = nullptr); virtual ~VisToolPointOfIntersectionCircles() = default; - virtual void RefreshGeometry() Q_DECL_OVERRIDE; - virtual void VisualMode(const quint32 &id) Q_DECL_OVERRIDE; + virtual void RefreshGeometry() override; + virtual void VisualMode(const quint32 &id) override; void setObject2Id(const quint32 &value); void setC1Radius(const QString &value); void setC2Radius(const QString &value); void setCrossPoint(const CrossCirclesPoint &value); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::ToolPointOfIntersectionCircles)}; private: Q_DISABLE_COPY(VisToolPointOfIntersectionCircles) diff --git a/src/libs/vtools/visualization/line/vistoolshoulderpoint.h b/src/libs/vtools/visualization/line/vistoolshoulderpoint.h index cac9e3183..5e0bf4784 100644 --- a/src/libs/vtools/visualization/line/vistoolshoulderpoint.h +++ b/src/libs/vtools/visualization/line/vistoolshoulderpoint.h @@ -46,11 +46,11 @@ public: explicit VisToolShoulderPoint(const VContainer *data, QGraphicsItem *parent = nullptr); virtual ~VisToolShoulderPoint() = default; - virtual void RefreshGeometry() Q_DECL_OVERRIDE; + virtual void RefreshGeometry() override; void setLineP1Id(const quint32 &value); void setLineP2Id(const quint32 &value); void setLength(const QString &expression); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::ToolShoulderPoint)}; private: Q_DISABLE_COPY(VisToolShoulderPoint) diff --git a/src/libs/vtools/visualization/line/vistoolspecialpoint.h b/src/libs/vtools/visualization/line/vistoolspecialpoint.h index 866742171..f49a6b347 100644 --- a/src/libs/vtools/visualization/line/vistoolspecialpoint.h +++ b/src/libs/vtools/visualization/line/vistoolspecialpoint.h @@ -40,8 +40,8 @@ public: explicit VisToolSpecialPoint(const VContainer *data, QGraphicsItem *parent = nullptr); virtual ~VisToolSpecialPoint(); - virtual void RefreshGeometry() Q_DECL_OVERRIDE; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual void RefreshGeometry() override; + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::ToolSpecialPoint)}; private: Q_DISABLE_COPY(VisToolSpecialPoint) diff --git a/src/libs/vtools/visualization/line/vistooltriangle.h b/src/libs/vtools/visualization/line/vistooltriangle.h index 5ecb03003..04f821504 100644 --- a/src/libs/vtools/visualization/line/vistooltriangle.h +++ b/src/libs/vtools/visualization/line/vistooltriangle.h @@ -49,13 +49,13 @@ public: explicit VisToolTriangle(const VContainer *data, QGraphicsItem *parent = nullptr); virtual ~VisToolTriangle() = default; - virtual void RefreshGeometry() Q_DECL_OVERRIDE; + virtual void RefreshGeometry() override; void setObject2Id(const quint32 &value); void setHypotenuseP1Id(const quint32 &value); void setHypotenuseP2Id(const quint32 &value); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::ToolTriangle)}; private: Q_DISABLE_COPY(VisToolTriangle) diff --git a/src/libs/vtools/visualization/line/vistooltruedarts.h b/src/libs/vtools/visualization/line/vistooltruedarts.h index ff3340af9..a21660693 100644 --- a/src/libs/vtools/visualization/line/vistooltruedarts.h +++ b/src/libs/vtools/visualization/line/vistooltruedarts.h @@ -46,14 +46,14 @@ public: explicit VisToolTrueDarts(const VContainer *data, QGraphicsItem *parent = nullptr); virtual ~VisToolTrueDarts() = default; - virtual void RefreshGeometry() Q_DECL_OVERRIDE; + virtual void RefreshGeometry() override; void setObject2Id(const quint32 &value); void setD1PointId(const quint32 &value); void setD2PointId(const quint32 &value); void setD3PointId(const quint32 &value); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::ToolTrueDarts)}; private: Q_DISABLE_COPY(VisToolTrueDarts) diff --git a/src/libs/vtools/visualization/path/vispath.h b/src/libs/vtools/visualization/path/vispath.h index 4049ab8f7..3b46ef9ef 100644 --- a/src/libs/vtools/visualization/path/vispath.h +++ b/src/libs/vtools/visualization/path/vispath.h @@ -51,13 +51,13 @@ public: void setApproximationScale(qreal approximationScale); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::Path)}; protected: qreal m_approximationScale; - virtual void InitPen() Q_DECL_OVERRIDE; - virtual void AddOnScene() Q_DECL_OVERRIDE; + virtual void InitPen() override; + virtual void AddOnScene() override; VSimplePoint *GetPoint(QVector &points, quint32 i, const QColor &color); private: diff --git a/src/libs/vtools/visualization/path/vispiecespecialpoints.h b/src/libs/vtools/visualization/path/vispiecespecialpoints.h index 859757c66..9fb7f837f 100644 --- a/src/libs/vtools/visualization/path/vispiecespecialpoints.h +++ b/src/libs/vtools/visualization/path/vispiecespecialpoints.h @@ -40,13 +40,13 @@ public: VisPieceSpecialPoints(const VContainer *data, QGraphicsItem *parent = nullptr); virtual ~VisPieceSpecialPoints() Q_DECL_EQ_DEFAULT; - virtual void RefreshGeometry() Q_DECL_OVERRIDE; + virtual void RefreshGeometry() override; void SetPoints(const QVector &pins); void SetShowRect(bool show); void SetRect(const QRectF &rect); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::PieceSpecialPoints)}; private: Q_DISABLE_COPY(VisPieceSpecialPoints) diff --git a/src/libs/vtools/visualization/path/vistoolarc.h b/src/libs/vtools/visualization/path/vistoolarc.h index c51a04dca..6a1e5cc1a 100644 --- a/src/libs/vtools/visualization/path/vistoolarc.h +++ b/src/libs/vtools/visualization/path/vistoolarc.h @@ -46,11 +46,11 @@ public: explicit VisToolArc(const VContainer *data, QGraphicsItem *parent = nullptr); virtual ~VisToolArc() Q_DECL_EQ_DEFAULT; - virtual void RefreshGeometry() Q_DECL_OVERRIDE; + virtual void RefreshGeometry() override; void setRadius(const QString &expression); void setF1(const QString &expression); void setF2(const QString &expression); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::ToolArc)}; private: Q_DISABLE_COPY(VisToolArc) diff --git a/src/libs/vtools/visualization/path/vistoolarcwithlength.h b/src/libs/vtools/visualization/path/vistoolarcwithlength.h index 91b3c570b..2591643b0 100644 --- a/src/libs/vtools/visualization/path/vistoolarcwithlength.h +++ b/src/libs/vtools/visualization/path/vistoolarcwithlength.h @@ -46,11 +46,11 @@ public: explicit VisToolArcWithLength(const VContainer *data, QGraphicsItem *parent = nullptr); virtual ~VisToolArcWithLength() Q_DECL_EQ_DEFAULT; - virtual void RefreshGeometry() Q_DECL_OVERRIDE; + virtual void RefreshGeometry() override; void setRadius(const QString &expression); void setF1(const QString &expression); void setLength(const QString &expression); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::ToolArcWithLength)}; private: Q_DISABLE_COPY(VisToolArcWithLength) diff --git a/src/libs/vtools/visualization/path/vistoolcubicbezier.h b/src/libs/vtools/visualization/path/vistoolcubicbezier.h index c2426fb14..f78771882 100644 --- a/src/libs/vtools/visualization/path/vistoolcubicbezier.h +++ b/src/libs/vtools/visualization/path/vistoolcubicbezier.h @@ -46,13 +46,13 @@ public: explicit VisToolCubicBezier(const VContainer *data, QGraphicsItem *parent = nullptr); virtual ~VisToolCubicBezier() Q_DECL_EQ_DEFAULT; - virtual void RefreshGeometry() Q_DECL_OVERRIDE; + virtual void RefreshGeometry() override; void setObject2Id(const quint32 &value); void setObject3Id(const quint32 &value); void setObject4Id(const quint32 &value); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::ToolCubicBezier)}; protected: Q_DISABLE_COPY(VisToolCubicBezier) diff --git a/src/libs/vtools/visualization/path/vistoolcubicbezierpath.h b/src/libs/vtools/visualization/path/vistoolcubicbezierpath.h index 0979f2f3c..c9d339240 100644 --- a/src/libs/vtools/visualization/path/vistoolcubicbezierpath.h +++ b/src/libs/vtools/visualization/path/vistoolcubicbezierpath.h @@ -48,12 +48,12 @@ public: explicit VisToolCubicBezierPath(const VContainer *data, QGraphicsItem *parent = nullptr); virtual ~VisToolCubicBezierPath(); - virtual void RefreshGeometry() Q_DECL_OVERRIDE; + virtual void RefreshGeometry() override; void setPath(const VCubicBezierPath &value); VCubicBezierPath getPath(); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::ToolCubicBezierPath)}; protected: Q_DISABLE_COPY(VisToolCubicBezierPath) diff --git a/src/libs/vtools/visualization/path/vistoolcutarc.h b/src/libs/vtools/visualization/path/vistoolcutarc.h index 267d78f6e..12f533bb4 100644 --- a/src/libs/vtools/visualization/path/vistoolcutarc.h +++ b/src/libs/vtools/visualization/path/vistoolcutarc.h @@ -46,9 +46,9 @@ public: explicit VisToolCutArc(const VContainer *data, QGraphicsItem *parent = nullptr); virtual ~VisToolCutArc() Q_DECL_EQ_DEFAULT; - virtual void RefreshGeometry() Q_DECL_OVERRIDE; + virtual void RefreshGeometry() override; void setLength(const QString &expression); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::ToolCutArc)}; protected: Q_DISABLE_COPY(VisToolCutArc) diff --git a/src/libs/vtools/visualization/path/vistoolcutspline.h b/src/libs/vtools/visualization/path/vistoolcutspline.h index 0277e8f01..23e3b8942 100644 --- a/src/libs/vtools/visualization/path/vistoolcutspline.h +++ b/src/libs/vtools/visualization/path/vistoolcutspline.h @@ -46,9 +46,9 @@ public: explicit VisToolCutSpline(const VContainer *data, QGraphicsItem *parent = nullptr); virtual ~VisToolCutSpline() Q_DECL_EQ_DEFAULT; - virtual void RefreshGeometry() Q_DECL_OVERRIDE; + virtual void RefreshGeometry() override; void setLength(const QString &expression); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::ToolCutSpline)}; protected: Q_DISABLE_COPY(VisToolCutSpline) diff --git a/src/libs/vtools/visualization/path/vistoolcutsplinepath.h b/src/libs/vtools/visualization/path/vistoolcutsplinepath.h index 82fddcb47..f114090e4 100644 --- a/src/libs/vtools/visualization/path/vistoolcutsplinepath.h +++ b/src/libs/vtools/visualization/path/vistoolcutsplinepath.h @@ -46,9 +46,9 @@ public: explicit VisToolCutSplinePath(const VContainer *data, QGraphicsItem *parent = nullptr); virtual ~VisToolCutSplinePath() Q_DECL_EQ_DEFAULT; - virtual void RefreshGeometry() Q_DECL_OVERRIDE; + virtual void RefreshGeometry() override; void setLength(const QString &expression); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::ToolCutSpline)}; protected: Q_DISABLE_COPY(VisToolCutSplinePath) diff --git a/src/libs/vtools/visualization/path/vistoolduplicatedetail.h b/src/libs/vtools/visualization/path/vistoolduplicatedetail.h index a306211c5..6edd41290 100644 --- a/src/libs/vtools/visualization/path/vistoolduplicatedetail.h +++ b/src/libs/vtools/visualization/path/vistoolduplicatedetail.h @@ -41,8 +41,8 @@ public: qreal Mx() const; qreal My() const; - virtual void RefreshGeometry() Q_DECL_OVERRIDE; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual void RefreshGeometry() override; + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::ToolDuplicateDetail)}; private: Q_DISABLE_COPY(VisToolDuplicateDetail) diff --git a/src/libs/vtools/visualization/path/vistoolellipticalarc.h b/src/libs/vtools/visualization/path/vistoolellipticalarc.h index 0097d6c36..ab05632c9 100644 --- a/src/libs/vtools/visualization/path/vistoolellipticalarc.h +++ b/src/libs/vtools/visualization/path/vistoolellipticalarc.h @@ -45,14 +45,14 @@ public: explicit VisToolEllipticalArc(const VContainer *data, QGraphicsItem *parent = nullptr); virtual ~VisToolEllipticalArc() Q_DECL_EQ_DEFAULT; - virtual void RefreshGeometry() Q_DECL_OVERRIDE; + virtual void RefreshGeometry() override; void setRadius1(const QString &expression); void setRadius2(const QString &expression); void setF1(const QString &expression); void setF2(const QString &expression); void setRotationAngle(const QString &expression); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::ToolEllipticalArc)}; private: Q_DISABLE_COPY(VisToolEllipticalArc) diff --git a/src/libs/vtools/visualization/path/vistoolpiece.h b/src/libs/vtools/visualization/path/vistoolpiece.h index 39eb52c04..46f2bca14 100644 --- a/src/libs/vtools/visualization/path/vistoolpiece.h +++ b/src/libs/vtools/visualization/path/vistoolpiece.h @@ -43,9 +43,9 @@ public: VisToolPiece(const VContainer *data, QGraphicsItem *parent = nullptr); virtual ~VisToolPiece() Q_DECL_EQ_DEFAULT; - virtual void RefreshGeometry() Q_DECL_OVERRIDE; + virtual void RefreshGeometry() override; void SetPiece(const VPiece &piece); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::ToolPiece)}; private: Q_DISABLE_COPY(VisToolPiece) diff --git a/src/libs/vtools/visualization/path/vistoolpiecepath.h b/src/libs/vtools/visualization/path/vistoolpiecepath.h index 1ae28e1d7..82a998e78 100644 --- a/src/libs/vtools/visualization/path/vistoolpiecepath.h +++ b/src/libs/vtools/visualization/path/vistoolpiecepath.h @@ -44,12 +44,12 @@ public: VisToolPiecePath(const VContainer *data, QGraphicsItem *parent = nullptr); virtual ~VisToolPiecePath() Q_DECL_EQ_DEFAULT; - virtual void RefreshGeometry() Q_DECL_OVERRIDE; + virtual void RefreshGeometry() override; void SetPath(const VPiecePath &path); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::ToolPiecePath)}; protected: - virtual void mousePressEvent( QGraphicsSceneMouseEvent * event ) Q_DECL_OVERRIDE; + virtual void mousePressEvent( QGraphicsSceneMouseEvent * event ) override; private: Q_DISABLE_COPY(VisToolPiecePath) diff --git a/src/libs/vtools/visualization/path/vistoolpointofintersectioncurves.h b/src/libs/vtools/visualization/path/vistoolpointofintersectioncurves.h index f16ebbf4f..f4c28c428 100644 --- a/src/libs/vtools/visualization/path/vistoolpointofintersectioncurves.h +++ b/src/libs/vtools/visualization/path/vistoolpointofintersectioncurves.h @@ -47,14 +47,14 @@ public: explicit VisToolPointOfIntersectionCurves(const VContainer *data, QGraphicsItem *parent = nullptr); virtual ~VisToolPointOfIntersectionCurves() Q_DECL_EQ_DEFAULT; - virtual void RefreshGeometry() Q_DECL_OVERRIDE; - virtual void VisualMode(const quint32 &id) Q_DECL_OVERRIDE; + virtual void RefreshGeometry() override; + virtual void VisualMode(const quint32 &id) override; void setObject2Id(const quint32 &value); void setVCrossPoint(const VCrossCurvesPoint &value); void setHCrossPoint(const HCrossCurvesPoint &value); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::ToolPointOfIntersectionCurves)}; private: Q_DISABLE_COPY(VisToolPointOfIntersectionCurves) diff --git a/src/libs/vtools/visualization/path/vistoolspline.h b/src/libs/vtools/visualization/path/vistoolspline.h index 3d66dcf30..c9ddfc013 100644 --- a/src/libs/vtools/visualization/path/vistoolspline.h +++ b/src/libs/vtools/visualization/path/vistoolspline.h @@ -50,7 +50,7 @@ public: explicit VisToolSpline(const VContainer *data, QGraphicsItem *parent = nullptr); virtual ~VisToolSpline(); - virtual void RefreshGeometry() Q_DECL_OVERRIDE; + virtual void RefreshGeometry() override; void setObject4Id(const quint32 &value); void SetAngle1(const qreal &value); @@ -62,7 +62,7 @@ public: QPointF GetP2() const; QPointF GetP3() const; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::ToolSpline)}; public slots: void MouseLeftPressed(); diff --git a/src/libs/vtools/visualization/path/vistoolsplinepath.h b/src/libs/vtools/visualization/path/vistoolsplinepath.h index 2e4580973..845fedb29 100644 --- a/src/libs/vtools/visualization/path/vistoolsplinepath.h +++ b/src/libs/vtools/visualization/path/vistoolsplinepath.h @@ -51,12 +51,12 @@ public: explicit VisToolSplinePath(const VContainer *data, QGraphicsItem *parent = nullptr); virtual ~VisToolSplinePath(); - virtual void RefreshGeometry() Q_DECL_OVERRIDE; + virtual void RefreshGeometry() override; void setPath(const VSplinePath &value); VSplinePath getPath(); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::ToolSplinePath)}; signals: void PathChanged(const VSplinePath &path); diff --git a/src/libs/vwidgets/fancytabbar/fancytabbar.h b/src/libs/vwidgets/fancytabbar/fancytabbar.h index c8c2bd2a9..e696ab13c 100644 --- a/src/libs/vwidgets/fancytabbar/fancytabbar.h +++ b/src/libs/vwidgets/fancytabbar/fancytabbar.h @@ -55,8 +55,8 @@ public: FancyTabBar(const TabBarPosition position, QWidget *parent = nullptr); virtual ~FancyTabBar() Q_DECL_EQ_DEFAULT; - virtual QSize sizeHint() const Q_DECL_OVERRIDE; - virtual QSize minimumSizeHint() const Q_DECL_OVERRIDE; + virtual QSize sizeHint() const override; + virtual QSize minimumSizeHint() const override; void SetOrientation(const TabBarPosition p); @@ -84,12 +84,12 @@ signals: void CurrentChanged(int); protected: - virtual bool event(QEvent *event) Q_DECL_OVERRIDE; - virtual void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; - virtual void mousePressEvent(QMouseEvent *) Q_DECL_OVERRIDE; - virtual void mouseMoveEvent(QMouseEvent *) Q_DECL_OVERRIDE; - virtual void enterEvent(QEvent *) Q_DECL_OVERRIDE; - virtual void leaveEvent(QEvent *) Q_DECL_OVERRIDE; + virtual bool event(QEvent *event) override; + virtual void paintEvent(QPaintEvent *event) override; + virtual void mousePressEvent(QMouseEvent *) override; + virtual void mouseMoveEvent(QMouseEvent *) override; + virtual void enterEvent(QEvent *) override; + virtual void leaveEvent(QEvent *) override; private slots: void EmitCurrentIndex(); diff --git a/src/libs/vwidgets/scalesceneitems.h b/src/libs/vwidgets/scalesceneitems.h index 412137372..aaf468826 100644 --- a/src/libs/vwidgets/scalesceneitems.h +++ b/src/libs/vwidgets/scalesceneitems.h @@ -40,11 +40,11 @@ public: VScaledLine(const QLineF &line, QGraphicsItem * parent = nullptr); virtual ~VScaledLine() = default; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::ScaledLine)}; virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = nullptr) Q_DECL_OVERRIDE; + QWidget *widget = nullptr) override; bool IsBoldLine() const; void SetBoldLine(bool bold); @@ -62,11 +62,11 @@ public: explicit VScaledEllipse(QGraphicsItem * parent = nullptr); virtual ~VScaledEllipse() = default; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::ScaledEllipse)}; virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = nullptr) Q_DECL_OVERRIDE; + QWidget *widget = nullptr) override; private: Q_DISABLE_COPY(VScaledEllipse) }; diff --git a/src/libs/vwidgets/vcontrolpointspline.h b/src/libs/vwidgets/vcontrolpointspline.h index f27322b67..a0fdd07a6 100644 --- a/src/libs/vwidgets/vcontrolpointspline.h +++ b/src/libs/vwidgets/vcontrolpointspline.h @@ -55,11 +55,11 @@ public: bool freeAngle, bool freeLength, QGraphicsItem * parent = nullptr); virtual ~VControlPointSpline() =default; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::ControlPointSpline)}; virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = nullptr) Q_DECL_OVERRIDE; + QWidget *widget = nullptr) override; signals: /** * @brief ControlPointChangePosition emit when control point change position. @@ -84,11 +84,11 @@ protected: /** @brief controlLine pointer to line control point. */ VScaledLine *controlLine; - virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent * event ) Q_DECL_OVERRIDE; - QVariant itemChange ( GraphicsItemChange change, const QVariant &value ) Q_DECL_OVERRIDE; - virtual void mousePressEvent( QGraphicsSceneMouseEvent * event ) Q_DECL_OVERRIDE; - virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ) Q_DECL_OVERRIDE; - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent *event ) Q_DECL_OVERRIDE; + virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent * event ) override; + QVariant itemChange ( GraphicsItemChange change, const QVariant &value ) override; + virtual void mousePressEvent( QGraphicsSceneMouseEvent * event ) override; + virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ) override; + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent *event ) override; private: Q_DISABLE_COPY(VControlPointSpline) /** @brief indexSpline index spline in list.. */ diff --git a/src/libs/vwidgets/vcurvepathitem.h b/src/libs/vwidgets/vcurvepathitem.h index 7d35ca3d7..d1fd47d22 100644 --- a/src/libs/vwidgets/vcurvepathitem.h +++ b/src/libs/vwidgets/vcurvepathitem.h @@ -40,12 +40,12 @@ public: explicit VCurvePathItem(QGraphicsItem *parent = nullptr); virtual ~VCurvePathItem() = default; - virtual QPainterPath shape() const Q_DECL_OVERRIDE; + virtual QPainterPath shape() const override; virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = nullptr) Q_DECL_OVERRIDE; + QWidget *widget = nullptr) override; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::CurvePathItem)}; void SetDirectionArrows(const QVector> &arrows); diff --git a/src/libs/vwidgets/vgrainlineitem.h b/src/libs/vwidgets/vgrainlineitem.h index 50382c4ad..a503ea7c2 100644 --- a/src/libs/vwidgets/vgrainlineitem.h +++ b/src/libs/vwidgets/vgrainlineitem.h @@ -40,12 +40,12 @@ public: explicit VGrainlineItem(QGraphicsItem* pParent = nullptr); virtual ~VGrainlineItem() Q_DECL_EQ_DEFAULT; - virtual QPainterPath shape() const Q_DECL_OVERRIDE; + virtual QPainterPath shape() const override; - virtual void paint(QPainter* pP, const QStyleOptionGraphicsItem* pOption, QWidget* pWidget) Q_DECL_OVERRIDE; + virtual void paint(QPainter* pP, const QStyleOptionGraphicsItem* pOption, QWidget* pWidget) override; void UpdateGeometry(const QPointF& ptPos, qreal dRotation, qreal dLength, ArrowType eAT); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::GrainlineItem)}; bool IsContained(const QPointF &pt, qreal dRot, qreal &dX, qreal &dY) const; @@ -55,15 +55,15 @@ signals: void SignalRotated(qreal dRot, const QPointF& ptNewPos); protected: - virtual void mousePressEvent(QGraphicsSceneMouseEvent* pME) Q_DECL_OVERRIDE; - virtual void mouseMoveEvent(QGraphicsSceneMouseEvent* pME) Q_DECL_OVERRIDE; - virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent* pME) Q_DECL_OVERRIDE; - virtual void hoverEnterEvent(QGraphicsSceneHoverEvent* pME) Q_DECL_OVERRIDE; - virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent* pME) Q_DECL_OVERRIDE; - virtual void Update() Q_DECL_OVERRIDE; + virtual void mousePressEvent(QGraphicsSceneMouseEvent* pME) override; + virtual void mouseMoveEvent(QGraphicsSceneMouseEvent* pME) override; + virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent* pME) override; + virtual void hoverEnterEvent(QGraphicsSceneHoverEvent* pME) override; + virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent* pME) override; + virtual void Update() override; void UpdateRectangle(); - virtual double GetAngle(const QPointF &pt) const Q_DECL_OVERRIDE; + virtual double GetAngle(const QPointF &pt) const override; QPointF Rotate(const QPointF& pt, const QPointF& ptCenter, qreal dAng) const; QPointF GetInsideCorner(int i, qreal dDist) const; diff --git a/src/libs/vwidgets/vgraphicssimpletextitem.h b/src/libs/vwidgets/vgraphicssimpletextitem.h index 72a24dc8c..f6d6b5be0 100644 --- a/src/libs/vwidgets/vgraphicssimpletextitem.h +++ b/src/libs/vwidgets/vgraphicssimpletextitem.h @@ -53,11 +53,11 @@ public: virtual ~VGraphicsSimpleTextItem() =default; qint32 BaseFontSize()const; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::GraphicsSimpleTextItem)}; virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = nullptr) Q_DECL_OVERRIDE; + QWidget *widget = nullptr) override; void setEnabled(bool enabled); void LabelSelectionType(const SelectionType &type); @@ -76,13 +76,13 @@ signals: void PointChoosed(); void PointSelected(bool selected); protected: - virtual QVariant itemChange ( GraphicsItemChange change, const QVariant &value ) Q_DECL_OVERRIDE; - virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent *event ) Q_DECL_OVERRIDE; - virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent *event ) Q_DECL_OVERRIDE; - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent *event ) Q_DECL_OVERRIDE; - virtual void mousePressEvent( QGraphicsSceneMouseEvent * event ) Q_DECL_OVERRIDE; - virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ) Q_DECL_OVERRIDE; - virtual void keyReleaseEvent ( QKeyEvent * event ) Q_DECL_OVERRIDE; + virtual QVariant itemChange ( GraphicsItemChange change, const QVariant &value ) override; + virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent *event ) override; + virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent *event ) override; + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent *event ) override; + virtual void mousePressEvent( QGraphicsSceneMouseEvent * event ) override; + virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ) override; + virtual void keyReleaseEvent ( QKeyEvent * event ) override; private: /** @brief fontSize label font size. */ qint32 m_fontSize; diff --git a/src/libs/vwidgets/vlineedit.h b/src/libs/vwidgets/vlineedit.h index feae812a1..cf9cb401e 100644 --- a/src/libs/vwidgets/vlineedit.h +++ b/src/libs/vwidgets/vlineedit.h @@ -39,9 +39,9 @@ public: VLineEdit(const QString &contents, QWidget *parent = nullptr); protected: - virtual void focusInEvent(QFocusEvent *e) Q_DECL_OVERRIDE; - virtual void focusOutEvent(QFocusEvent *e) Q_DECL_OVERRIDE; - virtual void mousePressEvent(QMouseEvent *e) Q_DECL_OVERRIDE; + virtual void focusInEvent(QFocusEvent *e) override; + virtual void focusOutEvent(QFocusEvent *e) override; + virtual void mousePressEvent(QMouseEvent *e) override; private: Q_DISABLE_COPY(VLineEdit) bool m_selectOnMousePress; diff --git a/src/libs/vwidgets/vmaingraphicsscene.h b/src/libs/vwidgets/vmaingraphicsscene.h index 2100cfe15..9a67ccf73 100644 --- a/src/libs/vwidgets/vmaingraphicsscene.h +++ b/src/libs/vwidgets/vmaingraphicsscene.h @@ -93,9 +93,9 @@ public slots: void ToggleNodePointHover(bool enabled); void ToggleDetailHover(bool enabled); protected: - virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; - virtual void mousePressEvent(QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; - virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; + virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override; + virtual void mousePressEvent(QGraphicsSceneMouseEvent *event) override; + virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; signals: /** * @brief mouseMove send new mouse position. diff --git a/src/libs/vwidgets/vmaingraphicsview.h b/src/libs/vwidgets/vmaingraphicsview.h index 652fa0b30..feb1b81e1 100644 --- a/src/libs/vwidgets/vmaingraphicsview.h +++ b/src/libs/vwidgets/vmaingraphicsview.h @@ -86,7 +86,7 @@ public slots: void HorizontalScrollingTime(qreal x); void animFinished(); protected: - virtual bool eventFilter(QObject* object, QEvent* event) Q_DECL_OVERRIDE; + virtual bool eventFilter(QObject* object, QEvent* event) override; private: Q_DISABLE_COPY(GraphicsViewZoom) QGraphicsView *_view; @@ -155,10 +155,10 @@ public slots: void ZoomFitBest(); void ResetScrollingAnimation(); protected: - virtual void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - virtual void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - virtual void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - virtual void mouseDoubleClickEvent(QMouseEvent *event) Q_DECL_OVERRIDE; + virtual void mousePressEvent(QMouseEvent *event) override; + virtual void mouseMoveEvent(QMouseEvent *event) override; + virtual void mouseReleaseEvent(QMouseEvent *event) override; + virtual void mouseDoubleClickEvent(QMouseEvent *event) override; private: Q_DISABLE_COPY(VMainGraphicsView) GraphicsViewZoom* zoom; diff --git a/src/libs/vwidgets/vnobrushscalepathitem.h b/src/libs/vwidgets/vnobrushscalepathitem.h index 69af67987..b15f5324c 100644 --- a/src/libs/vwidgets/vnobrushscalepathitem.h +++ b/src/libs/vwidgets/vnobrushscalepathitem.h @@ -42,9 +42,9 @@ public: protected: virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, - QWidget * widget = nullptr) Q_DECL_OVERRIDE; + QWidget * widget = nullptr) override; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::NoBrush)}; private: diff --git a/src/libs/vwidgets/vpieceitem.h b/src/libs/vwidgets/vpieceitem.h index ce13689a7..117b1a42d 100644 --- a/src/libs/vwidgets/vpieceitem.h +++ b/src/libs/vwidgets/vpieceitem.h @@ -52,7 +52,7 @@ public: explicit VPieceItem(QGraphicsItem* pParent = nullptr); virtual ~VPieceItem(); - virtual QRectF boundingRect() const Q_DECL_OVERRIDE; + virtual QRectF boundingRect() const override; virtual void Update() =0; @@ -62,7 +62,7 @@ public: VPieceItem::MoveTypes GetMoveType() const; void SetMoveType(const VPieceItem::MoveTypes &moveType); - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::PieceItem)}; signals: diff --git a/src/libs/vwidgets/vscenepoint.h b/src/libs/vwidgets/vscenepoint.h index 08b019bb5..5a9456434 100644 --- a/src/libs/vwidgets/vscenepoint.h +++ b/src/libs/vwidgets/vscenepoint.h @@ -44,11 +44,11 @@ public: explicit VScenePoint(QGraphicsItem *parent = nullptr); virtual ~VScenePoint() = default; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::ScenePoint)}; virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = nullptr) Q_DECL_OVERRIDE; + QWidget *widget = nullptr) override; virtual void RefreshPointGeometry(const VPointF &point); void RefreshLine(); @@ -69,8 +69,8 @@ protected: bool m_selectedFromChild; - virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event) Q_DECL_OVERRIDE; - virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) Q_DECL_OVERRIDE; + virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; + virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; void SetOnlyPoint(bool value); bool IsOnlyPoint() const; diff --git a/src/libs/vwidgets/vsimplecurve.h b/src/libs/vwidgets/vsimplecurve.h index 0da5c1317..64aaa42d6 100644 --- a/src/libs/vwidgets/vsimplecurve.h +++ b/src/libs/vwidgets/vsimplecurve.h @@ -53,7 +53,7 @@ public: VSimpleCurve(quint32 id, const QSharedPointer &curve, QObject *parent = nullptr); virtual ~VSimpleCurve() Q_DECL_EQ_DEFAULT; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::SimpleCurve)}; void RefreshGeometry(const QSharedPointer &curve); @@ -70,14 +70,14 @@ public slots: void CurveSelected(bool selected); protected: - virtual void mousePressEvent( QGraphicsSceneMouseEvent * event ) Q_DECL_OVERRIDE; - virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ) Q_DECL_OVERRIDE; - virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent * event ) Q_DECL_OVERRIDE; - virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ) Q_DECL_OVERRIDE; - virtual QVariant itemChange ( GraphicsItemChange change, const QVariant &value ) Q_DECL_OVERRIDE; - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) Q_DECL_OVERRIDE; - virtual void keyReleaseEvent ( QKeyEvent * event ) Q_DECL_OVERRIDE; - virtual void ScalePenWidth() Q_DECL_OVERRIDE; + virtual void mousePressEvent( QGraphicsSceneMouseEvent * event ) override; + virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ) override; + virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent * event ) override; + virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ) override; + virtual QVariant itemChange ( GraphicsItemChange change, const QVariant &value ) override; + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) override; + virtual void keyReleaseEvent ( QKeyEvent * event ) override; + virtual void ScalePenWidth() override; private: Q_DISABLE_COPY(VSimpleCurve) diff --git a/src/libs/vwidgets/vsimplepoint.h b/src/libs/vwidgets/vsimplepoint.h index 5d2d7e5fb..d80c32959 100644 --- a/src/libs/vwidgets/vsimplepoint.h +++ b/src/libs/vwidgets/vsimplepoint.h @@ -53,7 +53,7 @@ public: VSimplePoint(quint32 id, const QColor ¤tColor, QObject *parent = nullptr); virtual ~VSimplePoint() = default; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::SimplePoint)}; using VScenePoint::SetOnlyPoint; @@ -68,7 +68,7 @@ public: void EnableToolMove(bool move); void AllowLabelHover(bool enabled); void AllowLabelSelecting(bool enabled); - virtual void ToolSelectionType(const SelectionType &type) Q_DECL_OVERRIDE; + virtual void ToolSelectionType(const SelectionType &type) override; signals: /** * @brief Choosed send id when clicked. @@ -85,13 +85,13 @@ public slots: void ChangedPosition(const QPointF &pos); protected: - virtual void mousePressEvent( QGraphicsSceneMouseEvent * event ) Q_DECL_OVERRIDE; - virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ) Q_DECL_OVERRIDE; - virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event) Q_DECL_OVERRIDE; - virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) Q_DECL_OVERRIDE; - virtual void keyReleaseEvent ( QKeyEvent * event ) Q_DECL_OVERRIDE; - virtual QVariant itemChange ( GraphicsItemChange change, const QVariant &value ) Q_DECL_OVERRIDE; - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) Q_DECL_OVERRIDE; + virtual void mousePressEvent( QGraphicsSceneMouseEvent * event ) override; + virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ) override; + virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; + virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; + virtual void keyReleaseEvent ( QKeyEvent * event ) override; + virtual QVariant itemChange ( GraphicsItemChange change, const QVariant &value ) override; + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) override; private: Q_DISABLE_COPY(VSimplePoint) diff --git a/src/libs/vwidgets/vtextgraphicsitem.h b/src/libs/vwidgets/vtextgraphicsitem.h index 31a304953..0bbbbabaa 100644 --- a/src/libs/vwidgets/vtextgraphicsitem.h +++ b/src/libs/vwidgets/vtextgraphicsitem.h @@ -55,10 +55,10 @@ public: explicit VTextGraphicsItem(QGraphicsItem* pParent = nullptr); virtual ~VTextGraphicsItem() Q_DECL_EQ_DEFAULT; - virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) Q_DECL_OVERRIDE; - virtual void Update() Q_DECL_OVERRIDE; + virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; + virtual void Update() override; - virtual int type() const Q_DECL_OVERRIDE {return Type;} + virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Vis::TextGraphicsItem)}; void SetFont(const QFont& fnt); @@ -70,11 +70,11 @@ public: int GetTextLines() const; protected: - virtual void mousePressEvent(QGraphicsSceneMouseEvent* pME) Q_DECL_OVERRIDE; - virtual void mouseMoveEvent(QGraphicsSceneMouseEvent* pME) Q_DECL_OVERRIDE; - virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent* pME) Q_DECL_OVERRIDE; - virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *pME) Q_DECL_OVERRIDE; - virtual void hoverMoveEvent(QGraphicsSceneHoverEvent* pHE) Q_DECL_OVERRIDE; + virtual void mousePressEvent(QGraphicsSceneMouseEvent* pME) override; + virtual void mouseMoveEvent(QGraphicsSceneMouseEvent* pME) override; + virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent* pME) override; + virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *pME) override; + virtual void hoverMoveEvent(QGraphicsSceneHoverEvent* pHE) override; void UpdateBox(); void CorrectLabel(); diff --git a/src/test/TranslationsTest/tst_buitinregexp.h b/src/test/TranslationsTest/tst_buitinregexp.h index a7b5eba3c..4c209bac8 100644 --- a/src/test/TranslationsTest/tst_buitinregexp.h +++ b/src/test/TranslationsTest/tst_buitinregexp.h @@ -44,8 +44,8 @@ public: virtual ~TST_BuitInRegExp() Q_DECL_EQ_DEFAULT; protected: - virtual void PrepareData() Q_DECL_OVERRIDE; - virtual QStringList AllNames() Q_DECL_OVERRIDE; + virtual void PrepareData() override; + virtual QStringList AllNames() override; private slots: void initTestCase(); diff --git a/src/test/TranslationsTest/tst_measurementregexp.h b/src/test/TranslationsTest/tst_measurementregexp.h index 8c3754df8..8856d7a16 100644 --- a/src/test/TranslationsTest/tst_measurementregexp.h +++ b/src/test/TranslationsTest/tst_measurementregexp.h @@ -46,8 +46,8 @@ public: static const quint32 systemCounts; protected: - virtual void PrepareData() Q_DECL_OVERRIDE; - virtual QStringList AllNames() Q_DECL_OVERRIDE; + virtual void PrepareData() override; + virtual QStringList AllNames() override; private slots: void initTestCase(); diff --git a/src/test/TranslationsTest/tst_qmuparsererrormsg.h b/src/test/TranslationsTest/tst_qmuparsererrormsg.h index 165535eef..909443ad4 100644 --- a/src/test/TranslationsTest/tst_qmuparsererrormsg.h +++ b/src/test/TranslationsTest/tst_qmuparsererrormsg.h @@ -40,7 +40,7 @@ class TST_QmuParserErrorMsg : public AbstractTest Q_OBJECT public: explicit TST_QmuParserErrorMsg(const QString &locale, QObject *parent = nullptr); - virtual ~TST_QmuParserErrorMsg() Q_DECL_OVERRIDE; + virtual ~TST_QmuParserErrorMsg() override; private slots: void initTestCase();