Index: src/libchcore/TFileFiltersArray.cpp
===================================================================
diff -u -re92d7e2b63df1305b23aa04132c45ad8747dc22c -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3
--- src/libchcore/TFileFiltersArray.cpp	(.../TFileFiltersArray.cpp)	(revision e92d7e2b63df1305b23aa04132c45ad8747dc22c)
+++ src/libchcore/TFileFiltersArray.cpp	(.../TFileFiltersArray.cpp)	(revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
@@ -22,168 +22,167 @@
 #include "TConfig.h"
 #include "TConfigArray.h"
 
-BEGIN_CHCORE_NAMESPACE
-
-TFileFiltersArray::TFileFiltersArray()
+namespace chcore
 {
-}
+	TFileFiltersArray::TFileFiltersArray()
+	{
+	}
 
-TFileFiltersArray::~TFileFiltersArray()
-{
-}
-
-TFileFiltersArray& TFileFiltersArray::operator=(const TFileFiltersArray& rSrc)
-{
-	if(this != &rSrc)
+	TFileFiltersArray::~TFileFiltersArray()
 	{
-		m_vFilters = rSrc.m_vFilters;
 	}
 
-	return *this;
-}
+	TFileFiltersArray& TFileFiltersArray::operator=(const TFileFiltersArray& rSrc)
+	{
+		if (this != &rSrc)
+		{
+			m_vFilters = rSrc.m_vFilters;
+		}
 
-bool TFileFiltersArray::Match(const TFileInfoPtr& spInfo) const
-{
-	if(m_vFilters.empty())
-		return true;
+		return *this;
+	}
 
-	// if only one of the filters matches - return true
-	for(std::vector<TFileFilter>::const_iterator iterFilter = m_vFilters.begin(); iterFilter != m_vFilters.end(); iterFilter++)
+	bool TFileFiltersArray::Match(const TFileInfoPtr& spInfo) const
 	{
-		if((*iterFilter).Match(spInfo))
+		if (m_vFilters.empty())
 			return true;
-	}
 
-	return false;
-}
+		// if only one of the filters matches - return true
+		for (std::vector<TFileFilter>::const_iterator iterFilter = m_vFilters.begin(); iterFilter != m_vFilters.end(); iterFilter++)
+		{
+			if ((*iterFilter).Match(spInfo))
+				return true;
+		}
 
-void TFileFiltersArray::StoreInConfig(TConfig& rConfig, PCTSTR pszNodeName) const
-{
-	rConfig.DeleteNode(pszNodeName);
-	BOOST_FOREACH(const TFileFilter& rFilter, m_vFilters)
+		return false;
+	}
+
+	void TFileFiltersArray::StoreInConfig(TConfig& rConfig, PCTSTR pszNodeName) const
 	{
-		TConfig cfgNode;
-		rFilter.StoreInConfig(cfgNode);
+		rConfig.DeleteNode(pszNodeName);
+		BOOST_FOREACH(const TFileFilter& rFilter, m_vFilters)
+		{
+			TConfig cfgNode;
+			rFilter.StoreInConfig(cfgNode);
 
-		TString strNode = TString(pszNodeName) + _T(".FilterDefinition");
-		rConfig.AddSubConfig(strNode.c_str(), cfgNode);
+			TString strNode = TString(pszNodeName) + _T(".FilterDefinition");
+			rConfig.AddSubConfig(strNode.c_str(), cfgNode);
+		}
 	}
-}
 
-bool TFileFiltersArray::ReadFromConfig(const TConfig& rConfig, PCTSTR pszNodeName)
-{
-	m_vFilters.clear();
+	bool TFileFiltersArray::ReadFromConfig(const TConfig& rConfig, PCTSTR pszNodeName)
+	{
+		m_vFilters.clear();
 
-	TConfigArray vConfigs;
-	if(!rConfig.ExtractMultiSubConfigs(pszNodeName, vConfigs))
-		return false;
+		TConfigArray vConfigs;
+		if (!rConfig.ExtractMultiSubConfigs(pszNodeName, vConfigs))
+			return false;
 
-	for(size_t stIndex = 0; stIndex < vConfigs.GetCount(); ++stIndex)
-	{
-		const TConfig& rCfg = vConfigs.GetAt(stIndex);
-		TFileFilter tFilter;
-		tFilter.ReadFromConfig(rCfg);
+		for (size_t stIndex = 0; stIndex < vConfigs.GetCount(); ++stIndex)
+		{
+			const TConfig& rCfg = vConfigs.GetAt(stIndex);
+			TFileFilter tFilter;
+			tFilter.ReadFromConfig(rCfg);
 
-		m_vFilters.push_back(tFilter);
+			m_vFilters.push_back(tFilter);
+		}
+		return true;
 	}
-	return true;
-}
 
-bool TFileFiltersArray::IsEmpty() const
-{
-	return m_vFilters.empty();
-}
+	bool TFileFiltersArray::IsEmpty() const
+	{
+		return m_vFilters.empty();
+	}
 
-void TFileFiltersArray::Add(const TFileFilter& rFilter)
-{
-	m_vFilters.push_back(rFilter);
-}
+	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())
+	bool TFileFiltersArray::SetAt(size_t stIndex, const TFileFilter& rNewFilter)
 	{
-		TFileFilter& rFilter = m_vFilters.at(stIndex);
+		BOOST_ASSERT(stIndex < m_vFilters.size());
+		if (stIndex < m_vFilters.size())
+		{
+			TFileFilter& rFilter = m_vFilters.at(stIndex);
 
-		rFilter.SetData(rNewFilter);
-		return true;
+			rFilter.SetData(rNewFilter);
+			return true;
+		}
+		else
+			return false;
 	}
