Index: src/ch/ch.cpp
===================================================================
diff -u -N -rd16e1e189903c740e101b1ef0492639ccaaa9d52 -rb684bec49aaaea4b89ab2e599497f4085d8698a3
--- src/ch/ch.cpp	(.../ch.cpp)	(revision d16e1e189903c740e101b1ef0492639ccaaa9d52)
+++ src/ch/ch.cpp	(.../ch.cpp)	(revision b684bec49aaaea4b89ab2e599497f4085d8698a3)
@@ -77,7 +77,7 @@
 	theApp.OnResManNotify(uiMsg);
 }
 
-void ConfigPropertyChangedCallback(const std::set<CString>& setPropNames, void* /*pParam*/)
+void ConfigPropertyChangedCallback(const std::set<std::wstring>& setPropNames, void* /*pParam*/)
 {
 	theApp.OnConfigNotify(setPropNames);
 }
@@ -123,9 +123,9 @@
 	return ictranslate::CResourceManager::Acquire();
 }
 
-TConfig& GetConfig()
+chcore::TConfig& GetConfig()
 {
-	static TConfig tCfg;
+	static chcore::TConfig tCfg;
 	return tCfg;
 }
 
@@ -228,7 +228,7 @@
 	strCfgPath = strPath + _T("\\ch.xml");
 
 	// initialize configuration file
-	TConfig& rCfg = GetConfig();
+	chcore::TConfig& rCfg = GetConfig();
 	rCfg.ConnectToNotifier(ConfigPropertyChangedCallback, NULL);
 
 	// read the configuration
@@ -403,7 +403,7 @@
 	return false;
 }
 
-void CCopyHandlerApp::OnConfigNotify(const std::set<CString>& setPropNames)
+void CCopyHandlerApp::OnConfigNotify(const std::set<std::wstring>& setPropNames)
 {
 	// is this language
 	if(setPropNames.find(PropData<PP_PLANGUAGE>::GetPropertyName()) != setPropNames.end())