diff --git a/src/app/core/vapplication.h b/src/app/core/vapplication.h index bb86c87fd..82962ce9e 100644 --- a/src/app/core/vapplication.h +++ b/src/app/core/vapplication.h @@ -56,9 +56,9 @@ class VApplication : public VAbstractApplication Q_OBJECT public: VApplication(int &argc, char ** argv); - virtual ~VApplication(); + virtual ~VApplication() Q_DECL_OVERRIDE; static void NewValentina(const QString &fileName = QString()); - virtual bool notify(QObject * receiver, QEvent * event); + virtual bool notify(QObject * receiver, QEvent * event) Q_DECL_OVERRIDE; void InitOptions(); diff --git a/src/app/core/vformulaproperty.h b/src/app/core/vformulaproperty.h index ee63ee3cd..7e21aa11e 100644 --- a/src/app/core/vformulaproperty.h +++ b/src/app/core/vformulaproperty.h @@ -40,7 +40,7 @@ public: VFormulaProperty(const QString &name); //! Get the data how it should be displayed - virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const; + virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; //! Returns item flags Qt::ItemFlags flags(int column = DPC_Name) const; @@ -51,38 +51,38 @@ 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) Q_DECL_OVERRIDE; //! Sets the property's data to the editor (returns false, if the standard delegate should do that) - virtual bool setEditorData(QWidget* editor); + virtual bool setEditorData(QWidget* editor) Q_DECL_OVERRIDE; //! Gets the data from the widget - virtual QVariant getEditorData(const QWidget* editor) const; + virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE; //! Returns a string containing the type of the property - virtual QString type() const; + virtual QString type() const Q_DECL_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 Q_DECL_OVERRIDE; //! Sets the value of the property - virtual void setValue(const QVariant& value); + virtual void setValue(const QVariant& value) Q_DECL_OVERRIDE; //! Returns the value of the property as a QVariant - virtual QVariant getValue() const; + virtual QVariant getValue() const Q_DECL_OVERRIDE; //! Returns the formula - virtual VFormula GetFormula() const; + VFormula GetFormula() const; //! Sets the formula - virtual void SetFormula(const VFormula &formula); + void SetFormula(const VFormula &formula); public slots: - virtual void ValueChildChanged(const QVariant &value, int typeForParent); + virtual void ValueChildChanged(const QVariant &value, int typeForParent) Q_DECL_OVERRIDE; }; diff --git a/src/app/core/vformulapropertyeditor.h b/src/app/core/vformulapropertyeditor.h index e57910837..991dc0b27 100644 --- a/src/app/core/vformulapropertyeditor.h +++ b/src/app/core/vformulapropertyeditor.h @@ -46,7 +46,7 @@ public: VFormulaPropertyEditor(QWidget *parent); //! Destructor - virtual ~VFormulaPropertyEditor(); + virtual ~VFormulaPropertyEditor() Q_DECL_OVERRIDE; //! Returns the formula currently set VFormula GetFormula() const; diff --git a/src/app/dialogs/configdialog.h b/src/app/dialogs/configdialog.h index 3eac9336f..76250776d 100644 --- a/src/app/dialogs/configdialog.h +++ b/src/app/dialogs/configdialog.h @@ -46,7 +46,7 @@ public slots: signals: void UpdateProperties(); protected: - virtual void closeEvent(QCloseEvent *event); + virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(ConfigDialog) QListWidget *contentsWidget; diff --git a/src/app/dialogs/dialoghistory.h b/src/app/dialogs/dialoghistory.h index 74156e5a7..fc327c107 100644 --- a/src/app/dialogs/dialoghistory.h +++ b/src/app/dialogs/dialoghistory.h @@ -49,13 +49,13 @@ class DialogHistory : public DialogTool Q_OBJECT public: DialogHistory(VContainer *data, VPattern *doc, QWidget *parent = nullptr); - virtual ~DialogHistory(); + virtual ~DialogHistory() Q_DECL_OVERRIDE; public slots: - virtual void DialogAccepted(); + virtual void DialogAccepted() Q_DECL_OVERRIDE; /** TODO ISSUE 79 : create real function * @brief DialogApply apply data and emit signal about applied dialog. */ - virtual void DialogApply(){} + virtual void DialogApply() Q_DECL_OVERRIDE {} void cellClicked(int row, int column); void ChangedCursor(quint32 id); void UpdateHistory(); @@ -67,7 +67,7 @@ signals: */ void ShowHistoryTool(quint32 id, bool enable); protected: - virtual void closeEvent ( QCloseEvent * event ); + virtual void closeEvent ( QCloseEvent * event ) Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(DialogHistory) diff --git a/src/app/dialogs/dialogincrements.h b/src/app/dialogs/dialogincrements.h index 38adff800..0ade70e35 100644 --- a/src/app/dialogs/dialogincrements.h +++ b/src/app/dialogs/dialogincrements.h @@ -73,7 +73,7 @@ signals: */ void haveLiteChange(); protected: - virtual void closeEvent ( QCloseEvent * event ); + virtual void closeEvent ( QCloseEvent * event ) Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(DialogIncrements) diff --git a/src/app/dialogs/dialogpatternproperties.h b/src/app/dialogs/dialogpatternproperties.h index 3e19d6d43..d66264221 100644 --- a/src/app/dialogs/dialogpatternproperties.h +++ b/src/app/dialogs/dialogpatternproperties.h @@ -46,7 +46,7 @@ class DialogPatternProperties : public QDialog Q_OBJECT public: DialogPatternProperties(VPattern *doc, QWidget *parent = nullptr); - virtual ~DialogPatternProperties(); + virtual ~DialogPatternProperties() Q_DECL_OVERRIDE; signals: void UpdateGradation(); public slots: diff --git a/src/app/mainwindow.h b/src/app/mainwindow.h index b0db7bda5..08975286a 100644 --- a/src/app/mainwindow.h +++ b/src/app/mainwindow.h @@ -52,7 +52,7 @@ class MainWindow : public MainWindowsNoGUI Q_OBJECT public: explicit MainWindow(QWidget *parent = nullptr); - virtual ~MainWindow(); + virtual ~MainWindow() Q_DECL_OVERRIDE; void LoadPattern(const QString &curFile); void ReopenFilesAfterCrash(QStringList &args); public slots: @@ -149,13 +149,13 @@ signals: void RefreshHistory(); void EnableItemMove(bool move); protected: - virtual void keyPressEvent(QKeyEvent *event); - virtual void showEvent(QShowEvent *event); - virtual void closeEvent(QCloseEvent *event); - virtual void customEvent(QEvent * event); + virtual void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; + virtual void showEvent(QShowEvent *event) Q_DECL_OVERRIDE; + virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; + virtual void customEvent(QEvent * event) Q_DECL_OVERRIDE; - virtual void CleanLayout(); - virtual void PrepareSceneList(); + virtual void CleanLayout() Q_DECL_OVERRIDE; + virtual void PrepareSceneList() Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(MainWindow) /** @brief ui keeps information about user interface */ diff --git a/src/app/mainwindowsnogui.h b/src/app/mainwindowsnogui.h index 2e3b39a4d..4b1b78760 100644 --- a/src/app/mainwindowsnogui.h +++ b/src/app/mainwindowsnogui.h @@ -43,7 +43,7 @@ class MainWindowsNoGUI : public QMainWindow Q_OBJECT public: MainWindowsNoGUI(QWidget *parent = nullptr); - virtual ~MainWindowsNoGUI(); + virtual ~MainWindowsNoGUI() Q_DECL_OVERRIDE; public slots: void ToolLayoutSettings(bool checked); diff --git a/src/app/xml/vabstractmeasurements.h b/src/app/xml/vabstractmeasurements.h index 3d0501cfe..280bf70c2 100644 --- a/src/app/xml/vabstractmeasurements.h +++ b/src/app/xml/vabstractmeasurements.h @@ -36,7 +36,7 @@ class VAbstractMeasurements : public VDomDocument { public: VAbstractMeasurements(VContainer *data); - virtual ~VAbstractMeasurements(); + virtual ~VAbstractMeasurements() Q_DECL_OVERRIDE; virtual void Measurements(); Unit MUnit() const; static const QString TagUnit; diff --git a/src/app/xml/vindividualmeasurements.h b/src/app/xml/vindividualmeasurements.h index 50e339c2e..3b246ca55 100644 --- a/src/app/xml/vindividualmeasurements.h +++ b/src/app/xml/vindividualmeasurements.h @@ -45,9 +45,9 @@ class VIndividualMeasurements:public VAbstractMeasurements { public: VIndividualMeasurements(VContainer *data); - virtual ~VIndividualMeasurements(); + virtual ~VIndividualMeasurements() Q_DECL_OVERRIDE; void setUnit(const Unit &unit); - virtual void Measurements(); + virtual void Measurements() Q_DECL_OVERRIDE; QString FamilyName() const; void setFamilyName(const QString &text); QString GivenName() const; @@ -70,7 +70,7 @@ public: static QString GenderToStr(const SexType &sex); static SexType StrToGender(const QString &sex); protected: - virtual void ReadMeasurement(const QDomElement &domElement, const QString &tag); + virtual void ReadMeasurement(const QDomElement &domElement, const QString &tag) Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(VIndividualMeasurements) }; diff --git a/src/app/xml/vpattern.h b/src/app/xml/vpattern.h index e85a0392a..b42b26575 100644 --- a/src/app/xml/vpattern.h +++ b/src/app/xml/vpattern.h @@ -46,32 +46,32 @@ public: VPattern(VContainer *data, Draw *mode, VMainGraphicsScene *sceneDraw, VMainGraphicsScene *sceneDetail, QObject *parent = nullptr); - virtual void CreateEmptyFile(const QString &tablePath); + virtual void CreateEmptyFile(const QString &tablePath) Q_DECL_OVERRIDE; void Parse(const Document &parse); void setCurrentData(); - virtual void UpdateToolData(const quint32 &id, VContainer *data); + virtual void UpdateToolData(const quint32 &id, VContainer *data) Q_DECL_OVERRIDE; - virtual void IncrementReferens(quint32 id) const; - virtual void DecrementReferens(quint32 id) const; + virtual void IncrementReferens(quint32 id) const Q_DECL_OVERRIDE; + virtual void DecrementReferens(quint32 id) const Q_DECL_OVERRIDE; quint32 SPointActiveDraw(); - virtual bool SaveDocument(const QString &fileName, QString &error) const; + virtual bool SaveDocument(const QString &fileName, QString &error) const Q_DECL_OVERRIDE; QRectF ActiveDrawBoundingRect() const; QString GetAuthor() const; void SetAuthor(const QString &text); - virtual QString GenerateLabel(const LabelType &type, const QString &reservedName = QString())const; + virtual QString GenerateLabel(const LabelType &type, const QString &reservedName = QString())const Q_DECL_OVERRIDE; public slots: void LiteParseTree(const Document &parse); protected: - virtual void customEvent(QEvent * event); + virtual void customEvent(QEvent * event) Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(VPattern) diff --git a/src/app/xml/vstandardmeasurements.h b/src/app/xml/vstandardmeasurements.h index b5f822d68..ca758827d 100644 --- a/src/app/xml/vstandardmeasurements.h +++ b/src/app/xml/vstandardmeasurements.h @@ -43,7 +43,7 @@ class VStandardMeasurements:public VAbstractMeasurements { public: VStandardMeasurements(VContainer *data); - virtual ~VStandardMeasurements(); + virtual ~VStandardMeasurements() Q_DECL_OVERRIDE; QString OrigDescription (); QString TrDescription (); QString Id(); @@ -63,7 +63,7 @@ public: static const QString AttrHeight_increase; static const QString AttrBase; protected: - virtual void ReadMeasurement(const QDomElement &domElement, const QString &tag); + virtual void ReadMeasurement(const QDomElement &domElement, const QString &tag) Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(VStandardMeasurements) qreal TakeParametr(const QString &tag, const QString &attr, qreal defValue) const; diff --git a/src/libs/ifc/exception/vexception.h b/src/libs/ifc/exception/vexception.h index 66f6eb1f3..66dcb63ed 100644 --- a/src/libs/ifc/exception/vexception.h +++ b/src/libs/ifc/exception/vexception.h @@ -46,11 +46,11 @@ public: VException(const QString &what); VException(const VException &e); VException &operator=(const VException &e); - virtual ~VException() V_NOEXCEPT_EXPR (true){} + virtual ~VException() V_NOEXCEPT_EXPR (true) Q_DECL_OVERRIDE {} - Q_NORETURN virtual void raise() const; + Q_NORETURN virtual void raise() const Q_DECL_OVERRIDE; // cppcheck-suppress unusedFunction - virtual VException *clone() const; + virtual VException *clone() const Q_DECL_OVERRIDE; virtual QString ErrorMessage() const; virtual QString DetailedInformation() const; QString What() const; diff --git a/src/libs/ifc/exception/vexceptionbadid.h b/src/libs/ifc/exception/vexceptionbadid.h index 72ce160c5..2365f2b28 100644 --- a/src/libs/ifc/exception/vexceptionbadid.h +++ b/src/libs/ifc/exception/vexceptionbadid.h @@ -41,8 +41,8 @@ public: VExceptionBadId(const QString &what, const QString &key); VExceptionBadId(const VExceptionBadId &e); VExceptionBadId &operator=(const VExceptionBadId &e); - virtual ~VExceptionBadId() V_NOEXCEPT_EXPR (true){} - virtual QString ErrorMessage() const; + virtual ~VExceptionBadId() V_NOEXCEPT_EXPR (true) Q_DECL_OVERRIDE {} + virtual QString ErrorMessage() const Q_DECL_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 9a6fa3224..9a413feea 100644 --- a/src/libs/ifc/exception/vexceptionconversionerror.h +++ b/src/libs/ifc/exception/vexceptionconversionerror.h @@ -39,8 +39,8 @@ class VExceptionConversionError : public VException public: VExceptionConversionError(const QString &what, const QString &str); VExceptionConversionError(const VExceptionConversionError &e); - virtual ~VExceptionConversionError() V_NOEXCEPT_EXPR (true); - virtual QString ErrorMessage() const; + virtual ~VExceptionConversionError() V_NOEXCEPT_EXPR (true) Q_DECL_OVERRIDE; + virtual QString ErrorMessage() const Q_DECL_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 61571f34a..ad1ab1b08 100644 --- a/src/libs/ifc/exception/vexceptionemptyparameter.h +++ b/src/libs/ifc/exception/vexceptionemptyparameter.h @@ -41,9 +41,9 @@ class VExceptionEmptyParameter : public VException public: VExceptionEmptyParameter(const QString &what, const QString &name, const QDomElement &domElement); VExceptionEmptyParameter(const VExceptionEmptyParameter &e); - virtual ~VExceptionEmptyParameter() V_NOEXCEPT_EXPR (true); - virtual QString ErrorMessage() const; - virtual QString DetailedInformation() const; + virtual ~VExceptionEmptyParameter() V_NOEXCEPT_EXPR (true) Q_DECL_OVERRIDE; + virtual QString ErrorMessage() const Q_DECL_OVERRIDE; + virtual QString DetailedInformation() const Q_DECL_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 f1e6a5aae..dbdf434f7 100644 --- a/src/libs/ifc/exception/vexceptionobjecterror.h +++ b/src/libs/ifc/exception/vexceptionobjecterror.h @@ -41,9 +41,9 @@ class VExceptionObjectError : public VException public: VExceptionObjectError(const QString &what, const QDomElement &domElement); VExceptionObjectError(const VExceptionObjectError &e); - virtual ~VExceptionObjectError() V_NOEXCEPT_EXPR (true) {} - virtual QString ErrorMessage() const; - virtual QString DetailedInformation() const; + virtual ~VExceptionObjectError() V_NOEXCEPT_EXPR (true) Q_DECL_OVERRIDE {} + virtual QString ErrorMessage() const Q_DECL_OVERRIDE; + virtual QString DetailedInformation() const Q_DECL_OVERRIDE; QString TagText() const; QString TagName() const; qint32 LineNumber() const; diff --git a/src/libs/ifc/exception/vexceptionundo.h b/src/libs/ifc/exception/vexceptionundo.h index be4110863..c8adcd8e4 100644 --- a/src/libs/ifc/exception/vexceptionundo.h +++ b/src/libs/ifc/exception/vexceptionundo.h @@ -36,7 +36,7 @@ class VExceptionUndo : public VException public: VExceptionUndo(const QString &what); VExceptionUndo(const VExceptionUndo &e); - virtual ~VExceptionUndo() V_NOEXCEPT_EXPR (true); + virtual ~VExceptionUndo() V_NOEXCEPT_EXPR (true) Q_DECL_OVERRIDE; }; #endif // VEXCEPTIONUNDO_H diff --git a/src/libs/ifc/exception/vexceptionwrongid.h b/src/libs/ifc/exception/vexceptionwrongid.h index 86b73488c..f96ed58b0 100644 --- a/src/libs/ifc/exception/vexceptionwrongid.h +++ b/src/libs/ifc/exception/vexceptionwrongid.h @@ -41,9 +41,9 @@ class VExceptionWrongId : public VException public: VExceptionWrongId(const QString &what, const QDomElement &domElement); VExceptionWrongId(const VExceptionWrongId &e); - virtual ~VExceptionWrongId() V_NOEXCEPT_EXPR (true){} - virtual QString ErrorMessage() const; - virtual QString DetailedInformation() const; + virtual ~VExceptionWrongId() V_NOEXCEPT_EXPR (true) Q_DECL_OVERRIDE {} + virtual QString ErrorMessage() const Q_DECL_OVERRIDE; + virtual QString DetailedInformation() const Q_DECL_OVERRIDE; QString TagText() const; QString TagName() const; qint32 LineNumber() const; diff --git a/src/libs/ifc/xml/vabstractconverter.h b/src/libs/ifc/xml/vabstractconverter.h index 470e4e554..0d56c0c94 100644 --- a/src/libs/ifc/xml/vabstractconverter.h +++ b/src/libs/ifc/xml/vabstractconverter.h @@ -36,10 +36,10 @@ class VAbstractConverter :public VDomDocument Q_DECLARE_TR_FUNCTIONS(VAbstractConverter) public: VAbstractConverter(const QString &fileName); - virtual ~VAbstractConverter(); + virtual ~VAbstractConverter() Q_DECL_OVERRIDE; void Convert(); - virtual bool SaveDocument(const QString &fileName, QString &error) const; + virtual bool SaveDocument(const QString &fileName, QString &error) const Q_DECL_OVERRIDE; protected: int ver; diff --git a/src/libs/ifc/xml/vabstractpattern.h b/src/libs/ifc/xml/vabstractpattern.h index 61af69997..23091bfee 100644 --- a/src/libs/ifc/xml/vabstractpattern.h +++ b/src/libs/ifc/xml/vabstractpattern.h @@ -46,7 +46,7 @@ class VAbstractPattern : public QObject, public VDomDocument Q_OBJECT public: VAbstractPattern(QObject *parent = nullptr); - virtual ~VAbstractPattern(); + virtual ~VAbstractPattern() Q_DECL_OVERRIDE; virtual void CreateEmptyFile(const QString &tablePath)=0; diff --git a/src/libs/ifc/xml/vdomdocument.cpp b/src/libs/ifc/xml/vdomdocument.cpp index 20ad3237f..3487d54f9 100644 --- a/src/libs/ifc/xml/vdomdocument.cpp +++ b/src/libs/ifc/xml/vdomdocument.cpp @@ -51,7 +51,7 @@ public: protected: // cppcheck-suppress unusedFunction virtual void handleMessage(QtMsgType type, const QString &description, - const QUrl &identifier, const QSourceLocation &sourceLocation); + const QUrl &identifier, const QSourceLocation &sourceLocation) Q_DECL_OVERRIDE; private: QtMsgType m_messageType; QString m_description; diff --git a/src/libs/ifc/xml/vpatternconverter.h b/src/libs/ifc/xml/vpatternconverter.h index 5df5443cd..2f747f0da 100644 --- a/src/libs/ifc/xml/vpatternconverter.h +++ b/src/libs/ifc/xml/vpatternconverter.h @@ -36,20 +36,20 @@ class VPatternConverter : public VAbstractConverter Q_DECLARE_TR_FUNCTIONS(VPatternConverter) public: VPatternConverter(const QString &fileName); - virtual ~VPatternConverter(); + virtual ~VPatternConverter() Q_DECL_OVERRIDE; static const QString PatternMaxVerStr; static const QString CurrentSchema; protected: - virtual int MinVer() const; - virtual int MaxVer() const; + virtual int MinVer() const Q_DECL_OVERRIDE; + virtual int MaxVer() const Q_DECL_OVERRIDE; - virtual QString MinVerStr() const; - virtual QString MaxVerStr() const; + virtual QString MinVerStr() const Q_DECL_OVERRIDE; + virtual QString MaxVerStr() const Q_DECL_OVERRIDE; QString XSDSchema(int ver) const; - virtual void ApplyPatches(); + virtual void ApplyPatches() Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(VPatternConverter) diff --git a/src/libs/qmuparser/qmuparser.h b/src/libs/qmuparser/qmuparser.h index d33101f3e..ad9b699cf 100644 --- a/src/libs/qmuparser/qmuparser.h +++ b/src/libs/qmuparser/qmuparser.h @@ -46,11 +46,11 @@ namespace qmu { public: QmuParser(); - virtual void InitCharSets(); - virtual void InitFun(); - virtual void InitConst(); - virtual void InitOprt(); - virtual void OnDetectVar(const QString &pExpr, int &nStart, int &nEnd); + 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; 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 std::locale &s_locale); diff --git a/src/libs/qmuparser/qmuparserbase.h b/src/libs/qmuparser/qmuparserbase.h index aa96547a0..9a6a7956d 100644 --- a/src/libs/qmuparser/qmuparserbase.h +++ b/src/libs/qmuparser/qmuparserbase.h @@ -146,17 +146,17 @@ protected: :std::numpunct(), m_nGroup(nGroup), m_cDecPoint(cDecSep), m_cThousandsSep(cThousandsSep) {} protected: - virtual char_type do_decimal_point() const + virtual char_type do_decimal_point() const Q_DECL_OVERRIDE { return m_cDecPoint; } - virtual char_type do_thousands_sep() const + virtual char_type do_thousands_sep() const Q_DECL_OVERRIDE { return m_cThousandsSep; } - virtual std::string do_grouping() const + virtual std::string do_grouping() const Q_DECL_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 4ec0d90bf..cf0603dd0 100644 --- a/src/libs/qmuparser/qmuparsererror.h +++ b/src/libs/qmuparser/qmuparsererror.h @@ -140,7 +140,7 @@ public: QmuParserError ( const QString &a_szMsg, int a_iPos, const QString &sTok = QString() ); QmuParserError ( const QmuParserError &a_Obj ); QmuParserError& operator= ( const QmuParserError &a_Obj ); - virtual ~QmuParserError() QMUP_NOEXCEPT_EXPR (true){} + virtual ~QmuParserError() QMUP_NOEXCEPT_EXPR (true) Q_DECL_OVERRIDE {} void SetFormula ( const QString &a_strFormula ); const QString& GetExpr() const; @@ -148,8 +148,8 @@ public: int GetPos() const; const QString& GetToken() const; EErrorCodes GetCode() const; - Q_NORETURN virtual void raise() const; - virtual QmuParserError *clone() const; + Q_NORETURN virtual void raise() const Q_DECL_OVERRIDE; + virtual QmuParserError *clone() const Q_DECL_OVERRIDE; private: QString m_sMsg; ///< The message string QString m_sExpr; ///< Formula string diff --git a/src/libs/vgeometry/varc.h b/src/libs/vgeometry/varc.h index 30591883a..dd1e3361a 100644 --- a/src/libs/vgeometry/varc.h +++ b/src/libs/vgeometry/varc.h @@ -52,15 +52,15 @@ public: VArc (qreal length, VPointF center, qreal radius, qreal f1); VArc(const VArc &arc); VArc& operator= (const VArc &arc); - virtual ~VArc(); + virtual ~VArc() Q_DECL_OVERRIDE; QString GetFormulaF1 () const; void SetFormulaF1 (const QString &formula, qreal value); - virtual qreal GetStartAngle () const; + virtual qreal GetStartAngle () const Q_DECL_OVERRIDE; QString GetFormulaF2 () const; void SetFormulaF2 (const QString &formula, qreal value); - virtual qreal GetEndAngle () const; + virtual qreal GetEndAngle () const Q_DECL_OVERRIDE; QString GetFormulaRadius () const; void SetFormulaRadius (const QString &formula, qreal value); @@ -79,7 +79,7 @@ public: QVector GetPoints () const; QPointF CutArc (const qreal &length, VArc &arc1, VArc &arc2) const; QPointF CutArc (const qreal &length) const; - virtual void setId(const quint32 &id); + virtual void setId(const quint32 &id) Q_DECL_OVERRIDE; private: QSharedDataPointer d; diff --git a/src/libs/vgeometry/vpointf.h b/src/libs/vgeometry/vpointf.h index ed3597b1d..b41a93d1f 100644 --- a/src/libs/vgeometry/vpointf.h +++ b/src/libs/vgeometry/vpointf.h @@ -48,7 +48,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(); + virtual ~VPointF() Q_DECL_OVERRIDE; VPointF &operator=(const VPointF &point); qreal mx() const; qreal my() const; diff --git a/src/libs/vgeometry/vspline.h b/src/libs/vgeometry/vspline.h index e332581b2..e61b74233 100644 --- a/src/libs/vgeometry/vspline.h +++ b/src/libs/vgeometry/vspline.h @@ -51,15 +51,15 @@ public: quint32 idObject = 0, Draw mode = Draw::Calculation); VSpline (VPointF p1, QPointF p2, QPointF p3, VPointF p4, qreal kCurve, quint32 idObject = 0, Draw mode = Draw::Calculation); - virtual ~VSpline(); + virtual ~VSpline() Q_DECL_OVERRIDE; VSpline &operator=(const VSpline &spl); VPointF GetP1 () const; QPointF GetP2 () const; QPointF GetP3 () const; VPointF GetP4 () const; - virtual qreal GetStartAngle () const; - virtual qreal GetEndAngle() const; + virtual qreal GetStartAngle () const Q_DECL_OVERRIDE; + virtual qreal GetEndAngle() const Q_DECL_OVERRIDE; qreal GetLength () const; qreal GetKasm1() const; diff --git a/src/libs/vgeometry/vsplinepath.h b/src/libs/vgeometry/vsplinepath.h index f0d6deef2..69a1f85a4 100644 --- a/src/libs/vgeometry/vsplinepath.h +++ b/src/libs/vgeometry/vsplinepath.h @@ -57,7 +57,7 @@ public: * @param splPath spline path. */ VSplinePath(const VSplinePath& splPath); - virtual ~VSplinePath(); + virtual ~VSplinePath() Q_DECL_OVERRIDE; /** * @brief append add point in the end of list points. * @param point new point. @@ -176,8 +176,8 @@ public: int Segment(const QPointF &p) const; - virtual qreal GetStartAngle () const; - virtual qreal GetEndAngle () const; + virtual qreal GetStartAngle () const Q_DECL_OVERRIDE; + virtual qreal GetEndAngle () const Q_DECL_OVERRIDE; private: QSharedDataPointer d; }; diff --git a/src/libs/vlayout/vcontour.h b/src/libs/vlayout/vcontour.h index dfd6442ae..f521e7521 100644 --- a/src/libs/vlayout/vcontour.h +++ b/src/libs/vlayout/vcontour.h @@ -47,7 +47,7 @@ public: VContour(int height, int width); VContour(const VContour &contour); VContour &operator=(const VContour &contour); - virtual ~VContour(); + ~VContour(); void SetContour(const QVector &contour); QVector GetContour() const; diff --git a/src/libs/vlayout/vlayoutdetail.h b/src/libs/vlayout/vlayoutdetail.h index b53522bbf..7f4b21262 100644 --- a/src/libs/vlayout/vlayoutdetail.h +++ b/src/libs/vlayout/vlayoutdetail.h @@ -43,7 +43,7 @@ public: VLayoutDetail(); VLayoutDetail(const VLayoutDetail &detail); VLayoutDetail &operator=(const VLayoutDetail &detail); - virtual ~VLayoutDetail(); + virtual ~VLayoutDetail() Q_DECL_OVERRIDE; QVector GetContourPoints() const; void SetCountourPoints(const QVector &points); diff --git a/src/libs/vlayout/vlayoutgenerator.h b/src/libs/vlayout/vlayoutgenerator.h index 43c158818..eea20bd39 100644 --- a/src/libs/vlayout/vlayoutgenerator.h +++ b/src/libs/vlayout/vlayoutgenerator.h @@ -44,7 +44,7 @@ class VLayoutGenerator :public QObject Q_OBJECT public: VLayoutGenerator(QObject *parent = 0); - virtual ~VLayoutGenerator(); + virtual ~VLayoutGenerator() Q_DECL_OVERRIDE; void SetDetails(const QVector &details); void SetLayoutWidth(qreal width); diff --git a/src/libs/vlayout/vlayoutpaper.h b/src/libs/vlayout/vlayoutpaper.h index 9fb22f6c1..f8f1cab8f 100644 --- a/src/libs/vlayout/vlayoutpaper.h +++ b/src/libs/vlayout/vlayoutpaper.h @@ -45,7 +45,7 @@ public: VLayoutPaper(int height, int width); VLayoutPaper(const VLayoutPaper &paper); VLayoutPaper &operator=(const VLayoutPaper &paper); - virtual ~VLayoutPaper(); + ~VLayoutPaper(); int GetHeight() const; void SetHeight(int height); diff --git a/src/libs/vlayout/vposition.h b/src/libs/vlayout/vposition.h index bcfc79496..2e82210c7 100644 --- a/src/libs/vlayout/vposition.h +++ b/src/libs/vlayout/vposition.h @@ -48,7 +48,7 @@ class VPosition : public QRunnable public: VPosition(const VContour &gContour, int j, const VLayoutDetail &detail, int i, volatile bool *stop, bool rotate, int rotationIncrease, bool saveLength); - virtual ~VPosition(){} + virtual ~VPosition() Q_DECL_OVERRIDE{} quint32 getPaperIndex() const; void setPaperIndex(const quint32 &value); @@ -101,7 +101,7 @@ private: EdgeError = 2 }; - virtual void run(); + virtual void run() Q_DECL_OVERRIDE; void SaveCandidate(VBestSquare &bestResult, const VLayoutDetail &detail, int globalI, int detJ, BestFrom type); diff --git a/src/libs/vmisc/undoevent.h b/src/libs/vmisc/undoevent.h index e5c230b06..abb2c4d12 100644 --- a/src/libs/vmisc/undoevent.h +++ b/src/libs/vmisc/undoevent.h @@ -38,7 +38,7 @@ class UndoEvent : public QEvent { public: UndoEvent(); - virtual ~UndoEvent(); + virtual ~UndoEvent() Q_DECL_OVERRIDE; }; #endif // UNDOEVENT_H diff --git a/src/libs/vmisc/vabstractapplication.h b/src/libs/vmisc/vabstractapplication.h index 44f20f4fe..e7f18005c 100644 --- a/src/libs/vmisc/vabstractapplication.h +++ b/src/libs/vmisc/vabstractapplication.h @@ -49,7 +49,7 @@ class VAbstractApplication : public QApplication { public: VAbstractApplication(int &argc, char ** argv); - virtual ~VAbstractApplication(); + virtual ~VAbstractApplication() Q_DECL_OVERRIDE; virtual const VTranslateVars *TrVars()=0; diff --git a/src/libs/vobj/vobjengine.h b/src/libs/vobj/vobjengine.h index a93769195..040d27c67 100644 --- a/src/libs/vobj/vobjengine.h +++ b/src/libs/vobj/vobjengine.h @@ -40,18 +40,18 @@ class VObjEngine : public QPaintEngine { public: VObjEngine(); - virtual ~VObjEngine(); + virtual ~VObjEngine() Q_DECL_OVERRIDE; - virtual bool begin(QPaintDevice *pdev); - virtual bool end(); - virtual void updateState(const QPaintEngineState &state); - virtual void drawPath(const QPainterPath &path); - virtual Type type() const; - virtual void drawPoints(const QPointF *points, int pointCount); - virtual void drawPoints(const QPoint *points, int pointCount); - virtual void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr); - virtual void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode); - virtual void drawPolygon(const QPoint *points, int pointCount, PolygonDrawMode mode); + 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; QSize getSize() const; void setSize(const QSize &value); diff --git a/src/libs/vobj/vobjpaintdevice.h b/src/libs/vobj/vobjpaintdevice.h index 661e07990..d57e0676a 100644 --- a/src/libs/vobj/vobjpaintdevice.h +++ b/src/libs/vobj/vobjpaintdevice.h @@ -39,8 +39,8 @@ class VObjPaintDevice : public QPaintDevice { public: VObjPaintDevice(); - virtual ~VObjPaintDevice(); - virtual QPaintEngine *paintEngine() const; + virtual ~VObjPaintDevice() Q_DECL_OVERRIDE; + virtual QPaintEngine *paintEngine() const Q_DECL_OVERRIDE; QString getFileName() const; void setFileName(const QString &value); @@ -55,7 +55,7 @@ public: void setResolution(int dpi); protected: - virtual int metric(PaintDeviceMetric metric) const; + virtual int metric(PaintDeviceMetric metric) const Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(VObjPaintDevice) VObjEngine *engine; diff --git a/src/libs/vpatterndb/variables/varcangle.h b/src/libs/vpatterndb/variables/varcangle.h index 835837be3..b3ff56a6b 100644 --- a/src/libs/vpatterndb/variables/varcangle.h +++ b/src/libs/vpatterndb/variables/varcangle.h @@ -40,7 +40,7 @@ public: VArcAngle(const quint32 &id, const quint32 &parentId, const VAbstractCurve *curve, CurveAngle angle); VArcAngle(const VArcAngle &var); VArcAngle &operator=(const VArcAngle &var); - virtual ~VArcAngle(); + virtual ~VArcAngle() Q_DECL_OVERRIDE; }; #endif // VARCANGLE_H diff --git a/src/libs/vpatterndb/variables/varclength.h b/src/libs/vpatterndb/variables/varclength.h index 570f5ed0b..561fe4fcf 100644 --- a/src/libs/vpatterndb/variables/varclength.h +++ b/src/libs/vpatterndb/variables/varclength.h @@ -40,7 +40,7 @@ public: VArcLength(const quint32 &id, const quint32 &parentId, const VAbstractCurve *arc, Unit patternUnit); VArcLength(const VArcLength &var); VArcLength &operator=(const VArcLength &var); - virtual ~VArcLength(); + virtual ~VArcLength() Q_DECL_OVERRIDE; }; #endif // VARCLENGTH_H diff --git a/src/libs/vpatterndb/variables/varcradius.h b/src/libs/vpatterndb/variables/varcradius.h index a9d9b0d99..68f53de81 100644 --- a/src/libs/vpatterndb/variables/varcradius.h +++ b/src/libs/vpatterndb/variables/varcradius.h @@ -41,7 +41,7 @@ public: VArcRadius(const quint32 &id, const quint32 &parentId, const VArc *arc, Unit patternUnit); VArcRadius(const VArcRadius &var); VArcRadius &operator=(const VArcRadius &var); - virtual ~VArcRadius(); + virtual ~VArcRadius() Q_DECL_OVERRIDE; }; #endif // VARCRADIUS_H diff --git a/src/libs/vpatterndb/variables/varcradius_p.h b/src/libs/vpatterndb/variables/varcradius_p.h index 80fc935b6..6bd9f8310 100644 --- a/src/libs/vpatterndb/variables/varcradius_p.h +++ b/src/libs/vpatterndb/variables/varcradius_p.h @@ -52,7 +52,7 @@ public: :QSharedData(var), arcId(var.arcId) {} - virtual ~VArcRadiusData(); + virtual ~VArcRadiusData() Q_DECL_OVERRIDE; quint32 arcId; }; diff --git a/src/libs/vpatterndb/variables/vcurveangle.h b/src/libs/vpatterndb/variables/vcurveangle.h index bef32cbe5..4761af7fa 100644 --- a/src/libs/vpatterndb/variables/vcurveangle.h +++ b/src/libs/vpatterndb/variables/vcurveangle.h @@ -42,7 +42,7 @@ public: VCurveAngle(const quint32 &id, const quint32 &parentId, const VAbstractCurve *curve, CurveAngle angle); VCurveAngle(const VCurveAngle &var); VCurveAngle &operator=(const VCurveAngle &var); - virtual ~VCurveAngle(); + virtual ~VCurveAngle() Q_DECL_OVERRIDE; }; #endif // VCURVEANGLE_H diff --git a/src/libs/vpatterndb/variables/vcurvelength.h b/src/libs/vpatterndb/variables/vcurvelength.h index 22f86df36..3878d1ab8 100644 --- a/src/libs/vpatterndb/variables/vcurvelength.h +++ b/src/libs/vpatterndb/variables/vcurvelength.h @@ -41,7 +41,7 @@ public: VCurveLength(const quint32 &id, const quint32 &parentId, const VAbstractCurve *curve, Unit patternUnit); VCurveLength(const VCurveLength &var); VCurveLength &operator=(const VCurveLength &var); - virtual ~VCurveLength(); + virtual ~VCurveLength() Q_DECL_OVERRIDE; }; #endif // VCURVELENGTH_H diff --git a/src/libs/vpatterndb/variables/vcurvevariable.h b/src/libs/vpatterndb/variables/vcurvevariable.h index 7e29f9e02..a074acf11 100644 --- a/src/libs/vpatterndb/variables/vcurvevariable.h +++ b/src/libs/vpatterndb/variables/vcurvevariable.h @@ -41,9 +41,9 @@ public: VCurveVariable(const quint32 &id, const quint32 &parentId); VCurveVariable(const VCurveVariable &var); VCurveVariable &operator=(const VCurveVariable &var); - virtual ~VCurveVariable(); + virtual ~VCurveVariable() Q_DECL_OVERRIDE; - virtual bool Filter(quint32 id); + virtual bool Filter(quint32 id) Q_DECL_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 8877c2e2e..b6223998e 100644 --- a/src/libs/vpatterndb/variables/vincrement.h +++ b/src/libs/vpatterndb/variables/vincrement.h @@ -44,7 +44,7 @@ public: QString description = QString()); VIncrement(const VIncrement &incr); VIncrement &operator=(const VIncrement &incr); - virtual ~VIncrement(); + virtual ~VIncrement() Q_DECL_OVERRIDE; quint32 getId() const; void setId(const quint32 &value); diff --git a/src/libs/vpatterndb/variables/vinternalvariable_p.h b/src/libs/vpatterndb/variables/vinternalvariable_p.h index 53ec54c3d..7a61c2d89 100644 --- a/src/libs/vpatterndb/variables/vinternalvariable_p.h +++ b/src/libs/vpatterndb/variables/vinternalvariable_p.h @@ -30,6 +30,7 @@ #define VINTERNALVARIABLE_P_H #include +#include "../vmisc/def.h" #ifdef Q_CC_GNU #pragma GCC diagnostic push diff --git a/src/libs/vpatterndb/variables/vlineangle.h b/src/libs/vpatterndb/variables/vlineangle.h index d2ebde429..acd50004c 100644 --- a/src/libs/vpatterndb/variables/vlineangle.h +++ b/src/libs/vpatterndb/variables/vlineangle.h @@ -41,9 +41,9 @@ public: VLineAngle(const VPointF *p1, const quint32 &p1Id, const VPointF *p2, const quint32 &p2Id); VLineAngle(const VLineAngle &var); VLineAngle &operator=(const VLineAngle &var); - virtual ~VLineAngle(); + virtual ~VLineAngle() Q_DECL_OVERRIDE; - virtual bool Filter(quint32 id); + virtual bool Filter(quint32 id) Q_DECL_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 10932678d..4a13d412e 100644 --- a/src/libs/vpatterndb/variables/vlinelength.h +++ b/src/libs/vpatterndb/variables/vlinelength.h @@ -42,9 +42,9 @@ public: VLengthLine(const VPointF *p1, const quint32 &p1Id, const VPointF *p2, const quint32 &p2Id, Unit patternUnit); VLengthLine(const VLengthLine &var); VLengthLine &operator=(const VLengthLine &var); - virtual ~VLengthLine(); + virtual ~VLengthLine() Q_DECL_OVERRIDE; - virtual bool Filter(quint32 id); + virtual bool Filter(quint32 id) Q_DECL_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 890dc8748..6df0a6287 100644 --- a/src/libs/vpatterndb/variables/vmeasurement.h +++ b/src/libs/vpatterndb/variables/vmeasurement.h @@ -50,7 +50,7 @@ public: const QString &description = QString(), const QString &TagName = QString()); VMeasurement(const VMeasurement &m); VMeasurement &operator=(const VMeasurement &m); - virtual ~VMeasurement(); + virtual ~VMeasurement() Q_DECL_OVERRIDE; QString GetGuiText() const; QString TagName() const; diff --git a/src/libs/vpatterndb/variables/vsplineangle.h b/src/libs/vpatterndb/variables/vsplineangle.h index e76a941f1..beefb93e9 100644 --- a/src/libs/vpatterndb/variables/vsplineangle.h +++ b/src/libs/vpatterndb/variables/vsplineangle.h @@ -40,7 +40,7 @@ public: VSplineAngle(const quint32 &id, const quint32 &parentId, const VAbstractCurve *curve, CurveAngle angle); VSplineAngle(const VSplineAngle &var); VSplineAngle &operator=(const VSplineAngle &var); - virtual ~VSplineAngle(); + virtual ~VSplineAngle() Q_DECL_OVERRIDE; }; #endif // VSPLINEANGLE_H diff --git a/src/libs/vpatterndb/variables/vsplinelength.h b/src/libs/vpatterndb/variables/vsplinelength.h index e54379b23..742a2b4ce 100644 --- a/src/libs/vpatterndb/variables/vsplinelength.h +++ b/src/libs/vpatterndb/variables/vsplinelength.h @@ -41,7 +41,7 @@ public: VSplineLength(const quint32 &id, const quint32 &parentId, const VAbstractCurve *path, Unit patternUnit); VSplineLength(const VSplineLength &var); VSplineLength &operator=(const VSplineLength &var); - virtual ~VSplineLength(); + virtual ~VSplineLength() Q_DECL_OVERRIDE; }; #endif // VSPLINELENGTH_H diff --git a/src/libs/vpatterndb/variables/vvariable.h b/src/libs/vpatterndb/variables/vvariable.h index 6d52d4699..36016814e 100644 --- a/src/libs/vpatterndb/variables/vvariable.h +++ b/src/libs/vpatterndb/variables/vvariable.h @@ -43,7 +43,7 @@ public: VVariable(const QString &name, const qreal &base, const QString &description = QString()); VVariable(const VVariable &var); VVariable &operator=(const VVariable &var); - virtual ~VVariable(); + virtual ~VVariable() Q_DECL_OVERRIDE; qreal GetBase() const; void SetBase(const qreal &value); @@ -59,7 +59,7 @@ public: void SetValue(const qreal &size, const qreal &height, Unit patternUnit); - virtual bool IsNotUsed() const; + virtual bool IsNotUsed() const Q_DECL_OVERRIDE; private: QSharedDataPointer d; }; diff --git a/src/libs/vpatterndb/vdetail.h b/src/libs/vpatterndb/vdetail.h index f9b7cacba..b765239a5 100644 --- a/src/libs/vpatterndb/vdetail.h +++ b/src/libs/vpatterndb/vdetail.h @@ -48,7 +48,7 @@ public: VDetail(const QString &name, const QVector &nodes); VDetail(const VDetail &detail); VDetail &operator=(const VDetail &detail); - virtual ~VDetail(); + virtual ~VDetail() Q_DECL_OVERRIDE; void append(const VNodeDetail &node); void Clear(); diff --git a/src/libs/vpropertyexplorer/checkablemessagebox.h b/src/libs/vpropertyexplorer/checkablemessagebox.h index a66c0e4ce..3e0e69f86 100644 --- a/src/libs/vpropertyexplorer/checkablemessagebox.h +++ b/src/libs/vpropertyexplorer/checkablemessagebox.h @@ -42,7 +42,7 @@ class Q_DECL_EXPORT CheckableMessageBox : public QDialog public: explicit CheckableMessageBox(QWidget *parent); - virtual ~CheckableMessageBox(); + virtual ~CheckableMessageBox() Q_DECL_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 0f6435d0d..ffd196312 100644 --- a/src/libs/vpropertyexplorer/plugins/Vector3d/vvector3dproperty.h +++ b/src/libs/vpropertyexplorer/plugins/Vector3d/vvector3dproperty.h @@ -55,10 +55,10 @@ class VPROPERTYEXPLORERSHARED_EXPORT QVector3DProperty : public VProperty public: QVector3DProperty(const QString& name); - virtual ~QVector3DProperty() {} + virtual ~QVector3DProperty() Q_DECL_OVERRIDE {} //! Get the data how it should be displayed - virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const; + virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; //! Returns item flags Qt::ItemFlags flags(int column = DPC_Name) const; @@ -73,20 +73,20 @@ public: virtual void setVector(float x, float y, float z); //! Returns a string containing the type of the property - virtual QString type() const; + virtual QString type() const Q_DECL_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 Q_DECL_OVERRIDE; //! Sets the value of the property - virtual void setValue(const QVariant& value); + virtual void setValue(const QVariant& value) Q_DECL_OVERRIDE; //! Returns the value of the property as a QVariant - virtual QVariant getValue() const; + virtual QVariant getValue() const Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(QVector3DProperty) diff --git a/src/libs/vpropertyexplorer/plugins/vboolproperty.h b/src/libs/vpropertyexplorer/plugins/vboolproperty.h index 603cd2ef0..f4fc1835e 100644 --- a/src/libs/vpropertyexplorer/plugins/vboolproperty.h +++ b/src/libs/vpropertyexplorer/plugins/vboolproperty.h @@ -35,29 +35,29 @@ public: VBoolProperty(const QString& name); //! Destructor - ~VBoolProperty() {} + virtual ~VBoolProperty() Q_DECL_OVERRIDE {} //! Get the data how it should be displayed - virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const; + virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_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); + virtual bool setData (const QVariant& data, int role = Qt::EditRole) Q_DECL_OVERRIDE; //! Returns item flags - virtual Qt::ItemFlags flags(int column = DPC_Name) const; + virtual Qt::ItemFlags flags(int column = DPC_Name) const Q_DECL_OVERRIDE; //! Returns a string containing the type of the property - virtual QString type() const; + virtual QString type() const Q_DECL_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 Q_DECL_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 ef84b47fc..bf75a98e4 100644 --- a/src/libs/vpropertyexplorer/plugins/vcolorproperty.h +++ b/src/libs/vpropertyexplorer/plugins/vcolorproperty.h @@ -35,7 +35,7 @@ public: VColorProperty(const QString &name); //! Get the data how it should be displayed - virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const; + virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_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 @@ -43,23 +43,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); + const QAbstractItemDelegate* delegate) Q_DECL_OVERRIDE; //! Sets the property's data to the editor (returns false, if the standard delegate should do that) - virtual bool setEditorData(QWidget* editor); + virtual bool setEditorData(QWidget* editor) Q_DECL_OVERRIDE; //! Gets the data from the widget - virtual QVariant getEditorData(const QWidget* editor) const; + virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE; //! Returns a string containing the type of the property - virtual QString type() const; + virtual QString type() const Q_DECL_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 Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(VColorProperty) diff --git a/src/libs/vpropertyexplorer/plugins/vcolorpropertyeditor.h b/src/libs/vpropertyexplorer/plugins/vcolorpropertyeditor.h index 2de237f34..32c94b9df 100644 --- a/src/libs/vpropertyexplorer/plugins/vcolorpropertyeditor.h +++ b/src/libs/vpropertyexplorer/plugins/vcolorpropertyeditor.h @@ -41,7 +41,7 @@ public: VColorPropertyEditor(QWidget *parent); //! Destructor - virtual ~VColorPropertyEditor(); + virtual ~VColorPropertyEditor() Q_DECL_OVERRIDE; //! Returns the color currently set diff --git a/src/libs/vpropertyexplorer/plugins/vemptyproperty.h b/src/libs/vpropertyexplorer/plugins/vemptyproperty.h index f19c9bc1d..47e11d9d0 100644 --- a/src/libs/vpropertyexplorer/plugins/vemptyproperty.h +++ b/src/libs/vpropertyexplorer/plugins/vemptyproperty.h @@ -34,10 +34,10 @@ public: explicit VEmptyProperty(const QString& name); //! Destructor - virtual ~VEmptyProperty(); + virtual ~VEmptyProperty() Q_DECL_OVERRIDE; //! Get the data how it should be displayed - virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const; + virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_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 @@ -45,23 +45,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); + const QAbstractItemDelegate* delegate) Q_DECL_OVERRIDE; //! Gets the data from the widget - virtual QVariant getEditorData(const QWidget* editor) const; + virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE; //! Returns item flags - virtual Qt::ItemFlags flags(int column = DPC_Name) const; + virtual Qt::ItemFlags flags(int column = DPC_Name) const Q_DECL_OVERRIDE; //! Returns a string containing the type of the property - virtual QString type() const; + virtual QString type() const Q_DECL_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 Q_DECL_OVERRIDE; protected: //! Protected constructor diff --git a/src/libs/vpropertyexplorer/plugins/venumproperty.h b/src/libs/vpropertyexplorer/plugins/venumproperty.h index 1fae1a975..adae0a71d 100644 --- a/src/libs/vpropertyexplorer/plugins/venumproperty.h +++ b/src/libs/vpropertyexplorer/plugins/venumproperty.h @@ -36,10 +36,10 @@ public: VEnumProperty(const QString& name); //! Destructor - ~VEnumProperty() {} + virtual ~VEnumProperty() Q_DECL_OVERRIDE {} //! Get the data how it should be displayed - virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const; + virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_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 @@ -47,10 +47,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); + const QAbstractItemDelegate* delegate) Q_DECL_OVERRIDE; //! Gets the data from the widget - virtual QVariant getEditorData(const QWidget* editor) const; + virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE; //! Sets the enumeration literals virtual void setLiterals(const QStringList &literals); @@ -59,28 +59,28 @@ public: virtual QStringList getLiterals() const; //! Sets the value of the property - virtual void setValue(const QVariant& value); + virtual void setValue(const QVariant& value) Q_DECL_OVERRIDE; //! Returns a string containing the type of the property - virtual QString type() const; + virtual QString type() const Q_DECL_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 = nullptr) const; + virtual VProperty* clone(bool include_children = true, VProperty* container = nullptr) const Q_DECL_OVERRIDE; //! Sets the settings. Available settings: //! //! key: "literals" - value: "item1;;item2;;item3" - virtual void setSetting(const QString& key, const QVariant& value); + virtual void setSetting(const QString& key, const QVariant& value) Q_DECL_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 Q_DECL_OVERRIDE; //! Returns the list of keys of the property's settings - virtual QStringList getSettingKeys() const; + virtual QStringList getSettingKeys() const Q_DECL_OVERRIDE; public slots: void currentIndexChanged(int index); diff --git a/src/libs/vpropertyexplorer/plugins/vfileproperty.h b/src/libs/vpropertyexplorer/plugins/vfileproperty.h index 64611cf23..b520e2bf9 100644 --- a/src/libs/vpropertyexplorer/plugins/vfileproperty.h +++ b/src/libs/vpropertyexplorer/plugins/vfileproperty.h @@ -37,7 +37,7 @@ public: VFileProperty(const QString &name); //! The destructor - ~VFileProperty(); + virtual ~VFileProperty() Q_DECL_OVERRIDE; //! Sets the file filters. The file filters have to be like the ones passed a QFileOpenDialog. virtual void setFileFilters(const QString& filefilters); @@ -52,7 +52,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; + virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_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,34 +60,34 @@ 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) Q_DECL_OVERRIDE; //! Sets the property's data to the editor (returns false, if the standard delegate should do that) - virtual bool setEditorData(QWidget* editor); + virtual bool setEditorData(QWidget* editor) Q_DECL_OVERRIDE; //! Gets the data from the widget - virtual QVariant getEditorData(const QWidget* editor) const; + virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_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); + virtual void setSetting(const QString& key, const QVariant& value) Q_DECL_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 Q_DECL_OVERRIDE; //! Returns the list of keys of the property's settings - virtual QStringList getSettingKeys() const; + virtual QStringList getSettingKeys() const Q_DECL_OVERRIDE; //! Returns a string containing the type of the property - virtual QString type() const; + virtual QString type() const Q_DECL_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 = nullptr) const; + virtual VProperty* clone(bool include_children = true, VProperty* container = nullptr) const Q_DECL_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 c4b69151c..24c920948 100644 --- a/src/libs/vpropertyexplorer/plugins/vfilepropertyeditor.h +++ b/src/libs/vpropertyexplorer/plugins/vfilepropertyeditor.h @@ -38,7 +38,7 @@ class VPROPERTYEXPLORERSHARED_EXPORT VFileEditWidget : public QWidget public: VFileEditWidget(QWidget* parent, bool is_directory = false); - virtual ~VFileEditWidget(); + virtual ~VFileEditWidget() Q_DECL_OVERRIDE; //! This function returns the file currently set to this editor diff --git a/src/libs/vpropertyexplorer/plugins/vlinecolorproperty.h b/src/libs/vpropertyexplorer/plugins/vlinecolorproperty.h index f68c20f29..10d94e7cb 100644 --- a/src/libs/vpropertyexplorer/plugins/vlinecolorproperty.h +++ b/src/libs/vpropertyexplorer/plugins/vlinecolorproperty.h @@ -45,10 +45,10 @@ public: VLineColorProperty(const QString& name); //! Destructor - ~VLineColorProperty() {} + virtual ~VLineColorProperty() Q_DECL_OVERRIDE {} //! Get the data how it should be displayed - virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const; + virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_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); + const QAbstractItemDelegate* delegate) Q_DECL_OVERRIDE; //! Gets the data from the widget - virtual QVariant getEditorData(const QWidget* editor) const; + virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE; //! Sets the colors virtual void setColors(const QMap &colors); @@ -68,17 +68,17 @@ public: virtual QMap getColors() const; //! Sets the value of the property - virtual void setValue(const QVariant& value); + virtual void setValue(const QVariant& value) Q_DECL_OVERRIDE; //! Returns a string containing the type of the property - virtual QString type() const; + virtual QString type() const Q_DECL_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 = nullptr) const; + virtual VProperty* clone(bool include_children = true, VProperty* container = nullptr) const Q_DECL_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 3942cf140..9e79eb462 100644 --- a/src/libs/vpropertyexplorer/plugins/vlinetypeproperty.h +++ b/src/libs/vpropertyexplorer/plugins/vlinetypeproperty.h @@ -46,10 +46,10 @@ public: VLineTypeProperty(const QString& name); //! Destructor - ~VLineTypeProperty() {} + virtual ~VLineTypeProperty() Q_DECL_OVERRIDE {} //! Get the data how it should be displayed - virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const; + virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_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 @@ -57,10 +57,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); + const QAbstractItemDelegate* delegate) Q_DECL_OVERRIDE; //! Gets the data from the widget - virtual QVariant getEditorData(const QWidget* editor) const; + virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE; //! Sets the line styles virtual void setStyles(const QMap &styles); @@ -69,17 +69,17 @@ public: virtual QMap getStyles() const; //! Sets the value of the property - virtual void setValue(const QVariant& value); + virtual void setValue(const QVariant& value) Q_DECL_OVERRIDE; //! Returns a string containing the type of the property - virtual QString type() const; + virtual QString type() const Q_DECL_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 = nullptr) const; + virtual VProperty* clone(bool include_children = true, VProperty* container = nullptr) const Q_DECL_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 c76a4382d..2a65023ae 100644 --- a/src/libs/vpropertyexplorer/plugins/vnumberproperty.h +++ b/src/libs/vpropertyexplorer/plugins/vnumberproperty.h @@ -43,32 +43,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) Q_DECL_OVERRIDE; //! Gets the data from the widget - virtual QVariant getEditorData(const QWidget* editor) const; + virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_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) Q_DECL_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 Q_DECL_OVERRIDE; //! Returns the list of keys of the property's settings - virtual QStringList getSettingKeys() const; + virtual QStringList getSettingKeys() const Q_DECL_OVERRIDE; //! Returns a string containing the type of the property - virtual QString type() const; + virtual QString type() const Q_DECL_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 Q_DECL_OVERRIDE; public slots: void valueChanged(int i); protected: diff --git a/src/libs/vpropertyexplorer/plugins/vobjectproperty.h b/src/libs/vpropertyexplorer/plugins/vobjectproperty.h index 9c5b66f2c..55495ad5a 100644 --- a/src/libs/vpropertyexplorer/plugins/vobjectproperty.h +++ b/src/libs/vpropertyexplorer/plugins/vobjectproperty.h @@ -38,10 +38,10 @@ public: VObjectProperty(const QString& name); //! Destructor - ~VObjectProperty() {} + virtual ~VObjectProperty() Q_DECL_OVERRIDE {} //! Get the data how it should be displayed - virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const; + virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_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 @@ -49,13 +49,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); + const QAbstractItemDelegate* delegate) Q_DECL_OVERRIDE; //! Sets the property's data to the editor (returns false, if the standard delegate should do that) - virtual bool setEditorData(QWidget* editor); + virtual bool setEditorData(QWidget* editor) Q_DECL_OVERRIDE; //! Gets the data from the widget - virtual QVariant getEditorData(const QWidget* editor) const; + virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE; //! Sets the objects list void setObjectsList(const QMap &objects); @@ -64,17 +64,17 @@ public: virtual QMap getObjects() const; //! Sets the value of the property - virtual void setValue(const QVariant& value); + virtual void setValue(const QVariant& value) Q_DECL_OVERRIDE; //! Returns a string containing the type of the property - virtual QString type() const; + virtual QString type() const Q_DECL_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 = nullptr) const; + virtual VProperty* clone(bool include_children = true, VProperty* container = nullptr) const Q_DECL_OVERRIDE; public slots: void currentIndexChanged(int index); diff --git a/src/libs/vpropertyexplorer/plugins/vpointfproperty.h b/src/libs/vpropertyexplorer/plugins/vpointfproperty.h index 7c74cd0a2..d899a7c95 100644 --- a/src/libs/vpropertyexplorer/plugins/vpointfproperty.h +++ b/src/libs/vpropertyexplorer/plugins/vpointfproperty.h @@ -34,13 +34,13 @@ class VPROPERTYEXPLORERSHARED_EXPORT VPointFProperty : public VProperty public: VPointFProperty(const QString& name); - virtual ~VPointFProperty() {} + virtual ~VPointFProperty() Q_DECL_OVERRIDE {} //! Get the data how it should be displayed - virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const; + virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; //! Returns item flags - Qt::ItemFlags flags(int column = DPC_Name) const; + Qt::ItemFlags flags(int column = DPC_Name) const Q_DECL_OVERRIDE; //! Returns the QPointF virtual QPointF getPointF() const; @@ -52,20 +52,20 @@ public: virtual void setPointF(qreal x, qreal y); //! Returns a string containing the type of the property - virtual QString type() const; + virtual QString type() const Q_DECL_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 Q_DECL_OVERRIDE; //! Sets the value of the property - virtual void setValue(const QVariant& value); + virtual void setValue(const QVariant& value) Q_DECL_OVERRIDE; //! Returns the value of the property as a QVariant - virtual QVariant getValue() const; + virtual QVariant getValue() const Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(VPointFProperty) diff --git a/src/libs/vpropertyexplorer/plugins/vshortcutproperty.h b/src/libs/vpropertyexplorer/plugins/vshortcutproperty.h index db8e03cb5..df5bffa51 100644 --- a/src/libs/vpropertyexplorer/plugins/vshortcutproperty.h +++ b/src/libs/vpropertyexplorer/plugins/vshortcutproperty.h @@ -35,10 +35,10 @@ public: VShortcutProperty(const QString &name); //! The destructor - ~VShortcutProperty(); + virtual ~VShortcutProperty() Q_DECL_OVERRIDE; //! Get the data how it should be displayed - virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const; + virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_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 @@ -46,26 +46,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); + const QAbstractItemDelegate* delegate) Q_DECL_OVERRIDE; //! Sets the property's data to the editor (returns false, if the standard delegate should do that) - virtual bool setEditorData(QWidget* editor); + virtual bool setEditorData(QWidget* editor) Q_DECL_OVERRIDE; //! Gets the data from the widget - virtual QVariant getEditorData(const QWidget* editor) const; + virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE; //! Returns a string containing the type of the property - virtual QString type() const; + virtual QString type() const Q_DECL_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 Q_DECL_OVERRIDE; //! Sets the value of the property - virtual void setValue(const QVariant& value); + virtual void setValue(const QVariant& value) Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(VShortcutProperty) diff --git a/src/libs/vpropertyexplorer/plugins/vshortcutpropertyeditor.h b/src/libs/vpropertyexplorer/plugins/vshortcutpropertyeditor.h index 6e9c91144..d8b14130f 100644 --- a/src/libs/vpropertyexplorer/plugins/vshortcutpropertyeditor.h +++ b/src/libs/vpropertyexplorer/plugins/vshortcutpropertyeditor.h @@ -38,7 +38,7 @@ class VPROPERTYEXPLORERSHARED_EXPORT VShortcutEditWidget : public QWidget public: VShortcutEditWidget(QWidget* parent); - virtual ~VShortcutEditWidget(); + virtual ~VShortcutEditWidget() Q_DECL_OVERRIDE; //! Needed for proper event handling bool eventFilter(QObject* obj, QEvent* evenvt); diff --git a/src/libs/vpropertyexplorer/plugins/vstringproperty.h b/src/libs/vpropertyexplorer/plugins/vstringproperty.h index 247801ce3..11cac1f74 100644 --- a/src/libs/vpropertyexplorer/plugins/vstringproperty.h +++ b/src/libs/vpropertyexplorer/plugins/vstringproperty.h @@ -43,33 +43,33 @@ 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) Q_DECL_OVERRIDE; //! Gets the data from the widget - virtual QVariant getEditorData(const QWidget* editor) const; + virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE; void setReadOnly(bool readOnly); //! Sets the settings. - virtual void setSetting(const QString& key, const QVariant& value); + virtual void setSetting(const QString& key, const QVariant& value) Q_DECL_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 Q_DECL_OVERRIDE; //! Returns the list of keys of the property's settings - virtual QStringList getSettingKeys() const; + virtual QStringList getSettingKeys() const Q_DECL_OVERRIDE; //! Returns a string containing the type of the property - virtual QString type() const; + virtual QString type() const Q_DECL_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 = nullptr) const; + virtual VProperty* clone(bool include_children = true, VProperty* container = nullptr) const Q_DECL_OVERRIDE; - virtual void UpdateParent(const QVariant &value); + virtual void UpdateParent(const QVariant &value) Q_DECL_OVERRIDE; int getTypeForParent() const; void setTypeForParent(int value); diff --git a/src/libs/vpropertyexplorer/plugins/vwidgetproperty.h b/src/libs/vpropertyexplorer/plugins/vwidgetproperty.h index 610d91cab..104602d7e 100644 --- a/src/libs/vpropertyexplorer/plugins/vwidgetproperty.h +++ b/src/libs/vpropertyexplorer/plugins/vwidgetproperty.h @@ -42,7 +42,7 @@ public: VWidgetProperty(const QString &name, QWidget* widget = nullptr); //! The destructor - ~VWidgetProperty(); + virtual ~VWidgetProperty() Q_DECL_OVERRIDE; //! Returns the widget held by this property QWidget* getWidget() const; @@ -51,14 +51,14 @@ public: void setWidget(QWidget* widget); //! Returns a string containing the type of the property - virtual QString type() const; + virtual QString type() const Q_DECL_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 = nullptr) const; + virtual VProperty* clone(bool include_children = true, VProperty* container = nullptr) const Q_DECL_OVERRIDE; }; } diff --git a/src/libs/vpropertyexplorer/vabstractpropertyfactory.h b/src/libs/vpropertyexplorer/vabstractpropertyfactory.h index 2d71d137e..0913d9f36 100644 --- a/src/libs/vpropertyexplorer/vabstractpropertyfactory.h +++ b/src/libs/vpropertyexplorer/vabstractpropertyfactory.h @@ -38,8 +38,7 @@ class VPROPERTYEXPLORERSHARED_EXPORT VAbstractPropertyFactory { public: //! Empty virtual destructor - virtual ~VAbstractPropertyFactory() - {} + virtual ~VAbstractPropertyFactory() {} //! Creates a new property of a certain type and assigns a name and description (otionally) //! \param type The type of the property as string diff --git a/src/libs/vpropertyexplorer/vfileproperty_p.h b/src/libs/vpropertyexplorer/vfileproperty_p.h index c24c299ea..0b22604bc 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(); + virtual ~VFilePropertyPrivate() Q_DECL_OVERRIDE; }; VFilePropertyPrivate::~VFilePropertyPrivate() diff --git a/src/libs/vpropertyexplorer/vproperty.h b/src/libs/vpropertyexplorer/vproperty.h index d0371b20e..613b6eb72 100644 --- a/src/libs/vpropertyexplorer/vproperty.h +++ b/src/libs/vpropertyexplorer/vproperty.h @@ -41,7 +41,7 @@ class VPROPERTYEXPLORERSHARED_EXPORT UserChangeEvent : public QEvent { public: UserChangeEvent() : QEvent(static_cast(MyCustomEventType)) {} - virtual ~UserChangeEvent(); + virtual ~UserChangeEvent() Q_DECL_OVERRIDE; }; class VPropertyPrivate; @@ -60,7 +60,7 @@ public: explicit VProperty(const QString& name, QVariant::Type type = QVariant::String); //! Destructor - virtual ~VProperty(); + virtual ~VProperty() Q_DECL_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 9b15abeba..a2e8a4c1c 100644 --- a/src/libs/vpropertyexplorer/vpropertydelegate.h +++ b/src/libs/vpropertyexplorer/vpropertydelegate.h @@ -33,25 +33,28 @@ class VPROPERTYEXPLORERSHARED_EXPORT VPropertyDelegate : public QStyledItemDeleg Q_OBJECT public: explicit VPropertyDelegate(QObject *parent = 0); - virtual ~VPropertyDelegate(); + virtual ~VPropertyDelegate() Q_DECL_OVERRIDE; //! Creates the editor widget - virtual QWidget* createEditor (QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const; + virtual QWidget* createEditor (QWidget* parent, const QStyleOptionViewItem& option, + const QModelIndex& index) const Q_DECL_OVERRIDE; //! Sets the index data to the editor - virtual void setEditorData (QWidget * editor, const QModelIndex & index) const; + virtual void setEditorData (QWidget * editor, const QModelIndex & index) const Q_DECL_OVERRIDE; //! Updates the index data - virtual void setModelData (QWidget * editor, QAbstractItemModel * model, const QModelIndex & index) const; + virtual void setModelData (QWidget * editor, QAbstractItemModel * model, + const QModelIndex & index) const Q_DECL_OVERRIDE; //! Returns the size hint - virtual QSize sizeHint (const QStyleOptionViewItem& option, const QModelIndex& index) const; + virtual QSize sizeHint (const QStyleOptionViewItem& option, const QModelIndex& index) const Q_DECL_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; + virtual void paint (QPainter* painter, const QStyleOptionViewItem& option, + const QModelIndex& index ) const Q_DECL_OVERRIDE; protected: int RowHeight; diff --git a/src/libs/vpropertyexplorer/vpropertyfactorymanager.h b/src/libs/vpropertyexplorer/vpropertyfactorymanager.h index 4e8c2060f..e113e1b96 100644 --- a/src/libs/vpropertyexplorer/vpropertyfactorymanager.h +++ b/src/libs/vpropertyexplorer/vpropertyfactorymanager.h @@ -39,7 +39,7 @@ public: VPropertyFactoryManager(QObject* parent = nullptr); //! Destructor - virtual ~VPropertyFactoryManager(); + virtual ~VPropertyFactoryManager() Q_DECL_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 3493ac539..3b5573b41 100644 --- a/src/libs/vpropertyexplorer/vpropertyformview.h +++ b/src/libs/vpropertyexplorer/vpropertyformview.h @@ -47,12 +47,12 @@ public: explicit VPropertyFormView(VPropertySet* property_set, QWidget *parent = 0); //! Destructor - virtual ~VPropertyFormView(); + virtual ~VPropertyFormView() Q_DECL_OVERRIDE; public slots: //! Rebuilds the whole form - virtual void build(); + virtual void build() Q_DECL_OVERRIDE; //! Set the source model. Leads to the rebuild of the form //! \param model The model to use diff --git a/src/libs/vpropertyexplorer/vpropertyformview_p.h b/src/libs/vpropertyexplorer/vpropertyformview_p.h index a97758f80..1414a6d10 100644 --- a/src/libs/vpropertyexplorer/vpropertyformview_p.h +++ b/src/libs/vpropertyexplorer/vpropertyformview_p.h @@ -66,8 +66,7 @@ public: IgnoreDataChangedSignal(false) {} - virtual ~VPropertyFormViewPrivate() - {} + virtual ~VPropertyFormViewPrivate() Q_DECL_OVERRIDE {} private: Q_DISABLE_COPY(VPropertyFormViewPrivate) diff --git a/src/libs/vpropertyexplorer/vpropertyformwidget_p.h b/src/libs/vpropertyexplorer/vpropertyformwidget_p.h index 013e607fd..70b34fa29 100644 --- a/src/libs/vpropertyexplorer/vpropertyformwidget_p.h +++ b/src/libs/vpropertyexplorer/vpropertyformwidget_p.h @@ -68,8 +68,7 @@ public: : Properties(properties), EditorWidgets(QList()), UpdateEditors(true) {} - virtual ~VPropertyFormWidgetPrivate() - {} + virtual ~VPropertyFormWidgetPrivate() {} }; #ifdef Q_CC_CLANG diff --git a/src/libs/vpropertyexplorer/vpropertymodel.h b/src/libs/vpropertyexplorer/vpropertymodel.h index c254f8d8e..95ee61154 100644 --- a/src/libs/vpropertyexplorer/vpropertymodel.h +++ b/src/libs/vpropertyexplorer/vpropertymodel.h @@ -59,7 +59,7 @@ class VPROPERTYEXPLORERSHARED_EXPORT VPropertyModel : public QAbstractItemModel Q_OBJECT public: explicit VPropertyModel(QObject * parent = 0); - virtual ~VPropertyModel(); + virtual ~VPropertyModel() Q_DECL_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(), @@ -78,25 +78,26 @@ public: virtual Qt::ItemFlags flags (const QModelIndex& index) const; //! Sets the role data for the item at index to value - virtual bool setData (const QModelIndex& index, const QVariant& value, int role = Qt::EditRole); + virtual bool setData (const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) Q_DECL_OVERRIDE; //! Returns the model index at row/column - virtual QModelIndex index (int row, int column, const QModelIndex & parent = QModelIndex() ) const; + virtual QModelIndex index (int row, int column, const QModelIndex & parent = QModelIndex() ) const Q_DECL_OVERRIDE; //! Returns the parent of one model index - virtual QModelIndex parent (const QModelIndex& index) const; + virtual QModelIndex parent (const QModelIndex& index) const Q_DECL_OVERRIDE; //! Returns the data of an model index - virtual QVariant data (const QModelIndex& index, int role = Qt::DisplayRole) const; + virtual QVariant data (const QModelIndex& index, int role = Qt::DisplayRole) const Q_DECL_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; + virtual QVariant headerData (int section, Qt::Orientation orientation, + int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; //! Returns the number of rows - virtual int rowCount ( const QModelIndex & parent = QModelIndex() ) const; + virtual int rowCount ( const QModelIndex & parent = QModelIndex() ) const Q_DECL_OVERRIDE; //! Returns the number of columns - virtual int columnCount ( const QModelIndex & parent = QModelIndex() ) const; + virtual int columnCount ( const QModelIndex & parent = QModelIndex() ) const Q_DECL_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 58e17341e..757910f57 100644 --- a/src/libs/vpropertyexplorer/vpropertytreeview.h +++ b/src/libs/vpropertyexplorer/vpropertytreeview.h @@ -44,7 +44,7 @@ public: VPropertyTreeView(VPropertyModel* model, QWidget *parent = 0); //! Destructor - virtual ~VPropertyTreeView(); + virtual ~VPropertyTreeView() Q_DECL_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 88b90b0f7..7607e2e6e 100644 --- a/src/libs/vpropertyexplorer/vstandardpropertyfactory.h +++ b/src/libs/vpropertyexplorer/vstandardpropertyfactory.h @@ -46,7 +46,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 - virtual VProperty* createProperty(const QString& type, const QString &name); + virtual VProperty* createProperty(const QString& type, const QString &name) Q_DECL_OVERRIDE; }; } diff --git a/src/libs/vpropertyexplorer/vwidgetproperty_p.h b/src/libs/vpropertyexplorer/vwidgetproperty_p.h index 0e33fb801..ce93a6135 100644 --- a/src/libs/vpropertyexplorer/vwidgetproperty_p.h +++ b/src/libs/vpropertyexplorer/vwidgetproperty_p.h @@ -51,7 +51,7 @@ public: : VPropertyPrivate(), Widget(nullptr) {} //! Destructor - virtual ~VWidgetPropertyPrivate() + virtual ~VWidgetPropertyPrivate() Q_DECL_OVERRIDE { if (Widget) { diff --git a/src/libs/vtools/dialogs/support/dialogeditwrongformula.h b/src/libs/vtools/dialogs/support/dialogeditwrongformula.h index 8c299ba58..2f5865606 100644 --- a/src/libs/vtools/dialogs/support/dialogeditwrongformula.h +++ b/src/libs/vtools/dialogs/support/dialogeditwrongformula.h @@ -49,20 +49,20 @@ class DialogEditWrongFormula : public DialogTool Q_OBJECT public: explicit DialogEditWrongFormula(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogEditWrongFormula(); + virtual ~DialogEditWrongFormula() Q_DECL_OVERRIDE; QString GetFormula() const; void SetFormula(const QString &value); void setCheckZero(bool value); void setPostfix(const QString &value); public slots: - virtual void DialogAccepted(); - virtual void DialogRejected(); + virtual void DialogAccepted() Q_DECL_OVERRIDE; + virtual void DialogRejected() Q_DECL_OVERRIDE; /** * @brief DeployFormulaTextEdit grow or shrink formula input */ void DeployFormulaTextEdit(); - virtual void EvalFormula(); + virtual void EvalFormula() Q_DECL_OVERRIDE; void ValChenged(int row); void SizeHeight(); void PutHere(); @@ -78,8 +78,8 @@ public slots: void AngleLines(); void Increments(); protected: - virtual void CheckState(); - virtual void closeEvent(QCloseEvent *event); + virtual void CheckState() Q_DECL_OVERRIDE; + virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(DialogEditWrongFormula) Ui::DialogEditWrongFormula *ui; diff --git a/src/libs/vtools/dialogs/support/dialogundo.h b/src/libs/vtools/dialogs/support/dialogundo.h index 93def2525..ccb20873d 100644 --- a/src/libs/vtools/dialogs/support/dialogundo.h +++ b/src/libs/vtools/dialogs/support/dialogundo.h @@ -44,13 +44,13 @@ class DialogUndo : public QDialog public: explicit DialogUndo(QWidget *parent = 0); UndoButton Result() const; - ~DialogUndo(); + virtual ~DialogUndo() Q_DECL_OVERRIDE; public slots: void Undo(); void Fix(); void Cancel(); protected: - virtual void closeEvent ( QCloseEvent * event ); + virtual void closeEvent ( QCloseEvent * event ) Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(DialogUndo) Ui::DialogUndo *ui; diff --git a/src/libs/vtools/dialogs/tools/dialogalongline.h b/src/libs/vtools/dialogs/tools/dialogalongline.h index ef14c1eda..64965133a 100644 --- a/src/libs/vtools/dialogs/tools/dialogalongline.h +++ b/src/libs/vtools/dialogs/tools/dialogalongline.h @@ -44,7 +44,7 @@ class DialogAlongLine : public DialogTool Q_OBJECT public: DialogAlongLine(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogAlongLine(); + virtual ~DialogAlongLine() Q_DECL_OVERRIDE; void SetPointName(const QString &value); @@ -63,7 +63,7 @@ public: quint32 GetSecondPointId() const; void SetSecondPointId(const quint32 &value); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type); + virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; /** * @brief DeployFormulaTextEdit grow or shrink formula input */ @@ -76,12 +76,12 @@ public slots: void FXLength(); protected: - virtual void ShowVisualization(); + virtual void ShowVisualization() Q_DECL_OVERRIDE; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData(); - virtual void closeEvent(QCloseEvent *event); + virtual void SaveData() Q_DECL_OVERRIDE; + virtual void closeEvent(QCloseEvent *event) Q_DECL_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 ab5d707be..fe545413a 100644 --- a/src/libs/vtools/dialogs/tools/dialogarc.h +++ b/src/libs/vtools/dialogs/tools/dialogarc.h @@ -44,7 +44,7 @@ class DialogArc : public DialogTool Q_OBJECT public: DialogArc(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogArc(); + virtual ~DialogArc() Q_DECL_OVERRIDE; quint32 GetCenter() const; void SetCenter(const quint32 &value); @@ -61,7 +61,7 @@ public: QString GetColor() const; void SetColor(const QString &value); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type); + virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; /** * @brief DeployFormulaTextEdit grow or shrink formula input */ @@ -76,13 +76,13 @@ public slots: void FXF1(); void FXF2(); protected: - virtual void CheckState(); - virtual void ShowVisualization(); + virtual void CheckState() Q_DECL_OVERRIDE; + virtual void ShowVisualization() Q_DECL_OVERRIDE; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData(); - virtual void closeEvent(QCloseEvent *event); + virtual void SaveData() Q_DECL_OVERRIDE; + virtual void closeEvent(QCloseEvent *event) Q_DECL_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 f02749f66..0c89edcbc 100644 --- a/src/libs/vtools/dialogs/tools/dialogarcwithlength.h +++ b/src/libs/vtools/dialogs/tools/dialogarcwithlength.h @@ -60,7 +60,7 @@ public: void SetColor(const QString &value); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type); + virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; /** * @brief DeployFormulaTextEdit grow or shrink formula input */ @@ -77,13 +77,13 @@ public slots: void FXLength(); protected: - virtual void CheckState(); - virtual void ShowVisualization(); + virtual void CheckState() Q_DECL_OVERRIDE; + virtual void ShowVisualization() Q_DECL_OVERRIDE; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData(); - virtual void closeEvent(QCloseEvent *event); + virtual void SaveData() Q_DECL_OVERRIDE; + virtual void closeEvent(QCloseEvent *event) Q_DECL_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 34f186b9a..b4b2cc702 100644 --- a/src/libs/vtools/dialogs/tools/dialogbisector.h +++ b/src/libs/vtools/dialogs/tools/dialogbisector.h @@ -45,7 +45,7 @@ class DialogBisector : public DialogTool public: DialogBisector(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogBisector(); + virtual ~DialogBisector() Q_DECL_OVERRIDE; void SetPointName(const QString &value); @@ -67,7 +67,7 @@ public: QString GetLineColor() const; void SetLineColor(const QString &value); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type); + virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; /** * @brief DeployFormulaTextEdit grow or shrink formula input */ @@ -76,15 +76,15 @@ public slots: * @brief FormulaTextChanged when formula text changes for validation and calc */ void FormulaTextChanged(); - virtual void PointNameChanged(); + virtual void PointNameChanged() Q_DECL_OVERRIDE; void FXLength(); protected: - virtual void ShowVisualization(); + virtual void ShowVisualization() Q_DECL_OVERRIDE; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData(); - virtual void closeEvent(QCloseEvent *event); + virtual void SaveData() Q_DECL_OVERRIDE; + virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(DialogBisector) diff --git a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.h b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.h index 5ed47fe49..cba64ba51 100644 --- a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.h +++ b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.h @@ -42,7 +42,7 @@ class DialogCurveIntersectAxis : public DialogTool public: DialogCurveIntersectAxis(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogCurveIntersectAxis(); + virtual ~DialogCurveIntersectAxis() Q_DECL_OVERRIDE; void SetPointName(const QString &value); @@ -61,20 +61,20 @@ public: QString GetLineColor() const; void SetLineColor(const QString &value); - virtual void ShowDialog(bool click); + virtual void ShowDialog(bool click) Q_DECL_OVERRIDE; public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type); + virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; void EvalAngle(); void AngleTextChanged(); void DeployAngleTextEdit(); void FXAngle(); protected: - virtual void ShowVisualization(); + virtual void ShowVisualization() Q_DECL_OVERRIDE; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData(); - virtual void closeEvent(QCloseEvent *event); + virtual void SaveData() Q_DECL_OVERRIDE; + virtual void closeEvent(QCloseEvent *event) Q_DECL_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 2c5922ecd..72d075447 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutarc.h +++ b/src/libs/vtools/dialogs/tools/dialogcutarc.h @@ -45,7 +45,7 @@ class DialogCutArc : public DialogTool public: DialogCutArc(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogCutArc(); + virtual ~DialogCutArc() Q_DECL_OVERRIDE; void SetPointName(const QString &value); @@ -60,7 +60,7 @@ public: void SetChildrenId(const quint32 &ch1, const quint32 &ch2); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type); + virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; /** * @brief DeployFormulaTextEdit grow or shrink formula input */ @@ -71,12 +71,12 @@ public slots: void FormulaTextChanged(); void FXLength(); protected: - virtual void ShowVisualization(); + virtual void ShowVisualization() Q_DECL_OVERRIDE; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData(); - virtual void closeEvent(QCloseEvent *event); + virtual void SaveData() Q_DECL_OVERRIDE; + virtual void closeEvent(QCloseEvent *event) Q_DECL_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 b2203e85d..741967ff6 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutspline.h +++ b/src/libs/vtools/dialogs/tools/dialogcutspline.h @@ -44,7 +44,7 @@ class DialogCutSpline : public DialogTool Q_OBJECT public: DialogCutSpline(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogCutSpline(); + virtual ~DialogCutSpline() Q_DECL_OVERRIDE; void SetPointName(const QString &value); @@ -59,19 +59,19 @@ public: void SetChildrenId(const quint32 &ch1, const quint32 &ch2); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type); + virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; /** * @brief DeployFormulaTextEdit grow or shrink formula input */ void DeployFormulaTextEdit(); void FXLength(); protected: - virtual void ShowVisualization(); + virtual void ShowVisualization() Q_DECL_OVERRIDE; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData(); - virtual void closeEvent(QCloseEvent *event); + virtual void SaveData() Q_DECL_OVERRIDE; + virtual void closeEvent(QCloseEvent *event) Q_DECL_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 0976b5e1f..81b89daf5 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutsplinepath.h +++ b/src/libs/vtools/dialogs/tools/dialogcutsplinepath.h @@ -44,7 +44,7 @@ class DialogCutSplinePath : public DialogTool Q_OBJECT public: DialogCutSplinePath(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogCutSplinePath(); + virtual ~DialogCutSplinePath() Q_DECL_OVERRIDE; void SetPointName(const QString &value); @@ -59,19 +59,19 @@ public: void SetChildrenId(const quint32 &ch1, const quint32 &ch2); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type); + virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; /** * @brief DeployFormulaTextEdit grow or shrink formula input */ void DeployFormulaTextEdit(); void FXLength(); protected: - virtual void ShowVisualization(); + virtual void ShowVisualization() Q_DECL_OVERRIDE; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData(); - virtual void closeEvent(QCloseEvent *event); + virtual void SaveData() Q_DECL_OVERRIDE; + virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(DialogCutSplinePath) diff --git a/src/libs/vtools/dialogs/tools/dialogdetail.h b/src/libs/vtools/dialogs/tools/dialogdetail.h index 518410cf7..4930de5d2 100644 --- a/src/libs/vtools/dialogs/tools/dialogdetail.h +++ b/src/libs/vtools/dialogs/tools/dialogdetail.h @@ -45,7 +45,7 @@ public: VDetail getDetail() const; void setDetail(const VDetail &value); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type); + virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; void BiasXChanged(qreal d); void BiasYChanged(qreal d); void AlowenceChanged(qreal d); @@ -58,8 +58,8 @@ protected: /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData(); - virtual void CheckState(); + virtual void SaveData() Q_DECL_OVERRIDE; + virtual void CheckState() Q_DECL_OVERRIDE; private: /** @brief ui keeps information about user interface */ diff --git a/src/libs/vtools/dialogs/tools/dialogendline.h b/src/libs/vtools/dialogs/tools/dialogendline.h index 0164e3fb1..5ae777ee8 100644 --- a/src/libs/vtools/dialogs/tools/dialogendline.h +++ b/src/libs/vtools/dialogs/tools/dialogendline.h @@ -44,7 +44,7 @@ class DialogEndLine : public DialogTool Q_OBJECT public: DialogEndLine(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogEndLine(); + virtual ~DialogEndLine() Q_DECL_OVERRIDE; void SetPointName(const QString &value); @@ -63,9 +63,9 @@ public: QString GetLineColor() const; void SetLineColor(const QString &value); - virtual void ShowDialog(bool click); + virtual void ShowDialog(bool click) Q_DECL_OVERRIDE; public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type); + virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; /** * @brief DeployFormulaTextEdit grow or shrink formula input */ @@ -82,12 +82,12 @@ public slots: void FXAngle(); void FXLength(); protected: - virtual void ShowVisualization(); + virtual void ShowVisualization() Q_DECL_OVERRIDE; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData(); - virtual void closeEvent(QCloseEvent *event); + virtual void SaveData() Q_DECL_OVERRIDE; + virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(DialogEndLine) diff --git a/src/libs/vtools/dialogs/tools/dialogheight.h b/src/libs/vtools/dialogs/tools/dialogheight.h index 11bf3fcbe..c490b68bb 100644 --- a/src/libs/vtools/dialogs/tools/dialogheight.h +++ b/src/libs/vtools/dialogs/tools/dialogheight.h @@ -44,7 +44,7 @@ class DialogHeight : public DialogTool Q_OBJECT public: DialogHeight(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogHeight(); + virtual ~DialogHeight() Q_DECL_OVERRIDE; void SetPointName(const QString &value); @@ -63,14 +63,14 @@ public: QString GetLineColor() const; void SetLineColor(const QString &value); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type); - virtual void PointNameChanged(); + virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; + virtual void PointNameChanged() Q_DECL_OVERRIDE; protected: - virtual void ShowVisualization(); + virtual void ShowVisualization() Q_DECL_OVERRIDE; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData(); + virtual void SaveData() Q_DECL_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 cde718e56..3a34125a0 100644 --- a/src/libs/vtools/dialogs/tools/dialogline.h +++ b/src/libs/vtools/dialogs/tools/dialogline.h @@ -44,7 +44,7 @@ class DialogLine : public DialogTool Q_OBJECT public: DialogLine(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogLine(); + virtual ~DialogLine() Q_DECL_OVERRIDE; quint32 GetFirstPoint() const; void SetFirstPoint(const quint32 &value); @@ -58,14 +58,14 @@ public: QString GetLineColor() const; void SetLineColor(const QString &value); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type); - virtual void PointNameChanged(); + virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; + virtual void PointNameChanged() Q_DECL_OVERRIDE; protected: - virtual void ShowVisualization(); + virtual void ShowVisualization() Q_DECL_OVERRIDE; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData(); + virtual void SaveData() Q_DECL_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 76bbca1a9..43e03e733 100644 --- a/src/libs/vtools/dialogs/tools/dialoglineintersect.h +++ b/src/libs/vtools/dialogs/tools/dialoglineintersect.h @@ -44,7 +44,7 @@ class DialogLineIntersect : public DialogTool Q_OBJECT public: DialogLineIntersect(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogLineIntersect(); + virtual ~DialogLineIntersect() Q_DECL_OVERRIDE; quint32 GetP1Line1() const; void SetP1Line1(const quint32 &value); @@ -60,15 +60,15 @@ public: void SetPointName(const QString &value); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type); + virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; void PointChanged(); - virtual void PointNameChanged(); + virtual void PointNameChanged() Q_DECL_OVERRIDE; protected: - virtual void ShowVisualization(); + virtual void ShowVisualization() Q_DECL_OVERRIDE; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData(); + virtual void SaveData() Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(DialogLineIntersect) @@ -78,7 +78,7 @@ private: /** @brief flagPoint keep state of point */ bool flagPoint; - virtual void CheckState(); + virtual void CheckState() Q_DECL_OVERRIDE; bool CheckIntersecion(); }; diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.h b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.h index d8975889d..03a4135e0 100644 --- a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.h +++ b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.h @@ -42,7 +42,7 @@ class DialogLineIntersectAxis : public DialogTool public: DialogLineIntersectAxis(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogLineIntersectAxis(); + virtual ~DialogLineIntersectAxis() Q_DECL_OVERRIDE; void SetPointName(const QString &value); @@ -64,21 +64,21 @@ public: QString GetLineColor() const; void SetLineColor(const QString &value); - virtual void ShowDialog(bool click); + virtual void ShowDialog(bool click) Q_DECL_OVERRIDE; public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type); + virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; void EvalAngle(); void AngleTextChanged(); void DeployAngleTextEdit(); - virtual void PointNameChanged(); + virtual void PointNameChanged() Q_DECL_OVERRIDE; void FXAngle(); protected: - virtual void ShowVisualization(); + virtual void ShowVisualization() Q_DECL_OVERRIDE; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData(); - virtual void closeEvent(QCloseEvent *event); + virtual void SaveData() Q_DECL_OVERRIDE; + virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(DialogLineIntersectAxis) Ui::DialogLineIntersectAxis *ui; diff --git a/src/libs/vtools/dialogs/tools/dialognormal.h b/src/libs/vtools/dialogs/tools/dialognormal.h index b07ae1b55..e6979fb45 100644 --- a/src/libs/vtools/dialogs/tools/dialognormal.h +++ b/src/libs/vtools/dialogs/tools/dialognormal.h @@ -44,7 +44,7 @@ class DialogNormal : public DialogTool Q_OBJECT public: DialogNormal(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogNormal(); + virtual ~DialogNormal() Q_DECL_OVERRIDE; void SetPointName(const QString &value); @@ -66,7 +66,7 @@ public: QString GetLineColor() const; void SetLineColor(const QString &value); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type); + virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; /** * @brief DeployFormulaTextEdit grow or shrink formula input */ @@ -75,15 +75,15 @@ public slots: * @brief FormulaTextChanged when formula text changes for validation and calc */ void FormulaTextChanged(); - virtual void PointNameChanged(); + virtual void PointNameChanged() Q_DECL_OVERRIDE; void FXLength(); protected: - virtual void ShowVisualization(); + virtual void ShowVisualization() Q_DECL_OVERRIDE; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData(); - virtual void closeEvent(QCloseEvent *event); + virtual void SaveData() Q_DECL_OVERRIDE; + virtual void closeEvent(QCloseEvent *event) Q_DECL_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 2b21f4bab..67d141946 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.h +++ b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.h @@ -57,14 +57,14 @@ public: void SetCrossCirclesPoint(CrossCirclesPoint &p); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type); + virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; protected: - virtual void ShowVisualization(); + virtual void ShowVisualization() Q_DECL_OVERRIDE; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData(); + virtual void SaveData() Q_DECL_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 f1fdcaf9d..49169099b 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.h +++ b/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.h @@ -59,7 +59,7 @@ public: void SetCrossCirclesPoint(CrossCirclesPoint &p); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type); + virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; void PointChanged(); void DeployCircleRadiusTextEdit(); @@ -68,13 +68,13 @@ public slots: void EvalCircleRadius(); protected: - virtual void ShowVisualization(); + virtual void ShowVisualization() Q_DECL_OVERRIDE; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData(); - virtual void closeEvent(QCloseEvent *event); - virtual void CheckState(); + virtual void SaveData() Q_DECL_OVERRIDE; + virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; + virtual void CheckState() Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(DialogPointFromCircleAndTangent) diff --git a/src/libs/vtools/dialogs/tools/dialogpointofcontact.h b/src/libs/vtools/dialogs/tools/dialogpointofcontact.h index 3104d9036..afdf66943 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofcontact.h +++ b/src/libs/vtools/dialogs/tools/dialogpointofcontact.h @@ -45,7 +45,7 @@ class DialogPointOfContact : public DialogTool Q_OBJECT public: DialogPointOfContact(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogPointOfContact(); + virtual ~DialogPointOfContact() Q_DECL_OVERRIDE; void SetPointName(const QString &value); @@ -61,7 +61,7 @@ public: quint32 GetSecondPoint() const; void SetSecondPoint(const quint32 &value); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type); + virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; /** * @brief DeployFormulaTextEdit grow or shrink formula input */ @@ -70,15 +70,15 @@ public slots: * @brief FormulaTextChanged when formula text changes for validation and calc */ void FormulaTextChanged(); - virtual void PointNameChanged(); + virtual void PointNameChanged() Q_DECL_OVERRIDE; void FXRadius(); protected: - virtual void ShowVisualization(); + virtual void ShowVisualization() Q_DECL_OVERRIDE; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData(); - virtual void closeEvent(QCloseEvent *event); + virtual void SaveData() Q_DECL_OVERRIDE; + virtual void closeEvent(QCloseEvent *event) Q_DECL_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 651c4c5c8..2f5e1f6ad 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersection.h +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersection.h @@ -44,7 +44,7 @@ class DialogPointOfIntersection : public DialogTool Q_OBJECT public: DialogPointOfIntersection(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogPointOfIntersection(); + virtual ~DialogPointOfIntersection() Q_DECL_OVERRIDE; void SetPointName(const QString &value); @@ -54,14 +54,14 @@ public: quint32 GetSecondPointId() const; void SetSecondPointId(const quint32 &value); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type); - virtual void PointNameChanged(); + virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; + virtual void PointNameChanged() Q_DECL_OVERRIDE; protected: - virtual void ShowVisualization(); + virtual void ShowVisualization() Q_DECL_OVERRIDE; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData(); + virtual void SaveData() Q_DECL_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 b33e70f92..eb277c672 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.h +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.h @@ -42,7 +42,7 @@ class DialogPointOfIntersectionArcs : public DialogTool public: DialogPointOfIntersectionArcs(const VContainer *data, const quint32 &toolId, QWidget *parent = 0); - virtual ~DialogPointOfIntersectionArcs(); + virtual ~DialogPointOfIntersectionArcs() Q_DECL_OVERRIDE; void SetPointName(const QString &value); @@ -56,15 +56,15 @@ public: void SetCrossArcPoint(CrossCirclesPoint &p); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type); + virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; virtual void ArcChanged(); protected: - virtual void ShowVisualization(); + virtual void ShowVisualization() Q_DECL_OVERRIDE; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData(); + virtual void SaveData() Q_DECL_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 06521767d..7b122b9a9 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.h +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.h @@ -42,7 +42,7 @@ class DialogPointOfIntersectionCircles : public DialogTool public: DialogPointOfIntersectionCircles(const VContainer *data, const quint32 &toolId, QWidget *parent = 0); - virtual ~DialogPointOfIntersectionCircles(); + virtual ~DialogPointOfIntersectionCircles() Q_DECL_OVERRIDE; void SetPointName(const QString &value); @@ -62,7 +62,7 @@ public: void SetCrossCirclesPoint(CrossCirclesPoint &p); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type); + virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; void PointChanged(); void DeployCircle1RadiusTextEdit(); @@ -78,13 +78,13 @@ public slots: void EvalCircle2Radius(); protected: - virtual void ShowVisualization(); + virtual void ShowVisualization() Q_DECL_OVERRIDE; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData(); - virtual void closeEvent(QCloseEvent *event); - virtual void CheckState(); + virtual void SaveData() Q_DECL_OVERRIDE; + virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; + virtual void CheckState() Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(DialogPointOfIntersectionCircles) diff --git a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.h b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.h index f60e55d59..c34cc7e57 100644 --- a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.h +++ b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.h @@ -44,7 +44,7 @@ class DialogShoulderPoint : public DialogTool Q_OBJECT public: DialogShoulderPoint(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogShoulderPoint(); + virtual ~DialogShoulderPoint() Q_DECL_OVERRIDE; void SetPointName(const QString &value); @@ -66,7 +66,7 @@ public: QString GetLineColor() const; void SetLineColor(const QString &value); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type); + virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; /** * @brief DeployFormulaTextEdit grow or shrink formula input */ @@ -75,15 +75,15 @@ public slots: * @brief FormulaTextChanged when formula text changes for validation and calc */ void FormulaTextChanged(); - virtual void PointNameChanged(); + virtual void PointNameChanged() Q_DECL_OVERRIDE; void FXLength(); protected: - virtual void ShowVisualization(); + virtual void ShowVisualization() Q_DECL_OVERRIDE; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData(); - virtual void closeEvent(QCloseEvent *event); + virtual void SaveData() Q_DECL_OVERRIDE; + virtual void closeEvent(QCloseEvent *event) Q_DECL_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 79e48e980..b797390f5 100644 --- a/src/libs/vtools/dialogs/tools/dialogsinglepoint.h +++ b/src/libs/vtools/dialogs/tools/dialogsinglepoint.h @@ -44,7 +44,7 @@ class DialogSinglePoint : public DialogTool Q_OBJECT public: DialogSinglePoint(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogSinglePoint(); + virtual ~DialogSinglePoint() Q_DECL_OVERRIDE; void SetData(const QString &name, const QPointF &point); QPointF GetPoint()const; @@ -55,7 +55,7 @@ protected: /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData(); + virtual void SaveData() Q_DECL_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 09693f7af..ce36e4bb0 100644 --- a/src/libs/vtools/dialogs/tools/dialogspline.h +++ b/src/libs/vtools/dialogs/tools/dialogspline.h @@ -44,7 +44,7 @@ class DialogSpline : public DialogTool Q_OBJECT public: DialogSpline(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogSpline(); + virtual ~DialogSpline() Q_DECL_OVERRIDE; quint32 GetP1() const; void SetP1(const quint32 &value); @@ -70,14 +70,14 @@ public: QString GetColor() const; void SetColor(const QString &value); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type); - virtual void PointNameChanged(); + virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; + virtual void PointNameChanged() Q_DECL_OVERRIDE; protected: - virtual void ShowVisualization(); + virtual void ShowVisualization() Q_DECL_OVERRIDE; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData(); + virtual void SaveData() Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(DialogSpline) diff --git a/src/libs/vtools/dialogs/tools/dialogsplinepath.h b/src/libs/vtools/dialogs/tools/dialogsplinepath.h index a19f1243a..7e5642eaa 100644 --- a/src/libs/vtools/dialogs/tools/dialogsplinepath.h +++ b/src/libs/vtools/dialogs/tools/dialogsplinepath.h @@ -45,7 +45,7 @@ class DialogSplinePath : public DialogTool Q_OBJECT public: DialogSplinePath(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogSplinePath(); + virtual ~DialogSplinePath() Q_DECL_OVERRIDE; VSplinePath GetPath() const; void SetPath(const VSplinePath &value); @@ -53,21 +53,21 @@ public: QString GetColor() const; void SetColor(const QString &value); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type); + virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; void PointChanged(int row); void currentPointChanged( int index ); void Angle1Changed(qreal index ); void Angle2Changed( qreal index ); void KAsm1Changed(qreal d); void KAsm2Changed(qreal d); - virtual void ShowDialog(bool click); + virtual void ShowDialog(bool click) Q_DECL_OVERRIDE; void PathUpdated(const VSplinePath &path); protected: - virtual void ShowVisualization(); + virtual void ShowVisualization() Q_DECL_OVERRIDE; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData(); + virtual void SaveData() Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(DialogSplinePath) diff --git a/src/libs/vtools/dialogs/tools/dialogtool.h b/src/libs/vtools/dialogs/tools/dialogtool.h index 1688f6163..2a3a342c4 100644 --- a/src/libs/vtools/dialogs/tools/dialogtool.h +++ b/src/libs/vtools/dialogs/tools/dialogtool.h @@ -63,7 +63,7 @@ class DialogTool : public QDialog Q_OBJECT public: DialogTool(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogTool(); + virtual ~DialogTool() Q_DECL_OVERRIDE; VAbstractTool* GetAssociatedTool(); void SetAssociatedTool(VAbstractTool* tool); @@ -114,7 +114,7 @@ public slots: void ArrowRightDown(); virtual void EvalFormula(); - virtual void PointNameChanged(){} + virtual void PointNameChanged() {} protected: Q_DISABLE_COPY(DialogTool) @@ -181,8 +181,8 @@ protected: Visualization *vis; - virtual void closeEvent ( QCloseEvent * event ); - virtual void showEvent( QShowEvent *event ); + virtual void closeEvent ( QCloseEvent * event ) Q_DECL_OVERRIDE; + virtual void showEvent( QShowEvent *event ) Q_DECL_OVERRIDE; void FillComboBoxPoints(QComboBox *box, FillComboBox rule = FillComboBox::Whole, const quint32 &ch1 = NULL_ID, const quint32 &ch2 = NULL_ID)const; @@ -308,11 +308,11 @@ protected: } void ChangeColor(QWidget *widget, const QColor &color); - virtual void ShowVisualization(){} + virtual void ShowVisualization() {} /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData(){} + virtual void SaveData() {} void MoveCursorToEnd(QPlainTextEdit *plainTextEdit); bool eventFilter(QObject *object, QEvent *event); void FixateSize(); diff --git a/src/libs/vtools/dialogs/tools/dialogtriangle.h b/src/libs/vtools/dialogs/tools/dialogtriangle.h index d9e11357b..01ad7c42b 100644 --- a/src/libs/vtools/dialogs/tools/dialogtriangle.h +++ b/src/libs/vtools/dialogs/tools/dialogtriangle.h @@ -44,7 +44,7 @@ class DialogTriangle : public DialogTool Q_OBJECT public: DialogTriangle(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogTriangle(); + virtual ~DialogTriangle() Q_DECL_OVERRIDE; quint32 GetAxisP1Id() const; void SetAxisP1Id(const quint32 &value); @@ -60,14 +60,14 @@ public: void SetPointName(const QString &value); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type); - virtual void PointNameChanged(); + virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; + virtual void PointNameChanged() Q_DECL_OVERRIDE; protected: virtual void ShowVisualization(); /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData(); + virtual void SaveData() Q_DECL_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 c0cb2b2c6..37e05fbff 100644 --- a/src/libs/vtools/dialogs/tools/dialogtruedarts.h +++ b/src/libs/vtools/dialogs/tools/dialogtruedarts.h @@ -65,17 +65,17 @@ public: void SetChildrenId(const quint32 &ch1, const quint32 &ch2); public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type); - virtual void PointNameChanged(); + virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; + virtual void PointNameChanged() Q_DECL_OVERRIDE; void NameDartPoint1Changed(); void NameDartPoint2Changed(); protected: - virtual void ShowVisualization(); + virtual void ShowVisualization() Q_DECL_OVERRIDE; /** * @brief SaveData Put dialog data in local variables */ - virtual void SaveData(); - virtual void CheckState(); + virtual void SaveData() Q_DECL_OVERRIDE; + virtual void CheckState() Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(DialogTrueDarts) diff --git a/src/libs/vtools/dialogs/tools/dialoguniondetails.h b/src/libs/vtools/dialogs/tools/dialoguniondetails.h index 5a556ff72..03c6e7f86 100644 --- a/src/libs/vtools/dialogs/tools/dialoguniondetails.h +++ b/src/libs/vtools/dialogs/tools/dialoguniondetails.h @@ -44,7 +44,7 @@ class DialogUnionDetails : public DialogTool Q_OBJECT public: DialogUnionDetails(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); - virtual ~DialogUnionDetails(); + virtual ~DialogUnionDetails() Q_DECL_OVERRIDE; quint32 getD1() const; quint32 getD2() const; diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h index a653820a6..85c70fb3f 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h +++ b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h @@ -39,20 +39,21 @@ class VAbstractSpline:public VDrawTool, public QGraphicsPathItem Q_OBJECT public: VAbstractSpline(VAbstractPattern *doc, VContainer *data, quint32 id, QGraphicsItem * parent = nullptr); - virtual ~VAbstractSpline(); + virtual ~VAbstractSpline() Q_DECL_OVERRIDE; // cppcheck-suppress duplInheritedMember static const QString TagName; - virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0); - virtual int type() const {return Type;} + virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, + QWidget * widget = 0) Q_DECL_OVERRIDE; + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::AbstractSpline)}; - virtual QString getTagName() const; + virtual QString getTagName() const Q_DECL_OVERRIDE; void ShowHandles(bool show); void setEnabled(bool enabled); public slots: - virtual void FullUpdateFromFile (); - virtual void Disable(bool disable, const QString &namePP); + virtual void FullUpdateFromFile () Q_DECL_OVERRIDE; + virtual void Disable(bool disable, const QString &namePP) Q_DECL_OVERRIDE; void DetailsMode(bool mode); signals: /** @@ -81,16 +82,16 @@ protected: * @brief RefreshGeometry refresh item on scene. */ virtual void RefreshGeometry ()=0; - virtual void ShowTool(quint32 id, bool enable); - virtual void SetFactor(qreal factor); - virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent * event ); - virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ); - virtual QVariant itemChange ( GraphicsItemChange change, const QVariant &value ); - virtual void keyReleaseEvent(QKeyEvent * event); - virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ); + virtual void ShowTool(quint32 id, bool enable) Q_DECL_OVERRIDE; + virtual void SetFactor(qreal factor) 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 mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ) Q_DECL_OVERRIDE; QPainterPath ToolPath(PathDirection direction = PathDirection::Hide) const; - virtual void ReadToolAttributes(const QDomElement &domElement); - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj); + virtual void ReadToolAttributes(const QDomElement &domElement) Q_DECL_OVERRIDE; + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; template void ShowToolVisualization(bool show) diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.h index 46339e84c..3fe9ddef8 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.h +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.h @@ -42,16 +42,16 @@ class VToolArc :public VAbstractSpline public: VToolArc(VAbstractPattern *doc, VContainer *data, quint32 id, const QString &color, const Source &typeCreation, QGraphicsItem * parent = nullptr); - virtual void setDialog(); + virtual void setDialog() Q_DECL_OVERRIDE; static VToolArc* Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolArc* Create(const quint32 _id, const quint32 ¢er, QString &radius, QString &f1, QString &f2, const QString &color, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data, const Document &parse, const Source &typeCreation); static const QString TagName; static const QString ToolType; - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::Arc)}; - virtual QString getTagName() const; + virtual QString getTagName() const Q_DECL_OVERRIDE; quint32 getCenter() const; void setCenter(const quint32 &value); @@ -65,13 +65,13 @@ public: VFormula GetFormulaF2() const; void SetFormulaF2(const VFormula &value); - virtual void ShowVisualization(bool show); + virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void RemoveReferens(); - virtual void SaveDialog(QDomElement &domElement); - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj); - virtual void SetVisualization(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) Q_DECL_OVERRIDE; + virtual void RemoveReferens() Q_DECL_OVERRIDE; + virtual void SaveDialog(QDomElement &domElement) Q_DECL_OVERRIDE; + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; + virtual void SetVisualization() Q_DECL_OVERRIDE; private: void RefreshGeometry(); }; diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.h index 63054f455..a1c8572e8 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.h +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.h @@ -41,7 +41,7 @@ public: const Source &typeCreation, QGraphicsItem * parent = nullptr); - virtual void setDialog(); + virtual void setDialog() Q_DECL_OVERRIDE; static VToolArcWithLength* Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolArcWithLength* Create(const quint32 _id, const quint32 ¢er, QString &radius, QString &f1, @@ -50,9 +50,9 @@ public: VContainer *data, const Document &parse, const Source &typeCreation); static const QString TagName; static const QString ToolType; - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::ArcWithLength)}; - virtual QString getTagName() const; + virtual QString getTagName() const Q_DECL_OVERRIDE; quint32 getCenter() const; void setCenter(const quint32 &value); @@ -66,13 +66,13 @@ public: VFormula GetFormulaLength() const; void SetFormulaLength(const VFormula &value); - virtual void ShowVisualization(bool show); + virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void RemoveReferens(); - virtual void SaveDialog(QDomElement &domElement); - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj); - virtual void SetVisualization(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) Q_DECL_OVERRIDE; + virtual void RemoveReferens() Q_DECL_OVERRIDE; + virtual void SaveDialog(QDomElement &domElement) Q_DECL_OVERRIDE; + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; + virtual void SetVisualization() Q_DECL_OVERRIDE; private: void RefreshGeometry(); diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.h index 7866a4208..19d4a937f 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.h +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.h @@ -40,8 +40,8 @@ class VToolSpline:public VAbstractSpline public: VToolSpline (VAbstractPattern *doc, VContainer *data, quint32 id, const QString &color, const Source &typeCreation, QGraphicsItem * parent = nullptr ); - virtual ~VToolSpline(); - virtual void setDialog(); + virtual ~VToolSpline() Q_DECL_OVERRIDE; + virtual void setDialog() Q_DECL_OVERRIDE; static VToolSpline *Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolSpline *Create(const quint32 _id, const quint32 &p1, const quint32 &p4, const qreal &kAsm1, const qreal kAsm2, const qreal &angle1, const qreal &angle2, const qreal &kCurve, @@ -49,28 +49,28 @@ public: VContainer *data, const Document &parse, const Source &typeCreation); static const QString ToolType; - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::Spline)}; VSpline getSpline()const; void setSpline(const VSpline &spl); - virtual void ShowVisualization(bool show); + virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; public slots: void ControlPointChangePosition (const qint32 &indexSpline, const SplinePointPosition &position, const QPointF &pos); - virtual void EnableToolMove(bool move); + virtual void EnableToolMove(bool move) Q_DECL_OVERRIDE; protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void RemoveReferens(); - virtual void SaveDialog(QDomElement &domElement); - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj); - virtual void mousePressEvent(QGraphicsSceneMouseEvent * event); - virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ); - virtual void mouseMoveEvent(QGraphicsSceneMouseEvent * event); - virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent * event ); - virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ); - virtual void SetVisualization(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) Q_DECL_OVERRIDE; + virtual void RemoveReferens() Q_DECL_OVERRIDE; + virtual void SaveDialog(QDomElement &domElement) 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; private: Q_DISABLE_COPY(VToolSpline) void RefreshGeometry (); diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.h index b2fc2b9f7..f09e09233 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.h +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.h @@ -41,7 +41,7 @@ public: VToolSplinePath(VAbstractPattern *doc, VContainer *data, quint32 id, const QString &color, const Source &typeCreation, QGraphicsItem * parent = nullptr); - virtual ~VToolSplinePath(); + virtual ~VToolSplinePath() Q_DECL_OVERRIDE; virtual void setDialog(); static VToolSplinePath *Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); @@ -51,13 +51,13 @@ public: const Source &typeCreation); static const QString ToolType; static void UpdatePathPoint(VAbstractPattern *doc, QDomNode& node, const VSplinePath &path); - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::SplinePath)}; VSplinePath getSplinePath()const; void setSplinePath(const VSplinePath &splPath); - virtual void ShowVisualization(bool show); + virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; signals: /** * @brief RefreshLine refresh control line. @@ -77,19 +77,19 @@ public slots: void ControlPointChangePosition(const qint32 &indexSpline, const SplinePointPosition &position, const QPointF &pos); - virtual void EnableToolMove(bool move); + virtual void EnableToolMove(bool move) Q_DECL_OVERRIDE; protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void RefreshDataInFile(); - virtual void RemoveReferens(); - virtual void SaveDialog(QDomElement &domElement); - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj); - virtual void mousePressEvent(QGraphicsSceneMouseEvent * event); - virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ); - virtual void mouseMoveEvent(QGraphicsSceneMouseEvent * event); - virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent * event ); - virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ); - virtual void SetVisualization(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) Q_DECL_OVERRIDE; + virtual void RefreshDataInFile() Q_DECL_OVERRIDE; + virtual void RemoveReferens() Q_DECL_OVERRIDE; + virtual void SaveDialog(QDomElement &domElement) 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; private: QPointF oldPosition; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.h b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.h index b972f7d16..1f4eb3f7d 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.h @@ -43,12 +43,13 @@ class VToolDoublePoint: public VAbstractPoint, public QGraphicsPathItem public: VToolDoublePoint(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 p1id, quint32 p2id, QGraphicsItem * parent = nullptr); - virtual ~VToolDoublePoint(); + virtual ~VToolDoublePoint() Q_DECL_OVERRIDE; - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::DoublePoint)}; - virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0); + virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, + QWidget * widget = 0) Q_DECL_OVERRIDE; QString nameP1() const; void setNameP1(const QString &name); @@ -61,12 +62,12 @@ public: public slots: void Label1ChangePosition(const QPointF &pos); void Label2ChangePosition(const QPointF &pos); - virtual void SetFactor(qreal factor); - virtual void Disable(bool disable, const QString &namePP); - virtual void EnableToolMove(bool move); + virtual void SetFactor(qreal factor) Q_DECL_OVERRIDE; + virtual void Disable(bool disable, const QString &namePP) Q_DECL_OVERRIDE; + virtual void EnableToolMove(bool move) Q_DECL_OVERRIDE; void Point1Choosed(); void Point2Choosed(); - virtual void FullUpdateFromFile(); + virtual void FullUpdateFromFile() Q_DECL_OVERRIDE; protected: VSimplePoint *firstPoint; @@ -75,14 +76,14 @@ protected: quint32 p1id; quint32 p2id; - virtual void UpdateNamePosition(quint32 id); - virtual void RefreshLine(quint32 id); - virtual QVariant itemChange ( GraphicsItemChange change, const QVariant &value ); - virtual void keyReleaseEvent(QKeyEvent * event); - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj); - virtual void AddToFile(); - virtual void RefreshDataInFile(); + virtual void UpdateNamePosition(quint32 id) Q_DECL_OVERRIDE; + virtual void RefreshLine(quint32 id) 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 RefreshDataInFile() Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(VToolDoublePoint) diff --git a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.h b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.h index d9204085a..4aa074f6d 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.h @@ -50,7 +50,7 @@ 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(); + virtual void setDialog() Q_DECL_OVERRIDE; static VToolTrueDarts* Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolTrueDarts* Create(quint32 _id, @@ -65,10 +65,10 @@ public: VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data, const Document &parse, const Source &typeCreation); static const QString ToolType; - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::TrueDarts)}; - virtual void ShowVisualization(bool show); + virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; quint32 GetBaseLineP1Id() const; void SetBaseLineP1Id(const quint32 &value); @@ -86,12 +86,12 @@ public: void SetDartP3Id(const quint32 &value); protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void RemoveReferens(); - virtual void SaveDialog(QDomElement &domElement); - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj); - virtual void ReadToolAttributes(const QDomElement &domElement); - virtual void SetVisualization(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) Q_DECL_OVERRIDE; + virtual void RemoveReferens() Q_DECL_OVERRIDE; + virtual void SaveDialog(QDomElement &domElement) 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; 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 94f6aa89f..a963fa9d1 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.h @@ -42,7 +42,7 @@ public: VToolCut(VAbstractPattern *doc, VContainer *data, const quint32 &id, const QString &formula, const quint32 &curveCutId, const quint32 &curve1id, const quint32 &curve2id, const QString &color, QGraphicsItem * parent = nullptr); - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::Cut)}; VFormula GetFormula() const; @@ -54,9 +54,9 @@ public: public slots: virtual void CurveChoosed(quint32 id)=0; void HoverPath(quint32 id, SimpleCurvePoint curvePosition, PathDirection direction); - virtual void Disable(bool disable, const QString &namePP); + virtual void Disable(bool disable, const QString &namePP) Q_DECL_OVERRIDE; void DetailsMode(bool mode); - virtual void FullUpdateFromFile(); + virtual void FullUpdateFromFile() Q_DECL_OVERRIDE; protected: /** @brief formula keep formula of length */ QString formula; @@ -76,9 +76,9 @@ protected: virtual void RefreshCurve(VSimpleCurve *curve, quint32 curveId, SimpleCurvePoint curvePosition, PathDirection direction = PathDirection::Hide)=0; void RefreshGeometry(); - virtual void RemoveReferens(); + virtual void RemoveReferens() Q_DECL_OVERRIDE; void FullUpdateCurveFromFile(const QString &attrCurve); - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj); + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_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 b805d4f10..7178a313e 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.h @@ -42,26 +42,26 @@ public: const quint32 &arcId, const quint32 &arc1id, const quint32 &arc2id, const QString &color, const Source &typeCreation, QGraphicsItem * parent = nullptr); - virtual void setDialog(); + virtual void setDialog() Q_DECL_OVERRIDE; static VToolCutArc* Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolCutArc* Create(const quint32 _id, const QString &pointName, QString &formula, const quint32 &arcId, const qreal &mx, const qreal &my, const QString &color, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data, const Document &parse, const Source &typeCreation); static const QString ToolType; - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::CutArc)}; - virtual void ShowVisualization(bool show); + virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; public slots: - virtual void CurveChoosed(quint32 id); + virtual void CurveChoosed(quint32 id) Q_DECL_OVERRIDE; protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void SaveDialog(QDomElement &domElement); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) Q_DECL_OVERRIDE; + virtual void SaveDialog(QDomElement &domElement) Q_DECL_OVERRIDE; virtual void RefreshCurve(VSimpleCurve *curve, quint32 curveId, SimpleCurvePoint curvePosition, - PathDirection direction = PathDirection::Hide); - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj); - virtual void ReadToolAttributes(const QDomElement &domElement); - virtual void SetVisualization(); + PathDirection direction = PathDirection::Hide) 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; 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 df3c92d66..c3924192b 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.h @@ -42,7 +42,7 @@ public: VToolCutSpline(VAbstractPattern *doc, VContainer *data, const quint32 &id, const QString &formula, const quint32 &splineId, const quint32 &spl1id, const quint32 &spl2id, const QString &color, const Source &typeCreation, QGraphicsItem * parent = nullptr); - virtual void setDialog(); + virtual void setDialog() Q_DECL_OVERRIDE; static VToolCutSpline *Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolCutSpline *Create(const quint32 _id, const QString &pointName, QString &formula, @@ -52,19 +52,19 @@ public: const Source &typeCreation); static const QString ToolType; static const QString AttrSpline; - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::CutSpline)}; - virtual void ShowVisualization(bool show); + virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; public slots: - virtual void CurveChoosed(quint32 id); + virtual void CurveChoosed(quint32 id) Q_DECL_OVERRIDE; protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void SaveDialog(QDomElement &domElement); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) Q_DECL_OVERRIDE; + virtual void SaveDialog(QDomElement &domElement) Q_DECL_OVERRIDE; virtual void RefreshCurve(VSimpleCurve *curve, quint32 curveId, SimpleCurvePoint curvePosition, - PathDirection direction = PathDirection::Hide); - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj); - virtual void ReadToolAttributes(const QDomElement &domElement); - virtual void SetVisualization(); + PathDirection direction = PathDirection::Hide) 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; 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 0fd9107bc..b44935fbf 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h @@ -43,7 +43,7 @@ public: VToolCutSplinePath(VAbstractPattern *doc, VContainer *data, const quint32 &id, const QString &formula, const quint32 &splinePathId, const quint32 &splPath1id, const quint32 &splPath2id, const QString &color, const Source &typeCreation, QGraphicsItem * parent = nullptr); - virtual void setDialog(); + virtual void setDialog() Q_DECL_OVERRIDE; static VToolCutSplinePath *Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolCutSplinePath *Create(const quint32 _id, const QString &pointName, QString &formula, @@ -53,19 +53,19 @@ public: const Document &parse, const Source &typeCreation); static const QString ToolType; static const QString AttrSplinePath; - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::CutSplinePath)}; - virtual void ShowVisualization(bool show); + virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; public slots: - virtual void CurveChoosed(quint32 id); + virtual void CurveChoosed(quint32 id) Q_DECL_OVERRIDE; protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void SaveDialog(QDomElement &domElement); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) Q_DECL_OVERRIDE; + virtual void SaveDialog(QDomElement &domElement) Q_DECL_OVERRIDE; virtual void RefreshCurve(VSimpleCurve *curve, quint32 curveId, SimpleCurvePoint curvePosition, - PathDirection direction = PathDirection::Hide); - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj); - virtual void ReadToolAttributes(const QDomElement &domElement); - virtual void SetVisualization(); + PathDirection direction = PathDirection::Hide) 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; 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 a770db865..97562c96c 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.h @@ -43,8 +43,9 @@ public: const quint32 &firstPointId, const quint32 &secondPointId, const QString &typeLine, const QString &lineColor, const Source &typeCreation, QGraphicsItem * parent = nullptr); - virtual void setDialog(); - static VToolAlongLine* Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); + virtual void setDialog() Q_DECL_OVERRIDE; + static VToolAlongLine* Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, + VContainer *data); static VToolAlongLine* Create(const quint32 _id, const QString &pointName, const QString &typeLine, const QString &lineColor, QString &formula, const quint32 &firstPointId, const quint32 &secondPointId, const qreal &mx, const qreal &my, @@ -52,21 +53,21 @@ public: const Document &parse, const Source &typeCreation); static const QString ToolType; - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::AlongLine)}; quint32 GetSecondPointId() const; void SetSecondPointId(const quint32 &value); - virtual void ShowVisualization(bool show); + virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; public slots: - virtual void SetFactor(qreal factor); + virtual void SetFactor(qreal factor) Q_DECL_OVERRIDE; protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void RemoveReferens(); - virtual void SaveDialog(QDomElement &domElement); - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj); - virtual void ReadToolAttributes(const QDomElement &domElement); - virtual void SetVisualization(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) Q_DECL_OVERRIDE; + virtual void RemoveReferens() Q_DECL_OVERRIDE; + virtual void SaveDialog(QDomElement &domElement) 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; private: /** @brief secondPointId id second point of line. */ quint32 secondPointId; 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 9c8902983..f95e92156 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.h @@ -46,7 +46,7 @@ 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(); + virtual void setDialog() Q_DECL_OVERRIDE; static VToolBisector* Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolBisector* Create(const quint32 _id, QString &formula, const quint32 &firstPointId, @@ -56,7 +56,7 @@ public: const Document &parse, const Source &typeCreation); static const QString ToolType; - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::Bisector)}; quint32 GetFirstPointId() const; @@ -65,16 +65,16 @@ public: quint32 GetThirdPointId() const; void SetThirdPointId(const quint32 &value); - virtual void ShowVisualization(bool show); + virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; public slots: - virtual void SetFactor(qreal factor); + virtual void SetFactor(qreal factor) Q_DECL_OVERRIDE; protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void RemoveReferens(); - virtual void SaveDialog(QDomElement &domElement); - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj); - virtual void ReadToolAttributes(const QDomElement &domElement); - virtual void SetVisualization(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) Q_DECL_OVERRIDE; + virtual void RemoveReferens() Q_DECL_OVERRIDE; + virtual void SaveDialog(QDomElement &domElement) 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; private: /** @brief firstPointId id first point of angle. */ quint32 firstPointId; 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 08930c408..2b26956f0 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.h @@ -38,8 +38,8 @@ public: VToolCurveIntersectAxis(VAbstractPattern *doc, VContainer *data, const quint32 &id, const QString &typeLine, const QString &lineColor, const QString &formulaAngle, const quint32 &basePointId, const quint32 &curveId, const Source &typeCreation, QGraphicsItem * parent = nullptr); - virtual ~VToolCurveIntersectAxis(); - virtual void setDialog(); + virtual ~VToolCurveIntersectAxis() Q_DECL_OVERRIDE; + virtual void setDialog() Q_DECL_OVERRIDE; static VToolCurveIntersectAxis *Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); @@ -52,7 +52,7 @@ public: static QPointF FindPoint(const QPointF &point, qreal angle, const QSharedPointer &curve); static const QString ToolType; - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::CurveIntersectAxis)}; VFormula GetFormulaAngle() const; @@ -61,13 +61,13 @@ public: quint32 getCurveId() const; void setCurveId(const quint32 &value); - virtual void ShowVisualization(bool show); + virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void SaveDialog(QDomElement &domElement); - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj); - virtual void ReadToolAttributes(const QDomElement &domElement); - virtual void SetVisualization(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) Q_DECL_OVERRIDE; + virtual void SaveDialog(QDomElement &domElement) 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; 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 95277c137..8242a86f9 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.h @@ -43,8 +43,8 @@ public: const QString &lineColor, const QString &formulaLength, const QString &formulaAngle, const quint32 &basePointId, const Source &typeCreation, QGraphicsItem * parent = nullptr); - virtual ~VToolEndLine(); - virtual void setDialog(); + virtual ~VToolEndLine() Q_DECL_OVERRIDE; + virtual void setDialog() Q_DECL_OVERRIDE; static VToolEndLine *Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolEndLine *Create(const quint32 _id, const QString &pointName, const QString &typeLine, @@ -54,18 +54,18 @@ public: const Document &parse, const Source &typeCreation); static const QString ToolType; - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::EndLine)}; VFormula GetFormulaAngle() const; void SetFormulaAngle(const VFormula &value); - virtual void ShowVisualization(bool show); + virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void SaveDialog(QDomElement &domElement); - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj); - virtual void ReadToolAttributes(const QDomElement &domElement); - virtual void SetVisualization(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) Q_DECL_OVERRIDE; + virtual void SaveDialog(QDomElement &domElement) 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; private: QString formulaAngle; }; 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 244ffcd0a..19b426fc3 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.h @@ -43,7 +43,7 @@ public: const QString &lineColor, const quint32 &basePointId, const quint32 &p1LineId, const quint32 &p2LineId, const Source &typeCreation, QGraphicsItem * parent = nullptr); - virtual void setDialog(); + virtual void setDialog() Q_DECL_OVERRIDE; static VToolHeight *Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolHeight *Create(const quint32 _id, const QString &pointName, const QString &typeLine, const QString &lineColor, const quint32 &basePointId, const quint32 &p1LineId, @@ -52,7 +52,7 @@ public: const Source &typeCreation); static QPointF FindPoint(const QLineF &line, const QPointF &point); static const QString ToolType; - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::Height)}; quint32 GetP1LineId() const; @@ -61,13 +61,13 @@ public: quint32 GetP2LineId() const; void SetP2LineId(const quint32 &value); - virtual void ShowVisualization(bool show); + virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void SaveDialog(QDomElement &domElement); - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj); - virtual void ReadToolAttributes(const QDomElement &domElement); - virtual void SetVisualization(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) Q_DECL_OVERRIDE; + virtual void SaveDialog(QDomElement &domElement) 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; private: /** @brief p1LineId id first point of line. */ quint32 p1LineId; 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 470516595..9a157d1b8 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.h @@ -39,8 +39,8 @@ public: const QString &lineColor, const QString &formulaAngle, const quint32 &basePointId, const quint32 &firstPointId, const quint32 &secondPointId, const Source &typeCreation, QGraphicsItem * parent = nullptr); - virtual ~VToolLineIntersectAxis(); - virtual void setDialog(); + virtual ~VToolLineIntersectAxis() Q_DECL_OVERRIDE; + virtual void setDialog() Q_DECL_OVERRIDE; static VToolLineIntersectAxis *Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); @@ -54,7 +54,7 @@ public: static QPointF FindPoint(const QLineF &axis, const QLineF &line); static const QString ToolType; - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::LineIntersectAxis)}; VFormula GetFormulaAngle() const; @@ -66,13 +66,13 @@ public: quint32 GetSecondPointId() const; void SetSecondPointId(const quint32 &value); - virtual void ShowVisualization(bool show); + virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void SaveDialog(QDomElement &domElement); - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj); - virtual void ReadToolAttributes(const QDomElement &domElement); - virtual void SetVisualization(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) Q_DECL_OVERRIDE; + virtual void SaveDialog(QDomElement &domElement) 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; private: Q_DISABLE_COPY(VToolLineIntersectAxis) QString formulaAngle; 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 f20c9fcfd..225691dd7 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h @@ -42,8 +42,8 @@ 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(); - virtual int type() const {return Type;} + virtual ~VToolLinePoint() Q_DECL_OVERRIDE; + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::LinePoint)}; VFormula GetFormulaLength() const; void SetFormulaLength(const VFormula &value); @@ -55,9 +55,9 @@ public: void SetAngle(const qreal &value); public slots: - virtual void SetFactor(qreal factor); - virtual void Disable(bool disable, const QString &namePP); - virtual void FullUpdateFromFile(); + virtual void SetFactor(qreal factor) Q_DECL_OVERRIDE; + virtual void Disable(bool disable, const QString &namePP) Q_DECL_OVERRIDE; + virtual void FullUpdateFromFile() Q_DECL_OVERRIDE; protected: /** @brief formula string with length formula. */ QString formulaLength; @@ -72,8 +72,8 @@ protected: QGraphicsLineItem *mainLine; virtual void RefreshGeometry(); - virtual void RemoveReferens(); - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj); + virtual void RemoveReferens() Q_DECL_OVERRIDE; + virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_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 5a06293dd..9685b5c7d 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.h @@ -42,7 +42,7 @@ public: const QString &lineColor, const QString &formula, const qreal &angle, const quint32 &firstPointId, const quint32 &secondPointId, const Source &typeCreation, QGraphicsItem * parent = nullptr); - virtual void setDialog(); + virtual void setDialog() Q_DECL_OVERRIDE; static VToolNormal* Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolNormal* Create(const quint32 _id, QString &formula, const quint32 &firstPointId, const quint32 &secondPointId, const QString &typeLine, const QString &lineColor, @@ -53,22 +53,22 @@ public: static QPointF FindPoint(const QPointF &firstPoint, const QPointF &secondPoint, const qreal &length, const qreal &angle = 0); static const QString ToolType; - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::Normal)}; quint32 GetSecondPointId() const; void SetSecondPointId(const quint32 &value); - virtual void ShowVisualization(bool show); + virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; public slots: - virtual void SetFactor(qreal factor); + virtual void SetFactor(qreal factor) Q_DECL_OVERRIDE; protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void RemoveReferens(); - virtual void SaveDialog(QDomElement &domElement); - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj); - virtual void ReadToolAttributes(const QDomElement &domElement); - virtual void SetVisualization(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) Q_DECL_OVERRIDE; + virtual void RemoveReferens() Q_DECL_OVERRIDE; + virtual void SaveDialog(QDomElement &domElement) 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; private: /** @brief secondPointId id second line point. */ quint32 secondPointId; 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 c9aaa817a..71bcf6d7a 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.h @@ -42,7 +42,7 @@ public: VToolShoulderPoint(VAbstractPattern *doc, VContainer *data, const quint32 &id, const QString &typeLine, const QString &lineColor, const QString &formula, const quint32 &p1Line, const quint32 &p2Line, const quint32 &pShoulder, const Source &typeCreation, QGraphicsItem * parent = nullptr); - virtual void setDialog(); + virtual void setDialog() Q_DECL_OVERRIDE; static QPointF FindPoint(const QPointF &p1Line, const QPointF &p2Line, const QPointF &pShoulder, const qreal &length); static VToolShoulderPoint* Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, @@ -54,7 +54,7 @@ public: const Document &parse, const Source &typeCreation); static const QString ToolType; - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::ShoulderPoint) }; quint32 GetP2Line() const; @@ -63,16 +63,16 @@ public: quint32 getPShoulder() const; void setPShoulder(const quint32 &value); - virtual void ShowVisualization(bool show); + virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; public slots: - virtual void SetFactor(qreal factor); + virtual void SetFactor(qreal factor) Q_DECL_OVERRIDE; protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void RemoveReferens(); - virtual void SaveDialog(QDomElement &domElement); - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj); - virtual void ReadToolAttributes(const QDomElement &domElement); - virtual void SetVisualization(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) Q_DECL_OVERRIDE; + virtual void RemoveReferens() Q_DECL_OVERRIDE; + virtual void SaveDialog(QDomElement &domElement) 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; private: /** @brief p2Line id second line point. */ quint32 p2Line; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.h index 6d2a5757b..82bbd1f84 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.h @@ -41,35 +41,35 @@ class VToolBasePoint : public VToolSinglePoint public: VToolBasePoint (VAbstractPattern *doc, VContainer *data, quint32 id, const Source &typeCreation, const QString &namePP, const QString &mPath, QGraphicsItem * parent = nullptr ); - virtual ~VToolBasePoint(); - virtual void setDialog(); + virtual ~VToolBasePoint() Q_DECL_OVERRIDE; + virtual void setDialog() Q_DECL_OVERRIDE; static const QString ToolType; - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::BasePoint)}; - virtual void ShowVisualization(bool show); + virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; public slots: - virtual void FullUpdateFromFile(); - virtual void SetFactor(qreal factor); - virtual void EnableToolMove(bool move); + virtual void FullUpdateFromFile() Q_DECL_OVERRIDE; + virtual void SetFactor(qreal factor) Q_DECL_OVERRIDE; + virtual void EnableToolMove(bool move) Q_DECL_OVERRIDE; signals: /** * @brief FullUpdateTree handle if need update pattern file. */ void LiteUpdateTree(); protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void AddToFile(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) Q_DECL_OVERRIDE; + virtual void AddToFile() Q_DECL_OVERRIDE; QVariant itemChange ( GraphicsItemChange change, const QVariant &value ); - virtual void decrementReferens(); - virtual void DeleteTool(bool ask = true); - virtual void SaveDialog(QDomElement &domElement); - virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent * event ); - virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ); - virtual void mousePressEvent( QGraphicsSceneMouseEvent * event ); - virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ); - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj); - virtual void ReadToolAttributes(const QDomElement &domElement); - virtual void SetVisualization() {} + virtual void decrementReferens() Q_DECL_OVERRIDE; + virtual void DeleteTool(bool ask = true) Q_DECL_OVERRIDE; + virtual void SaveDialog(QDomElement &domElement) Q_DECL_OVERRIDE; + virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent * event ) Q_DECL_OVERRIDE; + virtual void hoverLeaveEvent ( 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 {} private: QString namePP; QString mPath; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.h index cf98e4a67..f6e16c862 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.h @@ -41,7 +41,7 @@ public: VToolLineIntersect(VAbstractPattern *doc, VContainer *data, const quint32 &id, const quint32 &p1Line1, const quint32 &p2Line1, const quint32 &p1Line2, const quint32 &p2Line2, const Source &typeCreation, QGraphicsItem * parent = nullptr); - virtual void setDialog(); + virtual void setDialog() Q_DECL_OVERRIDE; static VToolLineIntersect *Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolLineIntersect *Create(const quint32 _id, const quint32 &p1Line1Id, const quint32 &p2Line1Id, @@ -50,7 +50,7 @@ public: VAbstractPattern *doc, VContainer *data, const Document &parse, const Source &typeCreation); static const QString ToolType; - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::LineIntersect)}; quint32 GetP1Line1() const; @@ -65,16 +65,16 @@ public: quint32 GetP2Line2() const; void SetP2Line2(const quint32 &value); - virtual void ShowVisualization(bool show); + virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; public slots: - virtual void SetFactor(qreal factor); + virtual void SetFactor(qreal factor) Q_DECL_OVERRIDE; protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void RemoveReferens(); - virtual void SaveDialog(QDomElement &domElement); - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj); - virtual void ReadToolAttributes(const QDomElement &domElement); - virtual void SetVisualization(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) Q_DECL_OVERRIDE; + virtual void RemoveReferens() Q_DECL_OVERRIDE; + virtual void SaveDialog(QDomElement &domElement) 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; private: /** @brief p1Line1 id first point first line. */ quint32 p1Line1; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.h index 0fae5cfd1..858de956e 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.h @@ -38,7 +38,7 @@ public: VToolPointFromArcAndTangent(VAbstractPattern *doc, VContainer *data, const quint32 &id, quint32 arcId, quint32 tangentPointId, CrossCirclesPoint crossPoint, const Source &typeCreation, QGraphicsItem * parent = nullptr); - virtual void setDialog(); + virtual void setDialog() Q_DECL_OVERRIDE; static VToolPointFromArcAndTangent *Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolPointFromArcAndTangent *Create(const quint32 _id, const QString &pointName, quint32 arcId, @@ -47,7 +47,7 @@ public: VContainer *data, const Document &parse, const Source &typeCreation); static QPointF FindPoint(const QPointF &p, const VArc *arc, const CrossCirclesPoint pType); static const QString ToolType; - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::PointFromArcAndTangent) }; quint32 GetTangentPointId() const; @@ -59,14 +59,14 @@ public: CrossCirclesPoint GetCrossCirclesPoint() const; void SetCrossCirclesPoint(CrossCirclesPoint &value); - virtual void ShowVisualization(bool show); + virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; protected: - virtual void RemoveReferens(); - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void SaveDialog(QDomElement &domElement); - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj); - virtual void ReadToolAttributes(const QDomElement &domElement); - virtual void SetVisualization(); + virtual void RemoveReferens() Q_DECL_OVERRIDE; + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) Q_DECL_OVERRIDE; + virtual void SaveDialog(QDomElement &domElement) 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; 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 47a4602eb..c00ca45c3 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.h @@ -40,7 +40,7 @@ public: VToolPointFromCircleAndTangent(VAbstractPattern *doc, VContainer *data, const quint32 &id, quint32 circleCenterId, const QString &circleRadius, quint32 tangentPointId, CrossCirclesPoint crossPoint, const Source &typeCreation, QGraphicsItem * parent = nullptr); - virtual void setDialog(); + virtual void setDialog() Q_DECL_OVERRIDE; static VToolPointFromCircleAndTangent *Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolPointFromCircleAndTangent *Create(const quint32 _id, const QString &pointName, @@ -50,7 +50,7 @@ public: const Document &parse, const Source &typeCreation); static QPointF FindPoint(const QPointF &p, const QPointF ¢er, qreal radius, const CrossCirclesPoint crossPoint); static const QString ToolType; - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::PointFromCircleAndTangent) }; quint32 GetTangentPointId() const; @@ -65,14 +65,14 @@ public: CrossCirclesPoint GetCrossCirclesPoint() const; void SetCrossCirclesPoint(CrossCirclesPoint &value); - virtual void ShowVisualization(bool show); + virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; protected: - virtual void RemoveReferens(); - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void SaveDialog(QDomElement &domElement); - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj); - virtual void ReadToolAttributes(const QDomElement &domElement); - virtual void SetVisualization(); + virtual void RemoveReferens() Q_DECL_OVERRIDE; + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) Q_DECL_OVERRIDE; + virtual void SaveDialog(QDomElement &domElement) 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; 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 d93443a6e..81f879a32 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.h @@ -43,7 +43,7 @@ public: VToolPointOfContact(VAbstractPattern *doc, VContainer *data, const quint32 &id, const QString &arcRadius, const quint32 ¢er, const quint32 &firstPointId, const quint32 &secondPointId, const Source &typeCreation, QGraphicsItem * parent = nullptr); - virtual void setDialog(); + virtual void setDialog() Q_DECL_OVERRIDE; static QPointF FindPoint(const qreal &arcRadius, const QPointF ¢er, const QPointF &firstPoint, const QPointF &secondPoint); static VToolPointOfContact* Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, @@ -55,7 +55,7 @@ public: VAbstractPattern *doc, VContainer *data, const Document &parse, const Source &typeCreation); static const QString ToolType; - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::PointOfContact) }; VFormula getArcRadius() const; @@ -70,16 +70,16 @@ public: quint32 GetSecondPointId() const; void SetSecondPointId(const quint32 &value); - virtual void ShowVisualization(bool show); + virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; public slots: - virtual void SetFactor(qreal factor); + virtual void SetFactor(qreal factor) Q_DECL_OVERRIDE; protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void RemoveReferens(); - virtual void SaveDialog(QDomElement &domElement); - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj); - virtual void ReadToolAttributes(const QDomElement &domElement); - virtual void SetVisualization(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) Q_DECL_OVERRIDE; + virtual void RemoveReferens() Q_DECL_OVERRIDE; + virtual void SaveDialog(QDomElement &domElement) 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; private: /** @brief radius string with formula radius arc. */ QString arcRadius; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.h index 6f463ab86..1e956da3b 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.h @@ -41,7 +41,7 @@ public: VToolPointOfIntersection(VAbstractPattern *doc, VContainer *data, const quint32 &id, const quint32 &firstPointId, const quint32 &secondPointId, const Source &typeCreation, QGraphicsItem * parent = nullptr); - virtual void setDialog(); + virtual void setDialog() Q_DECL_OVERRIDE; static VToolPointOfIntersection *Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolPointOfIntersection *Create(const quint32 _id, const QString &pointName, const quint32 &firstPointId, @@ -49,7 +49,7 @@ public: VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data, const Document &parse, const Source &typeCreation); static const QString ToolType; - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::PointOfIntersection) }; quint32 GetFirstPointId() const; @@ -58,14 +58,14 @@ public: quint32 GetSecondPointId() const; void SetSecondPointId(const quint32 &value); - virtual void ShowVisualization(bool show); + virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; protected: - virtual void RemoveReferens(); - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void SaveDialog(QDomElement &domElement); - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj); - virtual void ReadToolAttributes(const QDomElement &domElement); - virtual void SetVisualization(); + virtual void RemoveReferens() Q_DECL_OVERRIDE; + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) Q_DECL_OVERRIDE; + virtual void SaveDialog(QDomElement &domElement) 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; private: Q_DISABLE_COPY(VToolPointOfIntersection) /** @brief firstPointId id first line point. */ diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.h index 703a2a997..880f50798 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.h @@ -41,7 +41,7 @@ public: VToolPointOfIntersectionArcs(VAbstractPattern *doc, VContainer *data, const quint32 &id, const quint32 &firstArcId, const quint32 &secondArcId, CrossCirclesPoint crossPoint, const Source &typeCreation, QGraphicsItem * parent = nullptr); - virtual void setDialog(); + virtual void setDialog() Q_DECL_OVERRIDE; static VToolPointOfIntersectionArcs *Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolPointOfIntersectionArcs *Create(const quint32 _id, const QString &pointName, const quint32 &firstArcId, @@ -51,7 +51,7 @@ public: const Source &typeCreation); static QPointF FindPoint(const VArc *arc1, const VArc *arc2, const CrossCirclesPoint crossPoint); static const QString ToolType; - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::PointOfIntersectionArcs) }; quint32 GetFirstArcId() const; @@ -63,14 +63,14 @@ public: CrossCirclesPoint GetCrossCirclesPoint() const; void SetCrossCirclesPoint(CrossCirclesPoint &value); - virtual void ShowVisualization(bool show); + virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; protected: - virtual void RemoveReferens(); - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void SaveDialog(QDomElement &domElement); - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj); - virtual void ReadToolAttributes(const QDomElement &domElement); - virtual void SetVisualization(); + virtual void RemoveReferens() Q_DECL_OVERRIDE; + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) Q_DECL_OVERRIDE; + virtual void SaveDialog(QDomElement &domElement) 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; 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 3c48523a8..3540605ed 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.h @@ -42,7 +42,7 @@ public: const QString &firstCircleRadius, const QString &secondCircleRadius, CrossCirclesPoint crossPoint, const Source &typeCreation, QGraphicsItem * parent = nullptr); - virtual void setDialog(); + virtual void setDialog() Q_DECL_OVERRIDE; static VToolPointOfIntersectionCircles *Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); @@ -56,7 +56,7 @@ public: static QPointF FindPoint(const QPointF &c1Point, const QPointF &c2Point, qreal c1Radius, qreal c2Radius, const CrossCirclesPoint crossPoint); static const QString ToolType; - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::PointOfIntersectionCircles) }; quint32 GetFirstCircleCenterId() const; @@ -74,14 +74,14 @@ public: CrossCirclesPoint GetCrossCirclesPoint() const; void SetCrossCirclesPoint(CrossCirclesPoint &value); - virtual void ShowVisualization(bool show); + virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; protected: - virtual void RemoveReferens(); - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void SaveDialog(QDomElement &domElement); - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj); - virtual void ReadToolAttributes(const QDomElement &domElement); - virtual void SetVisualization(); + virtual void RemoveReferens() Q_DECL_OVERRIDE; + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) Q_DECL_OVERRIDE; + virtual void SaveDialog(QDomElement &domElement) 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; private: Q_DISABLE_COPY(VToolPointOfIntersectionCircles) diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h index dc4520b13..112285ee8 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h @@ -43,12 +43,13 @@ class VToolSinglePoint: public VAbstractPoint, public QGraphicsEllipseItem Q_OBJECT public: VToolSinglePoint(VAbstractPattern *doc, VContainer *data, quint32 id, QGraphicsItem * parent = nullptr); - virtual ~VToolSinglePoint(); + virtual ~VToolSinglePoint() Q_DECL_OVERRIDE; - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::SinglePoint)}; - virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0); + virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, + QWidget * widget = 0) Q_DECL_OVERRIDE; QString name() const; void setName(const QString &name); @@ -56,11 +57,11 @@ public: public slots: void NameChangePosition(const QPointF &pos); - virtual void SetFactor(qreal factor); - virtual void Disable(bool disable, const QString &namePP); - virtual void EnableToolMove(bool move); + virtual void SetFactor(qreal factor) Q_DECL_OVERRIDE; + virtual void Disable(bool disable, const QString &namePP) Q_DECL_OVERRIDE; + virtual void EnableToolMove(bool move) Q_DECL_OVERRIDE; void PointChoosed(); - virtual void FullUpdateFromFile(); + virtual void FullUpdateFromFile() Q_DECL_OVERRIDE; protected: /** @brief radius radius circle. */ qreal radius; @@ -71,16 +72,16 @@ protected: /** @brief lineName line what we see if label moved too away from point. */ QGraphicsLineItem *lineName; - virtual void UpdateNamePosition(quint32 id); - virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ); - virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent * event ); - virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ); + virtual void UpdateNamePosition(quint32 id) 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 RefreshPointGeometry(const VPointF &point); - virtual void RefreshLine(quint32 id); - virtual QVariant itemChange ( GraphicsItemChange change, const QVariant &value ); - virtual void keyReleaseEvent(QKeyEvent * event); - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj); + virtual void RefreshLine(quint32 id) 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; 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 95e6a870d..c9950b81b 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.h @@ -43,7 +43,7 @@ public: const quint32 &axisP2Id, const quint32 &firstPointId, const quint32 &secondPointId, const Source &typeCreation, QGraphicsItem * parent = nullptr); - virtual void setDialog(); + virtual void setDialog() Q_DECL_OVERRIDE; static VToolTriangle *Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolTriangle *Create(const quint32 _id, const QString &pointName, const quint32 &axisP1Id, @@ -53,7 +53,7 @@ public: static QPointF FindPoint(const QPointF &axisP1, const QPointF &axisP2, const QPointF &firstPoint, const QPointF &secondPoint); static const QString ToolType; - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::Triangle)}; quint32 GetAxisP1Id() const; @@ -68,14 +68,14 @@ public: quint32 GetSecondPointId() const; void SetSecondPointId(const quint32 &value); - virtual void ShowVisualization(bool show); + virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; protected: - virtual void RemoveReferens(); - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void SaveDialog(QDomElement &domElement); - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj); - virtual void ReadToolAttributes(const QDomElement &domElement); - virtual void SetVisualization(); + virtual void RemoveReferens() Q_DECL_OVERRIDE; + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) Q_DECL_OVERRIDE; + virtual void SaveDialog(QDomElement &domElement) 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; 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 e01e6872a..ef8c02d76 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.h @@ -37,16 +37,16 @@ class VAbstractPoint: public VDrawTool Q_OBJECT public: VAbstractPoint(VAbstractPattern *doc, VContainer *data, quint32 id); - virtual ~VAbstractPoint(); + virtual ~VAbstractPoint() Q_DECL_OVERRIDE; - virtual QString getTagName() const; + virtual QString getTagName() const Q_DECL_OVERRIDE; static const QString TagName; template void ShowToolVisualization(bool show); public slots: - virtual void ShowTool(quint32 id, bool enable); + virtual void ShowTool(quint32 id, bool enable) Q_DECL_OVERRIDE; void DeleteFromLabel(); protected: diff --git a/src/libs/vtools/tools/drawTools/vdrawtool.h b/src/libs/vtools/tools/drawTools/vdrawtool.h index 5da42ccc6..9eb5f76e5 100644 --- a/src/libs/vtools/tools/drawTools/vdrawtool.h +++ b/src/libs/vtools/tools/drawTools/vdrawtool.h @@ -47,7 +47,7 @@ class VDrawTool : public VAbstractTool public: VDrawTool(VAbstractPattern *doc, VContainer *data, quint32 id, QObject *parent = nullptr); - virtual ~VDrawTool(); + virtual ~VDrawTool() Q_DECL_OVERRIDE; /** @brief factor scene scale factor. */ static qreal factor; @@ -93,8 +93,8 @@ protected: /** @brief SaveDialog save options into file after change in dialog. */ virtual void SaveDialog(QDomElement &domElement)=0; void SaveDialogChange(); - virtual void AddToFile(); - virtual void RefreshDataInFile(); + virtual void AddToFile() Q_DECL_OVERRIDE; + virtual void RefreshDataInFile() Q_DECL_OVERRIDE; void SaveOption(QSharedPointer &obj); virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj); diff --git a/src/libs/vtools/tools/drawTools/vtoolline.h b/src/libs/vtools/tools/drawTools/vtoolline.h index 49d7d98ac..474d0f83b 100644 --- a/src/libs/vtools/tools/drawTools/vtoolline.h +++ b/src/libs/vtools/tools/drawTools/vtoolline.h @@ -42,45 +42,46 @@ public: VToolLine(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 firstPoint, quint32 secondPoint, const QString &typeLine, const QString &lineColor, const Source &typeCreation, QGraphicsItem * parent = nullptr); - virtual void setDialog(); + virtual void setDialog() Q_DECL_OVERRIDE; static VToolLine *Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); static VToolLine *Create(const quint32 &_id, const quint32 &firstPoint, const quint32 &secondPoint, const QString &typeLine, const QString &lineColor, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data, const Document &parse, const Source &typeCreation); static const QString TagName; - virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0); - virtual int type() const {return Type;} + virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, + QWidget * widget = 0) Q_DECL_OVERRIDE; + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::Line)}; - virtual QString getTagName() const; + virtual QString getTagName() const Q_DECL_OVERRIDE; quint32 GetFirstPoint() const; void SetFirstPoint(const quint32 &value); quint32 GetSecondPoint() const; void SetSecondPoint(const quint32 &value); - virtual void ShowVisualization(bool show); + virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; - virtual void SetTypeLine(const QString &value); - virtual void SetLineColor(const QString &value); + virtual void SetTypeLine(const QString &value) Q_DECL_OVERRIDE; + virtual void SetLineColor(const QString &value) Q_DECL_OVERRIDE; public slots: - virtual void FullUpdateFromFile(); - virtual void ShowTool(quint32 id, bool enable); - virtual void SetFactor(qreal factor); - virtual void Disable(bool disable, const QString &namePP); + virtual void FullUpdateFromFile() Q_DECL_OVERRIDE; + virtual void ShowTool(quint32 id, bool enable) Q_DECL_OVERRIDE; + virtual void SetFactor(qreal factor) Q_DECL_OVERRIDE; + virtual void Disable(bool disable, const QString &namePP) Q_DECL_OVERRIDE; protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void AddToFile(); - virtual void RefreshDataInFile(); - virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent * event ); - virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ); - virtual void RemoveReferens(); - virtual QVariant itemChange ( GraphicsItemChange change, const QVariant &value ); - virtual void keyReleaseEvent(QKeyEvent * event); - virtual void SaveDialog(QDomElement &domElement); - virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj); - virtual void ReadToolAttributes(const QDomElement &domElement); - virtual void SetVisualization(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) Q_DECL_OVERRIDE; + virtual void AddToFile() Q_DECL_OVERRIDE; + virtual void RefreshDataInFile() 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 SaveDialog(QDomElement &domElement) 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; private: /** @brief firstPoint id first line point. */ quint32 firstPoint; diff --git a/src/libs/vtools/tools/nodeDetails/vabstractnode.h b/src/libs/vtools/tools/nodeDetails/vabstractnode.h index 3a8dd9566..862dd1925 100644 --- a/src/libs/vtools/tools/nodeDetails/vabstractnode.h +++ b/src/libs/vtools/tools/nodeDetails/vabstractnode.h @@ -42,12 +42,12 @@ class VAbstractNode : public VAbstractTool public: VAbstractNode(VAbstractPattern *doc, VContainer *data, const quint32 &id, const quint32 &idNode, const quint32 &idTool, QObject *parent = nullptr); - virtual ~VAbstractNode() {} + virtual ~VAbstractNode() Q_DECL_OVERRIDE {} static const QString AttrIdObject; static const QString AttrIdTool; virtual void DeleteNode(); virtual void RestoreNode(); - virtual void ShowVisualization(bool show); + virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; protected: /** @brief idNodenode id. */ quint32 idNode; @@ -59,8 +59,8 @@ protected: QColor currentColor; void AddToModeling(const QDomElement &domElement); - virtual void decrementReferens(); - virtual void RemoveReferens(); + virtual void decrementReferens() Q_DECL_OVERRIDE; + virtual void RemoveReferens() Q_DECL_OVERRIDE; virtual void RestoreReferens(); virtual void SetVisualization() {} }; diff --git a/src/libs/vtools/tools/nodeDetails/vnodearc.h b/src/libs/vtools/tools/nodeDetails/vnodearc.h index 777454ccb..a87822c74 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodearc.h +++ b/src/libs/vtools/tools/nodeDetails/vnodearc.h @@ -46,19 +46,19 @@ public: const Source &typeCreation, const quint32 &idTool = 0, QObject *parent = nullptr); static const QString TagName; static const QString ToolType; - virtual void DeleteNode(); - virtual void RestoreNode(); - virtual int type() const {return Type;} + virtual void DeleteNode() Q_DECL_OVERRIDE; + virtual void RestoreNode() Q_DECL_OVERRIDE; + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::NodeArc)}; - virtual QString getTagName() const; + virtual QString getTagName() const Q_DECL_OVERRIDE; public slots: - virtual void FullUpdateFromFile(); + virtual void FullUpdateFromFile() Q_DECL_OVERRIDE; protected: - virtual void AddToFile(); - virtual void RefreshDataInFile(); - virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ); - virtual void hoverMoveEvent ( QGraphicsSceneHoverEvent * event ); - virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ); + virtual void AddToFile() Q_DECL_OVERRIDE; + virtual void RefreshDataInFile() Q_DECL_OVERRIDE; + virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ) Q_DECL_OVERRIDE; + virtual void hoverMoveEvent ( QGraphicsSceneHoverEvent * event ) Q_DECL_OVERRIDE; + virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ) Q_DECL_OVERRIDE; private: void RefreshGeometry(); }; diff --git a/src/libs/vtools/tools/nodeDetails/vnodepoint.h b/src/libs/vtools/tools/nodeDetails/vnodepoint.h index f6a3f4853..d5fe0d3ff 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodepoint.h +++ b/src/libs/vtools/tools/nodeDetails/vnodepoint.h @@ -52,13 +52,13 @@ public: const Source &typeCreation, const quint32 &idTool = 0, QObject *parent = nullptr); static const QString TagName; static const QString ToolType; - virtual void DeleteNode(); - virtual void RestoreNode(); - virtual int type() const {return Type;} + virtual void DeleteNode() Q_DECL_OVERRIDE; + virtual void RestoreNode() Q_DECL_OVERRIDE; + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::NodePoint)}; - virtual QString getTagName() const; + virtual QString getTagName() const Q_DECL_OVERRIDE; public slots: - virtual void FullUpdateFromFile(); + virtual void FullUpdateFromFile() Q_DECL_OVERRIDE; void NameChangePosition(const QPointF &pos); protected: /** @brief radius radius circle. */ @@ -70,11 +70,11 @@ protected: /** @brief lineName pointer to label line. */ QGraphicsLineItem *lineName; - virtual void AddToFile(); - virtual void RefreshDataInFile(); - virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ); - virtual void hoverMoveEvent ( QGraphicsSceneHoverEvent * event ); - virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ); + virtual void AddToFile() Q_DECL_OVERRIDE; + virtual void RefreshDataInFile() Q_DECL_OVERRIDE; + virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ) Q_DECL_OVERRIDE; + virtual void hoverMoveEvent ( QGraphicsSceneHoverEvent * event ) Q_DECL_OVERRIDE; + virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ) Q_DECL_OVERRIDE; virtual void UpdateNamePosition(qreal mx, qreal my); virtual void RefreshPointGeometry(const VPointF &point); void RefreshLine(); diff --git a/src/libs/vtools/tools/nodeDetails/vnodespline.h b/src/libs/vtools/tools/nodeDetails/vnodespline.h index c65fce665..531574637 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodespline.h +++ b/src/libs/vtools/tools/nodeDetails/vnodespline.h @@ -47,19 +47,19 @@ public: const Source &typeCreation, const quint32 &idTool = 0, QObject *parent = nullptr); static const QString TagName; static const QString ToolType; - virtual void DeleteNode(); - virtual void RestoreNode(); - virtual int type() const {return Type;} + virtual void DeleteNode() Q_DECL_OVERRIDE; + virtual void RestoreNode() Q_DECL_OVERRIDE; + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::NodeSpline)}; - virtual QString getTagName() const; + virtual QString getTagName() const Q_DECL_OVERRIDE; public slots: - virtual void FullUpdateFromFile (); + virtual void FullUpdateFromFile () Q_DECL_OVERRIDE; protected: - virtual void AddToFile (); - virtual void RefreshDataInFile(); - virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ); - virtual void hoverMoveEvent ( QGraphicsSceneHoverEvent * event ); - virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ); + virtual void AddToFile () Q_DECL_OVERRIDE; + virtual void RefreshDataInFile() Q_DECL_OVERRIDE; + virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ) Q_DECL_OVERRIDE; + virtual void hoverMoveEvent ( QGraphicsSceneHoverEvent * event ) Q_DECL_OVERRIDE; + virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ) Q_DECL_OVERRIDE; private: void RefreshGeometry (); }; diff --git a/src/libs/vtools/tools/nodeDetails/vnodesplinepath.h b/src/libs/vtools/tools/nodeDetails/vnodesplinepath.h index 0e0916839..dcf9c7d21 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodesplinepath.h +++ b/src/libs/vtools/tools/nodeDetails/vnodesplinepath.h @@ -45,19 +45,19 @@ public: const Source &typeCreation, const quint32 &idTool = 0, QObject *parent = 0); static const QString TagName; static const QString ToolType; - virtual void DeleteNode(); - virtual void RestoreNode(); - virtual int type() const {return Type;} + virtual void DeleteNode() Q_DECL_OVERRIDE; + virtual void RestoreNode() Q_DECL_OVERRIDE; + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::SplinePath)}; - virtual QString getTagName() const; + virtual QString getTagName() const Q_DECL_OVERRIDE; public slots: - virtual void FullUpdateFromFile(); + virtual void FullUpdateFromFile() Q_DECL_OVERRIDE; protected: - virtual void AddToFile(); - virtual void RefreshDataInFile(); - virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ); - virtual void hoverMoveEvent ( QGraphicsSceneHoverEvent * event ); - virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ); + virtual void AddToFile() Q_DECL_OVERRIDE; + virtual void RefreshDataInFile() Q_DECL_OVERRIDE; + virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ) Q_DECL_OVERRIDE; + virtual void hoverMoveEvent ( QGraphicsSceneHoverEvent * event ) Q_DECL_OVERRIDE; + virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ) Q_DECL_OVERRIDE; private: void RefreshGeometry(); }; diff --git a/src/libs/vtools/tools/vabstracttool.h b/src/libs/vtools/tools/vabstracttool.h index 6795e1099..2a6156af1 100644 --- a/src/libs/vtools/tools/vabstracttool.h +++ b/src/libs/vtools/tools/vabstracttool.h @@ -52,7 +52,7 @@ class VAbstractTool: public VDataTool Q_OBJECT public: VAbstractTool(VAbstractPattern *doc, VContainer *data, quint32 id, QObject *parent = nullptr); - virtual ~VAbstractTool(); + virtual ~VAbstractTool() Q_DECL_OVERRIDE; quint32 getId() const; static const QString AttrType; static const QString AttrMx; @@ -186,7 +186,7 @@ protected: /** * @brief RemoveReferens decrement value of reference. */ - virtual void RemoveReferens(){} + virtual void RemoveReferens() {} virtual void DeleteTool(bool ask = true); static int ConfirmDeletion(); diff --git a/src/libs/vtools/tools/vdatatool.h b/src/libs/vtools/tools/vdatatool.h index a85ab2d41..00848a07e 100644 --- a/src/libs/vtools/tools/vdatatool.h +++ b/src/libs/vtools/tools/vdatatool.h @@ -45,7 +45,7 @@ class VDataTool : public QObject Q_OBJECT public: VDataTool(VContainer *data, QObject *parent = nullptr); - virtual ~VDataTool(); + virtual ~VDataTool() Q_DECL_OVERRIDE; VDataTool &operator= (const VDataTool &tool); VContainer getData() const; void setData(const VContainer *value); diff --git a/src/libs/vtools/tools/vtooldetail.h b/src/libs/vtools/tools/vtooldetail.h index 4dce78bee..6491b0fb5 100644 --- a/src/libs/vtools/tools/vtooldetail.h +++ b/src/libs/vtools/tools/vtooldetail.h @@ -82,22 +82,22 @@ public: static const QString NodeSplinePath; void Remove(bool ask); static void AddNode(VAbstractPattern *doc, QDomElement &domElement, const VNodeDetail &node); - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::Detail)}; - virtual QString getTagName() const; - virtual void ShowVisualization(bool show); + virtual QString getTagName() const Q_DECL_OVERRIDE; + virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; public slots: - virtual void FullUpdateFromFile (); + virtual void FullUpdateFromFile () Q_DECL_OVERRIDE; virtual void FullUpdateFromGuiOk(int result); protected: - virtual void AddToFile (); - virtual void RefreshDataInFile(); - virtual QVariant itemChange ( GraphicsItemChange change, const QVariant &value ); - virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ); - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void RemoveReferens(); - virtual void keyReleaseEvent(QKeyEvent * event); - virtual void SetVisualization() {} + 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 mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ) Q_DECL_OVERRIDE; + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) Q_DECL_OVERRIDE; + virtual void RemoveReferens() Q_DECL_OVERRIDE; + virtual void keyReleaseEvent(QKeyEvent * event) Q_DECL_OVERRIDE; + virtual void SetVisualization() Q_DECL_OVERRIDE {} private: Q_DISABLE_COPY(VToolDetail) /** @brief dialog dialog options. */ @@ -114,7 +114,7 @@ private: * @param node node of detail. */ void InitTool(VMainGraphicsScene *scene, const VNodeDetail &node); - virtual void DeleteTool(bool ask = true); + virtual void DeleteTool(bool ask = true) Q_DECL_OVERRIDE; }; #endif // VTOOLDETAIL_H diff --git a/src/libs/vtools/tools/vtooluniondetails.h b/src/libs/vtools/tools/vtooluniondetails.h index c6b1134e3..70f0427f6 100644 --- a/src/libs/vtools/tools/vtooluniondetails.h +++ b/src/libs/vtools/tools/vtooluniondetails.h @@ -77,17 +77,17 @@ public: const qreal &angle = 0); static void BiasRotatePoint(VPointF *point, const qreal &dx, const qreal &dy, const QPointF &pRotate, const qreal &angle); - virtual QString getTagName() const; - virtual void ShowVisualization(bool show); + virtual QString getTagName() const Q_DECL_OVERRIDE; + virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; public slots: /** * @brief FullUpdateFromFile update tool data form file. */ - virtual void FullUpdateFromFile (){} + virtual void FullUpdateFromFile () Q_DECL_OVERRIDE {} protected: - virtual void AddToFile(); - virtual void RefreshDataInFile(); - virtual void SetVisualization() {} + virtual void AddToFile() Q_DECL_OVERRIDE; + virtual void RefreshDataInFile() Q_DECL_OVERRIDE; + virtual void SetVisualization() Q_DECL_OVERRIDE {} private: Q_DISABLE_COPY(VToolUnionDetails) /** @brief d1 first detail. */ diff --git a/src/libs/vtools/undocommands/adddet.h b/src/libs/vtools/undocommands/adddet.h index 53e05fb39..a4cc094fe 100644 --- a/src/libs/vtools/undocommands/adddet.h +++ b/src/libs/vtools/undocommands/adddet.h @@ -36,11 +36,11 @@ class AddDet : public VUndoCommand Q_OBJECT public: AddDet(const QDomElement &xml, VAbstractPattern *doc, QUndoCommand *parent = 0); - virtual ~AddDet(); + virtual ~AddDet() Q_DECL_OVERRIDE; // cppcheck-suppress unusedFunction - virtual void undo(); + virtual void undo() Q_DECL_OVERRIDE; // cppcheck-suppress unusedFunction - virtual void redo(); + virtual void redo() Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(AddDet) }; diff --git a/src/libs/vtools/undocommands/adddetnode.h b/src/libs/vtools/undocommands/adddetnode.h index 8db44930d..5176f5218 100644 --- a/src/libs/vtools/undocommands/adddetnode.h +++ b/src/libs/vtools/undocommands/adddetnode.h @@ -36,9 +36,9 @@ class AddDetNode : public VUndoCommand Q_OBJECT public: AddDetNode(const QDomElement &xml, VAbstractPattern *doc, QUndoCommand *parent = 0); - virtual ~AddDetNode(); - virtual void undo(); - virtual void redo(); + virtual ~AddDetNode() Q_DECL_OVERRIDE; + virtual void undo() Q_DECL_OVERRIDE; + virtual void redo() Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(AddDetNode) }; diff --git a/src/libs/vtools/undocommands/addpatternpiece.h b/src/libs/vtools/undocommands/addpatternpiece.h index 2e900267a..d03b3427f 100644 --- a/src/libs/vtools/undocommands/addpatternpiece.h +++ b/src/libs/vtools/undocommands/addpatternpiece.h @@ -37,9 +37,9 @@ class AddPatternPiece : public VUndoCommand public: AddPatternPiece(const QDomElement &xml, VAbstractPattern *doc, const QString &namePP, const QString &mPath, QUndoCommand *parent = 0); - virtual ~AddPatternPiece(); - virtual void undo(); - virtual void redo(); + virtual ~AddPatternPiece() Q_DECL_OVERRIDE; + virtual void undo() Q_DECL_OVERRIDE; + virtual void redo() Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(AddPatternPiece) QString namePP; diff --git a/src/libs/vtools/undocommands/addtocalc.h b/src/libs/vtools/undocommands/addtocalc.h index 388caf91e..3b2aa0739 100644 --- a/src/libs/vtools/undocommands/addtocalc.h +++ b/src/libs/vtools/undocommands/addtocalc.h @@ -36,11 +36,11 @@ class AddToCalc : public VUndoCommand Q_OBJECT public: AddToCalc(const QDomElement &xml, VAbstractPattern *doc, QUndoCommand *parent = 0); - virtual ~AddToCalc(); - virtual void undo(); - virtual void redo(); + virtual ~AddToCalc() Q_DECL_OVERRIDE; + virtual void undo() Q_DECL_OVERRIDE; + virtual void redo() Q_DECL_OVERRIDE; protected: - virtual void RedoFullParsing(); + virtual void RedoFullParsing() Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(AddToCalc) const QString nameActivDraw; diff --git a/src/libs/vtools/undocommands/adduniondetails.h b/src/libs/vtools/undocommands/adduniondetails.h index e14e8a5f9..0afb1b146 100644 --- a/src/libs/vtools/undocommands/adduniondetails.h +++ b/src/libs/vtools/undocommands/adduniondetails.h @@ -36,9 +36,9 @@ class AddUnionDetails : public VUndoCommand Q_OBJECT public: AddUnionDetails(const QDomElement &xml, VAbstractPattern *doc, QUndoCommand *parent = 0); - virtual ~AddUnionDetails(); - virtual void undo(); - virtual void redo(); + virtual ~AddUnionDetails() Q_DECL_OVERRIDE; + virtual void undo() Q_DECL_OVERRIDE; + virtual void redo() Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(AddUnionDetails) }; diff --git a/src/libs/vtools/undocommands/deletedetail.h b/src/libs/vtools/undocommands/deletedetail.h index 46a991f35..dc2654053 100644 --- a/src/libs/vtools/undocommands/deletedetail.h +++ b/src/libs/vtools/undocommands/deletedetail.h @@ -37,9 +37,9 @@ class DeleteDetail : public VUndoCommand Q_OBJECT public: DeleteDetail(VAbstractPattern *doc, quint32 id, QUndoCommand *parent = 0); - virtual ~DeleteDetail(); - virtual void undo(); - virtual void redo(); + virtual ~DeleteDetail() Q_DECL_OVERRIDE; + virtual void undo() Q_DECL_OVERRIDE; + virtual void redo() Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(DeleteDetail) QDomNode parentNode; diff --git a/src/libs/vtools/undocommands/deletepatternpiece.h b/src/libs/vtools/undocommands/deletepatternpiece.h index 64ff5027c..bc7af8efb 100644 --- a/src/libs/vtools/undocommands/deletepatternpiece.h +++ b/src/libs/vtools/undocommands/deletepatternpiece.h @@ -36,9 +36,9 @@ class DeletePatternPiece : public VUndoCommand Q_OBJECT public: DeletePatternPiece(VAbstractPattern *doc, const QString &namePP, QUndoCommand *parent = 0); - virtual ~DeletePatternPiece(); - virtual void undo(); - virtual void redo(); + virtual ~DeletePatternPiece() Q_DECL_OVERRIDE; + virtual void undo() Q_DECL_OVERRIDE; + virtual void redo() Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(DeletePatternPiece) QString namePP; diff --git a/src/libs/vtools/undocommands/deltool.h b/src/libs/vtools/undocommands/deltool.h index dce673687..625a86c7a 100644 --- a/src/libs/vtools/undocommands/deltool.h +++ b/src/libs/vtools/undocommands/deltool.h @@ -37,9 +37,9 @@ class DelTool : public VUndoCommand Q_OBJECT public: DelTool(VAbstractPattern *doc, quint32 id, QUndoCommand *parent = 0); - virtual ~DelTool(); - virtual void undo(); - virtual void redo(); + virtual ~DelTool() Q_DECL_OVERRIDE; + virtual void undo() Q_DECL_OVERRIDE; + virtual void redo() Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(DelTool) QDomNode parentNode; diff --git a/src/libs/vtools/undocommands/movedetail.h b/src/libs/vtools/undocommands/movedetail.h index 3886d6252..a8e306c4d 100644 --- a/src/libs/vtools/undocommands/movedetail.h +++ b/src/libs/vtools/undocommands/movedetail.h @@ -39,12 +39,12 @@ class MoveDetail : public VUndoCommand public: MoveDetail(VAbstractPattern *doc, const double &x, const double &y, const quint32 &id, QGraphicsScene *scene, QUndoCommand *parent = 0); - virtual ~MoveDetail(); - virtual void undo(); - virtual void redo(); + virtual ~MoveDetail() Q_DECL_OVERRIDE; + virtual void undo() Q_DECL_OVERRIDE; + virtual void redo() Q_DECL_OVERRIDE; // cppcheck-suppress unusedFunction - virtual bool mergeWith(const QUndoCommand *command); - virtual int id() const; + virtual bool mergeWith(const QUndoCommand *command) Q_DECL_OVERRIDE; + virtual int id() const Q_DECL_OVERRIDE; quint32 getDetId() const; double getNewX() const; double getNewY() const; diff --git a/src/libs/vtools/undocommands/movedoublelabel.h b/src/libs/vtools/undocommands/movedoublelabel.h index 5d6bf4871..aae347691 100644 --- a/src/libs/vtools/undocommands/movedoublelabel.h +++ b/src/libs/vtools/undocommands/movedoublelabel.h @@ -41,11 +41,11 @@ class MoveDoubleLabel : public VUndoCommand public: MoveDoubleLabel(VAbstractPattern *doc, const double &x, const double &y, DoublePoint type, const quint32 &id, QGraphicsScene *scene, QUndoCommand *parent = 0); - virtual ~MoveDoubleLabel(); - virtual void undo(); - virtual void redo(); - virtual bool mergeWith(const QUndoCommand *command); - virtual int id() const; + virtual ~MoveDoubleLabel() 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; quint32 getPointId() const; double getNewMx() const; double getNewMy() const; diff --git a/src/libs/vtools/undocommands/movelabel.h b/src/libs/vtools/undocommands/movelabel.h index fcbfc6d2f..3d74e0342 100644 --- a/src/libs/vtools/undocommands/movelabel.h +++ b/src/libs/vtools/undocommands/movelabel.h @@ -39,11 +39,11 @@ class MoveLabel : public VUndoCommand public: MoveLabel(VAbstractPattern *doc, const double &x, const double &y, const quint32 &id, QGraphicsScene *scene, QUndoCommand *parent = 0); - virtual ~MoveLabel(); - virtual void undo(); - virtual void redo(); - virtual bool mergeWith(const QUndoCommand *command); - virtual int id() const; + virtual ~MoveLabel() 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; quint32 getPointId() const; double getNewMx() const; double getNewMy() const; diff --git a/src/libs/vtools/undocommands/movespline.h b/src/libs/vtools/undocommands/movespline.h index 236f3c41f..cce2787b1 100644 --- a/src/libs/vtools/undocommands/movespline.h +++ b/src/libs/vtools/undocommands/movespline.h @@ -40,11 +40,11 @@ class MoveSpline : public VUndoCommand public: MoveSpline(VAbstractPattern *doc, const VSpline *oldSpl, const VSpline &spl, const quint32 &id, QGraphicsScene *scene, QUndoCommand *parent = 0); - virtual ~MoveSpline(); - virtual void undo(); - virtual void redo(); - virtual bool mergeWith(const QUndoCommand *command); - virtual int id() const; + 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; quint32 getSplineId() const; VSpline getNewSpline() const; private: diff --git a/src/libs/vtools/undocommands/movesplinepath.h b/src/libs/vtools/undocommands/movesplinepath.h index 91e51ef4c..2dd7a82a5 100644 --- a/src/libs/vtools/undocommands/movesplinepath.h +++ b/src/libs/vtools/undocommands/movesplinepath.h @@ -40,11 +40,11 @@ class MoveSplinePath : public VUndoCommand public: MoveSplinePath(VAbstractPattern *doc, const VSplinePath &oldSplPath, const VSplinePath &newSplPath, const quint32 &id, QGraphicsScene *scene, QUndoCommand *parent = 0); - virtual ~MoveSplinePath(); - virtual void undo(); - virtual void redo(); - virtual bool mergeWith(const QUndoCommand *command); - virtual int id() const; + virtual ~MoveSplinePath() 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; quint32 getSplinePathId() const; VSplinePath getNewSplinePath() const; private: diff --git a/src/libs/vtools/undocommands/movespoint.h b/src/libs/vtools/undocommands/movespoint.h index 62dd6d0b8..f6defcd60 100644 --- a/src/libs/vtools/undocommands/movespoint.h +++ b/src/libs/vtools/undocommands/movespoint.h @@ -39,11 +39,11 @@ class MoveSPoint : public VUndoCommand public: MoveSPoint(VAbstractPattern *doc, const double &x, const double &y, const quint32 &id, QGraphicsScene *scene, QUndoCommand *parent = 0); - virtual ~MoveSPoint(); - virtual void undo(); - virtual void redo(); - virtual bool mergeWith(const QUndoCommand *command); - virtual int id() const; + 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; quint32 getSPointId() const; double getNewX() const; double getNewY() const; diff --git a/src/libs/vtools/undocommands/renamepp.h b/src/libs/vtools/undocommands/renamepp.h index c52c7a01c..663ceb874 100644 --- a/src/libs/vtools/undocommands/renamepp.h +++ b/src/libs/vtools/undocommands/renamepp.h @@ -37,12 +37,12 @@ class RenamePP :public VUndoCommand Q_OBJECT public: RenamePP(VAbstractPattern *doc, const QString &newPPname, QComboBox *combo, QUndoCommand *parent = 0); - virtual ~RenamePP(); + virtual ~RenamePP() Q_DECL_OVERRIDE; - virtual void undo(); - virtual void redo(); - virtual bool mergeWith(const QUndoCommand *command); - virtual int id() const; + 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; QString getNewPPname() const; QString getOldPPname() const; private: diff --git a/src/libs/vtools/undocommands/savedetailoptions.h b/src/libs/vtools/undocommands/savedetailoptions.h index a32b4fd91..922a7a976 100644 --- a/src/libs/vtools/undocommands/savedetailoptions.h +++ b/src/libs/vtools/undocommands/savedetailoptions.h @@ -40,11 +40,11 @@ class SaveDetailOptions : public VUndoCommand public: SaveDetailOptions(const VDetail &oldDet, const VDetail &newDet, VAbstractPattern *doc, const quint32 &id, QGraphicsScene *scene, QUndoCommand *parent = 0); - virtual ~SaveDetailOptions(); - virtual void undo(); - virtual void redo(); - virtual bool mergeWith(const QUndoCommand *command); - virtual int id() const; + virtual ~SaveDetailOptions() 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; quint32 getDetId() const; VDetail getNewDet() const; private: diff --git a/src/libs/vtools/undocommands/savetooloptions.h b/src/libs/vtools/undocommands/savetooloptions.h index 2051b7e53..dc297e0a3 100644 --- a/src/libs/vtools/undocommands/savetooloptions.h +++ b/src/libs/vtools/undocommands/savetooloptions.h @@ -37,11 +37,11 @@ class SaveToolOptions : public VUndoCommand public: SaveToolOptions(const QDomElement &oldXml, const QDomElement &newXml, VAbstractPattern *doc, const quint32 &id, QUndoCommand *parent = 0); - virtual ~SaveToolOptions(); - virtual void undo(); - virtual void redo(); - virtual bool mergeWith(const QUndoCommand *command); - virtual int id() const; + virtual ~SaveToolOptions() 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; QDomElement getNewXml() const; quint32 getToolId() const; private: diff --git a/src/libs/vtools/undocommands/vundocommand.h b/src/libs/vtools/undocommands/vundocommand.h index 6a63ec2d1..4874c741d 100644 --- a/src/libs/vtools/undocommands/vundocommand.h +++ b/src/libs/vtools/undocommands/vundocommand.h @@ -59,7 +59,7 @@ class VUndoCommand : public QObject, public QUndoCommand Q_OBJECT public: VUndoCommand(const QDomElement &xml, VAbstractPattern *doc, QUndoCommand *parent = 0); - virtual ~VUndoCommand(); + virtual ~VUndoCommand() Q_DECL_OVERRIDE; signals: void ClearScene(); void NeedFullParsing(); diff --git a/src/libs/vtools/visualization/visline.h b/src/libs/vtools/visualization/visline.h index b657cd84e..81dcfd80a 100644 --- a/src/libs/vtools/visualization/visline.h +++ b/src/libs/vtools/visualization/visline.h @@ -40,9 +40,9 @@ class VisLine: public Visualization, public QGraphicsLineItem Q_OBJECT public: VisLine(const VContainer *data, QGraphicsItem *parent = 0); - virtual ~VisLine(); + virtual ~VisLine() Q_DECL_OVERRIDE; - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Vis::Line)}; protected: qreal CorrectAngle(const qreal &angle) const; @@ -50,8 +50,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(); - virtual void AddOnScene(); + virtual void InitPen() Q_DECL_OVERRIDE; + virtual void AddOnScene() Q_DECL_OVERRIDE; void DrawRay(QGraphicsLineItem *lineItem, const QPointF &p, const QPointF &pTangent, const QColor &color, Qt::PenStyle style); diff --git a/src/libs/vtools/visualization/vispath.h b/src/libs/vtools/visualization/vispath.h index a694d68fe..4d625cdd9 100644 --- a/src/libs/vtools/visualization/vispath.h +++ b/src/libs/vtools/visualization/vispath.h @@ -37,13 +37,13 @@ class VisPath : public Visualization, public QGraphicsPathItem Q_OBJECT public: VisPath(const VContainer *data, QGraphicsItem *parent = 0); - virtual ~VisPath(); + virtual ~VisPath() Q_DECL_OVERRIDE; - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Vis::Path)}; protected: - virtual void InitPen(); - virtual void AddOnScene(); + virtual void InitPen() Q_DECL_OVERRIDE; + virtual void AddOnScene() Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(VisPath) }; diff --git a/src/libs/vtools/visualization/vistoolalongline.h b/src/libs/vtools/visualization/vistoolalongline.h index 9225c1a69..6c0caf4eb 100644 --- a/src/libs/vtools/visualization/vistoolalongline.h +++ b/src/libs/vtools/visualization/vistoolalongline.h @@ -38,12 +38,12 @@ class VisToolAlongLine :public VisLine Q_OBJECT public: VisToolAlongLine(const VContainer *data, QGraphicsItem *parent = 0); - virtual ~VisToolAlongLine(); + virtual ~VisToolAlongLine() Q_DECL_OVERRIDE; - virtual void RefreshGeometry(); + virtual void RefreshGeometry() Q_DECL_OVERRIDE; void setPoint2Id(const quint32 &value); void setLength(const QString &expression); - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Vis::ToolAlongLine)}; private: Q_DISABLE_COPY(VisToolAlongLine) diff --git a/src/libs/vtools/visualization/vistoolarc.h b/src/libs/vtools/visualization/vistoolarc.h index ebdf2c562..6539b4320 100644 --- a/src/libs/vtools/visualization/vistoolarc.h +++ b/src/libs/vtools/visualization/vistoolarc.h @@ -36,13 +36,13 @@ class VisToolArc : public VisPath Q_OBJECT public: VisToolArc(const VContainer *data, QGraphicsItem *parent = 0); - virtual ~VisToolArc(); + virtual ~VisToolArc() Q_DECL_OVERRIDE; - virtual void RefreshGeometry(); + virtual void RefreshGeometry() Q_DECL_OVERRIDE; void setRadius(const QString &expression); void setF1(const QString &expression); void setF2(const QString &expression); - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Vis::ToolArc)}; private: Q_DISABLE_COPY(VisToolArc) diff --git a/src/libs/vtools/visualization/vistoolarcwithlength.h b/src/libs/vtools/visualization/vistoolarcwithlength.h index 9d33a1e7c..7b405f888 100644 --- a/src/libs/vtools/visualization/vistoolarcwithlength.h +++ b/src/libs/vtools/visualization/vistoolarcwithlength.h @@ -36,13 +36,13 @@ class VisToolArcWithLength : public VisPath Q_OBJECT public: VisToolArcWithLength(const VContainer *data, QGraphicsItem *parent = 0); - virtual ~VisToolArcWithLength(); + virtual ~VisToolArcWithLength() Q_DECL_OVERRIDE; - virtual void RefreshGeometry(); + virtual void RefreshGeometry() Q_DECL_OVERRIDE; void setRadius(const QString &expression); void setF1(const QString &expression); void setLength(const QString &expression); - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Vis::ToolArcWithLength)}; private: Q_DISABLE_COPY(VisToolArcWithLength) diff --git a/src/libs/vtools/visualization/vistoolbisector.h b/src/libs/vtools/visualization/vistoolbisector.h index 5f8226a23..0c55efeb2 100644 --- a/src/libs/vtools/visualization/vistoolbisector.h +++ b/src/libs/vtools/visualization/vistoolbisector.h @@ -36,13 +36,13 @@ class VisToolBisector :public VisLine Q_OBJECT public: VisToolBisector(const VContainer *data, QGraphicsItem *parent = 0); - virtual ~VisToolBisector(); + virtual ~VisToolBisector() Q_DECL_OVERRIDE; - virtual void RefreshGeometry(); + virtual void RefreshGeometry() Q_DECL_OVERRIDE; void setPoint2Id(const quint32 &value); void setPoint3Id(const quint32 &value); void setLength(const QString &expression); - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Vis::ToolBisector)}; private: Q_DISABLE_COPY(VisToolBisector) diff --git a/src/libs/vtools/visualization/vistoolcurveintersectaxis.h b/src/libs/vtools/visualization/vistoolcurveintersectaxis.h index 621e54342..9b02a2fce 100644 --- a/src/libs/vtools/visualization/vistoolcurveintersectaxis.h +++ b/src/libs/vtools/visualization/vistoolcurveintersectaxis.h @@ -38,15 +38,15 @@ class VisToolCurveIntersectAxis : public VisLine Q_OBJECT public: VisToolCurveIntersectAxis(const VContainer *data, QGraphicsItem *parent = 0); - virtual ~VisToolCurveIntersectAxis(); + virtual ~VisToolCurveIntersectAxis() Q_DECL_OVERRIDE; - virtual void RefreshGeometry(); + virtual void RefreshGeometry() Q_DECL_OVERRIDE; QString Angle() const; void SetAngle(const QString &expression); void setAxisPointId(const quint32 &value); - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Vis::ToolLineIntersectAxis)}; private: Q_DISABLE_COPY(VisToolCurveIntersectAxis) diff --git a/src/libs/vtools/visualization/vistoolcutarc.h b/src/libs/vtools/visualization/vistoolcutarc.h index 755da9330..574e16a96 100644 --- a/src/libs/vtools/visualization/vistoolcutarc.h +++ b/src/libs/vtools/visualization/vistoolcutarc.h @@ -36,11 +36,11 @@ class VisToolCutArc : public VisPath Q_OBJECT public: VisToolCutArc(const VContainer *data, QGraphicsItem *parent = 0); - virtual ~VisToolCutArc(); + virtual ~VisToolCutArc() Q_DECL_OVERRIDE; - virtual void RefreshGeometry(); + virtual void RefreshGeometry() Q_DECL_OVERRIDE; void setLength(const QString &expression); - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Vis::ToolCutArc)}; protected: Q_DISABLE_COPY(VisToolCutArc) diff --git a/src/libs/vtools/visualization/vistoolcutspline.h b/src/libs/vtools/visualization/vistoolcutspline.h index 02c26d443..7721b8d2b 100644 --- a/src/libs/vtools/visualization/vistoolcutspline.h +++ b/src/libs/vtools/visualization/vistoolcutspline.h @@ -36,11 +36,11 @@ class VisToolCutSpline : public VisPath Q_OBJECT public: VisToolCutSpline(const VContainer *data, QGraphicsItem *parent = 0); - virtual ~VisToolCutSpline(); + virtual ~VisToolCutSpline() Q_DECL_OVERRIDE; - virtual void RefreshGeometry(); + virtual void RefreshGeometry() Q_DECL_OVERRIDE; void setLength(const QString &expression); - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Vis::ToolCutSpline)}; protected: Q_DISABLE_COPY(VisToolCutSpline) diff --git a/src/libs/vtools/visualization/vistoolcutsplinepath.h b/src/libs/vtools/visualization/vistoolcutsplinepath.h index 6a0a7fab9..ceb770dd0 100644 --- a/src/libs/vtools/visualization/vistoolcutsplinepath.h +++ b/src/libs/vtools/visualization/vistoolcutsplinepath.h @@ -36,11 +36,11 @@ class VisToolCutSplinePath : public VisPath Q_OBJECT public: VisToolCutSplinePath(const VContainer *data, QGraphicsItem *parent = 0); - virtual ~VisToolCutSplinePath(); + virtual ~VisToolCutSplinePath() Q_DECL_OVERRIDE; - virtual void RefreshGeometry(); + virtual void RefreshGeometry() Q_DECL_OVERRIDE; void setLength(const QString &expression); - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Vis::ToolCutSpline)}; protected: Q_DISABLE_COPY(VisToolCutSplinePath) diff --git a/src/libs/vtools/visualization/vistoolendline.h b/src/libs/vtools/visualization/vistoolendline.h index 0161bb6c9..181618a12 100644 --- a/src/libs/vtools/visualization/vistoolendline.h +++ b/src/libs/vtools/visualization/vistoolendline.h @@ -38,13 +38,13 @@ class VisToolEndLine : public VisLine Q_OBJECT public: VisToolEndLine(const VContainer *data, QGraphicsItem *parent = 0); - virtual ~VisToolEndLine(); + virtual ~VisToolEndLine() Q_DECL_OVERRIDE; - virtual void RefreshGeometry(); + virtual void RefreshGeometry() Q_DECL_OVERRIDE; QString Angle() const; void SetAngle(const QString &expression); void setLength(const QString &expression); - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Vis::ToolEndLine)}; private: Q_DISABLE_COPY(VisToolEndLine) diff --git a/src/libs/vtools/visualization/vistoolheight.h b/src/libs/vtools/visualization/vistoolheight.h index 9666e4387..6941b78e0 100644 --- a/src/libs/vtools/visualization/vistoolheight.h +++ b/src/libs/vtools/visualization/vistoolheight.h @@ -36,13 +36,13 @@ class VisToolHeight : public VisLine Q_OBJECT public: VisToolHeight(const VContainer *data, QGraphicsItem *parent = 0); - virtual ~VisToolHeight(); + virtual ~VisToolHeight() Q_DECL_OVERRIDE; - virtual void RefreshGeometry(); + virtual void RefreshGeometry() Q_DECL_OVERRIDE; void setLineP1Id(const quint32 &value); void setLineP2Id(const quint32 &value); - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Vis::ToolHeight)}; private: Q_DISABLE_COPY(VisToolHeight) diff --git a/src/libs/vtools/visualization/vistoolline.h b/src/libs/vtools/visualization/vistoolline.h index fd45c2ef6..049fbe1ae 100644 --- a/src/libs/vtools/visualization/vistoolline.h +++ b/src/libs/vtools/visualization/vistoolline.h @@ -36,15 +36,15 @@ class VisToolLine : public VisLine Q_OBJECT public: VisToolLine(const VContainer *data, QGraphicsItem *parent = 0); - virtual ~VisToolLine(); + virtual ~VisToolLine() Q_DECL_OVERRIDE; - virtual void RefreshGeometry(); + virtual void RefreshGeometry() Q_DECL_OVERRIDE; void setPoint2Id(const quint32 &value); - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Vis::ToolLine)}; protected: virtual void DrawLine(QGraphicsLineItem *lineItem, const QLineF &line, const QColor &color, - Qt::PenStyle style = Qt::SolidLine); + Qt::PenStyle style = Qt::SolidLine) Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(VisToolLine) quint32 point2Id; diff --git a/src/libs/vtools/visualization/vistoollineintersect.h b/src/libs/vtools/visualization/vistoollineintersect.h index 8b7b7544d..af60a13e6 100644 --- a/src/libs/vtools/visualization/vistoollineintersect.h +++ b/src/libs/vtools/visualization/vistoollineintersect.h @@ -36,14 +36,14 @@ class VisToolLineIntersect :public VisLine Q_OBJECT public: VisToolLineIntersect(const VContainer *data, QGraphicsItem *parent = 0); - virtual ~VisToolLineIntersect(); + virtual ~VisToolLineIntersect() Q_DECL_OVERRIDE; - virtual void RefreshGeometry(); + virtual void RefreshGeometry() Q_DECL_OVERRIDE; void setLine1P2Id(const quint32 &value); void setLine2P1Id(const quint32 &value); void setLine2P2Id(const quint32 &value); - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Vis::ToolLineIntersect)}; private: Q_DISABLE_COPY(VisToolLineIntersect) diff --git a/src/libs/vtools/visualization/vistoollineintersectaxis.h b/src/libs/vtools/visualization/vistoollineintersectaxis.h index d9950c492..e527afcbd 100644 --- a/src/libs/vtools/visualization/vistoollineintersectaxis.h +++ b/src/libs/vtools/visualization/vistoollineintersectaxis.h @@ -38,16 +38,16 @@ class VisToolLineIntersectAxis : public VisLine Q_OBJECT public: VisToolLineIntersectAxis(const VContainer *data, QGraphicsItem *parent = 0); - virtual ~VisToolLineIntersectAxis(); + virtual ~VisToolLineIntersectAxis() Q_DECL_OVERRIDE; - virtual void RefreshGeometry(); + virtual void RefreshGeometry() Q_DECL_OVERRIDE; QString Angle() const; void SetAngle(const QString &expression); void setPoint2Id(const quint32 &value); void setAxisPointId(const quint32 &value); - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Vis::ToolLineIntersectAxis)}; private: Q_DISABLE_COPY(VisToolLineIntersectAxis) diff --git a/src/libs/vtools/visualization/vistoolnormal.h b/src/libs/vtools/visualization/vistoolnormal.h index ae73725a9..dca366e25 100644 --- a/src/libs/vtools/visualization/vistoolnormal.h +++ b/src/libs/vtools/visualization/vistoolnormal.h @@ -36,15 +36,15 @@ class VisToolNormal : public VisLine Q_OBJECT public: VisToolNormal(const VContainer *data, QGraphicsItem *parent = 0); - virtual ~VisToolNormal(); + virtual ~VisToolNormal() Q_DECL_OVERRIDE; - virtual void RefreshGeometry(); + virtual void RefreshGeometry() Q_DECL_OVERRIDE; void setPoint2Id(const quint32 &value); void setLength(const QString &expression); qreal GetAngle() const; void SetAngle(const qreal &value); - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Vis::ToolNormal)}; private: Q_DISABLE_COPY(VisToolNormal) diff --git a/src/libs/vtools/visualization/vistoolpointfromarcandtangent.h b/src/libs/vtools/visualization/vistoolpointfromarcandtangent.h index 69e6307dc..370cb98ea 100644 --- a/src/libs/vtools/visualization/vistoolpointfromarcandtangent.h +++ b/src/libs/vtools/visualization/vistoolpointfromarcandtangent.h @@ -37,14 +37,14 @@ class VisToolPointFromArcAndTangent : public VisLine Q_OBJECT public: VisToolPointFromArcAndTangent(const VContainer *data, QGraphicsItem *parent = 0); - virtual ~VisToolPointFromArcAndTangent(); + virtual ~VisToolPointFromArcAndTangent() Q_DECL_OVERRIDE; - virtual void RefreshGeometry(); + virtual void RefreshGeometry() Q_DECL_OVERRIDE; void setArcId(const quint32 &value); void setCrossPoint(const CrossCirclesPoint &value); - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Vis::ToolPointFromArcAndTangent)}; private: Q_DISABLE_COPY(VisToolPointFromArcAndTangent) diff --git a/src/libs/vtools/visualization/vistoolpointfromcircleandtangent.h b/src/libs/vtools/visualization/vistoolpointfromcircleandtangent.h index 3d7ab68b4..b7408584a 100644 --- a/src/libs/vtools/visualization/vistoolpointfromcircleandtangent.h +++ b/src/libs/vtools/visualization/vistoolpointfromcircleandtangent.h @@ -37,15 +37,15 @@ class VisToolPointFromCircleAndTangent : public VisLine Q_OBJECT public: VisToolPointFromCircleAndTangent(const VContainer *data, QGraphicsItem *parent = 0); - virtual ~VisToolPointFromCircleAndTangent(); + virtual ~VisToolPointFromCircleAndTangent() Q_DECL_OVERRIDE; - virtual void RefreshGeometry(); + virtual void RefreshGeometry() Q_DECL_OVERRIDE; void setPoint2Id(const quint32 &value); void setCRadius(const QString &value); void setCrossPoint(const CrossCirclesPoint &value); - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Vis::ToolPointFromCircleAndTangent)}; private: Q_DISABLE_COPY(VisToolPointFromCircleAndTangent) diff --git a/src/libs/vtools/visualization/vistoolpointofcontact.h b/src/libs/vtools/visualization/vistoolpointofcontact.h index c1a2b605e..2e666d0cc 100644 --- a/src/libs/vtools/visualization/vistoolpointofcontact.h +++ b/src/libs/vtools/visualization/vistoolpointofcontact.h @@ -36,13 +36,13 @@ class VisToolPointOfContact : public VisLine Q_OBJECT public: VisToolPointOfContact(const VContainer *data, QGraphicsItem *parent = 0); - virtual ~VisToolPointOfContact(); + virtual ~VisToolPointOfContact() Q_DECL_OVERRIDE; - virtual void RefreshGeometry(); + virtual void RefreshGeometry() Q_DECL_OVERRIDE; void setLineP2Id(const quint32 &value); void setRadiusId(const quint32 &value); void setRadius(const QString &expression); - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Vis::ToolPointOfContact)}; private: Q_DISABLE_COPY(VisToolPointOfContact) diff --git a/src/libs/vtools/visualization/vistoolpointofintersection.h b/src/libs/vtools/visualization/vistoolpointofintersection.h index dc8bb4b75..27eed23f2 100644 --- a/src/libs/vtools/visualization/vistoolpointofintersection.h +++ b/src/libs/vtools/visualization/vistoolpointofintersection.h @@ -36,12 +36,12 @@ class VisToolPointOfIntersection : public VisLine Q_OBJECT public: VisToolPointOfIntersection(const VContainer *data, QGraphicsItem *parent = 0); - virtual ~VisToolPointOfIntersection(); + virtual ~VisToolPointOfIntersection() Q_DECL_OVERRIDE; - virtual void RefreshGeometry(); + virtual void RefreshGeometry() Q_DECL_OVERRIDE; void setPoint2Id(const quint32 &value); - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Vis::ToolPointOfIntersection)}; private: Q_DISABLE_COPY(VisToolPointOfIntersection) diff --git a/src/libs/vtools/visualization/vistoolpointofintersectionarcs.h b/src/libs/vtools/visualization/vistoolpointofintersectionarcs.h index 8258a9159..a57ead23a 100644 --- a/src/libs/vtools/visualization/vistoolpointofintersectionarcs.h +++ b/src/libs/vtools/visualization/vistoolpointofintersectionarcs.h @@ -37,16 +37,16 @@ class VisToolPointOfIntersectionArcs : public VisLine Q_OBJECT public: VisToolPointOfIntersectionArcs(const VContainer *data, QGraphicsItem *parent = 0); - virtual ~VisToolPointOfIntersectionArcs(); + virtual ~VisToolPointOfIntersectionArcs() Q_DECL_OVERRIDE; - virtual void RefreshGeometry(); - virtual void VisualMode(const quint32 &id); + virtual void RefreshGeometry() Q_DECL_OVERRIDE; + virtual void VisualMode(const quint32 &id) Q_DECL_OVERRIDE; void setArc1Id(const quint32 &value); void setArc2Id(const quint32 &value); void setCrossPoint(const CrossCirclesPoint &value); - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Vis::ToolPointOfIntersectionArcs)}; private: Q_DISABLE_COPY(VisToolPointOfIntersectionArcs) diff --git a/src/libs/vtools/visualization/vistoolpointofintersectioncircles.h b/src/libs/vtools/visualization/vistoolpointofintersectioncircles.h index 77248a780..8662ac54a 100644 --- a/src/libs/vtools/visualization/vistoolpointofintersectioncircles.h +++ b/src/libs/vtools/visualization/vistoolpointofintersectioncircles.h @@ -37,17 +37,17 @@ class VisToolPointOfIntersectionCircles : public VisLine Q_OBJECT public: VisToolPointOfIntersectionCircles(const VContainer *data, QGraphicsItem *parent = 0); - virtual ~VisToolPointOfIntersectionCircles(); + virtual ~VisToolPointOfIntersectionCircles() Q_DECL_OVERRIDE; - virtual void RefreshGeometry(); - virtual void VisualMode(const quint32 &id); + virtual void RefreshGeometry() Q_DECL_OVERRIDE; + virtual void VisualMode(const quint32 &id) Q_DECL_OVERRIDE; void setPoint2Id(const quint32 &value); void setC1Radius(const QString &value); void setC2Radius(const QString &value); void setCrossPoint(const CrossCirclesPoint &value); - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Vis::ToolPointOfIntersectionCircles)}; private: Q_DISABLE_COPY(VisToolPointOfIntersectionCircles) diff --git a/src/libs/vtools/visualization/vistoolshoulderpoint.h b/src/libs/vtools/visualization/vistoolshoulderpoint.h index b5b27e54b..2f55fd328 100644 --- a/src/libs/vtools/visualization/vistoolshoulderpoint.h +++ b/src/libs/vtools/visualization/vistoolshoulderpoint.h @@ -36,13 +36,13 @@ class VisToolShoulderPoint : public VisLine Q_OBJECT public: VisToolShoulderPoint(const VContainer *data, QGraphicsItem *parent = 0); - virtual ~VisToolShoulderPoint(); + virtual ~VisToolShoulderPoint() Q_DECL_OVERRIDE; - virtual void RefreshGeometry(); + virtual void RefreshGeometry() Q_DECL_OVERRIDE; void setLineP1Id(const quint32 &value); void setLineP2Id(const quint32 &value); void setLength(const QString &expression); - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Vis::ToolShoulderPoint)}; private: Q_DISABLE_COPY(VisToolShoulderPoint) diff --git a/src/libs/vtools/visualization/vistoolspline.h b/src/libs/vtools/visualization/vistoolspline.h index 6c48dcdd5..1a008417d 100644 --- a/src/libs/vtools/visualization/vistoolspline.h +++ b/src/libs/vtools/visualization/vistoolspline.h @@ -36,9 +36,9 @@ class VisToolSpline : public VisPath Q_OBJECT public: VisToolSpline(const VContainer *data, QGraphicsItem *parent = 0); - virtual ~VisToolSpline(); + virtual ~VisToolSpline() Q_DECL_OVERRIDE; - virtual void RefreshGeometry(); + virtual void RefreshGeometry() Q_DECL_OVERRIDE; void setPoint4Id(const quint32 &value); void SetAngle1(const qreal &value); @@ -47,7 +47,7 @@ public: void SetKAsm2(const qreal &value); void SetKCurve(const qreal &value); - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Vis::ToolSpline)}; protected: Q_DISABLE_COPY(VisToolSpline) diff --git a/src/libs/vtools/visualization/vistoolsplinepath.h b/src/libs/vtools/visualization/vistoolsplinepath.h index bc3f7079d..ce07a6c7e 100644 --- a/src/libs/vtools/visualization/vistoolsplinepath.h +++ b/src/libs/vtools/visualization/vistoolsplinepath.h @@ -39,14 +39,14 @@ class VisToolSplinePath : public VisPath Q_OBJECT public: VisToolSplinePath(const VContainer *data, QGraphicsItem *parent = 0); - virtual ~VisToolSplinePath(); + virtual ~VisToolSplinePath() Q_DECL_OVERRIDE; - virtual void RefreshGeometry(); + virtual void RefreshGeometry() Q_DECL_OVERRIDE; void setPath(const VSplinePath &value); VSplinePath getPath(); - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Vis::ToolSplinePath)}; Mode getMode() const; diff --git a/src/libs/vtools/visualization/vistooltriangle.h b/src/libs/vtools/visualization/vistooltriangle.h index 4cfb698e0..30f5b16a1 100644 --- a/src/libs/vtools/visualization/vistooltriangle.h +++ b/src/libs/vtools/visualization/vistooltriangle.h @@ -36,15 +36,15 @@ class VisToolTriangle : public VisLine Q_OBJECT public: VisToolTriangle(const VContainer *data, QGraphicsItem *parent = 0); - virtual ~VisToolTriangle(); + virtual ~VisToolTriangle() Q_DECL_OVERRIDE; - virtual void RefreshGeometry(); + virtual void RefreshGeometry() Q_DECL_OVERRIDE; void setPoint2Id(const quint32 &value); void setHypotenuseP1Id(const quint32 &value); void setHypotenuseP2Id(const quint32 &value); - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Vis::ToolTriangle)}; private: Q_DISABLE_COPY(VisToolTriangle) diff --git a/src/libs/vtools/visualization/vistooltruedarts.h b/src/libs/vtools/visualization/vistooltruedarts.h index 80d9e1223..4fabae765 100644 --- a/src/libs/vtools/visualization/vistooltruedarts.h +++ b/src/libs/vtools/visualization/vistooltruedarts.h @@ -36,16 +36,16 @@ class VisToolTrueDarts :public VisLine Q_OBJECT public: VisToolTrueDarts(const VContainer *data, QGraphicsItem *parent = 0); - virtual ~VisToolTrueDarts(); + virtual ~VisToolTrueDarts() Q_DECL_OVERRIDE; - virtual void RefreshGeometry(); + virtual void RefreshGeometry() Q_DECL_OVERRIDE; void setPoint2Id(const quint32 &value); void setD1PointId(const quint32 &value); void setD2PointId(const quint32 &value); void setD3PointId(const quint32 &value); - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Vis::ToolTrueDarts)}; private: Q_DISABLE_COPY(VisToolTrueDarts) diff --git a/src/libs/vtools/visualization/visualization.h b/src/libs/vtools/visualization/visualization.h index f540b3f78..f3a42de0a 100644 --- a/src/libs/vtools/visualization/visualization.h +++ b/src/libs/vtools/visualization/visualization.h @@ -44,7 +44,7 @@ class Visualization : public QObject Q_OBJECT public: Visualization(const VContainer *data); - virtual ~Visualization(); + virtual ~Visualization() Q_DECL_OVERRIDE; virtual void RefreshGeometry()=0; diff --git a/src/libs/vwidgets/vabstractsimple.h b/src/libs/vwidgets/vabstractsimple.h index 79e3bb221..936c547fb 100644 --- a/src/libs/vwidgets/vabstractsimple.h +++ b/src/libs/vwidgets/vabstractsimple.h @@ -38,7 +38,7 @@ class VAbstractSimple : public QObject public: VAbstractSimple(quint32 id, const QColor ¤tColor, Unit patternUnit, qreal *factor = nullptr, QObject *parent = 0); - virtual ~VAbstractSimple(); + virtual ~VAbstractSimple() Q_DECL_OVERRIDE; virtual void ChangedActivDraw(const bool &flag)=0; diff --git a/src/libs/vwidgets/vcontrolpointspline.h b/src/libs/vwidgets/vcontrolpointspline.h index 0b0a73134..21b9eb629 100644 --- a/src/libs/vwidgets/vcontrolpointspline.h +++ b/src/libs/vwidgets/vcontrolpointspline.h @@ -43,9 +43,10 @@ class VControlPointSpline : public QObject, public QGraphicsEllipseItem public: VControlPointSpline(const qint32 &indexSpline, SplinePointPosition position, const QPointF &controlPoint, const QPointF &splinePoint, Unit patternUnit, QGraphicsItem * parent = nullptr); - virtual ~VControlPointSpline(); - virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0); - virtual int type() const {return Type;} + virtual ~VControlPointSpline() Q_DECL_OVERRIDE; + virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, + QWidget * widget = 0) Q_DECL_OVERRIDE; + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Vis::ControlPointSpline)}; signals: /** @@ -72,12 +73,12 @@ protected: /** @brief controlLine pointer to line control point. */ QGraphicsLineItem *controlLine; - virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent * event ); - virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ); - QVariant itemChange ( GraphicsItemChange change, const QVariant &value ); - virtual void mousePressEvent( QGraphicsSceneMouseEvent * event ); - virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ); - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent *event ); + virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent * event ) Q_DECL_OVERRIDE; + virtual void hoverLeaveEvent ( 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; private: Q_DISABLE_COPY(VControlPointSpline) /** @brief indexSpline index spline in list.. */ diff --git a/src/libs/vwidgets/vgraphicssimpletextitem.h b/src/libs/vwidgets/vgraphicssimpletextitem.h index 7df21d074..ef7ff4693 100644 --- a/src/libs/vwidgets/vgraphicssimpletextitem.h +++ b/src/libs/vwidgets/vgraphicssimpletextitem.h @@ -42,11 +42,11 @@ class VGraphicsSimpleTextItem : public QObject, public QGraphicsSimpleTextItem public: VGraphicsSimpleTextItem(QGraphicsItem *parent = nullptr); VGraphicsSimpleTextItem( const QString & text, QGraphicsItem *parent = nullptr ); - virtual ~VGraphicsSimpleTextItem(); + virtual ~VGraphicsSimpleTextItem() Q_DECL_OVERRIDE; qint32 FontSize()const; - virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); - virtual int type() const {return Type;} + virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) Q_DECL_OVERRIDE; + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Vis::GraphicsSimpleTextItem)}; void setEnabled(bool enabled); @@ -65,12 +65,12 @@ signals: void PointChoosed(); protected: QVariant itemChange ( GraphicsItemChange change, const QVariant &value ); - virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent *event ); - virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent *event ); - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent *event ); - virtual void mousePressEvent( QGraphicsSceneMouseEvent * event ); - virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ); - virtual void keyReleaseEvent ( QKeyEvent * event ); + 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; private: /** @brief fontSize label font size. */ qint32 fontSize; diff --git a/src/libs/vwidgets/vmaingraphicsscene.h b/src/libs/vwidgets/vmaingraphicsscene.h index 4e2a441ce..ac8c83609 100644 --- a/src/libs/vwidgets/vmaingraphicsscene.h +++ b/src/libs/vwidgets/vmaingraphicsscene.h @@ -55,8 +55,8 @@ public slots: void EnableItemMove(bool move); void EnableDetailsMode(bool mode); protected: - virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event); - virtual void mousePressEvent(QGraphicsSceneMouseEvent *event); + virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; + virtual void mousePressEvent(QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; signals: /** * @brief mouseMove send new mouse position. diff --git a/src/libs/vwidgets/vsimplecurve.h b/src/libs/vwidgets/vsimplecurve.h index c75cb655a..4803936a2 100644 --- a/src/libs/vwidgets/vsimplecurve.h +++ b/src/libs/vwidgets/vsimplecurve.h @@ -44,10 +44,11 @@ class VSimpleCurve : public VAbstractSimple, public QGraphicsPathItem public: VSimpleCurve(quint32 id, const QColor ¤tColor, SimpleCurvePoint curvePosition, Unit patternUnit, qreal *factor = nullptr, QObject *parent = 0); - virtual void ChangedActivDraw(const bool &flag); - virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0); + virtual void ChangedActivDraw(const bool &flag) Q_DECL_OVERRIDE; + virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, + QWidget * widget = 0) Q_DECL_OVERRIDE; - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Vis::SimpleSplinePath)}; QColor GetCurrentColor() const; @@ -61,10 +62,10 @@ signals: void Choosed(quint32 id); void HoverPath(quint32 id, SimpleCurvePoint curvePosition, PathDirection direction); protected: - virtual void mousePressEvent(QGraphicsSceneMouseEvent * event); - virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ); - virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent * event ); - virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ); + 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; private: Q_DISABLE_COPY(VSimpleCurve) diff --git a/src/libs/vwidgets/vsimplepoint.h b/src/libs/vwidgets/vsimplepoint.h index 6ec014b9a..84d8fee0b 100644 --- a/src/libs/vwidgets/vsimplepoint.h +++ b/src/libs/vwidgets/vsimplepoint.h @@ -42,12 +42,13 @@ class VSimplePoint : public VAbstractSimple, public QGraphicsEllipseItem public: VSimplePoint(quint32 id, const QColor ¤tColor, Unit patternUnit, qreal *factor = nullptr, QObject *parent = nullptr); - virtual ~VSimplePoint(); + virtual ~VSimplePoint() Q_DECL_OVERRIDE; - virtual void ChangedActivDraw(const bool &flag); - virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0); + virtual void ChangedActivDraw(const bool &flag) Q_DECL_OVERRIDE; + virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, + QWidget * widget = 0) Q_DECL_OVERRIDE; - virtual int type() const {return Type;} + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Vis::SimplePoint)}; void RefreshLine(); @@ -74,9 +75,9 @@ public slots: void ContextMenu(QGraphicsSceneContextMenuEvent * event); protected: - virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ); - virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent * event ); - virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ); + virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ) Q_DECL_OVERRIDE; + virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent * event ) Q_DECL_OVERRIDE; + virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ) Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(VSimplePoint)