Only C++17 introduces the rule that static constexpr member variables are implicitly inline.
This commit is contained in:
parent
36fb9db58f
commit
8cd3bfb803
|
@ -95,6 +95,11 @@ auto TriangleBasic() -> QPainterPath
|
||||||
}
|
}
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
|
// See https://stackoverflow.com/a/46719572/3045403
|
||||||
|
#if __cplusplus < 201703L // C++17
|
||||||
|
constexpr qreal VPTileFactory::tileStripeWidth; // NOLINT(readability-redundant-declaration)
|
||||||
|
#endif
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
VPTileFactory::VPTileFactory(const VPLayoutPtr &layout, VCommonSettings *commonSettings, QObject *parent):
|
VPTileFactory::VPTileFactory(const VPLayoutPtr &layout, VCommonSettings *commonSettings, QObject *parent):
|
||||||
QObject(parent),
|
QObject(parent),
|
||||||
|
|
|
@ -32,6 +32,12 @@
|
||||||
#endif
|
#endif
|
||||||
#include "../ifc/exception/vexception.h"
|
#include "../ifc/exception/vexception.h"
|
||||||
|
|
||||||
|
// See https://stackoverflow.com/a/46719572/3045403
|
||||||
|
#if __cplusplus < 201703L // C++17
|
||||||
|
constexpr quint32 VLayoutPlaceLabel::streamHeader; // NOLINT(readability-redundant-declaration)
|
||||||
|
constexpr quint32 VLayoutPlaceLabel::classVersion; // NOLINT(readability-redundant-declaration)
|
||||||
|
#endif
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
VLayoutPlaceLabel::VLayoutPlaceLabel(const VPlaceLabelItem &item)
|
VLayoutPlaceLabel::VLayoutPlaceLabel(const VPlaceLabelItem &item)
|
||||||
: m_center(item.toQPointF()),
|
: m_center(item.toQPointF()),
|
||||||
|
|
|
@ -83,6 +83,12 @@ private:
|
||||||
|
|
||||||
QT_WARNING_POP
|
QT_WARNING_POP
|
||||||
|
|
||||||
|
// See https://stackoverflow.com/a/46719572/3045403
|
||||||
|
#if __cplusplus < 201703L // C++17
|
||||||
|
constexpr quint32 VAbstractPieceData::streamHeader; // NOLINT(readability-redundant-declaration)
|
||||||
|
constexpr quint32 VAbstractPieceData::classVersion; // NOLINT(readability-redundant-declaration)
|
||||||
|
#endif
|
||||||
|
|
||||||
// Friend functions
|
// Friend functions
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
inline auto operator<<(QDataStream &dataStream, const VAbstractPieceData &piece) -> QDataStream &
|
inline auto operator<<(QDataStream &dataStream, const VAbstractPieceData &piece) -> QDataStream &
|
||||||
|
|
|
@ -127,6 +127,14 @@ private:
|
||||||
static constexpr quint16 classVersion{4};
|
static constexpr quint16 classVersion{4};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
QT_WARNING_POP
|
||||||
|
|
||||||
|
// See https://stackoverflow.com/a/46719572/3045403
|
||||||
|
#if __cplusplus < 201703L // C++17
|
||||||
|
constexpr quint32 VLayoutPieceData::streamHeader; // NOLINT(readability-redundant-declaration)
|
||||||
|
constexpr quint32 VLayoutPieceData::classVersion; // NOLINT(readability-redundant-declaration)
|
||||||
|
#endif
|
||||||
|
|
||||||
// Friend functions
|
// Friend functions
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
inline auto operator<<(QDataStream &dataStream, const VLayoutPieceData &piece) -> QDataStream &
|
inline auto operator<<(QDataStream &dataStream, const VLayoutPieceData &piece) -> QDataStream &
|
||||||
|
@ -243,6 +251,4 @@ inline auto operator>>(QDataStream &dataStream, VLayoutPieceData &piece) -> QDat
|
||||||
return dataStream;
|
return dataStream;
|
||||||
}
|
}
|
||||||
|
|
||||||
QT_WARNING_POP
|
|
||||||
|
|
||||||
#endif // VLAYOUTDETAIL_P_H
|
#endif // VLAYOUTDETAIL_P_H
|
||||||
|
|
|
@ -80,6 +80,12 @@ private:
|
||||||
|
|
||||||
QT_WARNING_POP
|
QT_WARNING_POP
|
||||||
|
|
||||||
|
// See https://stackoverflow.com/a/46719572/3045403
|
||||||
|
#if __cplusplus < 201703L // C++17
|
||||||
|
constexpr quint32 VLayoutPiecePathData::streamHeader; // NOLINT(readability-redundant-declaration)
|
||||||
|
constexpr quint32 VLayoutPiecePathData::classVersion; // NOLINT(readability-redundant-declaration)
|
||||||
|
#endif
|
||||||
|
|
||||||
// Friend functions
|
// Friend functions
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
QDataStream& operator<<(QDataStream &dataStream, const VLayoutPiecePathData &path)
|
QDataStream& operator<<(QDataStream &dataStream, const VLayoutPiecePathData &path)
|
||||||
|
|
|
@ -96,6 +96,13 @@ private:
|
||||||
Q_DECLARE_METATYPE(VSAPoint) // NOLINT
|
Q_DECLARE_METATYPE(VSAPoint) // NOLINT
|
||||||
Q_DECLARE_TYPEINFO(VSAPoint, Q_MOVABLE_TYPE); // NOLINT
|
Q_DECLARE_TYPEINFO(VSAPoint, Q_MOVABLE_TYPE); // NOLINT
|
||||||
|
|
||||||
|
// See https://stackoverflow.com/a/46719572/3045403
|
||||||
|
#if __cplusplus < 201703L
|
||||||
|
constexpr qreal VSAPoint::passmarkFactor; // NOLINT(readability-redundant-declaration)
|
||||||
|
constexpr qreal VSAPoint::maxPassmarkLength; // NOLINT(readability-redundant-declaration)
|
||||||
|
constexpr qreal VSAPoint::minSAWidth; // NOLINT(readability-redundant-declaration)
|
||||||
|
#endif
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
Q_DECL_CONSTEXPR inline VSAPoint::VSAPoint(qreal xpos, qreal ypos)
|
Q_DECL_CONSTEXPR inline VSAPoint::VSAPoint(qreal xpos, qreal ypos)
|
||||||
: VLayoutPoint(xpos, ypos)
|
: VLayoutPoint(xpos, ypos)
|
||||||
|
|
|
@ -116,6 +116,12 @@ private:
|
||||||
static constexpr quint16 classVersion = 2;
|
static constexpr quint16 classVersion = 2;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// See https://stackoverflow.com/a/46719572/3045403
|
||||||
|
#if __cplusplus < 201703L // C++17
|
||||||
|
constexpr quint32 VPieceNodeData::streamHeader; // NOLINT(readability-redundant-declaration)
|
||||||
|
constexpr quint32 VPieceNodeData::classVersion; // NOLINT(readability-redundant-declaration)
|
||||||
|
#endif
|
||||||
|
|
||||||
// Friend functions
|
// Friend functions
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
QDataStream &operator<<(QDataStream &out, const VPieceNodeData &p)
|
QDataStream &operator<<(QDataStream &out, const VPieceNodeData &p)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user