Index: src/libchcore/TSQLiteSerializerFactory.cpp
===================================================================
diff -u -N -r11b0a299be97bc3afaa633d6522c17b214ba3b79 -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3
--- src/libchcore/TSQLiteSerializerFactory.cpp	(.../TSQLiteSerializerFactory.cpp)	(revision 11b0a299be97bc3afaa633d6522c17b214ba3b79)
+++ src/libchcore/TSQLiteSerializerFactory.cpp	(.../TSQLiteSerializerFactory.cpp)	(revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
@@ -29,71 +29,70 @@
 #include "TCoreException.h"
 #include "ErrorCodes.h"
 
-BEGIN_CHCORE_NAMESPACE
-
-TSQLiteSerializerFactory::TSQLiteSerializerFactory(const TSmartPath& pathSerializeDir) :
-	m_pathSerializeDir(pathSerializeDir)
+namespace chcore
 {
-}
+	TSQLiteSerializerFactory::TSQLiteSerializerFactory(const TSmartPath& pathSerializeDir) :
+		m_pathSerializeDir(pathSerializeDir)
+	{
+	}
 
-TSQLiteSerializerFactory::~TSQLiteSerializerFactory()
-{
-}
+	TSQLiteSerializerFactory::~TSQLiteSerializerFactory()
+	{
+	}
 
-ISerializerPtr TSQLiteSerializerFactory::CreateTaskManagerSerializer(bool bForceRecreate)
-{
-	TSmartPath pathTaskManager = m_pathSerializeDir + PathFromString(_T("tasks.sqlite"));
-
-	if (bForceRecreate)
+	ISerializerPtr TSQLiteSerializerFactory::CreateTaskManagerSerializer(bool bForceRecreate)
 	{
-		if (!DeleteFile(pathTaskManager.ToString()))
+		TSmartPath pathTaskManager = m_pathSerializeDir + PathFromString(_T("tasks.sqlite"));
+
+		if (bForceRecreate)
 		{
-			DWORD dwLastError = GetLastError();
-			if (dwLastError != ERROR_FILE_NOT_FOUND)
-				THROW_CORE_EXCEPTION_WIN32(eErr_CannotDeleteFile, dwLastError);
+			if (!DeleteFile(pathTaskManager.ToString()))
+			{
+				DWORD dwLastError = GetLastError();
+				if (dwLastError != ERROR_FILE_NOT_FOUND)
+					THROW_CORE_EXCEPTION_WIN32(eErr_CannotDeleteFile, dwLastError);
+			}
 		}
-	}
 
-	TSQLiteSerializerPtr spSerializer(boost::make_shared<TSQLiteSerializer>(
-		pathTaskManager,
-		boost::make_shared<TSQLiteTaskManagerSchema>()));
+		TSQLiteSerializerPtr spSerializer(boost::make_shared<TSQLiteSerializer>(
+			pathTaskManager,
+			boost::make_shared<TSQLiteTaskManagerSchema>()));
 
-	return spSerializer;
-}
-
-ISerializerPtr TSQLiteSerializerFactory::CreateTaskSerializer(const TString& strNameHint, bool bForceRecreate)
-{
-	TString strName(strNameHint);
-	if (strName.IsEmpty())
-	{
-		boost::uuids::random_generator gen;
-		boost::uuids::uuid u = gen();
-		strName = boost::lexical_cast<std::wstring>(u).c_str();
+		return spSerializer;
 	}
 
-	TSmartPath pathTask = PathFromWString(strName);
-	if (!pathTask.HasFileRoot())
+	ISerializerPtr TSQLiteSerializerFactory::CreateTaskSerializer(const TString& strNameHint, bool bForceRecreate)
 	{
-		if (!strName.EndsWithNoCase(_T(".sqlite")))
-			strName += _T(".sqlite");
+		TString strName(strNameHint);
+		if (strName.IsEmpty())
+		{
+			boost::uuids::random_generator gen;
+			boost::uuids::uuid u = gen();
+			strName = boost::lexical_cast<std::wstring>(u).c_str();
+		}
 
-		pathTask = m_pathSerializeDir;
-		pathTask += PathFromWString(strName);
-	}
+		TSmartPath pathTask = PathFromWString(strName);
+		if (!pathTask.HasFileRoot())
+		{
+			if (!strName.EndsWithNoCase(_T(".sqlite")))
+				strName += _T(".sqlite");
 
-	if (bForceRecreate)
-	{
-		if (!DeleteFile(pathTask.ToString()))
+			pathTask = m_pathSerializeDir;
+			pathTask += PathFromWString(strName);
+		}
+
+		if (bForceRecreate)
 		{
-			DWORD dwLastError = GetLastError();
-			if (dwLastError != ERROR_FILE_NOT_FOUND)
-				THROW_CORE_EXCEPTION_WIN32(eErr_CannotDeleteFile, dwLastError);
+			if (!DeleteFile(pathTask.ToString()))
+			{
+				DWORD dwLastError = GetLastError();
+				if (dwLastError != ERROR_FILE_NOT_FOUND)
+					THROW_CORE_EXCEPTION_WIN32(eErr_CannotDeleteFile, dwLastError);
+			}
 		}
-	}
 
-	TSQLiteSerializerPtr spSerializer(boost::make_shared<TSQLiteSerializer>(pathTask, boost::make_shared<TSQLiteTaskSchema>()));
+		TSQLiteSerializerPtr spSerializer(boost::make_shared<TSQLiteSerializer>(pathTask, boost::make_shared<TSQLiteTaskSchema>()));
 
-	return spSerializer;
+		return spSerializer;
+	}
 }
-
-END_CHCORE_NAMESPACE