Index: src/ch/CustomCopyDlg.cpp =================================================================== diff -u -N -r10d4c73f3589c377ec0b60a2a053ff6aafeb507f -rd12e49decb8a3df3e28f6786d38542390484ac07 --- src/ch/CustomCopyDlg.cpp (.../CustomCopyDlg.cpp) (revision 10d4c73f3589c377ec0b60a2a053ff6aafeb507f) +++ src/ch/CustomCopyDlg.cpp (.../CustomCopyDlg.cpp) (revision d12e49decb8a3df3e28f6786d38542390484ac07) @@ -19,7 +19,7 @@ #include "stdafx.h" #include #include "resource.h" -#include "FileInfo.h" +#include "../libchcore/FileInfo.h" #include "CustomCopyDlg.h" #include "structs.h" #include "dialogs.h" @@ -278,7 +278,7 @@ lvc.cx=static_cast(0.1*rc.Width()); m_ctlFilters.InsertColumn(6, &lvc); - CFiltersArray afFilters; + chcore::CFiltersArray 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 - CFiltersArray afFilters = GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); + chcore::CFiltersArray afFilters = GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); m_ctlFilters.DeleteAllItems(); for(size_t stIndex = 0; stIndex < afFilters.GetSize(); ++stIndex) { - const CFileFilter* pFilter = afFilters.GetAt(stIndex); + const chcore::CFileFilter* pFilter = afFilters.GetAt(stIndex); if(pFilter) AddFilter(*pFilter, boost::numeric_cast(stIndex)); } @@ -593,10 +593,10 @@ CFilterDlg dlg; chcore::TString strData; - CFiltersArray afFilters = GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); + chcore::CFiltersArray afFilters = GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); for (size_t i = 0; i < afFilters.GetSize(); i++) { - const CFileFilter* pFilter = afFilters.GetAt(i); + const chcore::CFileFilter* pFilter = afFilters.GetAt(i); BOOST_ASSERT(pFilter); if(pFilter) { @@ -620,7 +620,7 @@ } } -void CCustomCopyDlg::AddFilter(const CFileFilter &rFilter, int iPos) +void CCustomCopyDlg::AddFilter(const chcore::CFileFilter &rFilter, int iPos) { LVITEM lvi; TCHAR szLoaded[1024]; @@ -763,7 +763,7 @@ void CCustomCopyDlg::OnRemovefilterButton() { - CFiltersArray afFilters = GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); + chcore::CFiltersArray afFilters = GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); POSITION pos; int iItem; @@ -824,11 +824,11 @@ POSITION pos = m_ctlFilters.GetFirstSelectedItemPosition(); if(pos != NULL) { - CFiltersArray afFilters = GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); + chcore::CFiltersArray afFilters = GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); int iItem = m_ctlFilters.GetNextSelectedItem(pos); CFilterDlg dlg; - const CFileFilter* pFilter = afFilters.GetAt(iItem); + const chcore::CFileFilter* pFilter = afFilters.GetAt(iItem); BOOST_ASSERT(pFilter); if(pFilter) dlg.m_ffFilter = *pFilter;