-	else
-		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);
-	else
-		return NULL;
-}
+	const TFileFilter* TFileFiltersArray::GetAt(size_t stIndex) const
+	{
+		BOOST_ASSERT(stIndex < m_vFilters.size());
+		if (stIndex < m_vFilters.size())
+			return &m_vFilters.at(stIndex);
+		else
+			return NULL;
+	}
 
-bool TFileFiltersArray::RemoveAt(size_t stIndex)
-{
-	BOOST_ASSERT(stIndex < m_vFilters.size());
-	if(stIndex < m_vFilters.size())
+	bool TFileFiltersArray::RemoveAt(size_t stIndex)
 	{
-		m_setRemovedObjects.Add(m_vFilters[stIndex].GetObjectID());
+		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;
+			m_vFilters.erase(m_vFilters.begin() + stIndex);
+			return true;
+		}
+		else
+			return false;
 	}
-	else
-		return false;
-}
 
-size_t TFileFiltersArray::GetSize() const
-{
-	return m_vFilters.size();
-}
+	size_t TFileFiltersArray::GetSize() const
+	{
+		return m_vFilters.size();
+	}
 
-void TFileFiltersArray::Clear()
-{
-	BOOST_FOREACH(const TFileFilter& rFilter, m_vFilters)
+	void TFileFiltersArray::Clear()
 	{
-		m_setRemovedObjects.Add(rFilter.GetObjectID());
+		BOOST_FOREACH(const TFileFilter& rFilter, m_vFilters)
+		{
+			m_setRemovedObjects.Add(rFilter.GetObjectID());
+		}
+		m_vFilters.clear();
 	}
-	m_vFilters.clear();
-}
 
-void TFileFiltersArray::Store(const ISerializerContainerPtr& spContainer) const
-{
-	InitColumns(spContainer);
+	void TFileFiltersArray::Store(const ISerializerContainerPtr& spContainer) const
+	{
+		InitColumns(spContainer);
 
-	spContainer->DeleteRows(m_setRemovedObjects);
-	m_setRemovedObjects.Clear();
+		spContainer->DeleteRows(m_setRemovedObjects);
+		m_setRemovedObjects.Clear();
 
-	BOOST_FOREACH(const TFileFilter& rFilter, m_vFilters)
-	{
-		rFilter.Store(spContainer);
+		BOOST_FOREACH(const TFileFilter& rFilter, m_vFilters)
+		{
+			rFilter.Store(spContainer);
+		}
 	}
-}
 
-void TFileFiltersArray::Load(const ISerializerContainerPtr& spContainer)
-{
-	InitColumns(spContainer);
-
-	ISerializerRowReaderPtr spRowReader = spContainer->GetRowReader();
-	while(spRowReader->Next())
+	void TFileFiltersArray::Load(const ISerializerContainerPtr& spContainer)
 	{
-		TFileFilter tFileFilter;
-		tFileFilter.Load(spRowReader);
+		InitColumns(spContainer);
 
-		tFileFilter.ResetModifications();
+		ISerializerRowReaderPtr spRowReader = spContainer->GetRowReader();
+		while (spRowReader->Next())
+		{
+			TFileFilter tFileFilter;
+			tFileFilter.Load(spRowReader);
 
-		m_vFilters.push_back(tFileFilter);
+			tFileFilter.ResetModifications();
+
+			m_vFilters.push_back(tFileFilter);
+		}
 	}
-}
 
-void TFileFiltersArray::InitColumns(const ISerializerContainerPtr& spContainer) const
-{
-	IColumnsDefinition& rColumns = spContainer->GetColumnsDefinition();
-	if(rColumns.IsEmpty())
-		TFileFilter::InitColumns(rColumns);
+	void TFileFiltersArray::InitColumns(const ISerializerContainerPtr& spContainer) const
+	{
+		IColumnsDefinition& rColumns = spContainer->GetColumnsDefinition();
+		if (rColumns.IsEmpty())
+			TFileFilter::InitColumns(rColumns);
+	}
 }
-
-END_CHCORE_NAMESPACE