aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--cppcheck.suppress7
-rw-r--r--qt/ScintillaEditBase/PlatQt.h2
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;