GCC warnings.

--HG-- branch : develop
2017-05-30 18:44:16 +03:00 · 2017-05-30 18:44:16 +03:00 · 965d908663
commit 965d908663
parent b4f081727d
44 changed files with 94 additions and 15 deletions
--- a/src/libs/ifc/xml/vdomdocument.h
+++ b/src/libs/ifc/xml/vdomdocument.h
@ -55,6 +55,7 @@ Q_DECLARE_LOGGING_CATEGORY(vXML)

 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")

 /**
 * @brief The VDomDocument class represents a Valentina document (.val file).
--- a/src/libs/qmuparser/qmuparserbase.cpp
+++ b/src/libs/qmuparser/qmuparserbase.cpp
@ -1407,9 +1407,7 @@ void QmuParserBase::CreateRPN() const
                }
                ++stArgCount.top();
                // fallthrough intentional (no break!)
-            #ifdef Q_CC_CLANG
-                [[clang::fallthrough]];
-            #endif
+                QMUP_FALLTHROUGH
            case cmEND:
                ApplyRemainingOprt(stOpt, stVal);
                break;
@ -1466,9 +1464,7 @@ void QmuParserBase::CreateRPN() const
            case cmIF:
                m_nIfElseCounter++;
                // fallthrough intentional (no break!)
-            #ifdef Q_CC_CLANG
-                [[clang::fallthrough]];
-            #endif
+                QMUP_FALLTHROUGH
            case cmLE:
            case cmGE:
            case cmNEQ:
--- a/src/libs/qmuparser/qmuparserdef.h
+++ b/src/libs/qmuparser/qmuparserdef.h
@ -52,6 +52,24 @@
 #    define QMUP_NOEXCEPT_EXPR(x)
 #  endif

+#if __cplusplus > 201402L && __has_cpp_attribute(fallthrough)
+#   define QMUP_FALLTHROUGH [[fallthrough]];
+#elif defined(Q_CC_CLANG) && __cplusplus >= 201103L
+    /* clang's fallthrough annotations are only available starting in C++11. */
+#   define QMUP_FALLTHROUGH [[clang::fallthrough]];
+#elif defined(Q_CC_MSVC)
+   /*
+    * MSVC's __fallthrough annotations are checked by /analyze (Code Analysis):
+    * https://msdn.microsoft.com/en-us/library/ms235402%28VS.80%29.aspx
+    */
+#   include <sal.h>
+#   define QMUP_FALLTHROUGH __fallthrough;
+#elif defined(Q_CC_GNU) && (__GNUC__ >= 7)
+#   define QMUP_FALLTHROUGH [[gnu::fallthrough]];
+#else
+#   define QMUP_FALLTHROUGH
+#endif
+
 /** @brief If this macro is defined mathematical exceptions (div by zero) will be thrown as exceptions. */
 //#define QMUP_MATH_EXCEPTIONS

--- a/src/libs/vdxf/dxflib/dl_codes.h
+++ b/src/libs/vdxf/dxflib/dl_codes.h
@ -530,5 +530,23 @@ const double dxfColors[][3] =
 #define DL_DCS_TRANS_CODE      2
 #define DL_PCS_TRANS_CODE      3

+#if __cplusplus > 201402L && __has_cpp_attribute(fallthrough)
+#   define DL_FALLTHROUGH [[fallthrough]];
+#elif defined(Q_CC_CLANG) && __cplusplus >= 201103L
+    /* clang's fallthrough annotations are only available starting in C++11. */
+#   define DL_FALLTHROUGH [[clang::fallthrough]];
+#elif defined(Q_CC_MSVC)
+   /*
+    * MSVC's __fallthrough annotations are checked by /analyze (Code Analysis):
+    * https://msdn.microsoft.com/en-us/library/ms235402%28VS.80%29.aspx
+    */
+#   include <sal.h>
+#   define DL_FALLTHROUGH __fallthrough;
+#elif defined(Q_CC_GNU) && (__GNUC__ >= 7)
+#   define DL_FALLTHROUGH [[gnu::fallthrough]];
+#else
+#   define DL_FALLTHROUGH
+#endif
+
 #endif

