Index: src/libchengine/TFileFiltersArray.cpp =================================================================== diff -u -N -r85b07e753393f661f7d8f528e4238ebb6e9e1204 -rf3c80778cfee0736195e00274c78040f7908ac5b --- src/libchengine/TFileFiltersArray.cpp (.../TFileFiltersArray.cpp) (revision 85b07e753393f661f7d8f528e4238ebb6e9e1204) +++ src/libchengine/TFileFiltersArray.cpp (.../TFileFiltersArray.cpp) (revision f3c80778cfee0736195e00274c78040f7908ac5b) @@ -28,21 +28,13 @@ namespace chengine { - TFileFiltersArray::TFileFiltersArray() - { - } - - TFileFiltersArray::~TFileFiltersArray() - { - } - bool TFileFiltersArray::Match(const TFileInfoPtr& spInfo) const { - if(m_vFilters.empty()) + if(m_vEntries.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_vEntries.begin(); iterFilter != m_vEntries.end(); ++iterFilter) { if((*iterFilter).Match(spInfo)) return true; @@ -54,7 +46,7 @@ void TFileFiltersArray::StoreInConfig(TConfig& rConfig, PCTSTR pszNodeName) const { rConfig.DeleteNode(pszNodeName); - for(const TFileFilter& rFilter : m_vFilters) + for(const TFileFilter& rFilter : m_vEntries) { TConfig cfgNode; rFilter.StoreInConfig(cfgNode); @@ -66,7 +58,7 @@ bool TFileFiltersArray::ReadFromConfig(const TConfig& rConfig, PCTSTR pszNodeName) { - m_vFilters.clear(); + m_vEntries.clear(); TConfigArray vConfigs; if(!rConfig.ExtractMultiSubConfigs(pszNodeName, vConfigs)) @@ -78,100 +70,11 @@ TFileFilter tFilter; tFilter.ReadFromConfig(rCfg); - m_vFilters.push_back(tFilter); + m_vEntries.push_back(tFilter); } return true; } - bool TFileFiltersArray::IsEmpty() const - { - return m_vFilters.empty(); - } - - void TFileFiltersArray::Add(const TFileFilter& rFilter) - { - m_vFilters.push_back(rFilter); - } - - bool TFileFiltersArray::SetAt(size_t stIndex, const TFileFilter& rNewFilter) - { - BOOST_ASSERT(stIndex < m_vFilters.size()); - if(stIndex < m_vFilters.size()) - { - TFileFilter& rFilter = m_vFilters.at(stIndex); - - rFilter.SetData(rNewFilter); - return true; - } - - return false; - } - - const TFileFilter& TFileFiltersArray::GetAt(size_t stIndex) const - { - if(stIndex >= m_vFilters.size()) - throw std::out_of_range("stIndex is out of range"); - - return m_vFilters.at(stIndex); - } - - bool TFileFiltersArray::RemoveAt(size_t stIndex) - { - BOOST_ASSERT(stIndex < m_vFilters.size()); - if(stIndex < m_vFilters.size()) - { - m_setRemovedObjects.Add(m_vFilters[ stIndex ].GetObjectID()); - - m_vFilters.erase(m_vFilters.begin() + stIndex); - return true; - } - - return false; - } - - size_t TFileFiltersArray::GetCount() const - { - return m_vFilters.size(); - } - - void TFileFiltersArray::Clear() - { - for(const TFileFilter& rFilter : m_vFilters) - { - m_setRemovedObjects.Add(rFilter.GetObjectID()); - } - m_vFilters.clear(); - } - - void TFileFiltersArray::Store(const ISerializerContainerPtr& spContainer) const - { - InitColumns(spContainer); - - spContainer->DeleteRows(m_setRemovedObjects); - m_setRemovedObjects.Clear(); - - for(const TFileFilter& rFilter : m_vFilters) - { - rFilter.Store(spContainer); - } - } - - void TFileFiltersArray::Load(const ISerializerContainerPtr& spContainer) - { - InitColumns(spContainer); - - ISerializerRowReaderPtr spRowReader = spContainer->GetRowReader(); - while(spRowReader->Next()) - { - TFileFilter tFileFilter; - tFileFilter.Load(spRowReader); - - tFileFilter.ResetModifications(); - - m_vFilters.push_back(tFileFilter); - } - } - void TFileFiltersArray::InitColumns(const ISerializerContainerPtr& spContainer) const { IColumnsDefinition& rColumns = spContainer->GetColumnsDefinition();