organize includes

GUI/host/textthread.cc

@@ -5,7 +5,6 @@
 #include "textthread.h"
 #include "host.h"
 #include "const.h"
-#include <regex>
 
 TextThread::TextThread(ThreadParam tp, HookParam hp, std::wstring name) : handle(threadCounter++), name(name), tp(tp), hp(hp) {}
 

GUI/host/textthread.h

@@ -6,7 +6,6 @@
 
 #include "common.h"
 #include "types.h"
-#include <unordered_set>
 
 class TextThread
 {

extensions/bingtranslate/bingtranslate.cpp

@@ -1,9 +1,5 @@
 #include "../extension.h"
 #include <winhttp.h>
-#include <vector>
-#include <mutex>
-#include <algorithm>
-#include <regex>
 #include <QInputDialog>
 #include <QTimer>
 

extensions/extension.h

@@ -1,9 +1,6 @@
 #pragma once
 
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <cstdint>
-#include <string>
+#include "common.h"
 
 struct InfoForExtension
 {

extensions/googletranslate/googletranslate.cpp

@@ -1,10 +1,6 @@
 #include "../extension.h"
 #include <winhttp.h>
 #include <ctime>
-#include <vector>
-#include <mutex>
-#include <algorithm>
-#include <regex>
 #include <QInputDialog>
 #include <QTimer>
 

extensions/regexfilter/window.h

@@ -1,10 +1,9 @@
 #ifndef WINDOW_H
 #define WINDOW_H
 
+#include "common.h"
 #include <QMainWindow>
 #include <QString>
-#include <regex>
-#include <mutex>
 
 namespace Ui
 {

extensions/removerepeat/removerepeat.cpp

@@ -1,6 +1,4 @@
 #include "../extension.h"
-#include <set>
-#include <mutex>
 
 bool RemoveRepeatedChars(std::wstring& sentence)
 {
@@ -44,11 +42,11 @@ bool RemoveCyclicRepeats(std::wstring& sentence)
 
 bool RemoveRepeatedSentences(std::wstring& sentence, int64_t handle)
 {
-	static std::set<std::pair<int64_t, std::wstring>> seenSentences;
+	static std::unordered_map<int64_t, std::unordered_set<std::wstring>> seenSentences;
 	static std::mutex m;
 	std::lock_guard<std::mutex> l(m);
-	if (seenSentences.count({ handle, sentence }) != 0) Skip();
-	seenSentences.insert({ handle, sentence });
+	if (seenSentences[handle].count(sentence)) Skip();
+	seenSentences[handle].insert(sentence);
 	return false;
 }
 

extensions/threadlinker/window.h

@@ -1,9 +1,7 @@
 #ifndef WINDOW_H
 #define WINDOW_H
 
-#include <unordered_map>
-#include <unordered_set>
-#include <mutex>
+#include "common.h"
 #include <QMainWindow>
 #include <QListWidget>
 

include/common.h

@@ -5,8 +5,10 @@
 #include <string>
 #include <vector>
 #include <unordered_map>
+#include <unordered_set>
 #include <functional>
 #include <algorithm>
+#include <regex>
 #include <memory>
 #include <optional>
 #include <thread>