Use same parameter names in declarations and definitions.

20 files changed, 56 insertions, 56 deletions

diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx
index 9ad49c9b8..8a00fcdad 100644
--- a/gtk/PlatGTK.cxx
+++ b/gtk/PlatGTK.cxx
@@ -1505,13 +1505,13 @@ void ListBoxX::Create(Window &parent, int, Point, int, bool, int) {
 		GTK_WINDOW(top));
 }
 
-void ListBoxX::SetFont(Font &scint_font) {
+void ListBoxX::SetFont(Font &font) {
 	// Only do for Pango font as there have been crashes for GDK fonts
-	if (Created() && PFont(scint_font)->pfd) {
+	if (Created() && PFont(font)->pfd) {
 		// Current font is Pango font
 #if GTK_CHECK_VERSION(3,0,0)
 		if (cssProvider) {
-			PangoFontDescription *pfd = PFont(scint_font)->pfd;
+			PangoFontDescription *pfd = PFont(font)->pfd;
 			std::ostringstream ssFontSetting;
 			ssFontSetting << "GtkTreeView, treeview { ";
 			ssFontSetting << "font-family: " << pango_font_description_get_family(pfd) <<  "; ";
@@ -1532,7 +1532,7 @@ void ListBoxX::SetFont(Font &scint_font) {
 				ssFontSetting.str().c_str(), -1, NULL);
 		}
 #else
-		gtk_widget_modify_font(PWidget(list), PFont(scint_font)->pfd);
+		gtk_widget_modify_font(PWidget(list), PFont(font)->pfd);
 #endif
 		gtk_cell_renderer_text_set_fixed_height_from_font(GTK_CELL_RENDERER_TEXT(renderer), -1);
 		gtk_cell_renderer_text_set_fixed_height_from_font(GTK_CELL_RENDERER_TEXT(renderer), 1);
@@ -1918,14 +1918,14 @@ static void MenuPositionFunc(GtkMenu *, gint *x, gint *y, gboolean *, gpointer u
 }
 #endif
 
-void Menu::Show(Point pt, Window &wnd) {
+void Menu::Show(Point pt, Window &w) {
 	GtkMenu *widget = static_cast<GtkMenu *>(mid);
 	gtk_widget_show_all(GTK_WIDGET(widget));
 #if GTK_CHECK_VERSION(3,22,0)
 	// Rely on GTK+ to do the right thing with positioning
 	gtk_menu_popup_at_pointer(widget, NULL);
 #else
-	GdkRectangle rcMonitor = MonitorRectangleForWidget(PWidget(wnd.GetID()));
+	GdkRectangle rcMonitor = MonitorRectangleForWidget(PWidget(w.GetID()));
 	GtkRequisition requisition;
 #if GTK_CHECK_VERSION(3,0,0)
 	gtk_widget_get_preferred_size(GTK_WIDGET(widget), NULL, &requisition);
diff --git a/gtk/ScintillaGTK.h b/gtk/ScintillaGTK.h
index 225247c8f..95ad953f0 100644
--- a/gtk/ScintillaGTK.h
+++ b/gtk/ScintillaGTK.h
@@ -135,7 +135,7 @@ private:
 	void GetGtkSelectionText(GtkSelectionData *selectionData, SelectionText &selText);
 	void ReceivedSelection(GtkSelectionData *selection_data);
 	void ReceivedDrop(GtkSelectionData *selection_data);
-	static void GetSelection(GtkSelectionData *selection_data, guint info, SelectionText *selected);
+	static void GetSelection(GtkSelectionData *selection_data, guint info, SelectionText *text);
 	void StoreOnClipboard(SelectionText *clipText);
 	static void ClipboardGetSelection(GtkClipboard* clip, GtkSelectionData *selection_data, guint info, void *data);
 	static void ClipboardClearSelection(GtkClipboard* clip, void *data);
@@ -197,7 +197,7 @@ private:
 	static AtkObject* GetAccessible(GtkWidget *widget);
 
 	bool KoreanIME();
-	void CommitThis(char *str);
+	void CommitThis(char *commitStr);
 	static void Commit(GtkIMContext *context, char *str, ScintillaGTK *sciThis);
 	void PreeditChangedInlineThis();
 	void PreeditChangedWindowedThis();
@@ -238,7 +238,7 @@ private:
 #if GTK_CHECK_VERSION(3,0,0)
 	static gboolean DrawCT(GtkWidget *widget, cairo_t *cr, CallTip *ctip);
 #else
-	static gboolean ExposeCT(GtkWidget *widget, GdkEventExpose *ose, CallTip *ct);
+	static gboolean ExposeCT(GtkWidget *widget, GdkEventExpose *ose, CallTip *ctip);
 #endif
 	static gboolean PressCT(GtkWidget *widget, GdkEventButton *event, ScintillaGTK *sciThis);
 
diff --git a/gtk/ScintillaGTKAccessible.h b/gtk/ScintillaGTKAccessible.h
index 947b6198a..bb47ddf3e 100644
--- a/gtk/ScintillaGTKAccessible.h
+++ b/gtk/ScintillaGTKAccessible.h
@@ -109,7 +109,7 @@ private:
 	gboolean SetCaretOffset(int charOffset);
 	gint GetOffsetAtPoint(gint x, gint y, AtkCoordType coords);
 	void GetCharacterExtents(int charOffset, gint *x, gint *y, gint *width, gint *height, AtkCoordType coords);
-	AtkAttributeSet *GetAttributesForStyle(unsigned int style);
+	AtkAttributeSet *GetAttributesForStyle(unsigned int styleNum);
 	AtkAttributeSet *GetRunAttributes(int charOffset, int *startChar, int *endChar);
 	AtkAttributeSet *GetDefaultAttributes();
 	gint GetNSelections();
@@ -120,14 +120,14 @@ private:
 	// for AtkEditableText
 	bool InsertStringUTF8(Sci::Position bytePos, const gchar *utf8, Sci::Position lengthBytes);
 	void SetTextContents(const gchar *contents);
-	void InsertText(const gchar *contents, int lengthBytes, int *charPosition);
+	void InsertText(const gchar *text, int lengthBytes, int *charPosition);
 	void CopyText(int startChar, int endChar);
 	void CutText(int startChar, int endChar);
 	void DeleteText(int startChar, int endChar);
 	void PasteText(int charPosition);
 
 public:
-	ScintillaGTKAccessible(GtkAccessible *accessible, GtkWidget *widget);
+	ScintillaGTKAccessible(GtkAccessible *accessible_, GtkWidget *widget_);
 	~ScintillaGTKAccessible();
 
 	static ScintillaGTKAccessible *FromAccessible(GtkAccessible *accessible);
diff --git a/lexlib/LexerModule.h b/lexlib/LexerModule.h
index a561cf151..ca1d86ce5 100644
--- a/lexlib/LexerModule.h
+++ b/lexlib/LexerModule.h
@@ -53,9 +53,9 @@ public:
 
 	ILexer *Create() const;
 
-	virtual void Lex(Sci_PositionU startPos, Sci_Position length, int initStyle,
+	virtual void Lex(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle,
                   WordList *keywordlists[], Accessor &styler) const;
-	virtual void Fold(Sci_PositionU startPos, Sci_Position length, int initStyle,
+	virtual void Fold(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle,
                   WordList *keywordlists[], Accessor &styler) const;
 
 	friend class Catalogue;
diff --git a/lexlib/LexerNoExceptions.cxx b/lexlib/LexerNoExceptions.cxx
index 2adc3a733..96a3a72a4 100644
--- a/lexlib/LexerNoExceptions.cxx
+++ b/lexlib/LexerNoExceptions.cxx
@@ -42,20 +42,20 @@ Sci_Position SCI_METHOD LexerNoExceptions::WordListSet(int n, const char *wl) {
 	return -1;
 }
 
-void SCI_METHOD LexerNoExceptions::Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) {
+void SCI_METHOD LexerNoExceptions::Lex(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, IDocument *pAccess) {
 	try {
 		Accessor astyler(pAccess, &props);
-		Lexer(startPos, length, initStyle, pAccess, astyler);
+		Lexer(startPos, lengthDoc, initStyle, pAccess, astyler);
 		astyler.Flush();
 	} catch (...) {
 		// Should not throw into caller as may be compiled with different compiler or options
 		pAccess->SetErrorStatus(SC_STATUS_FAILURE);
 	}
 }
-void SCI_METHOD LexerNoExceptions::Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) {
+void SCI_METHOD LexerNoExceptions::Fold(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, IDocument *pAccess) {
 	try {
 		Accessor astyler(pAccess, &props);
-		Folder(startPos, length, initStyle, pAccess, astyler);
+		Folder(startPos, lengthDoc, initStyle, pAccess, astyler);
 		astyler.Flush();
 	} catch (...) {
 		// Should not throw into caller as may be compiled with different compiler or options
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;
diff --git a/src/CallTip.h b/src/CallTip.h
index 787941ded..28d815bbd 100644
--- a/src/CallTip.h
+++ b/src/CallTip.h
@@ -34,7 +34,7 @@ class CallTip {
 		int posStart, int posEnd, int ytext, PRectangle rcClient,
 		bool highlight, bool draw);
 	int PaintContents(Surface *surfaceWindow, bool draw);
-	bool IsTabCharacter(char c) const;
+	bool IsTabCharacter(char ch) const;
 	int NextTabPos(int x) const;
 
 public:
diff --git a/src/CellBuffer.h b/src/CellBuffer.h
index 60842ba95..f0b77e162 100644
--- a/src/CellBuffer.h
+++ b/src/CellBuffer.h
@@ -90,7 +90,7 @@ public:
 	UndoHistory();
 	~UndoHistory();
 
-	const char *AppendAction(actionType at, Sci::Position position, const char *data, Sci::Position length, bool &startSequence, bool mayCoalesce=true);
+	const char *AppendAction(actionType at, Sci::Position position, const char *data, Sci::Position lengthData, bool &startSequence, bool mayCoalesce=true);
 
 	void BeginUndoAction();
 	void EndUndoAction();
@@ -173,7 +173,7 @@ public:
 	/// Setting styles for positions outside the range of the buffer is safe and has no effect.
 	/// @return true if the style of a character is changed.
 	bool SetStyleAt(Sci::Position position, char styleValue);
-	bool SetStyleFor(Sci::Position position, Sci::Position length, char styleValue);
+	bool SetStyleFor(Sci::Position position, Sci::Position lengthStyle, char styleValue);
 
 	const char *DeleteChars(Sci::Position position, Sci::Position deleteLength, bool &startSequence);
 
diff --git a/src/CharClassify.h b/src/CharClassify.h
index 63e8e8be2..26ab546b2 100644
--- a/src/CharClassify.h
+++ b/src/CharClassify.h
@@ -19,7 +19,7 @@ public:
 	enum cc { ccSpace, ccNewLine, ccWord, ccPunctuation };
 	void SetDefaultCharClasses(bool includeWordClass);
 	void SetCharClasses(const unsigned char *chars, cc newCharClass);
-	int GetCharsOfClass(cc charClass, unsigned char *buffer) const;
+	int GetCharsOfClass(cc characterClass, unsigned char *buffer) const;
 	cc GetClass(unsigned char ch) const { return static_cast<cc>(charClass[ch]);}
 	bool IsWord(unsigned char ch) const { return static_cast<cc>(charClass[ch]) == ccWord;}
 
diff --git a/src/Document.h b/src/Document.h
index f6ab8b0d3..b8a88c0df 100644
--- a/src/Document.h
+++ b/src/Document.h
@@ -334,7 +334,7 @@ public:
 	int SCI_METHOD GetLineIndentation(Sci_Position line);
 	Sci::Position SetLineIndentation(Sci::Line line, Sci::Position indent);
 	Sci::Position GetLineIndentPosition(Sci::Line line) const;
-	Sci::Position GetColumn(Sci::Position position);
+	Sci::Position GetColumn(Sci::Position pos);
 	Sci::Position CountCharacters(Sci::Position startPos, Sci::Position endPos) const;
 	Sci::Position CountUTF16(Sci::Position startPos, Sci::Position endPos) const;
 	Sci::Position FindColumn(Sci::Line line, Sci::Position column);
@@ -377,7 +377,7 @@ public:
 	void ClearLevels();
 	Sci::Line GetLastChild(Sci::Line lineParent, int level=-1, Sci::Line lastLine=-1);
 	Sci::Line GetFoldParent(Sci::Line line) const;
-	void GetHighlightDelimiters(HighlightDelimiter &hDelimiter, Sci::Line line, Sci::Line lastLine);
+	void GetHighlightDelimiters(HighlightDelimiter &highlightDelimiter, Sci::Line line, Sci::Line lastLine);
 
 	Sci::Position ExtendWordSelect(Sci::Position pos, int delta, bool onlyWordCharacters=false) const;
 	Sci::Position NextWordStart(Sci::Position pos, int delta) const;
diff --git a/src/EditView.h b/src/EditView.h
index b80885330..9eb3146dd 100644
--- a/src/EditView.h
+++ b/src/EditView.h
@@ -128,7 +128,7 @@ public:
 		Sci::Line line, int xStart, PRectangle rcLine, int subLine, XYACCUMULATOR subLineStart, DrawPhase phase);
 	void DrawAnnotation(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll,
 		Sci::Line line, int xStart, PRectangle rcLine, int subLine, DrawPhase phase);
-	void DrawCarets(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll, Sci::Line line,
+	void DrawCarets(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll, Sci::Line lineDoc,
 		int xStart, PRectangle rcLine, int subLine) const;
 	void DrawBackground(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll, PRectangle rcLine,
 		Range lineRange, Sci::Position posLineStart, int xStart,
diff --git a/src/Editor.cxx b/src/Editor.cxx
index 6a6e7c7d7..4335e6386 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -1627,18 +1627,18 @@ void Editor::LinesSplit(int pixelWidth) {
 	}
 }
 
-void Editor::PaintSelMargin(Surface *surfWindow, PRectangle &rc) {
+void Editor::PaintSelMargin(Surface *surfaceWindow, PRectangle &rc) {
 	if (vs.fixedColumnWidth == 0)
 		return;
 
 	AllocateGraphics();
 	RefreshStyleData();
-	RefreshPixMaps(surfWindow);
+	RefreshPixMaps(surfaceWindow);
 
 	// On GTK+ with Ubuntu overlay scroll bars, the surface may have been finished
 	// at this point. The Initialised call checks for this case and sets the status
 	// to be bad which avoids crashes in following calls.
-	if (!surfWindow->Initialised()) {
+	if (!surfaceWindow->Initialised()) {
 		return;
 	}
 
@@ -1655,7 +1655,7 @@ void Editor::PaintSelMargin(Surface *surfWindow, PRectangle &rc) {
 	if (view.bufferedDraw) {
 		surface = marginView.pixmapSelMargin;
 	} else {
-		surface = surfWindow;
+		surface = surfaceWindow;
 	}
 
 	// Clip vertically to paint area to avoid drawing line numbers
@@ -1667,7 +1667,7 @@ void Editor::PaintSelMargin(Surface *surfWindow, PRectangle &rc) {
 	marginView.PaintMargin(surface, topLine, rc, rcMargin, *this, vs);
 
 	if (view.bufferedDraw) {
-		surfWindow->Copy(rcMargin, Point(rcMargin.left, rcMargin.top), *marginView.pixmapSelMargin);
+		surfaceWindow->Copy(rcMargin, Point(rcMargin.left, rcMargin.top), *marginView.pixmapSelMargin);
 	}
 }
 
diff --git a/src/Editor.h b/src/Editor.h
index 6e4e6474c..976d538ab 100644
--- a/src/Editor.h
+++ b/src/Editor.h
@@ -292,7 +292,7 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 	SelectionPosition SPositionFromLocation(Point pt, bool canReturnInvalid=false, bool charPosition=false, bool virtualSpace=true);
 	Sci::Position PositionFromLocation(Point pt, bool canReturnInvalid = false, bool charPosition = false);
 	SelectionPosition SPositionFromLineX(Sci::Line lineDoc, int x);
-	Sci::Position PositionFromLineX(Sci::Line line, int x);
+	Sci::Position PositionFromLineX(Sci::Line lineDoc, int x);
 	Sci::Line LineFromLocation(Point pt) const;
 	void SetTopLine(Sci::Line topLineNew);
 
@@ -377,7 +377,7 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 	void LinesJoin();
 	void LinesSplit(int pixelWidth);
 
-	void PaintSelMargin(Surface *surface, PRectangle &rc);
+	void PaintSelMargin(Surface *surfaceWindow, PRectangle &rc);
 	void RefreshPixMaps(Surface *surfaceWindow);
 	void Paint(Surface *surfaceWindow, PRectangle rcArea);
 	long FormatRange(bool draw, Sci_RangeToFormat *pfr);
@@ -449,7 +449,7 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 	void CheckModificationForWrap(DocModification mh);
 	void NotifyModified(Document *document, DocModification mh, void *userData) override;
 	void NotifyDeleted(Document *document, void *userData) override;
-	void NotifyStyleNeeded(Document *doc, void *userData, Sci::Position endPos) override;
+	void NotifyStyleNeeded(Document *doc, void *userData, Sci::Position endStyleNeeded) override;
 	void NotifyLexerChanged(Document *doc, void *userData) override;
 	void NotifyErrorOccurred(Document *doc, void *userData, int status) override;
 	void NotifyMacroRecord(unsigned int iMessage, uptr_t wParam, sptr_t lParam);
diff --git a/src/LineMarker.h b/src/LineMarker.h
index 6a5fe7492..fde11da0d 100644
--- a/src/LineMarker.h
+++ b/src/LineMarker.h
@@ -76,7 +76,7 @@ public:
 	void SetXPM(const char *textForm);
 	void SetXPM(const char *const *linesForm);
 	void SetRGBAImage(Point sizeRGBAImage, float scale, const unsigned char *pixelsRGBAImage);
-	void Draw(Surface *surface, PRectangle &rc, Font &fontForCharacter, typeOfFold tFold, int marginStyle) const;
+	void Draw(Surface *surface, PRectangle &rcWhole, Font &fontForCharacter, typeOfFold tFold, int marginStyle) const;
 };
 
 #ifdef SCI_NAMESPACE
diff --git a/src/PerLine.h b/src/PerLine.h
index 86e6a10e0..9f945114a 100644
--- a/src/PerLine.h
+++ b/src/PerLine.h
@@ -54,7 +54,7 @@ public:
 
 	int MarkValue(Sci::Line line);
 	Sci::Line MarkerNext(Sci::Line lineStart, int mask) const;
-	int AddMark(Sci::Line line, int marker, Sci::Line lines);
+	int AddMark(Sci::Line line, int markerNum, Sci::Line lines);
 	void MergeMarkers(Sci::Line line);
 	bool DeleteMark(Sci::Line line, int markerNum, bool all);
 	void DeleteMarkFromHandle(int markerHandle);
diff --git a/src/PositionCache.h b/src/PositionCache.h
index b80edd880..56018c141 100644
--- a/src/PositionCache.h
+++ b/src/PositionCache.h
@@ -83,7 +83,7 @@ public:
 	void Invalidate(validLevel validity_);
 	int LineStart(int line) const;
 	int LineLastVisible(int line) const;
-	Range SubLineRange(int line) const;
+	Range SubLineRange(int subLine) const;
 	bool InLine(int offset, int line) const;
 	void SetLineStart(int line, int start);
 	void SetBracesHighlight(Range rangeLine, const Sci::Position braces[],
@@ -134,7 +134,7 @@ public:
 	void Set(unsigned int styleNumber_, const char *s_, unsigned int len_, XYPOSITION *positions_, unsigned int clock_);
 	void Clear();
 	bool Retrieve(unsigned int styleNumber_, const char *s_, unsigned int len_, XYPOSITION *positions_) const;
-	static unsigned int Hash(unsigned int styleNumber_, const char *s, unsigned int len);
+	static unsigned int Hash(unsigned int styleNumber_, const char *s, unsigned int len_);
 	bool NewerThan(const PositionCacheEntry &other) const;
 	void ResetClock();
 };
@@ -194,7 +194,7 @@ public:
 	enum { lengthStartSubdivision = 300 };
 	// Try to make each subdivided run lengthEachSubdivision or shorter.
 	enum { lengthEachSubdivision = 100 };
-	BreakFinder(const LineLayout *ll_, const Selection *psel, Range rangeLine_, Sci::Position posLineStart_,
+	BreakFinder(const LineLayout *ll_, const Selection *psel, Range lineRange_, Sci::Position posLineStart_,
 		int xStart, bool breakForSelection, const Document *pdoc_, const SpecialRepresentations *preprs_, const ViewStyle *pvsDraw);
 	~BreakFinder();
 	TextSegment Next();
diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx
index c93a058c7..1b0f65518 100644
--- a/win32/PlatWin.cxx
+++ b/win32/PlatWin.cxx
@@ -1811,11 +1811,11 @@ static RECT RectFromMonitor(HMONITOR hMonitor) {
 	return rc;
 }
 
-void Window::SetPositionRelative(PRectangle rc, Window w) {
+void Window::SetPositionRelative(PRectangle rc, Window relativeTo) {
 	const LONG style = ::GetWindowLong(static_cast<HWND>(wid), GWL_STYLE);
 	if (style & WS_POPUP) {
 		POINT ptOther = {0, 0};
-		::ClientToScreen(static_cast<HWND>(w.GetID()), &ptOther);
+		::ClientToScreen(static_cast<HWND>(relativeTo.GetID()), &ptOther);
 		rc.Move(static_cast<XYPOSITION>(ptOther.x), static_cast<XYPOSITION>(ptOther.y));
 
 		RECT rcMonitor = RectFromPRectangle(rc);
@@ -2657,9 +2657,9 @@ void ListBoxX::Paint(HDC hDC) {
 	::DeleteObject(hBitmap);
 }
 
-LRESULT PASCAL ListBoxX::ControlWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) {
+LRESULT PASCAL ListBoxX::ControlWndProc(HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lParam) {
 	try {
-		switch (uMsg) {
+		switch (iMessage) {
 		case WM_ERASEBKGND:
 			return TRUE;
 
@@ -2706,13 +2706,13 @@ LRESULT PASCAL ListBoxX::ControlWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPA
 
 		WNDPROC prevWndProc = reinterpret_cast<WNDPROC>(GetWindowLongPtr(hWnd, GWLP_USERDATA));
 		if (prevWndProc) {
-			return ::CallWindowProc(prevWndProc, hWnd, uMsg, wParam, lParam);
+			return ::CallWindowProc(prevWndProc, hWnd, iMessage, wParam, lParam);
 		} else {
-			return ::DefWindowProc(hWnd, uMsg, wParam, lParam);
+			return ::DefWindowProc(hWnd, iMessage, wParam, lParam);
 		}
 	} catch (...) {
 	}
-	return ::DefWindowProc(hWnd, uMsg, wParam, lParam);
+	return ::DefWindowProc(hWnd, iMessage, wParam, lParam);
 }
 
 LRESULT ListBoxX::WndProc(HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lParam) {
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index f5e1f07d6..5d159ca31 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -356,8 +356,8 @@ class ScintillaWin :
 	void ScrollMessage(WPARAM wParam);
 	void HorizontalScrollMessage(WPARAM wParam);
 	void FullPaint();
-	void FullPaintDC(HDC dc);
-	bool IsCompatibleDC(HDC dc);
+	void FullPaintDC(HDC hdc);
+	bool IsCompatibleDC(HDC hOtherDC);
 	DWORD EffectFromState(DWORD grfKeyState) const;
 
 	int SetScrollInfo(int nBar, LPCSCROLLINFO lpsi, BOOL bRedraw);