Index: src/ch/ch.h =================================================================== diff -u -N -rcca174e74e108de1f5729e4cc6c46d2b9a5e25a7 -r12b36349f6214befeace08efa9acc7e03be0d847 --- src/ch/ch.h (.../ch.h) (revision cca174e74e108de1f5729e4cc6c46d2b9a5e25a7) +++ src/ch/ch.h (.../ch.h) (revision 12b36349f6214befeace08efa9acc7e03be0d847) @@ -25,9 +25,7 @@ #include "TShellExtensionClient.h" #include "TCommandLineParser.h" #include "../liblogger/TLogger.h" -#include "../liblogger/TLoggerInitializer.h" #include "../libchcore/TCoreEngine.h" -#include "../liblogger/TLoggerFactory.h" class CCopyHandlerApp : public CWinApp, public CAppHelper { @@ -48,7 +46,7 @@ static ictranslate::CResourceManager& GetResManager(); static chcore::TConfig& GetConfig(); - chcore::TLoggerFactoryPtr GetLogFactory(); + logger::TLogFileDataPtr GetLogFileData() const; void RegisterShellExtension(); void UnregisterShellExtension(); @@ -70,25 +68,24 @@ TCommandLineParser m_cmdLineParser; chcore::TCoreEngine m_chEngine; - chcore::TLoggerInitializer m_logInitializer; - chcore::TLoggerFactoryPtr m_spLogFactory; - chcore::TLoggerPtr m_spLog; + logger::TLoggerPtr m_spLog; CWnd *m_pMainWindow; DECLARE_MESSAGE_MAP() + private: - void InitLoggers(const CString& strBasePath); + void InitLoggers(); }; inline CCopyHandlerApp& GetApp() { return GetApplication(); } -inline chcore::TLoggerFactoryPtr GetLogFactory() +inline logger::TLogFileDataPtr GetLogFileData() { - return GetApp().GetLogFactory(); + return GetApp().GetLogFileData(); } inline ictranslate::CResourceManager& GetResManager()