Refactoring for usage of STL classes

Author: YaSuenag

SimpleCom/SerialSetup.cpp

@@ -131,7 +131,7 @@ void SimpleCom::SerialSetup::initialize() {
 	delete[] DeviceName;
 }
 
-static void AddStringToComboBox(HWND hCombo, SimpleCom::TString str) {
+static void AddStringToComboBox(HWND hCombo, TString str) {
 	LRESULT result = SendMessage(hCombo, CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(str.c_str()));
 	if (result == CB_ERR) {
 		throw SimpleCom::WinAPIException(_T("CB_ERR"), _T("AddStringToComboBox"));
@@ -145,7 +145,7 @@ static void InitializeDialog(HWND hDlg, SimpleCom::SerialSetup *setup) {
 	// Initialize serial configuration.
 	// Initial value is for serial console of Raspberry Pi.
 
-	SimpleCom::TString text_str;
+	TString text_str;
 
 	HWND hComboSerialDevice = GetDlgItem(hDlg, IDC_SERIAL_DEVICE);
 	if (hComboSerialDevice == NULL) {
@@ -386,11 +386,7 @@ void SimpleCom::SerialSetup::ParseArguments(int argc, LPCTSTR argv[]) {
 			}
 		}
 		else {
-#ifdef _UNICODE
-			std::wregex re(_T("^COM\\d+$"));
-#else
-			std::regex re("^COM\\d+$");
-#endif
+			TRegex re(_T("^COM\\d+$"));
 			if (std::regex_match(argv[i], re)) {
 				SetPort(argv[i]);
 			}

SimpleCom/SerialSetup.h

@@ -42,12 +42,6 @@ namespace SimpleCom {
 		constexpr explicit StopBits(const int value, LPCTSTR str) noexcept : EnumValue(value, str) {};
 	};
 
-#ifdef  UNICODE
-	typedef std::wstring TString;
-#else   /* UNICODE */
-	typedef std::string TString;
-#endif /* UNICODE */
-
 	typedef std::map<TString, TString> TDeviceMap;
 
 	/*

SimpleCom/SimpleCom.cpp

@@ -191,8 +191,8 @@ static HWND GetParentWindow() {
 
 }
 
-static void InitSerialPort(SimpleCom::TString &device, DCB *dcb) {
-	SimpleCom::TString title = _T("SimpleCom: ") + device;
+static void InitSerialPort(TString &device, DCB *dcb) {
+	TString title = _T("SimpleCom: ") + device;
 	CALL_WINAPI_WITH_DEBUGLOG(SetConsoleTitle(title.c_str()), TRUE, __FILE__, __LINE__)
 
 	CALL_WINAPI_WITH_DEBUGLOG(SetCommState(hSerial, dcb), TRUE, __FILE__, __LINE__)
@@ -260,7 +260,7 @@ class HandleHandler {
 int _tmain(int argc, LPCTSTR argv[])
 {
 	DCB dcb;
-	SimpleCom::TString device;
+	TString device;
 	HWND parent_hwnd = GetParentWindow();
 
 	// Serial port configuration

SimpleCom/WinAPIException.cpp

@@ -34,11 +34,7 @@ SimpleCom::WinAPIException::WinAPIException(DWORD error_code, LPCTSTR error_capt
 		_sntprintf_s(fallback_error_text, sizeof(fallback_error_text) / sizeof(TCHAR), _T("Error occured (%#x)"), _error_code);
 		_error_text = fallback_error_text;
 
-#ifdef _UNICODE
-		std::wstringstream msg;
-#else
-		std::stringstream msg;
-#endif
+		TStringStream msg;
 		msg << _T("Error occurred in FormatMessage (") << std::showbase << std::hex << errcode << _T(")");
 		debug::log(msg.str().c_str());
 	}

SimpleCom/debug.h

@@ -20,16 +20,10 @@
 
 #include "stdafx.h"
 
-#ifdef _UNICODE
-#define SS_CLASS std::wstringstream
-#else
-#define SS_CLASS std::stringstream
-#endif
-
 #define CALL_WINAPI_WITH_DEBUGLOG(func_call, expected, file, line)              \
   if (func_call != expected) {                                                  \
     SimpleCom::WinAPIException e(GetLastError(), nullptr);                      \
-    SS_CLASS ss;                                                                \
+    TStringStream ss;                                                           \
     ss << file << _T(":") << line << _T(": ") << e.GetErrorText() << std::endl; \
     SimpleCom::debug::log(ss.str().c_str());                                    \
   }

SimpleCom/stdafx.h

@@ -16,4 +16,14 @@
 #include <map>
 #include <regex>
 #include <sstream>
-#include <string>
+#include <string>
+
+#ifdef _UNICODE
+typedef std::wstring TString;
+typedef std::wstringstream TStringStream;
+typedef std::wregex TRegex;
+#else
+typedef std::string TString;
+typedef std::stringstream TStringStream;
+typedef std::regex TRegex;
+#endif