Index: src/ch/ch.h =================================================================== diff -u -r4c272b19c74694c428c943011f279ec064fbd894 -r7c612814a43eb389fa1ac27ccd8f621fd4ff37e8 --- src/ch/ch.h (.../ch.h) (revision 4c272b19c74694c428c943011f279ec064fbd894) +++ src/ch/ch.h (.../ch.h) (revision 7c612814a43eb389fa1ac27ccd8f621fd4ff37e8) @@ -28,13 +28,10 @@ #include "resource.h" // main symbols #include "AppHelper.h" #include "ResourceManager.h" - -#define DISABLE_CRYPT -#include "ConfigManager.h" - #include "CfgProperties.h" //#include "LogFile.h" #include "../libicpf/log.h" +#include "../libicpf/cfg.h" using namespace std; @@ -65,18 +62,19 @@ friend int MsgBox(UINT uiID, UINT nType=MB_OK, UINT nIDHelp=0); friend CCopyHandlerApp* GetApp(); friend CResourceManager* GetResManager(); - friend CConfigManager* GetConfig(); + friend icpf::config* GetConfig(); // friend CLogFile* GetLog(); - void OnConfigNotify(UINT uiType, LPARAM lParam); + void OnConfigNotify(uint_t uiPropID); void OnResManNotify(UINT uiType, LPARAM lParam); protected: bool UpdateHelpPaths(); HWND HHelp(HWND hwndCaller, LPCTSTR pszFile, UINT uCommand, DWORD dwData); public: CResourceManager m_resManager; - CConfigManager m_cfgManager; +// CConfigManager m_cfgManager; + icpf::config m_cfgSettings; icpf::log_file m_lfLog; CWnd *m_pMainWindow; @@ -87,6 +85,7 @@ // 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