Index: src/ch/CfgProperties.h =================================================================== diff -u -ra08ca9e12d93e9a036a5cf739348ff3ef2a58be8 -rb165add706c4fab9d783f0564b1dd398492da491 --- src/ch/CfgProperties.h (.../CfgProperties.h) (revision a08ca9e12d93e9a036a5cf739348ff3ef2a58be8) +++ src/ch/CfgProperties.h (.../CfgProperties.h) (revision b165add706c4fab9d783f0564b1dd398492da491) @@ -23,10 +23,7 @@ #include "../libchcore/TTaskConfiguration.h" #include "UpdateVersionInfo.h" -#include -using boost::log::trivial::severity_level; - namespace chcore { class TConfig; } // properties definitions @@ -217,15 +214,15 @@ PROPERTY_MINMAX(PP_LOGMAXSIZE, unsigned int, _T("CHConfig.General.Logging.SizeLimit"), 1024 * 1024, 1024, 0xffffffff); PROPERTY_MINMAX(PP_LOGROTATECOUNT, unsigned int, _T("CHConfig.General.Logging.RotateCount"), 5, 1, 0xffffffff); -PROPERTY_MINMAX(PP_LOGLEVEL_APP, int, _T("CHConfig.General.Logging.Level.App"), boost::log::trivial::warning, boost::log::trivial::trace, boost::log::trivial::fatal); -PROPERTY_MINMAX(PP_LOGLEVEL_ENGINEDEFAULT, int, _T("CHConfig.General.Logging.Level.EngineDefault"), boost::log::trivial::warning, boost::log::trivial::trace, boost::log::trivial::fatal); -PROPERTY_MINMAX(PP_LOGLEVEL_SERIALIZER, int, _T("CHConfig.General.Logging.Level.Serializer"), boost::log::trivial::warning, boost::log::trivial::trace, boost::log::trivial::fatal); -PROPERTY_MINMAX(PP_LOGLEVEL_TASK, int, _T("CHConfig.General.Logging.Level.Task"), boost::log::trivial::warning, boost::log::trivial::trace, boost::log::trivial::fatal); -PROPERTY_MINMAX(PP_LOGLEVEL_SUBTASK_SCANDIR, int, _T("CHConfig.General.Logging.Level.SubtaskScanDir"), boost::log::trivial::warning, boost::log::trivial::trace, boost::log::trivial::fatal); -PROPERTY_MINMAX(PP_LOGLEVEL_SUBTASK_COPYMOVE, int, _T("CHConfig.General.Logging.Level.SubtaskCopyMove"), boost::log::trivial::warning, boost::log::trivial::trace, boost::log::trivial::fatal); -PROPERTY_MINMAX(PP_LOGLEVEL_SUBTASK_FASTMOVE, int, _T("CHConfig.General.Logging.Level.SubtaskFastMove"), boost::log::trivial::warning, boost::log::trivial::trace, boost::log::trivial::fatal); -PROPERTY_MINMAX(PP_LOGLEVEL_SUBTASK_DELETE, int, _T("CHConfig.General.Logging.Level.SubtaskDelete"), boost::log::trivial::warning, boost::log::trivial::trace, boost::log::trivial::fatal); -PROPERTY_MINMAX(PP_LOGLEVEL_FILESYSTEM, int, _T("CHConfig.General.Logging.Level.Filesystem"), boost::log::trivial::warning, boost::log::trivial::trace, boost::log::trivial::fatal); +PROPERTY_MINMAX(PP_LOGLEVEL_APP, int, _T("CHConfig.General.Logging.Level.App"), logger::warning, logger::trace, logger::fatal); +PROPERTY_MINMAX(PP_LOGLEVEL_ENGINEDEFAULT, int, _T("CHConfig.General.Logging.Level.EngineDefault"), logger::warning, logger::trace, logger::fatal); +PROPERTY_MINMAX(PP_LOGLEVEL_SERIALIZER, int, _T("CHConfig.General.Logging.Level.Serializer"), logger::warning, logger::trace, logger::fatal); +PROPERTY_MINMAX(PP_LOGLEVEL_TASK, int, _T("CHConfig.General.Logging.Level.Task"), logger::warning, logger::trace, logger::fatal); +PROPERTY_MINMAX(PP_LOGLEVEL_SUBTASK_SCANDIR, int, _T("CHConfig.General.Logging.Level.SubtaskScanDir"), logger::warning, logger::trace, logger::fatal); +PROPERTY_MINMAX(PP_LOGLEVEL_SUBTASK_COPYMOVE, int, _T("CHConfig.General.Logging.Level.SubtaskCopyMove"), logger::warning, logger::trace, logger::fatal); +PROPERTY_MINMAX(PP_LOGLEVEL_SUBTASK_FASTMOVE, int, _T("CHConfig.General.Logging.Level.SubtaskFastMove"), logger::warning, logger::trace, logger::fatal); +PROPERTY_MINMAX(PP_LOGLEVEL_SUBTASK_DELETE, int, _T("CHConfig.General.Logging.Level.SubtaskDelete"), logger::warning, logger::trace, logger::fatal); +PROPERTY_MINMAX(PP_LOGLEVEL_FILESYSTEM, int, _T("CHConfig.General.Logging.Level.Filesystem"), logger::warning, logger::trace, logger::fatal); // GUI PROPERTY_MINMAX(PP_STATUSREFRESHINTERVAL, unsigned int, _T("CHConfig.GUI.StatusDialog.RefreshInterval"), 1000, 0, 24*Hour); Index: src/ch/TCommandLineParser.cpp =================================================================== diff -u -r8a2ff3b2b71b45fb525e030167e62f316cb32869 -rb165add706c4fab9d783f0564b1dd398492da491 --- src/ch/TCommandLineParser.cpp (.../TCommandLineParser.cpp) (revision 8a2ff3b2b71b45fb525e030167e62f316cb32869) +++ src/ch/TCommandLineParser.cpp (.../TCommandLineParser.cpp) (revision b165add706c4fab9d783f0564b1dd398492da491) @@ -22,7 +22,6 @@ // ============================================================================ #include "stdafx.h" #include "TCommandLineParser.h" -#include #include "../libchcore/TPath.h" #include "../libchcore/TPathContainer.h" Index: src/ch/ch.cpp =================================================================== diff -u -ra08ca9e12d93e9a036a5cf739348ff3ef2a58be8 -rb165add706c4fab9d783f0564b1dd398492da491 --- src/ch/ch.cpp (.../ch.cpp) (revision a08ca9e12d93e9a036a5cf739348ff3ef2a58be8) +++ src/ch/ch.cpp (.../ch.cpp) (revision b165add706c4fab9d783f0564b1dd398492da491) @@ -34,7 +34,6 @@ #include "../libchcore/TStringSet.h" #include "../libchcore/TSimpleTimer.h" #include "../libchcore/SerializerTrace.h" -#include #include "../libchcore/TSQLiteTaskSchema.h" #include "../libchcore/TSQLiteSerializer.h" #include "../libchcore/ISerializerContainer.h" Index: src/common/ipcstructs.h =================================================================== diff -u -r633a533cb6e741d44fe28aa56339e1d2709b1b27 -rb165add706c4fab9d783f0564b1dd398492da491 --- src/common/ipcstructs.h (.../ipcstructs.h) (revision 633a533cb6e741d44fe28aa56339e1d2709b1b27) +++ src/common/ipcstructs.h (.../ipcstructs.h) (revision b165add706c4fab9d783f0564b1dd398492da491) @@ -19,7 +19,7 @@ #ifndef __SHAREDDATA_H__ #define __SHAREDDATA_H__ -#include +#include // messages used #define WM_GETCONFIG WM_USER+20