Index: src/ch/FeedbackHandler.cpp
===================================================================
diff -u -N -re912e0a6b456c2eed24bec7303a908d3ff0aa59a -rd5c3edd0d167db9b5d47d04248820fda49499a5e
--- src/ch/FeedbackHandler.cpp (.../FeedbackHandler.cpp) (revision e912e0a6b456c2eed24bec7303a908d3ff0aa59a)
+++ src/ch/FeedbackHandler.cpp (.../FeedbackHandler.cpp) (revision d5c3edd0d167db9b5d47d04248820fda49499a5e)
@@ -1,108 +1,108 @@
-/***************************************************************************
- * Copyright (C) 2001-2008 by J�zef 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 "FeedbackHandler.h"
-#include "FeedbackReplaceDlg.h"
-#include "FeedbackFileErrorDlg.h"
-#include "FeedbackNotEnoughSpaceDlg.h"
-
-CFeedbackHandler::CFeedbackHandler() :
- chcore::IFeedbackHandler()
-{
- memset(m_aeFeedbackTypeStatus, 0, sizeof(m_aeFeedbackTypeStatus));
-}
-
-CFeedbackHandler::~CFeedbackHandler()
-{
-
-}
-
-ull_t CFeedbackHandler::RequestFeedback(ull_t ullFeedbackID, ptr_t pFeedbackParam)
-{
- BOOST_ASSERT(pFeedbackParam && ullFeedbackID < eFT_LastType);
- if(!pFeedbackParam || ullFeedbackID >= eFT_LastType)
- return eResult_Unknown;
-
- // if we have an action selected for this type (e.g. by selecting 'use for all items')
- if(m_aeFeedbackTypeStatus[ullFeedbackID] != eResult_Unknown)
- return m_aeFeedbackTypeStatus[ullFeedbackID];
-
- // standard processing of feedback
- EFeedbackResult eFeedbackResult = eResult_Unknown;
- BOOL bUseForAllItems = FALSE;
- switch(ullFeedbackID)
- {
- case eFT_FileAlreadyExists:
- {
- FEEDBACK_ALREADYEXISTS* pData = (FEEDBACK_ALREADYEXISTS*)pFeedbackParam;
- CFeedbackReplaceDlg dlg(pData->pfiSrc, pData->pfiDst);
- eFeedbackResult = (EFeedbackResult)dlg.DoModal();
- bUseForAllItems = dlg.m_bAllItems;
-
- break;
- }
- case eFT_FileError:
- {
- FEEDBACK_FILEERROR* pData = (FEEDBACK_FILEERROR*)pFeedbackParam;
- CFeedbackFileErrorDlg dlg(pData->pszPath, pData->ulError);
- eFeedbackResult = (EFeedbackResult)dlg.DoModal();
- bUseForAllItems = dlg.m_bAllItems;
-
- break;
- }
- case eFT_NotEnoughSpace:
- {
- FEEDBACK_NOTENOUGHSPACE* pData = (FEEDBACK_NOTENOUGHSPACE*)pFeedbackParam;
- CFeedbackNotEnoughSpaceDlg dlg(pData->ullRequiredSize, pData->pszSrcPath, pData->pszDstPath);
- eFeedbackResult = (EFeedbackResult)dlg.DoModal();
- bUseForAllItems = dlg.m_bAllItems;
-
- break;
- }
- default:
- BOOST_ASSERT(false);
- return eResult_Unknown;
- }
-
- // remember feedback option for next time
- if(bUseForAllItems)
- m_aeFeedbackTypeStatus[ullFeedbackID] = eFeedbackResult;
-
- return eFeedbackResult;
-}
-
-void CFeedbackHandler::Delete()
-{
- delete this;
-}
-
-chcore::IFeedbackHandler* CFeedbackHandlerFactory::Create()
-{
- return new CFeedbackHandler;
-}
-
-chcore::IFeedbackHandlerFactory* CFeedbackHandlerFactory::CreateFactory()
-{
- return new CFeedbackHandlerFactory;
-}
-
-void CFeedbackHandlerFactory::Delete()
-{
- delete this;
-}
+/***************************************************************************
+ * Copyright (C) 2001-2008 by J�zef 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 "FeedbackHandler.h"
+#include "FeedbackReplaceDlg.h"
+#include "FeedbackFileErrorDlg.h"
+#include "FeedbackNotEnoughSpaceDlg.h"
+
+CFeedbackHandler::CFeedbackHandler() :
+ chcore::IFeedbackHandler()
+{
+ memset(m_aeFeedbackTypeStatus, 0, sizeof(m_aeFeedbackTypeStatus));
+}
+
+CFeedbackHandler::~CFeedbackHandler()
+{
+
+}
+
+ull_t CFeedbackHandler::RequestFeedback(ull_t ullFeedbackID, ptr_t pFeedbackParam)
+{
+ BOOST_ASSERT(pFeedbackParam && ullFeedbackID < eFT_LastType);
+ if(!pFeedbackParam || ullFeedbackID >= eFT_LastType)
+ return eResult_Unknown;
+
+ // if we have an action selected for this type (e.g. by selecting 'use for all items')
+ if(m_aeFeedbackTypeStatus[ullFeedbackID] != eResult_Unknown)
+ return m_aeFeedbackTypeStatus[ullFeedbackID];
+
+ // standard processing of feedback
+ EFeedbackResult eFeedbackResult = eResult_Unknown;
+ BOOL bUseForAllItems = FALSE;
+ switch(ullFeedbackID)
+ {
+ case eFT_FileAlreadyExists:
+ {
+ FEEDBACK_ALREADYEXISTS* pData = (FEEDBACK_ALREADYEXISTS*)pFeedbackParam;
+ CFeedbackReplaceDlg dlg(pData->pfiSrc, pData->pfiDst);
+ eFeedbackResult = (EFeedbackResult)dlg.DoModal();
+ bUseForAllItems = dlg.m_bAllItems;
+
+ break;
+ }
+ case eFT_FileError:
+ {
+ FEEDBACK_FILEERROR* pData = (FEEDBACK_FILEERROR*)pFeedbackParam;
+ CFeedbackFileErrorDlg dlg(pData->pszPath, pData->ulError);
+ eFeedbackResult = (EFeedbackResult)dlg.DoModal();
+ bUseForAllItems = dlg.m_bAllItems;
+
+ break;
+ }
+ case eFT_NotEnoughSpace:
+ {
+ FEEDBACK_NOTENOUGHSPACE* pData = (FEEDBACK_NOTENOUGHSPACE*)pFeedbackParam;
+ CFeedbackNotEnoughSpaceDlg dlg(pData->ullRequiredSize, pData->pszSrcPath, pData->pszDstPath);
+ eFeedbackResult = (EFeedbackResult)dlg.DoModal();
+ bUseForAllItems = dlg.m_bAllItems;
+
+ break;
+ }
+ default:
+ BOOST_ASSERT(false);
+ return eResult_Unknown;
+ }
+
+ // remember feedback option for next time
+ if(bUseForAllItems)
+ m_aeFeedbackTypeStatus[ullFeedbackID] = eFeedbackResult;
+
+ return eFeedbackResult;
+}
+
+void CFeedbackHandler::Delete()
+{
+ delete this;
+}
+
+chcore::IFeedbackHandler* CFeedbackHandlerFactory::Create()
+{
+ return new CFeedbackHandler;
+}
+
+chcore::IFeedbackHandlerFactory* CFeedbackHandlerFactory::CreateFactory()
+{
+ return new CFeedbackHandlerFactory;
+}
+
+void CFeedbackHandlerFactory::Delete()
+{
+ delete this;
+}