Issue #276 - eliminate CString from GetDataPath

src/plugin/PluginDebug.cpp

 #include "PluginStdAfx.h"
 
 #include "PluginDebug.h"
 #include "PluginMutex.h"
 #include "PluginSettings.h"
 
 
 class CPluginDebugLock : public CPluginMutex
 {
 
@@ skipping 25 matching lines @@
   CONSOLE("%s", CT2A(text.GetString(), CP_UTF8));
 #endif
 
   if (CPluginSettings::HasInstance())
   {
 #ifdef ENABLE_DEBUG_SPLIT_FILE
     CPluginSettings* settings = CPluginSettings::GetInstance();
 
     bool isWorkingThread = settings->IsWorkingThread(dwThreadId);
 
-    CString processor;
+    std::wstring processor;
     wchar_t tmp[10];
     _itow_s(::GetCurrentProcessId(), tmp, 10);
     if (isWorkingThread)
-      processor = L"tab" + CString(tmp) + L"_thread";
+      processor = L"tab" + std::wstring(tmp) + L"_thread";
     else
-      processor = L"tab" + CString(tmp) + L"_ui";
+      processor = L"tab" + std::wstring(tmp) + L"_ui";
 #else
     if (dwProcessId == 0)
     {
       dwProcessId = ::GetCurrentProcessId();
     }
     if (dwThreadId == 0)
     {
       dwThreadId = ::GetCurrentThreadId();
     }
 
     CStringA processInfo;
     processInfo.Format("%4.4u.%4.4u - ", dwProcessId, dwThreadId);
 #endif
     SYSTEMTIME st;
     ::GetSystemTime(&st);
 
     CStringA sysTime;
     sysTime.Format("%2.2d:%2.2d:%2.2d.%3.3d - ", st.wHour, st.wMinute, st.wSecond, st.wMilliseconds);
 
     CPluginDebugLock lock;
     if (lock.IsLocked())
     {
       std::ofstream debugFile;
 
 #ifdef ENABLE_DEBUG_SPLIT_FILE
-      debugFile.open(CPluginSettings::GetDataPath(L"debug_" + processor + L".txt"), std::ios::app);
+      debugFile.open(GetDataPath(L"debug_" + processor + L".txt"), std::ios::app);
 #else
-      debugFile.open(CPluginSettings::GetDataPath(L"debug.txt"), std::ios::app);
+      debugFile.open(GetDataPath(L"debug.txt"), std::ios::app);
 #endif
       int pos = 0;
       CStringA line = text.Tokenize(L"\n\r", pos);
 
       while (pos >= 0)
       {
         debugFile.write(sysTime.GetBuffer(), sysTime.GetLength());
 #ifndef ENABLE_DEBUG_SPLIT_FILE
         debugFile.write(processInfo.GetBuffer(), processInfo.GetLength());
 #endif
         debugFile.write(line.GetBuffer(), line.GetLength());
         debugFile.write("\n", 1);
 
         line = text.Tokenize(L"\n\r", pos);
       }
 
       debugFile.flush();
     }
   }
 }
 
 void CPluginDebug::DebugClear()
 {
   CPluginDebugLock lock;
   if (lock.IsLocked())
   {
-    ::DeleteFile(CPluginSettings::GetDataPath(L"debug.txt"));
-    ::DeleteFile(CPluginSettings::GetDataPath(L"debug_main_ui.txt"));
-    ::DeleteFile(CPluginSettings::GetDataPath(L"debug_main_thread.txt"));
+    DeleteFileW(GetDataPath(L"debug.txt").c_str());
+    DeleteFileW(GetDataPath(L"debug_main_ui.txt").c_str());
+    DeleteFileW(GetDataPath(L"debug_main_thread.txt").c_str());
 
     for (int i = 1; i <= 10; i++)
     {
-      CString x;
-      x.Format(L"%d", i);
-
-      ::DeleteFile(CPluginSettings::GetDataPath(L"debug_tab" + x + L"_ui.txt"));
-      ::DeleteFile(CPluginSettings::GetDataPath(L"debug_tab" + x + L"_thread.txt"));
+      std::wstring x = std::to_wstring(i);
+      DeleteFileW(GetDataPath(L"debug_tab" + x + L"_ui.txt").c_str());
+      DeleteFileW(GetDataPath(L"debug_tab" + x + L"_thread.txt").c_str());
     }
   }
 }
 
 #endif
 
 #if (defined ENABLE_DEBUG_INFO || defined ENABLE_DEBUG_SELFTEST)
 
 void CPluginDebug::DebugError(const CString& error)
 {
@@ skipping 34 matching lines @@
   CStringA sysTime;
   sysTime.Format("%2.2d:%2.2d:%2.2d.%3.3d - ", st.wHour, st.wMinute, st.wSecond, st.wMilliseconds);
 
   CStringA textA = text;
 
   CPluginDebugLock lock;
   if (lock.IsLocked())
   {
     std::ofstream debugFile;
 
-    debugFile.open(CPluginSettings::GetDataPath("debug_result.txt"), std::ios::app);
+    debugFile.open(GetDataPath(L"debug_result.txt"), std::ios::app);
     debugFile.write(sysTime.GetBuffer(), sysTime.GetLength());
     debugFile.write(LPCSTR(textA), textA.GetLength());
     debugFile.write("\n", 1);
     debugFile.flush();
   }
 }
 
 void CPluginDebug::DebugResultDomain(const CString& domain)
 {
   DebugResult(L"===========================================================================================================================================================================================");
@@ skipping 30 matching lines @@
 
   DebugResult(blocking);
 }
 
 
 void CPluginDebug::DebugResultClear()
 {
   CPluginDebugLock lock;
   if (lock.IsLocked())
   {
-    ::DeleteFile(CPluginSettings::GetDataPath("debug_result.txt"));
+    DeleteFileW(GetDataPath(L"debug_result.txt").c_str());
   }
 }
 
 #endif // ENABLE_DEBUG_RESULT
 
 
 #ifdef ENABLE_DEBUG_RESULT_IGNORED
 
 void CPluginDebug::DebugResultIgnoring(const CString& type, const CString& src, const CString& domain)
 {
   CString srcTrunc = src;
   if (srcTrunc.GetLength() > 100)
   {
     srcTrunc = src.Left(67) + L"..." + src.Right(30);
   }
 
   CString blocking;
   blocking.Format(L"Ignored  %-12s  %s  %s", type, domain.IsEmpty()? L"-" : domain, srcTrunc);
 
   DebugResult(blocking);
 }
 
 #endif // ENABLE_DEBUG_RESULT_IGNORED