Index: src/ch/ch.h =================================================================== diff -u -r62d767936f1675e1db51174f53c91484fe691937 -rb556d023b748dfea230575959b6513acf29fd7b3 --- src/ch/ch.h (.../ch.h) (revision 62d767936f1675e1db51174f53c91484fe691937) +++ src/ch/ch.h (.../ch.h) (revision b556d023b748dfea230575959b6513acf29fd7b3) @@ -24,10 +24,9 @@ #include "../libchcore/TConfig.h" #include "TShellExtensionClient.h" #include "TCommandLineParser.h" -#include "../common/TLogger.h" -#include "../common/TLoggerInitializer.h" +#include "../liblogger/TLogger.h" #include "../libchcore/TCoreEngine.h" -#include "../common/TLoggerFactory.h" +#include "TShellExtensionConfig.h" class CCopyHandlerApp : public CWinApp, public CAppHelper { @@ -48,7 +47,9 @@ static ictranslate::CResourceManager& GetResManager(); static chcore::TConfig& GetConfig(); - chcore::TLoggerFactoryPtr GetLogFactory(); + logger::TLogFileDataPtr GetLogFileData() const; + logger::TMultiLoggerConfigPtr GetEngineLoggerConfig() const; + TShellExtensionConfigPtr GetShellExtensionConfig() const; void RegisterShellExtension(); void UnregisterShellExtension(); @@ -66,27 +67,35 @@ bool ParseCommandLine(); protected: - TShellExtensionClient m_tShellExtClient; + logger::TMultiLoggerConfigPtr m_spAppLoggerConfig; + logger::TMultiLoggerConfigPtr m_spEngineLoggerConfig; + + logger::TLoggerPtr m_spLog; + TCommandLineParser m_cmdLineParser; chcore::TCoreEngine m_chEngine; - TLoggerInitializer m_logInitializer; - chcore::TLoggerFactoryPtr m_spLogFactory; - chcore::TLoggerPtr m_spLog; + TShellExtensionConfigPtr m_shellExtConfig; + TShellExtensionClient m_tShellExtClient; + CWnd *m_pMainWindow; + bool m_bComInitialized = false; DECLARE_MESSAGE_MAP() + +private: + 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() @@ -99,4 +108,9 @@ return CCopyHandlerApp::GetConfig(); } +inline TShellExtensionConfigPtr GetShellExtensionConfig() +{ + return GetApp().GetShellExtensionConfig(); +} + #endif