Index: src/ch/AboutDlg.cpp
===================================================================
diff -u -ra27d1acf1bda3c25b6dcce0d0eb0278009ce63ae -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ch/AboutDlg.cpp (.../AboutDlg.cpp) (revision a27d1acf1bda3c25b6dcce0d0eb0278009ce63ae)
+++ src/ch/AboutDlg.cpp (.../AboutDlg.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -29,7 +29,7 @@
bool CAboutDlg::m_bLock=false;
-CAboutDlg::CAboutDlg() :ictranslate::CLanguageDialog(CAboutDlg::IDD, NULL, &m_bLock)
+CAboutDlg::CAboutDlg() :ictranslate::CLanguageDialog(IDD_ABOUTBOX, NULL, &m_bLock)
{
//{{AFX_DATA_INIT(CAboutDlg)
//}}AFX_DATA_INIT
Index: src/ch/AboutDlg.h
===================================================================
diff -u -rb46e69bed7377207f670be1fdbe84bc2e3d11e30 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ch/AboutDlg.h (.../AboutDlg.h) (revision b46e69bed7377207f670be1fdbe84bc2e3d11e30)
+++ src/ch/AboutDlg.h (.../AboutDlg.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -31,9 +31,6 @@
virtual void OnLanguageChanged();
virtual BOOL OnTooltipText(UINT uiID, TOOLTIPTEXT* pTip);
-// Dialog Data
- enum { IDD = IDD_ABOUTBOX };
-
protected:
static bool m_bLock; // locker
Index: src/ch/ClipboardMonitor.cpp
===================================================================
diff -u -r25129f39720523eca2cb702242890a7862f70ec6 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ch/ClipboardMonitor.cpp (.../ClipboardMonitor.cpp) (revision 25129f39720523eca2cb702242890a7862f70ec6)
+++ src/ch/ClipboardMonitor.cpp (.../ClipboardMonitor.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -30,6 +30,7 @@
#include "ShutdownDlg.h"
#include "DirectoryChooser.h"
#include "TTaskManagerWrapper.h"
+#include "resource.h"
using namespace chcore;
Index: src/ch/CrashDlg.cpp
===================================================================
diff -u -rd5c3edd0d167db9b5d47d04248820fda49499a5e -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ch/CrashDlg.cpp (.../CrashDlg.cpp) (revision d5c3edd0d167db9b5d47d04248820fda49499a5e)
+++ src/ch/CrashDlg.cpp (.../CrashDlg.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -23,6 +23,7 @@
#include "ch.h"
#include "CrashDlg.h"
#include "../common/version.h"
+#include "resource.h"
#define IDS_CRASH_TITLE _T("Application crashed")
#define IDS_STATIC_INFO _T("Copy Handler encountered an internal problem and will be closed.\n\nIf you want to help correct this problem in the future releases of program you can send the crash information to the author of this program (e-mail it to ixen@copyhandler.com).")
@@ -36,7 +37,7 @@
IMPLEMENT_DYNAMIC(CCrashDlg,ictranslate::CLanguageDialog)
CCrashDlg::CCrashDlg(bool bResult, PCTSTR pszFilename, CWnd* pParent /*=NULL*/)
- : CDialog(CCrashDlg::IDD, pParent),
+ : CDialog(IDD_CRASH_DIALOG, pParent),
m_bResult(bResult),
m_strFilename(pszFilename)
{
Index: src/ch/CrashDlg.h
===================================================================
diff -u -r449a5b399ab21ca0d06050b47b264f2f704af966 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ch/CrashDlg.h (.../CrashDlg.h) (revision 449a5b399ab21ca0d06050b47b264f2f704af966)
+++ src/ch/CrashDlg.h (.../CrashDlg.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -30,9 +30,6 @@
virtual BOOL OnInitDialog();
-// Dialog Data
- enum { IDD = IDD_CRASH_DIALOG };
-
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
Index: src/ch/CustomCopyDlg.cpp
===================================================================
diff -u -rad5d0d4f8d4cf517fd3ebfc13e876d08c8cb9f62 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ch/CustomCopyDlg.cpp (.../CustomCopyDlg.cpp) (revision ad5d0d4f8d4cf517fd3ebfc13e876d08c8cb9f62)
+++ src/ch/CustomCopyDlg.cpp (.../CustomCopyDlg.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -28,6 +28,7 @@
#include "StringHelpers.h"
#include "ch.h"
#include "../libchcore/TTaskConfigBufferSizes.h"
+#include "CfgProperties.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -40,13 +41,13 @@
CCustomCopyDlg::CCustomCopyDlg() :
- ictranslate::CLanguageDialog(CCustomCopyDlg::IDD)
+ ictranslate::CLanguageDialog(IDD_CUSTOM_COPY_DIALOG)
{
GetConfig().ExtractSubConfig(BRANCH_TASK_SETTINGS, m_tTaskDefinition.GetConfiguration());
}
CCustomCopyDlg::CCustomCopyDlg(const chcore::TTaskDefinition& rTaskDefinition) :
- ictranslate::CLanguageDialog(CCustomCopyDlg::IDD),
+ ictranslate::CLanguageDialog(IDD_CUSTOM_COPY_DIALOG),
m_tTaskDefinition(rTaskDefinition)
{
}
@@ -604,11 +605,11 @@
if (rFilter.GetUseSize1())
{
- strLoaded.Format(_T("%s %s"), GetResManager().LoadString(IDS_LT_STRING+rFilter.GetSizeType1()), GetSizeString(rFilter.GetSize1(), true));
+ strLoaded.Format(_T("%s %s"), GetResManager().LoadString(IDS_LT_STRING+rFilter.GetSizeType1()), (PCTSTR)GetSizeString(rFilter.GetSize1(), true));
if (rFilter.GetUseSize2())
{
strLoaded += GetResManager().LoadString(IDS_AND_STRING);
- strLoaded.AppendFormat(_T("%s %s"), GetResManager().LoadString(IDS_LT_STRING+rFilter.GetSizeType2()), GetSizeString(rFilter.GetSize2(), true));
+ strLoaded.AppendFormat(_T("%s %s"), GetResManager().LoadString(IDS_LT_STRING+rFilter.GetSizeType2()), (PCTSTR)GetSizeString(rFilter.GetSize2(), true));
}
}
else
Index: src/ch/CustomCopyDlg.h
===================================================================
diff -u -r926b1177cffa2face218fabb3d8af71910d1b8e5 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ch/CustomCopyDlg.h (.../CustomCopyDlg.h) (revision 926b1177cffa2face218fabb3d8af71910d1b8e5)
+++ src/ch/CustomCopyDlg.h (.../CustomCopyDlg.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -34,9 +34,6 @@
CCustomCopyDlg(); // standard constructor
explicit CCustomCopyDlg(const chcore::TTaskDefinition& rTaskDefinition);
-// Dialog Data
- enum { IDD = IDD_CUSTOM_COPY_DIALOG };
-
// Overrides
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
Index: src/ch/DirTreeCtrl.cpp
===================================================================
diff -u -r86c2327549cd4fa98972cf9035f9a78451a00f88 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ch/DirTreeCtrl.cpp (.../DirTreeCtrl.cpp) (revision 86c2327549cd4fa98972cf9035f9a78451a00f88)
+++ src/ch/DirTreeCtrl.cpp (.../DirTreeCtrl.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -489,8 +489,6 @@
EnsureVisible(hItem);
SelectItem(hItem);
return Expand(hItem, TVE_EXPAND) != 0;
-
- break;
}
default:
return Expand(hItem, nCode) != 0;
Index: src/ch/DirTreeCtrl.h
===================================================================
diff -u -r90e8a7720fc23cf282e486c7b2bc1dc590b5d74c -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ch/DirTreeCtrl.h (.../DirTreeCtrl.h) (revision 90e8a7720fc23cf282e486c7b2bc1dc590b5d74c)
+++ src/ch/DirTreeCtrl.h (.../DirTreeCtrl.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -64,8 +64,6 @@
#ifndef __DIRTREECTRL_H__
#define __DIRTREECTRL_H__
-#include "shlobj.h"
-
// Functions that deal with PIDLs
LPITEMIDLIST ConcatPidls(LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2);
LPITEMIDLIST CopyITEMID(LPMALLOC lpMalloc, LPITEMIDLIST lpi);
Index: src/ch/DirectoryChooser.cpp
===================================================================
diff -u -r8b7479db2ee71a3d00779c67fe6a1b1d9ec414b8 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ch/DirectoryChooser.cpp (.../DirectoryChooser.cpp) (revision 8b7479db2ee71a3d00779c67fe6a1b1d9ec414b8)
+++ src/ch/DirectoryChooser.cpp (.../DirectoryChooser.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -22,6 +22,8 @@
#include "FolderDialog.h"
#include "..\libchcore\TPathContainer.h"
#include "..\libchcore\TPath.h"
+#include "CfgProperties.h"
+#include "resource.h"
namespace DirectoryChooser
{
Index: src/ch/FeedbackFileErrorDlg.cpp
===================================================================
diff -u -ra27d1acf1bda3c25b6dcce0d0eb0278009ce63ae -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ch/FeedbackFileErrorDlg.cpp (.../FeedbackFileErrorDlg.cpp) (revision a27d1acf1bda3c25b6dcce0d0eb0278009ce63ae)
+++ src/ch/FeedbackFileErrorDlg.cpp (.../FeedbackFileErrorDlg.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -7,6 +7,7 @@
#include "FeedbackFileErrorDlg.h"
#include "FeedbackHandler.h"
#include "../libchcore/TWin32ErrorFormatter.h"
+#include "resource.h"
// CFeedbackFileErrorDlg dialog
Index: src/ch/FeedbackHandler.cpp
===================================================================
diff -u -r5d8ca703882285442606338c1acfc5fff6084e59 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ch/FeedbackHandler.cpp (.../FeedbackHandler.cpp) (revision 5d8ca703882285442606338c1acfc5fff6084e59)
+++ src/ch/FeedbackHandler.cpp (.../FeedbackHandler.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -24,6 +24,7 @@
#include "FeedbackNotEnoughSpaceDlg.h"
#include "ch.h"
#include "mmsystem.h"
+#include "CfgProperties.h"
using namespace chcore;
Index: src/ch/FeedbackHandler.h
===================================================================
diff -u -r4d1f8110906889d56552771fb58a6de86bc54a29 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ch/FeedbackHandler.h (.../FeedbackHandler.h) (revision 4d1f8110906889d56552771fb58a6de86bc54a29)
+++ src/ch/FeedbackHandler.h (.../FeedbackHandler.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -19,9 +19,7 @@
#ifndef __FEEDBACKHANDLER_H__
#define __FEEDBACKHANDLER_H__
-#include "../libchcore/IFeedbackHandlerFactory.h"
#include "../libchcore/TFeedbackHandlerBase.h"
-#include "../libchcore/EFeedbackResult.h"
#include "../libchcore/EFileError.h"
#include "../libchcore/TFeedbackResult.h"
@@ -41,6 +39,6 @@
friend class CFeedbackHandlerFactory;
};
-typedef boost::shared_ptr<CFeedbackHandler> CFeedbackHandlerPtr;
+typedef std::shared_ptr<CFeedbackHandler> CFeedbackHandlerPtr;
#endif
Index: src/ch/FeedbackHandlerFactory.cpp
===================================================================
diff -u -r671f4b1792a20d98b186f4e0a9cc6a620dede019 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ch/FeedbackHandlerFactory.cpp (.../FeedbackHandlerFactory.cpp) (revision 671f4b1792a20d98b186f4e0a9cc6a620dede019)
+++ src/ch/FeedbackHandlerFactory.cpp (.../FeedbackHandlerFactory.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -30,5 +30,5 @@
chcore::IFeedbackHandlerPtr CFeedbackHandlerFactory::Create()
{
- return boost::make_shared<CFeedbackHandler>();
+ return std::make_shared<CFeedbackHandler>();
}
Index: src/ch/FeedbackHandlerFactory.h
===================================================================
diff -u -r671f4b1792a20d98b186f4e0a9cc6a620dede019 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ch/FeedbackHandlerFactory.h (.../FeedbackHandlerFactory.h) (revision 671f4b1792a20d98b186f4e0a9cc6a620dede019)
+++ src/ch/FeedbackHandlerFactory.h (.../FeedbackHandlerFactory.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -31,6 +31,6 @@
virtual chcore::IFeedbackHandlerPtr Create() override;
};
-typedef boost::shared_ptr<CFeedbackHandlerFactory> CFeedbackHandlerFactoryPtr;
+typedef std::shared_ptr<CFeedbackHandlerFactory> CFeedbackHandlerFactoryPtr;
#endif
Index: src/ch/FeedbackNotEnoughSpaceDlg.cpp
===================================================================
diff -u -r8dc649003961dad64b92da67426814fb5dd862e0 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ch/FeedbackNotEnoughSpaceDlg.cpp (.../FeedbackNotEnoughSpaceDlg.cpp) (revision 8dc649003961dad64b92da67426814fb5dd862e0)
+++ src/ch/FeedbackNotEnoughSpaceDlg.cpp (.../FeedbackNotEnoughSpaceDlg.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -23,6 +23,7 @@
#include "StringHelpers.h"
#include "FeedbackHandler.h"
#include "FileSupport.h"
+#include "resource.h"
#ifdef _DEBUG
#define new DEBUG_NEW
Index: src/ch/FeedbackReplaceDlg.cpp
===================================================================
diff -u -rc6022cc2c68d1f286097697f4ba65098b92db222 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ch/FeedbackReplaceDlg.cpp (.../FeedbackReplaceDlg.cpp) (revision c6022cc2c68d1f286097697f4ba65098b92db222)
+++ src/ch/FeedbackReplaceDlg.cpp (.../FeedbackReplaceDlg.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -8,6 +8,7 @@
#include "../libictranslate/ResourceManager.h"
#include "../libchcore/TFileInfo.h"
#include "FeedbackHandler.h"
+#include "resource.h"
// CFeedbackReplaceDlg dialog
Index: src/ch/FilterDlg.cpp
===================================================================
diff -u -r2fe97a93f21771d75901d4b6559057d1ea055104 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ch/FilterDlg.cpp (.../FilterDlg.cpp) (revision 2fe97a93f21771d75901d4b6559057d1ea055104)
+++ src/ch/FilterDlg.cpp (.../FilterDlg.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -17,10 +17,10 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#include "stdafx.h"
-#include "../libchcore/TFileInfo.h"
#include "../libchcore/TFileFilter.h"
#include "ch.h"
#include "FilterDlg.h"
+#include "resource.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -32,7 +32,7 @@
// CFilterDlg dialog
CFilterDlg::CFilterDlg()
- :ictranslate::CLanguageDialog(CFilterDlg::IDD)
+ :ictranslate::CLanguageDialog(IDD_FILTER_DIALOG)
{
//{{AFX_DATA_INIT(CFilterDlg)
m_iArchive = FALSE;
Index: src/ch/FilterDlg.h
===================================================================
diff -u -r2aea3ad6f3c68be709ac65c70d9646eafe3b034c -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ch/FilterDlg.h (.../FilterDlg.h) (revision 2aea3ad6f3c68be709ac65c70d9646eafe3b034c)
+++ src/ch/FilterDlg.h (.../FilterDlg.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -30,7 +30,6 @@
// Dialog Data
//{{AFX_DATA(CFilterDlg)
- enum { IDD = IDD_FILTER_DIALOG };
CComboBox m_ctlExcludeMask;
CSpinButtonCtrl m_ctlSpin2;
CSpinButtonCtrl m_ctlSpin1;
Index: src/ch/FolderDialog.cpp
===================================================================
diff -u -r926b1177cffa2face218fabb3d8af71910d1b8e5 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ch/FolderDialog.cpp (.../FolderDialog.cpp) (revision 926b1177cffa2face218fabb3d8af71910d1b8e5)
+++ src/ch/FolderDialog.cpp (.../FolderDialog.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -26,6 +26,8 @@
#include "StringHelpers.h"
#include "FileSupport.h"
#include "TRecentPathsTools.h"
+#include "resource.h"
+#include "shortcuts.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -61,7 +63,7 @@
{
case WM_ERASEBKGND:
return (LRESULT)0;
- break;
+
case WM_PAINT:
CWnd* pWnd=CWnd::FromHandle(hwnd);
CPaintDC dc(pWnd);
@@ -95,7 +97,7 @@
CallWindowProc(pfWndProc, hwnd, WM_PAINT, (WPARAM)memdc.GetSafeHdc(), 0);
return 0;
- break;
+
}
return CallWindowProc(pfWndProc, hwnd, uMsg, wParam, lParam);
Index: src/ch/FolderDialog.h
===================================================================
diff -u -r44a2ec5f1eb0a435b56daef42ef5fe3b7a91da0d -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ch/FolderDialog.h (.../FolderDialog.h) (revision 44a2ec5f1eb0a435b56daef42ef5fe3b7a91da0d)
+++ src/ch/FolderDialog.h (.../FolderDialog.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -34,7 +34,6 @@
#include "DirTreeCtrl.h"
#include "ThemedButton.h"
-#include "shortcuts.h"
#include "../libictranslate/LanguageDialog.h"
/////////////////////////////////////////////////////////////////////////////
Index: src/ch/MainWnd.cpp
===================================================================
diff -u -r25129f39720523eca2cb702242890a7862f70ec6 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ch/MainWnd.cpp (.../MainWnd.cpp) (revision 25129f39720523eca2cb702242890a7862f70ec6)
+++ src/ch/MainWnd.cpp (.../MainWnd.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -46,6 +46,9 @@
#include "FeedbackHandlerFactory.h"
#include "../libchcore/TTask.h"
#include "TTaskManagerWrapper.h"
+#include "shortcuts.h"
+#include "CfgProperties.h"
+#include "resource.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -678,7 +681,7 @@
{
OnShowMiniView();
return static_cast<LRESULT>(0);
- break;
+
}
case WM_CONFIGNOTIFY:
@@ -718,7 +721,7 @@
bool bAddedAnyOption = false;
if(GetPropValue<PP_SHSHOWCOPY>(rConfig))
{
- spRootItem->AddChild(boost::make_shared<TShellMenuItem>(rResManager.LoadString(IDS_MENUCOPY_STRING), rResManager.LoadString(IDS_MENUTIPCOPY_STRING),
+ spRootItem->AddChild(std::make_shared<TShellMenuItem>(rResManager.LoadString(IDS_MENUCOPY_STRING), rResManager.LoadString(IDS_MENUTIPCOPY_STRING),
TOperationTypeInfo(TOperationTypeInfo::eOpType_Specified, chcore::eOperation_Copy),
TSourcePathsInfo(TSourcePathsInfo::eSrcType_InitializeIDataObject),
TDestinationPathInfo(TDestinationPathInfo::eDstType_InitializePidlFolder, chcore::TSmartPath()), false, chcore::eOperation_Copy));
@@ -727,7 +730,7 @@
if(GetPropValue<PP_SHSHOWMOVE>(rConfig))
{
- spRootItem->AddChild(boost::make_shared<TShellMenuItem>(rResManager.LoadString(IDS_MENUMOVE_STRING), rResManager.LoadString(IDS_MENUTIPMOVE_STRING),
+ spRootItem->AddChild(std::make_shared<TShellMenuItem>(rResManager.LoadString(IDS_MENUMOVE_STRING), rResManager.LoadString(IDS_MENUTIPMOVE_STRING),
TOperationTypeInfo(TOperationTypeInfo::eOpType_Specified, chcore::eOperation_Move),
TSourcePathsInfo(TSourcePathsInfo::eSrcType_InitializeIDataObject),
TDestinationPathInfo(TDestinationPathInfo::eDstType_InitializePidlFolder, chcore::TSmartPath()), false, chcore::eOperation_Move));
@@ -736,7 +739,7 @@
if(GetPropValue<PP_SHSHOWCOPYMOVE>(rConfig))
{
- spRootItem->AddChild(boost::make_shared<TShellMenuItem>(rResManager.LoadString(IDS_MENUCOPYMOVESPECIAL_STRING), rResManager.LoadString(IDS_MENUTIPCOPYMOVESPECIAL_STRING),
+ spRootItem->AddChild(std::make_shared<TShellMenuItem>(rResManager.LoadString(IDS_MENUCOPYMOVESPECIAL_STRING), rResManager.LoadString(IDS_MENUTIPCOPYMOVESPECIAL_STRING),
TOperationTypeInfo(TOperationTypeInfo::eOpType_Autodetect, chcore::eOperation_Copy),
TSourcePathsInfo(TSourcePathsInfo::eSrcType_InitializeIDataObject),
TDestinationPathInfo(TDestinationPathInfo::eDstType_InitializePidlFolder, chcore::TSmartPath()), true));
@@ -746,7 +749,7 @@
if(bAddedAnyOption)
{
// insert separator as an addition to other items
- spRootItem->AddChild(boost::make_shared<TShellMenuItem>());
+ spRootItem->AddChild(std::make_shared<TShellMenuItem>());
}
break;
}
@@ -755,15 +758,15 @@
{
if(GetPropValue<PP_SHSHOWPASTE>(rConfig))
{
- spRootItem->AddChild(boost::make_shared<TShellMenuItem>(rResManager.LoadString(IDS_MENUPASTE_STRING), rResManager.LoadString(IDS_MENUTIPPASTE_STRING),
+ spRootItem->AddChild(std::make_shared<TShellMenuItem>(rResManager.LoadString(IDS_MENUPASTE_STRING), rResManager.LoadString(IDS_MENUTIPPASTE_STRING),
TOperationTypeInfo(TOperationTypeInfo::eOpType_Autodetect, chcore::eOperation_Copy),
TSourcePathsInfo(TSourcePathsInfo::eSrcType_Clipboard),
TDestinationPathInfo(TDestinationPathInfo::eDstType_InitializeAuto, chcore::TSmartPath()), false));
}
if(GetPropValue<PP_SHSHOWPASTESPECIAL>(rConfig))
{
- spRootItem->AddChild(boost::make_shared<TShellMenuItem>(rResManager.LoadString(IDS_MENUPASTESPECIAL_STRING), rResManager.LoadString(IDS_MENUTIPPASTESPECIAL_STRING),
+ spRootItem->AddChild(std::make_shared<TShellMenuItem>(rResManager.LoadString(IDS_MENUPASTESPECIAL_STRING), rResManager.LoadString(IDS_MENUTIPPASTESPECIAL_STRING),
TOperationTypeInfo(TOperationTypeInfo::eOpType_Autodetect, chcore::eOperation_Copy),
TSourcePathsInfo(TSourcePathsInfo::eSrcType_Clipboard),
TDestinationPathInfo(TDestinationPathInfo::eDstType_InitializeAuto, chcore::TSmartPath()), true));
@@ -803,10 +806,10 @@
if(GetPropValue<PP_SHSHOWCOPYTO>(rConfig))
{
- boost::shared_ptr<TShellMenuItem> menuItem(boost::make_shared<TShellMenuItem>(rResManager.LoadString(IDS_MENUCOPYTO_STRING), rResManager.LoadString(IDS_MENUTIPCOPYTO_STRING)));
+ std::shared_ptr<TShellMenuItem> menuItem(std::make_shared<TShellMenuItem>(rResManager.LoadString(IDS_MENUCOPYTO_STRING), rResManager.LoadString(IDS_MENUTIPCOPYTO_STRING)));
BOOST_FOREACH(const CShortcut& tShortcut, vShortcuts)
{
- menuItem->AddChild(boost::make_shared<TShellMenuItem>((PCTSTR)tShortcut.m_strName, (PCTSTR)tShortcut.m_strPath,
+ menuItem->AddChild(std::make_shared<TShellMenuItem>((PCTSTR)tShortcut.m_strName, (PCTSTR)tShortcut.m_strPath,
TOperationTypeInfo(TOperationTypeInfo::eOpType_Specified, chcore::eOperation_Copy),
TSourcePathsInfo(TSourcePathsInfo::eSrcType_InitializeAuto),
TDestinationPathInfo(TDestinationPathInfo::eDstType_Specified, chcore::PathFromString((PCTSTR)tShortcut.m_strPath)), false));
@@ -816,21 +819,21 @@
// optionally separator
if(!vShortcuts.empty())
- menuItem->AddChild(boost::make_shared<TShellMenuItem>());
+ menuItem->AddChild(std::make_shared<TShellMenuItem>());
// "Choose" menu option
- menuItem->AddChild(boost::make_shared<TShellMenuItem>(rResManager.LoadString(IDS_SHELLEXT_CHOOSE_DIR_STRING), rResManager.LoadString(IDS_SHELLEXT_CHOOSE_DIR_TOOLTIP_STRING),
+ menuItem->AddChild(std::make_shared<TShellMenuItem>(rResManager.LoadString(IDS_SHELLEXT_CHOOSE_DIR_STRING), rResManager.LoadString(IDS_SHELLEXT_CHOOSE_DIR_TOOLTIP_STRING),
TOperationTypeInfo(TOperationTypeInfo::eOpType_Specified, chcore::eOperation_Copy),
TSourcePathsInfo(TSourcePathsInfo::eSrcType_InitializeAuto),
TDestinationPathInfo(TDestinationPathInfo::eDstType_Choose, chcore::TSmartPath()), false));
}
if(GetPropValue<PP_SHSHOWMOVETO>(rConfig))
{
- boost::shared_ptr<TShellMenuItem> menuItem(boost::make_shared<TShellMenuItem>(rResManager.LoadString(IDS_MENUMOVETO_STRING), rResManager.LoadString(IDS_MENUTIPMOVETO_STRING)));
+ std::shared_ptr<TShellMenuItem> menuItem(std::make_shared<TShellMenuItem>(rResManager.LoadString(IDS_MENUMOVETO_STRING), rResManager.LoadString(IDS_MENUTIPMOVETO_STRING)));
BOOST_FOREACH(const CShortcut& tShortcut, vShortcuts)
{
- menuItem->AddChild(boost::make_shared<TShellMenuItem>((PCTSTR)tShortcut.m_strName, (PCTSTR)tShortcut.m_strPath,
+ menuItem->AddChild(std::make_shared<TShellMenuItem>((PCTSTR)tShortcut.m_strName, (PCTSTR)tShortcut.m_strPath,
TOperationTypeInfo(TOperationTypeInfo::eOpType_Specified, chcore::eOperation_Move),
TSourcePathsInfo(TSourcePathsInfo::eSrcType_InitializeAuto),
TDestinationPathInfo(TDestinationPathInfo::eDstType_Specified, chcore::PathFromString((PCTSTR)tShortcut.m_strPath)), false));
@@ -840,21 +843,21 @@
// optionally separator
if(!vShortcuts.empty())
- menuItem->AddChild(boost::make_shared<TShellMenuItem>());
+ menuItem->AddChild(std::make_shared<TShellMenuItem>());
// "Choose" menu option
- menuItem->AddChild(boost::make_shared<TShellMenuItem>(rResManager.LoadString(IDS_SHELLEXT_CHOOSE_DIR_STRING), rResManager.LoadString(IDS_SHELLEXT_CHOOSE_DIR_TOOLTIP_STRING),
+ menuItem->AddChild(std::make_shared<TShellMenuItem>(rResManager.LoadString(IDS_SHELLEXT_CHOOSE_DIR_STRING), rResManager.LoadString(IDS_SHELLEXT_CHOOSE_DIR_TOOLTIP_STRING),
TOperationTypeInfo(TOperationTypeInfo::eOpType_Specified, chcore::eOperation_Move),
TSourcePathsInfo(TSourcePathsInfo::eSrcType_InitializeAuto),
TDestinationPathInfo(TDestinationPathInfo::eDstType_Choose, chcore::TSmartPath()), false));
}
if(GetPropValue<PP_SHSHOWCOPYMOVETO>(rConfig))
{
- boost::shared_ptr<TShellMenuItem> menuItem(boost::make_shared<TShellMenuItem>(rResManager.LoadString(IDS_MENUCOPYMOVETOSPECIAL_STRING), rResManager.LoadString(IDS_MENUTIPCOPYMOVETOSPECIAL_STRING)));
+ std::shared_ptr<TShellMenuItem> menuItem(std::make_shared<TShellMenuItem>(rResManager.LoadString(IDS_MENUCOPYMOVETOSPECIAL_STRING), rResManager.LoadString(IDS_MENUTIPCOPYMOVETOSPECIAL_STRING)));
BOOST_FOREACH(const CShortcut& tShortcut, vShortcuts)
{
- menuItem->AddChild(boost::make_shared<TShellMenuItem>((PCTSTR)tShortcut.m_strName, (PCTSTR)tShortcut.m_strPath,
+ menuItem->AddChild(std::make_shared<TShellMenuItem>((PCTSTR)tShortcut.m_strName, (PCTSTR)tShortcut.m_strPath,
TOperationTypeInfo(TOperationTypeInfo::eOpType_Specified, chcore::eOperation_Copy),
TSourcePathsInfo(TSourcePathsInfo::eSrcType_InitializeAuto),
TDestinationPathInfo(TDestinationPathInfo::eDstType_Specified, chcore::PathFromString((PCTSTR)tShortcut.m_strPath)), true));
@@ -864,10 +867,10 @@
// optionally separator
if(!vShortcuts.empty())
- menuItem->AddChild(boost::make_shared<TShellMenuItem>());
+ menuItem->AddChild(std::make_shared<TShellMenuItem>());
// "Choose" menu option
- menuItem->AddChild(boost::make_shared<TShellMenuItem>(rResManager.LoadString(IDS_SHELLEXT_CHOOSE_DIR_STRING), rResManager.LoadString(IDS_SHELLEXT_CHOOSE_DIR_TOOLTIP_STRING),
+ menuItem->AddChild(std::make_shared<TShellMenuItem>(rResManager.LoadString(IDS_SHELLEXT_CHOOSE_DIR_STRING), rResManager.LoadString(IDS_SHELLEXT_CHOOSE_DIR_TOOLTIP_STRING),
TOperationTypeInfo(TOperationTypeInfo::eOpType_Specified, chcore::eOperation_Copy),
TSourcePathsInfo(TSourcePathsInfo::eSrcType_InitializeAuto),
TDestinationPathInfo(TDestinationPathInfo::eDstType_Choose, chcore::TSmartPath()), true));
@@ -943,7 +946,6 @@
case WM_TRAYNOTIFY:
{
return OnTrayNotification(wParam, lParam);
- break;
}
}
Index: src/ch/MainWnd.h
===================================================================
diff -u -r8f15ad1d2f65340f4f5a30bc95f40a12b0b7dd66 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ch/MainWnd.h (.../MainWnd.h) (revision 8f15ad1d2f65340f4f5a30bc95f40a12b0b7dd66)
+++ src/ch/MainWnd.h (.../MainWnd.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -21,7 +21,6 @@
#define __MAINFRM_H__
#include "TrayIcon.h"
-#include "structs.h"
#include "../libchcore/TTaskManager.h"
#include "../libchcore/TSharedMemory.h"
Index: src/ch/MiniViewDlg.cpp
===================================================================
diff -u -rc5252ea6f56ae2094a1f46fce4900f4e7be61a17 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ch/MiniViewDlg.cpp (.../MiniViewDlg.cpp) (revision c5252ea6f56ae2094a1f46fce4900f4e7be61a17)
+++ src/ch/MiniViewDlg.cpp (.../MiniViewDlg.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -24,6 +24,8 @@
#include <assert.h>
#include "MemDC.h"
#include "../libchcore/TTaskManagerStatsSnapshot.h"
+#include "CfgProperties.h"
+#include "resource.h"
#ifdef _DEBUG
#define new DEBUG_NEW
Index: src/ch/OptionsDlg.cpp
===================================================================
diff -u -rffb46a396ce20cda2e04020cf01c118ae81642b5 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ch/OptionsDlg.cpp (.../OptionsDlg.cpp) (revision ffb46a396ce20cda2e04020cf01c118ae81642b5)
+++ src/ch/OptionsDlg.cpp (.../OptionsDlg.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -25,6 +25,7 @@
#include "RecentDlg.h"
#include <assert.h>
#include "structs.h"
+#include "CfgProperties.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -38,7 +39,7 @@
// COptionsDlg dialog
COptionsDlg::COptionsDlg(CWnd* pParent /*=NULL*/)
- :ictranslate::CLanguageDialog(COptionsDlg::IDD, pParent, &m_bLock)
+ :ictranslate::CLanguageDialog(IDD_OPTIONS_DIALOG, pParent, &m_bLock)
{
}
@@ -351,7 +352,7 @@
{
// replace the first part of path with <PROGRAM>
TCHAR szData[_MAX_PATH];
- _sntprintf(szData, _MAX_PATH, _T("<PROGRAM>%s"), strSrc.Mid(strProgramPath.GetLength()));
+ _sntprintf(szData, _MAX_PATH, _T("<PROGRAM>%s"), (PCTSTR)strSrc.Mid(strProgramPath.GetLength()));
SetPropValue<PP_PLANGUAGE>(rConfig, szData);
}
else
Index: src/ch/OptionsDlg.h
===================================================================
diff -u -r44a2ec5f1eb0a435b56daef42ef5fe3b7a91da0d -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ch/OptionsDlg.h (.../OptionsDlg.h) (revision 44a2ec5f1eb0a435b56daef42ef5fe3b7a91da0d)
+++ src/ch/OptionsDlg.h (.../OptionsDlg.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -29,9 +29,6 @@
class COptionsDlg : public ictranslate::CLanguageDialog
{
public:
- enum { IDD = IDD_OPTIONS_DIALOG };
-
-public:
explicit COptionsDlg(CWnd* pParent = NULL); // standard constructor
virtual void OnLanguageChanged();
Index: src/ch/RecentDlg.cpp
===================================================================
diff -u -r8f15ad1d2f65340f4f5a30bc95f40a12b0b7dd66 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ch/RecentDlg.cpp (.../RecentDlg.cpp) (revision 8f15ad1d2f65340f4f5a30bc95f40a12b0b7dd66)
+++ src/ch/RecentDlg.cpp (.../RecentDlg.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -20,6 +20,7 @@
#include "ch.h"
#include "RecentDlg.h"
#include "dialogs.h"
+#include "resource.h"
#ifdef _DEBUG
#define new DEBUG_NEW
Index: src/ch/ShortcutsDlg.cpp
===================================================================
diff -u -rcb4e9d4b60d62b25ae2cf556c0642601af56c787 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ch/ShortcutsDlg.cpp (.../ShortcutsDlg.cpp) (revision cb4e9d4b60d62b25ae2cf556c0642601af56c787)
+++ src/ch/ShortcutsDlg.cpp (.../ShortcutsDlg.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -21,6 +21,7 @@
#include "ShortcutsDlg.h"
#include "dialogs.h"
#include "shortcuts.h"
+#include "resource.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -32,7 +33,7 @@
// CShortcutsDlg dialog
CShortcutsDlg::CShortcutsDlg(CWnd* pParent /*=NULL*/)
- :ictranslate::CLanguageDialog(CShortcutsDlg::IDD, pParent)
+ :ictranslate::CLanguageDialog(IDD_SHORTCUTEDIT_DIALOG, pParent)
{
}
Index: src/ch/ShutdownDlg.cpp
===================================================================
diff -u -r44a2ec5f1eb0a435b56daef42ef5fe3b7a91da0d -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ch/ShutdownDlg.cpp (.../ShutdownDlg.cpp) (revision 44a2ec5f1eb0a435b56daef42ef5fe3b7a91da0d)
+++ src/ch/ShutdownDlg.cpp (.../ShutdownDlg.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -19,6 +19,7 @@
#include "stdafx.h"
#include "ch.h"
#include "ShutdownDlg.h"
+#include "resource.h"
#ifdef _DEBUG
#define new DEBUG_NEW
Index: src/ch/StatusDlg.cpp
===================================================================
diff -u -rd4064fca634707dcae112e5a41ed37e04455dc2a -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ch/StatusDlg.cpp (.../StatusDlg.cpp) (revision d4064fca634707dcae112e5a41ed37e04455dc2a)
+++ src/ch/StatusDlg.cpp (.../StatusDlg.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -28,6 +28,7 @@
#include "Structs.h"
#include "../libchcore/TTaskStatsSnapshot.h"
#include "../libchcore/TTaskManagerStatsSnapshot.h"
+#include "CfgProperties.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -41,7 +42,7 @@
// CStatusDlg dialog
CStatusDlg::CStatusDlg(chcore::TTaskManager* pTasks, CWnd* pParent /*=NULL*/)
- : ictranslate::CLanguageDialog(CStatusDlg::IDD, pParent, &m_bLock),
+ : ictranslate::CLanguageDialog(IDD_STATUS_DIALOG, pParent, &m_bLock),
m_spTaskMgrStats(new chcore::TTaskManagerStatsSnapshot),
m_pTasks(pTasks)
{
@@ -1089,8 +1090,8 @@
// avg transfer
CString strFmt;
- strFmt.Format(_T("%s/s (%s%s/s); %.0f/s (%s%.0f/s)"), strSpeedText, strAvgWord, strAvgSpeedText,
- dCountSpeed, strAvgWord, dAvgCountSpeed);
+ strFmt.Format(_T("%s/s (%s%s/s); %.0f/s (%s%.0f/s)"), (PCTSTR)strSpeedText, (PCTSTR)strAvgWord, (PCTSTR)strAvgSpeedText,
+ dCountSpeed, (PCTSTR)strAvgWord, dAvgCountSpeed);
return strFmt;
}
@@ -1185,7 +1186,7 @@
CString strTime3 = FormatTimeMiliseconds(timeRemaining);
CString strTime;
- strTime.Format(_T("%s / %s (%s)"), strTime1, strTime2, strTime3);
+ strTime.Format(_T("%s / %s (%s)"), (PCTSTR)strTime1, (PCTSTR)strTime2, (PCTSTR)strTime3);
GetDlgItem(IDC_TASKTIME_STATIC)->SetWindowText(strTime);
// set progress
Index: src/ch/StatusDlg.h
===================================================================
diff -u -r44a2ec5f1eb0a435b56daef42ef5fe3b7a91da0d -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ch/StatusDlg.h (.../StatusDlg.h) (revision 44a2ec5f1eb0a435b56daef42ef5fe3b7a91da0d)
+++ src/ch/StatusDlg.h (.../StatusDlg.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -26,7 +26,7 @@
{
class TTaskManager;
class TTask;
- typedef boost::shared_ptr<TTask> TTaskPtr;
+ typedef std::shared_ptr<TTask> TTaskPtr;
}
#define WM_UPDATESTATUS WM_USER+6
@@ -36,8 +36,6 @@
// CStatusDlg dialog
class CStatusDlg : public ictranslate::CLanguageDialog
{
- enum { IDD = IDD_STATUS_DIALOG };
-
// Construction
public:
CStatusDlg(chcore::TTaskManager* pTasks, CWnd* pParent = NULL); // standard constructor
Index: src/ch/Stdafx.h
===================================================================
diff -u -ra27d1acf1bda3c25b6dcce0d0eb0278009ce63ae -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ch/Stdafx.h (.../Stdafx.h) (revision a27d1acf1bda3c25b6dcce0d0eb0278009ce63ae)
+++ src/ch/Stdafx.h (.../Stdafx.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -45,8 +45,6 @@
#include <boost/thread/locks.hpp>
#include <boost/tuple/tuple.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
#include <boost/assert.hpp>
#include <boost/foreach.hpp>
Index: src/ch/StringHelpers.cpp
===================================================================
diff -u -r6015bff29e76b4f7c4cb06d66b7b9ec9dc00d31c -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ch/StringHelpers.cpp (.../StringHelpers.cpp) (revision 6015bff29e76b4f7c4cb06d66b7b9ec9dc00d31c)
+++ src/ch/StringHelpers.cpp (.../StringHelpers.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -20,6 +20,7 @@
#include "ch.h"
#include "StringHelpers.h"
#include "stdio.h"
+#include "resource.h"
#ifdef _DEBUG
#define new DEBUG_NEW
Index: src/ch/TMsgBox.cpp
===================================================================
diff -u -rb46e69bed7377207f670be1fdbe84bc2e3d11e30 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ch/TMsgBox.cpp (.../TMsgBox.cpp) (revision b46e69bed7377207f670be1fdbe84bc2e3d11e30)
+++ src/ch/TMsgBox.cpp (.../TMsgBox.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -19,6 +19,7 @@
#include "stdafx.h"
#include "TMsgBox.h"
#include "ch.h"
+#include "resource.h"
using namespace ictranslate;
Index: src/ch/UpdateChecker.h
===================================================================
diff -u -r50007f112b77cba170e6c427fee5428bda2d9dc5 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ch/UpdateChecker.h (.../UpdateChecker.h) (revision 50007f112b77cba170e6c427fee5428bda2d9dc5)
+++ src/ch/UpdateChecker.h (.../UpdateChecker.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -23,7 +23,6 @@
#ifndef __UPDATECHECKER_H__
#define __UPDATECHECKER_H__
-#include "WindowsVersion.h"
#include "AsyncHttpFile.h"
#include "UpdateHeaders.h"
#include "UpdateVersionInfo.h"
Index: src/ch/UpdaterDlg.cpp
===================================================================
diff -u -r4572f6cddf7dab06b1de99504a6bbd3680d11e6d -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ch/UpdaterDlg.cpp (.../UpdaterDlg.cpp) (revision 4572f6cddf7dab06b1de99504a6bbd3680d11e6d)
+++ src/ch/UpdaterDlg.cpp (.../UpdaterDlg.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -11,6 +11,8 @@
#include <boost/algorithm/string/classification.hpp>
#include "WindowsVersion.h"
#include "../libchcore/TLogger.h"
+#include "resource.h"
+#include "CfgProperties.h"
#define UPDATER_TIMER 639
@@ -27,7 +29,7 @@
IMPLEMENT_DYNAMIC(CUpdaterDlg, ictranslate::CLanguageDialog)
CUpdaterDlg::CUpdaterDlg(bool bBackgroundMode, CWnd* pParent /*=NULL*/) :
- ictranslate::CLanguageDialog(CUpdaterDlg::IDD, pParent),
+ ictranslate::CLanguageDialog(IDD_UPDATER_DIALOG, pParent),
m_eLastState(CUpdateChecker::eResult_Undefined),
m_bBackgroundMode(bBackgroundMode)
{
@@ -163,7 +165,6 @@
default:
_ASSERTE(FALSE);
- eBkMode = eRes_Exit;
return;
}
Index: src/ch/UpdaterDlg.h
===================================================================
diff -u -r1f27a2022090cf7aaf827a3f1ad90d6fe0038518 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ch/UpdaterDlg.h (.../UpdaterDlg.h) (revision 1f27a2022090cf7aaf827a3f1ad90d6fe0038518)
+++ src/ch/UpdaterDlg.h (.../UpdaterDlg.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -25,9 +25,6 @@
CUpdaterDlg(bool bBackgroundMode, CWnd* pParent = NULL); // standard constructor
virtual ~CUpdaterDlg();
- // Dialog Data
- enum { IDD = IDD_UPDATER_DIALOG };
-
virtual BOOL OnInitDialog();
void CheckForUpdates();
Index: src/ch/ch.cpp
===================================================================
diff -u -r5598fd0318a9e148ff2c2eb83a6f6c4af251e798 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ch/ch.cpp (.../ch.cpp) (revision 5598fd0318a9e148ff2c2eb83a6f6c4af251e798)
+++ src/ch/ch.cpp (.../ch.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -42,6 +42,7 @@
#include "../libchcore/TFileInfo.h"
#include "TMsgBox.h"
#include "../libchcore/TWin32ErrorFormatter.h"
+#include "resource.h"
#ifdef _DEBUG
#define new DEBUG_NEW
Index: src/ch/ch.h
===================================================================
diff -u -ra27d1acf1bda3c25b6dcce0d0eb0278009ce63ae -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ch/ch.h (.../ch.h) (revision a27d1acf1bda3c25b6dcce0d0eb0278009ce63ae)
+++ src/ch/ch.h (.../ch.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -19,9 +19,7 @@
#ifndef __COPYHANDLER_H__
#define __COPYHANDLER_H__
-#include "resource.h" // main symbols
#include "AppHelper.h"
-#include "CfgProperties.h"
#include "../libictranslate/ResourceManager.h"
#include "../libchcore/TConfig.h"
#include "TShellExtensionClient.h"
@@ -38,16 +36,15 @@
CCopyHandlerApp();
~CCopyHandlerApp();
- virtual BOOL InitInstance();
- virtual int ExitInstance();
+ virtual BOOL InitInstance() override;
+ virtual int ExitInstance() override;
- virtual void HtmlHelp(DWORD_PTR dwData, UINT nCmd);
+ virtual void HtmlHelp(DWORD_PTR dwData, UINT nCmd) override;
PCTSTR GetHelpPath() const { return m_pszHelpFilePath; };
friend int MsgBox(UINT uiID, UINT nType=MB_OK, UINT nIDHelp=0);
- friend LRESULT MainRouter(ULONGLONG ullDst, UINT uiMsg, WPARAM wParam, LPARAM lParam);
friend CCopyHandlerApp& GetApp();
friend ictranslate::CResourceManager& GetResManager();
friend chcore::TConfig& GetConfig();
Index: src/ch/shortcutsdlg.h
===================================================================
diff -u -rcb4e9d4b60d62b25ae2cf556c0642601af56c787 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ch/shortcutsdlg.h (.../shortcutsdlg.h) (revision cb4e9d4b60d62b25ae2cf556c0642601af56c787)
+++ src/ch/shortcutsdlg.h (.../shortcutsdlg.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -24,9 +24,6 @@
class CShortcutsDlg : public ictranslate::CLanguageDialog
{
-public:
- enum { IDD = IDD_SHORTCUTEDIT_DIALOG };
-
// Construction
public:
explicit CShortcutsDlg(CWnd* pParent = NULL); // standard constructor
Index: src/chext/TContextMenuHandler.h
===================================================================
diff -u -rb54c79b15d7c1a101c43994e9a403b07d695c8dc -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/chext/TContextMenuHandler.h (.../TContextMenuHandler.h) (revision b54c79b15d7c1a101c43994e9a403b07d695c8dc)
+++ src/chext/TContextMenuHandler.h (.../TContextMenuHandler.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -27,7 +27,7 @@
class TShellMenuItem;
-typedef boost::shared_ptr<TShellMenuItem> TShellMenuItemPtr;
+typedef std::shared_ptr<TShellMenuItem> TShellMenuItemPtr;
class TContextMenuHandler
{
Index: src/chext/TShellExtData.cpp
===================================================================
diff -u -r0485fd134d85ed64ac3550769833b21833ef8ff6 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/chext/TShellExtData.cpp (.../TShellExtData.cpp) (revision 0485fd134d85ed64ac3550769833b21833ef8ff6)
+++ src/chext/TShellExtData.cpp (.../TShellExtData.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -434,7 +434,7 @@
break;
case TSourcePathsInfo::eSrcType_InitializePidlFolder:
return false;
- break;
+
default:
return false;
}
Index: src/chext/TShellExtData.h
===================================================================
diff -u -r73583f2ca01fa1b2eae49bbc63bce46b9ecff5db -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/chext/TShellExtData.h (.../TShellExtData.h) (revision 73583f2ca01fa1b2eae49bbc63bce46b9ecff5db)
+++ src/chext/TShellExtData.h (.../TShellExtData.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -29,7 +29,7 @@
class TShellMenuItem;
-typedef boost::shared_ptr<TShellMenuItem> TShellMenuItemPtr;
+typedef std::shared_ptr<TShellMenuItem> TShellMenuItemPtr;
class TShellExtData
{
Index: src/common/TShellExtMenuConfig.cpp
===================================================================
diff -u -rb54c79b15d7c1a101c43994e9a403b07d695c8dc -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/common/TShellExtMenuConfig.cpp (.../TShellExtMenuConfig.cpp) (revision b54c79b15d7c1a101c43994e9a403b07d695c8dc)
+++ src/common/TShellExtMenuConfig.cpp (.../TShellExtMenuConfig.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -388,7 +388,7 @@
{
chcore::TConfig& rCfg = vCfgs.GetAt(stIndex);
- TShellMenuItemPtr spItem(boost::make_shared<TShellMenuItem>());
+ TShellMenuItemPtr spItem(std::make_shared<TShellMenuItem>());
spItem->ReadFromConfig(rCfg, NULL);
m_vChildItems.push_back(spItem);
}
@@ -432,7 +432,7 @@
m_bInterceptKeyboardActions(false),
m_bInterceptCtxMenuActions(false),
m_bShowShortcutIcons(false),
- m_spCommandsRoot(boost::make_shared<TShellMenuItem>(_T(""), _T("")))
+ m_spCommandsRoot(std::make_shared<TShellMenuItem>(_T(""), _T("")))
{
}
Index: src/common/TShellExtMenuConfig.h
===================================================================
diff -u -rb54c79b15d7c1a101c43994e9a403b07d695c8dc -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/common/TShellExtMenuConfig.h (.../TShellExtMenuConfig.h) (revision b54c79b15d7c1a101c43994e9a403b07d695c8dc)
+++ src/common/TShellExtMenuConfig.h (.../TShellExtMenuConfig.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -30,7 +30,7 @@
class TShellMenuItem;
-typedef boost::shared_ptr<TShellMenuItem> TShellMenuItemPtr;
+typedef std::shared_ptr<TShellMenuItem> TShellMenuItemPtr;
// specifies information about operation type
class TOperationTypeInfo
Index: src/ictranslate/ICTranslateDlg.cpp
===================================================================
diff -u -ra27d1acf1bda3c25b6dcce0d0eb0278009ce63ae -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ictranslate/ICTranslateDlg.cpp (.../ICTranslateDlg.cpp) (revision a27d1acf1bda3c25b6dcce0d0eb0278009ce63ae)
+++ src/ictranslate/ICTranslateDlg.cpp (.../ICTranslateDlg.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -20,10 +20,10 @@
//
#include "stdafx.h"
-#include "ictranslate.h"
#include "ICTranslateDlg.h"
#include <assert.h>
#include <set>
+#include "resource.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -72,7 +72,7 @@
CICTranslateDlg::CICTranslateDlg(CWnd* pParent /*=NULL*/)
- : CDialog(CICTranslateDlg::IDD, pParent),
+ : CDialog(IDD_ICTRANSLATE_DIALOG, pParent),
m_hAccel(NULL)
{
m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
Index: src/ictranslate/ICTranslateDlg.h
===================================================================
diff -u -ra27d1acf1bda3c25b6dcce0d0eb0278009ce63ae -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ictranslate/ICTranslateDlg.h (.../ICTranslateDlg.h) (revision a27d1acf1bda3c25b6dcce0d0eb0278009ce63ae)
+++ src/ictranslate/ICTranslateDlg.h (.../ICTranslateDlg.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -30,8 +30,6 @@
explicit CICTranslateDlg(CWnd* pParent = NULL); // standard constructor
// Dialog Data
- enum { IDD = IDD_ICTRANSLATE_DIALOG };
-
virtual BOOL PreTranslateMessage(MSG* pMsg);
afx_msg void OnFileOpenBaseTranslation();
afx_msg void OnFileOpenYourTranslation();
Index: src/ictranslate/ictranslate.h
===================================================================
diff -u -r8443d0d98d380facaf07b540c8d98da08365b816 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ictranslate/ictranslate.h (.../ictranslate.h) (revision 8443d0d98d380facaf07b540c8d98da08365b816)
+++ src/ictranslate/ictranslate.h (.../ictranslate.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -25,9 +25,6 @@
#error "include 'stdafx.h' before including this file for PCH"
#endif
-#include "resource.h" // main symbols
-
-
// CICTranslateApp:
// See ictranslate.cpp for the implementation of this class
//
Index: src/libchcore/ConfigNode.h
===================================================================
diff -u -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/ConfigNode.h (.../ConfigNode.h) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
+++ src/libchcore/ConfigNode.h (.../ConfigNode.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -20,7 +20,6 @@
#define __TCONFIGNODE_H__
#include "TString.h"
-#include <boost/variant.hpp>
#include <bitset>
#include "TSharedModificationTracker.h"
#include "SerializerDataTypes.h"
Index: src/libchcore/ConfigNodeContainer.cpp
===================================================================
diff -u -r4572f6cddf7dab06b1de99504a6bbd3680d11e6d -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/ConfigNodeContainer.cpp (.../ConfigNodeContainer.cpp) (revision 4572f6cddf7dab06b1de99504a6bbd3680d11e6d)
+++ src/libchcore/ConfigNodeContainer.cpp (.../ConfigNodeContainer.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -205,14 +205,13 @@
{
struct PredIsPrefixedWith
{
- private:
- PredIsPrefixedWith& operator=(const PredIsPrefixedWith&);
- PredIsPrefixedWith();
-
public:
PredIsPrefixedWith(PCTSTR pszPrefix, TRemovedObjects& rRemovedObjects) : m_strPrefix(pszPrefix), m_rRemovedObjects(rRemovedObjects) {}
PredIsPrefixedWith(const PredIsPrefixedWith& rSrc) : m_strPrefix(rSrc.m_strPrefix), m_rRemovedObjects(rSrc.m_rRemovedObjects) {}
+ PredIsPrefixedWith() = delete;
+ PredIsPrefixedWith& operator=(const PredIsPrefixedWith&) = delete;
+
bool operator()(const ConfigNode& rNode) const
{
if (rNode.m_strNodeName.Get().StartsWith(m_strPrefix.c_str()))
Index: src/libchcore/ConfigNodeContainer.h
===================================================================
diff -u -r17518cb4e2c229cb291fc23e58d74c9d9d8c658a -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/ConfigNodeContainer.h (.../ConfigNodeContainer.h) (revision 17518cb4e2c229cb291fc23e58d74c9d9d8c658a)
+++ src/libchcore/ConfigNodeContainer.h (.../ConfigNodeContainer.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -21,7 +21,6 @@
#include "TSharedModificationTracker.h"
#include "ConfigNode.h"
-#include <bitset>
#include <boost/multi_index_container.hpp>
#include <boost/multi_index/composite_key.hpp>
Index: src/libchcore/EFeedbackResult.h
===================================================================
diff -u -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/EFeedbackResult.h (.../EFeedbackResult.h) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
+++ src/libchcore/EFeedbackResult.h (.../EFeedbackResult.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -19,8 +19,6 @@
#ifndef __EFEEDBACKRESULT_H__
#define __EFEEDBACKRESULT_H__
-#include "libchcore.h"
-
namespace chcore
{
enum EFeedbackResult
Index: src/libchcore/EFileError.h
===================================================================
diff -u -ra6fac511b0dd40e1c18cab086e0bc5ff5d2bc8d7 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/EFileError.h (.../EFileError.h) (revision a6fac511b0dd40e1c18cab086e0bc5ff5d2bc8d7)
+++ src/libchcore/EFileError.h (.../EFileError.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -19,8 +19,6 @@
#ifndef __EFILEERROR_H__
#define __EFILEERROR_H__
-#include "libchcore.h"
-
namespace chcore
{
enum class EFileError
Index: src/libchcore/EOperationTypes.h
===================================================================
diff -u -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/EOperationTypes.h (.../EOperationTypes.h) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
+++ src/libchcore/EOperationTypes.h (.../EOperationTypes.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -23,8 +23,6 @@
#ifndef __EOPERATIONTYPES_H__
#define __EOPERATIONTYPES_H__
-#include "libchcore.h"
-
namespace chcore
{
// enum represents type of the operation handled by the task
Index: src/libchcore/ESubTaskTypes.h
===================================================================
diff -u -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/ESubTaskTypes.h (.../ESubTaskTypes.h) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
+++ src/libchcore/ESubTaskTypes.h (.../ESubTaskTypes.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -23,8 +23,6 @@
#ifndef __SUBTASKTYPES_H__
#define __SUBTASKTYPES_H__
-#include "libchcore.h"
-
namespace chcore
{
enum ESubOperationType
Index: src/libchcore/ETaskCurrentState.h
===================================================================
diff -u -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/ETaskCurrentState.h (.../ETaskCurrentState.h) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
+++ src/libchcore/ETaskCurrentState.h (.../ETaskCurrentState.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -19,8 +19,6 @@
#ifndef __ETASKCURRENTSTATE_H__
#define __ETASKCURRENTSTATE_H__
-#include "libchcore.h"
-
namespace chcore
{
// enum representing current processing state of the task
Index: src/libchcore/ErrorCodes.h
===================================================================
diff -u -rd468098a278a0d16c5b700236ea276b9c9677c9f -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/ErrorCodes.h (.../ErrorCodes.h) (revision d468098a278a0d16c5b700236ea276b9c9677c9f)
+++ src/libchcore/ErrorCodes.h (.../ErrorCodes.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -19,8 +19,6 @@
#ifndef __ERROR_CODES_H__
#define __ERROR_CODES_H__
-#include "libchcore.h"
-
namespace chcore
{
enum EGeneralErrors
Index: src/libchcore/IColumnsDefinition.h
===================================================================
diff -u -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/IColumnsDefinition.h (.../IColumnsDefinition.h) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
+++ src/libchcore/IColumnsDefinition.h (.../IColumnsDefinition.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -21,7 +21,6 @@
#include "libchcore.h"
#include "TString.h"
-#include <iosfwd>
#include "TPath.h"
namespace chcore
Index: src/libchcore/IFeedbackHandler.h
===================================================================
diff -u -r89f857792bba8752de98ddd477949e45cef5ba5a -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/IFeedbackHandler.h (.../IFeedbackHandler.h) (revision 89f857792bba8752de98ddd477949e45cef5ba5a)
+++ src/libchcore/IFeedbackHandler.h (.../IFeedbackHandler.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -20,9 +20,7 @@
#define __FEEDBACKHANDLERBASE_H__
#include "libchcore.h"
-#include "EFeedbackResult.h"
#include "TString.h"
-#include "ISerializerRowReader.h"
#include "ISerializerRowData.h"
#include "EFileError.h"
#include "TFeedbackResult.h"
@@ -56,7 +54,7 @@
virtual void Load(const ISerializerContainerPtr& spContainer) = 0;
};
- typedef boost::shared_ptr<IFeedbackHandler> IFeedbackHandlerPtr;
+ typedef std::shared_ptr<IFeedbackHandler> IFeedbackHandlerPtr;
}
#endif
Index: src/libchcore/IFeedbackHandlerFactory.h
===================================================================
diff -u -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/IFeedbackHandlerFactory.h (.../IFeedbackHandlerFactory.h) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
+++ src/libchcore/IFeedbackHandlerFactory.h (.../IFeedbackHandlerFactory.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -31,7 +31,7 @@
virtual IFeedbackHandlerPtr Create() = 0;
};
- typedef boost::shared_ptr<IFeedbackHandlerFactory> IFeedbackHandlerFactoryPtr;
+ typedef std::shared_ptr<IFeedbackHandlerFactory> IFeedbackHandlerFactoryPtr;
}
#endif
Index: src/libchcore/IOverlappedDataBufferQueue.h
===================================================================
diff -u -r861eb97e5f43584f9537b4aff0558f6689bd0e38 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/IOverlappedDataBufferQueue.h (.../IOverlappedDataBufferQueue.h) (revision 861eb97e5f43584f9537b4aff0558f6689bd0e38)
+++ src/libchcore/IOverlappedDataBufferQueue.h (.../IOverlappedDataBufferQueue.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -19,8 +19,6 @@
#ifndef __IOVERLAPPEDDATABUFFERQUEUE_H__
#define __IOVERLAPPEDDATABUFFERQUEUE_H__
-#include "libchcore.h"
-
namespace chcore
{
class TOverlappedDataBuffer;
Index: src/libchcore/IRunningTimeControl.h
===================================================================
diff -u -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/IRunningTimeControl.h (.../IRunningTimeControl.h) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
+++ src/libchcore/IRunningTimeControl.h (.../IRunningTimeControl.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -19,8 +19,6 @@
#ifndef __IRUNNINGTIMESTATS_H__
#define __IRUNNINGTIMESTATS_H__
-#include "libchcore.h"
-
namespace chcore
{
class IRunningTimeControl
Index: src/libchcore/ISQLiteSerializerSchema.h
===================================================================
diff -u -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/ISQLiteSerializerSchema.h (.../ISQLiteSerializerSchema.h) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
+++ src/libchcore/ISQLiteSerializerSchema.h (.../ISQLiteSerializerSchema.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -32,7 +32,7 @@
virtual void Setup(const sqlite::TSQLiteDatabasePtr& spDatabase) = 0;
};
- typedef boost::shared_ptr<ISQLiteSerializerSchema> ISerializerSchemaPtr;
+ typedef std::shared_ptr<ISQLiteSerializerSchema> ISerializerSchemaPtr;
}
#endif
Index: src/libchcore/ISerializer.h
===================================================================
diff -u -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/ISerializer.h (.../ISerializer.h) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
+++ src/libchcore/ISerializer.h (.../ISerializer.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -36,7 +36,7 @@
virtual void Flush() = 0;
};
- typedef boost::shared_ptr<ISerializer> ISerializerPtr;
+ typedef std::shared_ptr<ISerializer> ISerializerPtr;
}
#endif
Index: src/libchcore/ISerializerContainer.h
===================================================================
diff -u -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/ISerializerContainer.h (.../ISerializerContainer.h) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
+++ src/libchcore/ISerializerContainer.h (.../ISerializerContainer.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -46,7 +46,7 @@
virtual ISerializerRowReaderPtr GetRowReader() = 0;
};
- typedef boost::shared_ptr<ISerializerContainer> ISerializerContainerPtr;
+ using ISerializerContainerPtr = std::shared_ptr<ISerializerContainer>;
}
#endif
Index: src/libchcore/ISerializerFactory.h
===================================================================
diff -u -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/ISerializerFactory.h (.../ISerializerFactory.h) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
+++ src/libchcore/ISerializerFactory.h (.../ISerializerFactory.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -34,7 +34,7 @@
virtual ISerializerPtr CreateTaskSerializer(const TString& strNameHint = _T(""), bool bForceRecreate = false) = 0;
};
- typedef boost::shared_ptr<ISerializerFactory> ISerializerFactoryPtr;
+ typedef std::shared_ptr<ISerializerFactory> ISerializerFactoryPtr;
}
#endif
Index: src/libchcore/ISerializerRowData.h
===================================================================
diff -u -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/ISerializerRowData.h (.../ISerializerRowData.h) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
+++ src/libchcore/ISerializerRowData.h (.../ISerializerRowData.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -26,7 +26,7 @@
namespace chcore
{
class ISerializerContainer;
- typedef boost::shared_ptr<ISerializerContainer> ISerializerContainerPtr;
+ using ISerializerContainerPtr = std::shared_ptr<ISerializerContainer>;
class LIBCHCORE_API ISerializerRowData
{
Index: src/libchcore/ISerializerRowReader.h
===================================================================
diff -u -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/ISerializerRowReader.h (.../ISerializerRowReader.h) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
+++ src/libchcore/ISerializerRowReader.h (.../ISerializerRowReader.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -47,7 +47,7 @@
virtual void GetValue(const TString& strColName, TSmartPath& pathValue) = 0;
};
- typedef boost::shared_ptr<ISerializerRowReader> ISerializerRowReaderPtr;
+ typedef std::shared_ptr<ISerializerRowReader> ISerializerRowReaderPtr;
}
#endif
Index: src/libchcore/ITimestampProvider.h
===================================================================
diff -u -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/ITimestampProvider.h (.../ITimestampProvider.h) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
+++ src/libchcore/ITimestampProvider.h (.../ITimestampProvider.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -30,7 +30,7 @@
virtual unsigned long long GetCurrentTimestamp() const = 0;
};
- typedef boost::shared_ptr<ITimestampProvider> ITimestampProviderPtr;
+ using ITimestampProviderPtr = std::shared_ptr<ITimestampProvider>;
}
#endif
Index: src/libchcore/RoundingFunctions.h
===================================================================
diff -u -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/RoundingFunctions.h (.../RoundingFunctions.h) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
+++ src/libchcore/RoundingFunctions.h (.../RoundingFunctions.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -19,8 +19,6 @@
#ifndef __ROUNDINGFUNCTIONS_H__
#define __ROUNDINGFUNCTIONS_H__
-#include "libchcore.h"
-
namespace chcore
{
template<class T> T RoundUp(T number, T roundValue) { return ((number + roundValue - 1) & ~(roundValue - 1)); }
Index: src/libchcore/SerializerTrace.h
===================================================================
diff -u -rc8e73b75027d5e17fb8b1e1eb40e64f40fc62547 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/SerializerTrace.h (.../SerializerTrace.h) (revision c8e73b75027d5e17fb8b1e1eb40e64f40fc62547)
+++ src/libchcore/SerializerTrace.h (.../SerializerTrace.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -19,7 +19,6 @@
#ifndef __SERIALIZERTRACE_H__
#define __SERIALIZERTRACE_H__
-#include <atltrace.h>
#include <atlstr.h>
// enables tracing
Index: src/libchcore/TAutoHandles.h
===================================================================
diff -u -rcb4e9d4b60d62b25ae2cf556c0642601af56c787 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TAutoHandles.h (.../TAutoHandles.h) (revision cb4e9d4b60d62b25ae2cf556c0642601af56c787)
+++ src/libchcore/TAutoHandles.h (.../TAutoHandles.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -23,8 +23,6 @@
#ifndef __TAUTOHANDLES_H__
#define __TAUTOHANDLES_H__
-#include "libchcore.h"
-
namespace chcore
{
/// class encapsulates windows HANDLE, allowing automatic closing it in destructor.
Index: src/libchcore/TBaseException.h
===================================================================
diff -u -re8f31b0f922b402878356e130c866c4f3682a7f5 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TBaseException.h (.../TBaseException.h) (revision e8f31b0f922b402878356e130c866c4f3682a7f5)
+++ src/libchcore/TBaseException.h (.../TBaseException.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -33,6 +33,7 @@
public:
TBaseException(EGeneralErrors eErrorCode, const wchar_t* pszMsg, const wchar_t* pszFile, size_t stLineNumber, const wchar_t* pszFunction);
TBaseException(EGeneralErrors eErrorCode, const char* pszMsg, const wchar_t* pszFile, size_t stLineNumber, const wchar_t* pszFunction);
+ TBaseException() = delete;
virtual ~TBaseException();
@@ -43,8 +44,6 @@
virtual void GetDetailedErrorInfo(wchar_t* pszBuffer, size_t stMaxBuffer) const;
private:
- TBaseException();
-
// location info
const wchar_t* GetSourceFile() const { return m_pszFile; }
size_t GetSourceLineNumber() const { return m_stLineNumber; }
Index: src/libchcore/TBasePathData.cpp
===================================================================
diff -u -ref2ea2589f6eeed54f8001fee72936198172ceed -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TBasePathData.cpp (.../TBasePathData.cpp) (revision ef2ea2589f6eeed54f8001fee72936198172ceed)
+++ src/libchcore/TBasePathData.cpp (.../TBasePathData.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -303,7 +303,7 @@
TSmartPath path = tPaths.GetAt(stIndex);
path.StripSeparatorAtEnd();
- TBasePathDataPtr spPathData = boost::make_shared<TBasePathData>(++m_oidLastObjectID, path);
+ TBasePathDataPtr spPathData = std::make_shared<TBasePathData>(++m_oidLastObjectID, path);
m_vEntries.push_back(spPathData);
}
Index: src/libchcore/TBasePathData.h
===================================================================
diff -u -rda877d1e0007d3dffa60111c79a1d8927174e6e9 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TBasePathData.h (.../TBasePathData.h) (revision da877d1e0007d3dffa60111c79a1d8927174e6e9)
+++ src/libchcore/TBasePathData.h (.../TBasePathData.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -89,7 +89,7 @@
#pragma warning(pop)
};
- typedef boost::shared_ptr<TBasePathData> TBasePathDataPtr;
+ typedef std::shared_ptr<TBasePathData> TBasePathDataPtr;
//////////////////////////////////////////////////////////////////////////
// TBasePathDataContainer
@@ -141,7 +141,7 @@
object_id_t m_oidLastObjectID;
};
- typedef boost::shared_ptr<TBasePathDataContainer> TBasePathDataContainerPtr;
+ typedef std::shared_ptr<TBasePathDataContainer> TBasePathDataContainerPtr;
}
#endif // __TBASEPATHDATA_H__
Index: src/libchcore/TBasePathDataFwd.h
===================================================================
diff -u -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TBasePathDataFwd.h (.../TBasePathDataFwd.h) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
+++ src/libchcore/TBasePathDataFwd.h (.../TBasePathDataFwd.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -19,12 +19,10 @@
#ifndef __TBASEPATHDATAFWD_H__
#define __TBASEPATHDATAFWD_H__
-#include <boost/shared_ptr.hpp>
-
namespace chcore
{
class TBasePathData;
- typedef boost::shared_ptr<TBasePathData> TBasePathDataPtr;
+ typedef std::shared_ptr<TBasePathData> TBasePathDataPtr;
}
#endif
Index: src/libchcore/TConfigNotifier.h
===================================================================
diff -u -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TConfigNotifier.h (.../TConfigNotifier.h) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
+++ src/libchcore/TConfigNotifier.h (.../TConfigNotifier.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -19,7 +19,6 @@
#ifndef __TCONFIGNOTIFIER_H__
#define __TCONFIGNOTIFIER_H__
-#include "libchcore.h"
#include "TStringSet.h"
namespace chcore
Index: src/libchcore/TFakeFileSerializer.h
===================================================================
diff -u -rcb4e9d4b60d62b25ae2cf556c0642601af56c787 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TFakeFileSerializer.h (.../TFakeFileSerializer.h) (revision cb4e9d4b60d62b25ae2cf556c0642601af56c787)
+++ src/libchcore/TFakeFileSerializer.h (.../TFakeFileSerializer.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -41,7 +41,7 @@
TSmartPath m_pathFileSerializer;
};
- typedef boost::shared_ptr<TFakeFileSerializer> TFakeFileSerializerPtr;
+ typedef std::shared_ptr<TFakeFileSerializer> TFakeFileSerializerPtr;
}
#endif
Index: src/libchcore/TFeedbackHandlerBase.h
===================================================================
diff -u -r8592d6dcef30c8e4967ca4dcee37c1ca52afbf16 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TFeedbackHandlerBase.h (.../TFeedbackHandlerBase.h) (revision 8592d6dcef30c8e4967ca4dcee37c1ca52afbf16)
+++ src/libchcore/TFeedbackHandlerBase.h (.../TFeedbackHandlerBase.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -22,8 +22,6 @@
#include "libchcore.h"
#include "IFeedbackHandler.h"
#include "ISerializerRowData.h"
-#include "IColumnsDefinition.h"
-#include "ISerializerRowReader.h"
#include <bitset>
#include "TSharedModificationTracker.h"
@@ -87,7 +85,7 @@
#pragma warning(pop)
};
- typedef boost::shared_ptr<TFeedbackHandlerBase> TFeedbackHandlerBasePtr;
+ typedef std::shared_ptr<TFeedbackHandlerBase> TFeedbackHandlerBasePtr;
}
#endif
Index: src/libchcore/TFeedbackHandlerWrapper.h
===================================================================
diff -u -r89f857792bba8752de98ddd477949e45cef5ba5a -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TFeedbackHandlerWrapper.h (.../TFeedbackHandlerWrapper.h) (revision 89f857792bba8752de98ddd477949e45cef5ba5a)
+++ src/libchcore/TFeedbackHandlerWrapper.h (.../TFeedbackHandlerWrapper.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -21,7 +21,6 @@
#include "libchcore.h"
#include "IFeedbackHandler.h"
-#include <boost\smart_ptr\shared_ptr.hpp>
namespace chcore
{
@@ -54,7 +53,7 @@
TScopedRunningTimeTracker& m_rTimeGuard;
};
- typedef boost::shared_ptr<TFeedbackHandlerWrapper> TFeedbackHandlerWrapperPtr;
+ typedef std::shared_ptr<TFeedbackHandlerWrapper> TFeedbackHandlerWrapperPtr;
}
#endif
Fisheye: Tag 4fe995b304ea342b50293f92d3c1992b43b820f7 refers to a dead (removed) revision in file `src/libchcore/TFileAlreadyExistsFilter.cpp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 4fe995b304ea342b50293f92d3c1992b43b820f7 refers to a dead (removed) revision in file `src/libchcore/TFileAlreadyExistsFilter.h'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 4fe995b304ea342b50293f92d3c1992b43b820f7 refers to a dead (removed) revision in file `src/libchcore/TFileErrorFilter.cpp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 4fe995b304ea342b50293f92d3c1992b43b820f7 refers to a dead (removed) revision in file `src/libchcore/TFileErrorFilter.h'.
Fisheye: No comparison available. Pass `N' to diff?
Index: src/libchcore/TFileFilter.h
===================================================================
diff -u -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TFileFilter.h (.../TFileFilter.h) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
+++ src/libchcore/TFileFilter.h (.../TFileFilter.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -31,7 +31,7 @@
{
class TConfig;
class TFileInfo;
- typedef boost::shared_ptr<TFileInfo> TFileInfoPtr;
+ typedef std::shared_ptr<TFileInfo> TFileInfoPtr;
class LIBCHCORE_API TFileFilter
{
Index: src/libchcore/TFileFiltersArray.h
===================================================================
diff -u -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TFileFiltersArray.h (.../TFileFiltersArray.h) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
+++ src/libchcore/TFileFiltersArray.h (.../TFileFiltersArray.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -28,7 +28,7 @@
{
class TConfig;
class TFileInfo;
- typedef boost::shared_ptr<TFileInfo> TFileInfoPtr;
+ typedef std::shared_ptr<TFileInfo> TFileInfoPtr;
class LIBCHCORE_API TFileFiltersArray
{
Index: src/libchcore/TFileInfo.h
===================================================================
diff -u -rf866db90e4b058a4f2e13cc6cf076d1e0bf2d956 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TFileInfo.h (.../TFileInfo.h) (revision f866db90e4b058a4f2e13cc6cf076d1e0bf2d956)
+++ src/libchcore/TFileInfo.h (.../TFileInfo.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -142,7 +142,7 @@
#pragma warning(pop)
};
- typedef boost::shared_ptr<TFileInfo> TFileInfoPtr;
+ typedef std::shared_ptr<TFileInfo> TFileInfoPtr;
}
#endif
Index: src/libchcore/TFileInfoArray.h
===================================================================
diff -u -r6c67d46c243c6a275f2a427c991f82db59c63ef0 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TFileInfoArray.h (.../TFileInfoArray.h) (revision 6c67d46c243c6a275f2a427c991f82db59c63ef0)
+++ src/libchcore/TFileInfoArray.h (.../TFileInfoArray.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -23,14 +23,13 @@
#define __TFILEINFOARRAY_H__
#include "libchcore.h"
-#include "TPath.h"
#include "TBasePathData.h"
#include "CommonDataTypes.h"
namespace chcore
{
class TFileInfo;
- typedef boost::shared_ptr<TFileInfo> TFileInfoPtr;
+ typedef std::shared_ptr<TFileInfo> TFileInfoPtr;
class LIBCHCORE_API TFileInfoArray
{
Index: src/libchcore/TFileInfoFwd.h
===================================================================
diff -u -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TFileInfoFwd.h (.../TFileInfoFwd.h) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
+++ src/libchcore/TFileInfoFwd.h (.../TFileInfoFwd.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -19,12 +19,10 @@
#ifndef __TFILEINFOFWD_H__
#define __TFILEINFOFWD_H__
-#include <boost/shared_ptr.hpp>
-
namespace chcore
{
class TFileInfo;
- typedef boost::shared_ptr<TFileInfo> TFileInfoPtr;
+ typedef std::shared_ptr<TFileInfo> TFileInfoPtr;
}
#endif
Index: src/libchcore/TFileTime.h
===================================================================
diff -u -rf866db90e4b058a4f2e13cc6cf076d1e0bf2d956 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TFileTime.h (.../TFileTime.h) (revision f866db90e4b058a4f2e13cc6cf076d1e0bf2d956)
+++ src/libchcore/TFileTime.h (.../TFileTime.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -48,7 +48,7 @@
FILETIME m_ftTime;
};
- typedef boost::shared_ptr<TFileTime> TFileTimePtr;
+ typedef std::shared_ptr<TFileTime> TFileTimePtr;
}
#endif
Index: src/libchcore/TFilesystemFeedbackWrapper.h
===================================================================
diff -u -ra27d1acf1bda3c25b6dcce0d0eb0278009ce63ae -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TFilesystemFeedbackWrapper.h (.../TFilesystemFeedbackWrapper.h) (revision a27d1acf1bda3c25b6dcce0d0eb0278009ce63ae)
+++ src/libchcore/TFilesystemFeedbackWrapper.h (.../TFilesystemFeedbackWrapper.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -19,7 +19,6 @@
#ifndef __TFILESYSTEMFEEDBACKWRAPPER_H__
#define __TFILESYSTEMFEEDBACKWRAPPER_H__
-#include "libchcore.h"
#include "IFilesystem.h"
#include "TSubTaskBase.h"
@@ -31,7 +30,7 @@
class TFilesystemFeedbackWrapper
{
public:
- TFilesystemFeedbackWrapper(const IFeedbackHandlerPtr& spFeedbackHandler, const IFilesystemPtr& spFilesystem, chcore::log_file& rLog, TWorkerThreadController& rThreadController);
+ TFilesystemFeedbackWrapper(const IFeedbackHandlerPtr& spFeedbackHandler, const IFilesystemPtr& spFilesystem, log_file& rLog, TWorkerThreadController& rThreadController);
TFilesystemFeedbackWrapper& operator=(const TFilesystemFeedbackWrapper&) = delete;
TSubTaskBase::ESubOperationResult CreateDirectoryFB(const TSmartPath& pathDirectory);
@@ -52,7 +51,7 @@
private:
IFeedbackHandlerPtr m_spFeedbackHandler;
IFilesystemPtr m_spFilesystem;
- chcore::log_file& m_rLog;
+ log_file& m_rLog;
TWorkerThreadController& m_rThreadController;
};
}
Index: src/libchcore/TFilesystemFileFeedbackWrapper.cpp
===================================================================
diff -u -re8f31b0f922b402878356e130c866c4f3682a7f5 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TFilesystemFileFeedbackWrapper.cpp (.../TFilesystemFileFeedbackWrapper.cpp) (revision e8f31b0f922b402878356e130c866c4f3682a7f5)
+++ src/libchcore/TFilesystemFileFeedbackWrapper.cpp (.../TFilesystemFileFeedbackWrapper.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -132,7 +132,7 @@
{
try
{
- TFileInfoPtr spDstFileInfo(boost::make_shared<TFileInfo>());
+ TFileInfoPtr spDstFileInfo(std::make_shared<TFileInfo>());
m_spFilesystem->GetFileInfo(fileDst->GetFilePath(), spDstFileInfo);
if(spDstFileInfo->IsReadOnly())
@@ -237,7 +237,7 @@
}
// read info about the existing destination file,
- TFileInfoPtr spDstFileInfo(boost::make_shared<TFileInfo>());
+ TFileInfoPtr spDstFileInfo(std::make_shared<TFileInfo>());
fileDst->GetFileInfo(*spDstFileInfo);
// src and dst files are the same
Index: src/libchcore/TFilesystemFileFeedbackWrapper.h
===================================================================
diff -u -ra27d1acf1bda3c25b6dcce0d0eb0278009ce63ae -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TFilesystemFileFeedbackWrapper.h (.../TFilesystemFileFeedbackWrapper.h) (revision a27d1acf1bda3c25b6dcce0d0eb0278009ce63ae)
+++ src/libchcore/TFilesystemFileFeedbackWrapper.h (.../TFilesystemFileFeedbackWrapper.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -19,7 +19,6 @@
#ifndef __TFILESYSTEMFILEFEEDBACKWRAPPER_H__
#define __TFILESYSTEMFILEFEEDBACKWRAPPER_H__
-#include "libchcore.h"
#include "IFilesystemFile.h"
#include "TSubTaskBase.h"
#include "IFeedbackHandler.h"
@@ -33,7 +32,7 @@
class TFilesystemFileFeedbackWrapper
{
public:
- TFilesystemFileFeedbackWrapper(const IFeedbackHandlerPtr& spFeedbackHandler, chcore::log_file& rLog, TWorkerThreadController& rThreadController, const IFilesystemPtr& spFilesystem);
+ TFilesystemFileFeedbackWrapper(const IFeedbackHandlerPtr& spFeedbackHandler, log_file& rLog, TWorkerThreadController& rThreadController, const IFilesystemPtr& spFilesystem);
TFilesystemFileFeedbackWrapper& operator=(const TFilesystemFileFeedbackWrapper&) = delete;
TSubTaskBase::ESubOperationResult OpenSourceFileFB(const IFilesystemFilePtr& fileSrc);
@@ -58,7 +57,7 @@
private:
IFeedbackHandlerPtr m_spFeedbackHandler;
IFilesystemPtr m_spFilesystem;
- chcore::log_file& m_rLog;
+ log_file& m_rLog;
TWorkerThreadController& m_rThreadController;
};
}
Index: src/libchcore/TLocalFilesystem.cpp
===================================================================
diff -u -rf866db90e4b058a4f2e13cc6cf076d1e0bf2d956 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TLocalFilesystem.cpp (.../TLocalFilesystem.cpp) (revision f866db90e4b058a4f2e13cc6cf076d1e0bf2d956)
+++ src/libchcore/TLocalFilesystem.cpp (.../TLocalFilesystem.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -304,8 +304,7 @@
//THROW(_T("Problem with physical disk detection"), 0, 0, 0);
eRelation = eRelation_TwoPhysicalDisks;
}
-
- if (dwFirstPhysicalDisk == dwSecondPhysicalDisk)
+ else if (dwFirstPhysicalDisk == dwSecondPhysicalDisk)
eRelation = eRelation_SinglePhysicalDisk;
else
eRelation = eRelation_TwoPhysicalDisks;
Index: src/libchcore/TLocalFilesystemFile.cpp
===================================================================
diff -u -rad4fe0f8085b15527158073aa76eb2d9ef80b0e5 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TLocalFilesystemFile.cpp (.../TLocalFilesystemFile.cpp) (revision ad4fe0f8085b15527158073aa76eb2d9ef80b0e5)
+++ src/libchcore/TLocalFilesystemFile.cpp (.../TLocalFilesystemFile.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -47,7 +47,7 @@
{
try
{
- Close();
+ InternalClose();
}
catch (const std::exception&)
{
@@ -220,13 +220,18 @@
}
}
- void TLocalFilesystemFile::Close()
+ void TLocalFilesystemFile::InternalClose()
{
if (m_hFile != INVALID_HANDLE_VALUE)
::CloseHandle(m_hFile);
m_hFile = INVALID_HANDLE_VALUE;
}
+ void TLocalFilesystemFile::Close()
+ {
+ InternalClose();
+ }
+
file_size_t TLocalFilesystemFile::GetFileSize() const
{
if (!IsOpen())
Index: src/libchcore/TLocalFilesystemFile.h
===================================================================
diff -u -rbfc7a8378a96c5b58def559b343918fca32f05a6 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TLocalFilesystemFile.h (.../TLocalFilesystemFile.h) (revision bfc7a8378a96c5b58def559b343918fca32f05a6)
+++ src/libchcore/TLocalFilesystemFile.h (.../TLocalFilesystemFile.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -45,7 +45,7 @@
virtual bool IsOpen() const override { return m_hFile != INVALID_HANDLE_VALUE; }
virtual file_size_t GetFileSize() const override;
- virtual void GetFileInfo(TFileInfo& tFileInfo) const;
+ virtual void GetFileInfo(TFileInfo& tFileInfo) const override;
virtual TSmartPath GetFilePath() const override;
@@ -56,9 +56,10 @@
TLocalFilesystemFile(const TSmartPath& pathFile, bool bNoBuffering);
DWORD GetFlagsAndAttributes(bool bNoBuffering) const;
-
void OpenExistingForWriting(bool bNoBuffering);
+ void InternalClose();
+
private:
TSmartPath m_pathFile;
HANDLE m_hFile;
Index: src/libchcore/TLocalFilesystemFind.cpp
===================================================================
diff -u -raf42be61996360060ae56ac01f9e22387daf09f9 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TLocalFilesystemFind.cpp (.../TLocalFilesystemFind.cpp) (revision af42be61996360060ae56ac01f9e22387daf09f9)
+++ src/libchcore/TLocalFilesystemFind.cpp (.../TLocalFilesystemFind.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -32,7 +32,7 @@
TLocalFilesystemFind::~TLocalFilesystemFind()
{
- Close();
+ InternalClose();
}
bool TLocalFilesystemFind::FindNext(TFileInfoPtr& rspFileInfo)
@@ -75,10 +75,15 @@
return false;
}
- void TLocalFilesystemFind::Close()
+ void TLocalFilesystemFind::InternalClose()
{
- if (m_hFind != INVALID_HANDLE_VALUE)
+ if(m_hFind != INVALID_HANDLE_VALUE)
FindClose(m_hFind);
m_hFind = INVALID_HANDLE_VALUE;
}
+
+ void TLocalFilesystemFind::Close()
+ {
+ InternalClose();
+ }
}
Index: src/libchcore/TLocalFilesystemFind.h
===================================================================
diff -u -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TLocalFilesystemFind.h (.../TLocalFilesystemFind.h) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
+++ src/libchcore/TLocalFilesystemFind.h (.../TLocalFilesystemFind.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -37,6 +37,8 @@
private:
TLocalFilesystemFind(const TSmartPath& pathDir, const TSmartPath& pathMask);
+ void InternalClose();
+
private:
TSmartPath m_pathDir;
TSmartPath m_pathMask;
Index: src/libchcore/TModificationTracker.h
===================================================================
diff -u -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TModificationTracker.h (.../TModificationTracker.h) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
+++ src/libchcore/TModificationTracker.h (.../TModificationTracker.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -19,8 +19,6 @@
#ifndef __TMODIFICATIONTRACKER_H__
#define __TMODIFICATIONTRACKER_H__
-#include "libchcore.h"
-
namespace chcore
{
template<class T>
Fisheye: Tag 4fe995b304ea342b50293f92d3c1992b43b820f7 refers to a dead (removed) revision in file `src/libchcore/TNotEnoughSpaceFilter.cpp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 4fe995b304ea342b50293f92d3c1992b43b820f7 refers to a dead (removed) revision in file `src/libchcore/TNotEnoughSpaceFilter.h'.
Fisheye: No comparison available. Pass `N' to diff?
Index: src/libchcore/TOverlappedDataBuffer.h
===================================================================
diff -u -rc6148b3c853fcd809375d48414b7f13dd4d10d7e -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TOverlappedDataBuffer.h (.../TOverlappedDataBuffer.h) (revision c6148b3c853fcd809375d48414b7f13dd4d10d7e)
+++ src/libchcore/TOverlappedDataBuffer.h (.../TOverlappedDataBuffer.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -16,15 +16,13 @@
// Free Software Foundation, Inc.,
// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// ============================================================================
-/// @file TDataBuffer.h
+/// @file TOverlappedDataBuffer.h
/// @date 2012/03/04
/// @brief Contains class representing buffer for data.
// ============================================================================
#ifndef __TDATABUFFER_H__
#define __TDATABUFFER_H__
-#include "libchcore.h"
-
namespace chcore
{
class IOverlappedDataBufferQueue;
Index: src/libchcore/TOverlappedDataBufferQueue.h
===================================================================
diff -u -r861eb97e5f43584f9537b4aff0558f6689bd0e38 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TOverlappedDataBufferQueue.h (.../TOverlappedDataBufferQueue.h) (revision 861eb97e5f43584f9537b4aff0558f6689bd0e38)
+++ src/libchcore/TOverlappedDataBufferQueue.h (.../TOverlappedDataBufferQueue.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -19,7 +19,6 @@
#ifndef __TOVERLAPPEDDATABUFFERQUEUE_H__
#define __TOVERLAPPEDDATABUFFERQUEUE_H__
-#include "libchcore.h"
#include <deque>
#include "TEvent.h"
#include "IOverlappedDataBufferQueue.h"
Index: src/libchcore/TSQLiteDatabase.h
===================================================================
diff -u -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TSQLiteDatabase.h (.../TSQLiteDatabase.h) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
+++ src/libchcore/TSQLiteDatabase.h (.../TSQLiteDatabase.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -19,7 +19,6 @@
#ifndef __TSQLITEDATABASE_H__
#define __TSQLITEDATABASE_H__
-#include "libchcore.h"
#include "TPath.h"
struct sqlite3;
@@ -51,7 +50,7 @@
friend class TSQLiteTransaction;
};
- typedef boost::shared_ptr<TSQLiteDatabase> TSQLiteDatabasePtr;
+ typedef std::shared_ptr<TSQLiteDatabase> TSQLiteDatabasePtr;
}
}
Index: src/libchcore/TSQLiteException.h
===================================================================
diff -u -r8d3154738b885f2e01997071e6180da0c4b8cc7c -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TSQLiteException.h (.../TSQLiteException.h) (revision 8d3154738b885f2e01997071e6180da0c4b8cc7c)
+++ src/libchcore/TSQLiteException.h (.../TSQLiteException.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -19,7 +19,6 @@
#ifndef __TSQLITEEXCEPTION_H__
#define __TSQLITEEXCEPTION_H__
-#include "libchcore.h"
#include "TBaseException.h"
namespace chcore
Index: src/libchcore/TSQLiteSerializer.cpp
===================================================================
diff -u -re8f31b0f922b402878356e130c866c4f3682a7f5 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TSQLiteSerializer.cpp (.../TSQLiteSerializer.cpp) (revision e8f31b0f922b402878356e130c866c4f3682a7f5)
+++ src/libchcore/TSQLiteSerializer.cpp (.../TSQLiteSerializer.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -58,7 +58,7 @@
if (iterMap == m_mapContainers.end())
iterMap = m_mapContainers.insert(std::make_pair(
strContainerName,
- TSQLiteSerializerContainerPtr(new TSQLiteSerializerContainer(strContainerName, m_spDatabase, m_poolStrings)))).first;
+ std::make_shared<TSQLiteSerializerContainer>(strContainerName, m_spDatabase, m_poolStrings))).first;
return iterMap->second;
}
Index: src/libchcore/TSQLiteSerializer.h
===================================================================
diff -u -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TSQLiteSerializer.h (.../TSQLiteSerializer.h) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
+++ src/libchcore/TSQLiteSerializer.h (.../TSQLiteSerializer.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -57,7 +57,7 @@
#pragma warning(pop)
};
- typedef boost::shared_ptr<TSQLiteSerializer> TSQLiteSerializerPtr;
+ typedef std::shared_ptr<TSQLiteSerializer> TSQLiteSerializerPtr;
}
#endif
Index: src/libchcore/TSQLiteSerializerContainer.h
===================================================================
diff -u -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TSQLiteSerializerContainer.h (.../TSQLiteSerializerContainer.h) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
+++ src/libchcore/TSQLiteSerializerContainer.h (.../TSQLiteSerializerContainer.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -22,8 +22,6 @@
#include "libchcore.h"
#include "ISerializerRowReader.h"
#include "ISerializerContainer.h"
-#include <map>
-#include <boost/optional.hpp>
#include <boost/pool/poolfwd.hpp>
#include "TSQLiteColumnDefinition.h"
#include "TSQLiteDatabase.h"
@@ -76,7 +74,7 @@
#pragma warning(pop)
};
- typedef boost::shared_ptr<TSQLiteSerializerContainer> TSQLiteSerializerContainerPtr;
+ using TSQLiteSerializerContainerPtr = std::shared_ptr<TSQLiteSerializerContainer>;
}
#endif
Index: src/libchcore/TSQLiteSerializerFactory.cpp
===================================================================
diff -u -rad4fe0f8085b15527158073aa76eb2d9ef80b0e5 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TSQLiteSerializerFactory.cpp (.../TSQLiteSerializerFactory.cpp) (revision ad4fe0f8085b15527158073aa76eb2d9ef80b0e5)
+++ src/libchcore/TSQLiteSerializerFactory.cpp (.../TSQLiteSerializerFactory.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -54,9 +54,9 @@
}
}
- TSQLiteSerializerPtr spSerializer(boost::make_shared<TSQLiteSerializer>(
+ TSQLiteSerializerPtr spSerializer(std::make_shared<TSQLiteSerializer>(
pathTaskManager,
- boost::make_shared<TSQLiteTaskManagerSchema>()));
+ std::make_shared<TSQLiteTaskManagerSchema>()));
return spSerializer;
}
@@ -91,7 +91,7 @@
}
}
- TSQLiteSerializerPtr spSerializer(boost::make_shared<TSQLiteSerializer>(pathTask, boost::make_shared<TSQLiteTaskSchema>()));
+ TSQLiteSerializerPtr spSerializer(std::make_shared<TSQLiteSerializer>(pathTask, std::make_shared<TSQLiteTaskSchema>()));
return spSerializer;
}
Index: src/libchcore/TSQLiteSerializerFactory.h
===================================================================
diff -u -rcb4e9d4b60d62b25ae2cf556c0642601af56c787 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TSQLiteSerializerFactory.h (.../TSQLiteSerializerFactory.h) (revision cb4e9d4b60d62b25ae2cf556c0642601af56c787)
+++ src/libchcore/TSQLiteSerializerFactory.h (.../TSQLiteSerializerFactory.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -38,7 +38,7 @@
TSmartPath m_pathSerializeDir;
};
- typedef boost::shared_ptr<TSQLiteSerializerFactory> TSQLiteSerializerFactoryPtr;
+ typedef std::shared_ptr<TSQLiteSerializerFactory> TSQLiteSerializerFactoryPtr;
}
#endif
Index: src/libchcore/TSQLiteSerializerRowData.cpp
===================================================================
diff -u -r8d3154738b885f2e01997071e6180da0c4b8cc7c -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TSQLiteSerializerRowData.cpp (.../TSQLiteSerializerRowData.cpp) (revision 8d3154738b885f2e01997071e6180da0c4b8cc7c)
+++ src/libchcore/TSQLiteSerializerRowData.cpp (.../TSQLiteSerializerRowData.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -43,7 +43,7 @@
// set id
size_t stIDIndex = rColumnDefinition.GetColumnIndex(_T("id"));
- SetValue(stIDIndex, oidRowID);
+ InternalSetValue(stIDIndex, oidRowID);
if (bAdded)
MarkAsAdded();
@@ -114,15 +114,21 @@
return *this;
}
- ISerializerRowData& TSQLiteSerializerRowData::SetValue(size_t stColIndex, unsigned long ulValue)
+ ISerializerRowData& TSQLiteSerializerRowData::InternalSetValue(size_t stColIndex, unsigned long ulValue)
{
- if (m_rColumns.GetColumnType(stColIndex) != IColumnsDefinition::eType_ulong)
+ if(m_rColumns.GetColumnType(stColIndex) != IColumnsDefinition::eType_ulong)
throw TSerializerException(eErr_InvalidArgument, _T("Invalid argument type provided"), LOCATION);
ModifyColumnData(stColIndex) = (unsigned long long)ulValue;
return *this;
}
+ ISerializerRowData& TSQLiteSerializerRowData::SetValue(size_t stColIndex, unsigned long ulValue)
+ {
+ InternalSetValue(stColIndex, ulValue);
+ return *this;
+ }
+
ISerializerRowData& TSQLiteSerializerRowData::SetValue(size_t stColIndex, long long llValue)
{
if (m_rColumns.GetColumnType(stColIndex) != IColumnsDefinition::eType_longlong)
Index: src/libchcore/TSQLiteSerializerRowData.h
===================================================================
diff -u -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TSQLiteSerializerRowData.h (.../TSQLiteSerializerRowData.h) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
+++ src/libchcore/TSQLiteSerializerRowData.h (.../TSQLiteSerializerRowData.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -25,9 +25,7 @@
#include "ISerializerContainer.h"
#include "TSQLiteDatabase.h"
#include "TSQLiteStatement.h"
-#include <vector>
#include <boost/dynamic_bitset.hpp>
-#include <boost/variant/variant.hpp>
namespace chcore
{
@@ -93,6 +91,7 @@
bool HasData(size_t stColumnIndex) const;
void BindParams(sqlite::TSQLiteStatement &tStatement, int& iSQLiteColumnNumber, size_t bSkipColumn = (size_t)-1);
+ ISerializerRowData& InternalSetValue(size_t stColIndex, unsigned long ulValue);
private:
unsigned long long* m_pPoolMemory;
@@ -103,7 +102,7 @@
friend class TSQLiteSerializerContainer;
};
- typedef boost::shared_ptr<TSQLiteSerializerRowData> TSQLiteSerializerRowDataPtr;
+ typedef std::shared_ptr<TSQLiteSerializerRowData> TSQLiteSerializerRowDataPtr;
}
#endif
Index: src/libchcore/TSQLiteSerializerRowReader.h
===================================================================
diff -u -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TSQLiteSerializerRowReader.h (.../TSQLiteSerializerRowReader.h) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
+++ src/libchcore/TSQLiteSerializerRowReader.h (.../TSQLiteSerializerRowReader.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -64,7 +64,7 @@
#pragma warning(pop)
};
- typedef boost::shared_ptr<TSQLiteSerializerRowReader> TSQLiteSerializerRowReaderPtr;
+ typedef std::shared_ptr<TSQLiteSerializerRowReader> TSQLiteSerializerRowReaderPtr;
}
#endif
Index: src/libchcore/TSQLiteStatement.h
===================================================================
diff -u -rcb4e9d4b60d62b25ae2cf556c0642601af56c787 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TSQLiteStatement.h (.../TSQLiteStatement.h) (revision cb4e9d4b60d62b25ae2cf556c0642601af56c787)
+++ src/libchcore/TSQLiteStatement.h (.../TSQLiteStatement.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -19,7 +19,6 @@
#ifndef __TSQLITESTATEMENT_H__
#define __TSQLITESTATEMENT_H__
-#include "libchcore.h"
#include "TSQLiteDatabase.h"
#include "TString.h"
@@ -29,7 +28,7 @@
{
namespace sqlite
{
- typedef boost::shared_ptr<sqlite3_stmt> SQLiteStatementHandle;
+ typedef std::shared_ptr<sqlite3_stmt> SQLiteStatementHandle;
class TSQLiteStatement
{
@@ -100,7 +99,7 @@
bool m_bHasRow;
};
- typedef boost::shared_ptr<TSQLiteStatement> TSQLiteStatementPtr;
+ typedef std::shared_ptr<TSQLiteStatement> TSQLiteStatementPtr;
}
}
Index: src/libchcore/TSQLiteTaskManagerSchema.h
===================================================================
diff -u -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TSQLiteTaskManagerSchema.h (.../TSQLiteTaskManagerSchema.h) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
+++ src/libchcore/TSQLiteTaskManagerSchema.h (.../TSQLiteTaskManagerSchema.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -34,7 +34,7 @@
virtual void Setup(const sqlite::TSQLiteDatabasePtr& spDatabase);
};
- typedef boost::shared_ptr<TSQLiteTaskManagerSchema> TTaskManagerSchemaPtr;
+ typedef std::shared_ptr<TSQLiteTaskManagerSchema> TTaskManagerSchemaPtr;
}
#endif
Index: src/libchcore/TSQLiteTaskSchema.h
===================================================================
diff -u -r410f8f7b06e7639102eff1021e523b3cfdc185a2 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TSQLiteTaskSchema.h (.../TSQLiteTaskSchema.h) (revision 410f8f7b06e7639102eff1021e523b3cfdc185a2)
+++ src/libchcore/TSQLiteTaskSchema.h (.../TSQLiteTaskSchema.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -43,7 +43,7 @@
void Migrate_004_005(const sqlite::TSQLiteDatabasePtr& spDatabase, TSerializerVersion &tVersion);
};
- typedef boost::shared_ptr<TSQLiteTaskSchema> TSQLiteTaskSchemaPtr;
+ typedef std::shared_ptr<TSQLiteTaskSchema> TSQLiteTaskSchemaPtr;
}
#endif
Index: src/libchcore/TSQLiteTransaction.h
===================================================================
diff -u -rcb4e9d4b60d62b25ae2cf556c0642601af56c787 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TSQLiteTransaction.h (.../TSQLiteTransaction.h) (revision cb4e9d4b60d62b25ae2cf556c0642601af56c787)
+++ src/libchcore/TSQLiteTransaction.h (.../TSQLiteTransaction.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -19,7 +19,6 @@
#ifndef __TSQLITETRANSACTION_H__
#define __TSQLITETRANSACTION_H__
-#include "libchcore.h"
#include "TSQLiteDatabase.h"
namespace chcore
Index: src/libchcore/TScopedRunningTimeTracker.h
===================================================================
diff -u -rcb4e9d4b60d62b25ae2cf556c0642601af56c787 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TScopedRunningTimeTracker.h (.../TScopedRunningTimeTracker.h) (revision cb4e9d4b60d62b25ae2cf556c0642601af56c787)
+++ src/libchcore/TScopedRunningTimeTracker.h (.../TScopedRunningTimeTracker.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -19,7 +19,6 @@
#ifndef __TSCOPEDRUNNINGTIME_H__
#define __TSCOPEDRUNNINGTIME_H__
-#include "libchcore.h"
#include "IRunningTimeControl.h"
namespace chcore
Index: src/libchcore/TSharedModificationTracker.h
===================================================================
diff -u -rcb4e9d4b60d62b25ae2cf556c0642601af56c787 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TSharedModificationTracker.h (.../TSharedModificationTracker.h) (revision cb4e9d4b60d62b25ae2cf556c0642601af56c787)
+++ src/libchcore/TSharedModificationTracker.h (.../TSharedModificationTracker.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -19,8 +19,6 @@
#ifndef __TSHAREDMODIFICATIONTRACKER_H__
#define __TSHAREDMODIFICATIONTRACKER_H__
-#include "libchcore.h"
-
namespace chcore
{
template<class T, class Bitset, size_t ChangeBit>
Index: src/libchcore/TSimpleTimer.cpp
===================================================================
diff -u -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TSimpleTimer.cpp (.../TSimpleTimer.cpp) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
+++ src/libchcore/TSimpleTimer.cpp (.../TSimpleTimer.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -29,7 +29,7 @@
m_ullTotalTime(0)
{
if (!spTimestampProvider)
- m_spTimestampProvider = ITimestampProviderPtr(new TTimestampProviderTickCount);
+ m_spTimestampProvider = std::make_shared<TTimestampProviderTickCount>();
if (bAutostart)
Start();
Index: src/libchcore/TSpeedTracker.h
===================================================================
diff -u -ra380f7b2ae7d8fe6121e2d0a026b98ee2248c8b5 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TSpeedTracker.h (.../TSpeedTracker.h) (revision a380f7b2ae7d8fe6121e2d0a026b98ee2248c8b5)
+++ src/libchcore/TSpeedTracker.h (.../TSpeedTracker.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -1,7 +1,6 @@
#ifndef __TSPEEDTRACKER_H__
#define __TSPEEDTRACKER_H__
-#include "libchcore.h"
#include "TString.h"
namespace chcore
Index: src/libchcore/TString.h
===================================================================
diff -u -r5446395d3925e49d3e4cba82044bdfd4dffb6ee9 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TString.h (.../TString.h) (revision 5446395d3925e49d3e4cba82044bdfd4dffb6ee9)
+++ src/libchcore/TString.h (.../TString.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -24,7 +24,6 @@
#define __TSTRING_H__
#include "libchcore.h"
-#include <algorithm>
#include <ostream>
namespace chcore
Index: src/libchcore/TStringException.h
===================================================================
diff -u -r8d3154738b885f2e01997071e6180da0c4b8cc7c -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TStringException.h (.../TStringException.h) (revision 8d3154738b885f2e01997071e6180da0c4b8cc7c)
+++ src/libchcore/TStringException.h (.../TStringException.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -30,9 +30,7 @@
public:
TStringException(EGeneralErrors eErrorCode, const wchar_t* pszMsg, const wchar_t* pszFile, size_t stLineNumber, const wchar_t* pszFunction);
TStringException(EGeneralErrors eErrorCode, const char* pszMsg, const wchar_t* pszFile, size_t stLineNumber, const wchar_t* pszFunction);
-
- private:
- TStringException();
+ TStringException() = delete;
};
}
Index: src/libchcore/TSubTaskArray.cpp
===================================================================
diff -u -rbe569bc86280887eeebb8d3e9489f6fc17c570e6 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TSubTaskArray.cpp (.../TSubTaskArray.cpp) (revision be569bc86280887eeebb8d3e9489f6fc17c570e6)
+++ src/libchcore/TSubTaskArray.cpp (.../TSubTaskArray.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -79,9 +79,9 @@
{
case eOperation_Copy:
{
- TSubTaskBasePtr spOperation = boost::make_shared<TSubTaskScanDirectories>(boost::ref(m_rSubTaskContext));
+ TSubTaskBasePtr spOperation = std::make_shared<TSubTaskScanDirectories>(boost::ref(m_rSubTaskContext));
AddSubTask(spOperation, bReadTasksSizeBeforeBlocking);
- spOperation = boost::make_shared<TSubTaskCopyMove>(boost::ref(m_rSubTaskContext));
+ spOperation = std::make_shared<TSubTaskCopyMove>(boost::ref(m_rSubTaskContext));
AddSubTask(spOperation, false);
break;
@@ -95,27 +95,27 @@
// fastmove (if not reordered)
if(!bReorderFastMove)
{
- spOperation = boost::make_shared<TSubTaskFastMove>(boost::ref(m_rSubTaskContext));
+ spOperation = std::make_shared<TSubTaskFastMove>(boost::ref(m_rSubTaskContext));
AddSubTask(spOperation, bFastMoveBeforeBlocking);
}
// scanning
- spOperation = boost::make_shared<TSubTaskScanDirectories>(boost::ref(m_rSubTaskContext));
+ spOperation = std::make_shared<TSubTaskScanDirectories>(boost::ref(m_rSubTaskContext));
AddSubTask(spOperation, bReadTasksSizeBeforeBlocking);
// fastmove (if reordered)
if(bReorderFastMove)
{
- spOperation = boost::make_shared<TSubTaskFastMove>(boost::ref(m_rSubTaskContext));
+ spOperation = std::make_shared<TSubTaskFastMove>(boost::ref(m_rSubTaskContext));
AddSubTask(spOperation, bFastMoveBeforeBlocking);
}
// copy/move
- spOperation = boost::make_shared<TSubTaskCopyMove>(boost::ref(m_rSubTaskContext));
+ spOperation = std::make_shared<TSubTaskCopyMove>(boost::ref(m_rSubTaskContext));
AddSubTask(spOperation, false);
// delete
- spOperation = boost::make_shared<TSubTaskDelete>(boost::ref(m_rSubTaskContext));
+ spOperation = std::make_shared<TSubTaskDelete>(boost::ref(m_rSubTaskContext));
AddSubTask(spOperation, false);
break;
@@ -355,16 +355,16 @@
switch (eType)
{
case eSubOperation_FastMove:
- return boost::make_shared<TSubTaskFastMove>(boost::ref(rContext));
+ return std::make_shared<TSubTaskFastMove>(boost::ref(rContext));
case eSubOperation_Scanning:
- return boost::make_shared<TSubTaskScanDirectories>(boost::ref(rContext));
+ return std::make_shared<TSubTaskScanDirectories>(boost::ref(rContext));
case eSubOperation_Copying:
- return boost::make_shared<TSubTaskCopyMove>(boost::ref(rContext));
+ return std::make_shared<TSubTaskCopyMove>(boost::ref(rContext));
case eSubOperation_Deleting:
- return boost::make_shared<TSubTaskDelete>(boost::ref(rContext));
+ return std::make_shared<TSubTaskDelete>(boost::ref(rContext));
default:
throw TCoreException(eErr_UnhandledCase, L"SubTask is unknown to the engine", LOCATION);
Index: src/libchcore/TSubTaskBase.h
===================================================================
diff -u -r7ba9f25ab2c2a42bac9f5455ecb98aaf6e29f02d -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TSubTaskBase.h (.../TSubTaskBase.h) (revision 7ba9f25ab2c2a42bac9f5455ecb98aaf6e29f02d)
+++ src/libchcore/TSubTaskBase.h (.../TSubTaskBase.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -24,7 +24,6 @@
#define __TSUBTASKBASE_H__
#include "libchcore.h"
-#include "TPath.h"
#include "ESubTaskTypes.h"
#include "TSubTaskStatsInfo.h"
#include "ISerializer.h"
@@ -34,7 +33,7 @@
{
class TSubTaskContext;
class TFileInfo;
- typedef boost::shared_ptr<TFileInfo> TFileInfoPtr;
+ typedef std::shared_ptr<TFileInfo> TFileInfoPtr;
///////////////////////////////////////////////////////////////////////////
// TSubTaskBase
@@ -82,7 +81,7 @@
TSubTaskContext& m_rContext;
};
- typedef boost::shared_ptr<TSubTaskBase> TSubTaskBasePtr;
+ typedef std::shared_ptr<TSubTaskBase> TSubTaskBasePtr;
}
#endif
Index: src/libchcore/TSubTaskContext.cpp
===================================================================
diff -u -re8f31b0f922b402878356e130c866c4f3682a7f5 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TSubTaskContext.cpp (.../TSubTaskContext.cpp) (revision e8f31b0f922b402878356e130c866c4f3682a7f5)
+++ src/libchcore/TSubTaskContext.cpp (.../TSubTaskContext.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -126,16 +126,11 @@
return m_rThreadController;
}
- IFilesystemPtr TSubTaskContext::GetLocalFilesystem()
+ IFilesystemPtr TSubTaskContext::GetLocalFilesystem() const
{
return m_spFilesystem;
}
- const IFilesystemPtr TSubTaskContext::GetLocalFilesystem() const
- {
- return m_spFilesystem;
- }
-
const TFileFiltersArray& TSubTaskContext::GetFilters() const
{
return m_rFilters;
Index: src/libchcore/TSubTaskContext.h
===================================================================
diff -u -rfb881f503caba7b2ade610ba7fc1a36a5aea5d01 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TSubTaskContext.h (.../TSubTaskContext.h) (revision fb881f503caba7b2ade610ba7fc1a36a5aea5d01)
+++ src/libchcore/TSubTaskContext.h (.../TSubTaskContext.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -26,7 +26,6 @@
#include "libchcore.h"
#include "TPath.h"
#include "EOperationTypes.h"
-#include "IFeedbackHandler.h"
#include "TBasePathData.h"
#include "TFileInfoArray.h"
#include "IFilesystem.h"
@@ -75,8 +74,7 @@
TWorkerThreadController& GetThreadController();
const TWorkerThreadController& GetThreadController() const;
- IFilesystemPtr GetLocalFilesystem();
- const IFilesystemPtr GetLocalFilesystem() const;
+ IFilesystemPtr GetLocalFilesystem() const;
private:
TSubTaskContext(const TSubTaskContext& rSrc);
Index: src/libchcore/TSubTaskCopyMove.cpp
===================================================================
diff -u -r7ba9f25ab2c2a42bac9f5455ecb98aaf6e29f02d -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TSubTaskCopyMove.cpp (.../TSubTaskCopyMove.cpp) (revision 7ba9f25ab2c2a42bac9f5455ecb98aaf6e29f02d)
+++ src/libchcore/TSubTaskCopyMove.cpp (.../TSubTaskCopyMove.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -99,7 +99,7 @@
TSubTaskBase::ESubOperationResult TSubTaskCopyMove::Exec(const IFeedbackHandlerPtr& spFeedback)
{
TScopedRunningTimeTracker guard(m_tSubTaskStats);
- TFeedbackHandlerWrapperPtr spFeedbackHandler(boost::make_shared<TFeedbackHandlerWrapper>(spFeedback, guard));
+ TFeedbackHandlerWrapperPtr spFeedbackHandler(std::make_shared<TFeedbackHandlerWrapper>(spFeedback, guard));
chcore::log_file& rLog = GetContext().GetLog();
TFileInfoArray& rFilesCache = GetContext().GetFilesCache();
@@ -691,7 +691,7 @@
if (m_tSubTaskStats.CanCurrentItemSilentResume())
{
bool bContinue = true;
- TFileInfoPtr spDstFileInfo(boost::make_shared<TFileInfo>());
+ TFileInfoPtr spDstFileInfo(std::make_shared<TFileInfo>());
// verify that the file qualifies for silent resume
try
{
Index: src/libchcore/TSubTaskCopyMove.h
===================================================================
diff -u -rfb881f503caba7b2ade610ba7fc1a36a5aea5d01 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TSubTaskCopyMove.h (.../TSubTaskCopyMove.h) (revision fb881f503caba7b2ade610ba7fc1a36a5aea5d01)
+++ src/libchcore/TSubTaskCopyMove.h (.../TSubTaskCopyMove.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -31,7 +31,7 @@
namespace chcore
{
- typedef boost::shared_ptr<TFileInfo> TFileInfoPtr;
+ typedef std::shared_ptr<TFileInfo> TFileInfoPtr;
struct CUSTOM_COPY_PARAMS;
class TDataBufferManager;
Index: src/libchcore/TSubTaskDelete.cpp
===================================================================
diff -u -rfb881f503caba7b2ade610ba7fc1a36a5aea5d01 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TSubTaskDelete.cpp (.../TSubTaskDelete.cpp) (revision fb881f503caba7b2ade610ba7fc1a36a5aea5d01)
+++ src/libchcore/TSubTaskDelete.cpp (.../TSubTaskDelete.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -78,7 +78,7 @@
TSubTaskBase::ESubOperationResult TSubTaskDelete::Exec(const IFeedbackHandlerPtr& spFeedback)
{
TScopedRunningTimeTracker guard(m_tSubTaskStats);
- TFeedbackHandlerWrapperPtr spFeedbackHandler(boost::make_shared<TFeedbackHandlerWrapper>(spFeedback, guard));
+ TFeedbackHandlerWrapperPtr spFeedbackHandler(std::make_shared<TFeedbackHandlerWrapper>(spFeedback, guard));
// log
chcore::log_file& rLog = GetContext().GetLog();
Index: src/libchcore/TSubTaskFastMove.cpp
===================================================================
diff -u -rcc02a2b70a8e6d4108ef25365ddcdb47fc436cbe -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TSubTaskFastMove.cpp (.../TSubTaskFastMove.cpp) (revision cc02a2b70a8e6d4108ef25365ddcdb47fc436cbe)
+++ src/libchcore/TSubTaskFastMove.cpp (.../TSubTaskFastMove.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -81,7 +81,7 @@
TSubTaskFastMove::ESubOperationResult TSubTaskFastMove::Exec(const IFeedbackHandlerPtr& spFeedback)
{
TScopedRunningTimeTracker guard(m_tSubTaskStats);
- TFeedbackHandlerWrapperPtr spFeedbackHandler(boost::make_shared<TFeedbackHandlerWrapper>(spFeedback, guard));
+ TFeedbackHandlerWrapperPtr spFeedbackHandler(std::make_shared<TFeedbackHandlerWrapper>(spFeedback, guard));
// log
chcore::log_file& rLog = GetContext().GetLog();
@@ -143,7 +143,7 @@
if (spBasePath->GetSkipFurtherProcessing())
continue;
- TFileInfoPtr spFileInfo(boost::make_shared<TFileInfo>());
+ TFileInfoPtr spFileInfo(std::make_shared<TFileInfo>());
bool bSkip = false;
ESubOperationResult eResult = tFilesystemFBWrapper.GetFileInfoFB(pathCurrent, spFileInfo, spBasePath, bSkip);
Index: src/libchcore/TSubTaskFastMove.h
===================================================================
diff -u -rcb4e9d4b60d62b25ae2cf556c0642601af56c787 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TSubTaskFastMove.h (.../TSubTaskFastMove.h) (revision cb4e9d4b60d62b25ae2cf556c0642601af56c787)
+++ src/libchcore/TSubTaskFastMove.h (.../TSubTaskFastMove.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -25,8 +25,6 @@
#include "libchcore.h"
#include "TSubTaskBase.h"
-#include "TPath.h"
-#include "CommonDataTypes.h"
namespace chcore
{
@@ -52,12 +50,9 @@
void InitColumns(const ISerializerContainerPtr& spContainer) const;
- virtual void GetStatsSnapshot(TSubTaskStatsSnapshotPtr& rStats) const;
+ virtual void GetStatsSnapshot(TSubTaskStatsSnapshotPtr& rStats) const override;
private:
- int ScanDirectory(TSmartPath pathDirName, size_t stSrcIndex, bool bRecurse, bool bIncludeDirs, TFileFiltersArray& afFilters);
-
- private:
#pragma warning(push)
#pragma warning(disable: 4251)
TSubTaskStatsInfo m_tSubTaskStats;
Index: src/libchcore/TSubTaskScanDirectory.cpp
===================================================================
diff -u -r410f8f7b06e7639102eff1021e523b3cfdc185a2 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TSubTaskScanDirectory.cpp (.../TSubTaskScanDirectory.cpp) (revision 410f8f7b06e7639102eff1021e523b3cfdc185a2)
+++ src/libchcore/TSubTaskScanDirectory.cpp (.../TSubTaskScanDirectory.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -82,7 +82,7 @@
TSubTaskScanDirectories::ESubOperationResult TSubTaskScanDirectories::Exec(const IFeedbackHandlerPtr& spFeedback)
{
TScopedRunningTimeTracker guard(m_tSubTaskStats);
- TFeedbackHandlerWrapperPtr spFeedbackHandler(boost::make_shared<TFeedbackHandlerWrapper>(spFeedback, guard));
+ TFeedbackHandlerWrapperPtr spFeedbackHandler(std::make_shared<TFeedbackHandlerWrapper>(spFeedback, guard));
// log
chcore::log_file& rLog = GetContext().GetLog();
@@ -131,7 +131,7 @@
m_tSubTaskStats.SetProcessedCount(fcIndex);
m_tSubTaskStats.SetCurrentPath(pathCurrent.ToString());
- TFileInfoPtr spFileInfo(boost::make_shared<TFileInfo>());
+ TFileInfoPtr spFileInfo(std::make_shared<TFileInfo>());
// check if we want to process this path at all (might be already fast moved)
if (spBasePath->GetSkipFurtherProcessing())
@@ -222,7 +222,7 @@
const IFilesystemPtr& spFilesystem = GetContext().GetLocalFilesystem();
IFilesystemFindPtr spFinder = spFilesystem->CreateFinderObject(pathDirName, PathFromString(_T("*")));
- TFileInfoPtr spFileInfo(boost::make_shared<TFileInfo>());
+ TFileInfoPtr spFileInfo(std::make_shared<TFileInfo>());
while (spFinder->FindNext(spFileInfo))
{
@@ -235,7 +235,7 @@
{
spFileInfo->SetParentObject(spBasePathData);
rFilesCache.AddFileInfo(spFileInfo);
- spFileInfo = boost::make_shared<TFileInfo>();
+ spFileInfo = std::make_shared<TFileInfo>();
}
}
else
@@ -245,7 +245,7 @@
{
spFileInfo->SetParentObject(spBasePathData);
rFilesCache.AddFileInfo(spFileInfo);
- spFileInfo = boost::make_shared<TFileInfo>();
+ spFileInfo = std::make_shared<TFileInfo>();
}
if (bRecurse)
Index: src/libchcore/TSubTaskScanDirectory.h
===================================================================
diff -u -r410f8f7b06e7639102eff1021e523b3cfdc185a2 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TSubTaskScanDirectory.h (.../TSubTaskScanDirectory.h) (revision 410f8f7b06e7639102eff1021e523b3cfdc185a2)
+++ src/libchcore/TSubTaskScanDirectory.h (.../TSubTaskScanDirectory.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -27,7 +27,6 @@
#include "TSubTaskBase.h"
#include "TPath.h"
#include "TBasePathData.h"
-#include "CommonDataTypes.h"
namespace chcore
{
Index: src/libchcore/TSubTaskStatsInfo.h
===================================================================
diff -u -rcb4e9d4b60d62b25ae2cf556c0642601af56c787 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TSubTaskStatsInfo.h (.../TSubTaskStatsInfo.h) (revision cb4e9d4b60d62b25ae2cf556c0642601af56c787)
+++ src/libchcore/TSubTaskStatsInfo.h (.../TSubTaskStatsInfo.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -23,7 +23,6 @@
#ifndef __TSUBTASKSTATSINFO_H__
#define __TSUBTASKSTATSINFO_H__
-#include "libchcore.h"
#include "TString.h"
#include "TSimpleTimer.h"
#include "TSpeedTracker.h"
Index: src/libchcore/TSubTaskStatsSnapshot.h
===================================================================
diff -u -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TSubTaskStatsSnapshot.h (.../TSubTaskStatsSnapshot.h) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
+++ src/libchcore/TSubTaskStatsSnapshot.h (.../TSubTaskStatsSnapshot.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -125,7 +125,7 @@
unsigned long long m_timeElapsed; // time really elapsed for the subtask
};
- typedef boost::shared_ptr<TSubTaskStatsSnapshot> TSubTaskStatsSnapshotPtr;
+ typedef std::shared_ptr<TSubTaskStatsSnapshot> TSubTaskStatsSnapshotPtr;
}
#endif
Index: src/libchcore/TTask.cpp
===================================================================
diff -u -ref05af11e2a9b7964a91dffdd9f76e85a690b887 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TTask.cpp (.../TTask.cpp) (revision ef05af11e2a9b7964a91dffdd9f76e85a690b887)
+++ src/libchcore/TTask.cpp (.../TTask.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -526,7 +526,7 @@
{
// start tracking time for this thread
TScopedRunningTimeTracker tProcessingGuard(m_tLocalStats);
- TFeedbackHandlerWrapperPtr spFeedbackHandler(boost::make_shared<TFeedbackHandlerWrapper>(m_spInternalFeedbackHandler, tProcessingGuard));
+ TFeedbackHandlerWrapperPtr spFeedbackHandler(std::make_shared<TFeedbackHandlerWrapper>(m_spInternalFeedbackHandler, tProcessingGuard));
const size_t ExceptionBufferSize = 2048;
std::unique_ptr<wchar_t[]> upExceptionInfoBuffer(new wchar_t[ExceptionBufferSize]);
Index: src/libchcore/TTask.h
===================================================================
diff -u -rfb881f503caba7b2ade610ba7fc1a36a5aea5d01 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TTask.h (.../TTask.h) (revision fb881f503caba7b2ade610ba7fc1a36a5aea5d01)
+++ src/libchcore/TTask.h (.../TTask.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -32,7 +32,6 @@
#include "TTaskStatsSnapshot.h"
#include "ISerializer.h"
#include "TTaskBaseData.h"
-#include "TEvent.h"
#include <mutex>
#include "log.h"
#include "IFilesystem.h"
@@ -110,10 +109,6 @@
TSubTaskBase::ESubOperationResult CheckForWaitState();
- // m_nStatus
- void SetStatusNL(UINT nStatus, UINT nMask);
- UINT GetStatusNL(UINT nMask = 0xffffffff);
-
void SetForceFlagNL(bool bFlag = true);
bool GetForceFlagNL();
@@ -187,7 +182,7 @@
friend class TTaskManager;
};
- typedef boost::shared_ptr<TTask> TTaskPtr;
+ typedef std::shared_ptr<TTask> TTaskPtr;
}
#endif
Index: src/libchcore/TTaskConfigTracker.h
===================================================================
diff -u -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TTaskConfigTracker.h (.../TTaskConfigTracker.h) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
+++ src/libchcore/TTaskConfigTracker.h (.../TTaskConfigTracker.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -52,7 +52,6 @@
bool IsModified(ETaskOptions eOption) const;
bool IsModified(TOptionsSet setOptions) const;
bool IsModified(ETaskOptions eOption, bool bResetModificationState);
- bool IsModified(TOptionsSet setOptions, bool bResetModificationState);
void AddModified(const TString& strModified);
void AddModified(ETaskOptions eModified);
Index: src/libchcore/TTaskConfiguration.h
===================================================================
diff -u -r4572f6cddf7dab06b1de99504a6bbd3680d11e6d -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TTaskConfiguration.h (.../TTaskConfiguration.h) (revision 4572f6cddf7dab06b1de99504a6bbd3680d11e6d)
+++ src/libchcore/TTaskConfiguration.h (.../TTaskConfiguration.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -23,7 +23,6 @@
#ifndef __TTASKCONFIGURATION_H__
#define __TTASKCONFIGURATION_H__
-#include "libchcore.h"
#include "TConfig.h"
namespace chcore
Index: src/libchcore/TTaskInfo.h
===================================================================
diff -u -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TTaskInfo.h (.../TTaskInfo.h) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
+++ src/libchcore/TTaskInfo.h (.../TTaskInfo.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -20,8 +20,6 @@
#define __TTASKINFO_H__
#include "libchcore.h"
-#include "TString.h"
-#include <boost/shared_ptr.hpp>
#include "TPath.h"
#include "TaskID.h"
#include "ISerializerContainer.h"
@@ -32,7 +30,7 @@
namespace chcore
{
class TTask;
- typedef boost::shared_ptr<TTask> TTaskPtr;
+ typedef std::shared_ptr<TTask> TTaskPtr;
class LIBCHCORE_API TTaskInfoEntry
{
Index: src/libchcore/TTaskLocalStats.h
===================================================================
diff -u -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TTaskLocalStats.h (.../TTaskLocalStats.h) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
+++ src/libchcore/TTaskLocalStats.h (.../TTaskLocalStats.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -23,8 +23,6 @@
#ifndef __TTASKLOCALSTATS_H__
#define __TTASKLOCALSTATS_H__
-#include "libchcore.h"
-#include "ESubTaskTypes.h"
#include "TSubTaskStatsInfo.h"
#include "TTaskStatsSnapshot.h"
#include "TSharedModificationTracker.h"
@@ -44,8 +42,6 @@
void Clear();
void GetSnapshot(TTaskStatsSnapshotPtr& spSnapshot) const;
- void SetCurrentSubOperationType(ESubOperationType eSubOperationType);
-
bool IsRunning() const;
void Store(const ISerializerContainerPtr& spContainer) const;
@@ -67,9 +63,6 @@
void UpdateTime(boost::upgrade_lock<boost::shared_mutex>& lock) const;
#pragma warning(pop)
- void SetTimeElapsed(unsigned long long timeElapsed);
- unsigned long long GetTimeElapsed();
-
private:
TTaskLocalStatsInfo(const TTaskLocalStatsInfo&);
TTaskLocalStatsInfo& operator=(const TTaskLocalStatsInfo&);
Index: src/libchcore/TTaskManager.cpp
===================================================================
diff -u -r25129f39720523eca2cb702242890a7862f70ec6 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TTaskManager.cpp (.../TTaskManager.cpp) (revision 25129f39720523eca2cb702242890a7862f70ec6)
+++ src/libchcore/TTaskManager.cpp (.../TTaskManager.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -522,7 +522,7 @@
}
if (!spSerializer)
- spSerializer = boost::make_shared<TFakeFileSerializer>(rInfo.second);
+ spSerializer = std::make_shared<TFakeFileSerializer>(rInfo.second);
TTaskPtr spTask(new TTask(spSerializer, spHandler));
spTask->Load();
Index: src/libchcore/TTaskManager.h
===================================================================
diff -u -rba618764ec3c9221fa704e905a9f807bd85ed4c5 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TTaskManager.h (.../TTaskManager.h) (revision ba618764ec3c9221fa704e905a9f807bd85ed4c5)
+++ src/libchcore/TTaskManager.h (.../TTaskManager.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -32,7 +32,7 @@
{
class TTaskDefinition;
class TTask;
- typedef boost::shared_ptr<TTask> TTaskPtr;
+ typedef std::shared_ptr<TTask> TTaskPtr;
///////////////////////////////////////////////////////////////////////////
// TTaskManager
@@ -104,7 +104,7 @@
#pragma warning(pop)
};
- typedef boost::shared_ptr<TTaskManager> TTaskManagerPtr;
+ typedef std::shared_ptr<TTaskManager> TTaskManagerPtr;
}
#endif
Index: src/libchcore/TTaskManagerStatsSnapshot.h
===================================================================
diff -u -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TTaskManagerStatsSnapshot.h (.../TTaskManagerStatsSnapshot.h) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
+++ src/libchcore/TTaskManagerStatsSnapshot.h (.../TTaskManagerStatsSnapshot.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -32,9 +32,9 @@
{
public:
TTaskManagerStatsSnapshot();
- TTaskManagerStatsSnapshot(const TTaskManagerStatsSnapshot& rSrc);
+ TTaskManagerStatsSnapshot(const TTaskManagerStatsSnapshot& rSrc) = delete;
- TTaskManagerStatsSnapshot& operator=(const TTaskManagerStatsSnapshot& rSrc);
+ TTaskManagerStatsSnapshot& operator=(const TTaskManagerStatsSnapshot& rSrc) = delete;
void Clear();
@@ -85,7 +85,7 @@
mutable double m_dCombinedProgress;
};
- typedef boost::shared_ptr<TTaskManagerStatsSnapshot> TTaskManagerStatsSnapshotPtr;
+ typedef std::shared_ptr<TTaskManagerStatsSnapshot> TTaskManagerStatsSnapshotPtr;
}
#endif
Index: src/libchcore/TTaskOperationPlan.h
===================================================================
diff -u -rbe569bc86280887eeebb8d3e9489f6fc17c570e6 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TTaskOperationPlan.h (.../TTaskOperationPlan.h) (revision be569bc86280887eeebb8d3e9489f6fc17c570e6)
+++ src/libchcore/TTaskOperationPlan.h (.../TTaskOperationPlan.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -25,7 +25,6 @@
#include "libchcore.h"
#include "EOperationTypes.h"
-#include "ESubTaskTypes.h"
namespace chcore
{
Index: src/libchcore/TTaskStatsSnapshot.h
===================================================================
diff -u -rd4064fca634707dcae112e5a41ed37e04455dc2a -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TTaskStatsSnapshot.h (.../TTaskStatsSnapshot.h) (revision d4064fca634707dcae112e5a41ed37e04455dc2a)
+++ src/libchcore/TTaskStatsSnapshot.h (.../TTaskStatsSnapshot.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -25,7 +25,6 @@
#include "libchcore.h"
#include "TSubTaskStatsInfo.h"
-#include "ESubTaskTypes.h"
#include "TSubTaskArrayStatsSnapshot.h"
#include "TFileFiltersArray.h"
#include "EOperationTypes.h"
@@ -143,7 +142,7 @@
mutable double m_dCombinedProgress;
};
- typedef boost::shared_ptr<TTaskStatsSnapshot> TTaskStatsSnapshotPtr;
+ typedef std::shared_ptr<TTaskStatsSnapshot> TTaskStatsSnapshotPtr;
}
#endif
Index: src/libchcore/TTimestampProviderTickCount.h
===================================================================
diff -u -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TTimestampProviderTickCount.h (.../TTimestampProviderTickCount.h) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
+++ src/libchcore/TTimestampProviderTickCount.h (.../TTimestampProviderTickCount.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -19,7 +19,6 @@
#ifndef __TTIMESTAMPPROVIDERTICKCOUNT_H__
#define __TTIMESTAMPPROVIDERTICKCOUNT_H__
-#include "libchcore.h"
#include "ITimestampProvider.h"
namespace chcore
Index: src/libchcore/TaskID.h
===================================================================
diff -u -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/TaskID.h (.../TaskID.h) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
+++ src/libchcore/TaskID.h (.../TaskID.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -19,7 +19,6 @@
#ifndef __TASKID_H__
#define __TASKID_H__
-#include "libchcore.h"
#include "SerializerDataTypes.h"
namespace chcore
Index: src/libchcore/Tests/TestsTSimpleTimer.cpp
===================================================================
diff -u -r9b8cccbee0fcfeca28a112cc0253a7641f73f74f -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/Tests/TestsTSimpleTimer.cpp (.../TestsTSimpleTimer.cpp) (revision 9b8cccbee0fcfeca28a112cc0253a7641f73f74f)
+++ src/libchcore/Tests/TestsTSimpleTimer.cpp (.../TestsTSimpleTimer.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -15,7 +15,7 @@
TEST(TSimpleTimerTests, SimpleStartStop_CalculatesTimeProperly)
{
- boost::shared_ptr<StrictMock<ITimestampProviderMock> > spTimestampProviderMock(new StrictMock<ITimestampProviderMock>);
+ std::shared_ptr<StrictMock<ITimestampProviderMock> > spTimestampProviderMock(new StrictMock<ITimestampProviderMock>);
EXPECT_CALL(*spTimestampProviderMock, GetCurrentTimestamp())
.WillOnce(Return(30))
@@ -30,7 +30,7 @@
TEST(TSimpleTimerTests, TickWithoutStarting_UpdatesLastTimestamp)
{
- boost::shared_ptr<StrictMock<ITimestampProviderMock> > spTimestampProviderMock(new StrictMock<ITimestampProviderMock>);
+ std::shared_ptr<StrictMock<ITimestampProviderMock> > spTimestampProviderMock(new StrictMock<ITimestampProviderMock>);
EXPECT_CALL(*spTimestampProviderMock, GetCurrentTimestamp())
.WillOnce(Return(30));
@@ -42,7 +42,7 @@
TEST(TSimpleTimerTests, StartAndTicking_CorrectlyCountsTime)
{
- boost::shared_ptr<StrictMock<ITimestampProviderMock> > spTimestampProviderMock(new StrictMock<ITimestampProviderMock>);
+ std::shared_ptr<StrictMock<ITimestampProviderMock> > spTimestampProviderMock(new StrictMock<ITimestampProviderMock>);
EXPECT_CALL(*spTimestampProviderMock, GetCurrentTimestamp())
.WillOnce(Return(30))
@@ -59,7 +59,7 @@
TEST(TSimpleTimerTests, StartAndTicking_TickReturnsLastTimestamp)
{
- boost::shared_ptr<StrictMock<ITimestampProviderMock> > spTimestampProviderMock(new StrictMock<ITimestampProviderMock>);
+ std::shared_ptr<StrictMock<ITimestampProviderMock> > spTimestampProviderMock(new StrictMock<ITimestampProviderMock>);
EXPECT_CALL(*spTimestampProviderMock, GetCurrentTimestamp())
.WillOnce(Return(30))
@@ -74,7 +74,7 @@
TEST(TSimpleTimerTests, Reset_StopsTimeCountingAndResetsTime)
{
- boost::shared_ptr<StrictMock<ITimestampProviderMock> > spTimestampProviderMock(new StrictMock<ITimestampProviderMock>);
+ std::shared_ptr<StrictMock<ITimestampProviderMock> > spTimestampProviderMock(new StrictMock<ITimestampProviderMock>);
EXPECT_CALL(*spTimestampProviderMock, GetCurrentTimestamp())
.WillOnce(Return(30))
Index: src/libchcore/libchcore.vc140.vcxproj
===================================================================
diff -u -r4a481bbe77043e0bda2435c6d62a02700b3e46c5 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/libchcore.vc140.vcxproj (.../libchcore.vc140.vcxproj) (revision 4a481bbe77043e0bda2435c6d62a02700b3e46c5)
+++ src/libchcore/libchcore.vc140.vcxproj (.../libchcore.vc140.vcxproj) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -491,8 +491,6 @@
<ClInclude Include="TFeedbackHandlerWrapper.h" />
<ClInclude Include="TFeedbackResult.h" />
<ClInclude Include="TFilesystemFeedbackWrapper.h" />
- <ClInclude Include="TFileAlreadyExistsFilter.h" />
- <ClInclude Include="TFileErrorFilter.h" />
<ClInclude Include="TFileInfoFwd.h" />
<ClInclude Include="TFilesystemFileFeedbackWrapper.h" />
<ClInclude Include="TFileTime.h" />
@@ -501,7 +499,6 @@
<ClInclude Include="TLocalFilesystemFind.h" />
<ClInclude Include="TModificationTracker.h" />
<ClInclude Include="TModPathContainer.h" />
- <ClInclude Include="TNotEnoughSpaceFilter.h" />
<ClInclude Include="TObsoleteFiles.h" />
<ClInclude Include="TOverlappedDataBufferQueue.h" />
<ClInclude Include="TPathContainer.h" />
@@ -731,15 +728,12 @@
<ClCompile Include="TFilesystemFeedbackWrapper.cpp" />
<ClCompile Include="TFeedbackHandlerBase.cpp" />
<ClCompile Include="TFeedbackHandlerWrapper.cpp" />
- <ClCompile Include="TFileAlreadyExistsFilter.cpp" />
- <ClCompile Include="TFileErrorFilter.cpp" />
<ClCompile Include="TFilesystemFileFeedbackWrapper.cpp" />
<ClCompile Include="TFileTime.cpp" />
<ClCompile Include="TFileException.cpp" />
<ClCompile Include="TLocalFilesystemFile.cpp" />
<ClCompile Include="TLocalFilesystemFind.cpp" />
<ClCompile Include="TModPathContainer.cpp" />
- <ClCompile Include="TNotEnoughSpaceFilter.cpp" />
<ClCompile Include="TObsoleteFiles.cpp" />
<ClCompile Include="TOverlappedDataBufferQueue.cpp" />
<ClCompile Include="TPathContainer.cpp" />
Index: src/libchcore/libchcore.vc140.vcxproj.filters
===================================================================
diff -u -rc0120993b38b7f0759e0887fd0e5a03dcced68de -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/libchcore.vc140.vcxproj.filters (.../libchcore.vc140.vcxproj.filters) (revision c0120993b38b7f0759e0887fd0e5a03dcced68de)
+++ src/libchcore/libchcore.vc140.vcxproj.filters (.../libchcore.vc140.vcxproj.filters) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -377,15 +377,6 @@
<ClInclude Include="TBufferSizes.h">
<Filter>Source Files\Tools\Data Buffer</Filter>
</ClInclude>
- <ClInclude Include="TFileErrorFilter.h">
- <Filter>Source Files\Feedback</Filter>
- </ClInclude>
- <ClInclude Include="TFileAlreadyExistsFilter.h">
- <Filter>Source Files\Feedback</Filter>
- </ClInclude>
- <ClInclude Include="TNotEnoughSpaceFilter.h">
- <Filter>Source Files\Feedback</Filter>
- </ClInclude>
<ClInclude Include="EFileError.h">
<Filter>Source Files\Feedback</Filter>
</ClInclude>
@@ -772,15 +763,6 @@
<ClCompile Include="Tests\TestsTSharedModificationTracker.cpp">
<Filter>Tests</Filter>
</ClCompile>
- <ClCompile Include="TFileErrorFilter.cpp">
- <Filter>Source Files\Feedback</Filter>
- </ClCompile>
- <ClCompile Include="TFileAlreadyExistsFilter.cpp">
- <Filter>Source Files\Feedback</Filter>
- </ClCompile>
- <ClCompile Include="TNotEnoughSpaceFilter.cpp">
- <Filter>Source Files\Feedback</Filter>
- </ClCompile>
<ClCompile Include="TStringPattern.cpp">
<Filter>Source Files\Tools</Filter>
</ClCompile>
Index: src/libchcore/stdafx.h
===================================================================
diff -u -ra27d1acf1bda3c25b6dcce0d0eb0278009ce63ae -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libchcore/stdafx.h (.../stdafx.h) (revision a27d1acf1bda3c25b6dcce0d0eb0278009ce63ae)
+++ src/libchcore/stdafx.h (.../stdafx.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -23,7 +23,6 @@
#include <boost/thread/locks.hpp>
#include <boost/foreach.hpp>
-#include <boost/shared_ptr.hpp>
#include <list>
#include <set>
#include <vector>
Index: src/libictranslate/cfg.h
===================================================================
diff -u -r3432ca77e8f6d67bf0de4e0dfa36cf89705ae853 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libictranslate/cfg.h (.../cfg.h) (revision 3432ca77e8f6d67bf0de4e0dfa36cf89705ae853)
+++ src/libictranslate/cfg.h (.../cfg.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -45,7 +45,7 @@
property_tracker(const property_tracker& rSrc); ///< Copy constructor
~property_tracker(); ///< Standard destructor
- property_tracker& operator=(const property_tracker& rSrc); ///< Assignment operator
+ property_tracker& operator=(const property_tracker& rSrc) = delete; ///< Assignment operator
/**@}*/
/** \name Operations */
Index: src/libictranslate/cfg_ini.cpp
===================================================================
diff -u -ra27d1acf1bda3c25b6dcce0d0eb0278009ce63ae -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libictranslate/cfg_ini.cpp (.../cfg_ini.cpp) (revision a27d1acf1bda3c25b6dcce0d0eb0278009ce63ae)
+++ src/libictranslate/cfg_ini.cpp (.../cfg_ini.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -305,7 +305,7 @@
{
assert(pFindHandle);
if(!pFindHandle)
- return NULL;
+ return false;
INIFINDHANDLE* pfh=(INIFINDHANDLE*)pFindHandle;
if(pfh->bOnlyAttributes)
Index: src/libictranslate/cfg_ini.h
===================================================================
diff -u -ra27d1acf1bda3c25b6dcce0d0eb0278009ce63ae -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libictranslate/cfg_ini.h (.../cfg_ini.h) (revision a27d1acf1bda3c25b6dcce0d0eb0278009ce63ae)
+++ src/libictranslate/cfg_ini.h (.../cfg_ini.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -32,10 +32,12 @@
/** \name Construction/destruction/operators */
/**@{*/
ini_cfg(); ///< Standard constructor
- ini_cfg(const ini_cfg& rSrc); ///< Copy constructor
+ ini_cfg(const ini_cfg& rSrc) = delete; ///< Copy constructor
virtual ~ini_cfg(); ///< Standard destructor
/**@}*/
+ ini_cfg& operator=(const ini_cfg& rSrc) = delete;
+
/** \name File operations */
/**@{*/
/// Reads the xml document from the specified file
Index: src/libictranslate/config_property.cpp
===================================================================
diff -u -ra27d1acf1bda3c25b6dcce0d0eb0278009ce63ae -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libictranslate/config_property.cpp (.../config_property.cpp) (revision a27d1acf1bda3c25b6dcce0d0eb0278009ce63ae)
+++ src/libictranslate/config_property.cpp (.../config_property.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -345,7 +345,7 @@
case type_string:
assert(stIndex < m_paStrings->size());
return m_paStrings->at(stIndex).c_str();
- break;
+
case type_signed_num:
assert(stIndex < m_paSigneds->size());
_sntprintf(pszString, stMaxSize, L"%I64d", m_paSigneds->at(stIndex));
@@ -368,7 +368,7 @@
{
case type_string:
return m_val.pszVal;
- break;
+
case type_signed_num:
_sntprintf(pszString, stMaxSize, L"%I64d", m_val.llVal);
break;
Index: src/libictranslate/crc32.cpp
===================================================================
diff -u -r5446395d3925e49d3e4cba82044bdfd4dffb6ee9 -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/libictranslate/crc32.cpp (.../crc32.cpp) (revision 5446395d3925e49d3e4cba82044bdfd4dffb6ee9)
+++ src/libictranslate/crc32.cpp (.../crc32.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -21,8 +21,6 @@
*/
#include "stdafx.h"
#include "crc32.h"
-#include <assert.h>
-#include <stdexcept>
/// Helper data for calculating crc32 values
unsigned int __crc32data__[256] =