From 51ed05e1fa4e294407d76c7829a7200ad8aa2aa5 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 25 Sep 2021 12:57:15 +0300 Subject: [PATCH] GCC warnings. --- src/libs/ifc/exception/vexception.h | 5 +++++ src/libs/ifc/xml/vabstractpattern.h | 5 +++++ src/libs/vdxf/libdxfrw/drw_objects.h | 2 +- src/libs/vgeometry/vabstractarc.h | 5 +++++ src/libs/vgeometry/vabstractarc_p.h | 2 +- src/libs/vgeometry/vabstractcubicbezierpath.h | 5 +++++ src/libs/vgeometry/vcubicbezierpath.h | 2 +- src/libs/vgeometry/vplacelabelitem_p.h | 2 +- src/libs/vtools/warnings.pri | 1 + src/libs/vwidgets/vabstractmainwindow.h | 5 +++++ src/libs/vwidgets/vcurvepathitem.h | 5 +++++ 11 files changed, 35 insertions(+), 4 deletions(-) diff --git a/src/libs/ifc/exception/vexception.h b/src/libs/ifc/exception/vexception.h index 6cdecf9a7..429d1e634 100644 --- a/src/libs/ifc/exception/vexception.h +++ b/src/libs/ifc/exception/vexception.h @@ -36,6 +36,9 @@ #include "../ifcdef.h" +QT_WARNING_PUSH +QT_WARNING_DISABLE_GCC("-Wsuggest-final-types") + /** * @brief The VException class parent for all exception. Could be use for abstract exception */ @@ -69,6 +72,8 @@ protected: QString MoreInfo(const QString &detInfo) const; }; +QT_WARNING_POP + //--------------------------------------------------------------------------------------------------------------------- /** * @brief What return string with error diff --git a/src/libs/ifc/xml/vabstractpattern.h b/src/libs/ifc/xml/vabstractpattern.h index 581407873..3ca01017a 100644 --- a/src/libs/ifc/xml/vabstractpattern.h +++ b/src/libs/ifc/xml/vabstractpattern.h @@ -87,6 +87,9 @@ struct VGroupData QT_WARNING_POP +QT_WARNING_PUSH +QT_WARNING_DISABLE_GCC("-Wsuggest-final-types") + class VAbstractPattern : public VDomDocument { Q_OBJECT @@ -471,6 +474,8 @@ private: void SetFMeasurements(QDomElement &element, const QVector &measurements); }; +QT_WARNING_POP + //--------------------------------------------------------------------------------------------------------------------- /** * @brief GetNameActivPP return current pattern piece name. diff --git a/src/libs/vdxf/libdxfrw/drw_objects.h b/src/libs/vdxf/libdxfrw/drw_objects.h index 20ddbf6c0..266ba52a4 100644 --- a/src/libs/vdxf/libdxfrw/drw_objects.h +++ b/src/libs/vdxf/libdxfrw/drw_objects.h @@ -302,7 +302,7 @@ public: * @author Rallaz */ /*TODO: handle complex lineType*/ -class DRW_LType : public DRW_TableEntry { +class DRW_LType final : public DRW_TableEntry { SETOBJFRIENDS public: DRW_LType() diff --git a/src/libs/vgeometry/vabstractarc.h b/src/libs/vgeometry/vabstractarc.h index 470b644a2..768422469 100644 --- a/src/libs/vgeometry/vabstractarc.h +++ b/src/libs/vgeometry/vabstractarc.h @@ -41,6 +41,9 @@ class VAbstractArcData; class VPointF; +QT_WARNING_PUSH +QT_WARNING_DISABLE_GCC("-Wsuggest-final-types") + class VAbstractArc : public VAbstractCurve { public: @@ -89,4 +92,6 @@ private: QSharedDataPointer d; }; +QT_WARNING_POP + #endif // VABSTRACTARC_H diff --git a/src/libs/vgeometry/vabstractarc_p.h b/src/libs/vgeometry/vabstractarc_p.h index 787d77cd7..75a8b46b5 100644 --- a/src/libs/vgeometry/vabstractarc_p.h +++ b/src/libs/vgeometry/vabstractarc_p.h @@ -39,7 +39,7 @@ QT_WARNING_PUSH QT_WARNING_DISABLE_GCC("-Weffc++") QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor") -class VAbstractArcData : public QSharedData +class VAbstractArcData final : public QSharedData { public: VAbstractArcData(); diff --git a/src/libs/vgeometry/vabstractcubicbezierpath.h b/src/libs/vgeometry/vabstractcubicbezierpath.h index fad8a30aa..d8a2b3c30 100644 --- a/src/libs/vgeometry/vabstractcubicbezierpath.h +++ b/src/libs/vgeometry/vabstractcubicbezierpath.h @@ -43,6 +43,9 @@ class VPointF; class VSpline; class VSplinePoint; +QT_WARNING_PUSH +QT_WARNING_DISABLE_GCC("-Wsuggest-final-types") + class VAbstractCubicBezierPath : public VAbstractBezier { Q_DECLARE_TR_FUNCTIONS(VAbstractCubicBezierPath) @@ -80,4 +83,6 @@ protected: virtual VPointF LastPoint() const =0; }; +QT_WARNING_POP + #endif // VABSTRACTCUBICBEZIERPATH_H diff --git a/src/libs/vgeometry/vcubicbezierpath.h b/src/libs/vgeometry/vcubicbezierpath.h index ca1456730..0f7fdd899 100644 --- a/src/libs/vgeometry/vcubicbezierpath.h +++ b/src/libs/vgeometry/vcubicbezierpath.h @@ -44,7 +44,7 @@ class VCubicBezierPathData; -class VCubicBezierPath : public VAbstractCubicBezierPath +class VCubicBezierPath final : public VAbstractCubicBezierPath { Q_DECLARE_TR_FUNCTIONS(VCubicBezierPath) public: diff --git a/src/libs/vgeometry/vplacelabelitem_p.h b/src/libs/vgeometry/vplacelabelitem_p.h index 1b225b386..0951c0913 100644 --- a/src/libs/vgeometry/vplacelabelitem_p.h +++ b/src/libs/vgeometry/vplacelabelitem_p.h @@ -37,7 +37,7 @@ QT_WARNING_PUSH QT_WARNING_DISABLE_GCC("-Weffc++") QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor") -class VPlaceLabelItemData : public QSharedData +class VPlaceLabelItemData final : public QSharedData { public: VPlaceLabelItemData() diff --git a/src/libs/vtools/warnings.pri b/src/libs/vtools/warnings.pri index 9c069161b..41d68e2c4 100644 --- a/src/libs/vtools/warnings.pri +++ b/src/libs/vtools/warnings.pri @@ -39,6 +39,7 @@ unix { *clang*{ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. + -isystem "$${OUT_PWD}/$${UI_DIR}" \ -isystem "$${OUT_PWD}/$${MOC_DIR}" \ $$CLANG_DEBUG_CXXFLAGS # See common.pri for more details. diff --git a/src/libs/vwidgets/vabstractmainwindow.h b/src/libs/vwidgets/vabstractmainwindow.h index 20421843a..ac2ad7ca4 100644 --- a/src/libs/vwidgets/vabstractmainwindow.h +++ b/src/libs/vwidgets/vabstractmainwindow.h @@ -37,6 +37,9 @@ struct VFinalMeasurement; +QT_WARNING_PUSH +QT_WARNING_DISABLE_GCC("-Wsuggest-final-types") + class VAbstractMainWindow : public QMainWindow { Q_OBJECT @@ -79,4 +82,6 @@ private: Q_DISABLE_COPY(VAbstractMainWindow) }; +QT_WARNING_POP + #endif // VABSTRACTMAINWINDOW_H diff --git a/src/libs/vwidgets/vcurvepathitem.h b/src/libs/vwidgets/vcurvepathitem.h index 32ac2029c..694116361 100644 --- a/src/libs/vwidgets/vcurvepathitem.h +++ b/src/libs/vwidgets/vcurvepathitem.h @@ -34,6 +34,9 @@ #include "../vmisc/def.h" +QT_WARNING_PUSH +QT_WARNING_DISABLE_GCC("-Wsuggest-final-types") + class VCurvePathItem : public QGraphicsPathItem { public: @@ -61,4 +64,6 @@ private: qreal m_defaultWidth; }; +QT_WARNING_POP + #endif // VCURVEPATHITEM_H