From 241d5906e458c6956cc69d62505223c12de6c91a Mon Sep 17 00:00:00 2001 From: Akash Mozumdar Date: Wed, 20 Feb 2019 02:19:30 -0500 Subject: [PATCH] minor fixes --- GUI/CMakeLists.txt | 2 +- GUI/extenwindow.cpp | 1 - extensions/util.h | 2 +- include/common.h | 2 +- text.cpp | 3 +-- 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/GUI/CMakeLists.txt b/GUI/CMakeLists.txt index 32746e2..ea1b843 100644 --- a/GUI/CMakeLists.txt +++ b/GUI/CMakeLists.txt @@ -15,4 +15,4 @@ add_executable(${PROJECT_NAME} WIN32 ) target_link_libraries(${PROJECT_NAME} Qt5::Widgets shell32 winhttp) -#install_qt5_libs(${PROJECT_NAME}) # can be commented out for consecutive builds +install_qt5_libs(${PROJECT_NAME}) # can be commented out for consecutive builds diff --git a/GUI/extenwindow.cpp b/GUI/extenwindow.cpp index ca845da..bac4c1a 100644 --- a/GUI/extenwindow.cpp +++ b/GUI/extenwindow.cpp @@ -12,7 +12,6 @@ namespace { - struct Extension { std::wstring name; diff --git a/extensions/util.h b/extensions/util.h index 3fc3470..280d43a 100644 --- a/extensions/util.h +++ b/extensions/util.h @@ -10,9 +10,9 @@ public: int delay; private: + inline static HANDLE DUMMY; std::atomic requestsLeft; AutoHandle> timerQueue = CreateTimerQueue(); - HANDLE DUMMY; }; inline std::wstring StringToWideString(const std::string& text) diff --git a/include/common.h b/include/common.h index ae7e70b..d530682 100644 --- a/include/common.h +++ b/include/common.h @@ -65,7 +65,7 @@ private: }; #ifdef _DEBUG -#define TEST(...) inline AutoHandle<> TEST__RUNNER__DUMMY = CreateThread(nullptr, 0, [](auto) { __VA_ARGS__; return 0UL; }, NULL, 0, nullptr); +#define TEST(...) inline auto TEST__RUNNER__DUMMY = CreateThread(nullptr, 0, [](auto) { __VA_ARGS__; return 0UL; }, NULL, 0, nullptr); #else #define TEST(...) #endif diff --git a/text.cpp b/text.cpp index 0bc520d..c7cf3c4 100644 --- a/text.cpp +++ b/text.cpp @@ -114,8 +114,7 @@ Replacement commands must be formatted like this: |ORIG|original_text|BECOMES|replacement_text|END| All text in this file outside of a replacement command is ignored. Whitespace in original_text is ignored, but replacement_text can contain spaces, newlines, etc. -This file must be encoded in Unicode (UTF-16 little endian). -)"; +This file must be encoded in Unicode (UTF-16 little endian).)"; const char* THREAD_LINKER = u8"Thread Linker"; const char* LINK = u8"Link"; const char* THREAD_LINK_FROM = u8"Thread number to link from";