Index: src/ch/ch.h
===================================================================
diff -u -rd5c3edd0d167db9b5d47d04248820fda49499a5e -rbeeac49d2e0888993bd231a4e5863c7f0741e154
--- src/ch/ch.h	(.../ch.h)	(revision d5c3edd0d167db9b5d47d04248820fda49499a5e)
+++ src/ch/ch.h	(.../ch.h)	(revision beeac49d2e0888993bd231a4e5863c7f0741e154)
@@ -27,10 +27,9 @@
 #include "AppHelper.h"
 #include "CfgProperties.h"
 #include "../chext/chext.h"
-//#include "LogFile.h"
 #include "../libicpf/log.h"
-#include "../libchcore/EngineCfg.h"
 #include "../libictranslate/ResourceManager.h"
+#include "../libchcore/TCoreConfig.h"
 
 using namespace std;
 
@@ -45,53 +44,37 @@
 	CCopyHandlerApp();
 	~CCopyHandlerApp();
 
-// Overrides
-public:
 	virtual BOOL InitInstance();
+	virtual int ExitInstance();
 
-
 	virtual void HtmlHelp(DWORD_PTR dwData, UINT nCmd);
 
 	PCTSTR GetHelpPath() const { return m_pszHelpFilePath; };
 
-	friend LRESULT MainRouter(ULONGLONG ullDst, UINT uiMsg, WPARAM wParam, LPARAM lParam);
 	friend int MsgBox(UINT uiID, UINT nType=MB_OK, UINT nIDHelp=0);
-	friend CCopyHandlerApp* GetApp();
-	friend ictranslate::CResourceManager* GetResManager();
-	friend chcore::engine_config* GetConfig();
-//	friend CLogFile* GetLog();
 
+	friend LRESULT MainRouter(ULONGLONG ullDst, UINT uiMsg, WPARAM wParam, LPARAM lParam);
+	friend CCopyHandlerApp& GetApp();
+	friend ictranslate::CResourceManager& GetResManager();
+	friend icpf::config& GetConfig();
+
 	bool IsShellExtEnabled() const;
 
 	void OnConfigNotify(uint_t uiPropID);
 	void OnResManNotify(UINT uiType);
+
 protected:
 	bool UpdateHelpPaths();
-	HWND HHelp(HWND hwndCaller, LPCTSTR pszFile, UINT uCommand, DWORD dwData);
+	HWND HHelp(HWND hwndCaller, LPCTSTR pszFile, UINT uCommand, DWORD_PTR dwData);
 
-public:
-	ictranslate::CResourceManager m_resManager;
-//	CConfigManager m_cfgManager;
-	chcore::engine_config m_cfgSettings;
-	icpf::log_file m_lfLog;
-
+protected:
+	HANDLE m_hMapObject;
 	IShellExtControl* m_piShellExtControl;
+	static icpf::config m_config;
 
 	CWnd *m_pMainWindow;
-	// currently opened dialogs
-//	list<CWnd*> m_lhDialogs;
 
-protected:
-// Implementation
-	HANDLE m_hMapObject;
-	//TCHAR m_szHelpPath[_MAX_PATH];	// full file path to the help file
-//	CString m_strCrashInfo;			// crash info text
-
-	//{{AFX_MSG(CCopyHandlerApp)
-	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
-public:
-	virtual int ExitInstance();
 };