Index: src/libchcore/TConfig.h
===================================================================
diff -u -r5fd6beaad9f1eccb664b997d151acb59961e4827 -rb1e03eb232a784d6e2d40f67cbbbb33be0972228
--- src/libchcore/TConfig.h	(.../TConfig.h)	(revision 5fd6beaad9f1eccb664b997d151acb59961e4827)
+++ src/libchcore/TConfig.h	(.../TConfig.h)	(revision b1e03eb232a784d6e2d40f67cbbbb33be0972228)
@@ -23,66 +23,19 @@
 #ifndef __TCONFIG_H__
 #define __TCONFIG_H__
 
-#pragma warning(push)
-#pragma warning(disable: 4100 4702 4512)
-	#include <boost/property_tree/ptree.hpp>
-	#include <boost/signals2.hpp>
-#pragma warning(pop)
-#include "TStringSet.h"
-#include "TStringArray.h"
+#include "libchcore.h"
+#include "ISerializerContainer.h"
 
 BEGIN_CHCORE_NAMESPACE
 
-class TReadBinarySerializer;
-class TWriteBinarySerializer;
+class TConfigArray;
+class TStringSet;
 
-// class defines configuration change notification record; not to be used outside
-class TConfigNotifier
+namespace details
 {
-public:
-	TConfigNotifier(void (*pfnCallback)(const TStringSet&, void*), void* pParam);
-	~TConfigNotifier();
+	struct ConfigNodeContainer;
+}
 
-	void operator()(const TStringSet& rsetPropNames);
-
-	TConfigNotifier& operator=(const TConfigNotifier& rNotifier);
-
-	bool operator==(const TConfigNotifier& rNotifier) const;
-
-private:
-	void (*m_pfnCallback)(const TStringSet&, void*);
-	void* m_pParam;
-};
-
-class TConfig;
-
-class LIBCHCORE_API TConfigArray
-{
-public:
-	TConfigArray();
-	TConfigArray(const TConfigArray& rSrc);
-	~TConfigArray();
-
-	TConfigArray& operator=(const TConfigArray& rSrc);
-
-	size_t GetCount() const;
-	bool IsEmpty() const;
-
-	const TConfig& GetAt(size_t stIndex) const;
-	TConfig& GetAt(size_t stIndex);
-
-	void Add(const TConfig& rSrc);
-
-	void RemoveAt(size_t stIndex);
-	void Clear();
-
-private:
-#pragma warning(push)
-#pragma warning(disable: 4251)
-	std::vector<TConfig> m_vConfigs;
-#pragma warning(pop)
-};
-
 // class for handling configuration settings
 class LIBCHCORE_API TConfig
 {
@@ -97,21 +50,16 @@
 
 	// read/write
 	void Read(PCTSTR pszFile);
-	void Write(bool bOnlyIfModified = false);
+	void Write();
 
-	void SerializeLoad(TReadBinarySerializer& rSerializer);
-	void SerializeStore(TWriteBinarySerializer& rSerializer);
+	void Store(const ISerializerContainerPtr& spContainer) const;
+	void Load(const ISerializerContainerPtr& spContainer) const;
 
 	void ReadFromString(const TString& strInput);
 	void WriteToString(TString& strOutput);
 
 	void SetFilePath(PCTSTR pszPath);
 
-	// Modifications management
-	bool IsModified() const;
-	void MarkAsModified();
-	void MarkAsNotModified();
-
 	// value setting/retrieval
 	bool GetBool(PCTSTR pszPropName, bool bDefault = false) const;
 	bool GetValue(PCTSTR pszPropName, bool& bValue) const;
@@ -141,8 +89,12 @@
 	bool GetValue(PCTSTR pszPropName, TString& rstrValue) const;
 	TConfig& SetValue(PCTSTR pszPropName, const TString& strValue);
 
+	TSmartPath GetPath(PCTSTR pszPropName, const TSmartPath& pathDefault) const;
+	bool GetValue(PCTSTR pszPropName, TSmartPath& rpathValue) const;
+	TConfig& SetValue(PCTSTR pszPropName, const TSmartPath& pathValue);
+
 	bool GetValue(PCTSTR pszPropName, TStringArray& rvValues) const;
-	void SetValue(PCTSTR pszPropName, const TStringArray& rvValues);
+	TConfig& SetValue(PCTSTR pszPropName, const TStringArray& rvValues);
 
 	void DeleteNode(PCTSTR pszNodeName);
 
@@ -165,22 +117,14 @@
 
 	void ClearNL();
 
-	void SerializeStoreNode(TWriteBinarySerializer& rSerializer, boost::property_tree::wiptree& treeNode);
-	void SerializeLoadNode(TReadBinarySerializer& rSerializer, boost::property_tree::wiptree& treeNode);
+private:
+	details::ConfigNodeContainer* GetImpl();
+	const details::ConfigNodeContainer* GetImpl() const;
 
 private:
 #pragma warning(push)
 #pragma warning(disable: 4251)
-	boost::property_tree::wiptree m_propTree;
-	TString m_strFilePath;
-
-	boost::signals2::signal<void (const TStringSet&)> m_notifier;
-	TStringSet m_setDelayedNotifications;
-	bool m_bDelayedEnabled;
-
-	bool m_bModified;		///< Modification state - cleared when saving
-
-	mutable boost::shared_mutex m_lock;
+	details::ConfigNodeContainer* m_pImpl;
 #pragma warning(pop)
 };