--- a/src/libs/vdxf/dxflib/dl_dxf.cpp
+++ b/src/libs/vdxf/dxflib/dl_dxf.cpp
@ -5866,14 +5866,10 @@ int DL_Dxf::getLibVersion(const std::string& str)
        {
            case 4:
                v3 = ver.at(3).toInt();
-            #ifdef Q_CC_CLANG
-                [[clang::fallthrough]];
-            #endif
+            DL_FALLTHROUGH
            case 3:
                v2 = ver.at(2).toInt();
-            #ifdef Q_CC_CLANG
-                [[clang::fallthrough]];
-            #endif
+            DL_FALLTHROUGH
            case 2:
                v0 = ver.at(0).toInt();
                v1 = ver.at(1).toInt();
--- a/src/libs/vgeometry/vabstractarc_p.h
+++ b/src/libs/vgeometry/vabstractarc_p.h
@ -37,6 +37,7 @@

 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")

 class VAbstractArcData : public QSharedData
 {
--- a/src/libs/vgeometry/vabstractcurve_p.h
+++ b/src/libs/vgeometry/vabstractcurve_p.h
@ -36,6 +36,7 @@

 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")

 class VAbstractCurveData : public QSharedData
 {
--- a/src/libs/vgeometry/varc_p.h
+++ b/src/libs/vgeometry/varc_p.h
@ -36,6 +36,7 @@

 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")

 class VArcData : public QSharedData
 {
--- a/src/libs/vgeometry/vcubicbezier_p.h
+++ b/src/libs/vgeometry/vcubicbezier_p.h
@ -39,6 +39,7 @@

 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")

 class VCubicBezierData : public QSharedData
 {
--- a/src/libs/vgeometry/vcubicbezierpath_p.h
+++ b/src/libs/vgeometry/vcubicbezierpath_p.h
@ -36,6 +36,7 @@

 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")

 class VCubicBezierPathData : public QSharedData
 {
--- a/src/libs/vgeometry/vellipticalarc_p.h
+++ b/src/libs/vgeometry/vellipticalarc_p.h
@ -8,6 +8,7 @@

 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")

 class VEllipticalArcData : public QSharedData
 {
--- a/src/libs/vgeometry/vgobject_p.h
+++ b/src/libs/vgeometry/vgobject_p.h
@ -36,6 +36,7 @@

 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")

 class VGObjectData : public QSharedData
 {
--- a/src/libs/vgeometry/vpointf_p.h
+++ b/src/libs/vgeometry/vpointf_p.h
@ -36,6 +36,7 @@

 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")

 class VPointFData : public QSharedData
 {
--- a/src/libs/vgeometry/vspline_p.h
+++ b/src/libs/vgeometry/vspline_p.h
@ -38,6 +38,7 @@

 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")

 class VSplineData : public QSharedData
 {
--- a/src/libs/vgeometry/vsplinepath_p.h
+++ b/src/libs/vgeometry/vsplinepath_p.h
@ -34,6 +34,7 @@

 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")

 class VSplinePathData : public QSharedData
 {
--- a/src/libs/vgeometry/vsplinepoint_p.h
+++ b/src/libs/vgeometry/vsplinepoint_p.h
@ -39,6 +39,7 @@

 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")

 class VFSplinePointData : public QSharedData
 {
--- a/src/libs/vlayout/vabstractpiece.h
+++ b/src/libs/vlayout/vabstractpiece.h
@ -44,6 +44,7 @@ class VAbstractPieceData;

 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")

 /**
 * @brief The VSAPoint class seam allowance point
--- a/src/libs/vlayout/vabstractpiece_p.h
+++ b/src/libs/vlayout/vabstractpiece_p.h
@ -37,6 +37,7 @@

 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")

 class VAbstractPieceData : public QSharedData
 {
--- a/src/libs/vlayout/vcontour_p.h
+++ b/src/libs/vlayout/vcontour_p.h
@ -36,6 +36,7 @@

 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")

 class VContourData : public QSharedData
 {
--- a/src/libs/vlayout/vlayoutpaper_p.h
+++ b/src/libs/vlayout/vlayoutpaper_p.h
@ -38,6 +38,7 @@

 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")

 class VLayoutPaperData : public QSharedData
 {
--- a/src/libs/vlayout/vlayoutpiece_p.h
+++ b/src/libs/vlayout/vlayoutpiece_p.h
@ -44,6 +44,7 @@

 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")

 class VLayoutPieceData : public QSharedData
 {
--- a/src/libs/vlayout/vlayoutpiecepath_p.h
+++ b/src/libs/vlayout/vlayoutpiecepath_p.h
@ -37,6 +37,7 @@

 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")

 class VLayoutPiecePathData : public QSharedData
 {
--- a/src/libs/vmisc/backport/qcommandlineoption.cpp
+++ b/src/libs/vmisc/backport/qcommandlineoption.cpp
@ -29,6 +29,7 @@

 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")

 class QCommandLineOptionPrivate : public QSharedData
 {
--- a/src/libs/vmisc/backport/qcommandlineoption.h
+++ b/src/libs/vmisc/backport/qcommandlineoption.h
@ -30,6 +30,7 @@

 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")

 class QCommandLineOptionPrivate;

--- a/src/libs/vmisc/backport/qcommandlineparser.cpp
+++ b/src/libs/vmisc/backport/qcommandlineparser.cpp
@ -35,6 +35,7 @@ QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
 QT_WARNING_DISABLE_GCC("-Wswitch-default")
 QT_WARNING_DISABLE_GCC("-Wsuggest-attribute=noreturn")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")

 typedef QHash<QString, int> NameHash_t;

--- a/src/libs/vmisc/backport/qcommandlineparser.h
+++ b/src/libs/vmisc/backport/qcommandlineparser.h
@ -33,6 +33,7 @@ class QCoreApplication;

 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")

 class QCommandLineParser
 {
--- a/src/libs/vmisc/def.h
+++ b/src/libs/vmisc/def.h
@ -282,10 +282,22 @@ enum class GSizes : unsigned char { ALL,
 #define SCASSERT(cond) qt_noop();
 #endif /* V_NO_ASSERT */

-#ifdef Q_CC_CLANG
-#define V_FALLTHROUGH [[clang::fallthrough]];
+#if __cplusplus > 201402L && __has_cpp_attribute(fallthrough)
+#   define V_FALLTHROUGH [[fallthrough]];
+#elif defined(Q_CC_CLANG) && __cplusplus >= 201103L
+    /* clang's fallthrough annotations are only available starting in C++11. */
+#   define V_FALLTHROUGH [[clang::fallthrough]];
+#elif defined(Q_CC_MSVC)
+   /*
+    * MSVC's __fallthrough annotations are checked by /analyze (Code Analysis):
+    * https://msdn.microsoft.com/en-us/library/ms235402%28VS.80%29.aspx
+    */
+#   include <sal.h>
+#   define V_FALLTHROUGH __fallthrough;
+#elif defined(Q_CC_GNU) && (__GNUC__ >= 7)
+#   define V_FALLTHROUGH [[gnu::fallthrough]];
 #else
-#define V_FALLTHROUGH
+#   define V_FALLTHROUGH
 #endif

 extern const QString LONG_OPTION_NO_HDPI_SCALING;
--- a/src/libs/vpatterndb/floatItemData/vabstractfloatitemdata_p.h
+++ b/src/libs/vpatterndb/floatItemData/vabstractfloatitemdata_p.h
@ -36,6 +36,7 @@

 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")

 class VAbstractFloatItemDataPrivate : public QSharedData
 {
--- a/src/libs/vpatterndb/floatItemData/vgrainlinedata_p.h
+++ b/src/libs/vpatterndb/floatItemData/vgrainlinedata_p.h
@ -38,6 +38,7 @@

 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")

 class VGrainlineDataPrivate : public QSharedData
 {
--- a/src/libs/vpatterndb/floatItemData/vpatternlabeldata_p.h
+++ b/src/libs/vpatterndb/floatItemData/vpatternlabeldata_p.h
@ -37,6 +37,7 @@

 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")

 class VPatternLabelDataPrivate : public QSharedData
 {
--- a/src/libs/vpatterndb/floatItemData/vpiecelabeldata_p.h
+++ b/src/libs/vpatterndb/floatItemData/vpiecelabeldata_p.h
@ -37,6 +37,7 @@

 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")

 class VPieceLabelDataPrivate : public QSharedData
 {
--- a/src/libs/vpatterndb/variables/varcradius_p.h
+++ b/src/libs/vpatterndb/variables/varcradius_p.h
@ -35,6 +35,7 @@

 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")

 class VArcRadiusData : public QSharedData
 {
--- a/src/libs/vpatterndb/variables/vcurvevariable_p.h
+++ b/src/libs/vpatterndb/variables/vcurvevariable_p.h
@ -36,6 +36,7 @@

 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")

 class VCurveVariableData : public QSharedData
 {
--- a/src/libs/vpatterndb/variables/vincrement_p.h
+++ b/src/libs/vpatterndb/variables/vincrement_p.h
@ -37,6 +37,7 @@

 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")

 class VIncrementData : public QSharedData
 {
--- a/src/libs/vpatterndb/variables/vinternalvariable_p.h
+++ b/src/libs/vpatterndb/variables/vinternalvariable_p.h
@ -35,6 +35,7 @@

 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")

 class VInternalVariableData : public QSharedData
 {
--- a/src/libs/vpatterndb/variables/vlineangle_p.h
+++ b/src/libs/vpatterndb/variables/vlineangle_p.h
@ -36,6 +36,7 @@

 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")

 class VLineAngleData : public QSharedData
 {
--- a/src/libs/vpatterndb/variables/vlinelength_p.h
+++ b/src/libs/vpatterndb/variables/vlinelength_p.h
@ -36,6 +36,7 @@

 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")

 class VLengthLineData : public QSharedData
 {
--- a/src/libs/vpatterndb/variables/vmeasurement_p.h
+++ b/src/libs/vpatterndb/variables/vmeasurement_p.h
@ -36,6 +36,7 @@

 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")

 class VMeasurementData : public QSharedData
 {
--- a/src/libs/vpatterndb/variables/vvariable_p.h
+++ b/src/libs/vpatterndb/variables/vvariable_p.h
@ -35,6 +35,7 @@

 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")

 class VVariableData : public QSharedData
 {
--- a/src/libs/vpatterndb/vcontainer.h
+++ b/src/libs/vpatterndb/vcontainer.h
@ -62,6 +62,7 @@ class VEllipticalArc;
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
 QT_WARNING_DISABLE_INTEL(2021)
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")

 class VContainerData : public QSharedData //-V690
 {
--- a/src/libs/vpatterndb/vnodedetail_p.h
+++ b/src/libs/vpatterndb/vnodedetail_p.h
@ -35,6 +35,7 @@

 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")

 class VNodeDetailData : public QSharedData
 {
--- a/src/libs/vpatterndb/vpiece_p.h
+++ b/src/libs/vpatterndb/vpiece_p.h
@ -42,6 +42,7 @@

 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")

 class VPieceData : public QSharedData
 {
--- a/src/libs/vpatterndb/vpiecenode_p.h
+++ b/src/libs/vpatterndb/vpiecenode_p.h
@ -36,6 +36,7 @@

 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")

 class VPieceNodeData : public QSharedData
 {
--- a/src/libs/vpatterndb/vpiecepath_p.h
+++ b/src/libs/vpatterndb/vpiecepath_p.h
@ -37,6 +37,7 @@

 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
+QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")

 class VPiecePathData : public QSharedData
 {