Index: src/ch/CustomCopyDlg.cpp =================================================================== diff -u -N -rf46d334ffd78c7daa7626f214ae698adbac5f36d -r2aea3ad6f3c68be709ac65c70d9646eafe3b034c --- src/ch/CustomCopyDlg.cpp (.../CustomCopyDlg.cpp) (revision f46d334ffd78c7daa7626f214ae698adbac5f36d) +++ src/ch/CustomCopyDlg.cpp (.../CustomCopyDlg.cpp) (revision 2aea3ad6f3c68be709ac65c70d9646eafe3b034c) @@ -278,7 +278,7 @@ lvc.cx=static_cast(0.1*rc.Width()); m_ctlFilters.InsertColumn(6, &lvc); - chcore::CFiltersArray afFilters; + chcore::TFiltersArray afFilters; GetTaskPropValue(m_tTaskDefinition.GetConfiguration(), afFilters); m_bFilters = !afFilters.IsEmpty(); @@ -379,11 +379,11 @@ m_ctlFilters.InsertColumn(6, &lvc); // refresh the entries in filters' list - chcore::CFiltersArray afFilters = GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); + chcore::TFiltersArray afFilters = GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); m_ctlFilters.DeleteAllItems(); for(size_t stIndex = 0; stIndex < afFilters.GetSize(); ++stIndex) { - const chcore::CFileFilter* pFilter = afFilters.GetAt(stIndex); + const chcore::TFileFilter* pFilter = afFilters.GetAt(stIndex); if(pFilter) AddFilter(*pFilter, boost::numeric_cast(stIndex)); } @@ -593,10 +593,10 @@ CFilterDlg dlg; chcore::TString strData; - chcore::CFiltersArray afFilters = GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); + chcore::TFiltersArray afFilters = GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); for (size_t i = 0; i < afFilters.GetSize(); i++) { - const chcore::CFileFilter* pFilter = afFilters.GetAt(i); + const chcore::TFileFilter* pFilter = afFilters.GetAt(i); BOOST_ASSERT(pFilter); if(pFilter) { @@ -620,7 +620,7 @@ } } -void CCustomCopyDlg::AddFilter(const chcore::CFileFilter &rFilter, int iPos) +void CCustomCopyDlg::AddFilter(const chcore::TFileFilter &rFilter, int iPos) { LVITEM lvi; TCHAR szLoaded[1024]; @@ -760,7 +760,7 @@ void CCustomCopyDlg::OnRemovefilterButton() { - chcore::CFiltersArray afFilters = GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); + chcore::TFiltersArray afFilters = GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); POSITION pos; int iItem; @@ -821,11 +821,11 @@ POSITION pos = m_ctlFilters.GetFirstSelectedItemPosition(); if(pos != NULL) { - chcore::CFiltersArray afFilters = GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); + chcore::TFiltersArray afFilters = GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); int iItem = m_ctlFilters.GetNextSelectedItem(pos); CFilterDlg dlg; - const chcore::CFileFilter* pFilter = afFilters.GetAt(iItem); + const chcore::TFileFilter* pFilter = afFilters.GetAt(iItem); BOOST_ASSERT(pFilter); if(pFilter) dlg.m_ffFilter = *pFilter; Index: src/ch/CustomCopyDlg.h =================================================================== diff -u -N -rd12e49decb8a3df3e28f6786d38542390484ac07 -r2aea3ad6f3c68be709ac65c70d9646eafe3b034c --- src/ch/CustomCopyDlg.h (.../CustomCopyDlg.h) (revision d12e49decb8a3df3e28f6786d38542390484ac07) +++ src/ch/CustomCopyDlg.h (.../CustomCopyDlg.h) (revision 2aea3ad6f3c68be709ac65c70d9646eafe3b034c) @@ -47,7 +47,7 @@ void UpdateComboIcon(); void SetComboPath(LPCTSTR lpszText); void EnableControls(); - void AddFilter(const chcore::CFileFilter& rFilter, int iPos=-1); + void AddFilter(const chcore::TFileFilter& rFilter, int iPos=-1); void AddPath(CString strPath); void SetBuffersizesString(); Index: src/ch/FeedbackHandler.h =================================================================== diff -u -N -rd12e49decb8a3df3e28f6786d38542390484ac07 -r2aea3ad6f3c68be709ac65c70d9646eafe3b034c --- src/ch/FeedbackHandler.h (.../FeedbackHandler.h) (revision d12e49decb8a3df3e28f6786d38542390484ac07) +++ src/ch/FeedbackHandler.h (.../FeedbackHandler.h) (revision 2aea3ad6f3c68be709ac65c70d9646eafe3b034c) @@ -23,8 +23,8 @@ struct FEEDBACK_ALREADYEXISTS { - chcore::CFileInfoPtr spSrcFileInfo; - chcore::CFileInfoPtr spDstFileInfo; + chcore::TFileInfoPtr spSrcFileInfo; + chcore::TFileInfoPtr spDstFileInfo; }; struct FEEDBACK_FILEERROR Index: src/ch/FeedbackReplaceDlg.cpp =================================================================== diff -u -N -rd12e49decb8a3df3e28f6786d38542390484ac07 -r2aea3ad6f3c68be709ac65c70d9646eafe3b034c --- src/ch/FeedbackReplaceDlg.cpp (.../FeedbackReplaceDlg.cpp) (revision d12e49decb8a3df3e28f6786d38542390484ac07) +++ src/ch/FeedbackReplaceDlg.cpp (.../FeedbackReplaceDlg.cpp) (revision 2aea3ad6f3c68be709ac65c70d9646eafe3b034c) @@ -13,7 +13,7 @@ IMPLEMENT_DYNAMIC(CFeedbackReplaceDlg, ictranslate::CLanguageDialog) -CFeedbackReplaceDlg::CFeedbackReplaceDlg(const chcore::CFileInfoPtr& spSrcFile, const chcore::CFileInfoPtr& spDstFile, CWnd* pParent /*=NULL*/) +CFeedbackReplaceDlg::CFeedbackReplaceDlg(const chcore::TFileInfoPtr& spSrcFile, const chcore::TFileInfoPtr& spDstFile, CWnd* pParent /*=NULL*/) : ictranslate::CLanguageDialog(IDD_FEEDBACK_REPLACE_DIALOG, pParent), m_spSrcFile(spSrcFile), m_spDstFile(spDstFile), Index: src/ch/FeedbackReplaceDlg.h =================================================================== diff -u -N -rd12e49decb8a3df3e28f6786d38542390484ac07 -r2aea3ad6f3c68be709ac65c70d9646eafe3b034c --- src/ch/FeedbackReplaceDlg.h (.../FeedbackReplaceDlg.h) (revision d12e49decb8a3df3e28f6786d38542390484ac07) +++ src/ch/FeedbackReplaceDlg.h (.../FeedbackReplaceDlg.h) (revision 2aea3ad6f3c68be709ac65c70d9646eafe3b034c) @@ -24,7 +24,7 @@ DECLARE_DYNAMIC(CFeedbackReplaceDlg) public: - CFeedbackReplaceDlg(const chcore::CFileInfoPtr& spSrcFile, const chcore::CFileInfoPtr& spDstFile, CWnd* pParent = NULL); // standard constructor + CFeedbackReplaceDlg(const chcore::TFileInfoPtr& spSrcFile, const chcore::TFileInfoPtr& spDstFile, CWnd* pParent = NULL); // standard constructor virtual ~CFeedbackReplaceDlg(); virtual BOOL OnInitDialog(); @@ -45,8 +45,8 @@ BOOL m_bAllItems; protected: - const chcore::CFileInfoPtr m_spSrcFile; - const chcore::CFileInfoPtr m_spDstFile; + const chcore::TFileInfoPtr m_spSrcFile; + const chcore::TFileInfoPtr m_spDstFile; public: afx_msg void OnBnClickedReplaceButton(); Index: src/ch/FilterDlg.cpp =================================================================== diff -u -N -rf46d334ffd78c7daa7626f214ae698adbac5f36d -r2aea3ad6f3c68be709ac65c70d9646eafe3b034c --- src/ch/FilterDlg.cpp (.../FilterDlg.cpp) (revision f46d334ffd78c7daa7626f214ae698adbac5f36d) +++ src/ch/FilterDlg.cpp (.../FilterDlg.cpp) (revision 2aea3ad6f3c68be709ac65c70d9646eafe3b034c) @@ -135,7 +135,7 @@ m_ctlDateType.AddString(GetResManager().LoadString(IDS_DATECREATED_STRING+i)); } - // copy data from CFileFilter to a dialog - mask + // copy data from TFileFilter to a dialog - mask m_bFilter = m_ffFilter.GetUseMask(); chcore::TString strData; @@ -335,7 +335,7 @@ { UpdateData(TRUE); - // CFileFilter --> dialogu - mask + // TFileFilter --> dialogu - mask CString strText; m_ctlFilter.GetWindowText(strText); m_ffFilter.SetUseMask(((m_bFilter != 0) && !strText.IsEmpty())); @@ -349,17 +349,17 @@ m_ffFilter.SetUseSize1(m_bSize != 0); m_ffFilter.SetUseSize2(m_bSize2 != 0); - m_ffFilter.SetSizeType1((chcore::CFileFilter::ESizeCompareType)m_ctlSizeType1.GetCurSel()); - m_ffFilter.SetSizeType2((chcore::CFileFilter::ESizeCompareType)m_ctlSizeType2.GetCurSel()); + m_ffFilter.SetSizeType1((chcore::TFileFilter::ESizeCompareType)m_ctlSizeType1.GetCurSel()); + m_ffFilter.SetSizeType2((chcore::TFileFilter::ESizeCompareType)m_ctlSizeType2.GetCurSel()); m_ffFilter.SetSize1(static_cast(m_uiSize1)*static_cast(GetMultiplier(m_ctlSize1Multi.GetCurSel()))); m_ffFilter.SetSize2(static_cast(m_uiSize2)*static_cast(GetMultiplier(m_ctlSize2Multi.GetCurSel()))); // date - m_ffFilter.SetDateType((chcore::CFileFilter::EDateType)m_ctlDateType.GetCurSel()); + m_ffFilter.SetDateType((chcore::TFileFilter::EDateType)m_ctlDateType.GetCurSel()); - m_ffFilter.SetDateCmpType1((chcore::CFileFilter::EDateCompareType)m_ctlDateType1.GetCurSel()); - m_ffFilter.SetDateCmpType2((chcore::CFileFilter::EDateCompareType)m_ctlDateType2.GetCurSel()); + m_ffFilter.SetDateCmpType1((chcore::TFileFilter::EDateCompareType)m_ctlDateType1.GetCurSel()); + m_ffFilter.SetDateCmpType2((chcore::TFileFilter::EDateCompareType)m_ctlDateType2.GetCurSel()); CTime tDate; CTime tTime; Index: src/ch/FilterDlg.h =================================================================== diff -u -N -rf46d334ffd78c7daa7626f214ae698adbac5f36d -r2aea3ad6f3c68be709ac65c70d9646eafe3b034c --- src/ch/FilterDlg.h (.../FilterDlg.h) (revision f46d334ffd78c7daa7626f214ae698adbac5f36d) +++ src/ch/FilterDlg.h (.../FilterDlg.h) (revision 2aea3ad6f3c68be709ac65c70d9646eafe3b034c) @@ -73,7 +73,7 @@ // Implementation public: void SetSize2(unsigned __int64 ullSize); - chcore::CFileFilter m_ffFilter; + chcore::TFileFilter m_ffFilter; CStringArray m_astrAddMask; CStringArray m_astrAddExcludeMask; Index: src/ch/TLocalFilesystem.cpp =================================================================== diff -u -N -rd12e49decb8a3df3e28f6786d38542390484ac07 -r2aea3ad6f3c68be709ac65c70d9646eafe3b034c --- src/ch/TLocalFilesystem.cpp (.../TLocalFilesystem.cpp) (revision d12e49decb8a3df3e28f6786d38542390484ac07) +++ src/ch/TLocalFilesystem.cpp (.../TLocalFilesystem.cpp) (revision 2aea3ad6f3c68be709ac65c70d9646eafe3b034c) @@ -133,7 +133,7 @@ return ::DeleteFile(PrependPathExtensionIfNeeded(pathFile).ToString()) != FALSE; } -bool TLocalFilesystem::GetFileInfo(const chcore::TSmartPath& pathFile, chcore::CFileInfoPtr& rFileInfo, size_t stSrcIndex, const chcore::TPathContainer* pBasePaths) +bool TLocalFilesystem::GetFileInfo(const chcore::TSmartPath& pathFile, chcore::TFileInfoPtr& rFileInfo, size_t stSrcIndex, const chcore::TPathContainer* pBasePaths) { if(!rFileInfo) THROW(_T("Invalid argument"), 0, 0, 0); @@ -313,7 +313,7 @@ Close(); } -bool TLocalFilesystemFind::FindNext(chcore::CFileInfoPtr& rspFileInfo) +bool TLocalFilesystemFind::FindNext(chcore::TFileInfoPtr& rspFileInfo) { WIN32_FIND_DATA wfd; chcore::TSmartPath pathCurrent = m_pathDir + m_pathMask; Index: src/ch/TLocalFilesystem.h =================================================================== diff -u -N -rf46d334ffd78c7daa7626f214ae698adbac5f36d -r2aea3ad6f3c68be709ac65c70d9646eafe3b034c --- src/ch/TLocalFilesystem.h (.../TLocalFilesystem.h) (revision f46d334ffd78c7daa7626f214ae698adbac5f36d) +++ src/ch/TLocalFilesystem.h (.../TLocalFilesystem.h) (revision 2aea3ad6f3c68be709ac65c70d9646eafe3b034c) @@ -28,8 +28,8 @@ namespace chcore { - class CFileInfo; - typedef boost::shared_ptr CFileInfoPtr; + class TFileInfo; + typedef boost::shared_ptr TFileInfoPtr; } class TAutoFileHandle; @@ -63,7 +63,7 @@ static bool RemoveDirectory(const chcore::TSmartPath& pathFile); static bool DeleteFile(const chcore::TSmartPath& pathFile); - static bool GetFileInfo(const chcore::TSmartPath& pathFile, chcore::CFileInfoPtr& rFileInfo, size_t stSrcIndex = std::numeric_limits::max(), const chcore::TPathContainer* pBasePaths = NULL); + static bool GetFileInfo(const chcore::TSmartPath& pathFile, chcore::TFileInfoPtr& rFileInfo, size_t stSrcIndex = std::numeric_limits::max(), const chcore::TPathContainer* pBasePaths = NULL); static bool FastMove(const chcore::TSmartPath& pathSource, const chcore::TSmartPath& pathDestination); static TLocalFilesystemFind CreateFinderObject(const chcore::TSmartPath& pathDir, const chcore::TSmartPath& pathMask); @@ -91,7 +91,7 @@ public: ~TLocalFilesystemFind(); - bool FindNext(chcore::CFileInfoPtr& rspFileInfo); + bool FindNext(chcore::TFileInfoPtr& rspFileInfo); void Close(); private: Index: src/ch/TSubTaskBase.cpp =================================================================== diff -u -N -rd12e49decb8a3df3e28f6786d38542390484ac07 -r2aea3ad6f3c68be709ac65c70d9646eafe3b034c --- src/ch/TSubTaskBase.cpp (.../TSubTaskBase.cpp) (revision d12e49decb8a3df3e28f6786d38542390484ac07) +++ src/ch/TSubTaskBase.cpp (.../TSubTaskBase.cpp) (revision 2aea3ad6f3c68be709ac65c70d9646eafe3b034c) @@ -40,7 +40,7 @@ { } -chcore::TSmartPath TSubTaskBase::CalculateDestinationPath(const chcore::CFileInfoPtr& spFileInfo, chcore::TSmartPath pathDst, int iFlags) const +chcore::TSmartPath TSubTaskBase::CalculateDestinationPath(const chcore::TFileInfoPtr& spFileInfo, chcore::TSmartPath pathDst, int iFlags) const { const chcore::TBasePathDataContainer& rSourcePathsInfo = GetContext().GetBasePathDataContainer(); Index: src/ch/TSubTaskBase.h =================================================================== diff -u -N -rf46d334ffd78c7daa7626f214ae698adbac5f36d -r2aea3ad6f3c68be709ac65c70d9646eafe3b034c --- src/ch/TSubTaskBase.h (.../TSubTaskBase.h) (revision f46d334ffd78c7daa7626f214ae698adbac5f36d) +++ src/ch/TSubTaskBase.h (.../TSubTaskBase.h) (revision 2aea3ad6f3c68be709ac65c70d9646eafe3b034c) @@ -54,7 +54,7 @@ protected: // some common operations - chcore::TSmartPath CalculateDestinationPath(const chcore::CFileInfoPtr& spFileInfo, chcore::TSmartPath strPath, int iFlags) const; + chcore::TSmartPath CalculateDestinationPath(const chcore::TFileInfoPtr& spFileInfo, chcore::TSmartPath strPath, int iFlags) const; chcore::TSmartPath FindFreeSubstituteName(chcore::TSmartPath pathSrcPath, chcore::TSmartPath pathDstPath) const; private: Index: src/ch/TSubTaskContext.cpp =================================================================== diff -u -N -rd12e49decb8a3df3e28f6786d38542390484ac07 -r2aea3ad6f3c68be709ac65c70d9646eafe3b034c --- src/ch/TSubTaskContext.cpp (.../TSubTaskContext.cpp) (revision d12e49decb8a3df3e28f6786d38542390484ac07) +++ src/ch/TSubTaskContext.cpp (.../TSubTaskContext.cpp) (revision 2aea3ad6f3c68be709ac65c70d9646eafe3b034c) @@ -23,7 +23,7 @@ #include "stdafx.h" #include "TSubTaskContext.h" -TSubTaskContext::TSubTaskContext(chcore::TTaskDefinition& rTaskDefinition, chcore::TBasePathDataContainer& rBasePathDataContainer, chcore::CFileInfoArray& rFilesCache, TTaskLocalStats& rTaskLocalStats, +TSubTaskContext::TSubTaskContext(chcore::TTaskDefinition& rTaskDefinition, chcore::TBasePathDataContainer& rBasePathDataContainer, chcore::TFileInfoArray& rFilesCache, TTaskLocalStats& rTaskLocalStats, TTaskBasicProgressInfo& rTaskBasicProgressInfo, TTaskConfigTracker& rCfgTracker, icpf::log_file& rLog, chcore::IFeedbackHandler* piFeedbackHandler, chcore::TWorkerThreadController& rThreadController, TLocalFilesystem& rfsLocal) : m_rTaskDefinition(rTaskDefinition), Index: src/ch/TSubTaskContext.h =================================================================== diff -u -N -rd12e49decb8a3df3e28f6786d38542390484ac07 -r2aea3ad6f3c68be709ac65c70d9646eafe3b034c --- src/ch/TSubTaskContext.h (.../TSubTaskContext.h) (revision d12e49decb8a3df3e28f6786d38542390484ac07) +++ src/ch/TSubTaskContext.h (.../TSubTaskContext.h) (revision 2aea3ad6f3c68be709ac65c70d9646eafe3b034c) @@ -44,7 +44,7 @@ class TSubTaskContext { public: - TSubTaskContext(chcore::TTaskDefinition& rTaskDefinition, chcore::TBasePathDataContainer& rBasePathDataContainer, chcore::CFileInfoArray& rFilesCache, TTaskLocalStats& rTaskLocalStats, + TSubTaskContext(chcore::TTaskDefinition& rTaskDefinition, chcore::TBasePathDataContainer& rBasePathDataContainer, chcore::TFileInfoArray& rFilesCache, TTaskLocalStats& rTaskLocalStats, TTaskBasicProgressInfo& rTaskBasicProgressInfo, TTaskConfigTracker& rCfgTracker, icpf::log_file& rLog, chcore::IFeedbackHandler* piFeedbackHandler, chcore::TWorkerThreadController& rThreadController, TLocalFilesystem& rfsLocal); ~TSubTaskContext(); @@ -55,8 +55,8 @@ chcore::TBasePathDataContainer& GetBasePathDataContainer() { return m_rBasePathDataContainer; } const chcore::TBasePathDataContainer& GetBasePathDataContainer() const { return m_rBasePathDataContainer; } - chcore::CFileInfoArray& GetFilesCache() { return m_rFilesCache; } - const chcore::CFileInfoArray& GetFilesCache() const { return m_rFilesCache; } + chcore::TFileInfoArray& GetFilesCache() { return m_rFilesCache; } + const chcore::TFileInfoArray& GetFilesCache() const { return m_rFilesCache; } TTaskLocalStats& GetTaskLocalStats() { return m_rTaskLocalStats; } const TTaskLocalStats& GetTaskLocalStats() const { return m_rTaskLocalStats; } @@ -86,7 +86,7 @@ chcore::TBasePathDataContainer& m_rBasePathDataContainer; // data on which to operate - chcore::CFileInfoArray& m_rFilesCache; + chcore::TFileInfoArray& m_rFilesCache; // local stats for task TTaskLocalStats& m_rTaskLocalStats; Index: src/ch/TSubTaskCopyMove.cpp =================================================================== diff -u -N -rd12e49decb8a3df3e28f6786d38542390484ac07 -r2aea3ad6f3c68be709ac65c70d9646eafe3b034c --- src/ch/TSubTaskCopyMove.cpp (.../TSubTaskCopyMove.cpp) (revision d12e49decb8a3df3e28f6786d38542390484ac07) +++ src/ch/TSubTaskCopyMove.cpp (.../TSubTaskCopyMove.cpp) (revision 2aea3ad6f3c68be709ac65c70d9646eafe3b034c) @@ -34,7 +34,7 @@ struct CUSTOM_COPY_PARAMS { - chcore::CFileInfoPtr spSrcFile; // CFileInfo - src file + chcore::TFileInfoPtr spSrcFile; // CFileInfo - src file chcore::TSmartPath pathDstFile; // dest path with filename chcore::TDataBuffer dbBuffer; // buffer handling @@ -50,7 +50,7 @@ TSubTaskBase::ESubOperationResult TSubTaskCopyMove::Exec() { icpf::log_file& rLog = GetContext().GetLog(); - chcore::CFileInfoArray& rFilesCache = GetContext().GetFilesCache(); + chcore::TFileInfoArray& rFilesCache = GetContext().GetFilesCache(); chcore::TTaskDefinition& rTaskDefinition = GetContext().GetTaskDefinition(); TTaskConfigTracker& rCfgTracker = GetContext().GetCfgTracker(); TTaskBasicProgressInfo& rBasicProgressInfo = GetContext().GetTaskBasicProgressInfo(); @@ -128,7 +128,7 @@ } // update m_stNextIndex, getting current CFileInfo - chcore::CFileInfoPtr spFileInfo = rFilesCache.GetAt(rBasicProgressInfo.GetCurrentIndex()); + chcore::TFileInfoPtr spFileInfo = rFilesCache.GetAt(rBasicProgressInfo.GetCurrentIndex()); // set dest path with filename ccp.pathDstFile = CalculateDestinationPath(spFileInfo, rTaskDefinition.GetDestinationPath(), ((int)bForceDirectories) << 1 | (int)bIgnoreFolders); @@ -260,7 +260,7 @@ return TSubTaskBase::eSubResult_Continue; } -bool TSubTaskCopyMove::GetMove(const chcore::CFileInfoPtr& spFileInfo) +bool TSubTaskCopyMove::GetMove(const chcore::TFileInfoPtr& spFileInfo) { if(!spFileInfo) THROW(_T("Invalid pointer"), 0, 0, 0); @@ -276,7 +276,7 @@ return spPathData->GetMove(); } -int TSubTaskCopyMove::GetBufferIndex(const chcore::CFileInfoPtr& spFileInfo) +int TSubTaskCopyMove::GetBufferIndex(const chcore::TFileInfoPtr& spFileInfo) { if(!spFileInfo) THROW(_T("Invalid pointer"), 0, 0, 0); @@ -670,7 +670,7 @@ return TSubTaskBase::eSubResult_Continue; } -TSubTaskBase::ESubOperationResult TSubTaskCopyMove::OpenDestinationFileFB(TLocalFilesystemFile& fileDst, const chcore::TSmartPath& pathDstFile, bool bNoBuffering, const chcore::CFileInfoPtr& spSrcFileInfo, unsigned long long& ullSeekTo, bool& bFreshlyCreated) +TSubTaskBase::ESubOperationResult TSubTaskCopyMove::OpenDestinationFileFB(TLocalFilesystemFile& fileDst, const chcore::TSmartPath& pathDstFile, bool bNoBuffering, const chcore::TFileInfoPtr& spSrcFileInfo, unsigned long long& ullSeekTo, bool& bFreshlyCreated) { chcore::IFeedbackHandler* piFeedbackHandler = GetContext().GetFeedbackHandler(); icpf::log_file& rLog = GetContext().GetLog(); @@ -703,7 +703,7 @@ // NOTE: it is not known which one would be faster - reading file parameters // by using spDstFileInfo->Create() (which uses FindFirstFile()) or by // reading parameters using opened handle; need to be tested in the future - chcore::CFileInfoPtr spDstFileInfo(boost::make_shared()); + chcore::TFileInfoPtr spDstFileInfo(boost::make_shared()); if(!TLocalFilesystem::GetFileInfo(pathDstFile, spDstFileInfo)) THROW(_T("Cannot get information about file which has already been opened!"), 0, GetLastError(), 0); Index: src/ch/TSubTaskCopyMove.h =================================================================== diff -u -N -rf46d334ffd78c7daa7626f214ae698adbac5f36d -r2aea3ad6f3c68be709ac65c70d9646eafe3b034c --- src/ch/TSubTaskCopyMove.h (.../TSubTaskCopyMove.h) (revision f46d334ffd78c7daa7626f214ae698adbac5f36d) +++ src/ch/TSubTaskCopyMove.h (.../TSubTaskCopyMove.h) (revision 2aea3ad6f3c68be709ac65c70d9646eafe3b034c) @@ -28,7 +28,7 @@ namespace chcore { class TDataBuffer; - typedef boost::shared_ptr CFileInfoPtr; + typedef boost::shared_ptr TFileInfoPtr; } struct CUSTOM_COPY_PARAMS; @@ -42,13 +42,13 @@ ESubOperationResult Exec(); private: - bool GetMove(const chcore::CFileInfoPtr& spFileInfo); - int GetBufferIndex(const chcore::CFileInfoPtr& spFileInfo); + bool GetMove(const chcore::TFileInfoPtr& spFileInfo); + int GetBufferIndex(const chcore::TFileInfoPtr& spFileInfo); ESubOperationResult CustomCopyFileFB(CUSTOM_COPY_PARAMS* pData); ESubOperationResult OpenSourceFileFB(TLocalFilesystemFile& fileSrc, const chcore::TSmartPath& spPathToOpen, bool bNoBuffering); - ESubOperationResult OpenDestinationFileFB(TLocalFilesystemFile& fileDst, const chcore::TSmartPath& pathDstFile, bool bNoBuffering, const chcore::CFileInfoPtr& spSrcFileInfo, unsigned long long& ullSeekTo, bool& bFreshlyCreated); + ESubOperationResult OpenDestinationFileFB(TLocalFilesystemFile& fileDst, const chcore::TSmartPath& pathDstFile, bool bNoBuffering, const chcore::TFileInfoPtr& spSrcFileInfo, unsigned long long& ullSeekTo, bool& bFreshlyCreated); ESubOperationResult OpenExistingDestinationFileFB(TLocalFilesystemFile& fileDst, const chcore::TSmartPath& pathDstFilePath, bool bNoBuffering); ESubOperationResult SetFilePointerFB(TLocalFilesystemFile& file, long long llDistance, const chcore::TSmartPath& pathFile, bool& bSkip); Index: src/ch/TSubTaskDelete.cpp =================================================================== diff -u -N -rf46d334ffd78c7daa7626f214ae698adbac5f36d -r2aea3ad6f3c68be709ac65c70d9646eafe3b034c --- src/ch/TSubTaskDelete.cpp (.../TSubTaskDelete.cpp) (revision f46d334ffd78c7daa7626f214ae698adbac5f36d) +++ src/ch/TSubTaskDelete.cpp (.../TSubTaskDelete.cpp) (revision 2aea3ad6f3c68be709ac65c70d9646eafe3b034c) @@ -39,7 +39,7 @@ { // log icpf::log_file& rLog = GetContext().GetLog(); - chcore::CFileInfoArray& rFilesCache = GetContext().GetFilesCache(); + chcore::TFileInfoArray& rFilesCache = GetContext().GetFilesCache(); chcore::TTaskDefinition& rTaskDefinition = GetContext().GetTaskDefinition(); TTaskBasicProgressInfo& rBasicProgressInfo = GetContext().GetTaskBasicProgressInfo(); chcore::TWorkerThreadController& rThreadController = GetContext().GetThreadController(); @@ -50,7 +50,7 @@ // current processed path BOOL bSuccess; - chcore::CFileInfoPtr spFileInfo; + chcore::TFileInfoPtr spFileInfo; ictranslate::CFormat fmt; // index points to 0 or next item to process Index: src/ch/TSubTaskScanDirectory.cpp =================================================================== diff -u -N -rf46d334ffd78c7daa7626f214ae698adbac5f36d -r2aea3ad6f3c68be709ac65c70d9646eafe3b034c --- src/ch/TSubTaskScanDirectory.cpp (.../TSubTaskScanDirectory.cpp) (revision f46d334ffd78c7daa7626f214ae698adbac5f36d) +++ src/ch/TSubTaskScanDirectory.cpp (.../TSubTaskScanDirectory.cpp) (revision 2aea3ad6f3c68be709ac65c70d9646eafe3b034c) @@ -45,7 +45,7 @@ { // log icpf::log_file& rLog = GetContext().GetLog(); - chcore::CFileInfoArray& rFilesCache = GetContext().GetFilesCache(); + chcore::TFileInfoArray& rFilesCache = GetContext().GetFilesCache(); chcore::TTaskDefinition& rTaskDefinition = GetContext().GetTaskDefinition(); chcore::IFeedbackHandler* piFeedbackHandler = GetContext().GetFeedbackHandler(); const chcore::TBasePathDataContainer& rarrSourcePathsInfo = GetContext().GetBasePathDataContainer(); @@ -62,7 +62,7 @@ rFilesCache.Clear(); // read filtering options - chcore::CFiltersArray afFilters; + chcore::TFiltersArray afFilters; GetTaskPropValue(rTaskDefinition.GetConfiguration(), afFilters); // enter some data to rFilesCache @@ -80,11 +80,11 @@ size_t stSize = rTaskDefinition.GetSourcePathCount(); for(size_t stIndex = 0; stIndex < stSize ; stIndex++) { - chcore::CFileInfoPtr spFileInfo; + chcore::TFileInfoPtr spFileInfo; bSkipInputPath = false; - spFileInfo.reset(new chcore::CFileInfo()); + spFileInfo.reset(new chcore::TFileInfo()); // try to get some info about the input path; let user know if the path does not exist. do @@ -218,14 +218,14 @@ return eSubResult_Continue; } -int TSubTaskScanDirectories::ScanDirectory(chcore::TSmartPath pathDirName, size_t stSrcIndex, bool bRecurse, bool bIncludeDirs, chcore::CFiltersArray& afFilters) +int TSubTaskScanDirectories::ScanDirectory(chcore::TSmartPath pathDirName, size_t stSrcIndex, bool bRecurse, bool bIncludeDirs, chcore::TFiltersArray& afFilters) { - chcore::CFileInfoArray& rFilesCache = GetContext().GetFilesCache(); + chcore::TFileInfoArray& rFilesCache = GetContext().GetFilesCache(); chcore::TTaskDefinition& rTaskDefinition = GetContext().GetTaskDefinition(); chcore::TWorkerThreadController& rThreadController = GetContext().GetThreadController(); TLocalFilesystemFind finder = TLocalFilesystem::CreateFinderObject(pathDirName, chcore::PathFromString(_T("*"))); - chcore::CFileInfoPtr spFileInfo(boost::make_shared()); + chcore::TFileInfoPtr spFileInfo(boost::make_shared()); while(finder.FindNext(spFileInfo)) { @@ -238,7 +238,7 @@ { spFileInfo->SetParentObject(stSrcIndex, &rTaskDefinition.GetSourcePaths()); rFilesCache.AddFileInfo(spFileInfo); - spFileInfo = boost::make_shared(); + spFileInfo = boost::make_shared(); } } else @@ -248,7 +248,7 @@ { spFileInfo->SetParentObject(stSrcIndex, &rTaskDefinition.GetSourcePaths()); rFilesCache.AddFileInfo(spFileInfo); - spFileInfo = boost::make_shared(); + spFileInfo = boost::make_shared(); } if(bRecurse) Index: src/ch/TSubTaskScanDirectory.h =================================================================== diff -u -N -rd12e49decb8a3df3e28f6786d38542390484ac07 -r2aea3ad6f3c68be709ac65c70d9646eafe3b034c --- src/ch/TSubTaskScanDirectory.h (.../TSubTaskScanDirectory.h) (revision d12e49decb8a3df3e28f6786d38542390484ac07) +++ src/ch/TSubTaskScanDirectory.h (.../TSubTaskScanDirectory.h) (revision 2aea3ad6f3c68be709ac65c70d9646eafe3b034c) @@ -39,7 +39,7 @@ virtual ESubOperationResult Exec(); private: - int ScanDirectory(chcore::TSmartPath pathDirName, size_t stSrcIndex, bool bRecurse, bool bIncludeDirs, chcore::CFiltersArray& afFilters); + int ScanDirectory(chcore::TSmartPath pathDirName, size_t stSrcIndex, bool bRecurse, bool bIncludeDirs, chcore::TFiltersArray& afFilters); }; #endif Index: src/ch/TTaskConfiguration.h =================================================================== diff -u -N -rd12e49decb8a3df3e28f6786d38542390484ac07 -r2aea3ad6f3c68be709ac65c70d9646eafe3b034c --- src/ch/TTaskConfiguration.h (.../TTaskConfiguration.h) (revision d12e49decb8a3df3e28f6786d38542390484ac07) +++ src/ch/TTaskConfiguration.h (.../TTaskConfiguration.h) (revision 2aea3ad6f3c68be709ac65c70d9646eafe3b034c) @@ -116,7 +116,7 @@ TASK_PROPERTY(eTO_CreateDirectoriesRelativeToRoot, bool, _T("Operation.CreateDirectoriesRelativeToRoot"), false); TASK_PROPERTY(eTO_IgnoreDirectories, bool, _T("Operation.IgnoreDirectories"), false); -TASK_PROPERTY(eTO_Filters, chcore::CFiltersArray, _T("Operation.Filtering"), chcore::CFiltersArray()); +TASK_PROPERTY(eTO_Filters, chcore::TFiltersArray, _T("Operation.Filtering"), chcore::TFiltersArray()); // Naming settings TASK_PROPERTY(eTO_AlternateFilenameFormatString_First, CString, _T("Naming.AlternateFilenameFormatFirst"), _T("Copy of %name")); Index: src/ch/task.h =================================================================== diff -u -N -rf46d334ffd78c7daa7626f214ae698adbac5f36d -r2aea3ad6f3c68be709ac65c70d9646eafe3b034c --- src/ch/task.h (.../task.h) (revision f46d334ffd78c7daa7626f214ae698adbac5f36d) +++ src/ch/task.h (.../task.h) (revision 2aea3ad6f3c68be709ac65c70d9646eafe3b034c) @@ -64,7 +64,7 @@ size_t m_stSize; chcore::TSmartPath m_pathDstPath; - chcore::CFiltersArray* m_pafFilters; + chcore::TFiltersArray* m_pafFilters; ETaskCurrentState m_eTaskState; chcore::EOperationType m_eOperationType; @@ -214,7 +214,7 @@ // current task state (derivatives of the task initial information) // changing slowly or only partially - chcore::CFileInfoArray m_files; // list of files/directories found during operating on the task input data (filled by search for files) + chcore::TFileInfoArray m_files; // list of files/directories found during operating on the task input data (filled by search for files) // changing fast volatile ETaskCurrentState m_eCurrentState; // current state of processing this task represents @@ -225,7 +225,7 @@ TTaskLocalStats m_localStats; // local statistics // task settings - chcore::CFiltersArray m_afFilters; // filtering settings for files (will be filtered according to the rules inside when searching for files) + chcore::TFiltersArray m_afFilters; // filtering settings for files (will be filtered according to the rules inside when searching for files) bool m_bForce; // if the continuation of tasks should be independent of max concurrently running task limit bool m_bContinue; // allows task to continue Index: src/libchcore/FileFilter.cpp =================================================================== diff -u -N -rf46d334ffd78c7daa7626f214ae698adbac5f36d -r2aea3ad6f3c68be709ac65c70d9646eafe3b034c --- src/libchcore/FileFilter.cpp (.../FileFilter.cpp) (revision f46d334ffd78c7daa7626f214ae698adbac5f36d) +++ src/libchcore/FileFilter.cpp (.../FileFilter.cpp) (revision 2aea3ad6f3c68be709ac65c70d9646eafe3b034c) @@ -32,7 +32,7 @@ return (_tcsicmp(ch1, ch2) == 0); } -CFileFilter::CFileFilter() +TFileFilter::TFileFilter() { // files mask m_bUseMask=false; @@ -72,12 +72,12 @@ m_iDirectory=2; } -CFileFilter::CFileFilter(const CFileFilter& rFilter) +TFileFilter::TFileFilter(const TFileFilter& rFilter) { *this=rFilter; } -CFileFilter& CFileFilter::operator=(const CFileFilter& rFilter) +TFileFilter& TFileFilter::operator=(const TFileFilter& rFilter) { // files mask m_bUseMask=rFilter.m_bUseMask; @@ -119,7 +119,7 @@ return *this; } -chcore::TString& CFileFilter::GetCombinedMask(chcore::TString& strMask) const +chcore::TString& TFileFilter::GetCombinedMask(chcore::TString& strMask) const { strMask.Clear(); size_t stCount = m_astrMask.GetCount(); @@ -135,14 +135,14 @@ return strMask; } -void CFileFilter::SetCombinedMask(const chcore::TString& pMask) +void TFileFilter::SetCombinedMask(const chcore::TString& pMask) { m_astrMask.Clear(); pMask.Split(_T("|"), m_astrMask); } -chcore::TString& CFileFilter::GetCombinedExcludeMask(chcore::TString& strMask) const +chcore::TString& TFileFilter::GetCombinedExcludeMask(chcore::TString& strMask) const { strMask.Clear(); size_t stCount = m_astrExcludeMask.GetCount(); @@ -158,14 +158,14 @@ return strMask; } -void CFileFilter::SetCombinedExcludeMask(const chcore::TString& pMask) +void TFileFilter::SetCombinedExcludeMask(const chcore::TString& pMask) { m_astrExcludeMask.Clear(); pMask.Split(_T("|"), m_astrExcludeMask); } -void CFileFilter::StoreInConfig(chcore::TConfig& rConfig) const +void TFileFilter::StoreInConfig(chcore::TConfig& rConfig) const { SetConfigValue(rConfig, _T("IncludeMask.Use"), m_bUseMask); SetConfigValue(rConfig, _T("IncludeMask.MaskList.Mask"), m_astrMask); @@ -201,7 +201,7 @@ SetConfigValue(rConfig, _T("Attributes.Directory"), m_iDirectory); } -void CFileFilter::ReadFromConfig(const chcore::TConfig& rConfig) +void TFileFilter::ReadFromConfig(const chcore::TConfig& rConfig) { if(!GetConfigValue(rConfig, _T("IncludeMask.Use"), m_bUseMask)) m_bUseMask = false; @@ -269,7 +269,7 @@ m_iDirectory = 0; } -void CFileFilter::Serialize(chcore::TReadBinarySerializer& rSerializer) +void TFileFilter::Serialize(chcore::TReadBinarySerializer& rSerializer) { using chcore::Serializers::Serialize; @@ -307,7 +307,7 @@ Serialize(rSerializer, m_iDirectory); } -void CFileFilter::Serialize(chcore::TWriteBinarySerializer& rSerializer) const +void TFileFilter::Serialize(chcore::TWriteBinarySerializer& rSerializer) const { using chcore::Serializers::Serialize; @@ -345,7 +345,7 @@ Serialize(rSerializer, m_iDirectory); } -bool CFileFilter::Match(const CFileInfoPtr& spInfo) const +bool TFileFilter::Match(const TFileInfoPtr& spInfo) const { // check by mask if(m_bUseMask) @@ -521,7 +521,7 @@ return true; } -bool CFileFilter::MatchMask(LPCTSTR lpszMask, LPCTSTR lpszString) const +bool TFileFilter::MatchMask(LPCTSTR lpszMask, LPCTSTR lpszString) const { bool bMatch = 1; @@ -547,7 +547,7 @@ } // scan '?' and '*' -bool CFileFilter::Scan(LPCTSTR& lpszMask, LPCTSTR& lpszString) const +bool TFileFilter::Scan(LPCTSTR& lpszMask, LPCTSTR& lpszString) const { // remove the '?' and '*' for(lpszMask++; *lpszString != _T('\0') && (*lpszMask == _T('?') || *lpszMask == _T('*')); lpszMask++) @@ -581,7 +581,7 @@ } } -CFiltersArray& CFiltersArray::operator=(const CFiltersArray& rSrc) +TFiltersArray& TFiltersArray::operator=(const TFiltersArray& rSrc) { if(this != &rSrc) { @@ -591,13 +591,13 @@ return *this; } -bool CFiltersArray::Match(const CFileInfoPtr& spInfo) const +bool TFiltersArray::Match(const TFileInfoPtr& spInfo) const { if(m_vFilters.empty()) return true; // if only one of the filters matches - return true - for(std::vector::const_iterator iterFilter = m_vFilters.begin(); iterFilter != m_vFilters.end(); iterFilter++) + for(std::vector::const_iterator iterFilter = m_vFilters.begin(); iterFilter != m_vFilters.end(); iterFilter++) { if((*iterFilter).Match(spInfo)) return true; @@ -606,18 +606,18 @@ return false; } -void CFiltersArray::StoreInConfig(chcore::TConfig& rConfig, PCTSTR pszNodeName) const +void TFiltersArray::StoreInConfig(chcore::TConfig& rConfig, PCTSTR pszNodeName) const { rConfig.DeleteNode(pszNodeName); - BOOST_FOREACH(const CFileFilter& rFilter, m_vFilters) + BOOST_FOREACH(const TFileFilter& rFilter, m_vFilters) { chcore::TConfig cfgNode; rFilter.StoreInConfig(cfgNode); rConfig.AddSubConfig(chcore::TString(pszNodeName) + _T(".FilterDefinition"), cfgNode); } } -bool CFiltersArray::ReadFromConfig(const chcore::TConfig& rConfig, PCTSTR pszNodeName) +bool TFiltersArray::ReadFromConfig(const chcore::TConfig& rConfig, PCTSTR pszNodeName) { m_vFilters.clear(); @@ -628,50 +628,50 @@ for(size_t stIndex = 0; stIndex < vConfigs.GetCount(); ++stIndex) { const chcore::TConfig& rCfg = vConfigs.GetAt(stIndex); - CFileFilter tFilter; + TFileFilter tFilter; tFilter.ReadFromConfig(rCfg); m_vFilters.push_back(tFilter); } return true; } -void CFiltersArray::Serialize(chcore::TReadBinarySerializer& rSerializer) +void TFiltersArray::Serialize(chcore::TReadBinarySerializer& rSerializer) { using chcore::Serializers::Serialize; Serialize(rSerializer, m_vFilters); } -void CFiltersArray::Serialize(chcore::TWriteBinarySerializer& rSerializer) const +void TFiltersArray::Serialize(chcore::TWriteBinarySerializer& rSerializer) const { using chcore::Serializers::Serialize; Serialize(rSerializer, m_vFilters); } -bool CFiltersArray::IsEmpty() const +bool TFiltersArray::IsEmpty() const { return m_vFilters.empty(); } -void CFiltersArray::Add(const CFileFilter& rFilter) +void TFiltersArray::Add(const TFileFilter& rFilter) { m_vFilters.push_back(rFilter); } -bool CFiltersArray::SetAt(size_t stIndex, const CFileFilter& rNewFilter) +bool TFiltersArray::SetAt(size_t stIndex, const TFileFilter& rNewFilter) { BOOST_ASSERT(stIndex < m_vFilters.size()); if(stIndex < m_vFilters.size()) { - CFileFilter& rFilter = m_vFilters.at(stIndex); + TFileFilter& rFilter = m_vFilters.at(stIndex); rFilter = rNewFilter; return true; } else return false; } -const CFileFilter* CFiltersArray::GetAt(size_t stIndex) const +const TFileFilter* TFiltersArray::GetAt(size_t stIndex) const { BOOST_ASSERT(stIndex < m_vFilters.size()); if(stIndex < m_vFilters.size()) @@ -680,7 +680,7 @@ return NULL; } -bool CFiltersArray::RemoveAt(size_t stIndex) +bool TFiltersArray::RemoveAt(size_t stIndex) { BOOST_ASSERT(stIndex < m_vFilters.size()); if(stIndex < m_vFilters.size()) @@ -692,7 +692,7 @@ return false; } -size_t CFiltersArray::GetSize() const +size_t TFiltersArray::GetSize() const { return m_vFilters.size(); } Index: src/libchcore/FileFilter.h =================================================================== diff -u -N -rf46d334ffd78c7daa7626f214ae698adbac5f36d -r2aea3ad6f3c68be709ac65c70d9646eafe3b034c --- src/libchcore/FileFilter.h (.../FileFilter.h) (revision f46d334ffd78c7daa7626f214ae698adbac5f36d) +++ src/libchcore/FileFilter.h (.../FileFilter.h) (revision 2aea3ad6f3c68be709ac65c70d9646eafe3b034c) @@ -28,7 +28,7 @@ class TConfig; -class LIBCHCORE_API CFileFilter +class LIBCHCORE_API TFileFilter { public: enum ESizeCompareType @@ -57,11 +57,11 @@ }; public: - CFileFilter(); - CFileFilter(const CFileFilter& rFilter); - CFileFilter& operator=(const CFileFilter& rFilter); + TFileFilter(); + TFileFilter(const TFileFilter& rFilter); + TFileFilter& operator=(const TFileFilter& rFilter); - bool Match(const CFileInfoPtr& spInfo) const; + bool Match(const TFileInfoPtr& spInfo) const; chcore::TString& GetCombinedMask(chcore::TString& pMask) const; void SetCombinedMask(const chcore::TString& pMask); @@ -107,15 +107,15 @@ void SetSize2(unsigned long long ullSize2) { m_ullSize2 = ullSize2; } // dates - CFileFilter::EDateType GetDateType() const { return m_eDateType; } - void SetDateType(CFileFilter::EDateType eDateType) { m_eDateType = eDateType; } + TFileFilter::EDateType GetDateType() const { return m_eDateType; } + void SetDateType(TFileFilter::EDateType eDateType) { m_eDateType = eDateType; } // date 1 bool GetUseDateTime1() const { return m_bUseDateTime1; } void SetUseDateTime1(bool bUseDateTime1) { m_bUseDateTime1 = bUseDateTime1; } - CFileFilter::EDateCompareType GetDateCmpType1() const { return m_eDateCmpType1; } - void SetDateCmpType1(CFileFilter::EDateCompareType eCmpType1) { m_eDateCmpType1 = eCmpType1; } + TFileFilter::EDateCompareType GetDateCmpType1() const { return m_eDateCmpType1; } + void SetDateCmpType1(TFileFilter::EDateCompareType eCmpType1) { m_eDateCmpType1 = eCmpType1; } bool GetUseDate1() const { return m_bUseDate1; } void SetUseDate1(bool tDate1) { m_bUseDate1 = tDate1; } @@ -130,8 +130,8 @@ bool GetUseDateTime2() const { return m_bUseDateTime2; } void SetUseDateTime2(bool bUseDateTime2) { m_bUseDateTime2 = bUseDateTime2; } - CFileFilter::EDateCompareType GetDateCmpType2() const { return m_eDateCmpType2; } - void SetDateCmpType2(CFileFilter::EDateCompareType eCmpType2) { m_eDateCmpType2 = eCmpType2; } + TFileFilter::EDateCompareType GetDateCmpType2() const { return m_eDateCmpType2; } + void SetDateCmpType2(TFileFilter::EDateCompareType eCmpType2) { m_eDateCmpType2 = eCmpType2; } bool GetUseDate2() const { return m_bUseDate2; } void SetUseDate2(bool tDate2) { m_bUseDate2 = tDate2; } @@ -211,14 +211,14 @@ int m_iDirectory; }; -class LIBCHCORE_API CFiltersArray +class LIBCHCORE_API TFiltersArray { public: - CFiltersArray() {} - ~CFiltersArray() {} + TFiltersArray() {} + ~TFiltersArray() {} - CFiltersArray& operator=(const CFiltersArray& rSrc); - bool Match(const CFileInfoPtr& spInfo) const; + TFiltersArray& operator=(const TFiltersArray& rSrc); + bool Match(const TFileInfoPtr& spInfo) const; void StoreInConfig(chcore::TConfig& rConfig, PCTSTR pszNodeName) const; bool ReadFromConfig(const chcore::TConfig& rConfig, PCTSTR pszNodeName); @@ -228,21 +228,21 @@ bool IsEmpty() const; - void Add(const CFileFilter& rFilter); - bool SetAt(size_t stIndex, const CFileFilter& rNewFilter); - const CFileFilter* GetAt(size_t stIndex) const; + void Add(const TFileFilter& rFilter); + bool SetAt(size_t stIndex, const TFileFilter& rNewFilter); + const TFileFilter* GetAt(size_t stIndex) const; bool RemoveAt(size_t stIndex); size_t GetSize() const; -protected: +private: #pragma warning(push) #pragma warning(disable: 4251) - std::vector m_vFilters; + std::vector m_vFilters; #pragma warning(pop) }; END_CHCORE_NAMESPACE -CONFIG_MEMBER_SERIALIZATION(CFiltersArray) +CONFIG_MEMBER_SERIALIZATION(TFiltersArray) #endif Index: src/libchcore/FileInfo.cpp =================================================================== diff -u -N -rd12e49decb8a3df3e28f6786d38542390484ac07 -r2aea3ad6f3c68be709ac65c70d9646eafe3b034c --- src/libchcore/FileInfo.cpp (.../FileInfo.cpp) (revision d12e49decb8a3df3e28f6786d38542390484ac07) +++ src/libchcore/FileInfo.cpp (.../FileInfo.cpp) (revision 2aea3ad6f3c68be709ac65c70d9646eafe3b034c) @@ -31,7 +31,7 @@ // Construction/Destruction ////////////////////////////////////////////////////////////////////// -CFileInfo::CFileInfo() : +TFileInfo::TFileInfo() : m_pBasePaths(NULL), m_pathFile(), m_stSrcIndex(std::numeric_limits::max()), @@ -44,7 +44,7 @@ m_ftLastWrite.dwHighDateTime = m_ftLastWrite.dwLowDateTime = 0; } -CFileInfo::CFileInfo(const CFileInfo& finf) : +TFileInfo::TFileInfo(const TFileInfo& finf) : m_pathFile(finf.m_pathFile), m_stSrcIndex(finf.m_stSrcIndex), m_dwAttributes(finf.m_dwAttributes), @@ -57,11 +57,11 @@ { } -CFileInfo::~CFileInfo() +TFileInfo::~TFileInfo() { } -void CFileInfo::Init(const chcore::TSmartPath& rpathFile, size_t stSrcIndex, const chcore::TPathContainer* pBasePaths, +void TFileInfo::Init(const chcore::TSmartPath& rpathFile, size_t stSrcIndex, const chcore::TPathContainer* pBasePaths, DWORD dwAttributes, ULONGLONG uhFileSize, FILETIME ftCreation, FILETIME ftLastAccess, FILETIME ftLastWrite, uint_t uiFlags) { @@ -79,7 +79,7 @@ m_pathFile.MakeRelativePath(m_pBasePaths->GetAt(m_stSrcIndex)); // cut path from clipboard } -void CFileInfo::Init(const chcore::TSmartPath& rpathFile, DWORD dwAttributes, ULONGLONG uhFileSize, FILETIME ftCreation, FILETIME ftLastAccess, FILETIME ftLastWrite, +void TFileInfo::Init(const chcore::TSmartPath& rpathFile, DWORD dwAttributes, ULONGLONG uhFileSize, FILETIME ftCreation, FILETIME ftLastAccess, FILETIME ftLastWrite, uint_t uiFlags) { m_pathFile = rpathFile; @@ -93,7 +93,7 @@ m_uiFlags = uiFlags; } -void CFileInfo::SetParentObject(size_t stIndex, const chcore::TPathContainer* pBasePaths) +void TFileInfo::SetParentObject(size_t stIndex, const chcore::TPathContainer* pBasePaths) { // cannot set parent object if there is already one specified if(m_pBasePaths && m_stSrcIndex != std::numeric_limits::max()) @@ -106,13 +106,13 @@ m_pathFile.MakeRelativePath(m_pBasePaths->GetAt(m_stSrcIndex)); } -bool CFileInfo::operator==(const CFileInfo& rInfo) +bool TFileInfo::operator==(const TFileInfo& rInfo) { return (rInfo.m_dwAttributes == m_dwAttributes && rInfo.m_ftCreation.dwHighDateTime == m_ftCreation.dwHighDateTime && rInfo.m_ftCreation.dwLowDateTime == m_ftCreation.dwLowDateTime && rInfo.m_ftLastWrite.dwHighDateTime == m_ftLastWrite.dwHighDateTime && rInfo.m_ftLastWrite.dwLowDateTime == m_ftLastWrite.dwLowDateTime && rInfo.m_uhFileSize == m_uhFileSize); } -chcore::TSmartPath CFileInfo::GetFullFilePath() const +chcore::TSmartPath TFileInfo::GetFullFilePath() const { if(m_stSrcIndex != std::numeric_limits::max()) { @@ -128,7 +128,7 @@ return m_pathFile; } -void CFileInfo::Serialize(chcore::TReadBinarySerializer& rSerializer) +void TFileInfo::Serialize(chcore::TReadBinarySerializer& rSerializer) { using chcore::Serializers::Serialize; @@ -145,7 +145,7 @@ Serialize(rSerializer, m_uiFlags); } -void CFileInfo::Serialize(chcore::TWriteBinarySerializer& rSerializer) const +void TFileInfo::Serialize(chcore::TWriteBinarySerializer& rSerializer) const { using chcore::Serializers::Serialize; @@ -164,28 +164,28 @@ /////////////////////////////////////////////////////////////////////// // Array -CFileInfoArray::CFileInfoArray(const chcore::TPathContainer& rBasePaths) : +TFileInfoArray::TFileInfoArray(const chcore::TPathContainer& rBasePaths) : m_rBasePaths(rBasePaths) { } -CFileInfoArray::~CFileInfoArray() +TFileInfoArray::~TFileInfoArray() { } -void CFileInfoArray::AddFileInfo(const CFileInfoPtr& spFileInfo) +void TFileInfoArray::AddFileInfo(const TFileInfoPtr& spFileInfo) { boost::unique_lock lock(m_lock); m_vFiles.push_back(spFileInfo); } -size_t CFileInfoArray::GetSize() const +size_t TFileInfoArray::GetSize() const { boost::shared_lock lock(m_lock); return m_vFiles.size(); } -CFileInfoPtr CFileInfoArray::GetAt(size_t stIndex) const +TFileInfoPtr TFileInfoArray::GetAt(size_t stIndex) const { boost::shared_lock lock(m_lock); @@ -195,39 +195,39 @@ return m_vFiles.at(stIndex); } -CFileInfo CFileInfoArray::GetCopyAt(size_t stIndex) const +TFileInfo TFileInfoArray::GetCopyAt(size_t stIndex) const { boost::shared_lock lock(m_lock); if(stIndex >= m_vFiles.size()) THROW(_T("Out of bounds"), 0, 0, 0); - const CFileInfoPtr& spInfo = m_vFiles.at(stIndex); + const TFileInfoPtr& spInfo = m_vFiles.at(stIndex); if(!spInfo) THROW(_T("Invalid pointer"), 0, 0, 0); return *spInfo; } -void CFileInfoArray::Clear() +void TFileInfoArray::Clear() { boost::unique_lock lock(m_lock); m_vFiles.clear(); } -unsigned long long CFileInfoArray::CalculateTotalSize() +unsigned long long TFileInfoArray::CalculateTotalSize() { unsigned long long ullSize = 0; boost::shared_lock lock(m_lock); - BOOST_FOREACH(CFileInfoPtr& spFileInfo, m_vFiles) + BOOST_FOREACH(TFileInfoPtr& spFileInfo, m_vFiles) { ullSize += spFileInfo->GetLength64(); } return ullSize; } -void CFileInfoArray::Serialize(chcore::TReadBinarySerializer& rSerializer, bool bOnlyFlags) +void TFileInfoArray::Serialize(chcore::TReadBinarySerializer& rSerializer, bool bOnlyFlags) { using chcore::Serializers::Serialize; @@ -242,35 +242,35 @@ else if(stCount != m_vFiles.size()) THROW(_T("Invalid count of flags received"), 0, 0, 0); - CFileInfoPtr spFileInfo; + TFileInfoPtr spFileInfo; uint_t uiFlags = 0; for(size_t stIndex = 0; stIndex < stCount; stIndex++) { if(bOnlyFlags) { - CFileInfoPtr& rspFileInfo = m_vFiles.at(stIndex); + TFileInfoPtr& rspFileInfo = m_vFiles.at(stIndex); Serialize(rSerializer, uiFlags); rspFileInfo->SetFlags(uiFlags); } else { - spFileInfo.reset(new CFileInfo); + spFileInfo.reset(new TFileInfo); spFileInfo->SetClipboard(&m_rBasePaths); Serialize(rSerializer, *spFileInfo); m_vFiles.push_back(spFileInfo); } } } -void CFileInfoArray::Serialize(chcore::TWriteBinarySerializer& rSerializer, bool bOnlyFlags) const +void TFileInfoArray::Serialize(chcore::TWriteBinarySerializer& rSerializer, bool bOnlyFlags) const { using chcore::Serializers::Serialize; size_t stCount = m_vFiles.size(); Serialize(rSerializer, stCount); - for(std::vector::const_iterator iterFile = m_vFiles.begin(); iterFile != m_vFiles.end(); ++iterFile) + for(std::vector::const_iterator iterFile = m_vFiles.begin(); iterFile != m_vFiles.end(); ++iterFile) { if(bOnlyFlags) { @@ -282,15 +282,15 @@ } } -unsigned long long CFileInfoArray::CalculatePartialSize(size_t stCount) +unsigned long long TFileInfoArray::CalculatePartialSize(size_t stCount) { unsigned long long ullSize = 0; boost::shared_lock lock(m_lock); if(stCount > m_vFiles.size()) THROW(_T("Invalid argument"), 0, 0, 0); - for(std::vector::iterator iter = m_vFiles.begin(); iter != m_vFiles.begin() + stCount; ++iter) + for(std::vector::iterator iter = m_vFiles.begin(); iter != m_vFiles.begin() + stCount; ++iter) { ullSize += (*iter)->GetLength64(); } Index: src/libchcore/FileInfo.h =================================================================== diff -u -N -rf46d334ffd78c7daa7626f214ae698adbac5f36d -r2aea3ad6f3c68be709ac65c70d9646eafe3b034c --- src/libchcore/FileInfo.h (.../FileInfo.h) (revision f46d334ffd78c7daa7626f214ae698adbac5f36d) +++ src/libchcore/FileInfo.h (.../FileInfo.h) (revision 2aea3ad6f3c68be709ac65c70d9646eafe3b034c) @@ -31,14 +31,14 @@ // flag stating that file has been processed (used to determine if file can be deleted at the end of copying) #define FIF_PROCESSED 0x00000001 -class CFiltersArray; +class TFiltersArray; -class LIBCHCORE_API CFileInfo +class LIBCHCORE_API TFileInfo { public: - CFileInfo(); - CFileInfo(const CFileInfo& finf); - ~CFileInfo(); + TFileInfo(); + TFileInfo(const TFileInfo& finf); + ~TFileInfo(); // with base path void Init(const chcore::TSmartPath& rpathFile, size_t stSrcIndex, const chcore::TPathContainer* pBasePaths, @@ -85,7 +85,7 @@ size_t GetSrcIndex() const { return m_stSrcIndex; }; // operators - bool operator==(const CFileInfo& rInfo); + bool operator==(const TFileInfo& rInfo); void Serialize(chcore::TReadBinarySerializer& rSerializer); void Serialize(chcore::TWriteBinarySerializer& rSerializer) const; @@ -105,25 +105,25 @@ uint_t m_uiFlags; }; -typedef boost::shared_ptr CFileInfoPtr; +typedef boost::shared_ptr TFileInfoPtr; -class LIBCHCORE_API CFileInfoArray +class LIBCHCORE_API TFileInfoArray { public: - CFileInfoArray(const chcore::TPathContainer& rBasePaths); - ~CFileInfoArray(); + TFileInfoArray(const chcore::TPathContainer& rBasePaths); + ~TFileInfoArray(); // Adds a new object info to this container - void AddFileInfo(const CFileInfoPtr& spFileInfo); + void AddFileInfo(const TFileInfoPtr& spFileInfo); /// Retrieves count of elements in this object size_t GetSize() const; /// Retrieves an element at the specified index - CFileInfoPtr GetAt(size_t stIndex) const; + TFileInfoPtr GetAt(size_t stIndex) const; /// Retrieves a copy of the element at a specified index - CFileInfo GetCopyAt(size_t stIndex) const; + TFileInfo GetCopyAt(size_t stIndex) const; /// Removes all elements from this object void Clear(); @@ -144,7 +144,7 @@ #pragma warning(push) #pragma warning(disable: 4251) - std::vector m_vFiles; + std::vector m_vFiles; mutable boost::shared_mutex m_lock; #pragma warning(pop) };