aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed issue #715. Build fails with Qt 5.9.1 / clang / macOS.

Browse Source 
(grafted from d78ca13c4891ccf3542b0704a7d66af0f9b02938)

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2017-07-01 21:38:26 +03:00
parent b18f5fa928
commit 72ea1997fb
30 changed files with 64 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/tape/dialogs/dialogmdatabase.h
View File

@ -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();

3
src/app/tape/tmainwindow.h
View File

@ -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);

4
src/app/valentina/core/vformulaproperty.h
View File

@ -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;

4
src/libs/ifc/exception/vexception.h
View File

@ -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);

2
src/libs/qmuparser/qmudef.h
View File

@ -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))

3
src/libs/qmuparser/qmuparsercallback.h
View File

@ -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;

2
src/libs/qmuparser/qmuparsererror.h
View File

@ -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

2
src/libs/vdxf/dxfdef.h
View File

@ -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))

2
src/libs/vdxf/vdxfengine.h
View File

@ -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

4
src/libs/vlayout/vlayoutgenerator.h
View File

@ -82,8 +82,8 @@ public:
LayoutErrors State() const;
QList<QGraphicsItem *> GetPapersItems() const Q_REQUIRED_RESULT;
QList<QList<QGraphicsItem *>> GetAllDetails() const Q_REQUIRED_RESULT;
Q_REQUIRED_RESULT QList<QGraphicsItem *> GetPapersItems() const;
Q_REQUIRED_RESULT QList<QList<QGraphicsItem *>> GetAllDetails() const;
bool GetRotate() const;
void SetRotate(bool value);

4
src/libs/vlayout/vlayoutpaper.h
View File

@ -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<QGraphicsItem *> GetItemDetails() const Q_REQUIRED_RESULT;
Q_REQUIRED_RESULT QGraphicsRectItem *GetPaperItem(bool autoCrop) const;
Q_REQUIRED_RESULT QList<QGraphicsItem *> GetItemDetails() const;
QVector<VLayoutPiece> GetDetails() const;
void SetDetails(const QList<VLayoutPiece>& details);

4
src/libs/vlayout/vlayoutpiece.h
View File

@ -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<VLayoutPieceData> d;
QVector<QPointF> DetailPath() const;
QGraphicsPathItem *GetMainItem() const Q_REQUIRED_RESULT;
Q_REQUIRED_RESULT QGraphicsPathItem *GetMainItem() const;
QPainterPath CreateLabelText(const QVector<QPointF> &labelShape, const VTextManager &tm) const;

22
src/libs/vmisc/def.h
View File

@ -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<QPrinter> PreparePrinter(const QPrinterInfo &info,
QPrinter::PrinterMode mode = QPrinter::ScreenResolution) Q_REQUIRED_RESULT;
Q_REQUIRED_RESULT QSharedPointer<QPrinter> PreparePrinter(const QPrinterInfo &info,
QPrinter::PrinterMode mode = QPrinter::ScreenResolution);
QMarginsF GetMinPrinterFields(const QSharedPointer<QPrinter> &printer);
QMarginsF GetPrinterFields(const QSharedPointer<QPrinter> &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))

2
src/libs/vpatterndb/measurements.h
View File

@ -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

4
src/libs/vpropertyexplorer/plugins/vemptyproperty.h
View File

@ -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

4
src/libs/vpropertyexplorer/plugins/venumproperty.h
View File

@ -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:
//!

4
src/libs/vpropertyexplorer/plugins/vfileproperty.h
View File

@ -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;

4
src/libs/vpropertyexplorer/plugins/vlabelproperty.h
View File

@ -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;

4
src/libs/vpropertyexplorer/plugins/vlinecolorproperty.h
View File

@ -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<QString, QString> &colors, const QString &color);

4
src/libs/vpropertyexplorer/plugins/vlinetypeproperty.h
View File

@ -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<QString, QIcon> &styles, const QString &style);

4
src/libs/vpropertyexplorer/plugins/vnumberproperty.h
View File

@ -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:

4
src/libs/vpropertyexplorer/plugins/vobjectproperty.h
View File

@ -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);

4
src/libs/vpropertyexplorer/plugins/vpointfproperty.h
View File

@ -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;

4
src/libs/vpropertyexplorer/plugins/vshortcutproperty.h
View File

@ -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;

4
src/libs/vpropertyexplorer/plugins/vstringproperty.h
View File

@ -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;

4
src/libs/vpropertyexplorer/plugins/vwidgetproperty.h
View File

@ -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;
};
}

2
src/libs/vpropertyexplorer/vproperty.h
View File

@ -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);

2
src/libs/vpropertyexplorer/vpropertyset.h
View File

@ -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

2
src/libs/vpropertyexplorer/vstandardpropertyfactory.h
View File

@ -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;
};
}

7
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h
View File

@ -65,9 +65,10 @@ public:
enum { Type = UserType + static_cast<int>(Tool::CutSplinePath)};
virtual void ShowVisualization(bool show) Q_DECL_OVERRIDE;
static VPointF *CutSplinePath(qreal length, const QSharedPointer<VAbstractCubicBezierPath> &splPath,
const QString &pName, VSplinePath **splPath1,
VSplinePath **splPath2) Q_REQUIRED_RESULT;
Q_REQUIRED_RESULT static VPointF *CutSplinePath(qreal length,
const QSharedPointer<VAbstractCubicBezierPath> &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;