Index: src/libchcore/TFeedbackHandlerBase.cpp
===================================================================
diff -u -N -r8a2ff3b2b71b45fb525e030167e62f316cb32869 -ra4635addad389b9e117679437a3e1b64a739ea96
--- src/libchcore/TFeedbackHandlerBase.cpp	(.../TFeedbackHandlerBase.cpp)	(revision 8a2ff3b2b71b45fb525e030167e62f316cb32869)
+++ src/libchcore/TFeedbackHandlerBase.cpp	(.../TFeedbackHandlerBase.cpp)	(revision a4635addad389b9e117679437a3e1b64a739ea96)
@@ -1,183 +1,183 @@
-// ============================================================================
-//  Copyright (C) 2001-2015 by Jozef Starosczyk
-//  ixen@copyhandler.com
-//
-//  This program is free software; you can redistribute it and/or modify
-//  it under the terms of the GNU Library General Public License
-//  (version 2) as published by the Free Software Foundation;
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU Library General Public
-//  License along with this program; if not, write to the
-//  Free Software Foundation, Inc.,
-//  59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-// ============================================================================
-#include "stdafx.h"
-#include "TFeedbackHandlerBase.h"
-#include "SerializerDataTypes.h"
-#include "ISerializerContainer.h"
-#include <boost/thread/locks.hpp>
-
-namespace chcore
-{
-	TFeedbackHandlerBase::TFeedbackHandlerBase() :
-		m_eFileError(m_setModifications, EFeedbackResult::eResult_Unknown),
-		m_eFileAlreadyExists(m_setModifications, EFeedbackResult::eResult_Unknown),
-		m_eNotEnoughSpace(m_setModifications, EFeedbackResult::eResult_Unknown),
-		m_eOperationFinished(m_setModifications, EFeedbackResult::eResult_Unknown),
-		m_eOperationError(m_setModifications, EFeedbackResult::eResult_Unknown)
-	{
-		m_setModifications[eMod_Added] = true;
-	}
-
-	TFeedbackHandlerBase::~TFeedbackHandlerBase()
-	{
-	}
-
-	void TFeedbackHandlerBase::SetFileErrorPermanentResponse(EFeedbackResult ePermanentResult)
-	{
-		boost::unique_lock<boost::shared_mutex> lock(m_lock);
-		m_eFileError = ePermanentResult;
-	}
-
-	EFeedbackResult TFeedbackHandlerBase::GetFileErrorPermanentResponse() const
-	{
-		boost::shared_lock<boost::shared_mutex> lock(m_lock);
-		return m_eFileError;
-	}
-
-	bool TFeedbackHandlerBase::HasFileErrorPermanentResponse(EFeedbackResult& rePermanentResult) const
-	{
-		boost::shared_lock<boost::shared_mutex> lock(m_lock);
-		rePermanentResult = m_eFileError;
-		return rePermanentResult != EFeedbackResult::eResult_Unknown;
-	}
-
-	void TFeedbackHandlerBase::SetFileAlreadyExistsPermanentResponse(EFeedbackResult ePermanentResult)
-	{
-		boost::unique_lock<boost::shared_mutex> lock(m_lock);
-		m_eFileAlreadyExists = ePermanentResult;
-	}
-
-	EFeedbackResult TFeedbackHandlerBase::GetFileAlreadyExistsPermanentResponse() const
-	{
-		boost::shared_lock<boost::shared_mutex> lock(m_lock);
-		return m_eFileAlreadyExists;
-	}
-
-	bool TFeedbackHandlerBase::HasFileAlreadyExistsPermanentResponse(EFeedbackResult& rePermanentResult) const
-	{
-		boost::shared_lock<boost::shared_mutex> lock(m_lock);
-		rePermanentResult = m_eFileAlreadyExists;
-		return rePermanentResult != EFeedbackResult::eResult_Unknown;
-	}
-
-	void TFeedbackHandlerBase::SetNotEnoughSpacePermanentResponse(EFeedbackResult ePermanentResult)
-	{
-		boost::unique_lock<boost::shared_mutex> lock(m_lock);
-		m_eNotEnoughSpace = ePermanentResult;
-	}
-
-	EFeedbackResult TFeedbackHandlerBase::GetNotEnoughSpacePermanentResponse() const
-	{
-		boost::shared_lock<boost::shared_mutex> lock(m_lock);
-		return m_eNotEnoughSpace;
-	}
-
-	bool TFeedbackHandlerBase::HasNotEnoughSpacePermanentResponse(EFeedbackResult& rePermanentResult) const
-	{
-		boost::shared_lock<boost::shared_mutex> lock(m_lock);
-		rePermanentResult = m_eNotEnoughSpace;
-		return rePermanentResult != EFeedbackResult::eResult_Unknown;
-	}
-
-	void TFeedbackHandlerBase::Store(const ISerializerContainerPtr& spContainer) const
-	{
-		boost::shared_lock<boost::shared_mutex> lock(m_lock);
-
-		if (m_setModifications.any())
-		{
-			InitColumns(spContainer);
-
-			bool bAdded = m_setModifications[eMod_Added];
-			ISerializerRowData& rRowData = spContainer->GetRow(0, bAdded);
-
-			if (bAdded || m_eFileError.IsModified())
-				rRowData.SetValue(_T("file_error"), m_eFileError);
-
-			if (bAdded || m_eFileAlreadyExists.IsModified())
-				rRowData.SetValue(_T("file_already_exists"), m_eFileAlreadyExists);
-
-			if (bAdded || m_eNotEnoughSpace.IsModified())
-				rRowData.SetValue(_T("not_enough_space"), m_eNotEnoughSpace);
-
-			if (bAdded || m_eOperationFinished.IsModified())
-				rRowData.SetValue(_T("operation_finished"), m_eOperationFinished);
-
-			if (bAdded || m_eOperationError.IsModified())
-				rRowData.SetValue(_T("operation_error"), m_eOperationError);
-
-			m_setModifications.reset();
-		}
-	}
-
-	void TFeedbackHandlerBase::InitColumns(const ISerializerContainerPtr& spContainer)
-	{
-		IColumnsDefinition& rColumnDefs = spContainer->GetColumnsDefinition();
-		if (rColumnDefs.IsEmpty())
-		{
-			rColumnDefs.AddColumn(_T("id"), ColumnType<object_id_t>::value);
-			rColumnDefs.AddColumn(_T("file_error"), IColumnsDefinition::eType_int);
-			rColumnDefs.AddColumn(_T("file_already_exists"), IColumnsDefinition::eType_int);
-			rColumnDefs.AddColumn(_T("not_enough_space"), IColumnsDefinition::eType_int);
-			rColumnDefs.AddColumn(_T("operation_finished"), IColumnsDefinition::eType_int);
-			rColumnDefs.AddColumn(_T("operation_error"), IColumnsDefinition::eType_int);
-		}
-	}
-
-	void TFeedbackHandlerBase::Load(const ISerializerContainerPtr& spContainer)
-	{
-		boost::unique_lock<boost::shared_mutex> lock(m_lock);
-
-		InitColumns(spContainer);
-		ISerializerRowReaderPtr spRowReader = spContainer->GetRowReader();
-		if (spRowReader->Next())
-		{
-			int iFeedbackResult = eResult_Unknown;
-
-			spRowReader->GetValue(_T("file_error"), iFeedbackResult);
-			m_eFileError = (EFeedbackResult)iFeedbackResult;
-
-			spRowReader->GetValue(_T("file_already_exists"), iFeedbackResult);
-			m_eFileAlreadyExists = (EFeedbackResult)iFeedbackResult;
-			spRowReader->GetValue(_T("not_enough_space"), iFeedbackResult);
-			m_eNotEnoughSpace = (EFeedbackResult)iFeedbackResult;
-			spRowReader->GetValue(_T("operation_finished"), iFeedbackResult);
-			m_eOperationFinished = (EFeedbackResult)iFeedbackResult;
-			spRowReader->GetValue(_T("operation_error"), iFeedbackResult);
-			m_eOperationError = (EFeedbackResult)iFeedbackResult;
-
-			m_setModifications.reset();
-		}
-	}
-
-	DWORD TFeedbackHandlerBase::GetRetryInterval() const
-	{
-		return 100;
-	}
-
-	void TFeedbackHandlerBase::RestoreDefaults()
-	{
-		boost::unique_lock<boost::shared_mutex> lock(m_lock);
-
-		m_eFileError = EFeedbackResult::eResult_Unknown;
-		m_eFileAlreadyExists = EFeedbackResult::eResult_Unknown;
-		m_eNotEnoughSpace = EFeedbackResult::eResult_Unknown;
-		m_eOperationFinished = EFeedbackResult::eResult_Unknown;
-		m_eOperationError = EFeedbackResult::eResult_Unknown;
-	}
-}
+// ============================================================================
+//  Copyright (C) 2001-2015 by Jozef Starosczyk
+//  ixen@copyhandler.com
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU Library General Public License
+//  (version 2) as published by the Free Software Foundation;
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU Library General Public
+//  License along with this program; if not, write to the
+//  Free Software Foundation, Inc.,
+//  59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// ============================================================================
+#include "stdafx.h"
+#include "TFeedbackHandlerBase.h"
+#include "SerializerDataTypes.h"
+#include "ISerializerContainer.h"
+#include <boost/thread/locks.hpp>
+
+namespace chcore
+{
+	TFeedbackHandlerBase::TFeedbackHandlerBase() :
+		m_eFileError(m_setModifications, EFeedbackResult::eResult_Unknown),
+		m_eFileAlreadyExists(m_setModifications, EFeedbackResult::eResult_Unknown),
+		m_eNotEnoughSpace(m_setModifications, EFeedbackResult::eResult_Unknown),
+		m_eOperationFinished(m_setModifications, EFeedbackResult::eResult_Unknown),
+		m_eOperationError(m_setModifications, EFeedbackResult::eResult_Unknown)
+	{
+		m_setModifications[eMod_Added] = true;
+	}
+
+	TFeedbackHandlerBase::~TFeedbackHandlerBase()
+	{
+	}
+
+	void TFeedbackHandlerBase::SetFileErrorPermanentResponse(EFeedbackResult ePermanentResult)
+	{
+		boost::unique_lock<boost::shared_mutex> lock(m_lock);
+		m_eFileError = ePermanentResult;
+	}
+
+	EFeedbackResult TFeedbackHandlerBase::GetFileErrorPermanentResponse() const
+	{
+		boost::shared_lock<boost::shared_mutex> lock(m_lock);
+		return m_eFileError;
+	}
+
+	bool TFeedbackHandlerBase::HasFileErrorPermanentResponse(EFeedbackResult& rePermanentResult) const
+	{
+		boost::shared_lock<boost::shared_mutex> lock(m_lock);
+		rePermanentResult = m_eFileError;
+		return rePermanentResult != EFeedbackResult::eResult_Unknown;
+	}
+
+	void TFeedbackHandlerBase::SetFileAlreadyExistsPermanentResponse(EFeedbackResult ePermanentResult)
+	{
+		boost::unique_lock<boost::shared_mutex> lock(m_lock);
+		m_eFileAlreadyExists = ePermanentResult;
+	}
+
+	EFeedbackResult TFeedbackHandlerBase::GetFileAlreadyExistsPermanentResponse() const
+	{
+		boost::shared_lock<boost::shared_mutex> lock(m_lock);
+		return m_eFileAlreadyExists;
+	}
+
+	bool TFeedbackHandlerBase::HasFileAlreadyExistsPermanentResponse(EFeedbackResult& rePermanentResult) const
+	{
+		boost::shared_lock<boost::shared_mutex> lock(m_lock);
+		rePermanentResult = m_eFileAlreadyExists;
+		return rePermanentResult != EFeedbackResult::eResult_Unknown;
+	}
+
+	void TFeedbackHandlerBase::SetNotEnoughSpacePermanentResponse(EFeedbackResult ePermanentResult)
+	{
+		boost::unique_lock<boost::shared_mutex> lock(m_lock);
+		m_eNotEnoughSpace = ePermanentResult;
+	}
+
+	EFeedbackResult TFeedbackHandlerBase::GetNotEnoughSpacePermanentResponse() const
+	{
+		boost::shared_lock<boost::shared_mutex> lock(m_lock);
+		return m_eNotEnoughSpace;
+	}
+
+	bool TFeedbackHandlerBase::HasNotEnoughSpacePermanentResponse(EFeedbackResult& rePermanentResult) const
+	{
+		boost::shared_lock<boost::shared_mutex> lock(m_lock);
+		rePermanentResult = m_eNotEnoughSpace;
+		return rePermanentResult != EFeedbackResult::eResult_Unknown;
+	}
+
+	void TFeedbackHandlerBase::Store(const ISerializerContainerPtr& spContainer) const
+	{
+		boost::shared_lock<boost::shared_mutex> lock(m_lock);
+
+		if (m_setModifications.any())
+		{
+			InitColumns(spContainer);
+
+			bool bAdded = m_setModifications[eMod_Added];
+			ISerializerRowData& rRowData = spContainer->GetRow(0, bAdded);
+
+			if (bAdded || m_eFileError.IsModified())
+				rRowData.SetValue(_T("file_error"), m_eFileError);
+
+			if (bAdded || m_eFileAlreadyExists.IsModified())
+				rRowData.SetValue(_T("file_already_exists"), m_eFileAlreadyExists);
+
+			if (bAdded || m_eNotEnoughSpace.IsModified())
+				rRowData.SetValue(_T("not_enough_space"), m_eNotEnoughSpace);
+
+			if (bAdded || m_eOperationFinished.IsModified())
+				rRowData.SetValue(_T("operation_finished"), m_eOperationFinished);
+
+			if (bAdded || m_eOperationError.IsModified())
+				rRowData.SetValue(_T("operation_error"), m_eOperationError);
+
+			m_setModifications.reset();
+		}
+	}
+
+	void TFeedbackHandlerBase::InitColumns(const ISerializerContainerPtr& spContainer)
+	{
+		IColumnsDefinition& rColumnDefs = spContainer->GetColumnsDefinition();
+		if (rColumnDefs.IsEmpty())
+		{
+			rColumnDefs.AddColumn(_T("id"), ColumnType<object_id_t>::value);
+			rColumnDefs.AddColumn(_T("file_error"), IColumnsDefinition::eType_int);
+			rColumnDefs.AddColumn(_T("file_already_exists"), IColumnsDefinition::eType_int);
+			rColumnDefs.AddColumn(_T("not_enough_space"), IColumnsDefinition::eType_int);
+			rColumnDefs.AddColumn(_T("operation_finished"), IColumnsDefinition::eType_int);
+			rColumnDefs.AddColumn(_T("operation_error"), IColumnsDefinition::eType_int);
+		}
+	}
+
+	void TFeedbackHandlerBase::Load(const ISerializerContainerPtr& spContainer)
+	{
+		boost::unique_lock<boost::shared_mutex> lock(m_lock);
+
+		InitColumns(spContainer);
+		ISerializerRowReaderPtr spRowReader = spContainer->GetRowReader();
+		if (spRowReader->Next())
+		{
+			int iFeedbackResult = eResult_Unknown;
+
+			spRowReader->GetValue(_T("file_error"), iFeedbackResult);
+			m_eFileError = (EFeedbackResult)iFeedbackResult;
+
+			spRowReader->GetValue(_T("file_already_exists"), iFeedbackResult);
+			m_eFileAlreadyExists = (EFeedbackResult)iFeedbackResult;
+			spRowReader->GetValue(_T("not_enough_space"), iFeedbackResult);
+			m_eNotEnoughSpace = (EFeedbackResult)iFeedbackResult;
+			spRowReader->GetValue(_T("operation_finished"), iFeedbackResult);
+			m_eOperationFinished = (EFeedbackResult)iFeedbackResult;
+			spRowReader->GetValue(_T("operation_error"), iFeedbackResult);
+			m_eOperationError = (EFeedbackResult)iFeedbackResult;
+
+			m_setModifications.reset();
+		}
+	}
+
+	DWORD TFeedbackHandlerBase::GetRetryInterval() const
+	{
+		return 100;
+	}
+
+	void TFeedbackHandlerBase::RestoreDefaults()
+	{
+		boost::unique_lock<boost::shared_mutex> lock(m_lock);
+
+		m_eFileError = EFeedbackResult::eResult_Unknown;
+		m_eFileAlreadyExists = EFeedbackResult::eResult_Unknown;
+		m_eNotEnoughSpace = EFeedbackResult::eResult_Unknown;
+		m_eOperationFinished = EFeedbackResult::eResult_Unknown;
+		m_eOperationError = EFeedbackResult::eResult_Unknown;
+	}
+}