From e251bd365c5ab5fd07892433877d49c11df88f8d Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 22 Nov 2022 08:20:22 +0200 Subject: [PATCH] Fix build. --- src/libs/vgeometry/vlayoutplacelabel.cpp | 2 +- src/libs/vlayout/vabstractpiece_p.h | 2 +- src/libs/vlayout/vlayoutpiece_p.h | 2 +- src/libs/vlayout/vlayoutpiecepath_p.h | 2 +- src/libs/vpatterndb/vpiecenode_p.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libs/vgeometry/vlayoutplacelabel.cpp b/src/libs/vgeometry/vlayoutplacelabel.cpp index adf560467..75d4bfe98 100644 --- a/src/libs/vgeometry/vlayoutplacelabel.cpp +++ b/src/libs/vgeometry/vlayoutplacelabel.cpp @@ -35,7 +35,7 @@ // 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) +constexpr quint16 VLayoutPlaceLabel::classVersion; // NOLINT(readability-redundant-declaration) #endif //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vlayout/vabstractpiece_p.h b/src/libs/vlayout/vabstractpiece_p.h index 99fc9b5e4..ffacc53d7 100644 --- a/src/libs/vlayout/vabstractpiece_p.h +++ b/src/libs/vlayout/vabstractpiece_p.h @@ -86,7 +86,7 @@ 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) +constexpr quint16 VAbstractPieceData::classVersion; // NOLINT(readability-redundant-declaration) #endif // Friend functions diff --git a/src/libs/vlayout/vlayoutpiece_p.h b/src/libs/vlayout/vlayoutpiece_p.h index fbebcedb0..c1ad97727 100644 --- a/src/libs/vlayout/vlayoutpiece_p.h +++ b/src/libs/vlayout/vlayoutpiece_p.h @@ -132,7 +132,7 @@ 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) +constexpr quint16 VLayoutPieceData::classVersion; // NOLINT(readability-redundant-declaration) #endif // Friend functions diff --git a/src/libs/vlayout/vlayoutpiecepath_p.h b/src/libs/vlayout/vlayoutpiecepath_p.h index 26f0d2e90..a0181d69f 100644 --- a/src/libs/vlayout/vlayoutpiecepath_p.h +++ b/src/libs/vlayout/vlayoutpiecepath_p.h @@ -83,7 +83,7 @@ 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) + constexpr quint16 VLayoutPiecePathData::classVersion; // NOLINT(readability-redundant-declaration) #endif // Friend functions diff --git a/src/libs/vpatterndb/vpiecenode_p.h b/src/libs/vpatterndb/vpiecenode_p.h index d2a10e251..34c23efef 100644 --- a/src/libs/vpatterndb/vpiecenode_p.h +++ b/src/libs/vpatterndb/vpiecenode_p.h @@ -119,7 +119,7 @@ private: // 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) +constexpr quint16 VPieceNodeData::classVersion; // NOLINT(readability-redundant-declaration) #endif // Friend functions