3 files changed, 9 insertions, 9 deletions
diff --git a/qt/ScintillaEditBase/PlatQt.cpp b/qt/ScintillaEditBase/PlatQt.cpp
index bdcb0a6dc..54355bd5c 100644
--- a/qt/ScintillaEditBase/PlatQt.cpp
+++ b/qt/ScintillaEditBase/PlatQt.cpp
@@ -755,7 +755,7 @@ public:
 
 	virtual void SetFont(Font &font);
 	virtual void Create(Window &parent, int ctrlID, Point location,
-						int lineHeight, bool unicodeMode, int technology);
+						int lineHeight, bool unicodeMode_, int technology);
 	virtual void SetAverageCharWidth(int width);
 	virtual void SetVisibleRows(int rows);
 	virtual int GetVisibleRows() const;
diff --git a/qt/ScintillaEditBase/PlatQt.h b/qt/ScintillaEditBase/PlatQt.h
index be35d818b..4d41425b1 100644
--- a/qt/ScintillaEditBase/PlatQt.h
+++ b/qt/ScintillaEditBase/PlatQt.h
@@ -75,8 +75,8 @@ public:
 	virtual void PenColour(ColourDesired fore);
 	virtual int LogPixelsY();
 	virtual int DeviceHeightFont(int points);
-	virtual void MoveTo(int x, int y);
-	virtual void LineTo(int x, int y);
+	virtual void MoveTo(int x_, int y_);
+	virtual void LineTo(int x_, int y_);
 	virtual void Polygon(Point *pts, int npts, ColourDesired fore,
 		ColourDesired back);
 	virtual void RectangleDraw(PRectangle rc, ColourDesired fore,
@@ -85,7 +85,7 @@ public:
 	virtual void FillRectangle(PRectangle rc, Surface &surfacePattern);
 	virtual void RoundedRectangle(PRectangle rc, ColourDesired fore,
 		ColourDesired back);
-	virtual void AlphaRectangle(PRectangle rc, int corner, ColourDesired fill,
+	virtual void AlphaRectangle(PRectangle rc, int cornerSize, ColourDesired fill,
 		int alphaFill, ColourDesired outline, int alphaOutline, int flags);
 	virtual void DrawRGBAImage(PRectangle rc, int width, int height,
 		const unsigned char *pixelsImage);
@@ -113,8 +113,8 @@ public:
 	virtual void SetClip(PRectangle rc);
 	virtual void FlushCachedState();
 
-	virtual void SetUnicodeMode(bool unicodeMode);
-	virtual void SetDBCSMode(int codePage);
+	virtual void SetUnicodeMode(bool unicodeMode_);
+	virtual void SetDBCSMode(int codePage_);
 
 	void BrushColour(ColourDesired back);
 	void SetCodec(Font &font);
diff --git a/qt/ScintillaEditBase/ScintillaQt.cpp b/qt/ScintillaEditBase/ScintillaQt.cpp
index fc1d40c74..c5490a1d6 100644
--- a/qt/ScintillaEditBase/ScintillaQt.cpp
+++ b/qt/ScintillaEditBase/ScintillaQt.cpp
@@ -648,10 +648,10 @@ void ScintillaQt::AddToPopUp(const char *label,
 	        this, SLOT(execCommand(QAction *)));
 }
 
-sptr_t ScintillaQt::WndProc(unsigned int message, uptr_t wParam, sptr_t lParam)
+sptr_t ScintillaQt::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam)
 {
 	try {
-		switch (message) {
+		switch (iMessage) {
 
 		case SCI_SETIMEINTERACTION:
 			// Only inline IME supported on Qt
@@ -674,7 +674,7 @@ sptr_t ScintillaQt::WndProc(unsigned int message, uptr_t wParam, sptr_t lParam)
 #endif
 
 		default:
-			return ScintillaBase::WndProc(message, wParam, lParam);
+			return ScintillaBase::WndProc(iMessage, wParam, lParam);
 		}
 	} catch (std::bad_alloc &) {
 		errorStatus = SC_STATUS_BADALLOC;