Index: src/libchcore/TPathContainer.cpp
===================================================================
diff -u -N -r11b0a299be97bc3afaa633d6522c17b214ba3b79 -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3
--- src/libchcore/TPathContainer.cpp	(.../TPathContainer.cpp)	(revision 11b0a299be97bc3afaa633d6522c17b214ba3b79)
+++ src/libchcore/TPathContainer.cpp	(.../TPathContainer.cpp)	(revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
@@ -22,200 +22,199 @@
 #include "ErrorCodes.h"
 #include "TStringArray.h"
 
-BEGIN_CHCORE_NAMESPACE
-
-// ============================================================================
-/// TPathContainer::TPathContainer
-/// @date 2009/11/30
-///
-/// @brief     Constructs an empty path container object.
-// ============================================================================
-TPathContainer::TPathContainer() :
-m_vPaths()
+namespace chcore
 {
-}
+	// ============================================================================
+	/// TPathContainer::TPathContainer
+	/// @date 2009/11/30
+	///
+	/// @brief     Constructs an empty path container object.
+	// ============================================================================
+	TPathContainer::TPathContainer() :
+		m_vPaths()
+	{
+	}
 
-// ============================================================================
-/// TPathContainer::TPathContainer
-/// @date 2009/11/30
-///
-/// @brief     Constructs the path container object from another path container.
-/// @param[in] rSrcContainer - path container to copy paths from.
-// ============================================================================
-TPathContainer::TPathContainer(const TPathContainer& rSrcContainer) :
-m_vPaths(rSrcContainer.m_vPaths)
-{
-}
+	// ============================================================================
+	/// TPathContainer::TPathContainer
+	/// @date 2009/11/30
+	///
+	/// @brief     Constructs the path container object from another path container.
+	/// @param[in] rSrcContainer - path container to copy paths from.
+	// ============================================================================
+	TPathContainer::TPathContainer(const TPathContainer& rSrcContainer) :
+		m_vPaths(rSrcContainer.m_vPaths)
+	{
+	}
 
-// ============================================================================
-/// TPathContainer::~TPathContainer
-/// @date 2009/11/30
-///
-/// @brief     Destructs this path container object.
-// ============================================================================
-TPathContainer::~TPathContainer()
-{
-}
+	// ============================================================================
+	/// TPathContainer::~TPathContainer
+	/// @date 2009/11/30
+	///
+	/// @brief     Destructs this path container object.
+	// ============================================================================
+	TPathContainer::~TPathContainer()
+	{
+	}
 
-// ============================================================================
-/// TPathContainer::operator=
-/// @date 2009/11/30
-///
-/// @brief     Assigns another path container object to this one.
-/// @param[in] rSrcContainer - container with paths to copy from.
-/// @return    Reference to this object.
-// ============================================================================
-TPathContainer& TPathContainer::operator=(const TPathContainer& rSrcContainer)
-{
-	if(this != &rSrcContainer)
-		m_vPaths = rSrcContainer.m_vPaths;
+	// ============================================================================
+	/// TPathContainer::operator=
+	/// @date 2009/11/30
+	///
+	/// @brief     Assigns another path container object to this one.
+	/// @param[in] rSrcContainer - container with paths to copy from.
+	/// @return    Reference to this object.
+	// ============================================================================
+	TPathContainer& TPathContainer::operator=(const TPathContainer& rSrcContainer)
+	{
+		if (this != &rSrcContainer)
+			m_vPaths = rSrcContainer.m_vPaths;
 
-	return *this;
-}
+		return *this;
+	}
 
-// ============================================================================
-/// TPathContainer::Add
-/// @date 2009/11/30
-///
-/// @brief     Adds a path to the end of list.
-/// @param[in] spPath - path to be added.
-// ============================================================================
-void TPathContainer::Add(const TSmartPath& spPath)
-{
-	m_vPaths.push_back(spPath);
-}
+	// ============================================================================
+	/// TPathContainer::Add
+	/// @date 2009/11/30
+	///
+	/// @brief     Adds a path to the end of list.
+	/// @param[in] spPath - path to be added.
+	// ============================================================================
+	void TPathContainer::Add(const TSmartPath& spPath)
+	{
+		m_vPaths.push_back(spPath);
+	}
 
-void TPathContainer::Append(const TPathContainer& vPaths)
-{
-	m_vPaths.insert(m_vPaths.end(), vPaths.m_vPaths.begin(), vPaths.m_vPaths.end());
-}
+	void TPathContainer::Append(const TPathContainer& vPaths)
+	{
+		m_vPaths.insert(m_vPaths.end(), vPaths.m_vPaths.begin(), vPaths.m_vPaths.end());
+	}
 
-// ============================================================================
-/// TPathContainer::GetAt
-/// @date 2009/11/30
-///
-/// @brief     Retrieves path at specified index.
-/// @param[in] stIndex - index at which to retrieve item.
-/// @return    Reference to the path object.
-// ============================================================================
-const TSmartPath& TPathContainer::GetAt(size_t stIndex) const
-{
-	if(stIndex > m_vPaths.size())
-		THROW_CORE_EXCEPTION(eErr_BoundsExceeded);
+	// ============================================================================
+	/// TPathContainer::GetAt
+	/// @date 2009/11/30
+	///
+	/// @brief     Retrieves path at specified index.
+	/// @param[in] stIndex - index at which to retrieve item.
+	/// @return    Reference to the path object.
+	// ============================================================================
+	const TSmartPath& TPathContainer::GetAt(size_t stIndex) const
+	{
+		if (stIndex > m_vPaths.size())
+			THROW_CORE_EXCEPTION(eErr_BoundsExceeded);
 
-	return m_vPaths.at(stIndex);
-}
+		return m_vPaths.at(stIndex);
+	}
 
-// ============================================================================
-/// TPathContainer::GetAt
-/// @date 2009/11/30
-///
-/// @brief     Retrieves path at specified index.
-/// @param[in] stIndex - index at which to retrieve item.
-/// @return    Reference to the path object.
-// ============================================================================
-TSmartPath& TPathContainer::GetAt(size_t stIndex)
-{
-	if(stIndex > m_vPaths.size())
-		THROW_CORE_EXCEPTION(eErr_BoundsExceeded);
+	// ============================================================================
+	/// TPathContainer::GetAt
+	/// @date 2009/11/30
+	///
+	/// @brief     Retrieves path at specified index.
+	/// @param[in] stIndex - index at which to retrieve item.
+	/// @return    Reference to the path object.
+	// ============================================================================
+	TSmartPath& TPathContainer::GetAt(size_t stIndex)
+	{
+		if (stIndex > m_vPaths.size())
+			THROW_CORE_EXCEPTION(eErr_BoundsExceeded);
 
-	return m_vPaths.at(stIndex);
-}
+		return m_vPaths.at(stIndex);
+	}
 
-// ============================================================================
-/// TPathContainer::SetAt
-/// @date 2009/11/30
-///
-/// @brief     Sets a path at a specified index.
-/// @param[in] stIndex - index at which to set the path.
-/// @param[in] spPath -  path to be set.
-// ============================================================================
-void TPathContainer::SetAt(size_t stIndex, const TSmartPath& spPath)
-{
-	if(stIndex > m_vPaths.size())
-		THROW_CORE_EXCEPTION(eErr_BoundsExceeded);
+	// ============================================================================
+	/// TPathContainer::SetAt
+	/// @date 2009/11/30
+	///
+	/// @brief     Sets a path at a specified index.
+	/// @param[in] stIndex - index at which to set the path.
+	/// @param[in] spPath -  path to be set.
+	// ============================================================================
+	void TPathContainer::SetAt(size_t stIndex, const TSmartPath& spPath)
+	{
+		if (stIndex > m_vPaths.size())
+			THROW_CORE_EXCEPTION(eErr_BoundsExceeded);
 
-	m_vPaths[stIndex] = spPath;
-}
+		m_vPaths[stIndex] = spPath;
+	}
 
-// ============================================================================
-/// TPathContainer::DeleteAt
-/// @date 2009/11/30
-///
-/// @brief     Removes a path from container at specified index.
-/// @param[in] stIndex - index at which to delete.
-// ============================================================================
-void TPathContainer::DeleteAt(size_t stIndex)
-{
-	if(stIndex > m_vPaths.size())
-		THROW_CORE_EXCEPTION(eErr_BoundsExceeded);
+	// ============================================================================
+	/// TPathContainer::DeleteAt
+	/// @date 2009/11/30
+	///
+	/// @brief     Removes a path from container at specified index.
+	/// @param[in] stIndex - index at which to delete.
+	// ============================================================================
+	void TPathContainer::DeleteAt(size_t stIndex)
+	{
+		if (stIndex > m_vPaths.size())
+			THROW_CORE_EXCEPTION(eErr_BoundsExceeded);
 
-	m_vPaths.erase(m_vPaths.begin() + stIndex);
-}
+		m_vPaths.erase(m_vPaths.begin() + stIndex);
+	}
 
-// ============================================================================
-/// TPathContainer::Clear
-/// @date 2009/11/30
-///
-/// @brief     Removes all paths from this container.
-// ============================================================================
-void TPathContainer::Clear()
-{
-	m_vPaths.clear();
-}
+	// ============================================================================
+	/// TPathContainer::Clear
+	/// @date 2009/11/30
+	///
+	/// @brief     Removes all paths from this container.
+	// ============================================================================
+	void TPathContainer::Clear()
+	{
+		m_vPaths.clear();
+	}
 
-// ============================================================================
-/// TPathContainer::GetCount
-/// @date 2009/11/30
-///
-/// @brief     Retrieves count of elements in the container.
-/// @return    Count of elements.
-// ============================================================================
-size_t TPathContainer::GetCount() const
-{
-	return m_vPaths.size();
-}
+	// ============================================================================
+	/// TPathContainer::GetCount
+	/// @date 2009/11/30
+	///
+	/// @brief     Retrieves count of elements in the container.
+	/// @return    Count of elements.
+	// ============================================================================
+	size_t TPathContainer::GetCount() const
+	{
+		return m_vPaths.size();
+	}
 
-// ============================================================================
-/// TPathContainer::GetCount
-/// @date 2010/10/12
-///
-/// @brief     Retrieves info if this container is empty.
-/// @return    True if empty, false otherwise.
-// ============================================================================
-bool TPathContainer::IsEmpty() const
-{
-	return m_vPaths.empty();
-}
-
-void TPathContainer::StoreInConfig(TConfig& rConfig, PCTSTR pszPropName) const
-{
-	TStringArray vPaths;
-
-	// store as vector of strings (ineffective; should be done better)
-	BOOST_FOREACH(const TSmartPath& spPath, m_vPaths)
+	// ============================================================================
+	/// TPathContainer::GetCount
+	/// @date 2010/10/12
+	///
+	/// @brief     Retrieves info if this container is empty.
+	/// @return    True if empty, false otherwise.
+	// ============================================================================
+	bool TPathContainer::IsEmpty() const
 	{
-		vPaths.Add(spPath.ToWString());
+		return m_vPaths.empty();
 	}
 
-	rConfig.SetValue(pszPropName, vPaths);
-}
+	void TPathContainer::StoreInConfig(TConfig& rConfig, PCTSTR pszPropName) const
+	{
+		TStringArray vPaths;
 
-bool TPathContainer::ReadFromConfig(const TConfig& rConfig, PCTSTR pszPropName)
-{
-	m_vPaths.clear();
+		// store as vector of strings (ineffective; should be done better)
+		BOOST_FOREACH(const TSmartPath& spPath, m_vPaths)
+		{
+			vPaths.Add(spPath.ToWString());
+		}
 
-	TStringArray vPaths;
-	if(rConfig.GetValue(pszPropName, vPaths))
+		rConfig.SetValue(pszPropName, vPaths);
+	}
+
+	bool TPathContainer::ReadFromConfig(const TConfig& rConfig, PCTSTR pszPropName)
 	{
-		for(size_t stIndex = 0; stIndex < vPaths.GetCount(); ++stIndex)
+		m_vPaths.clear();
+
+		TStringArray vPaths;
+		if (rConfig.GetValue(pszPropName, vPaths))
 		{
-			m_vPaths.push_back(PathFromWString(vPaths.GetAt(stIndex)));
+			for (size_t stIndex = 0; stIndex < vPaths.GetCount(); ++stIndex)
+			{
+				m_vPaths.push_back(PathFromWString(vPaths.GetAt(stIndex)));
+			}
+			return true;
 		}
-		return true;
+		else
+			return false;
 	}
-	else
-		return false;
 }
-
-END_CHCORE_NAMESPACE