Index: src/ch/BufferSizeDlg.h =================================================================== diff -u -N -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/ch/BufferSizeDlg.h (.../BufferSizeDlg.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) +++ src/ch/BufferSizeDlg.h (.../BufferSizeDlg.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -19,15 +19,15 @@ #ifndef __BUFFERSIZEDLG_H__ #define __BUFFERSIZEDLG_H__ -#include "..\libchcore\TBufferSizes.h" +#include "../libchcore/TBufferSizes.h" ///////////////////////////////////////////////////////////////////////////// // CBufferSizeDlg dialog class CBufferSizeDlg : public ictranslate::CLanguageDialog { public: - CBufferSizeDlg(chcore::TBufferSizes* pInitialBufferSizes, chcore::TBufferSizes::EBufferType eSelectedBuffer = chcore::TBufferSizes::eBuffer_Default); + explicit CBufferSizeDlg(chcore::TBufferSizes* pInitialBufferSizes, chcore::TBufferSizes::EBufferType eSelectedBuffer = chcore::TBufferSizes::eBuffer_Default); const chcore::TBufferSizes& GetBufferSizes() const { return m_bsSizes; } @@ -43,7 +43,7 @@ void SetTwoDisksSize(UINT uiSize); void SetOneDiskSize(UINT uiSize); void SetDefaultSize(UINT uiSize); - UINT IndexToValue(int iIndex); + static UINT IndexToValue(int iIndex); void EnableControls(bool bEnable=true); Index: src/ch/ClipboardMonitor.h =================================================================== diff -u -N -r25129f39720523eca2cb702242890a7862f70ec6 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/ch/ClipboardMonitor.h (.../ClipboardMonitor.h) (revision 25129f39720523eca2cb702242890a7862f70ec6) +++ src/ch/ClipboardMonitor.h (.../ClipboardMonitor.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -1,57 +1,57 @@ -//****************************************************************************** -// Copyright (C) 2001-2008 by Jozef Starosczyk -// ixen@copyhandler.com -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Library General Public License -// (version 2) as published by the Free Software Foundation; -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU Library General Public -// License along with this program; if not, write to the -// Free Software Foundation, Inc., -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -// -/// @file ClipboardMonitor.h -/// @brief Contains clipboard monitoring package. -//****************************************************************************** -#ifndef __CLIPBOARDMONITOR_H__ -#define __CLIPBOARDMONITOR_H__ - -#include "..\libchcore\TWorkerThreadController.h" -#include "..\libchcore\TTaskManager.h" - -namespace chcore -{ - class TTaskManager; -} - -class CClipboardMonitor -{ -public: - static void StartMonitor(chcore::TTaskManagerPtr spTasks); - static void StopMonitor(); - - void Start(chcore::TTaskManagerPtr spTasks); - void Stop(); - -protected: - CClipboardMonitor(); - ~CClipboardMonitor(); - - static DWORD WINAPI ClipboardMonitorProc(LPVOID pParam); - -protected: - static CClipboardMonitor S_ClipboardMonitor; - - chcore::TTaskManagerPtr m_spTasks; - - // thread control - chcore::TWorkerThreadController m_threadWorker; -}; - -#endif +//****************************************************************************** +// Copyright (C) 2001-2008 by Jozef Starosczyk +// ixen@copyhandler.com +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU Library General Public License +// (version 2) as published by the Free Software Foundation; +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU Library General Public +// License along with this program; if not, write to the +// Free Software Foundation, Inc., +// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// +/// @file ClipboardMonitor.h +/// @brief Contains clipboard monitoring package. +//****************************************************************************** +#ifndef __CLIPBOARDMONITOR_H__ +#define __CLIPBOARDMONITOR_H__ + +#include "../libchcore/TWorkerThreadController.h" +#include "../libchcore/TTaskManager.h" + +namespace chcore +{ + class TTaskManager; +} + +class CClipboardMonitor +{ +public: + static void StartMonitor(chcore::TTaskManagerPtr spTasks); + static void StopMonitor(); + + void Start(chcore::TTaskManagerPtr spTasks); + void Stop(); + +protected: + CClipboardMonitor(); + ~CClipboardMonitor(); + + static DWORD WINAPI ClipboardMonitorProc(LPVOID pParam); + +protected: + static CClipboardMonitor S_ClipboardMonitor; + + chcore::TTaskManagerPtr m_spTasks; + + // thread control + chcore::TWorkerThreadController m_threadWorker; +}; + +#endif Index: src/ch/DirTreeCtrl.cpp =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/ch/DirTreeCtrl.cpp (.../DirTreeCtrl.cpp) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/ch/DirTreeCtrl.cpp (.../DirTreeCtrl.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -369,9 +369,7 @@ ULONG ulAttrib = 0; TVITEM tvi = { 0 }; TVINSERTSTRUCT tvis = { 0 }; - _SHELLITEMDATA *psid = nullptr; TCHAR szText[ _MAX_PATH ]; - HTREEITEM hCurrent = nullptr; while (lpeid->Next(1, &lpiidl, nullptr) == NOERROR) { @@ -384,7 +382,7 @@ bFound=true; // it's time to add everything - psid=new _SHELLITEMDATA; + _SHELLITEMDATA* psid=new _SHELLITEMDATA; lpsf->BindToObject(lpiidl, nullptr, IID_IShellFolder, (void**)&psid->lpsf); psid->lpiidl=ConcatPidls(lpidl, lpiidl); psid->lpiidlRelative=CopyITEMID(lpm, lpiidl); @@ -401,7 +399,7 @@ tvis.hParent=hParent; tvis.item=tvi; - hCurrent=InsertItem(&tvis); + HTREEITEM hCurrent=InsertItem(&tvis); if (hParent == GetRootItem() && lpsfDesktop) { Index: src/ch/DirectoryChooser.cpp =================================================================== diff -u -N -rfd8a13a1d3b6505fd723def1b3db6a5930d0ecf0 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/ch/DirectoryChooser.cpp (.../DirectoryChooser.cpp) (revision fd8a13a1d3b6505fd723def1b3db6a5930d0ecf0) +++ src/ch/DirectoryChooser.cpp (.../DirectoryChooser.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -1,87 +1,87 @@ -// ============================================================================ -// Copyright (C) 2001-2014 by Jozef Starosczyk -// ixen@copyhandler.com -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Library General Public License -// (version 2) as published by the Free Software Foundation; -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU Library General Public -// License along with this program; if not, write to the -// Free Software Foundation, Inc., -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -// ============================================================================ -#include "stdafx.h" -#include "DirectoryChooser.h" -#include "ch.h" -#include "FolderDialog.h" -#include "..\libchcore\TPathContainer.h" -#include "..\libchcore\TPath.h" -#include "CfgProperties.h" -#include "resource.h" - -namespace DirectoryChooser -{ -INT_PTR ChooseDirectory(chcore::EOperationType eOperation, const chcore::TPathContainer& rInputPaths, chcore::TSmartPath& rSelectedPath) -{ - rSelectedPath.Clear(); - - chcore::TConfig& rConfig = GetConfig(); - - // get dest folder - CFolderDialog dlg; - - GetPropValue(rConfig, dlg.m_bdData.cvShortcuts); - GetPropValue(rConfig, dlg.m_bdData.cvRecent); - - dlg.m_bdData.bExtended=GetPropValue(rConfig); - dlg.m_bdData.cx=GetPropValue(rConfig); - dlg.m_bdData.cy=GetPropValue(rConfig); - dlg.m_bdData.iView=GetPropValue(rConfig); - dlg.m_bdData.bIgnoreDialogs=GetPropValue(rConfig); - - dlg.m_bdData.strInitialDir=(dlg.m_bdData.cvRecent.size() > 0) ? dlg.m_bdData.cvRecent.at(0) : _T(""); - - if(eOperation == chcore::eOperation_Copy) - dlg.m_bdData.strCaption = GetResManager().LoadString(IDS_TITLECOPY_STRING); - else if(eOperation == chcore::eOperation_Move) - dlg.m_bdData.strCaption = GetResManager().LoadString(IDS_TITLEMOVE_STRING); - else - dlg.m_bdData.strCaption = GetResManager().LoadString(IDS_TITLEUNKNOWNOPERATION_STRING); - dlg.m_bdData.strText = GetResManager().LoadString(IDS_MAINBROWSETEXT_STRING); - - // set count of data to display - size_t stClipboardSize = rInputPaths.GetCount(); - size_t stEntries = (stClipboardSize > 3) ? 2 : stClipboardSize; - for(size_t stIndex = 0; stIndex < stEntries; stIndex++) - { - dlg.m_bdData.strText += rInputPaths.GetAt(stIndex).ToString(); - dlg.m_bdData.strText += _T("\n"); - } - - // add ... - if (stEntries < stClipboardSize) - dlg.m_bdData.strText+=_T("..."); - - // show window - INT_PTR iResult = dlg.DoModal(); - - // set data to config - SetPropValue(rConfig, dlg.m_bdData.cvShortcuts); - SetPropValue(rConfig, dlg.m_bdData.cvRecent); - - SetPropValue(rConfig, dlg.m_bdData.bExtended); - SetPropValue(rConfig, dlg.m_bdData.cx); - SetPropValue(rConfig, dlg.m_bdData.cy); - SetPropValue(rConfig, dlg.m_bdData.iView); - SetPropValue(rConfig, dlg.m_bdData.bIgnoreDialogs); - rConfig.Write(); - +// ============================================================================ +// Copyright (C) 2001-2014 by Jozef Starosczyk +// ixen@copyhandler.com +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU Library General Public License +// (version 2) as published by the Free Software Foundation; +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU Library General Public +// License along with this program; if not, write to the +// Free Software Foundation, Inc., +// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// ============================================================================ +#include "stdafx.h" +#include "DirectoryChooser.h" +#include "ch.h" +#include "FolderDialog.h" +#include "../libchcore/TPathContainer.h" +#include "../libchcore/TPath.h" +#include "CfgProperties.h" +#include "resource.h" + +namespace DirectoryChooser +{ +INT_PTR ChooseDirectory(chcore::EOperationType eOperation, const chcore::TPathContainer& rInputPaths, chcore::TSmartPath& rSelectedPath) +{ + rSelectedPath.Clear(); + + chcore::TConfig& rConfig = GetConfig(); + + // get dest folder + CFolderDialog dlg; + + GetPropValue(rConfig, dlg.m_bdData.cvShortcuts); + GetPropValue(rConfig, dlg.m_bdData.cvRecent); + + dlg.m_bdData.bExtended=GetPropValue(rConfig); + dlg.m_bdData.cx=GetPropValue(rConfig); + dlg.m_bdData.cy=GetPropValue(rConfig); + dlg.m_bdData.iView=GetPropValue(rConfig); + dlg.m_bdData.bIgnoreDialogs=GetPropValue(rConfig); + + dlg.m_bdData.strInitialDir=(dlg.m_bdData.cvRecent.size() > 0) ? dlg.m_bdData.cvRecent.at(0) : _T(""); + + if(eOperation == chcore::eOperation_Copy) + dlg.m_bdData.strCaption = GetResManager().LoadString(IDS_TITLECOPY_STRING); + else if(eOperation == chcore::eOperation_Move) + dlg.m_bdData.strCaption = GetResManager().LoadString(IDS_TITLEMOVE_STRING); + else + dlg.m_bdData.strCaption = GetResManager().LoadString(IDS_TITLEUNKNOWNOPERATION_STRING); + dlg.m_bdData.strText = GetResManager().LoadString(IDS_MAINBROWSETEXT_STRING); + + // set count of data to display + size_t stClipboardSize = rInputPaths.GetCount(); + size_t stEntries = (stClipboardSize > 3) ? 2 : stClipboardSize; + for(size_t stIndex = 0; stIndex < stEntries; stIndex++) + { + dlg.m_bdData.strText += rInputPaths.GetAt(stIndex).ToString(); + dlg.m_bdData.strText += _T("\n"); + } + + // add ... + if (stEntries < stClipboardSize) + dlg.m_bdData.strText+=_T("..."); + + // show window + INT_PTR iResult = dlg.DoModal(); + + // set data to config + SetPropValue(rConfig, dlg.m_bdData.cvShortcuts); + SetPropValue(rConfig, dlg.m_bdData.cvRecent); + + SetPropValue(rConfig, dlg.m_bdData.bExtended); + SetPropValue(rConfig, dlg.m_bdData.cx); + SetPropValue(rConfig, dlg.m_bdData.cy); + SetPropValue(rConfig, dlg.m_bdData.iView); + SetPropValue(rConfig, dlg.m_bdData.bIgnoreDialogs); + rConfig.Write(); + //LOG_INFO(m_spLog) << L"Updating shell extension configuration"; try { @@ -93,15 +93,15 @@ { //LOG_INFO(m_spLog) << L"Failed to set shell extension configuration. Error: " << e.what(); } - - if(iResult == IDOK) - { - CString strPath; - dlg.GetPath(strPath); - - rSelectedPath = chcore::PathFromString(strPath); - } - - return iResult; -} -} + + if(iResult == IDOK) + { + CString strPath; + dlg.GetPath(strPath); + + rSelectedPath = chcore::PathFromString(strPath); + } + + return iResult; +} +} Index: src/ch/DirectoryChooser.h =================================================================== diff -u -N -r8b7479db2ee71a3d00779c67fe6a1b1d9ec414b8 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/ch/DirectoryChooser.h (.../DirectoryChooser.h) (revision 8b7479db2ee71a3d00779c67fe6a1b1d9ec414b8) +++ src/ch/DirectoryChooser.h (.../DirectoryChooser.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -1,30 +1,30 @@ -// ============================================================================ -// Copyright (C) 2001-2014 by Jozef Starosczyk -// ixen@copyhandler.com -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Library General Public License -// (version 2) as published by the Free Software Foundation; -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU Library General Public -// License along with this program; if not, write to the -// Free Software Foundation, Inc., -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -// ============================================================================ -#ifndef __DIRECTORYCHOOSER_H__ -#define __DIRECTORYCHOOSER_H__ - -#include "..\libchcore\EOperationTypes.h" - -namespace DirectoryChooser -{ - INT_PTR ChooseDirectory(chcore::EOperationType eOperation, const chcore::TPathContainer& rInputPaths, chcore::TSmartPath& rSelectedPath); -} - - -#endif +// ============================================================================ +// Copyright (C) 2001-2014 by Jozef Starosczyk +// ixen@copyhandler.com +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU Library General Public License +// (version 2) as published by the Free Software Foundation; +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU Library General Public +// License along with this program; if not, write to the +// Free Software Foundation, Inc., +// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// ============================================================================ +#ifndef __DIRECTORYCHOOSER_H__ +#define __DIRECTORYCHOOSER_H__ + +#include "../libchcore/EOperationTypes.h" + +namespace DirectoryChooser +{ + INT_PTR ChooseDirectory(chcore::EOperationType eOperation, const chcore::TPathContainer& rInputPaths, chcore::TSmartPath& rSelectedPath); +} + + +#endif Index: src/ch/FeedbackHandlerFactory.h =================================================================== diff -u -N -rc085b65f1de24f25feab2bac2d5882abf04aabcf -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/ch/FeedbackHandlerFactory.h (.../FeedbackHandlerFactory.h) (revision c085b65f1de24f25feab2bac2d5882abf04aabcf) +++ src/ch/FeedbackHandlerFactory.h (.../FeedbackHandlerFactory.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -19,8 +19,8 @@ #ifndef __FEEDBACKHANDLERFACTORY_H__ #define __FEEDBACKHANDLERFACTORY_H__ -#include "..\libchcore\IFeedbackHandlerFactory.h" -#include "..\libchcore\IFeedbackHandler.h" +#include "../libchcore/IFeedbackHandlerFactory.h" +#include "../libchcore/IFeedbackHandler.h" class CFeedbackHandlerFactory : public chcore::IFeedbackHandlerFactory { Index: src/ch/MainWnd.cpp =================================================================== diff -u -N -r7eb1f74a4a5228a71a86f522d22056ff8f616050 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/ch/MainWnd.cpp (.../MainWnd.cpp) (revision 7eb1f74a4a5228a71a86f522d22056ff8f616050) +++ src/ch/MainWnd.cpp (.../MainWnd.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -24,7 +24,7 @@ #include "FolderDialog.h" #include "CustomCopyDlg.h" #include "AboutDlg.h" -#include "..\common\ipcstructs.h" +#include "../common/ipcstructs.h" #include "UpdateChecker.h" #include "UpdaterDlg.h" #include "MiniviewDlg.h" @@ -610,12 +610,10 @@ } catch(const chcore::TBaseException& e) { - bImported = false; e.GetDetailedErrorInfo(szBuffer.get(), stBufferSize); } catch(...) { - bImported = false; szBuffer.get()[0] = _T('\0'); } Index: src/ch/MainWnd.h =================================================================== diff -u -N -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/ch/MainWnd.h (.../MainWnd.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) +++ src/ch/MainWnd.h (.../MainWnd.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -41,9 +41,6 @@ protected: LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam) override; - void PrepareDragAndDropMenuItems(TShellExtMenuConfig &cfgShellExt) const; - void PrepareNormalMenuItems(TShellExtMenuConfig &cfgShellExt) const; - BOOL RegisterClass(); int ShowTrayIcon(); void ShowStatusWindow(const chcore::TTaskPtr& spSelect = chcore::TTaskPtr()); Index: src/ch/MiniViewDlg.cpp =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/ch/MiniViewDlg.cpp (.../MiniViewDlg.cpp) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/ch/MiniViewDlg.cpp (.../MiniViewDlg.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -713,7 +713,7 @@ } if (!bProcessed) - m_ctlStatus.SetCurSel(-1); + m_ctlStatus.SetCurrentSelection(-1); m_iIndex=-1; Index: src/ch/ProgressListBox.cpp =================================================================== diff -u -N -r8068e0c351055554340ac9755d1bc846893bf2b8 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/ch/ProgressListBox.cpp (.../ProgressListBox.cpp) (revision 8068e0c351055554340ac9755d1bc846893bf2b8) +++ src/ch/ProgressListBox.cpp (.../ProgressListBox.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -229,9 +229,9 @@ return FALSE/*CListBox::OnEraseBkgnd(pDC)*/; } -int CProgressListBox::SetCurSel(int nSelect) +int CProgressListBox::SetCurrentSelection(int nSelect) { - int nResult=static_cast(this)->SetCurSel(nSelect); + int nResult=SetCurSel(nSelect); if (nSelect == -1) GetParent()->SendMessage(WM_COMMAND, (LBN_SELCANCEL << 16) | GetDlgCtrlID(), reinterpret_cast(this->m_hWnd)); @@ -240,7 +240,7 @@ void CProgressListBox::OnKillfocus() { - SetCurSel(-1); + SetCurrentSelection(-1); } void CProgressListBox::SetSmoothProgress(bool bSmoothProgress) Index: src/ch/ProgressListBox.h =================================================================== diff -u -N -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/ch/ProgressListBox.h (.../ProgressListBox.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) +++ src/ch/ProgressListBox.h (.../ProgressListBox.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -62,7 +62,7 @@ // Implementation public: void SetSmoothProgress(bool bSmoothProgress); - int SetCurSel( int nSelect ); + int SetCurrentSelection( int nSelect ); void Init(); void UpdateItems(int nLimit, bool bUpdateSize); // updates items in listbox Index: src/ch/StatusDlg.h =================================================================== diff -u -N -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/ch/StatusDlg.h (.../StatusDlg.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) +++ src/ch/StatusDlg.h (.../StatusDlg.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -27,7 +27,6 @@ { class TTaskManager; class TTask; - typedef std::shared_ptr TTaskPtr; } #define WM_UPDATESTATUS WM_USER+6 @@ -39,7 +38,7 @@ { // Construction public: - CStatusDlg(chcore::TTaskManager* pTasks, CWnd* pParent = nullptr); // standard constructor + explicit CStatusDlg(chcore::TTaskManager* pTasks, CWnd* pParent = nullptr); // standard constructor virtual ~CStatusDlg(); void PostCloseMessage(); Index: src/ch/TMsgBox.h =================================================================== diff -u -N -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/ch/TMsgBox.h (.../TMsgBox.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) +++ src/ch/TMsgBox.h (.../TMsgBox.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -19,7 +19,7 @@ #ifndef __TMSGBOX_H__ #define __TMSGBOX_H__ -#include "..\libictranslate\LanguageDialog.h" +#include "../libictranslate/LanguageDialog.h" class TMsgBox : public ictranslate::CLanguageDialog { @@ -62,7 +62,7 @@ void InitRichEdit(); void OnCancel() override; - void OnGetMinMaxInfo(MINMAXINFO* lpMMI); + afx_msg void OnGetMinMaxInfo(MINMAXINFO* lpMMI); void InitializeControls(); Index: src/ch/TTaskManagerWrapper.cpp =================================================================== diff -u -N -rd18db617f4727a237c94b59af9b4328f829eda16 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/ch/TTaskManagerWrapper.cpp (.../TTaskManagerWrapper.cpp) (revision d18db617f4727a237c94b59af9b4328f829eda16) +++ src/ch/TTaskManagerWrapper.cpp (.../TTaskManagerWrapper.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -19,11 +19,11 @@ #include "stdafx.h" #include "TTaskManagerWrapper.h" #include "resource.h" -#include "..\libictranslate\ResourceManager.h" -#include "..\libchcore\TTaskConfiguration.h" -#include "..\libchcore\TTaskDefinition.h" -#include "..\libchcore\TTask.h" -#include "..\libchcore\TBaseException.h" +#include "../libictranslate/ResourceManager.h" +#include "../libchcore/TTaskConfiguration.h" +#include "../libchcore/TTaskDefinition.h" +#include "../libchcore/TTask.h" +#include "../libchcore/TBaseException.h" #include "CfgProperties.h" #include "ch.h" Index: src/ch/TTaskManagerWrapper.h =================================================================== diff -u -N -r031c4e5f6be6ad9589ce5fea8292c990351f9a82 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/ch/TTaskManagerWrapper.h (.../TTaskManagerWrapper.h) (revision 031c4e5f6be6ad9589ce5fea8292c990351f9a82) +++ src/ch/TTaskManagerWrapper.h (.../TTaskManagerWrapper.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -19,7 +19,7 @@ #ifndef __TTASKMANAGERWRAPPER_H__ #define __TTASKMANAGERWRAPPER_H__ -#include "..\libchcore\TTaskManager.h" +#include "../libchcore/TTaskManager.h" class TTaskManagerWrapper { Index: src/ch/UpdateChecker.cpp =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/ch/UpdateChecker.cpp (.../UpdateChecker.cpp) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/ch/UpdateChecker.cpp (.../UpdateChecker.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -66,15 +66,6 @@ ::DeleteCriticalSection(&m_cs); } -// ============================================================================ -/// CUpdateChecker::AsyncCheckForUpdates -/// @date 2009/04/18 -/// -/// @brief Starts the asynchronous checking for updates. -/// @param[in] pszSite Site where to search for updates (without file name). -/// @param[in] bCheckBeta States if we are interested in beta products. -/// @return True if operation started, false otherwise. -// ============================================================================ bool CUpdateChecker::AsyncCheckForUpdates(const wchar_t* pszSite, const wchar_t* pszLanguage, UpdateVersionInfo::EVersionType eUpdateChannel, bool bOnlyIfConnected, bool bSendHeaders) { if(!pszSite) @@ -212,13 +203,6 @@ ::LeaveCriticalSection(&m_cs); } -// ============================================================================ -/// CUpdateChecker::GetSiteAddress -/// @date 2009/04/18 -/// -/// @brief Retrieves the address of a site to check the updates at. -/// @param[out] rstrAddress Receives the address. -// ============================================================================ CString CUpdateChecker::GetSiteAddress() const { ::EnterCriticalSection(&m_cs); Index: src/ch/UpdateHeaders.cpp =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/ch/UpdateHeaders.cpp (.../UpdateHeaders.cpp) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/ch/UpdateHeaders.cpp (.../UpdateHeaders.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -19,8 +19,8 @@ #include "stdafx.h" #include "UpdateHeaders.h" #include "WindowsVersion.h" -#include -#include "..\common\version.h" +#include +#include "../common/version.h" #include UpdateHeaders::UpdateHeaders() Index: src/ch/UpdaterDlg.cpp =================================================================== diff -u -N -r12b36349f6214befeace08efa9acc7e03be0d847 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/ch/UpdaterDlg.cpp (.../UpdaterDlg.cpp) (revision 12b36349f6214befeace08efa9acc7e03be0d847) +++ src/ch/UpdaterDlg.cpp (.../UpdaterDlg.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -179,7 +179,7 @@ fmt.SetParam(_T("%officialver"), m_ucChecker.GetReadableVersion()); fmt.SetParam(L"%reldate", m_ucChecker.GetReleaseDate()); - CString strEntireText = fmt; + CString strEntireText = (PCTSTR)fmt; CString strReleaseNotes = m_ucChecker.GetReleaseNotes(); strReleaseNotes = strReleaseNotes.Trim(); if(!strReleaseNotes.IsEmpty()) Index: src/ch/UpdaterDlg.h =================================================================== diff -u -N -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/ch/UpdaterDlg.h (.../UpdaterDlg.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) +++ src/ch/UpdaterDlg.h (.../UpdaterDlg.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -22,7 +22,7 @@ }; public: - CUpdaterDlg(bool bBackgroundMode, CWnd* pParent = nullptr); // standard constructor + explicit CUpdaterDlg(bool bBackgroundMode, CWnd* pParent = nullptr); // standard constructor virtual ~CUpdaterDlg(); BOOL OnInitDialog() override; Index: src/ch/WindowsVersion.cpp =================================================================== diff -u -N -r045540c818c374806d09742ef3d7a984d8d757d3 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/ch/WindowsVersion.cpp (.../WindowsVersion.cpp) (revision 045540c818c374806d09742ef3d7a984d8d757d3) +++ src/ch/WindowsVersion.cpp (.../WindowsVersion.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -19,8 +19,8 @@ #include "stdafx.h" #include "WindowsVersion.h" #include "TRegistry.h" -#include -#include +#include +#include std::wstring WindowsVersion::GetWindowsVersion() { Index: src/chext/DropMenuExt.cpp =================================================================== diff -u -N -r134983cab6122e3fff73994a6f9c417aaeab3bc2 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/chext/DropMenuExt.cpp (.../DropMenuExt.cpp) (revision 134983cab6122e3fff73994a6f9c417aaeab3bc2) +++ src/chext/DropMenuExt.cpp (.../DropMenuExt.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -21,7 +21,6 @@ #include "DropMenuExt.h" #include "../Common/ipcstructs.h" #include "../libchcore/TTaskDefinition.h" -#include #include "../common/TShellExtMenuConfig.h" #include "../libchcore/TSharedMemory.h" #include "Logger.h" @@ -268,14 +267,12 @@ } } -STDMETHODIMP CDropMenuExt::HandleMenuMsg(UINT uMsg, WPARAM wParam, LPARAM lParam) +STDMETHODIMP CDropMenuExt::HandleMenuMsg(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/) { - uMsg; wParam; lParam; return S_FALSE; } -STDMETHODIMP CDropMenuExt::HandleMenuMsg2(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT* /*plResult*/) +STDMETHODIMP CDropMenuExt::HandleMenuMsg2(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, LRESULT* /*plResult*/) { - uMsg; wParam; lParam; return S_FALSE; } Index: src/chext/DropMenuExt.h =================================================================== diff -u -N -r2f696d06139af4d0fab14dd1613507b66f5169cb -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/chext/DropMenuExt.h (.../DropMenuExt.h) (revision 2f696d06139af4d0fab14dd1613507b66f5169cb) +++ src/chext/DropMenuExt.h (.../DropMenuExt.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -21,9 +21,9 @@ #include "resource.h" // main symbols #include "TContextMenuHandler.h" -#include "..\common\TShellExtMenuConfig.h" +#include "../common/TShellExtMenuConfig.h" #include "TShellExtData.h" -#include "..\liblogger\TLogger.h" +#include "../liblogger/TLogger.h" ///////////////////////////////////////////////////////////////////////////// // CDropMenuExt @@ -48,7 +48,7 @@ END_COM_MAP() public: - STDMETHOD(InvokeCommand)(LPCMINVOKECOMMANDINFO lpici); + STDMETHOD(InvokeCommand) (LPCMINVOKECOMMANDINFO lpici); STDMETHOD(Initialize)(LPCITEMIDLIST pidlFolder, IDataObject* piDataObject, HKEY /*hkeyProgID*/); STDMETHOD(GetCommandString)(UINT_PTR idCmd, UINT uFlags, UINT* /*pwReserved*/, LPSTR pszName, UINT cchMax); STDMETHOD(QueryContextMenu)(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT /*idCmdLast*/, UINT uFlags); Index: src/chext/HResultFormatter.cpp =================================================================== diff -u -N -rc33d4855ebf17772c28012a66c829a1f21d080f5 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/chext/HResultFormatter.cpp (.../HResultFormatter.cpp) (revision c33d4855ebf17772c28012a66c829a1f21d080f5) +++ src/chext/HResultFormatter.cpp (.../HResultFormatter.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -1,50 +1,50 @@ -// ============================================================================ -// Copyright (C) 2001-2015 by Jozef Starosczyk -// ixen@copyhandler.com -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Library General Public License -// (version 2) as published by the Free Software Foundation; -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU Library General Public -// License along with this program; if not, write to the -// Free Software Foundation, Inc., -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -// ============================================================================ -#include "stdafx.h" -#include "HResultFormatter.h" -#include -#include "..\libchcore\TWin32ErrorFormatter.h" - -std::wstring HResultFormatter::FormatHResult(HRESULT hResult) -{ - std::wstringstream wstr; - wstr << L"hr=0x" << std::hex << hResult; - - switch(hResult) - { - case S_OK: - wstr << L" (S_OK)"; - break; - case S_FALSE: - wstr << L" (S_FALSE)"; - break; - case E_FAIL: - wstr << L" (E_FAIL)"; - break; - - default: - { - chcore::TString strDesc = chcore::TWin32ErrorFormatter::FormatWin32ErrorCodeWithFallback(hResult, nullptr, false); - if(!strDesc.IsEmpty()) - wstr << L" (" << strDesc.c_str() << ")"; - } - } - - return wstr.str(); -} +// ============================================================================ +// Copyright (C) 2001-2015 by Jozef Starosczyk +// ixen@copyhandler.com +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU Library General Public License +// (version 2) as published by the Free Software Foundation; +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU Library General Public +// License along with this program; if not, write to the +// Free Software Foundation, Inc., +// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// ============================================================================ +#include "stdafx.h" +#include "HResultFormatter.h" +#include +#include "../libchcore/TWin32ErrorFormatter.h" + +std::wstring HResultFormatter::FormatHResult(HRESULT hResult) +{ + std::wstringstream wstr; + wstr << L"hr=0x" << std::hex << hResult; + + switch(hResult) + { + case S_OK: + wstr << L" (S_OK)"; + break; + case S_FALSE: + wstr << L" (S_FALSE)"; + break; + case E_FAIL: + wstr << L" (E_FAIL)"; + break; + + default: + { + chcore::TString strDesc = chcore::TWin32ErrorFormatter::FormatWin32ErrorCodeWithFallback(hResult, nullptr, false); + if(!strDesc.IsEmpty()) + wstr << L" (" << strDesc.c_str() << ")"; + } + } + + return wstr.str(); +} Index: src/chext/MenuExt.cpp =================================================================== diff -u -N -rcb014b333936d2d95577380f4d6c2ca94ed8082c -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/chext/MenuExt.cpp (.../MenuExt.cpp) (revision cb014b333936d2d95577380f4d6c2ca94ed8082c) +++ src/chext/MenuExt.cpp (.../MenuExt.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -19,7 +19,7 @@ #include "stdafx.h" #include "chext.h" #include "MenuExt.h" -#include "..\common\ipcstructs.h" +#include "../common/ipcstructs.h" #include "stdio.h" #include "memory.h" #include Index: src/chext/MenuExt.h =================================================================== diff -u -N -r2f696d06139af4d0fab14dd1613507b66f5169cb -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/chext/MenuExt.h (.../MenuExt.h) (revision 2f696d06139af4d0fab14dd1613507b66f5169cb) +++ src/chext/MenuExt.h (.../MenuExt.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -21,9 +21,9 @@ #include "resource.h" // main symbols #include "TContextMenuHandler.h" -#include "..\common\TShellExtMenuConfig.h" +#include "../common/TShellExtMenuConfig.h" #include "TShellExtData.h" -#include "..\liblogger\TLogger.h" +#include "../liblogger/TLogger.h" class TShellMenuItem; Index: src/chext/TShellExtData.h =================================================================== diff -u -N -r4fe995b304ea342b50293f92d3c1992b43b820f7 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/chext/TShellExtData.h (.../TShellExtData.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7) +++ src/chext/TShellExtData.h (.../TShellExtData.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -1,122 +1,122 @@ -// ============================================================================ -// Copyright (C) 2001-2011 by Jozef Starosczyk -// ixen@copyhandler.com -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Library General Public License -// (version 2) as published by the Free Software Foundation; -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU Library General Public -// License along with this program; if not, write to the -// Free Software Foundation, Inc., -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -// ============================================================================ -/// @file TShellExtData.h -/// @date 2011/05/28 -/// @brief Contains class responsible for handling data harvested with shell interfaces. -// ============================================================================ -#ifndef __TSHELLEXTDATA_H__ -#define __TSHELLEXTDATA_H__ - -#include "..\libchcore\TPath.h" -#include "..\libchcore\EOperationTypes.h" -#include "..\libchcore\TPathContainer.h" - -class TShellMenuItem; - -typedef std::shared_ptr TShellMenuItemPtr; - -class TShellExtData -{ -public: - enum EDataSource - { - eDS_IDataObject, - eDS_PidlFolder, - eDS_Clipboard, - }; - - enum EActionSource - { - eSrc_None = 0x0000, - eSrc_CtxMenu = 0x0100, - eSrc_DropMenu = 0x0200, - eSrc_Keyboard = 0x0400, - }; - -private: - /// State of the keyboard - enum EStateKeys - { - eKey_None = 0, - eKey_Ctrl = 1, - eKey_Alt = 2, - eKey_Shift = 4 - }; - - /// Default operation - enum EAction - { - eAction_None = 0x0000, - eAction_Copy = 0x0001, - eAction_Move = 0x0002, - eAction_Shortcut = 0x0004 - }; - -public: - TShellExtData(); - ~TShellExtData(); - - HRESULT GatherDataFromInitialize(LPCITEMIDLIST pidlFolder, IDataObject* piDataObject); - void ReadDefaultSelectionStateFromMenu(HMENU hMenu); ///< Retrieves the state information from a menu handle; should be used only for drag&drop menu - - void Clear(); - - bool CanServeAsSourcePaths(EDataSource eDataSource) const; - bool CanServeAsDestinationPath(EDataSource eDataSource) const; - - bool VerifyItemCanBeExecuted(const TShellMenuItemPtr& spMenuItem) const; - bool IsDefaultItem(const TShellMenuItemPtr& spMenuItem) const; - - bool GetSourcePathsByItem(const TShellMenuItemPtr& spMenuItem, chcore::TPathContainer& tSourcePaths) const; - bool GetDestinationPathByItem(const TShellMenuItemPtr& spMenuItem, chcore::TSmartPath& tDestinationPath) const; - - bool GetOperationTypeByItem(const TShellMenuItemPtr& spMenuItem, chcore::EOperationType& eOperationType) const; - - EActionSource GetActionSource() const; - -protected: - void ReadKeyboardState(); ///< Reads current keyboard state - HRESULT ReadPreferredDropEffectFromIDataObject(IDataObject* piDataObject); - HRESULT ReadClipboard(); - - bool IsSameDrive(const chcore::TSmartPath& spPath1, const chcore::TSmartPath& spPath2) const; - -private: - // data gathered from IDataObject (Initialize()) - chcore::TPathContainer m_vPathsIDataObject; - DWORD m_dwIDataObjectDropEffect; - - // data gathered from ITEMIDLIST (Initialize) - chcore::TSmartPath m_pathPidlFolder; - - // Keys' state (Initialize()) - unsigned long m_ulKeysState; ///< State of the ctrl/shift/alt keys - - // data gathered from clipboard (Initialize()) - chcore::TPathContainer m_vPathsClipboard; - DWORD m_dwClipboardDropEffect; - - // clicked in folder background - bool m_bFolderBackground; - - // information retrieved from context menu - EAction m_eDefaultSystemMenuAction; -}; - +// ============================================================================ +// Copyright (C) 2001-2011 by Jozef Starosczyk +// ixen@copyhandler.com +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU Library General Public License +// (version 2) as published by the Free Software Foundation; +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU Library General Public +// License along with this program; if not, write to the +// Free Software Foundation, Inc., +// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// ============================================================================ +/// @file TShellExtData.h +/// @date 2011/05/28 +/// @brief Contains class responsible for handling data harvested with shell interfaces. +// ============================================================================ +#ifndef __TSHELLEXTDATA_H__ +#define __TSHELLEXTDATA_H__ + +#include "../libchcore/TPath.h" +#include "../libchcore/EOperationTypes.h" +#include "../libchcore/TPathContainer.h" + +class TShellMenuItem; + +typedef std::shared_ptr TShellMenuItemPtr; + +class TShellExtData +{ +public: + enum EDataSource + { + eDS_IDataObject, + eDS_PidlFolder, + eDS_Clipboard, + }; + + enum EActionSource + { + eSrc_None = 0x0000, + eSrc_CtxMenu = 0x0100, + eSrc_DropMenu = 0x0200, + eSrc_Keyboard = 0x0400, + }; + +private: + /// State of the keyboard + enum EStateKeys + { + eKey_None = 0, + eKey_Ctrl = 1, + eKey_Alt = 2, + eKey_Shift = 4 + }; + + /// Default operation + enum EAction + { + eAction_None = 0x0000, + eAction_Copy = 0x0001, + eAction_Move = 0x0002, + eAction_Shortcut = 0x0004 + }; + +public: + TShellExtData(); + ~TShellExtData(); + + HRESULT GatherDataFromInitialize(LPCITEMIDLIST pidlFolder, IDataObject* piDataObject); + void ReadDefaultSelectionStateFromMenu(HMENU hMenu); ///< Retrieves the state information from a menu handle; should be used only for drag&drop menu + + void Clear(); + + bool CanServeAsSourcePaths(EDataSource eDataSource) const; + bool CanServeAsDestinationPath(EDataSource eDataSource) const; + + bool VerifyItemCanBeExecuted(const TShellMenuItemPtr& spMenuItem) const; + bool IsDefaultItem(const TShellMenuItemPtr& spMenuItem) const; + + bool GetSourcePathsByItem(const TShellMenuItemPtr& spMenuItem, chcore::TPathContainer& tSourcePaths) const; + bool GetDestinationPathByItem(const TShellMenuItemPtr& spMenuItem, chcore::TSmartPath& tDestinationPath) const; + + bool GetOperationTypeByItem(const TShellMenuItemPtr& spMenuItem, chcore::EOperationType& eOperationType) const; + + EActionSource GetActionSource() const; + +protected: + void ReadKeyboardState(); ///< Reads current keyboard state + HRESULT ReadPreferredDropEffectFromIDataObject(IDataObject* piDataObject); + HRESULT ReadClipboard(); + + bool IsSameDrive(const chcore::TSmartPath& spPath1, const chcore::TSmartPath& spPath2) const; + +private: + // data gathered from IDataObject (Initialize()) + chcore::TPathContainer m_vPathsIDataObject; + DWORD m_dwIDataObjectDropEffect; + + // data gathered from ITEMIDLIST (Initialize) + chcore::TSmartPath m_pathPidlFolder; + + // Keys' state (Initialize()) + unsigned long m_ulKeysState; ///< State of the ctrl/shift/alt keys + + // data gathered from clipboard (Initialize()) + chcore::TPathContainer m_vPathsClipboard; + DWORD m_dwClipboardDropEffect; + + // clicked in folder background + bool m_bFolderBackground; + + // information retrieved from context menu + EAction m_eDefaultSystemMenuAction; +}; + #endif // __TSHELLEXTDATA_H__ \ No newline at end of file Index: src/libchcore/ESubTaskTypes.h =================================================================== diff -u -N -ra4635addad389b9e117679437a3e1b64a739ea96 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/ESubTaskTypes.h (.../ESubTaskTypes.h) (revision a4635addad389b9e117679437a3e1b64a739ea96) +++ src/libchcore/ESubTaskTypes.h (.../ESubTaskTypes.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -16,10 +16,6 @@ // Free Software Foundation, Inc., // 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // ============================================================================ -/// @file SubTaskTypes.h -/// @date 2011/11/12 -/// @brief File contains subtask types enumeration. -// ============================================================================ #ifndef __SUBTASKTYPES_H__ #define __SUBTASKTYPES_H__ Index: src/libchcore/TAutoHandles.h =================================================================== diff -u -N -ra4635addad389b9e117679437a3e1b64a739ea96 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TAutoHandles.h (.../TAutoHandles.h) (revision a4635addad389b9e117679437a3e1b64a739ea96) +++ src/libchcore/TAutoHandles.h (.../TAutoHandles.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -29,48 +29,25 @@ class TAutoFileHandle { public: - // ============================================================================ - /// TAutoFileHandle::TAutoFileHandle - /// @date 2010/08/26 - /// - /// @brief Constructs the TAutoFileHandle object. - // ============================================================================ TAutoFileHandle() : m_hHandle(INVALID_HANDLE_VALUE) { } - // ============================================================================ - /// TAutoFileHandle::TAutoFileHandle - /// @date 2010/08/26 - /// - /// @brief Constructs the TAutoFileHandle object with specified handle. - /// @param[in] hHandle - System handle to be managed by this class. - // ============================================================================ + TAutoFileHandle(const TAutoFileHandle&) = delete; + explicit TAutoFileHandle(HANDLE hHandle) : m_hHandle(hHandle) { } - // ============================================================================ - /// TAutoFileHandle::~TAutoFileHandle - /// @date 2010/08/26 - /// - /// @brief Destructs the TAutoFileHandle object and closes handle if not closed already. - // ============================================================================ ~TAutoFileHandle() { Close(); } - // ============================================================================ - /// TAutoFileHandle::operator= - /// @date 2010/08/26 - /// - /// @brief Assignment operator. - /// @param[in] hHandle - Handle to be assigned. - /// @return Reference to this object, - // ============================================================================ + TAutoFileHandle& operator=(const TAutoFileHandle&) = delete; + TAutoFileHandle& operator=(HANDLE hHandle) { if (m_hHandle != hHandle) @@ -81,25 +58,16 @@ return *this; } - // ============================================================================ - /// TAutoFileHandle::operator HANDLE - /// @date 2010/08/26 - /// - /// @brief Retrieves the system handle. - /// @return HANDLE value. - // ============================================================================ - operator HANDLE() + explicit operator HANDLE() const { return m_hHandle; } - // ============================================================================ - /// TAutoFileHandle::Close - /// @date 2010/08/26 - /// - /// @brief Closes the internal handle if needed. - /// @return Result of the CloseHandle() function. - // ============================================================================ + bool HasValidHandle() const + { + return m_hHandle != INVALID_HANDLE_VALUE; + } + BOOL Close() { BOOL bResult = TRUE; @@ -112,13 +80,6 @@ return bResult; } - // ============================================================================ - /// TAutoFileHandle::Detach - /// @date 2010/09/12 - /// - /// @brief Detaches the handle, so it won't be closed in destructor. - /// @return Returns current handle. - // ============================================================================ HANDLE Detach() { HANDLE hHandle = m_hHandle; Index: src/libchcore/TBaseException.cpp =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TBaseException.cpp (.../TBaseException.cpp) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TBaseException.cpp (.../TBaseException.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -25,37 +25,38 @@ TBaseException::TBaseException(EGeneralErrors eErrorCode, const wchar_t* pszMsg, const wchar_t* pszFile, size_t stLineNumber, const wchar_t* pszFunction) : m_eErrorCode(eErrorCode), m_pszMsg(pszMsg), - m_bDeleteMsg(false), m_pszFile(pszFile), m_pszFunction(pszFunction), m_stLineNumber(stLineNumber) { ATLTRACE(_T("*** Base Exception is being thrown:\n\tMsg: %s\n\tError code: %d\n\tFile: %s\n\tLine number: %ld\n\tFunction: %s\n"), pszMsg, eErrorCode, pszFile, stLineNumber, pszFunction); } - TBaseException::TBaseException(EGeneralErrors eErrorCode, const char* pszMsg, const wchar_t* pszFile, size_t stLineNumber, const wchar_t* pszFunction) : - m_eErrorCode(eErrorCode), - m_pszMsg(nullptr), - m_bDeleteMsg(false), - m_pszFile(pszFile), - m_pszFunction(pszFunction), - m_stLineNumber(stLineNumber) + TBaseException::TBaseException(const TBaseException& rSrc) : + m_eErrorCode(rSrc.m_eErrorCode), + m_pszMsg(rSrc.m_pszMsg), + m_pszFile(rSrc.m_pszFile), + m_pszFunction(rSrc.m_pszFunction), + m_stLineNumber(rSrc.m_stLineNumber) { - ATLTRACE(_T("*** Base Exception is being thrown:\n\tMsg: %S\n\tError code: %d\n\tFile: %s\n\tLine number: %ld\n\tFunction: %s\n"), pszMsg, eErrorCode, pszFile, stLineNumber, pszFunction); - if (pszMsg) - { - size_t stMsgLen = strlen(pszMsg); - m_pszMsg = new wchar_t[stMsgLen + 1]; + } - size_t stResult = 0; - mbstowcs_s(&stResult, const_cast(m_pszMsg), stMsgLen + 1, pszMsg, _TRUNCATE); + TBaseException& TBaseException::operator=(const TBaseException& rSrc) + { + if(this != &rSrc) + { + m_eErrorCode = rSrc.m_eErrorCode; + m_pszMsg = rSrc.m_pszMsg; + m_pszFile = rSrc.m_pszFile; + m_pszFunction = rSrc.m_pszFunction; + m_stLineNumber = rSrc.m_stLineNumber; } + + return *this; } TBaseException::~TBaseException() { - if (m_bDeleteMsg) - delete[] m_pszMsg; } void TBaseException::GetErrorInfo(wchar_t* pszBuffer, size_t stMaxBuffer) const Index: src/libchcore/TBaseException.h =================================================================== diff -u -N -ra4635addad389b9e117679437a3e1b64a739ea96 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TBaseException.h (.../TBaseException.h) (revision a4635addad389b9e117679437a3e1b64a739ea96) +++ src/libchcore/TBaseException.h (.../TBaseException.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -32,9 +32,10 @@ { 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; + TBaseException(const TBaseException& rSrc); + TBaseException& operator=(const TBaseException&); + virtual ~TBaseException(); // error information @@ -55,7 +56,6 @@ // where it happened? const wchar_t* m_pszMsg; - bool m_bDeleteMsg; const wchar_t* m_pszFile; const wchar_t* m_pszFunction; Index: src/libchcore/TBasePathData.h =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TBasePathData.h (.../TBasePathData.h) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TBasePathData.h (.../TBasePathData.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -28,12 +28,12 @@ #include "TSharedModificationTracker.h" #include "TRemovedObjects.h" #include "ISerializerRowData.h" -#include "IColumnsDefinition.h" #include "ISerializerRowReader.h" #include "CommonDataTypes.h" namespace chcore { + class IColumnsDefinition; class TPathContainer; ///////////////////////////////////////////////////////////////////////////// @@ -98,8 +98,11 @@ public: // constructors/destructor TBasePathDataContainer(); + TBasePathDataContainer(const TBasePathDataContainer& rSrc) = delete; ~TBasePathDataContainer(); + TBasePathDataContainer& operator=(const TBasePathDataContainer& rSrc) = delete; + TBasePathDataContainer& operator=(const TPathContainer& tPaths); // standard access to data @@ -123,9 +126,6 @@ void InitColumns(const ISerializerContainerPtr& spContainer) const; private: - TBasePathDataContainer(const TBasePathDataContainer& rSrc); - TBasePathDataContainer& operator=(const TBasePathDataContainer& rSrc); - void ClearNL(); protected: Index: src/libchcore/TBasePathDataFwd.h =================================================================== diff -u -N -ra4635addad389b9e117679437a3e1b64a739ea96 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TBasePathDataFwd.h (.../TBasePathDataFwd.h) (revision a4635addad389b9e117679437a3e1b64a739ea96) +++ src/libchcore/TBasePathDataFwd.h (.../TBasePathDataFwd.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -22,7 +22,7 @@ namespace chcore { class TBasePathData; - typedef std::shared_ptr TBasePathDataPtr; + using TBasePathDataPtr = std::shared_ptr; } #endif Index: src/libchcore/TCoreException.cpp =================================================================== diff -u -N -ra4635addad389b9e117679437a3e1b64a739ea96 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TCoreException.cpp (.../TCoreException.cpp) (revision a4635addad389b9e117679437a3e1b64a739ea96) +++ src/libchcore/TCoreException.cpp (.../TCoreException.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -26,8 +26,7 @@ { } - TCoreException::TCoreException(EGeneralErrors eErrorCode, const char* pszMsg, const wchar_t* pszFile, size_t stLineNumber, const wchar_t* pszFunction) : - TBaseException(eErrorCode, pszMsg, pszFile, stLineNumber, pszFunction) + TCoreException::TCoreException(TCoreException&& rSrc) : TBaseException(std::forward(rSrc)) { } } Index: src/libchcore/TCoreException.h =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TCoreException.h (.../TCoreException.h) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TCoreException.h (.../TCoreException.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -27,8 +27,8 @@ class LIBCHCORE_API TCoreException : public TBaseException { public: + TCoreException(TCoreException&& rSrc); TCoreException(EGeneralErrors eErrorCode, const wchar_t* pszMsg, const wchar_t* pszFile, size_t stLineNumber, const wchar_t* pszFunction); - TCoreException(EGeneralErrors eErrorCode, const char* pszMsg, const wchar_t* pszFile, size_t stLineNumber, const wchar_t* pszFunction); }; } Index: src/libchcore/TCoreStdException.cpp =================================================================== diff -u -N --- src/libchcore/TCoreStdException.cpp (revision a4635addad389b9e117679437a3e1b64a739ea96) +++ src/libchcore/TCoreStdException.cpp (revision 0) @@ -1,39 +0,0 @@ -// ============================================================================ -// Copyright (C) 2001-2015 by Jozef Starosczyk -// ixen@copyhandler.com -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Library General Public License -// (version 2) as published by the Free Software Foundation; -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU Library General Public -// License along with this program; if not, write to the -// Free Software Foundation, Inc., -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -// ============================================================================ -#include "stdafx.h" -#include "TCoreStdException.h" - -namespace chcore -{ - // ============================================================================ - /// TCoreException::TCoreException - /// @date 2009/11/30 - /// - /// @brief Constructs core exception object with additional data. - /// @param[in] eErrorCode - error code - /// @param[in] stdException - standard exception info - /// @param[in] pszFile - source file name - /// @param[in] stLineNumber - source line number - /// @param[in] pszFunction - function name in which the problem occurred. - // ============================================================================ - TCoreStdException::TCoreStdException(EGeneralErrors eErrorCode, std::exception& stdException, const wchar_t* pszFile, size_t stLineNumber, const wchar_t* pszFunction) : - TCoreException(eErrorCode, stdException.what(), pszFile, stLineNumber, pszFunction) - { - } -} Index: src/libchcore/TCoreStdException.h =================================================================== diff -u -N --- src/libchcore/TCoreStdException.h (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TCoreStdException.h (revision 0) @@ -1,36 +0,0 @@ -// ============================================================================ -// Copyright (C) 2001-2015 by Jozef Starosczyk -// ixen@copyhandler.com -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Library General Public License -// (version 2) as published by the Free Software Foundation; -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU Library General Public -// License along with this program; if not, write to the -// Free Software Foundation, Inc., -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -// ============================================================================ -#ifndef __TCORESTDEXCEPTION_H__ -#define __TCORESTDEXCEPTION_H__ - -#include "TCoreException.h" - -#define THROW_CORE_EXCEPTION_STD(error_code, std_exception)\ - throw TCoreStdException(error_code, std_exception, __FILEW__, __LINE__, __FUNCTIONW__) - -namespace chcore -{ - class LIBCHCORE_API TCoreStdException : public TCoreException - { - public: - TCoreStdException(EGeneralErrors eErrorCode, std::exception& stdException, const wchar_t* pszFile, size_t stLineNumber, const wchar_t* pszFunction); - }; -} - -#endif Index: src/libchcore/TEventGuard.h =================================================================== diff -u -N -r7892d3d5ca43da7dca4d9e8e0c321c21c3e13ea0 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TEventGuard.h (.../TEventGuard.h) (revision 7892d3d5ca43da7dca4d9e8e0c321c21c3e13ea0) +++ src/libchcore/TEventGuard.h (.../TEventGuard.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -27,8 +27,11 @@ { public: TEventGuard(TEvent& rEvent, bool bValueToSetAtExit); + TEventGuard(const TEventGuard&) = delete; ~TEventGuard(); + TEventGuard& operator=(const TEventGuard&) = delete; + private: TEvent& m_event; bool m_bValueToSetAtExit = false; Index: src/libchcore/TFeedbackHandlerBase.h =================================================================== diff -u -N -rc085b65f1de24f25feab2bac2d5882abf04aabcf -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TFeedbackHandlerBase.h (.../TFeedbackHandlerBase.h) (revision c085b65f1de24f25feab2bac2d5882abf04aabcf) +++ src/libchcore/TFeedbackHandlerBase.h (.../TFeedbackHandlerBase.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -30,8 +30,11 @@ { public: TFeedbackHandlerBase(); + TFeedbackHandlerBase(const TFeedbackHandlerBase&) = delete; virtual ~TFeedbackHandlerBase(); + TFeedbackHandlerBase& operator=(const TFeedbackHandlerBase&) = delete; + // marking responses as permanent void SetFileErrorPermanentResponse(EFeedbackResult ePermanentResult); EFeedbackResult GetFileErrorPermanentResponse() const; Index: src/libchcore/TFileFiltersArray.cpp =================================================================== diff -u -N -r8a2ff3b2b71b45fb525e030167e62f316cb32869 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TFileFiltersArray.cpp (.../TFileFiltersArray.cpp) (revision 8a2ff3b2b71b45fb525e030167e62f316cb32869) +++ src/libchcore/TFileFiltersArray.cpp (.../TFileFiltersArray.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -32,16 +32,6 @@ { } - TFileFiltersArray& TFileFiltersArray::operator=(const TFileFiltersArray& rSrc) - { - if (this != &rSrc) - { - m_vFilters = rSrc.m_vFilters; - } - - return *this; - } - bool TFileFiltersArray::Match(const TFileInfoPtr& spInfo) const { if (m_vFilters.empty()) Index: src/libchcore/TFileFiltersArray.h =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TFileFiltersArray.h (.../TFileFiltersArray.h) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TFileFiltersArray.h (.../TFileFiltersArray.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -35,7 +35,6 @@ TFileFiltersArray(); ~TFileFiltersArray(); - TFileFiltersArray& operator=(const TFileFiltersArray& rSrc); bool Match(const TFileInfoPtr& spInfo) const; void StoreInConfig(TConfig& rConfig, PCTSTR pszNodeName) const; Index: src/libchcore/TFileInfo.cpp =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TFileInfo.cpp (.../TFileInfo.cpp) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TFileInfo.cpp (.../TFileInfo.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -45,20 +45,6 @@ m_setModifications[eMod_Added] = true; } - TFileInfo::TFileInfo(const TFileInfo& rSrc) : - m_setModifications(rSrc.m_setModifications), - m_oidObjectID(rSrc.m_oidObjectID), - m_pathFile(m_setModifications, rSrc.m_pathFile), - m_spBasePathData(m_setModifications, rSrc.m_spBasePathData), - m_dwAttributes(m_setModifications, rSrc.m_dwAttributes), - m_uhFileSize(m_setModifications, rSrc.m_uhFileSize), - m_ftCreation(m_setModifications, rSrc.m_ftCreation), - m_ftLastAccess(m_setModifications, rSrc.m_ftLastAccess), - m_ftLastWrite(m_setModifications, rSrc.m_ftLastWrite), - m_uiFlags(m_setModifications, rSrc.m_uiFlags) - { - } - TFileInfo::TFileInfo(const TBasePathDataPtr& spBasePathData, const TSmartPath& rpathFile, DWORD dwAttributes, ULONGLONG uhFileSize, const TFileTime& ftCreation, const TFileTime& ftLastAccess, const TFileTime& ftLastWrite, unsigned int uiFlags) : m_oidObjectID(0), m_pathFile(m_setModifications, rpathFile), @@ -78,25 +64,6 @@ { } - TFileInfo& TFileInfo::operator=(const TFileInfo& rSrc) - { - if (this != &rSrc) - { - m_pathFile = rSrc.m_pathFile; - m_spBasePathData = rSrc.m_spBasePathData; - m_dwAttributes = rSrc.m_dwAttributes; - m_uhFileSize = rSrc.m_uhFileSize; - m_ftCreation = rSrc.m_ftCreation; - m_ftLastAccess = rSrc.m_ftLastAccess; - m_ftLastWrite = rSrc.m_ftLastWrite; - m_uiFlags = rSrc.m_uiFlags; - m_oidObjectID = rSrc.m_oidObjectID; - m_setModifications = rSrc.m_setModifications; - } - - return *this; - } - void TFileInfo::Init(const TBasePathDataPtr& spBasePathData, const TSmartPath& rpathFile, DWORD dwAttributes, ULONGLONG uhFileSize, const TFileTime& ftCreation, const TFileTime& ftLastAccess, const TFileTime& ftLastWrite, unsigned int uiFlags) Index: src/libchcore/TFileInfo.h =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TFileInfo.h (.../TFileInfo.h) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TFileInfo.h (.../TFileInfo.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -41,14 +41,11 @@ public: TFileInfo(); - TFileInfo(const TFileInfo& rSrc); TFileInfo(const TBasePathDataPtr& spBasePathData, const TSmartPath& rpathFile, DWORD dwAttributes, ULONGLONG uhFileSize, const TFileTime& ftCreation, const TFileTime& ftLastAccess, const TFileTime& ftLastWrite, unsigned int uiFlags); ~TFileInfo(); - TFileInfo& operator=(const TFileInfo& rSrc); - // operators bool operator==(const TFileInfo& rInfo) const; Index: src/libchcore/TFileInfoFwd.h =================================================================== diff -u -N -ra4635addad389b9e117679437a3e1b64a739ea96 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TFileInfoFwd.h (.../TFileInfoFwd.h) (revision a4635addad389b9e117679437a3e1b64a739ea96) +++ src/libchcore/TFileInfoFwd.h (.../TFileInfoFwd.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -22,7 +22,7 @@ namespace chcore { class TFileInfo; - typedef std::shared_ptr TFileInfoPtr; + using TFileInfoPtr = std::shared_ptr; } #endif Index: src/libchcore/TFileTime.cpp =================================================================== diff -u -N -ra4635addad389b9e117679437a3e1b64a739ea96 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TFileTime.cpp (.../TFileTime.cpp) (revision a4635addad389b9e117679437a3e1b64a739ea96) +++ src/libchcore/TFileTime.cpp (.../TFileTime.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -27,11 +27,6 @@ m_ftTime.dwLowDateTime = 0; } - TFileTime::TFileTime(const TFileTime& rSrc) : - m_ftTime(rSrc.m_ftTime) - { - } - TFileTime::TFileTime(const FILETIME& rftTime) : m_ftTime(rftTime) { @@ -41,24 +36,13 @@ { } - TFileTime& TFileTime::operator=(const TFileTime& rSrc) - { - if (this != &rSrc) - { - m_ftTime = rSrc.m_ftTime; - } - - return *this; - } - TFileTime& TFileTime::operator=(const FILETIME& rSrc) { m_ftTime = rSrc; return *this; } - bool TFileTime::operator==(const TFileTime& rSrc) const { return m_ftTime.dwHighDateTime == rSrc.m_ftTime.dwHighDateTime && m_ftTime.dwLowDateTime == rSrc.m_ftTime.dwLowDateTime; Index: src/libchcore/TFileTime.h =================================================================== diff -u -N -ra4635addad389b9e117679437a3e1b64a739ea96 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TFileTime.h (.../TFileTime.h) (revision a4635addad389b9e117679437a3e1b64a739ea96) +++ src/libchcore/TFileTime.h (.../TFileTime.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -29,10 +29,8 @@ TFileTime(); // cppcheck-suppress noExplicitConstructor TFileTime(const FILETIME& rftTime); - TFileTime(const TFileTime& rSrc); ~TFileTime(); - TFileTime& operator=(const TFileTime& rSrc); TFileTime& operator=(const FILETIME& rSrc); bool operator==(const TFileTime& rSrc) const; Index: src/libchcore/TFilesystemFeedbackWrapper.cpp =================================================================== diff -u -N -rbaad6054459abaaf69cbfd1ebad8783085160d99 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TFilesystemFeedbackWrapper.cpp (.../TFilesystemFeedbackWrapper.cpp) (revision baad6054459abaaf69cbfd1ebad8783085160d99) +++ src/libchcore/TFilesystemFeedbackWrapper.cpp (.../TFilesystemFeedbackWrapper.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -40,8 +40,6 @@ bool bRetry = false; do { - bRetry = false; - DWORD dwLastError = ERROR_SUCCESS; try { @@ -196,7 +194,6 @@ bool bRetry = false; do { - bRetry = false; DWORD dwLastError = ERROR_SUCCESS; try @@ -257,8 +254,6 @@ bool bRetry = false; do { - bRetry = false; - DWORD dwLastError = ERROR_SUCCESS; try { @@ -318,8 +313,6 @@ bool bRetry = false; do { - bRetry = false; - TSmartPath pathSrc = spBasePath->GetSrcPath(); DWORD dwLastError = ERROR_SUCCESS; @@ -381,8 +374,6 @@ bool bRetry = false; do { - bRetry = false; - // read attributes of src file/folder DWORD dwLastError = ERROR_SUCCESS; try @@ -430,8 +421,6 @@ bool bRetry = false; do { - bRetry = false; - // read attributes of src file/folder DWORD dwLastError = ERROR_SUCCESS; try Index: src/libchcore/TFilesystemFileFeedbackWrapper.cpp =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TFilesystemFileFeedbackWrapper.cpp (.../TFilesystemFileFeedbackWrapper.cpp) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TFilesystemFileFeedbackWrapper.cpp (.../TFilesystemFileFeedbackWrapper.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -140,8 +140,6 @@ bool bRetry = false; do { - bRetry = false; - DWORD dwLastError = ERROR_SUCCESS; try @@ -194,8 +192,6 @@ bool bRetry = false; do { - bRetry = false; - DWORD dwLastError = ERROR_SUCCESS; try @@ -248,8 +244,6 @@ bool bRetry = false; do { - bRetry = false; - DWORD dwLastError = ERROR_SUCCESS; try @@ -384,8 +378,6 @@ bool bRetry = false; do { - bRetry = false; - DWORD dwLastError = ERROR_SUCCESS; try @@ -442,8 +434,6 @@ bool bRetry = false; do { - bRetry = false; - DWORD dwLastError = ERROR_SUCCESS; try @@ -503,8 +493,6 @@ bool bRetry = false; do { - bRetry = false; - DWORD dwLastError = ERROR_SUCCESS; try Index: src/libchcore/TIpcMutex.h =================================================================== diff -u -N -ra6b040ed1b328ac7ad30882b07b7ca41e812bbb9 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TIpcMutex.h (.../TIpcMutex.h) (revision a6b040ed1b328ac7ad30882b07b7ca41e812bbb9) +++ src/libchcore/TIpcMutex.h (.../TIpcMutex.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -27,9 +27,12 @@ { public: TIpcMutex(); + TIpcMutex(const TIpcMutex&) = delete; explicit TIpcMutex(const wchar_t* pszName); ~TIpcMutex(); + TIpcMutex& operator=(const TIpcMutex&) = delete; + void CreateMutex(const wchar_t* pszName); void Lock(DWORD dwTimeout = INFINITE); Index: src/libchcore/TIpcMutexLock.h =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TIpcMutexLock.h (.../TIpcMutexLock.h) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TIpcMutexLock.h (.../TIpcMutexLock.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -27,8 +27,11 @@ { public: explicit TIpcMutexLock(TIpcMutex& rMutex); + TIpcMutexLock(const TIpcMutexLock&) = delete; ~TIpcMutexLock(); + TIpcMutexLock& operator=(const TIpcMutexLock&) = delete; + private: TIpcMutex& m_rMutex; }; Index: src/libchcore/TLocalFilesystem.cpp =================================================================== diff -u -N -rbaad6054459abaaf69cbfd1ebad8783085160d99 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TLocalFilesystem.cpp (.../TLocalFilesystem.cpp) (revision baad6054459abaaf69cbfd1ebad8783085160d99) +++ src/libchcore/TLocalFilesystem.cpp (.../TLocalFilesystem.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -111,9 +111,9 @@ L", last-access-time: " << ftLastAccessTime.GetAsFiletime() << L", last-write-time: " << ftLastWriteTime.GetAsFiletime(); - TAutoFileHandle hFile = TAutoFileHandle(CreateFile(fullPath.ToString(), GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, + TAutoFileHandle hFile(CreateFile(fullPath.ToString(), GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_BACKUP_SEMANTICS, nullptr)); - if(hFile == INVALID_HANDLE_VALUE) + if(!hFile.HasValidHandle()) { DWORD dwLastError = GetLastError(); LOG_ERROR(m_spLog) << L"Open file failed with error: " << dwLastError << L". Cannot set file/directory times."; @@ -128,7 +128,7 @@ basicInfo.LastWriteTime.QuadPart = ftLastWriteTime.ToUInt64(); basicInfo.ChangeTime.QuadPart = ftLastWriteTime.ToUInt64(); - if(!SetFileInformationByHandle(hFile, FileBasicInfo, &basicInfo, sizeof(FILE_BASIC_INFO))) + if(!SetFileInformationByHandle((HANDLE)hFile, FileBasicInfo, &basicInfo, sizeof(FILE_BASIC_INFO))) { DWORD dwLastError = GetLastError(); LOG_ERROR(m_spLog) << L"Failed to set file/dir basic info for " << pathFileDir; Index: src/libchcore/TLocalFilesystem.h =================================================================== diff -u -N -rc085b65f1de24f25feab2bac2d5882abf04aabcf -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TLocalFilesystem.h (.../TLocalFilesystem.h) (revision c085b65f1de24f25feab2bac2d5882abf04aabcf) +++ src/libchcore/TLocalFilesystem.h (.../TLocalFilesystem.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -27,7 +27,7 @@ #include "TBasePathData.h" #include "TFileInfoFwd.h" #include "IFilesystem.h" -#include "..\liblogger\TLogger.h" +#include "../liblogger/TLogger.h" namespace chcore { @@ -42,8 +42,12 @@ { public: explicit TLocalFilesystem(const logger::TLogFileDataPtr& spLogFileData); + TLocalFilesystem(const TLocalFilesystem&) = delete; + virtual ~TLocalFilesystem(); + TLocalFilesystem& operator=(const TLocalFilesystem&) = delete; + bool PathExist(const TSmartPath& strPath) override; // check for file or folder existence void SetFileDirBasicInfo(const TSmartPath& pathFileDir, DWORD dwAttributes, const TFileTime& ftCreationTime, const TFileTime& ftLastAccessTime, const TFileTime& ftLastWriteTime) override; Index: src/libchcore/TLocalFilesystemFind.h =================================================================== diff -u -N -rc085b65f1de24f25feab2bac2d5882abf04aabcf -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TLocalFilesystemFind.h (.../TLocalFilesystemFind.h) (revision c085b65f1de24f25feab2bac2d5882abf04aabcf) +++ src/libchcore/TLocalFilesystemFind.h (.../TLocalFilesystemFind.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -22,7 +22,7 @@ #include "TFileInfoFwd.h" #include "TPath.h" #include "IFilesystemFind.h" -#include "..\liblogger\TLogger.h" +#include "../liblogger/TLogger.h" namespace chcore { Index: src/libchcore/TModPathContainer.cpp =================================================================== diff -u -N --- src/libchcore/TModPathContainer.cpp (revision a4635addad389b9e117679437a3e1b64a739ea96) +++ src/libchcore/TModPathContainer.cpp (revision 0) @@ -1,337 +0,0 @@ -// ============================================================================ -// Copyright (C) 2001-2014 by Jozef Starosczyk -// ixen@copyhandler.com -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Library General Public License -// (version 2) as published by the Free Software Foundation; -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU Library General Public -// License along with this program; if not, write to the -// Free Software Foundation, Inc., -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -// ============================================================================ -#include "stdafx.h" -#include "TModPathContainer.h" -#include "TCoreException.h" -#include "ErrorCodes.h" -#include "TPathContainer.h" -#include "ISerializerRowData.h" - -namespace chcore -{ - // ============================================================================ - /// TModPathContainer::TModPathContainer - /// @date 2009/11/30 - /// - /// @brief Constructs an empty path container object. - // ============================================================================ - TModPathContainer::TModPathContainer() : - m_vPaths(), - m_oidNextObjectID(1) - { - } - - // ============================================================================ - /// TModPathContainer::TModPathContainer - /// @date 2009/11/30 - /// - /// @brief Constructs the path container object from another path container. - /// @param[in] rSrcContainer - path container to copy paths from. - // ============================================================================ - TModPathContainer::TModPathContainer(const TModPathContainer& rSrcContainer) : - m_vPaths(rSrcContainer.m_vPaths), - m_oidNextObjectID(rSrcContainer.m_oidNextObjectID) - { - } - - // ============================================================================ - /// TModPathContainer::~TModPathContainer - /// @date 2009/11/30 - /// - /// @brief Destructs this path container object. - // ============================================================================ - TModPathContainer::~TModPathContainer() - { - } - - // ============================================================================ - /// TModPathContainer::operator= - /// @date 2009/11/30 - /// - /// @brief Assigns another path container object to this one. - /// @param[in] rSrcContainer - container with paths to copy from. - /// @return Reference to this object. - // ============================================================================ - TModPathContainer& TModPathContainer::operator=(const TModPathContainer& rSrcContainer) - { - if (this != &rSrcContainer) - { - m_vPaths = rSrcContainer.m_vPaths; - m_oidNextObjectID = rSrcContainer.m_oidNextObjectID; - } - - return *this; - } - - TModPathContainer& TModPathContainer::operator=(const TPathContainer& rSrcContainer) - { - Clear(true); - - for (size_t stIndex = 0; stIndex < rSrcContainer.GetCount(); ++stIndex) - { - m_vPaths.insert(std::make_pair(m_oidNextObjectID++, TModificationTracker(rSrcContainer.GetAt(stIndex), true))); - } - - return *this; - } - - // ============================================================================ - /// TModPathContainer::Add - /// @date 2009/11/30 - /// - /// @brief Adds a path to the end of list. - /// @param[in] spPath - path to be added. - // ============================================================================ - void TModPathContainer::Add(const TSmartPath& spPath) - { - m_vPaths.insert(std::make_pair(m_oidNextObjectID++, TModificationTracker(spPath, true))); - } - - // ============================================================================ - /// TModPathContainer::GetAt - /// @date 2009/11/30 - /// - /// @brief Retrieves path at specified index. - /// @param[in] stIndex - index at which to retrieve item. - /// @return Reference to the path object. - // ============================================================================ - const TSmartPath& TModPathContainer::GetAt(size_t stIndex) const - { - if (stIndex > m_vPaths.size()) - throw TCoreException(eErr_BoundsExceeded, L"stIndex", LOCATION); - - DataMap::const_iterator iter = m_vPaths.cbegin() + stIndex; - return iter->second; - } - - // ============================================================================ - /// TModPathContainer::GetAt - /// @date 2009/11/30 - /// - /// @brief Retrieves path at specified index. - /// @param[in] stIndex - index at which to retrieve item. - /// @return Reference to the path object. - // ============================================================================ - TSmartPath& TModPathContainer::GetAt(size_t stIndex) - { - if (stIndex > m_vPaths.size()) - throw TCoreException(eErr_BoundsExceeded, L"stIndex", LOCATION); - - DataMap::iterator iter = m_vPaths.begin() + stIndex; - return iter->second.Modify(); - } - - object_id_t TModPathContainer::GetOidAt(size_t stIndex) const - { - if (stIndex > m_vPaths.size()) - throw TCoreException(eErr_BoundsExceeded, L"stIndex", LOCATION); - - DataMap::const_iterator iter = m_vPaths.begin() + stIndex; - return iter->first; - } - - // ============================================================================ - /// TModPathContainer::SetAt - /// @date 2009/11/30 - /// - /// @brief Sets a path at a specified index. - /// @param[in] stIndex - index at which to set the path. - /// @param[in] spPath - path to be set. - // ============================================================================ - void TModPathContainer::SetAt(size_t stIndex, const TSmartPath& spPath) - { - if (stIndex > m_vPaths.size()) - throw TCoreException(eErr_BoundsExceeded, L"stIndex", LOCATION); - - DataMap::iterator iter = m_vPaths.begin() + stIndex; - iter->second = spPath; - } - - // ============================================================================ - /// TModPathContainer::DeleteAt - /// @date 2009/11/30 - /// - /// @brief Removes a path from container at specified index. - /// @param[in] stIndex - index at which to delete. - // ============================================================================ - void TModPathContainer::DeleteAt(size_t stIndex) - { - if (stIndex > m_vPaths.size()) - throw TCoreException(eErr_BoundsExceeded, L"stIndex", LOCATION); - - DataMap::iterator iterDel = m_vPaths.begin() + stIndex; - m_setRemovedItems.Add(iterDel->first); - m_vPaths.erase(iterDel); - } - - // ============================================================================ - /// TModPathContainer::Clear - /// @date 2009/11/30 - /// - /// @brief Removes all paths from this container. - // ============================================================================ - void TModPathContainer::Clear(bool bClearModificationsData) - { - if (!bClearModificationsData) - { - for (DataMap::iterator iterDel = m_vPaths.begin(); iterDel != m_vPaths.end(); ++iterDel) - { - m_setRemovedItems.Add(iterDel->first); - } - } - else - { - m_setRemovedItems.Clear(); - m_oidNextObjectID = 1; - } - - m_vPaths.clear(); - } - - // ============================================================================ - /// TModPathContainer::GetCount - /// @date 2009/11/30 - /// - /// @brief Retrieves count of elements in the container. - /// @return Count of elements. - // ============================================================================ - size_t TModPathContainer::GetCount() const - { - return m_vPaths.size(); - } - - // ============================================================================ - /// TModPathContainer::GetCount - /// @date 2010/10/12 - /// - /// @brief Retrieves info if this container is empty. - /// @return True if empty, false otherwise. - // ============================================================================ - bool TModPathContainer::IsEmpty() const - { - return m_vPaths.empty(); - } - - const TSmartPath& TModPathContainer::GetAtOid(object_id_t oidObjectID) const - { - return m_vPaths.at(oidObjectID); - } - - TSmartPath& TModPathContainer::GetAtOid(object_id_t oidObjectID) - { - return m_vPaths.at(oidObjectID).Modify(); - } - - void TModPathContainer::SetByOid(object_id_t oidObjectID, const TSmartPath& spPath) - { - DataMap::iterator iterFnd = m_vPaths.find(oidObjectID); - if (iterFnd != m_vPaths.end()) - iterFnd->second = spPath; - else - m_vPaths.insert(std::make_pair(oidObjectID, TModificationTracker(spPath, true))); - } - - void TModPathContainer::DeleteOid(object_id_t oidObjectID) - { - m_vPaths.erase(oidObjectID); - m_setRemovedItems.Add(oidObjectID); - } - - bool TModPathContainer::HasModifications() const - { - if (!m_setRemovedItems.IsEmpty()) - return true; - - for (DataMap::const_iterator iterDel = m_vPaths.begin(); iterDel != m_vPaths.end(); ++iterDel) - { - if (iterDel->second.IsModified() || iterDel->second.IsAdded()) - return true; - } - - return false; - } - - void TModPathContainer::ClearModifications() - { - m_setRemovedItems.Clear(); - - for (DataMap::iterator iterDel = m_vPaths.begin(); iterDel != m_vPaths.end(); ++iterDel) - { - iterDel->second.ClearModifications(); - } - } - - void TModPathContainer::Store(const ISerializerContainerPtr& spContainer) const - { - InitColumns(spContainer); - - // delete items first - spContainer->DeleteRows(m_setRemovedItems); - m_setRemovedItems.Clear(); - - // add/modify - for (DataMap::const_iterator iterPath = m_vPaths.begin(); iterPath != m_vPaths.end(); ++iterPath) - { - const TModificationTracker& rItem = iterPath->second; - - if (rItem.IsModified()) - { - ISerializerRowData& rRow = spContainer->GetRow(iterPath->first, rItem.IsAdded()); - rRow.SetValue(_T("path"), rItem); - - rItem.ClearModifications(); - } - else - continue; - } - } - - void TModPathContainer::Load(const ISerializerContainerPtr& spContainer) - { - m_setRemovedItems.Clear(); - m_vPaths.clear(); - m_oidNextObjectID = 1; - - InitColumns(spContainer); - - ISerializerRowReaderPtr spRowReader = spContainer->GetRowReader(); - while (spRowReader->Next()) - { - object_id_t oidObjectID = 0; - TSmartPath path; - - spRowReader->GetValue(_T("id"), oidObjectID); - spRowReader->GetValue(_T("path"), path); - - m_vPaths.insert(std::make_pair(oidObjectID, TModificationTracker(path, false))); - } - - ClearModifications(); - } - - void TModPathContainer::InitColumns(const ISerializerContainerPtr& spContainer) const - { - IColumnsDefinition& rColumns = spContainer->GetColumnsDefinition(); - if (rColumns.IsEmpty()) - { - rColumns.AddColumn(_T("id"), ColumnType::value); - rColumns.AddColumn(_T("path"), IColumnsDefinition::eType_path); - } - } -} Index: src/libchcore/TModPathContainer.h =================================================================== diff -u -N --- src/libchcore/TModPathContainer.h (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TModPathContainer.h (revision 0) @@ -1,91 +0,0 @@ -// ============================================================================ -// Copyright (C) 2001-2014 by Jozef Starosczyk -// ixen@copyhandler.com -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Library General Public License -// (version 2) as published by the Free Software Foundation; -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU Library General Public -// License along with this program; if not, write to the -// Free Software Foundation, Inc., -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -// ============================================================================ -#ifndef __TMODPATHCONTAINER_H__ -#define __TMODPATHCONTAINER_H__ - -#include -#include "TModificationTracker.h" -#include "TPath.h" -#include "ISerializerContainer.h" -#include "TRemovedObjects.h" - -namespace chcore -{ - class LIBCHCORE_API TModPathContainer - { - public: - TModPathContainer(); - TModPathContainer(const TModPathContainer& rSrcContainer); - ~TModPathContainer(); - - TModPathContainer& operator=(const TModPathContainer& rSrcContainer); - TModPathContainer& operator=(const TPathContainer& rSrcContainer); - -#pragma region Index-based interface - void Add(const TSmartPath& spPath); - - const TSmartPath& GetAt(size_t stIndex) const; - TSmartPath& GetAt(size_t stIndex); - object_id_t GetOidAt(size_t stIndex) const; - - void SetAt(size_t stIndex, const TSmartPath& spPath); - - void DeleteAt(size_t stIndex); -#pragma endregion - -#pragma region Object id-based interface - const TSmartPath& GetAtOid(object_id_t oidObjectID) const; - TSmartPath& GetAtOid(object_id_t oidObjectID); - - void SetByOid(object_id_t oidObjectID, const TSmartPath& spPath); - void DeleteOid(object_id_t oidObjectID); -#pragma endregion - -#pragma region Generic interface - void Clear(bool bClearModificationsData); - - size_t GetCount() const; - bool IsEmpty() const; -#pragma endregion - -#pragma region Modifications management - bool HasModifications() const; - void ClearModifications(); -#pragma endregion - -#pragma region Serialization - void Store(const ISerializerContainerPtr& spContainer) const; - void Load(const ISerializerContainerPtr& spContainer); - - void InitColumns(const ISerializerContainerPtr& spContainer) const; - -#pragma endregion - - private: -#pragma warning(push) -#pragma warning(disable: 4251) - mutable TRemovedObjects m_setRemovedItems; - typedef boost::container::flat_map > DataMap; - DataMap m_vPaths; -#pragma warning(pop) - object_id_t m_oidNextObjectID; - }; -} - -#endif Index: src/libchcore/TObsoleteFiles.h =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TObsoleteFiles.h (.../TObsoleteFiles.h) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TObsoleteFiles.h (.../TObsoleteFiles.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -40,8 +40,11 @@ { public: TObsoleteFiles(); + TObsoleteFiles(const TObsoleteFiles&) = delete; virtual ~TObsoleteFiles(); + TObsoleteFiles& operator=(const TObsoleteFiles&) = delete; + void DeleteObsoleteFile(const TSmartPath& pathToDelete); void Store(const ISerializerContainerPtr& spContainer) const; Index: src/libchcore/TOrderedBufferQueue.cpp =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TOrderedBufferQueue.cpp (.../TOrderedBufferQueue.cpp) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TOrderedBufferQueue.cpp (.../TOrderedBufferQueue.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -105,7 +105,7 @@ return pBuffer; } - const TOverlappedDataBuffer* const TOrderedBufferQueue::Peek() const + const TOverlappedDataBuffer* TOrderedBufferQueue::Peek() const { boost::unique_lock lock(m_mutex); Index: src/libchcore/TOrderedBufferQueue.h =================================================================== diff -u -N -rd99302fce795dbb5139659016a5da7948f141fb4 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TOrderedBufferQueue.h (.../TOrderedBufferQueue.h) (revision d99302fce795dbb5139659016a5da7948f141fb4) +++ src/libchcore/TOrderedBufferQueue.h (.../TOrderedBufferQueue.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -45,7 +45,7 @@ TOverlappedDataBuffer* Pop(); TOverlappedDataBuffer* PopError(); - const TOverlappedDataBuffer* const Peek() const; + const TOverlappedDataBuffer* Peek() const; size_t GetCount() const; bool IsEmpty() const; Index: src/libchcore/TOverlappedDataBuffer.cpp =================================================================== diff -u -N -ra4635addad389b9e117679437a3e1b64a739ea96 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TOverlappedDataBuffer.cpp (.../TOverlappedDataBuffer.cpp) (revision a4635addad389b9e117679437a3e1b64a739ea96) +++ src/libchcore/TOverlappedDataBuffer.cpp (.../TOverlappedDataBuffer.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -16,10 +16,6 @@ // Free Software Foundation, Inc., // 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // ============================================================================ -/// @file TDataBuffer.cpp -/// @date 2012/03/04 -/// @brief Contains class representing buffer for data. -// ============================================================================ #include "stdafx.h" #include "TOverlappedDataBuffer.h" #include "TCoreException.h" Index: src/libchcore/TPath.cpp =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TPath.cpp (.../TPath.cpp) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TPath.cpp (.../TPath.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -44,18 +44,6 @@ } // ============================================================================ - /// TSmartPath::TSmartPath - /// @date 2009/11/29 - /// - /// @brief Constructs path object from another path object. - /// @param[in] spPath - reference to another path object. - // ============================================================================ - TSmartPath::TSmartPath(const TSmartPath& spPath) : - m_strPath(spPath.m_strPath) - { - } - - // ============================================================================ /// TSmartPath::~TSmartPath /// @date 2009/11/29 /// @@ -64,7 +52,6 @@ // ============================================================================ TSmartPath::~TSmartPath() { - Clear(); } // ============================================================================ @@ -78,7 +65,6 @@ m_strPath.Clear(); } - TSmartPath TSmartPath::AppendCopy(const TSmartPath& pathToAppend, bool bEnsurePathSeparatorExists) const { TSmartPath pathNew(*this); @@ -122,25 +108,6 @@ } // ============================================================================ - /// TSmartPath::operator= - /// @date 2009/11/29 - /// - /// @brief Assigns a path from other path object. - /// @param[in] spPath - path object from which we want to get path. - /// @return Reference to this object. - // ============================================================================ - TSmartPath& TSmartPath::operator=(const TSmartPath& spPath) - { - if (this != &spPath) - { - Clear(); - m_strPath = spPath.m_strPath; - } - - return *this; - } - - // ============================================================================ /// TSmartPath::operator== /// @date 2009/11/29 /// @@ -932,14 +899,6 @@ return spPath; } - // ============================================================================ - /// PathFromWString - /// @date 2010/10/12 - /// - /// @brief Creates a path object from string. - /// @param[in] pszPath - string containing path. - /// @return New path object. - // ============================================================================ TSmartPath PathFromWString(const TString& strPath) { TSmartPath spPath; Index: src/libchcore/TPath.h =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TPath.h (.../TPath.h) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TPath.h (.../TPath.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -34,13 +34,8 @@ public: // Construction/destruction TSmartPath(); - TSmartPath(const TSmartPath& spPath); - ~TSmartPath(); - // operators - TSmartPath& operator=(const TSmartPath& spPath); - bool operator==(const TSmartPath& rPath) const; bool operator!=(const TSmartPath& rPath) const; bool operator<(const TSmartPath& rPath) const; Index: src/libchcore/TPathContainer.cpp =================================================================== diff -u -N -ra4635addad389b9e117679437a3e1b64a739ea96 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TPathContainer.cpp (.../TPathContainer.cpp) (revision a4635addad389b9e117679437a3e1b64a739ea96) +++ src/libchcore/TPathContainer.cpp (.../TPathContainer.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -36,18 +36,6 @@ } // ============================================================================ - /// TPathContainer::TPathContainer - /// @date 2009/11/30 - /// - /// @brief Constructs the path container object from another path container. - /// @param[in] rSrcContainer - path container to copy paths from. - // ============================================================================ - TPathContainer::TPathContainer(const TPathContainer& rSrcContainer) : - m_vPaths(rSrcContainer.m_vPaths) - { - } - - // ============================================================================ /// TPathContainer::~TPathContainer /// @date 2009/11/30 /// @@ -58,22 +46,6 @@ } // ============================================================================ - /// TPathContainer::operator= - /// @date 2009/11/30 - /// - /// @brief Assigns another path container object to this one. - /// @param[in] rSrcContainer - container with paths to copy from. - /// @return Reference to this object. - // ============================================================================ - TPathContainer& TPathContainer::operator=(const TPathContainer& rSrcContainer) - { - if (this != &rSrcContainer) - m_vPaths = rSrcContainer.m_vPaths; - - return *this; - } - - // ============================================================================ /// TPathContainer::Add /// @date 2009/11/30 /// Index: src/libchcore/TPathContainer.h =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TPathContainer.h (.../TPathContainer.h) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TPathContainer.h (.../TPathContainer.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -28,11 +28,8 @@ { public: TPathContainer(); - TPathContainer(const TPathContainer& rSrcContainer); ~TPathContainer(); - TPathContainer& operator=(const TPathContainer& rSrcContainer); - void Add(const TSmartPath& spPath); void Append(const TPathContainer& vPaths); Index: src/libchcore/TPlainStringPool.h =================================================================== diff -u -N -ra4635addad389b9e117679437a3e1b64a739ea96 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TPlainStringPool.h (.../TPlainStringPool.h) (revision a4635addad389b9e117679437a3e1b64a739ea96) +++ src/libchcore/TPlainStringPool.h (.../TPlainStringPool.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -30,8 +30,11 @@ public: TPlainStringPool(); + TPlainStringPool(const TPlainStringPool&) = delete; ~TPlainStringPool(); + TPlainStringPool& operator=(const TPlainStringPool&) = delete; + wchar_t* Alloc(size_t stCount); wchar_t* AllocForString(const wchar_t* pszString); Index: src/libchcore/TSQLiteDatabase.h =================================================================== diff -u -N -ra4635addad389b9e117679437a3e1b64a739ea96 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TSQLiteDatabase.h (.../TSQLiteDatabase.h) (revision a4635addad389b9e117679437a3e1b64a739ea96) +++ src/libchcore/TSQLiteDatabase.h (.../TSQLiteDatabase.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -31,8 +31,11 @@ { public: explicit TSQLiteDatabase(const TSmartPath& strFilename); + TSQLiteDatabase(const TSQLiteDatabase&) = delete; ~TSQLiteDatabase(); + TSQLiteDatabase& operator=(const TSQLiteDatabase&) = delete; + HANDLE GetHandle(); TSmartPath GetLocation() const; Index: src/libchcore/TSQLiteException.cpp =================================================================== diff -u -N -ra4635addad389b9e117679437a3e1b64a739ea96 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TSQLiteException.cpp (.../TSQLiteException.cpp) (revision a4635addad389b9e117679437a3e1b64a739ea96) +++ src/libchcore/TSQLiteException.cpp (.../TSQLiteException.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -29,12 +29,6 @@ { } - TSQLiteException::TSQLiteException(EGeneralErrors eErrorCode, int iSQLiteError, const char* pszMsg, const wchar_t* pszFile, size_t stLineNumber, const wchar_t* pszFunction) : - TBaseException(eErrorCode, pszMsg, pszFile, stLineNumber, pszFunction), - m_iSQLiteError(iSQLiteError) - { - } - int TSQLiteException::GetSQLiteError() const { return m_iSQLiteError; Index: src/libchcore/TSQLiteException.h =================================================================== diff -u -N -ra4635addad389b9e117679437a3e1b64a739ea96 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TSQLiteException.h (.../TSQLiteException.h) (revision a4635addad389b9e117679437a3e1b64a739ea96) +++ src/libchcore/TSQLiteException.h (.../TSQLiteException.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -29,7 +29,6 @@ { public: TSQLiteException(EGeneralErrors eErrorCode, int iSQLiteError, const wchar_t* pszMsg, const wchar_t* pszFile, size_t stLineNumber, const wchar_t* pszFunction); - TSQLiteException(EGeneralErrors eErrorCode, int iSQLiteError, const char* pszMsg, const wchar_t* pszFile, size_t stLineNumber, const wchar_t* pszFunction); int GetSQLiteError() const; Index: src/libchcore/TSQLiteSerializerContainer.h =================================================================== diff -u -N -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TSQLiteSerializerContainer.h (.../TSQLiteSerializerContainer.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) +++ src/libchcore/TSQLiteSerializerContainer.h (.../TSQLiteSerializerContainer.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -32,14 +32,13 @@ { class LIBCHCORE_API TSQLiteSerializerContainer : public ISerializerContainer { - private: - TSQLiteSerializerContainer(const TSQLiteSerializerContainer&); - TSQLiteSerializerContainer& operator=(const TSQLiteSerializerContainer&); - public: TSQLiteSerializerContainer(const TString& strName, const sqlite::TSQLiteDatabasePtr& spDB, TPlainStringPool& poolStrings); + TSQLiteSerializerContainer(const TSQLiteSerializerContainer&) = delete; virtual ~TSQLiteSerializerContainer(); + TSQLiteSerializerContainer& operator=(const TSQLiteSerializerContainer&) = delete; + IColumnsDefinition& GetColumnsDefinition() override; ISerializerRowData& GetRow(object_id_t oidRowID, bool bMarkAsAdded) override; Index: src/libchcore/TSQLiteSerializerRowReader.h =================================================================== diff -u -N -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TSQLiteSerializerRowReader.h (.../TSQLiteSerializerRowReader.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) +++ src/libchcore/TSQLiteSerializerRowReader.h (.../TSQLiteSerializerRowReader.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -27,14 +27,13 @@ { class LIBCHCORE_API TSQLiteSerializerRowReader : public ISerializerRowReader { - private: - TSQLiteSerializerRowReader(const TSQLiteSerializerRowReader&); - TSQLiteSerializerRowReader& operator=(const TSQLiteSerializerRowReader&); - public: TSQLiteSerializerRowReader(const sqlite::TSQLiteDatabasePtr& spDatabase, TSQLiteColumnsDefinition& rColumns, const TString& strContainerName); + TSQLiteSerializerRowReader(const TSQLiteSerializerRowReader&) = delete; virtual ~TSQLiteSerializerRowReader(); + TSQLiteSerializerRowReader& operator=(const TSQLiteSerializerRowReader&) = delete; + bool Next() override; void GetValue(const TString& strColName, bool& bValue) override; Index: src/libchcore/TSQLiteStatement.h =================================================================== diff -u -N -ra4635addad389b9e117679437a3e1b64a739ea96 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TSQLiteStatement.h (.../TSQLiteStatement.h) (revision a4635addad389b9e117679437a3e1b64a739ea96) +++ src/libchcore/TSQLiteStatement.h (.../TSQLiteStatement.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -41,11 +41,14 @@ public: explicit TSQLiteStatement(const TSQLiteDatabasePtr& spDatabase); + TSQLiteStatement(const TSQLiteStatement&) = delete; ~TSQLiteStatement(); + TSQLiteStatement& operator=(const TSQLiteStatement&) = delete; + void Close(); - void Prepare(PCTSTR pszQuery); + void Prepare(PCWSTR pszQuery); void BindValue(int iColumn, bool bValue); void BindValue(int iColumn, short siValue); Index: src/libchcore/TSQLiteTransaction.h =================================================================== diff -u -N -ra4635addad389b9e117679437a3e1b64a739ea96 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TSQLiteTransaction.h (.../TSQLiteTransaction.h) (revision a4635addad389b9e117679437a3e1b64a739ea96) +++ src/libchcore/TSQLiteTransaction.h (.../TSQLiteTransaction.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -29,8 +29,11 @@ { public: explicit TSQLiteTransaction(const TSQLiteDatabasePtr& spDatabase); + TSQLiteTransaction(const TSQLiteTransaction&) = delete; ~TSQLiteTransaction(); + TSQLiteTransaction& operator=(const TSQLiteTransaction&) = delete; + void Begin(); void Rollback(); void Commit(); Index: src/libchcore/TScopedRunningTimeTracker.h =================================================================== diff -u -N -ra4635addad389b9e117679437a3e1b64a739ea96 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TScopedRunningTimeTracker.h (.../TScopedRunningTimeTracker.h) (revision a4635addad389b9e117679437a3e1b64a739ea96) +++ src/libchcore/TScopedRunningTimeTracker.h (.../TScopedRunningTimeTracker.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -27,19 +27,18 @@ { public: explicit TScopedRunningTimeTracker(IRunningTimeControl& rStats); + TScopedRunningTimeTracker(const TScopedRunningTimeTracker& rLocalStats) = delete; ~TScopedRunningTimeTracker(); + TScopedRunningTimeTracker& operator=(const TScopedRunningTimeTracker& rLocalStats) = delete; + void PauseTimeTracking(); void UnPauseTimeTracking(); void PauseRunningState(); void UnPauseRunningState(); private: - TScopedRunningTimeTracker(const TScopedRunningTimeTracker& rLocalStats) = delete; - TScopedRunningTimeTracker& operator=(const TScopedRunningTimeTracker& rLocalStats) = delete; - - private: IRunningTimeControl& m_rLocalStats; bool m_bTimeTrackingPaused; bool m_bRunningStatePaused; Index: src/libchcore/TSerializerException.cpp =================================================================== diff -u -N -ra4635addad389b9e117679437a3e1b64a739ea96 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TSerializerException.cpp (.../TSerializerException.cpp) (revision a4635addad389b9e117679437a3e1b64a739ea96) +++ src/libchcore/TSerializerException.cpp (.../TSerializerException.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -25,9 +25,4 @@ TBaseException(eErrorCode, pszMsg, pszFile, stLineNumber, pszFunction) { } - - TSerializerException::TSerializerException(EGeneralErrors eErrorCode, const char* pszMsg, const wchar_t* pszFile, size_t stLineNumber, const wchar_t* pszFunction) : - TBaseException(eErrorCode, pszMsg, pszFile, stLineNumber, pszFunction) - { - } } Index: src/libchcore/TSerializerException.h =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TSerializerException.h (.../TSerializerException.h) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TSerializerException.h (.../TSerializerException.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -27,7 +27,6 @@ { public: TSerializerException(EGeneralErrors eErrorCode, const wchar_t* pszMsg, const wchar_t* pszFile, size_t stLineNumber, const wchar_t* pszFunction); - TSerializerException(EGeneralErrors eErrorCode, const char* pszMsg, const wchar_t* pszFile, size_t stLineNumber, const wchar_t* pszFunction); }; } Index: src/libchcore/TSerializerVersion.cpp =================================================================== diff -u -N -ra4635addad389b9e117679437a3e1b64a739ea96 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TSerializerVersion.cpp (.../TSerializerVersion.cpp) (revision a4635addad389b9e117679437a3e1b64a739ea96) +++ src/libchcore/TSerializerVersion.cpp (.../TSerializerVersion.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -23,7 +23,7 @@ #include "TSerializerException.h" #include "TSQLiteStatement.h" #include "TSQLiteException.h" -#include "sqlite3\sqlite3.h" +#include namespace chcore { Index: src/libchcore/TSharedMemory.h =================================================================== diff -u -N -ra4635addad389b9e117679437a3e1b64a739ea96 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TSharedMemory.h (.../TSharedMemory.h) (revision a4635addad389b9e117679437a3e1b64a739ea96) +++ src/libchcore/TSharedMemory.h (.../TSharedMemory.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -35,8 +35,11 @@ public: TSharedMemory(); + TSharedMemory(const TSharedMemory&) = delete; ~TSharedMemory(); + TSharedMemory& operator=(const TSharedMemory&) = delete; + void Create(const wchar_t* pszName, shm_size_t stSize); void Create(const wchar_t* pszName, const TString& wstrData); void Create(const wchar_t* pszName, const BYTE* pbyData, shm_size_t stSize); Index: src/libchcore/TSimpleOrderedBufferQueue.h =================================================================== diff -u -N -rd99302fce795dbb5139659016a5da7948f141fb4 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TSimpleOrderedBufferQueue.h (.../TSimpleOrderedBufferQueue.h) (revision d99302fce795dbb5139659016a5da7948f141fb4) +++ src/libchcore/TSimpleOrderedBufferQueue.h (.../TSimpleOrderedBufferQueue.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -55,7 +55,7 @@ return pBuffer; } - const TOverlappedDataBuffer* const Peek() const + const TOverlappedDataBuffer* Peek() const { if(empty()) return nullptr; Index: src/libchcore/TSimpleTimer.h =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TSimpleTimer.h (.../TSimpleTimer.h) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TSimpleTimer.h (.../TSimpleTimer.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -26,9 +26,12 @@ class LIBCHCORE_API TSimpleTimer { public: - TSimpleTimer(bool bAutostart = false, const ITimestampProviderPtr& spTimestampProvider = ITimestampProviderPtr()); + explicit TSimpleTimer(bool bAutostart = false, const ITimestampProviderPtr& spTimestampProvider = ITimestampProviderPtr()); + TSimpleTimer(const TSimpleTimer&) = delete; ~TSimpleTimer(); + TSimpleTimer& operator=(const TSimpleTimer&) = delete; + void Init(unsigned long long ullTotalTime); void Start(); Index: src/libchcore/TSizeFormatter.h =================================================================== diff -u -N -r3c248d4f6d0fdb1e487cc868b2f0b219eec37ef4 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TSizeFormatter.h (.../TSizeFormatter.h) (revision 3c248d4f6d0fdb1e487cc868b2f0b219eec37ef4) +++ src/libchcore/TSizeFormatter.h (.../TSizeFormatter.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -30,8 +30,11 @@ { public: TSizeFormatter(); + TSizeFormatter(const TSizeFormatter&) = delete; TSizeFormatter(const wchar_t* strBytes, const wchar_t* strKBytes, const wchar_t* strMBytes, const wchar_t* strGBytes, const wchar_t* strTBytes); + TSizeFormatter& operator=(const TSizeFormatter&) = delete; + void SetValues(const wchar_t* strBytes, const wchar_t* strKBytes, const wchar_t* strMBytes, const wchar_t* strGBytes, const wchar_t* strTBytes); std::wstring GetSizeString(unsigned long long ullData, bool bStrict = false) const; Index: src/libchcore/TSparseRangeMap.cpp =================================================================== diff -u -N --- src/libchcore/TSparseRangeMap.cpp (revision a4635addad389b9e117679437a3e1b64a739ea96) +++ src/libchcore/TSparseRangeMap.cpp (revision 0) @@ -1,113 +0,0 @@ -// ============================================================================ -// Copyright (C) 2001-2015 by Jozef Starosczyk -// ixen@copyhandler.com -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Library General Public License -// (version 2) as published by the Free Software Foundation; -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU Library General Public -// License along with this program; if not, write to the -// Free Software Foundation, Inc., -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -// ============================================================================ -#include "stdafx.h" -#include "TSparseRangeMap.h" -#include "TCoreException.h" -#include "ErrorCodes.h" - -namespace chcore -{ - TSparseRangeMap::TSparseRangeMap() - { - } - - TSparseRangeMap::~TSparseRangeMap() - { - } - - void TSparseRangeMap::Insert(file_size_t fsRangeStart, file_size_t fsRangeEnd) - { - if (fsRangeEnd < fsRangeStart) - std::swap(fsRangeStart, fsRangeEnd); - - std::pair pairInsert = m_mapRanges.emplace(std::make_pair(fsRangeStart, fsRangeEnd)); - RangeMap::iterator iterInsertedRange = pairInsert.first; - if (!pairInsert.second) - { - // range with fsRangeStart already exists; update it with the increased range (if bigger than the existing one) - if (fsRangeEnd > iterInsertedRange->second) - iterInsertedRange->second = fsRangeEnd; - else - return; // new range overlaps with old one and is smaller; does not change the state of internal map and no reorganization is needed - } - else - { - // element inserted successfully; since it can overlap the previous range in the map, we need to start merging ranges from this previous element - if (iterInsertedRange != m_mapRanges.begin()) - iterInsertedRange = std::prev(iterInsertedRange); - else if (m_mapRanges.size() == 1) - return; // this is the only element currently in the map; no need to process further. - } - - // merge subsequent ranges - file_size_t fsCurrentRangeEnd = iterInsertedRange->second; - - RangeMap::iterator iterRange = std::next(iterInsertedRange); - - while (iterRange != m_mapRanges.end()) - { - if (iterRange->first <= fsCurrentRangeEnd + 1) - { - // next range overlaps with the inserted one - merge them - if (iterRange->second > iterInsertedRange->second) - iterInsertedRange->second = iterRange->second; - iterRange = m_mapRanges.erase(iterRange); - } - else - break; - } - } - - size_t TSparseRangeMap::GetRangeCount() const - { - return m_mapRanges.size(); - } - - void TSparseRangeMap::GetRangeAt(size_t stIndex, file_size_t& rfsRangeStart, file_size_t& rfsRangeEnd) const - { - if (stIndex >= m_mapRanges.size()) - throw TCoreException(eErr_BoundsExceeded, L"stIndex", LOCATION); - - RangeMap::const_iterator iterMap = m_mapRanges.begin(); - std::advance(iterMap, stIndex); - - rfsRangeStart = iterMap->first; - rfsRangeEnd = iterMap->second; - } - - bool TSparseRangeMap::OverlapsRange(file_size_t fsRangeStart, file_size_t fsRangeEnd) const - { - if (fsRangeEnd < fsRangeStart) - std::swap(fsRangeStart, fsRangeEnd); - - RangeMap::const_iterator iterStart = m_mapRanges.lower_bound(fsRangeStart); - if (iterStart != m_mapRanges.begin()) - iterStart = std::prev(iterStart); - - RangeMap::const_iterator iterEnd = m_mapRanges.upper_bound(fsRangeEnd); - while (iterStart != iterEnd) - { - if (fsRangeStart <= iterStart->second && iterStart->first <= fsRangeEnd) - return true; - ++iterStart; - } - - return false; - } -} Index: src/libchcore/TSparseRangeMap.h =================================================================== diff -u -N --- src/libchcore/TSparseRangeMap.h (revision a4635addad389b9e117679437a3e1b64a739ea96) +++ src/libchcore/TSparseRangeMap.h (revision 0) @@ -1,51 +0,0 @@ -// ============================================================================ -// Copyright (C) 2001-2015 by Jozef Starosczyk -// ixen@copyhandler.com -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Library General Public License -// (version 2) as published by the Free Software Foundation; -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU Library General Public -// License along with this program; if not, write to the -// Free Software Foundation, Inc., -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -// ============================================================================ -#ifndef __TSparseRangeMap_H__ -#define __TSparseRangeMap_H__ - -#include "libchcore.h" -#include "CommonDataTypes.h" - -namespace chcore -{ - class LIBCHCORE_API TSparseRangeMap - { - public: - TSparseRangeMap(); - ~TSparseRangeMap(); - - void Insert(file_size_t fsRangeStart, file_size_t fsRangeEnd); - - size_t GetRangeCount() const; - void GetRangeAt(size_t stIndex, file_size_t& rfsRangeStart, file_size_t& rfsRangeEnd) const; - - bool OverlapsRange(file_size_t fsRangeStart, file_size_t fsRangeEnd) const; - - private: - using RangePair = std::pair; - using RangeMap = std::map; - -#pragma warning(push) -#pragma warning(disable: 4251) - RangeMap m_mapRanges; -#pragma warning(pop) - }; -} - -#endif Index: src/libchcore/TSpeedTracker.h =================================================================== diff -u -N -ra4635addad389b9e117679437a3e1b64a739ea96 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TSpeedTracker.h (.../TSpeedTracker.h) (revision a4635addad389b9e117679437a3e1b64a739ea96) +++ src/libchcore/TSpeedTracker.h (.../TSpeedTracker.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -9,7 +9,10 @@ { public: TSpeedTracker(unsigned long long ullTrackTime, unsigned long long ullSampleTime); + TSpeedTracker(const TSpeedTracker&) = delete; + TSpeedTracker& operator=(const TSpeedTracker&) = delete; + void AddSample(unsigned long long ullValue, unsigned long long ullTimestamp); void Clear(); @@ -20,9 +23,6 @@ void FromString(const TString& strData); private: - TSpeedTracker(const TSpeedTracker&); - TSpeedTracker& operator=(const TSpeedTracker&); - static double NormalizeValueByTime(unsigned long long ullValue, unsigned long long ullTime, unsigned long long ullNormalizeTime = 1000); size_t GetNextSampleIndexAndIncrease(); Index: src/libchcore/TString.cpp =================================================================== diff -u -N -ra4635addad389b9e117679437a3e1b64a739ea96 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TString.cpp (.../TString.cpp) (revision a4635addad389b9e117679437a3e1b64a739ea96) +++ src/libchcore/TString.cpp (.../TString.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -102,6 +102,14 @@ SetString(rSrc.m_pszData); } + TString::TString(TString&& str) : + m_pszData(str.m_pszData), + m_stBufferSize(str.m_stBufferSize) + { + str.m_pszData = nullptr; + str.m_stBufferSize = 0; + } + /** Destructor releases the underlying data object. */ TString::~TString() @@ -111,12 +119,6 @@ m_stBufferSize = 0; } - /** Operator releases the current data object, stores a pointer to - * the data object from the given TString object and increases a reference - * count. - * \param[in] src - source TString object - * \return A reference to the current TString. - */ TString& TString::operator=(const TString& rSrc) { if (this != &rSrc) @@ -138,6 +140,14 @@ return *this; } + TString& TString::operator=(TString&& src) + { + std::swap(m_pszData, src.m_pszData); + std::swap(m_stBufferSize, src.m_stBufferSize); + + return *this; + } + /** Operator concatenates a given TString object with the current content of * this TString and returns a new TString object. * \param[in] src - TString object that will be appended @@ -228,9 +238,6 @@ wcsncpy_s(m_pszData + stThisLen, m_stBufferSize - stThisLen, pszSrc, stAddLen + 1); } - /** Function merges the given TString object with the current content of an internal buffer. - * \param[in] src - TString object to append - */ void TString::Append(const TString& rSrc) { if (rSrc.IsEmpty()) @@ -306,13 +313,6 @@ return Mid(tStart, stAfterEndPos - tStart); } - /** Makes this TString it's Left part. Much faster than using standard - * Left() function. - * \param[in] tLen - count of characters at the beginning of the TString to be Left in a TString. - * \param[in] bReallocBuffer - if the internal TString buffer is to be reallocated if exceeds - * the allowable range size (CHUNK_INCSIZE, CHUNK_DECSIZE). - * \see Left() - */ void TString::LeftSelf(size_t tLen) { size_t stThisLen = GetLength(); @@ -325,13 +325,6 @@ m_pszData[tLen] = _T('\0'); } - /** Makes this TString it's Right part. Much faster than using standard - * Right() function. - * \param[in] tLen - count of characters at the end of the TString to be Left in a TString. - * \param[in] bReallocBuffer - if the internal TString buffer is to be reallocated if exceeds - * the allowable range size (CHUNK_INCSIZE, CHUNK_DECSIZE). - * \see Right() - */ void TString::RightSelf(size_t tLen) { size_t stThisLen = GetLength(); @@ -344,14 +337,6 @@ wmemmove(m_pszData, m_pszData + stThisLen - tLen, tLen + 1); } - /** Makes this TString it's middle part. Much faster than using standard - * Mid() function. - * \param[in] tStart - starting position of a text to be Left in a TString - * \param[in] tLen - count of characters at the middle of the TString to be Left in a TString. - * \param[in] bReallocBuffer - if the internal TString buffer is to be reallocated if exceeds - * the allowable range size (CHUNK_INCSIZE, CHUNK_DECSIZE). - * \see Mid() - */ void TString::MidSelf(size_t tStart, size_t tLen) { size_t stThisLen = GetLength(); Index: src/libchcore/TString.h =================================================================== diff -u -N -ra4635addad389b9e117679437a3e1b64a739ea96 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TString.h (.../TString.h) (revision a4635addad389b9e117679437a3e1b64a739ea96) +++ src/libchcore/TString.h (.../TString.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -41,59 +41,44 @@ class LIBCHCORE_API TString { public: - /** \name Construction/destruction */ - /*@{*/ - TString(); ///< Standard constructor + TString(); // cppcheck-suppress noExplicitConstructor - TString(const wchar_t* pszStr); ///< Constructor that takes const wchar_t* as an initial TString + TString(const wchar_t* pszStr); TString(const wchar_t* pszStart, const wchar_t* pszEnd, size_t stMaxStringSize = DefaultMaxStringSize); TString(const wchar_t* pszStart, size_t stCount); - TString(const TString& str); ///< Standard copy constructor - ~TString(); ///< Standard destructor - /*@}*/ + TString(const TString& str); + TString(TString&& str); - /** \name Operators */ - /**@{*/ + ~TString(); + // assignment - TString& operator=(const TString& src); ///< Assign operator for TString objects - TString operator+(const TString& src) const; ///< Concatenate operator for TString objects - const TString& operator+=(const TString& src); ///< Merge operator for TString objects + TString& operator=(const TString& src); + TString& operator=(TString&& src); - const TString& operator=(const wchar_t* pszSrc); ///< Assign operator from unicode strings - TString operator+(const wchar_t* pszSrc) const; ///< Concatenate operator for unicode strings - const TString& operator+=(const wchar_t* pszSrc); ///< Merge operator for unicode strings + const TString& operator=(const wchar_t* pszSrc); - /// Makes case sensitive comparison to the unicode TString ( see Compare(const wchar_t* psz) ) + TString operator+(const TString& src) const; + const TString& operator+=(const TString& src); + + TString operator+(const wchar_t* pszSrc) const; + const TString& operator+=(const wchar_t* pszSrc); + bool operator<(const wchar_t* psz) const { return Compare(psz) < 0; }; - /// Makes case sensitive comparison to the unicode TString ( see Compare(const wchar_t* psz) ) bool operator<=(const wchar_t* psz) const { return Compare(psz) <= 0; }; - /// Makes case sensitive comparison to the unicode TString ( see Compare(const wchar_t* psz) ) bool operator==(const wchar_t* psz) const { return Compare(psz) == 0; }; - /// Makes case sensitive comparison to the unicode TString ( see Compare(const wchar_t* psz) ) bool operator>=(const wchar_t* psz) const { return Compare(psz) >= 0; }; - /// Makes case sensitive comparison to the unicode TString ( see Compare(const wchar_t* psz) ) bool operator>(const wchar_t* psz) const { return Compare(psz) > 0; }; - /// Makes case sensitive comparison to the unicode TString ( see Compare(const wchar_t* psz) ) bool operator!=(const wchar_t* psz) const { return Compare(psz) != 0; }; - /// Makes case sensitive comparison to the TString object ( see Compare(const TString& str) ) bool operator<(const TString& str) const { return Compare(str) < 0; }; - /// Makes case sensitive comparison to the TString object ( see Compare(const TString& str) ) bool operator<=(const TString& str) const { return Compare(str) <= 0; }; - /// Makes case sensitive comparison to the TString object ( see Compare(const TString& str) ) bool operator==(const TString& str) const { return Compare(str) == 0; }; - /// Makes case sensitive comparison to the TString object ( see Compare(const TString& str) ) bool operator>=(const TString& str) const { return Compare(str) >= 0; }; - /// Makes case sensitive comparison to the TString object ( see Compare(const TString& str) ) bool operator>(const TString& str) const { return Compare(str) >= 0; }; - /// Makes case sensitive comparison to the TString object ( see Compare(const TString& str) ) bool operator!=(const TString& str) const { return Compare(str) != 0; }; - /**@}*/ - /** \name Standard operations */ - /**@{*/ - // appends the given TString to this + // appends the given TString to this void Append(const wchar_t* pszSrc); ///< Appends an unicode TString to the TString object void Append(const TString& src); ///< Appends a TString object to another TString object @@ -145,7 +130,6 @@ void Clear(); ///< Clear the contents of the TString object bool IsEmpty() const; ///< Returns true if the TString is empty - /**@}*/ protected: void SetString(const wchar_t* pszStart, size_t stCount); Index: src/libchcore/TStringArray.cpp =================================================================== diff -u -N -ra4635addad389b9e117679437a3e1b64a739ea96 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TStringArray.cpp (.../TStringArray.cpp) (revision a4635addad389b9e117679437a3e1b64a739ea96) +++ src/libchcore/TStringArray.cpp (.../TStringArray.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -127,14 +127,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////// // class TStringArray - TStringArray::TStringArray() - { - } - - TStringArray::~TStringArray() - { - } - void TStringArray::Add(const TString& str) { m_vItems.push_back(str); Index: src/libchcore/TStringArray.h =================================================================== diff -u -N -ra4635addad389b9e117679437a3e1b64a739ea96 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TStringArray.h (.../TStringArray.h) (revision a4635addad389b9e117679437a3e1b64a739ea96) +++ src/libchcore/TStringArray.h (.../TStringArray.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -90,9 +90,6 @@ typedef TStringArrayConstIterator const_iterator; public: - TStringArray(); - ~TStringArray(); - bool operator==(const TStringArray& rSrc) const; bool operator!=(const TStringArray& rSrc) const; Index: src/libchcore/TStringException.cpp =================================================================== diff -u -N -ra4635addad389b9e117679437a3e1b64a739ea96 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TStringException.cpp (.../TStringException.cpp) (revision a4635addad389b9e117679437a3e1b64a739ea96) +++ src/libchcore/TStringException.cpp (.../TStringException.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -7,9 +7,4 @@ TBaseException(eErrorCode, pszMsg, pszFile, stLineNumber, pszFunction) { } - - TStringException::TStringException(EGeneralErrors eErrorCode, const char* pszMsg, const wchar_t* pszFile, size_t stLineNumber, const wchar_t* pszFunction) : - TBaseException(eErrorCode, pszMsg, pszFile, stLineNumber, pszFunction) - { - } } Index: src/libchcore/TStringException.h =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TStringException.h (.../TStringException.h) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TStringException.h (.../TStringException.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -28,8 +28,6 @@ { 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); - TStringException() = delete; }; } Index: src/libchcore/TStringPattern.h =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TStringPattern.h (.../TStringPattern.h) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TStringPattern.h (.../TStringPattern.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -33,7 +33,7 @@ public: explicit TStringPattern(EPatternType ePatternType = EPatternType::eType_Wildcard); - TStringPattern(const TString& strPattern, EPatternType ePatternType = EPatternType::eType_Wildcard); + explicit TStringPattern(const TString& strPattern, EPatternType ePatternType = EPatternType::eType_Wildcard); void SetPattern(const TString& strPattern, EPatternType ePatternType = EPatternType::eType_Wildcard); bool Matches(const TString& strTextToMatch) const; Index: src/libchcore/TStringPatternArray.cpp =================================================================== diff -u -N -ra4635addad389b9e117679437a3e1b64a739ea96 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TStringPatternArray.cpp (.../TStringPatternArray.cpp) (revision a4635addad389b9e117679437a3e1b64a739ea96) +++ src/libchcore/TStringPatternArray.cpp (.../TStringPatternArray.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -24,14 +24,6 @@ namespace chcore { - TStringPatternArray::TStringPatternArray() - { - } - - TStringPatternArray::~TStringPatternArray() - { - } - void TStringPatternArray::Add(const TStringPattern& strPattern) { m_vPatterns.push_back(strPattern); Index: src/libchcore/TStringPatternArray.h =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TStringPatternArray.h (.../TStringPatternArray.h) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TStringPatternArray.h (.../TStringPatternArray.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -26,9 +26,6 @@ class LIBCHCORE_API TStringPatternArray { public: - TStringPatternArray(); - ~TStringPatternArray(); - // general api void Add(const TStringPattern& strPattern); void InsertAt(size_t stIndex, const TStringPattern& strPattern); Index: src/libchcore/TStringSet.cpp =================================================================== diff -u -N -ra4635addad389b9e117679437a3e1b64a739ea96 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TStringSet.cpp (.../TStringSet.cpp) (revision a4635addad389b9e117679437a3e1b64a739ea96) +++ src/libchcore/TStringSet.cpp (.../TStringSet.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -119,15 +119,6 @@ /////////////////////////////////////////////////////////////////////////////////////////// // class TStringSet - - TStringSet::TStringSet() - { - } - - TStringSet::~TStringSet() - { - } - void TStringSet::Insert(const TString& str) { m_setItems.insert(str); Index: src/libchcore/TStringSet.h =================================================================== diff -u -N -ra4635addad389b9e117679437a3e1b64a739ea96 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TStringSet.h (.../TStringSet.h) (revision a4635addad389b9e117679437a3e1b64a739ea96) +++ src/libchcore/TStringSet.h (.../TStringSet.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -87,9 +87,6 @@ typedef TStringSetConstIterator const_iterator; public: - TStringSet(); - ~TStringSet(); - void Insert(const TString& str); void Insert(const TStringSet& setStrings); void Remove(const TString& str); Index: src/libchcore/TSubTaskArray.h =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TSubTaskArray.h (.../TSubTaskArray.h) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TSubTaskArray.h (.../TSubTaskArray.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -43,8 +43,11 @@ public: explicit TSubTasksArray(TSubTaskContext& rSubTaskContext); TSubTasksArray(const TOperationPlan& rOperationPlan, TSubTaskContext& rSubTaskContext); + TSubTasksArray(const TSubTasksArray& rSrc) = delete; ~TSubTasksArray(); + TSubTasksArray& operator=(const TSubTasksArray& rSrc) = delete; + void Init(const TOperationPlan& rOperationPlan); EOperationType GetOperationType() const; @@ -63,9 +66,6 @@ bool AreAllBasePathsProcessed() const; private: - TSubTasksArray(const TSubTasksArray& rSrc); - TSubTasksArray& operator=(const TSubTasksArray& rSrc); - void AddSubTask(const TSubTaskBasePtr& spOperation, bool bIsPartOfEstimation); static TSubTaskBasePtr CreateSubtask(ESubOperationType eType, TSubTaskContext& rContext); Index: src/libchcore/TSubTaskArrayStatsSnapshot.cpp =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TSubTaskArrayStatsSnapshot.cpp (.../TSubTaskArrayStatsSnapshot.cpp) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TSubTaskArrayStatsSnapshot.cpp (.../TSubTaskArrayStatsSnapshot.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -18,7 +18,7 @@ // ============================================================================ #include "stdafx.h" #include "TSubTaskArrayStatsSnapshot.h" -#include +#include namespace chcore { Index: src/libchcore/TSubTaskBase.h =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TSubTaskBase.h (.../TSubTaskBase.h) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TSubTaskBase.h (.../TSubTaskBase.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -53,8 +53,11 @@ public: explicit TSubTaskBase(TSubTaskContext& rContext); + TSubTaskBase(const TSubTaskBase&) = delete; virtual ~TSubTaskBase(); + TSubTaskBase& operator=(const TSubTaskBase&) = delete; + virtual void Reset() = 0; virtual void InitBeforeExec() = 0; @@ -74,10 +77,6 @@ const TSubTaskContext& GetContext() const { return m_rContext; } private: - TSubTaskBase(const TSubTaskBase&); - TSubTaskBase& operator=(const TSubTaskBase&); - - private: TSubTaskContext& m_rContext; }; Index: src/libchcore/TSubTaskContext.h =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TSubTaskContext.h (.../TSubTaskContext.h) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TSubTaskContext.h (.../TSubTaskContext.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -28,7 +28,7 @@ #include "TBasePathData.h" #include "TFileInfoArray.h" #include "IFilesystem.h" -#include "..\liblogger\TLogFileData.h" +#include "../liblogger/TLogFileData.h" namespace chcore { @@ -47,8 +47,11 @@ const TFileFiltersArray& rFilters, TTaskConfigTracker& rCfgTracker, const logger::TLogFileDataPtr& spLogFileData, TWorkerThreadController& rThreadController, const IFilesystemPtr& spFilesystem); + TSubTaskContext(const TSubTaskContext& rSrc) = delete; ~TSubTaskContext(); + TSubTaskContext& operator=(const TSubTaskContext& rSrc) = delete; + TConfig& GetConfig(); const TConfig& GetConfig() const; @@ -75,10 +78,6 @@ IFilesystemPtr GetLocalFilesystem() const; private: - TSubTaskContext(const TSubTaskContext& rSrc); - TSubTaskContext& operator=(const TSubTaskContext& rSrc); - - private: TConfig& m_rConfig; EOperationType m_eOperationType; Index: src/libchcore/TSubTaskDelete.cpp =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TSubTaskDelete.cpp (.../TSubTaskDelete.cpp) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TSubTaskDelete.cpp (.../TSubTaskDelete.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -26,7 +26,7 @@ #include "TWorkerThreadController.h" #include "TTaskConfiguration.h" #include "IFeedbackHandler.h" -#include +#include #include "TFileInfoArray.h" #include "TFileInfo.h" #include "TTaskLocalStats.h" Index: src/libchcore/TSubTaskFastMove.cpp =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TSubTaskFastMove.cpp (.../TSubTaskFastMove.cpp) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TSubTaskFastMove.cpp (.../TSubTaskFastMove.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -29,7 +29,7 @@ #include "TWorkerThreadController.h" #include "TTaskLocalStats.h" #include "TFileInfo.h" -#include +#include #include "TPathContainer.h" #include "TScopedRunningTimeTracker.h" #include "TFeedbackHandlerWrapper.h" Index: src/libchcore/TSubTaskStatsInfo.cpp =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TSubTaskStatsInfo.cpp (.../TSubTaskStatsInfo.cpp) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TSubTaskStatsInfo.cpp (.../TSubTaskStatsInfo.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -22,7 +22,7 @@ // ============================================================================ #include "stdafx.h" #include "TSubTaskStatsInfo.h" -#include +#include #include "TSubTaskStatsSnapshot.h" #include "TCoreException.h" #include "ErrorCodes.h" Index: src/libchcore/TSubTaskStatsInfo.h =================================================================== diff -u -N -rc085b65f1de24f25feab2bac2d5882abf04aabcf -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TSubTaskStatsInfo.h (.../TSubTaskStatsInfo.h) (revision c085b65f1de24f25feab2bac2d5882abf04aabcf) +++ src/libchcore/TSubTaskStatsInfo.h (.../TSubTaskStatsInfo.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -54,7 +54,10 @@ public: explicit TSubTaskStatsInfo(ESubOperationType eSubTaskType); + TSubTaskStatsInfo(const TSubTaskStatsInfo&) = delete; + TSubTaskStatsInfo& operator=(const TSubTaskStatsInfo&) = delete; + void Init(int iCurrentBufferIndex, file_count_t fcTotalCount, file_count_t fcProcessedCount, unsigned long long ullTotalSize, unsigned long long ullProcessedSize, const TString& strCurrentPath); void Clear(); bool WasAdded() const; @@ -110,9 +113,6 @@ void Load(const ISerializerRowReaderPtr& spRowReader); private: - TSubTaskStatsInfo(const TSubTaskStatsInfo&) = delete; - TSubTaskStatsInfo& operator=(const TSubTaskStatsInfo&) = delete; - // is running? void MarkAsRunning() override; void MarkAsNotRunning() override; Index: src/libchcore/TTask.h =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TTask.h (.../TTask.h) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TTask.h (.../TTask.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -33,7 +33,7 @@ #include "TTaskBaseData.h" #include #include "IFilesystem.h" -#include "..\liblogger\TLogger.h" +#include "../liblogger/TLogger.h" namespace chcore { @@ -47,9 +47,12 @@ class LIBCHCORE_API TTask { private: + TTask(const TTask&) = delete; TTask(const ISerializerPtr& spSerializer, const IFeedbackHandlerPtr& spFeedbackHandler, const TTaskBaseData& rBaseTaskData, const logger::TMultiLoggerConfigPtr& spLoggerConfig); TTask(const ISerializerPtr& spSerializer, const IFeedbackHandlerPtr& spFeedbackHandler, const TTaskDefinition& rTaskDefinition, const TSmartPath& rLogPath, const logger::TMultiLoggerConfigPtr& spLoggerConfig); + TTask& operator=(const TTask&) = delete; + public: ~TTask(); Index: src/libchcore/TTaskBaseData.h =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TTaskBaseData.h (.../TTaskBaseData.h) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TTaskBaseData.h (.../TTaskBaseData.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -28,12 +28,6 @@ { class LIBCHCORE_API TTaskBaseData { -/* - private: - TTaskBaseData(const TTaskBaseData&); - TTaskBaseData& operator=(const TTaskBaseData&); -*/ - public: TTaskBaseData(); ~TTaskBaseData(); Index: src/libchcore/TTaskConfigTracker.h =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TTaskConfigTracker.h (.../TTaskConfigTracker.h) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TTaskConfigTracker.h (.../TTaskConfigTracker.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -16,10 +16,6 @@ // Free Software Foundation, Inc., // 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // ============================================================================ -/// @file TConfigTracker.h -/// @date 2010/10/04 -/// @brief Contains declaration of the TTaskConfigTracker class. -// ============================================================================ #ifndef __TCONFIGTRACKER_H__ #define __TCONFIGTRACKER_H__ @@ -45,8 +41,11 @@ { public: TTaskConfigTracker(); + TTaskConfigTracker(const TTaskConfigTracker&) = delete; ~TTaskConfigTracker(); + TTaskConfigTracker& operator=(const TTaskConfigTracker&) = delete; + bool IsModified() const; bool IsModified(ETaskOptions eOption) const; bool IsModified(TOptionsSet setOptions) const; Index: src/libchcore/TTaskConfigVerifier.cpp =================================================================== diff -u -N -r12b36349f6214befeace08efa9acc7e03be0d847 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TTaskConfigVerifier.cpp (.../TTaskConfigVerifier.cpp) (revision 12b36349f6214befeace08efa9acc7e03be0d847) +++ src/libchcore/TTaskConfigVerifier.cpp (.../TTaskConfigVerifier.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -19,8 +19,8 @@ #include "stdafx.h" #include "TTaskConfigVerifier.h" #include "TTaskConfiguration.h" -#include -#include "..\liblogger\TLogger.h" +#include +#include "../liblogger/TLogger.h" namespace chcore { Index: src/libchcore/TTaskConfigVerifier.h =================================================================== diff -u -N -r12b36349f6214befeace08efa9acc7e03be0d847 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TTaskConfigVerifier.h (.../TTaskConfigVerifier.h) (revision 12b36349f6214befeace08efa9acc7e03be0d847) +++ src/libchcore/TTaskConfigVerifier.h (.../TTaskConfigVerifier.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -19,7 +19,7 @@ #ifndef __TTASKCONFIGVERIFIER_H__ #define __TTASKCONFIGVERIFIER_H__ -#include "..\liblogger\TLogger.h" +#include "../liblogger/TLogger.h" namespace chcore { Index: src/libchcore/TTaskDefinition.cpp =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TTaskDefinition.cpp (.../TTaskDefinition.cpp) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TTaskDefinition.cpp (.../TTaskDefinition.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -43,39 +43,10 @@ m_strTaskName = boost::lexical_cast(u).c_str(); } - TTaskDefinition::TTaskDefinition(const TTaskDefinition& rSrc) : - m_strTaskName(rSrc.m_strTaskName), - m_vSourcePaths(rSrc.m_vSourcePaths), - m_pathDestinationPath(rSrc.m_pathDestinationPath), - m_afFilters(rSrc.m_afFilters), - m_tOperationPlan(rSrc.m_tOperationPlan), - m_ullTaskVersion(rSrc.m_ullTaskVersion), - m_tConfiguration(rSrc.m_tConfiguration), - m_bModified(rSrc.m_bModified) - { - } - TTaskDefinition::~TTaskDefinition() { } - TTaskDefinition& TTaskDefinition::operator=(const TTaskDefinition& rSrc) - { - if (this != &rSrc) - { - m_strTaskName = rSrc.m_strTaskName; - m_vSourcePaths = rSrc.m_vSourcePaths; - m_afFilters = rSrc.m_afFilters; - m_pathDestinationPath = rSrc.m_pathDestinationPath; - m_tOperationPlan = rSrc.m_tOperationPlan; - m_ullTaskVersion = rSrc.m_ullTaskVersion; - m_tConfiguration = rSrc.m_tConfiguration; - m_bModified = rSrc.m_bModified; - } - - return *this; - } - // Task unique id TString TTaskDefinition::GetTaskName() const { Index: src/libchcore/TTaskDefinition.h =================================================================== diff -u -N -ra4635addad389b9e117679437a3e1b64a739ea96 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TTaskDefinition.h (.../TTaskDefinition.h) (revision a4635addad389b9e117679437a3e1b64a739ea96) +++ src/libchcore/TTaskDefinition.h (.../TTaskDefinition.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -38,11 +38,8 @@ { public: TTaskDefinition(); - TTaskDefinition(const TTaskDefinition& rSrc); ~TTaskDefinition(); - TTaskDefinition& operator=(const TTaskDefinition& rSrc); - // Task unique ID TString GetTaskName() const; Index: src/libchcore/TTaskInfo.h =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TTaskInfo.h (.../TTaskInfo.h) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TTaskInfo.h (.../TTaskInfo.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -85,7 +85,10 @@ { public: TTaskInfoContainer(); + TTaskInfoContainer(const TTaskInfoContainer&) = delete; + TTaskInfoContainer& operator=(const TTaskInfoContainer&) = delete; + void Add(const TSmartPath& strPath, int iOrder, const TTaskPtr& spTask); void RemoveAt(size_t stIndex); Index: src/libchcore/TTaskLocalStats.cpp =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TTaskLocalStats.cpp (.../TTaskLocalStats.cpp) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TTaskLocalStats.cpp (.../TTaskLocalStats.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -16,10 +16,6 @@ // Free Software Foundation, Inc., // 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // ============================================================================ -/// @file TTaskLocalStatsInfo.cpp -/// @date 2011/03/28 -/// @brief Contains implementation of classes responsible for maintaining local task stats. -// ============================================================================ #include "stdafx.h" #include "TTaskLocalStats.h" #include "TSubTaskStatsInfo.h" Index: src/libchcore/TTaskLocalStats.h =================================================================== diff -u -N -rc085b65f1de24f25feab2bac2d5882abf04aabcf -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TTaskLocalStats.h (.../TTaskLocalStats.h) (revision c085b65f1de24f25feab2bac2d5882abf04aabcf) +++ src/libchcore/TTaskLocalStats.h (.../TTaskLocalStats.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -16,10 +16,6 @@ // Free Software Foundation, Inc., // 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // ============================================================================ -/// @file TTaskLocalStatsInfo.h -/// @date 2011/03/28 -/// @brief Contains classes responsible for maintaining local task stats. -// ============================================================================ #ifndef __TTASKLOCALSTATS_H__ #define __TTASKLOCALSTATS_H__ @@ -37,8 +33,11 @@ { public: TTaskLocalStatsInfo(); + TTaskLocalStatsInfo(const TTaskLocalStatsInfo&) = delete; ~TTaskLocalStatsInfo(); + TTaskLocalStatsInfo& operator=(const TTaskLocalStatsInfo&) = delete; + void Clear(); void GetSnapshot(TTaskStatsSnapshotPtr& spSnapshot) const; @@ -64,10 +63,6 @@ #pragma warning(pop) private: - TTaskLocalStatsInfo(const TTaskLocalStatsInfo&); - TTaskLocalStatsInfo& operator=(const TTaskLocalStatsInfo&); - - private: enum EModifications { eMod_Added, Index: src/libchcore/TTaskManager.cpp =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TTaskManager.cpp (.../TTaskManager.cpp) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TTaskManager.cpp (.../TTaskManager.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -27,7 +27,7 @@ #include "TTaskInfo.h" #include "SerializerTrace.h" #include "TFakeFileSerializer.h" -#include "..\liblogger\TLoggerPaths.h" +#include "../liblogger/TLoggerPaths.h" namespace chcore { Index: src/libchcore/TTaskManager.h =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TTaskManager.h (.../TTaskManager.h) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TTaskManager.h (.../TTaskManager.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -26,7 +26,7 @@ #include "ISerializer.h" #include "ISerializerFactory.h" #include "TObsoleteFiles.h" -#include "..\liblogger\TMultiLoggerConfig.h" +#include "../liblogger/TMultiLoggerConfig.h" namespace chcore { @@ -44,9 +44,12 @@ const TSmartPath& pathLogDir, const logger::TMultiLoggerConfigPtr& spMultiLoggerConfig, bool bForceRecreateSerializer = false); + TTaskManager(const TTaskManager&) = delete; ~TTaskManager(); + TTaskManager& operator=(const TTaskManager&) = delete; + void Store(bool bForce); void Load(); Index: src/libchcore/TWorkerThreadController.h =================================================================== diff -u -N -ra4635addad389b9e117679437a3e1b64a739ea96 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/TWorkerThreadController.h (.../TWorkerThreadController.h) (revision a4635addad389b9e117679437a3e1b64a739ea96) +++ src/libchcore/TWorkerThreadController.h (.../TWorkerThreadController.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -37,8 +37,11 @@ { public: TWorkerThreadController(); + TWorkerThreadController(const TWorkerThreadController&) = delete; ~TWorkerThreadController(); + TWorkerThreadController& operator=(const TWorkerThreadController&) = delete; + // methods to be used outside of the thread being controlled void StartThread(PTHREAD_START_ROUTINE pThreadFunction, PVOID pThreadParam, int iPriority = THREAD_PRIORITY_NORMAL); void SignalThreadToStop(); @@ -58,10 +61,6 @@ void WaitForThreadToExit(boost::upgrade_lock& rUpgradeLock, DWORD dwMiliseconds = INFINITE); private: - TWorkerThreadController(const TWorkerThreadController&); - TWorkerThreadController& operator=(const TWorkerThreadController&); - - private: HANDLE m_hThread; HANDLE m_hKillThread; #pragma warning(push) Index: src/libchcore/Tests/TestsTConfig.cpp =================================================================== diff -u -N -ra4635addad389b9e117679437a3e1b64a739ea96 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/Tests/TestsTConfig.cpp (.../TestsTConfig.cpp) (revision a4635addad389b9e117679437a3e1b64a739ea96) +++ src/libchcore/Tests/TestsTConfig.cpp (.../TestsTConfig.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -29,7 +29,7 @@ class FileWithConfigurationFixture : public ::testing::Test { protected: - virtual void SetUp() + void SetUp() override { m_strTempFilePath = GetTmpPath(); @@ -73,7 +73,7 @@ outFile.flush(); } - virtual void TearDown() + void TearDown() override { DeleteFile(m_strTempFilePath.c_str()); } @@ -84,7 +84,7 @@ class InitializedConfigFixture : public ::testing::Test { protected: - virtual void SetUp() + void SetUp() override { m_strInputXmlString = L"\ Index: src/libchcore/libchcore.vc140.vcxproj =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/libchcore.vc140.vcxproj (.../libchcore.vc140.vcxproj) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/libchcore.vc140.vcxproj (.../libchcore.vc140.vcxproj) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -508,7 +508,6 @@ - @@ -532,7 +531,6 @@ - @@ -553,7 +551,6 @@ - @@ -658,7 +655,6 @@ - @@ -831,7 +827,6 @@ - @@ -851,7 +846,6 @@ - Index: src/libchcore/libchcore.vc140.vcxproj.filters =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libchcore/libchcore.vc140.vcxproj.filters (.../libchcore.vc140.vcxproj.filters) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/libchcore.vc140.vcxproj.filters (.../libchcore.vc140.vcxproj.filters) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -308,9 +308,6 @@ Source Files\Tools - - Source Files\Tools - Source Files\Tools @@ -434,9 +431,6 @@ Source Files\Filesystems\Local - - Source Files\Tools - Source Files\Tools @@ -458,9 +452,6 @@ Source Files\Tools\Exceptions - - Source Files\Tools\Exceptions - Source Files\Filesystems\Exceptions @@ -740,9 +731,6 @@ Source Files\Tools - - Source Files\Tools - Source Files\Tools @@ -881,9 +869,6 @@ Source Files\Filesystems\Local - - Source Files\Tools - Tests @@ -896,9 +881,6 @@ Source Files\Tools\Exceptions - - Source Files\Tools\Exceptions - Source Files\Filesystems\Exceptions Index: src/libictranslate/LanguageDialog.cpp =================================================================== diff -u -N -r8068e0c351055554340ac9755d1bc846893bf2b8 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libictranslate/LanguageDialog.cpp (.../LanguageDialog.cpp) (revision 8068e0c351055554340ac9755d1bc846893bf2b8) +++ src/libictranslate/LanguageDialog.cpp (.../LanguageDialog.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -285,26 +285,6 @@ } // ============================================================================ -/// ictranslate::CControlResizeInfo::SetFactors -/// @date 2009/04/18 -/// -/// @brief Sets the offset and scaling factors for future placement calculations. -/// @param[in] dXPosFactor Multiplier for the dialog width change - used for x-offset. -/// @param[in] dYPosFactor Multiplier for the dialog height change - used for y-offset. -/// @param[in] dXScaleFactor Multiplier for the dialog width change - used for x-size. -/// @param[in] dYScaleFactor Multiplier for the dialog height change - used for y-size. -// ============================================================================ -/* -void CControlResizeInfo::SetFactors(double dXPosFactor, double dYPosFactor, double dXScaleFactor, double dYScaleFactor) -{ - m_dXOffsetFactor = dXPosFactor; - m_dYOffsetFactor = dYPosFactor; - m_dXScaleFactor = dXScaleFactor; - m_dYScaleFactor = dYScaleFactor; -}*/ - - -// ============================================================================ /// ictranslate::CControlResizeInfo::GetNewControlPlacement /// @date 2009/04/18 /// Index: src/libictranslate/LanguageDialog.h =================================================================== diff -u -N -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libictranslate/LanguageDialog.h (.../LanguageDialog.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) +++ src/libictranslate/LanguageDialog.h (.../LanguageDialog.h) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -177,8 +177,8 @@ public: // Construction/destruction explicit CLanguageDialog(bool* pLock=nullptr); - CLanguageDialog(PCTSTR lpszTemplateName, CWnd* pParent = nullptr, bool* pLock=nullptr); // standard constructor - CLanguageDialog(UINT uiIDTemplate, CWnd* pParent = nullptr, bool* pLock=nullptr); // standard constructor + explicit CLanguageDialog(PCTSTR lpszTemplateName, CWnd* pParent = nullptr, bool* pLock=nullptr); // standard constructor + explicit CLanguageDialog(UINT uiIDTemplate, CWnd* pParent = nullptr, bool* pLock=nullptr); // standard constructor CLanguageDialog(const CLanguageDialog&) = delete; CLanguageDialog& operator=(const CLanguageDialog&) = delete; @@ -195,8 +195,8 @@ void MapRect(RECT* pRect); CFont* GetFont() { return m_pFont ? m_pFont : ((CDialog*)this)->GetFont(); }; - BOOL OnHelpInfo(HELPINFO* pHelpInfo); - void OnContextMenu(CWnd* pWnd, CPoint point); + afx_msg BOOL OnHelpInfo(HELPINFO* pHelpInfo); + afx_msg void OnContextMenu(CWnd* pWnd, CPoint point); void OnHelpButton(); // Controls resize support Index: src/libictranslate/cfg.cpp =================================================================== diff -u -N -r8068e0c351055554340ac9755d1bc846893bf2b8 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libictranslate/cfg.cpp (.../cfg.cpp) (revision 8068e0c351055554340ac9755d1bc846893bf2b8) +++ src/libictranslate/cfg.cpp (.../cfg.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -121,10 +121,6 @@ #define m_pvProps ((std::vector*)m_hProps) -/** Constructs a config object. - * \param[in] pCfgBase - pointer to a base handler of the configuration strings - * cound be pointer to xml handler, ini handler or any other - */ config::config(config_base_types eCfgType) : m_lock(), m_hProps((void*)new std::vector), @@ -685,14 +681,6 @@ property_changed_notify(uiProp); } -/** Function sets the unsigned number property value. - * - * \param[in] uiProp - property id to set the value for - * \param[in] llVal - property value to set - * \param[in] a - action to take if the property is array based - * \param[in] tIndex - index of a value to set at (for action action_setat) - * \param[out] pTracker - property tracker that collects the property ID's - */ void config::set_unsigned_num(unsigned int uiProp, unsigned long long ullVal, property::actions a, size_t tIndex, property_tracker* pTracker) { m_lock.Lock(); @@ -703,14 +691,6 @@ property_changed_notify(uiProp); } -/** Function sets the bool property value. - * - * \param[in] uiProp - property id to set the value for - * \param[in] llVal - property value to set - * \param[in] a - action to take if the property is array based - * \param[in] tIndex - index of a value to set at (for action action_setat) - * \param[out] pTracker - property tracker that collects the property ID's - */ void config::set_bool(unsigned int uiProp, bool bVal, property::actions a, size_t tIndex, property_tracker* pTracker) { m_lock.Lock(); @@ -721,14 +701,6 @@ property_changed_notify(uiProp); } -/** Function sets the string property value. - * - * \param[in] uiProp - property id to set the value for - * \param[in] llVal - property value to set - * \param[in] a - action to take if the property is array based - * \param[in] tIndex - index of a value to set at (for action action_setat) - * \param[out] pTracker - property tracker that collects the property ID's - */ void config::set_string(unsigned int uiProp, const wchar_t* pszVal, property::actions a, size_t tIndex, property_tracker* pTracker) { m_lock.Lock(); @@ -739,13 +711,6 @@ property_changed_notify(uiProp); } -/** Sets the string manually, without using registered properties; does not notify about change. -* -* \param[in] pszName - name of the property -* \param[in] pszVal - value of the property -* \param[in] a - action to take if the property is array based -* \param[in] tIndex - index of a value to set at (for action action_setat) -*/ void config::set_string(const wchar_t* pszName, const wchar_t* pszVal, property::actions a) { config_base::actions action; Index: src/libictranslate/cfg_ini.cpp =================================================================== diff -u -N -r8068e0c351055554340ac9755d1bc846893bf2b8 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/libictranslate/cfg_ini.cpp (.../cfg_ini.cpp) (revision 8068e0c351055554340ac9755d1bc846893bf2b8) +++ src/libictranslate/cfg_ini.cpp (.../cfg_ini.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -419,21 +419,11 @@ } } -/** Clears the contents of this class -* -* \param[in] pszName - name of the property to clear the values for -*/ void ini_cfg::clear() { m_pMainNode->clear(); } -/** Recursive clear function - searches recursively for a proper node -* and finally clears the string map. -* -* \param[in] pNodePtr - pointer to a node to be processed -* \param[in] pszName - name of the property to search for in the given node -*/ void ini_cfg::clear(const wchar_t* pszName) { if(pszName == nullptr || pszName[0] == _T('*')) Index: src/liblogger/TLogFile.cpp =================================================================== diff -u -N -ra4635addad389b9e117679437a3e1b64a739ea96 -rb26ced3298e3e7e51d91f3ac70b56746786da83b --- src/liblogger/TLogFile.cpp (.../TLogFile.cpp) (revision a4635addad389b9e117679437a3e1b64a739ea96) +++ src/liblogger/TLogFile.cpp (.../TLogFile.cpp) (revision b26ced3298e3e7e51d91f3ac70b56746786da83b) @@ -19,8 +19,8 @@ #include "stdafx.h" #include "TLogFile.h" #include -#include -#include +#include +#include #include namespace logger