aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2021-03-18 23:31:59 +1100
committerNeil <nyamatongwe@gmail.com>2021-03-18 23:31:59 +1100
commitb047c81396af14e5497d969b37b1df9d67d09d17 (patch)
tree4b7eab66346c57d36314e3fd7566a610c2dfc66e
parent088336e91cb2771acd435bcd4646373420f62484 (diff)
downloadscintilla-mirror-b047c81396af14e5497d969b37b1df9d67d09d17.tar.gz
Make Surface::Release and callers (where possible) noexcept.
-rw-r--r--cocoa/PlatCocoa.h2
-rw-r--r--cocoa/PlatCocoa.mm2
-rwxr-xr-xgtk/PlatGTK.cxx4
-rw-r--r--qt/ScintillaEditBase/PlatQt.cpp2
-rw-r--r--qt/ScintillaEditBase/PlatQt.h2
-rw-r--r--src/EditView.cxx2
-rw-r--r--src/EditView.h2
-rw-r--r--src/Editor.cxx2
-rw-r--r--src/Editor.h2
-rw-r--r--src/MarginView.cxx2
-rw-r--r--src/MarginView.h2
-rw-r--r--src/Platform.h2
-rw-r--r--win32/PlatWin.cxx8
13 files changed, 17 insertions, 17 deletions
diff --git a/cocoa/PlatCocoa.h b/cocoa/PlatCocoa.h
index 4d006b1ff..0117fcc15 100644
--- a/cocoa/PlatCocoa.h
+++ b/cocoa/PlatCocoa.h
@@ -78,7 +78,7 @@ public:
void InitPixMap(int width, int height, Surface *surface_, WindowID wid) override;
CGContextRef GetContext() { return gc; }
- void Release() override;
+ void Release() noexcept override;
bool Initialised() override;
void PenColour(ColourDesired fore) override;
diff --git a/cocoa/PlatCocoa.mm b/cocoa/PlatCocoa.mm
index 4eb3bfd1b..2f8778d11 100644
--- a/cocoa/PlatCocoa.mm
+++ b/cocoa/PlatCocoa.mm
@@ -365,7 +365,7 @@ void SurfaceImpl::Clear() {
//--------------------------------------------------------------------------------------------------
-void SurfaceImpl::Release() {
+void SurfaceImpl::Release() noexcept {
Clear();
}
diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx
index 691872e5a..6aed67ba5 100755
--- a/gtk/PlatGTK.cxx
+++ b/gtk/PlatGTK.cxx
@@ -150,7 +150,7 @@ public:
void InitPixMap(int width, int height, Surface *surface_, WindowID wid) override;
void Clear() noexcept;
- void Release() override;
+ void Release() noexcept override;
bool Initialised() override;
void PenColour(ColourDesired fore) override;
int LogPixelsY() override;
@@ -285,7 +285,7 @@ void SurfaceImpl::Clear() noexcept {
createdGC = false;
}
-void SurfaceImpl::Release() {
+void SurfaceImpl::Release() noexcept {
Clear();
}
diff --git a/qt/ScintillaEditBase/PlatQt.cpp b/qt/ScintillaEditBase/PlatQt.cpp
index 9cbf591b9..52cb54bf7 100644
--- a/qt/ScintillaEditBase/PlatQt.cpp
+++ b/qt/ScintillaEditBase/PlatQt.cpp
@@ -200,7 +200,7 @@ void SurfaceImpl::InitPixMap(int width,
SetDBCSMode(psurfOther->codePage);
}
-void SurfaceImpl::Release()
+void SurfaceImpl::Release() noexcept
{
Clear();
}
diff --git a/qt/ScintillaEditBase/PlatQt.h b/qt/ScintillaEditBase/PlatQt.h
index a4bf8df6b..844418343 100644
--- a/qt/ScintillaEditBase/PlatQt.h
+++ b/qt/ScintillaEditBase/PlatQt.h
@@ -89,7 +89,7 @@ public:
void InitPixMap(int width, int height,
Surface *surface, WindowID wid) override;
- void Release() override;
+ void Release() noexcept override;
bool Initialised() override;
void PenColour(ColourDesired fore) override;
int LogPixelsY() override;
diff --git a/src/EditView.cxx b/src/EditView.cxx
index 1ec163d27..6ba480123 100644
--- a/src/EditView.cxx
+++ b/src/EditView.cxx
@@ -251,7 +251,7 @@ void EditView::LinesAddedOrRemoved(Sci::Line lineOfPos, Sci::Line linesAdded) {
}
}
-void EditView::DropGraphics(bool freeObjects) {
+void EditView::DropGraphics(bool freeObjects) noexcept {
if (freeObjects) {
pixmapLine.reset();
pixmapIndentGuide.reset();
diff --git a/src/EditView.h b/src/EditView.h
index 8f544f280..eb4cbf849 100644
--- a/src/EditView.h
+++ b/src/EditView.h
@@ -108,7 +108,7 @@ public:
int GetNextTabstop(Sci::Line line, int x) const noexcept;
void LinesAddedOrRemoved(Sci::Line lineOfPos, Sci::Line linesAdded);
- void DropGraphics(bool freeObjects);
+ void DropGraphics(bool freeObjects) noexcept;
void AllocateGraphics(const ViewStyle &vsDraw);
void RefreshPixMaps(Surface *surfaceWindow, WindowID wid, const ViewStyle &vsDraw);
diff --git a/src/Editor.cxx b/src/Editor.cxx
index ab5c9c811..786d1bb95 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -262,7 +262,7 @@ void Editor::SetRepresentations() {
}
}
-void Editor::DropGraphics(bool freeObjects) {
+void Editor::DropGraphics(bool freeObjects) noexcept {
marginView.DropGraphics(freeObjects);
view.DropGraphics(freeObjects);
}
diff --git a/src/Editor.h b/src/Editor.h
index 548c72ed8..4d01cb16a 100644
--- a/src/Editor.h
+++ b/src/Editor.h
@@ -274,7 +274,7 @@ protected: // ScintillaBase subclass needs access to much of Editor
void InvalidateStyleRedraw();
void RefreshStyleData();
void SetRepresentations();
- void DropGraphics(bool freeObjects);
+ void DropGraphics(bool freeObjects) noexcept;
void AllocateGraphics();
// The top left visible point in main window coordinates. Will be 0,0 except for
diff --git a/src/MarginView.cxx b/src/MarginView.cxx
index 555720536..4d52d6036 100644
--- a/src/MarginView.cxx
+++ b/src/MarginView.cxx
@@ -109,7 +109,7 @@ MarginView::MarginView() noexcept {
customDrawWrapMarker = nullptr;
}
-void MarginView::DropGraphics(bool freeObjects) {
+void MarginView::DropGraphics(bool freeObjects) noexcept {
if (freeObjects) {
pixmapSelMargin.reset();
pixmapSelPattern.reset();
diff --git a/src/MarginView.h b/src/MarginView.h
index 4468afa1b..bb1981ed8 100644
--- a/src/MarginView.h
+++ b/src/MarginView.h
@@ -34,7 +34,7 @@ public:
MarginView() noexcept;
- void DropGraphics(bool freeObjects);
+ void DropGraphics(bool freeObjects) noexcept;
void AllocateGraphics(const ViewStyle &vsDraw);
void RefreshPixMaps(Surface *surfaceWindow, WindowID wid, const ViewStyle &vsDraw);
void PaintMargin(Surface *surface, Sci::Line topLine, PRectangle rc, PRectangle rcMargin,
diff --git a/src/Platform.h b/src/Platform.h
index 0c0f37ff6..46c3faf5b 100644
--- a/src/Platform.h
+++ b/src/Platform.h
@@ -174,7 +174,7 @@ public:
virtual void Init(SurfaceID sid, WindowID wid)=0;
virtual void InitPixMap(int width, int height, Surface *surface_, WindowID wid)=0;
- virtual void Release()=0;
+ virtual void Release() noexcept=0;
virtual bool Initialised()=0;
virtual void PenColour(ColourDesired fore)=0;
virtual int LogPixelsY()=0;
diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx
index 2ad3e2f7b..aea7cac98 100644
--- a/win32/PlatWin.cxx
+++ b/win32/PlatWin.cxx
@@ -475,7 +475,7 @@ public:
void Init(SurfaceID sid, WindowID wid) override;
void InitPixMap(int width, int height, Surface *surface_, WindowID wid) override;
- void Release() override;
+ void Release() noexcept override;
bool Initialised() override;
void PenColour(ColourDesired fore) override;
int LogPixelsY() override;
@@ -554,7 +554,7 @@ void SurfaceGDI::Clear() noexcept {
}
}
-void SurfaceGDI::Release() {
+void SurfaceGDI::Release() noexcept {
Clear();
}
@@ -1150,7 +1150,7 @@ public:
void Init(SurfaceID sid, WindowID wid) override;
void InitPixMap(int width, int height, Surface *surface_, WindowID wid) override;
- void Release() override;
+ void Release() noexcept override;
bool Initialised() override;
HRESULT FlushDrawing();
@@ -1239,7 +1239,7 @@ void SurfaceD2D::Clear() noexcept {
pBitmapRenderTarget = nullptr;
}
-void SurfaceD2D::Release() {
+void SurfaceD2D::Release() noexcept {
Clear();
}