diff --git a/src/app/tape/dialogs/dialogmdatabase.h b/src/app/tape/dialogs/dialogmdatabase.h index d933a2450..858883fa6 100644 --- a/src/app/tape/dialogs/dialogmdatabase.h +++ b/src/app/tape/dialogs/dialogmdatabase.h @@ -91,7 +91,8 @@ private: void InitGroup(QTreeWidgetItem **group, const QString &groupName, const QStringList &mList, const QStringList &list = QStringList()); - QTreeWidgetItem *AddGroup(const QString &text) Q_REQUIRED_RESULT; + Q_REQUIRED_RESULT QTreeWidgetItem *AddGroup(const QString &text); + void AddMeasurement(QTreeWidgetItem *group, const QString &name, const QStringList &list); void ReadSettings(); diff --git a/src/app/tape/tmainwindow.h b/src/app/tape/tmainwindow.h index 3f635c505..02259c59b 100644 --- a/src/app/tape/tmainwindow.h +++ b/src/app/tape/tmainwindow.h @@ -175,7 +175,8 @@ private: QTableWidgetItem *AddCell(const QString &text, int row, int column, int aligment, bool ok = true); - QComboBox *SetGradationList(QLabel *label, const QStringList &list) Q_REQUIRED_RESULT; + Q_REQUIRED_RESULT QComboBox *SetGradationList(QLabel *label, const QStringList &list); + void SetDefaultHeight(int value); void SetDefaultSize(int value); diff --git a/src/app/valentina/core/vformulaproperty.h b/src/app/valentina/core/vformulaproperty.h index 4a8c0525b..4a18f1f3f 100644 --- a/src/app/valentina/core/vformulaproperty.h +++ b/src/app/valentina/core/vformulaproperty.h @@ -67,8 +67,8 @@ public: //! \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 Q_DECL_OVERRIDE Q_REQUIRED_RESULT; + Q_REQUIRED_RESULT virtual VProperty* clone(bool include_children = true, + VProperty* container = nullptr) const Q_DECL_OVERRIDE; //! Sets the value of the property virtual void setValue(const QVariant& value) Q_DECL_OVERRIDE; diff --git a/src/libs/ifc/exception/vexception.h b/src/libs/ifc/exception/vexception.h index 3b240a3a9..12ea10de5 100644 --- a/src/libs/ifc/exception/vexception.h +++ b/src/libs/ifc/exception/vexception.h @@ -49,8 +49,10 @@ public: virtual ~VException() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT; Q_NORETURN virtual void raise() const Q_DECL_OVERRIDE; + // cppcheck-suppress unusedFunction - virtual VException *clone() const Q_DECL_OVERRIDE Q_REQUIRED_RESULT; + Q_REQUIRED_RESULT virtual VException *clone() const Q_DECL_OVERRIDE; + virtual QString ErrorMessage() const; virtual QString DetailedInformation() const; QString WhatUtf8() const V_NOEXCEPT_EXPR (true); diff --git a/src/libs/qmuparser/qmudef.h b/src/libs/qmuparser/qmudef.h index b851ea8b8..f0706ba6e 100644 --- a/src/libs/qmuparser/qmudef.h +++ b/src/libs/qmuparser/qmudef.h @@ -121,7 +121,7 @@ inline QString NameRegExp() QT_WARNING_POP -static inline bool QmuFuzzyComparePossibleNulls(double p1, double p2) Q_REQUIRED_RESULT; +Q_REQUIRED_RESULT static inline bool QmuFuzzyComparePossibleNulls(double p1, double p2); static inline bool QmuFuzzyComparePossibleNulls(double p1, double p2) { if(qFuzzyIsNull(p1)) diff --git a/src/libs/qmuparser/qmuparsercallback.h b/src/libs/qmuparser/qmuparsercallback.h index ad406e380..42edb8f6f 100644 --- a/src/libs/qmuparser/qmuparsercallback.h +++ b/src/libs/qmuparser/qmuparsercallback.h @@ -82,7 +82,8 @@ public: QmuParserCallback(const QmuParserCallback &a_Fun); QmuParserCallback &operator=(const QmuParserCallback &a_Fun); - QmuParserCallback* Clone() const Q_REQUIRED_RESULT; + Q_REQUIRED_RESULT QmuParserCallback* Clone() const; + bool IsOptimizable() const; void* GetAddr() const; ECmdCode GetCode() const; diff --git a/src/libs/qmuparser/qmuparsererror.h b/src/libs/qmuparser/qmuparsererror.h index 7c8c663bf..b93ca0ad0 100644 --- a/src/libs/qmuparser/qmuparsererror.h +++ b/src/libs/qmuparser/qmuparsererror.h @@ -155,7 +155,7 @@ public: const QString& GetToken() const; EErrorCodes GetCode() const; Q_NORETURN virtual void raise() const Q_DECL_OVERRIDE; - virtual QmuParserError *clone() const Q_DECL_OVERRIDE Q_REQUIRED_RESULT; + Q_REQUIRED_RESULT virtual QmuParserError *clone() const Q_DECL_OVERRIDE; private: QString m_sMsg; ///< The message string QString m_sExpr; ///< Formula string diff --git a/src/libs/vdxf/dxfdef.h b/src/libs/vdxf/dxfdef.h index c62eb0f11..3c5139b82 100644 --- a/src/libs/vdxf/dxfdef.h +++ b/src/libs/vdxf/dxfdef.h @@ -40,7 +40,7 @@ enum class VarMeasurement : unsigned char { English=0, Metric=1 }; //Default drawing units for AutoCAD DesignCenter blocks: enum class VarInsunits : unsigned char { Inches=1, Millimeters=4, Centimeters=5 }; -static inline bool DL_FuzzyComparePossibleNulls(double p1, double p2) Q_REQUIRED_RESULT; +Q_REQUIRED_RESULT static inline bool DL_FuzzyComparePossibleNulls(double p1, double p2); static inline bool DL_FuzzyComparePossibleNulls(double p1, double p2) { if(qFuzzyIsNull(p1)) diff --git a/src/libs/vdxf/vdxfengine.h b/src/libs/vdxf/vdxfengine.h index 10b4b368f..839e50a6a 100644 --- a/src/libs/vdxf/vdxfengine.h +++ b/src/libs/vdxf/vdxfengine.h @@ -91,7 +91,7 @@ private: VarMeasurement varMeasurement; VarInsunits varInsunits; - double FromPixel(double pix, const VarInsunits &unit) const Q_REQUIRED_RESULT; + Q_REQUIRED_RESULT double FromPixel(double pix, const VarInsunits &unit) const; }; #endif // VDXFENGINE_H diff --git a/src/libs/vlayout/vlayoutgenerator.h b/src/libs/vlayout/vlayoutgenerator.h index f8fa58d42..334afd00d 100644 --- a/src/libs/vlayout/vlayoutgenerator.h +++ b/src/libs/vlayout/vlayoutgenerator.h @@ -82,8 +82,8 @@ public: LayoutErrors State() const; - QList GetPapersItems() const Q_REQUIRED_RESULT; - QList> GetAllDetails() const Q_REQUIRED_RESULT; + Q_REQUIRED_RESULT QList GetPapersItems() const; + Q_REQUIRED_RESULT QList> GetAllDetails() const; bool GetRotate() const; void SetRotate(bool value); diff --git a/src/libs/vlayout/vlayoutpaper.h b/src/libs/vlayout/vlayoutpaper.h index 37c95291a..80b76a612 100644 --- a/src/libs/vlayout/vlayoutpaper.h +++ b/src/libs/vlayout/vlayoutpaper.h @@ -88,8 +88,8 @@ public: bool ArrangeDetail(const VLayoutPiece &detail, std::atomic_bool &stop); int Count() const; - QGraphicsRectItem *GetPaperItem(bool autoCrop) const Q_REQUIRED_RESULT; - QList GetItemDetails() const Q_REQUIRED_RESULT; + Q_REQUIRED_RESULT QGraphicsRectItem *GetPaperItem(bool autoCrop) const; + Q_REQUIRED_RESULT QList GetItemDetails() const; QVector GetDetails() const; void SetDetails(const QList& details); diff --git a/src/libs/vlayout/vlayoutpiece.h b/src/libs/vlayout/vlayoutpiece.h index f64de592e..ba43d4235 100644 --- a/src/libs/vlayout/vlayoutpiece.h +++ b/src/libs/vlayout/vlayoutpiece.h @@ -126,14 +126,14 @@ public: QPainterPath ContourPath() const; QPainterPath LayoutAllowancePath() const; - QGraphicsItem *GetItem() const Q_REQUIRED_RESULT; + Q_REQUIRED_RESULT QGraphicsItem *GetItem() const; private: QSharedDataPointer d; QVector DetailPath() const; - QGraphicsPathItem *GetMainItem() const Q_REQUIRED_RESULT; + Q_REQUIRED_RESULT QGraphicsPathItem *GetMainItem() const; QPainterPath CreateLabelText(const QVector &labelShape, const VTextManager &tm) const; diff --git a/src/libs/vmisc/def.h b/src/libs/vmisc/def.h index c355225a1..a7cc08e90 100644 --- a/src/libs/vmisc/def.h +++ b/src/libs/vmisc/def.h @@ -375,29 +375,29 @@ void RestoreOverrideCursor(Qt::CursorShape shape); extern const qreal PrintDPI; -double ToPixel(double val, const Unit &unit) Q_REQUIRED_RESULT; -double FromPixel(double pix, const Unit &unit) Q_REQUIRED_RESULT; +Q_REQUIRED_RESULT double ToPixel(double val, const Unit &unit); +Q_REQUIRED_RESULT double FromPixel(double pix, const Unit &unit); -qreal UnitConvertor(qreal value, const Unit &from, const Unit &to) Q_REQUIRED_RESULT; +Q_REQUIRED_RESULT qreal UnitConvertor(qreal value, const Unit &from, const Unit &to); void InitLanguages(QComboBox *combobox); -QStringList SupportedLocales() Q_REQUIRED_RESULT; +Q_REQUIRED_RESULT QStringList SupportedLocales(); -QString StrippedName(const QString &fullFileName) Q_REQUIRED_RESULT; -QString RelativeMPath(const QString &patternPath, const QString &absoluteMPath) Q_REQUIRED_RESULT; -QString AbsoluteMPath(const QString &patternPath, const QString &relativeMPath) Q_REQUIRED_RESULT; +Q_REQUIRED_RESULT QString StrippedName(const QString &fullFileName); +Q_REQUIRED_RESULT QString RelativeMPath(const QString &patternPath, const QString &absoluteMPath); +Q_REQUIRED_RESULT QString AbsoluteMPath(const QString &patternPath, const QString &relativeMPath); -QSharedPointer PreparePrinter(const QPrinterInfo &info, - QPrinter::PrinterMode mode = QPrinter::ScreenResolution) Q_REQUIRED_RESULT; +Q_REQUIRED_RESULT QSharedPointer PreparePrinter(const QPrinterInfo &info, + QPrinter::PrinterMode mode = QPrinter::ScreenResolution); QMarginsF GetMinPrinterFields(const QSharedPointer &printer); QMarginsF GetPrinterFields(const QSharedPointer &printer); -QPixmap darkenPixmap(const QPixmap &pixmap) Q_REQUIRED_RESULT; +Q_REQUIRED_RESULT QPixmap darkenPixmap(const QPixmap &pixmap); void ShowInGraphicalShell(const QString &filePath); -static inline bool VFuzzyComparePossibleNulls(double p1, double p2) Q_REQUIRED_RESULT; +Q_REQUIRED_RESULT static inline bool VFuzzyComparePossibleNulls(double p1, double p2); static inline bool VFuzzyComparePossibleNulls(double p1, double p2) { if(qFuzzyIsNull(p1)) diff --git a/src/libs/vpatterndb/measurements.h b/src/libs/vpatterndb/measurements.h index de97539ff..e63875104 100644 --- a/src/libs/vpatterndb/measurements.h +++ b/src/libs/vpatterndb/measurements.h @@ -316,6 +316,6 @@ QStringList ListGroupQ(); QStringList ListNumbers(const VTranslateMeasurements *trM, const QStringList & listMeasurements); QString MapDiagrams(const VTranslateMeasurements *trM, const QString &number); -QStringList AllGroupNames() Q_REQUIRED_RESULT; +Q_REQUIRED_RESULT QStringList AllGroupNames(); #endif // MEASUREMENTS_H diff --git a/src/libs/vpropertyexplorer/plugins/vemptyproperty.h b/src/libs/vpropertyexplorer/plugins/vemptyproperty.h index 4159cb66f..6305b0033 100644 --- a/src/libs/vpropertyexplorer/plugins/vemptyproperty.h +++ b/src/libs/vpropertyexplorer/plugins/vemptyproperty.h @@ -76,8 +76,8 @@ public: //! \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 Q_DECL_OVERRIDE Q_REQUIRED_RESULT; + Q_REQUIRED_RESULT virtual VProperty* clone(bool include_children = true, + VProperty* container = nullptr) const Q_DECL_OVERRIDE; protected: //! Protected constructor diff --git a/src/libs/vpropertyexplorer/plugins/venumproperty.h b/src/libs/vpropertyexplorer/plugins/venumproperty.h index 2b550a541..9f8857c01 100644 --- a/src/libs/vpropertyexplorer/plugins/venumproperty.h +++ b/src/libs/vpropertyexplorer/plugins/venumproperty.h @@ -78,8 +78,8 @@ public: //! \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 Q_DECL_OVERRIDE Q_REQUIRED_RESULT; + Q_REQUIRED_RESULT virtual VProperty* clone(bool include_children = true, + VProperty* container = nullptr) const Q_DECL_OVERRIDE; //! Sets the settings. Available settings: //! diff --git a/src/libs/vpropertyexplorer/plugins/vfileproperty.h b/src/libs/vpropertyexplorer/plugins/vfileproperty.h index 33e3c5043..9fa88cc3c 100644 --- a/src/libs/vpropertyexplorer/plugins/vfileproperty.h +++ b/src/libs/vpropertyexplorer/plugins/vfileproperty.h @@ -95,8 +95,8 @@ public: //! \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 Q_DECL_OVERRIDE Q_REQUIRED_RESULT; + Q_REQUIRED_RESULT 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/vlabelproperty.h b/src/libs/vpropertyexplorer/plugins/vlabelproperty.h index ed093f433..c5657606b 100644 --- a/src/libs/vpropertyexplorer/plugins/vlabelproperty.h +++ b/src/libs/vpropertyexplorer/plugins/vlabelproperty.h @@ -83,8 +83,8 @@ public: //! \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 Q_DECL_OVERRIDE Q_REQUIRED_RESULT; + Q_REQUIRED_RESULT virtual VProperty* clone(bool include_children = true, + VProperty* container = nullptr) const Q_DECL_OVERRIDE; virtual void UpdateParent(const QVariant &value) Q_DECL_OVERRIDE; diff --git a/src/libs/vpropertyexplorer/plugins/vlinecolorproperty.h b/src/libs/vpropertyexplorer/plugins/vlinecolorproperty.h index 5a24c9b2c..92c1e3b84 100644 --- a/src/libs/vpropertyexplorer/plugins/vlinecolorproperty.h +++ b/src/libs/vpropertyexplorer/plugins/vlinecolorproperty.h @@ -87,8 +87,8 @@ public: //! \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 Q_DECL_OVERRIDE Q_REQUIRED_RESULT; + Q_REQUIRED_RESULT 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 a690d2dd3..0f9eb029c 100644 --- a/src/libs/vpropertyexplorer/plugins/vlinetypeproperty.h +++ b/src/libs/vpropertyexplorer/plugins/vlinetypeproperty.h @@ -88,8 +88,8 @@ public: //! \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 Q_DECL_OVERRIDE Q_REQUIRED_RESULT; + Q_REQUIRED_RESULT 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 b609c6fa3..ecd4e8760 100644 --- a/src/libs/vpropertyexplorer/plugins/vnumberproperty.h +++ b/src/libs/vpropertyexplorer/plugins/vnumberproperty.h @@ -79,8 +79,8 @@ public: //! \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 Q_DECL_OVERRIDE Q_REQUIRED_RESULT; + Q_REQUIRED_RESULT virtual VProperty* clone(bool include_children = true, + VProperty* container = nullptr) 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 0866bae13..bd0387bf3 100644 --- a/src/libs/vpropertyexplorer/plugins/vobjectproperty.h +++ b/src/libs/vpropertyexplorer/plugins/vobjectproperty.h @@ -84,8 +84,8 @@ public: //! \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 Q_DECL_OVERRIDE Q_REQUIRED_RESULT; + Q_REQUIRED_RESULT 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 602ac0585..a45d1272f 100644 --- a/src/libs/vpropertyexplorer/plugins/vpointfproperty.h +++ b/src/libs/vpropertyexplorer/plugins/vpointfproperty.h @@ -67,8 +67,8 @@ public: //! \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 Q_DECL_OVERRIDE Q_REQUIRED_RESULT; + Q_REQUIRED_RESULT virtual VProperty* clone(bool include_children = true, + VProperty* container = nullptr) const Q_DECL_OVERRIDE; //! Sets the value of the property virtual void setValue(const QVariant& value) Q_DECL_OVERRIDE; diff --git a/src/libs/vpropertyexplorer/plugins/vshortcutproperty.h b/src/libs/vpropertyexplorer/plugins/vshortcutproperty.h index b5fcd51b4..a04329096 100644 --- a/src/libs/vpropertyexplorer/plugins/vshortcutproperty.h +++ b/src/libs/vpropertyexplorer/plugins/vshortcutproperty.h @@ -71,8 +71,8 @@ public: //! \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 Q_DECL_OVERRIDE Q_REQUIRED_RESULT; + Q_REQUIRED_RESULT virtual VProperty* clone(bool include_children = true, + VProperty* container = nullptr) const Q_DECL_OVERRIDE; //! Sets the value of the property virtual void setValue(const QVariant& value) Q_DECL_OVERRIDE; diff --git a/src/libs/vpropertyexplorer/plugins/vstringproperty.h b/src/libs/vpropertyexplorer/plugins/vstringproperty.h index 445b4a30c..fe4bb9e6f 100644 --- a/src/libs/vpropertyexplorer/plugins/vstringproperty.h +++ b/src/libs/vpropertyexplorer/plugins/vstringproperty.h @@ -79,8 +79,8 @@ public: //! \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 Q_DECL_OVERRIDE Q_REQUIRED_RESULT; + Q_REQUIRED_RESULT virtual VProperty* clone(bool include_children = true, + VProperty* container = nullptr) const Q_DECL_OVERRIDE; virtual void UpdateParent(const QVariant &value) Q_DECL_OVERRIDE; diff --git a/src/libs/vpropertyexplorer/plugins/vwidgetproperty.h b/src/libs/vpropertyexplorer/plugins/vwidgetproperty.h index 353a2e365..0b27c3c85 100644 --- a/src/libs/vpropertyexplorer/plugins/vwidgetproperty.h +++ b/src/libs/vpropertyexplorer/plugins/vwidgetproperty.h @@ -63,8 +63,8 @@ public: //! \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 Q_DECL_OVERRIDE Q_REQUIRED_RESULT; + Q_REQUIRED_RESULT virtual VProperty* clone(bool include_children = true, + VProperty* container = nullptr) const Q_DECL_OVERRIDE; }; } diff --git a/src/libs/vpropertyexplorer/vproperty.h b/src/libs/vpropertyexplorer/vproperty.h index cf2bd8b43..83072be60 100644 --- a/src/libs/vpropertyexplorer/vproperty.h +++ b/src/libs/vpropertyexplorer/vproperty.h @@ -199,7 +199,7 @@ public: //! \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 Q_REQUIRED_RESULT; + Q_REQUIRED_RESULT virtual VProperty* clone(bool include_children = true, VProperty* container = nullptr) const; Property propertyType() const; void setPropertyType(const Property &type); diff --git a/src/libs/vpropertyexplorer/vpropertyset.h b/src/libs/vpropertyexplorer/vpropertyset.h index 8ad21d30e..46830fe5e 100644 --- a/src/libs/vpropertyexplorer/vpropertyset.h +++ b/src/libs/vpropertyexplorer/vpropertyset.h @@ -117,7 +117,7 @@ public: int getRootPropertyCount() const; //! Clones the property set - VPropertySet* clone() const Q_REQUIRED_RESULT; + Q_REQUIRED_RESULT VPropertySet* clone() const; protected: //! Checks whether a property belongs to this set and returns the result diff --git a/src/libs/vpropertyexplorer/vstandardpropertyfactory.h b/src/libs/vpropertyexplorer/vstandardpropertyfactory.h index 9b12f5209..9f97e8b0d 100644 --- a/src/libs/vpropertyexplorer/vstandardpropertyfactory.h +++ b/src/libs/vpropertyexplorer/vstandardpropertyfactory.h @@ -47,7 +47,7 @@ public: //! Creates a new property of a certain type and assigns a name and description (otionally) //! \param type The type of the property as string //! \return Returns the created property or NULL if it couldn't be be created - virtual VProperty* createProperty(const QString& type, const QString &name) Q_DECL_OVERRIDE Q_REQUIRED_RESULT; + Q_REQUIRED_RESULT virtual VProperty* createProperty(const QString& type, const QString &name) Q_DECL_OVERRIDE; }; } 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 32714df85..850bb18f3 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h @@ -65,9 +65,10 @@ public: enum { Type = UserType + static_cast(Tool::CutSplinePath)}; virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE; - static VPointF *CutSplinePath(qreal length, const QSharedPointer &splPath, - const QString &pName, VSplinePath **splPath1, - VSplinePath **splPath2) Q_REQUIRED_RESULT; + Q_REQUIRED_RESULT static VPointF *CutSplinePath(qreal length, + const QSharedPointer &splPath, + const QString &pName, VSplinePath **splPath1, + VSplinePath **splPath2); protected: virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) Q_DECL_OVERRIDE; virtual void SaveDialog(QDomElement &domElement) Q_DECL_OVERRIDE;