Index: src/ch/MainWnd.cpp
===================================================================
diff -u -N -r633a533cb6e741d44fe28aa56339e1d2709b1b27 -rbe5d5dfa17e79a1db8e64ad2d2ed5faea30399cb
--- src/ch/MainWnd.cpp	(.../MainWnd.cpp)	(revision 633a533cb6e741d44fe28aa56339e1d2709b1b27)
+++ src/ch/MainWnd.cpp	(.../MainWnd.cpp)	(revision be5d5dfa17e79a1db8e64ad2d2ed5faea30399cb)
@@ -34,7 +34,6 @@
 #include "ClipboardMonitor.h"
 #include <boost/make_shared.hpp>
 #include <boost/shared_array.hpp>
-#include "../libchcore/TWStringData.h"
 #include "../common/TShellExtMenuConfig.h"
 #include "../libchcore/TConfig.h"
 #include "FileSupport.h"
@@ -433,8 +432,8 @@
 			if(!pszBuffer || ulLen == 0 || pszBuffer[ulLen - 1] != L'\0')
 				return FALSE;
 
-			chcore::TWStringData wstrData(pszBuffer);
-			AfxMessageBox(wstrData.GetData());		// TEMP = to remove before commit
+			chcore::TString wstrData(pszBuffer);
+			AfxMessageBox(wstrData);		// TEMP = to remove before commit
 
 			chcore::TTaskDefinition tTaskDefinition;
 			tTaskDefinition.LoadFromString(wstrData);
@@ -768,7 +767,7 @@
 			}
 
 			chcore::TConfig cfgStorage;
-			chcore::TWStringData wstrData;
+			chcore::TString wstrData;
 
 			cfgShellExt.StoreInConfig(cfgStorage, _T("ShellExtCfg"));
 			cfgStorage.WriteToString(wstrData);