From 0b4aa4e5307bbb76147d9b7c5b1feb062a4ca054 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Thu, 3 Jan 2019 09:26:07 +1100
Subject: Backport: Avoid shadowing of AutoSurface.

Backport of changeset 7189:8eff2f26b0ee.
---
 qt/ScintillaEditBase/ScintillaQt.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'qt/ScintillaEditBase/ScintillaQt.cpp')

diff --git a/qt/ScintillaEditBase/ScintillaQt.cpp b/qt/ScintillaEditBase/ScintillaQt.cpp
index 8aebb9521..804cd2dc0 100644
--- a/qt/ScintillaEditBase/ScintillaQt.cpp
+++ b/qt/ScintillaEditBase/ScintillaQt.cpp
@@ -701,9 +701,9 @@ void ScintillaQt::PartialPaint(const PRectangle &rect)
 	PRectangle rcClient = GetClientRectangle();
 	paintingAllText = rcPaint.Contains(rcClient);
 
-	AutoSurface surface(this);
-	Paint(surface, rcPaint);
-	surface->Release();
+	AutoSurface surfacePaint(this);
+	Paint(surfacePaint, rcPaint);
+	surfacePaint->Release();
 
 	if (paintState == paintAbandoned) {
 		// FIXME: Failure to paint the requested rectangle in each
-- 
cgit v1.2.3