Index: src/ch/ch.h =================================================================== diff -u -N -rbeeac49d2e0888993bd231a4e5863c7f0741e154 -r9ea1e103b5fa4ddfebf8028f121ce16e917eec04 --- src/ch/ch.h (.../ch.h) (revision beeac49d2e0888993bd231a4e5863c7f0741e154) +++ src/ch/ch.h (.../ch.h) (revision 9ea1e103b5fa4ddfebf8028f121ce16e917eec04) @@ -29,7 +29,7 @@ #include "../chext/chext.h" #include "../libicpf/log.h" #include "../libictranslate/ResourceManager.h" -#include "../libchcore/TCoreConfig.h" +#include "TConfig.h" using namespace std; @@ -56,11 +56,11 @@ friend LRESULT MainRouter(ULONGLONG ullDst, UINT uiMsg, WPARAM wParam, LPARAM lParam); friend CCopyHandlerApp& GetApp(); friend ictranslate::CResourceManager& GetResManager(); - friend icpf::config& GetConfig(); + friend TConfig& GetConfig(); bool IsShellExtEnabled() const; - void OnConfigNotify(uint_t uiPropID); + void OnConfigNotify(const std::set& setPropNames); void OnResManNotify(UINT uiType); protected: @@ -70,7 +70,6 @@ protected: HANDLE m_hMapObject; IShellExtControl* m_piShellExtControl; - static icpf::config m_config; CWnd *m_pMainWindow;