Cleanup

src/plugin/PluginSettings.h

 /**
 * This class contains all client functionality of the IE plugin
 *
 * Exception errors are tested by calls to ExceptionsTest from: Main ...
 */
 
 #ifndef _PLUGIN_SETTINGS_H_
 #define _PLUGIN_SETTINGS_H_
 
 
@@ skipping 40 matching lines @@
 class CPluginSettings
 {
 
 public:
 
   typedef std::map<CString, CString> TProperties;
 
 private:
 
   bool m_isFirstRun;
   bool m_isFirstRunUpdate;

[Wladimir Palant, 2013/07/05 09:26:45]

I think that these two properties and the corresponding methods can be removed
as well.

 
   DWORD m_dwMainProcessId;
   DWORD m_dwMainThreadId;
   DWORD m_dwMainUiThreadId;
   DWORD m_dwWorkingThreadId;
 
   CString m_tabNumber;
 
-  CPluginSettings::TProperties m_properties;
-
   bool m_isDirty;

[Wladimir Palant, 2013/07/05 09:26:45]

You can remove that property, all code using it has been removed.

 
   CString m_settingsVersion;

[Wladimir Palant, 2013/07/05 09:26:45]

That property is unused.

-  std::auto_ptr<CPluginIniFileW> m_settingsFile;
-
 
   static CComAutoCriticalSection s_criticalSectionLocal;
 #ifdef SUPPORT_WHITELIST
   static CComAutoCriticalSection s_criticalSectionDomainHistory;

[Wladimir Palant, 2013/07/05 09:26:45]

This property is unused.

 #endif
 
-  bool m_isPluginSelftestEnabled;
-
   void Clear();
 
   // Private constructor used by the singleton pattern
   CPluginSettings();
 public:
 
   ~CPluginSettings();
 
   static CPluginSettings* s_instance;
 
   static bool s_isLightOnly;

[Wladimir Palant, 2013/07/05 09:26:45]

This property seems unused.

   static bool HasInstance();
   static CPluginSettings* GetInstance();
 
-  bool Read(bool bDebug=true);
-  bool Write(bool bDebug=true);
-
   static CString GetDataPath(const CString& filename=L"");
 
   static CString GetTempPath(const CString& filename=L"");
   static CString GetTempFile(const CString& prefix, const CString& extension=L"");

[Wladimir Palant, 2013/07/05 09:26:45]

These two methods seem unused.

 
-  bool Has(const CString& key) const;
-  void Remove(const CString& key);
-
   CString GetPluginId();

[Wladimir Palant, 2013/07/05 09:26:45]

This method isn't even implemented.

 
-  CString GetString(const CString& key, const CString& defaultValue=L"") const;
-  void SetString(const CString& key, const CString& value);
-
-  int GetValue(const CString& key, int defaultValue=0) const;
-  void SetValue(const CString& key, int value);
-
-  bool GetBool(const CString& key, bool defaultValue) const;
-  void SetBool(const CString& key, bool value);
-
   bool IsPluginEnabled() const;
 
   bool IsPluginSelftestEnabled();

[Wladimir Palant, 2013/07/05 09:26:45]

This method isn't even implemented.

 
   bool FilterlistExpired(CString filterlist) const;
   bool SetFilterRefreshDate(CString filterlist, time_t refreshtime);

[Wladimir Palant, 2013/07/05 09:26:45]

These two methods aren't even implemented.

 
   std::map<CString, CString> GetFilterLanguageTitleList() const;
 
   void SetMainProcessId();
   void SetMainProcessId(DWORD id);
   bool IsMainProcess(DWORD dwProcessId=0) const;
 
   void SetMainUiThreadId();
   void SetMainUiThreadId(DWORD id);
   bool IsMainUiThread(DWORD dwThread=0) const;
@@ skipping 12 matching lines @@
   void SetFirstRunUpdate();
   bool IsFirstRunUpdate() const;
 
   bool IsFirstRunAny() const;
 
   static CString GetSystemLanguage();
   DWORD m_WindowsBuildNumber;
 
 private:
 
-  bool m_isDirtyTab;
   bool m_isPluginEnabledTab;
 
-  CPluginSettings::TProperties m_propertiesTab;
-  CPluginSettings::TProperties m_errorsTab;
-
-  std::auto_ptr<CPluginIniFileW> m_settingsFileTab;
-
-  void ClearTab();
-
-  bool ReadTab(bool bDebug=true);
-  bool WriteTab(bool bDebug=true);
-
 public:
 
-  void EraseTab();
-
   CString GetTabNumber() const;
 
   bool IncrementTabCount();
   bool DecrementTabCount();
 
   void TogglePluginEnabled();
   void SetPluginDisabled();
   void SetPluginEnabled();
   bool GetPluginEnabled() const;
 
   void AddError(const CString& error, const CString& errorCode);
-  CString GetErrorList() const;
-  void RemoveErrors();
-
-  bool GetForceConfigurationUpdateOnStart() const;
-  void ForceConfigurationUpdateOnStart(bool isUpdating=true);
-  void RemoveForceConfigurationUpdateOnStart();
-
-  void RefreshTab();
-
-  int GetTabVersion(const CString& key) const;
-  void IncrementTabVersion(const CString& key);
 
   // Settings whitelist
 #ifdef SUPPORT_WHITELIST
 
 private:
   std::vector<std::wstring> m_whitelistedDomains;
 
   void ClearWhitelist();
   bool ReadWhitelist(bool bDebug=true);
 
 public:
   void AddWhiteListedDomain(const CString& domain);
   void RemoveWhiteListedDomain(const CString& domain);
   int GetWhiteListedDomainCount() const;
   std::vector<std::wstring> GetWhiteListedDomainList();
 #endif //SUPPORT_WHITELIST
 
   bool RefreshWhitelist();
   DWORD GetWindowsBuildNumber();
 
   void SetSubscription(const std::wstring& url);
   void SetDefaultSubscription();
   CString GetSubscription();
   void RefreshFilterlist();
 
+  bool GetStatusBarAsked();
+  void SetStatusBarAsked(bool asked);
   std::vector<SubscriptionDescription> m_subscriptions;
 };
 
 
 #endif // _PLUGIN_SETTINGS_H_