Cleanup

src/plugin/PluginSettings.h

Index: src/plugin/PluginSettings.h
===================================================================
--- a/src/plugin/PluginSettings.h
+++ b/src/plugin/PluginSettings.h
@@ -67,21 +67,15 @@
 
   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
@@ -96,28 +90,13 @@
   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.

@@ -156,23 +135,10 @@
 
 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();
@@ -184,17 +150,6 @@
   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
@@ -220,6 +175,8 @@
   CString GetSubscription();
   void RefreshFilterlist();
 
+  bool GetStatusBarAsked();
+  void SetStatusBarAsked(bool asked);
   std::vector<SubscriptionDescription> m_subscriptions;
 };