Index: src/libchengine/TFileFiltersArray.cpp =================================================================== diff -u -N -r9ddf8fdd5f641491dd30c49eb90f8f740314b6af -rfadd6c9c628de875716d96c3a497b5bc6c8dca8a --- src/libchengine/TFileFiltersArray.cpp (.../TFileFiltersArray.cpp) (revision 9ddf8fdd5f641491dd30c49eb90f8f740314b6af) +++ src/libchengine/TFileFiltersArray.cpp (.../TFileFiltersArray.cpp) (revision fadd6c9c628de875716d96c3a497b5bc6c8dca8a) @@ -28,21 +28,13 @@ namespace chengine { - TFileFiltersArray::TFileFiltersArray() - { - } - - TFileFiltersArray::~TFileFiltersArray() - { - } - bool TFileFiltersArray::Match(const TFileInfoPtr& spInfo) const { - if (m_vFilters.empty()) + if (m_vItems.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_vItems.begin(); iterFilter != m_vItems.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_vItems) { TConfig cfgNode; rFilter.StoreInConfig(cfgNode); @@ -66,7 +58,7 @@ bool TFileFiltersArray::ReadFromConfig(const TConfig& rConfig, PCTSTR pszNodeName) { - m_vFilters.clear(); + m_vItems.clear(); TConfigArray vConfigs; if (!rConfig.ExtractMultiSubConfigs(pszNodeName, vConfigs)) @@ -78,80 +70,19 @@ TFileFilter tFilter; tFilter.ReadFromConfig(rCfg); - m_vFilters.push_back(tFilter); + m_vItems.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 - { - BOOST_ASSERT(stIndex < m_vFilters.size()); - if (stIndex < m_vFilters.size()) - return &m_vFilters.at(stIndex); - - return nullptr; - } - - 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::GetSize() 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) + for(const TFileFilter& rFilter : m_vItems) { rFilter.Store(spContainer); } @@ -169,7 +100,7 @@ tFileFilter.ResetModifications(); - m_vFilters.push_back(tFileFilter); + m_vItems.push_back(tFileFilter); } }