Cleanup

src/plugin/PluginUserSettings.cpp

 #include "PluginStdAfx.h"
 #include "PluginUserSettings.h"
 #include <algorithm>
 #include "PluginSettings.h"
 #include "PluginClient.h"
-#include "PluginIniFileW.h"
+#include "../shared/Dictionary.h"
 
 static const CString s_GetMessage = L"GetMessage";
 static const CString s_GetLanguageCount = L"GetLanguageCount";
 static const CString s_GetLanguageByIndex = L"GetLanguageByIndex";
 static const CString s_GetLanguageTitleByIndex = L"GetLanguageTitleByIndex";
 static const CString s_SetLanguage = L"SetLanguage";
 static const CString s_GetLanguage = L"GetLanguage";
 static const CString s_GetWhitelistDomains = L"GetWhitelistDomains";
 static const CString s_AddWhitelistDomain = L"AddWhitelistDomain";
 static const CString s_RemoveWhitelistDomain = L"RemoveWhitelistDomain";
@@ skipping 69 matching lines @@
 
   *rgdispid = indxMethod;
 
   return S_OK;
 }
 
 
 static CString sGetLanguage()
 {
   CPluginSettings* settings = CPluginSettings::GetInstance();
-
-  return settings->GetString(SETTING_LANGUAGE);
-}
-
-
-static bool sReadSettingsPageFile(CPluginIniFileW& iniFile)
-{
-  return iniFile.HasSection(sGetLanguage());
-}
-
-
-static CPluginIniFileW& sReadSettingsPageFile(bool& readOK)
-{
-  static CPluginIniFileW iniFile(CPluginSettings::GetDataPath(SETTING_PAGE_INI_FILE));
-  static bool s_readOK = iniFile.Read();
-
-  readOK = s_readOK;
-
-  return iniFile;
+  return settings->GetSubscription();
 }
 
 
 CStringW sGetMessage(const CString& key)
 {
-  bool readOK = false;
-  CPluginIniFileW& iniFile = sReadSettingsPageFile(readOK);
-
-  return iniFile.GetValue(sGetLanguage(), key);
+  Dictionary* dictionary = Dictionary::GetInstance();
+  return CString(dictionary->Lookup("settings", std::string(CW2A(key))).c_str());
+}
+
+std::wstring sGetMessage(const std::string& key)
+{
+  Dictionary* dictionary = Dictionary::GetInstance();
+  return dictionary->Lookup("settings", key);
 }
 
 
 STDMETHODIMP CPluginUserSettings::Invoke(DISPID dispidMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS* pDispparams, VARIANT* pVarResult,
                                          EXCEPINFO* pExcepinfo, UINT* pArgErr)
 {
   if (!pDispparams)
     return E_POINTER;
 
   if (!pExcepinfo)
@@ skipping 183 matching lines @@
     {
       settings->RemoveWhiteListedDomain((BSTR)domain);
     }
   }
   else
     return DISP_E_MEMBERNOTFOUND;
 
   return S_OK;
 }