From 146afdc926617ad00385bc031ffc54394734cafc Mon Sep 17 00:00:00 2001
From: Akash Mozumdar <akashmozumdar@gmail.com>
Date: Sun, 17 Feb 2019 19:14:49 -0500
Subject: [PATCH] using new api

---
 extensions/bingtranslate.cpp   |  2 +-
 extensions/extension.h         |  2 +-
 extensions/extranewlines.cpp   |  2 +-
 extensions/googletranslate.cpp |  2 +-
 extensions/regexfilter.cpp     |  2 +-
 extensions/removerepeat.cpp    |  2 +-
 extensions/replacer.cpp        | 16 ++++++++--------
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/extensions/bingtranslate.cpp b/extensions/bingtranslate.cpp
index 4fc65aa..f7cfa39 100644
--- a/extensions/bingtranslate.cpp
+++ b/extensions/bingtranslate.cpp
@@ -116,7 +116,7 @@ std::wstring Translate(const std::wstring& text, std::wstring translateFrom, std
 
 bool ProcessSentence(std::wstring& sentence, SentenceInfo sentenceInfo)
 {
-	if (sentenceInfo["hook address"] == -1) return false;
+	if (sentenceInfo["text number"] == 0) return false;
 
 	static RateLimiter rateLimiter(30, 60 * 1000);
 
diff --git a/extensions/extension.h b/extensions/extension.h
index 77d4c58..b7f5a8f 100644
--- a/extensions/extension.h
+++ b/extensions/extension.h
@@ -18,7 +18,7 @@ struct SentenceInfo
 		throw;
 	}
 
-	inline static InfoForExtension DUMMY[2] = { { "hook address", 0 } };
+	inline static InfoForExtension DUMMY[2] = { { "text number", 1 } };
 };
 
 struct SKIP {};
diff --git a/extensions/extranewlines.cpp b/extensions/extranewlines.cpp
index 6b796ec..35236cf 100644
--- a/extensions/extranewlines.cpp
+++ b/extensions/extranewlines.cpp
@@ -2,7 +2,7 @@
 
 bool ProcessSentence(std::wstring& sentence, SentenceInfo sentenceInfo)
 {
-	if (sentenceInfo["hook address"] == -1) return false;
+	if (sentenceInfo["text number"] == 0) return false;
 	sentence += L"\n";
 	return true;
 }
diff --git a/extensions/googletranslate.cpp b/extensions/googletranslate.cpp
index 1be18c5..5fda786 100644
--- a/extensions/googletranslate.cpp
+++ b/extensions/googletranslate.cpp
@@ -129,7 +129,7 @@ std::wstring GetTranslationUri(const std::wstring& text, unsigned TKK)
 
 bool ProcessSentence(std::wstring& sentence, SentenceInfo sentenceInfo)
 {
-	if (sentenceInfo["hook address"] == -1) return false;
+	if (sentenceInfo["text number"] == 0) return false;
 
 	static std::atomic<HINTERNET> internet = NULL;
 	if (!internet) internet = WinHttpOpen(L"Mozilla/5.0 Textractor", WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, NULL, NULL, 0);
diff --git a/extensions/regexfilter.cpp b/extensions/regexfilter.cpp
index 57eda59..59683d9 100644
--- a/extensions/regexfilter.cpp
+++ b/extensions/regexfilter.cpp
@@ -64,7 +64,7 @@ BOOL WINAPI DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved
 bool ProcessSentence(std::wstring& sentence, SentenceInfo sentenceInfo)
 {
 	std::shared_lock l(m);
-	if (window == nullptr || sentenceInfo["hook address"] == -1) return false;
+	if (window == nullptr || sentenceInfo["text number"] == 0) return false;
 	sentence = std::regex_replace(sentence, regex, L"");
 	return true;
 }
diff --git a/extensions/removerepeat.cpp b/extensions/removerepeat.cpp
index 691bcc9..ff73b87 100644
--- a/extensions/removerepeat.cpp
+++ b/extensions/removerepeat.cpp
@@ -45,7 +45,7 @@ remove:
 
 bool ProcessSentence(std::wstring& sentence, SentenceInfo sentenceInfo)
 {
-	if (sentenceInfo["hook address"] == -1) return false;
+	if (sentenceInfo["text number"] == 0) return false;
 	RemoveRepeatedChars(sentence);
 	RemoveCyclicRepeats(sentence);
 	return true;
diff --git a/extensions/replacer.cpp b/extensions/replacer.cpp
index 5bc831a..6dab462 100644
--- a/extensions/replacer.cpp
+++ b/extensions/replacer.cpp
@@ -15,9 +15,9 @@ public:
 	void Put(std::wstring original, std::wstring replacement)
 	{
 		Node* current = &root;
-		for (auto c : original)
-			if (Ignore(c));
-			else if (auto& next = current->next[c]) current = next.get();
+		for (auto ch : original)
+			if (Ignore(ch));
+			else if (auto& next = current->next[ch]) current = next.get();
 			else current = (next = std::make_unique<Node>()).get();
 		if (current != &root) current->value = replacement;
 	}
@@ -26,17 +26,17 @@ public:
 	{
 		int length = 0;
 		Node* current = &root;
-		for (auto c : text)
-			if (Ignore(c)) ++length;
-			else if (auto& next = current->next[c]) ++length, current = next.get();
+		for (auto ch : text)
+			if (Ignore(ch)) ++length;
+			else if (auto& next = current->next[ch]) ++length, current = next.get();
 			else break;
 		return { length, current->value };
 	}
 
 private:
-	static bool Ignore(wchar_t c)
+	static bool Ignore(wchar_t ch)
 	{
-		return c <= 0x20 || std::iswspace(c);
+		return ch <= 0x20 || std::iswspace(ch);
 	}
 
 	struct Node