diff options
| -rw-r--r-- | lexlib/StyleContext.h | 5 | ||||
| -rw-r--r-- | src/EditView.h | 3 | ||||
| -rw-r--r-- | win32/ScintillaWin.cxx | 5 |
3 files changed, 8 insertions, 5 deletions
diff --git a/lexlib/StyleContext.h b/lexlib/StyleContext.h index 045939f14..7b2f59c00 100644 --- a/lexlib/StyleContext.h +++ b/lexlib/StyleContext.h @@ -27,8 +27,6 @@ class StyleContext { Sci_PositionU currentPosLastRelative; Sci_Position offsetRelative; - StyleContext &operator=(const StyleContext &); - void GetNextChar() { if (multiByteAccess) { chNext = multiByteAccess->GetCharacterAndWidth(currentPos+width, &widthNext); @@ -97,6 +95,9 @@ public: GetNextChar(); } + // Deleted so StyleContext objects can not be copied + StyleContext(const StyleContext &) = delete; + StyleContext &operator=(const StyleContext &) = delete; void Complete() { styler.ColourTo(currentPos - ((currentPos > lengthDocument) ? 2 : 1), state); styler.Flush(); diff --git a/src/EditView.h b/src/EditView.h index 9eb3146dd..d884019d4 100644 --- a/src/EditView.h +++ b/src/EditView.h @@ -154,9 +154,10 @@ public: class AutoLineLayout { LineLayoutCache &llc; LineLayout *ll; - AutoLineLayout &operator=(const AutoLineLayout &); public: AutoLineLayout(LineLayoutCache &llc_, LineLayout *ll_) : llc(llc_), ll(ll_) {} + explicit AutoLineLayout(const AutoLineLayout &) = delete; + AutoLineLayout &operator=(const AutoLineLayout &) = delete; ~AutoLineLayout() { llc.Dispose(ll); ll = 0; diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index e4547f6b6..91a68fbf2 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -272,9 +272,10 @@ class ScintillaWin : #endif explicit ScintillaWin(HWND hwnd); - ScintillaWin(const ScintillaWin &); + // Deleted so ScintillaWin objects can not be copied + ScintillaWin(const ScintillaWin &) = delete; + ScintillaWin &operator=(const ScintillaWin &) = delete; ~ScintillaWin() override; - ScintillaWin &operator=(const ScintillaWin &); void Init(); void Finalise() override; |