From b9e09f34badc402f80a4a53c507576affd97b8bc Mon Sep 17 00:00:00 2001 From: Neil Date: Tue, 7 May 2024 11:59:23 +1000 Subject: Update suppressions for cppcheck 2.14. Mark SurfaceImpl destructor as override to avoid cppcheck warning. --- cppcheck.suppress | 7 ++++--- qt/ScintillaEditBase/PlatQt.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cppcheck.suppress b/cppcheck.suppress index bd24b3ff1..ea0dacc48 100644 --- a/cppcheck.suppress +++ b/cppcheck.suppress @@ -27,12 +27,13 @@ constStatement:scintilla/src/Document.cxx // ILexer5* is not pointing at logically const constParameterPointer:scintilla/src/Document.cxx -// Doesn't seem to understand that values change in loops -knownConditionTrueFalse:scintilla/src/Document.cxx - // Some non-explicit constructors are used for conversions or are private to lexers noExplicitConstructor +// RangesCopy is deliberately returning a copy. +// The copy is always mutated so returning a refererence just enables lifetime problems. +returnByReference:scintilla/src/Selection.h + // MarginView access to all bits is safe and is better defined in later versions of C++ shiftTooManyBitsSigned:scintilla/src/MarginView.cxx diff --git a/qt/ScintillaEditBase/PlatQt.h b/qt/ScintillaEditBase/PlatQt.h index a7c405156..abb855270 100644 --- a/qt/ScintillaEditBase/PlatQt.h +++ b/qt/ScintillaEditBase/PlatQt.h @@ -83,7 +83,7 @@ private: public: SurfaceImpl(); SurfaceImpl(int width, int height, SurfaceMode mode_); - virtual ~SurfaceImpl(); + virtual ~SurfaceImpl() override; void Init(WindowID wid) override; void Init(SurfaceID sid, WindowID wid) override; -- cgit v1.2.3