Issue #1234 - Rewrite internals of debug facility

src/plugin/PluginSettings.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 23 matching lines @@
 class CPluginSettingsWhitelistLock : public CPluginMutex
 {
 public:
   CPluginSettingsWhitelistLock() : CPluginMutex(L"SettingsFileWhitelist", PLUGIN_ERROR_MUTEX_SETTINGS_FILE_WHITELIST) {}
   ~CPluginSettingsWhitelistLock() {}
 };
 
 CPluginSettings* CPluginSettings::s_instance = NULL;
 CComAutoCriticalSection CPluginSettings::s_criticalSectionLocal;
 
-CPluginSettings::CPluginSettings() : m_dwWorkingThreadId(0)
+CPluginSettings::CPluginSettings()
 {
   s_instance = NULL;
   ClearWhitelist();
 }
 
 CPluginSettings::~CPluginSettings()
 {
   s_instance = NULL;
 }
 
@@ skipping 22 matching lines @@
 
   s_criticalSectionLocal.Lock();
   {
     hasInstance = s_instance != NULL;
   }
   s_criticalSectionLocal.Unlock();
 
   return hasInstance;
 }
 
-std::wstring GetDataPath(const std::wstring& filename)
-{
-  return GetAppDataPath() + L"\\" + filename;
-}
-
 bool CPluginSettings::IsPluginEnabled() const
 {
   return GetPluginEnabled();
 }
 
 std::map<std::wstring, std::wstring> CPluginSettings::GetFilterLanguageTitleList() const
 {
   auto subscriptions = CPluginClient::GetInstance()->FetchAvailableSubscriptions();
 
   std::map<std::wstring, std::wstring> filterList;
   for (size_t i = 0; i < subscriptions.size(); i ++)
   {
     auto it = subscriptions[i];
     filterList.insert(std::make_pair(it.url, it.title));
   }
   return filterList;
 }
 
-bool CPluginSettings::IsWorkingThread(DWORD dwThreadId) const
-{
-  if (dwThreadId == 0)
-  {
-    dwThreadId = ::GetCurrentThreadId();
-  }
-  return m_dwWorkingThreadId == dwThreadId;
-}
-
-void CPluginSettings::SetWorkingThreadId()
-{
-  m_dwWorkingThreadId = ::GetCurrentThreadId();
-}
-
-void CPluginSettings::SetWorkingThreadId(DWORD id)
-{
-  m_dwWorkingThreadId = id;
-}
-
 void CPluginSettings::TogglePluginEnabled()
 {
   CPluginClient::GetInstance()->TogglePluginEnabled();  
 }
 bool CPluginSettings::GetPluginEnabled() const
 {
   return CPluginClient::GetInstance()->GetPref(L"enabled", true);
 }
 
 void CPluginSettings::AddError(const CString& error, const CString& errorCode)
@@ skipping 98 matching lines @@
 
   for (auto subscription = subscriptions.begin(); subscription != subscriptions.end(); subscription++)
   {
     if (subscription->url != aaUrl)
     {
       return subscription->url;
     }
   }
   return std::wstring();
 }