From c60d0059738eb49622dfe94e69d371856748ec18 Mon Sep 17 00:00:00 2001
From: mitchell <unknown>
Date: Sat, 5 May 2018 21:09:21 -0400
Subject: Backport: Make some changes recommended by clang-tidy.

Backport of changeset 6687:4cbf987c7590.
---
 lexlib/LexerSimple.h     | 6 +++---
 lexlib/PropSetSimple.cxx | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'lexlib')

diff --git a/lexlib/LexerSimple.h b/lexlib/LexerSimple.h
index 0edeabe8f..87882eaeb 100644
--- a/lexlib/LexerSimple.h
+++ b/lexlib/LexerSimple.h
@@ -16,9 +16,9 @@ class LexerSimple : public LexerBase {
 	std::string wordLists;
 public:
 	explicit LexerSimple(const LexerModule *module_);
-	const char * SCI_METHOD DescribeWordListSets();
-	void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, IDocument *pAccess);
-	void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, IDocument *pAccess);
+	const char * SCI_METHOD DescribeWordListSets() override;
+	void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, IDocument *pAccess) override;
+	void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, IDocument *pAccess) override;
 };
 
 }
diff --git a/lexlib/PropSetSimple.cxx b/lexlib/PropSetSimple.cxx
index e8f0364fa..ed473bc3b 100644
--- a/lexlib/PropSetSimple.cxx
+++ b/lexlib/PropSetSimple.cxx
@@ -100,7 +100,7 @@ struct VarChain {
 static int ExpandAllInPlace(const PropSetSimple &props, std::string &withVars, int maxExpands, const VarChain &blankVars) {
 	size_t varStart = withVars.find("$(");
 	while ((varStart != std::string::npos) && (maxExpands > 0)) {
-		const size_t varEnd = withVars.find(")", varStart+2);
+		const size_t varEnd = withVars.find(')', varStart+2);
 		if (varEnd == std::string::npos) {
 			break;
 		}
-- 
cgit v1.2.3