Index: src/libchcore/TConfigSerializers.h
===================================================================
diff -u -N -r633a533cb6e741d44fe28aa56339e1d2709b1b27 -rbe30619d750d8663d54cf02e7d4bde2ed2dd8d05
--- src/libchcore/TConfigSerializers.h	(.../TConfigSerializers.h)	(revision 633a533cb6e741d44fe28aa56339e1d2709b1b27)
+++ src/libchcore/TConfigSerializers.h	(.../TConfigSerializers.h)	(revision be30619d750d8663d54cf02e7d4bde2ed2dd8d05)
@@ -31,12 +31,12 @@
 
 // CString config serializer
 
-static void StoreInConfig(const CString& strValue, chcore::TConfig& rConfig, PCTSTR pszPropName)
+static void StoreInConfig(const CString& strValue, TConfig& rConfig, PCTSTR pszPropName)
 {
 	rConfig.SetValue(pszPropName, TString((PCTSTR)strValue));
 }
 
-static bool ReadFromConfig(CString& strValue, const chcore::TConfig& rConfig, PCTSTR pszPropName)
+static bool ReadFromConfig(CString& strValue, const TConfig& rConfig, PCTSTR pszPropName)
 {
 	TString wstrData;
 	bool bRes = rConfig.GetValue(pszPropName, wstrData);
@@ -49,7 +49,7 @@
 
 // vector<CString> config serializer
 
-static void StoreInConfig(const std::vector<CString>& vValues, chcore::TConfig& rConfig, PCTSTR pszPropName)
+static void StoreInConfig(const std::vector<CString>& vValues, TConfig& rConfig, PCTSTR pszPropName)
 {
 	// convert to vector of wstrings (ineffective; there should be a better way to do this)
 	TStringArray vToStore;
@@ -61,7 +61,7 @@
 	rConfig.SetValue(pszPropName, vToStore);
 }
 
-static bool ReadFromConfig(std::vector<CString>& vValues, const chcore::TConfig& rConfig, PCTSTR pszPropName)
+static bool ReadFromConfig(std::vector<CString>& vValues, const TConfig& rConfig, PCTSTR pszPropName)
 {
 	vValues.clear();