Backport: Feature [feature-requests:#1215]. Stop warning about virtual call in destructor.

Backport of changeset 6690:2107e0144806.

1 files changed, 18 insertions, 13 deletions

diff --git a/qt/ScintillaEditBase/PlatQt.cpp b/qt/ScintillaEditBase/PlatQt.cpp
index 87496a191..e32fec67d 100644
--- a/qt/ScintillaEditBase/PlatQt.cpp
+++ b/qt/ScintillaEditBase/PlatQt.cpp
@@ -165,7 +165,23 @@ SurfaceImpl::SurfaceImpl()
 
 SurfaceImpl::~SurfaceImpl()
 {
-	Release();
+	Clear();
+}
+
+void SurfaceImpl::Clear()
+{
+	if (painterOwned && painter) {
+		delete painter;
+	}
+
+	if (deviceOwned && device) {
+		delete device;
+	}
+
+	device = 0;
+	painter = 0;
+	deviceOwned = false;
+	painterOwned = false;
 }
 
 void SurfaceImpl::Init(WindowID wid)
@@ -197,18 +213,7 @@ void SurfaceImpl::InitPixMap(int width,
 
 void SurfaceImpl::Release()
 {
-	if (painterOwned && painter) {
-		delete painter;
-	}
-
-	if (deviceOwned && device) {
-		delete device;
-	}
-
-	device = 0;
-	painter = 0;
-	deviceOwned = false;
-	painterOwned = false;
+	Clear();
 }
 
 bool SurfaceImpl::Initialised()