Index: src/libchcore/TTaskConfigVerifier.cpp
===================================================================
diff -u -N -r6f8b891b60eb0f33199fd29db75d4d9f4a22c248 -rdcc6234ed612a75910b8900704c9d564096a037a
--- src/libchcore/TTaskConfigVerifier.cpp	(.../TTaskConfigVerifier.cpp)	(revision 6f8b891b60eb0f33199fd29db75d4d9f4a22c248)
+++ src/libchcore/TTaskConfigVerifier.cpp	(.../TTaskConfigVerifier.cpp)	(revision dcc6234ed612a75910b8900704c9d564096a037a)
@@ -19,22 +19,23 @@
 #include "stdafx.h"
 #include "TTaskConfigVerifier.h"
 #include "TTaskConfiguration.h"
+#include "log.h"
 #include <boost\format.hpp>
-#include "..\Common\TLogger.h"
 
 namespace chcore
 {
-	void TTaskConfigVerifier::VerifyAndUpdate(TConfig& rConfig, TLogger* pLog)
+	void TTaskConfigVerifier::VerifyAndUpdate(TConfig& rConfig, log_file* pLog)
 	{
 		TString strFirstFormat = GetTaskPropValue<eTO_AlternateFilenameFormatString_First>(rConfig);
 		if(strFirstFormat.Find(L"%name") == TString::npos || strFirstFormat.Find(L"%ext") == TString::npos)
 		{
 			TString strDefaultFormat = TaskPropData<eTO_AlternateFilenameFormatString_First>::GetDefaultValue();
 			if(pLog)
 			{
-				LOG_WARNING(*pLog) << boost::str(boost::wformat(L"First alternate filename format string (%1%) does not contain %%name placeholder. Switching to default (%2%).")
+				pLog->logw(
+					boost::str(boost::wformat(L"First alternate filename format string (%1%) does not contain %%name placeholder. Switching to default (%2%).")
 						% strFirstFormat.c_str()
-						% strDefaultFormat.c_str()).c_str();
+						% strDefaultFormat.c_str()).c_str());
 			}
 
 			SetTaskPropValue<eTO_AlternateFilenameFormatString_First>(rConfig, strDefaultFormat);
@@ -47,10 +48,10 @@
 			TString strDefaultFormat = TaskPropData<eTO_AlternateFilenameFormatString_AfterFirst>::GetDefaultValue();
 			if(pLog)
 			{
-				LOG_WARNING(*pLog) <<
+				pLog->logw(
 					boost::str(boost::wformat(L"Subsequent alternate filename format string (%1%) does not contain %%name or %%count placeholder. Switching to default (%2%).")
 						% strSubsequentFormat.c_str()
-						% strDefaultFormat.c_str()).c_str();
+						% strDefaultFormat.c_str()).c_str());
 			}
 
 			SetTaskPropValue<eTO_AlternateFilenameFormatString_AfterFirst>(rConfig, strDefaultFormat);