From 1b3e1333092b4f587604926e59555d4d7449936f Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 25 Sep 2021 12:42:28 +0300 Subject: [PATCH] GCC warnings. --- common.pri | 2 +- src/libs/vdxf/dxiface.h | 2 +- src/libs/vdxf/libdxfrw/drw_objects.h | 12 ++++++------ src/libs/vgeometry/varc.h | 2 +- src/libs/vgeometry/vcubicbezier.h | 2 +- src/libs/vgeometry/vcubicbezier_p.h | 2 +- src/libs/vobj/delaunay.cpp | 1 + src/libs/vpropertyexplorer/plugins/vboolproperty.h | 2 ++ src/libs/vpropertyexplorer/plugins/vcolorproperty.h | 2 ++ src/libs/vpropertyexplorer/plugins/vemptyproperty.h | 2 ++ .../vpropertyexplorer/plugins/vshortcutproperty.h | 2 ++ src/libs/vtools/dialogs/tools/dialogarc.h | 2 +- src/libs/vtools/dialogs/tools/dialogarcwithlength.h | 2 +- src/libs/vwidgets/vcurvepathitem.cpp | 4 +--- 14 files changed, 23 insertions(+), 16 deletions(-) diff --git a/common.pri b/common.pri index cb5c93927..eabee0196 100644 --- a/common.pri +++ b/common.pri @@ -424,7 +424,7 @@ g++7:GCC_DEBUG_CXXFLAGS += \ -Wrestrict \ -Walloc-zero \ -Wnonnull \ - -Wstringop-overflow=0 # cannot suppress warning in Qt headers + -Wno-stringop-overflow # cannot suppress warning in Qt headers # Since GCC 8 g++8:GCC_DEBUG_CXXFLAGS += \ diff --git a/src/libs/vdxf/dxiface.h b/src/libs/vdxf/dxiface.h index f6b3d05ef..abcc27fbf 100644 --- a/src/libs/vdxf/dxiface.h +++ b/src/libs/vdxf/dxiface.h @@ -35,7 +35,7 @@ public: }; //container class to store entites. -class dx_ifaceBlock : public DRW_Block { +class dx_ifaceBlock final : public DRW_Block { public: dx_ifaceBlock() : ent() diff --git a/src/libs/vdxf/libdxfrw/drw_objects.h b/src/libs/vdxf/libdxfrw/drw_objects.h index ad213e47d..20ddbf6c0 100644 --- a/src/libs/vdxf/libdxfrw/drw_objects.h +++ b/src/libs/vdxf/libdxfrw/drw_objects.h @@ -115,7 +115,7 @@ private: * Class to handle dim style symbol table entries * @author Rallaz */ -class DRW_Dimstyle : public DRW_TableEntry { +class DRW_Dimstyle final : public DRW_TableEntry { SETOBJFRIENDS public: DRW_Dimstyle() @@ -343,7 +343,7 @@ private: * Class to handle layer symbol table entries * @author Rallaz */ -class DRW_Layer : public DRW_TableEntry { +class DRW_Layer final : public DRW_TableEntry { SETOBJFRIENDS public: DRW_Layer() @@ -410,7 +410,7 @@ public: * Class to handle text style symbol table entries * @author Rallaz */ -class DRW_Textstyle : public DRW_TableEntry { +class DRW_Textstyle final : public DRW_TableEntry { SETOBJFRIENDS public: DRW_Textstyle() @@ -453,7 +453,7 @@ public: * Class to handle vport symbol table entries * @author Rallaz */ -class DRW_Vport : public DRW_TableEntry { +class DRW_Vport final : public DRW_TableEntry { SETOBJFRIENDS public: DRW_Vport() @@ -545,7 +545,7 @@ public: * Class to handle image definitions object entries * @author Rallaz */ -class DRW_ImageDef : public DRW_TableEntry {// +class DRW_ImageDef final : public DRW_TableEntry {// SETOBJFRIENDS public: DRW_ImageDef() @@ -590,7 +590,7 @@ public: * Class to handle AppId symbol table entries * @author Rallaz */ -class DRW_AppId : public DRW_TableEntry { +class DRW_AppId final : public DRW_TableEntry { SETOBJFRIENDS public: DRW_AppId() { reset();} diff --git a/src/libs/vgeometry/varc.h b/src/libs/vgeometry/varc.h index c96289514..1ecef9c47 100644 --- a/src/libs/vgeometry/varc.h +++ b/src/libs/vgeometry/varc.h @@ -47,7 +47,7 @@ class VArcData; /** * @brief VArc class for anticlockwise arc. */ -class VArc: public VAbstractArc +class VArc final : public VAbstractArc { Q_DECLARE_TR_FUNCTIONS(VArc) public: diff --git a/src/libs/vgeometry/vcubicbezier.h b/src/libs/vgeometry/vcubicbezier.h index f282bf3aa..aacdd2197 100644 --- a/src/libs/vgeometry/vcubicbezier.h +++ b/src/libs/vgeometry/vcubicbezier.h @@ -43,7 +43,7 @@ class VCubicBezierData; -class VCubicBezier : public VAbstractCubicBezier +class VCubicBezier final : public VAbstractCubicBezier { public: VCubicBezier(); diff --git a/src/libs/vgeometry/vcubicbezier_p.h b/src/libs/vgeometry/vcubicbezier_p.h index 97cf5275e..c277a5cdc 100644 --- a/src/libs/vgeometry/vcubicbezier_p.h +++ b/src/libs/vgeometry/vcubicbezier_p.h @@ -41,7 +41,7 @@ QT_WARNING_PUSH QT_WARNING_DISABLE_GCC("-Weffc++") QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor") -class VCubicBezierData : public QSharedData +class VCubicBezierData final : public QSharedData { public: VCubicBezierData(); diff --git a/src/libs/vobj/delaunay.cpp b/src/libs/vobj/delaunay.cpp index 01f249425..c34f27a18 100644 --- a/src/libs/vobj/delaunay.cpp +++ b/src/libs/vobj/delaunay.cpp @@ -31,6 +31,7 @@ QT_WARNING_DISABLE_GCC("-Wold-style-cast") QT_WARNING_DISABLE_CLANG("-Wold-style-cast") QT_WARNING_DISABLE_GCC("-Wcast-qual") QT_WARNING_DISABLE_CLANG("-Wcast-qual") +QT_WARNING_DISABLE_GCC("-Walloc-zero") #if PREDICATE == EXACT_PREDICATE extern void exactinit(); diff --git a/src/libs/vpropertyexplorer/plugins/vboolproperty.h b/src/libs/vpropertyexplorer/plugins/vboolproperty.h index b4b6cc40b..abc047a84 100644 --- a/src/libs/vpropertyexplorer/plugins/vboolproperty.h +++ b/src/libs/vpropertyexplorer/plugins/vboolproperty.h @@ -80,6 +80,8 @@ private: Q_DISABLE_COPY(VBoolProperty) }; +VPE_MARK_NONFINAL_CLASS(VBoolProperty) + } #endif // VBOOLPROPERTY_H diff --git a/src/libs/vpropertyexplorer/plugins/vcolorproperty.h b/src/libs/vpropertyexplorer/plugins/vcolorproperty.h index 1928487d2..b76df13d8 100644 --- a/src/libs/vpropertyexplorer/plugins/vcolorproperty.h +++ b/src/libs/vpropertyexplorer/plugins/vcolorproperty.h @@ -74,6 +74,8 @@ private: Q_DISABLE_COPY(VColorProperty) }; +VPE_MARK_NONFINAL_CLASS(VColorProperty) + } #endif // VCOLORPROPERTY_H diff --git a/src/libs/vpropertyexplorer/plugins/vemptyproperty.h b/src/libs/vpropertyexplorer/plugins/vemptyproperty.h index 99fbdba3e..509c4cad2 100644 --- a/src/libs/vpropertyexplorer/plugins/vemptyproperty.h +++ b/src/libs/vpropertyexplorer/plugins/vemptyproperty.h @@ -87,6 +87,8 @@ private: Q_DISABLE_COPY(VEmptyProperty) }; +VPE_MARK_NONFINAL_CLASS(VEmptyProperty) + } #endif // VEMPTYPROPERTY_H diff --git a/src/libs/vpropertyexplorer/plugins/vshortcutproperty.h b/src/libs/vpropertyexplorer/plugins/vshortcutproperty.h index 434617344..8dceaf416 100644 --- a/src/libs/vpropertyexplorer/plugins/vshortcutproperty.h +++ b/src/libs/vpropertyexplorer/plugins/vshortcutproperty.h @@ -81,6 +81,8 @@ private: Q_DISABLE_COPY(VShortcutProperty) }; +VPE_MARK_NONFINAL_CLASS(VShortcutProperty) + } #endif // VFILEPROPERTY_H diff --git a/src/libs/vtools/dialogs/tools/dialogarc.h b/src/libs/vtools/dialogs/tools/dialogarc.h index 9eb896f49..f68d4f77a 100644 --- a/src/libs/vtools/dialogs/tools/dialogarc.h +++ b/src/libs/vtools/dialogs/tools/dialogarc.h @@ -46,7 +46,7 @@ namespace Ui /** * @brief The DialogArc class dialog for ToolArc. Help create arc and edit option. */ -class DialogArc : public DialogTool +class DialogArc final : public DialogTool { Q_OBJECT public: diff --git a/src/libs/vtools/dialogs/tools/dialogarcwithlength.h b/src/libs/vtools/dialogs/tools/dialogarcwithlength.h index ea69c1bbc..87160b4b6 100644 --- a/src/libs/vtools/dialogs/tools/dialogarcwithlength.h +++ b/src/libs/vtools/dialogs/tools/dialogarcwithlength.h @@ -43,7 +43,7 @@ namespace Ui class DialogArcWithLength; } -class DialogArcWithLength : public DialogTool +class DialogArcWithLength final : public DialogTool { Q_OBJECT diff --git a/src/libs/vwidgets/vcurvepathitem.cpp b/src/libs/vwidgets/vcurvepathitem.cpp index a0929c753..e25f6f8c8 100644 --- a/src/libs/vwidgets/vcurvepathitem.cpp +++ b/src/libs/vwidgets/vcurvepathitem.cpp @@ -39,9 +39,7 @@ VCurvePathItem::VCurvePathItem(QGraphicsItem *parent) m_directionArrows(), m_points(), m_defaultWidth(VAbstractApplication::VApp()->Settings()->WidthMainLine()) -{ - SCASSERT(parent != nullptr); -} +{} //--------------------------------------------------------------------------------------------------------------------- QPainterPath VCurvePathItem::shape() const