Index: src/libchcore/TStringPatternArray.cpp
===================================================================
diff -u -N -r5ccf162f73d05a43bbe5cb7c01d16d07b6b0d4d9 -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3
--- src/libchcore/TStringPatternArray.cpp	(.../TStringPatternArray.cpp)	(revision 5ccf162f73d05a43bbe5cb7c01d16d07b6b0d4d9)
+++ src/libchcore/TStringPatternArray.cpp	(.../TStringPatternArray.cpp)	(revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
@@ -22,104 +22,103 @@
 #include "ErrorCodes.h"
 #include "TStringArray.h"
 
-BEGIN_CHCORE_NAMESPACE
-
-TStringPatternArray::TStringPatternArray()
+namespace chcore
 {
-}
+	TStringPatternArray::TStringPatternArray()
+	{
+	}
 
-TStringPatternArray::~TStringPatternArray()
-{
-}
+	TStringPatternArray::~TStringPatternArray()
+	{
+	}
 
-void TStringPatternArray::Add(const TStringPattern& strPattern)
-{
-	m_vPatterns.push_back(strPattern);
-}
+	void TStringPatternArray::Add(const TStringPattern& strPattern)
+	{
+		m_vPatterns.push_back(strPattern);
+	}
 
-void TStringPatternArray::InsertAt(size_t stIndex, const TStringPattern& strPattern)
-{
-	if (stIndex > m_vPatterns.size())
-		THROW_CORE_EXCEPTION(eErr_BoundsExceeded);
+	void TStringPatternArray::InsertAt(size_t stIndex, const TStringPattern& strPattern)
+	{
+		if (stIndex > m_vPatterns.size())
+			THROW_CORE_EXCEPTION(eErr_BoundsExceeded);
 
-	m_vPatterns.insert(m_vPatterns.begin() + stIndex, strPattern);
-}
+		m_vPatterns.insert(m_vPatterns.begin() + stIndex, strPattern);
+	}
 
-void TStringPatternArray::SetAt(size_t stIndex, const TStringPattern& strPattern)
-{
-	if (stIndex >= m_vPatterns.size())
-		THROW_CORE_EXCEPTION(eErr_BoundsExceeded);
+	void TStringPatternArray::SetAt(size_t stIndex, const TStringPattern& strPattern)
+	{
+		if (stIndex >= m_vPatterns.size())
+			THROW_CORE_EXCEPTION(eErr_BoundsExceeded);
 
-	m_vPatterns[stIndex] = strPattern;
-}
+		m_vPatterns[stIndex] = strPattern;
+	}
 
-void TStringPatternArray::RemoveAt(size_t stIndex)
-{
-	if (stIndex >= m_vPatterns.size())
-		THROW_CORE_EXCEPTION(eErr_BoundsExceeded);
+	void TStringPatternArray::RemoveAt(size_t stIndex)
+	{
+		if (stIndex >= m_vPatterns.size())
+			THROW_CORE_EXCEPTION(eErr_BoundsExceeded);
 
-	m_vPatterns.erase(m_vPatterns.begin() + stIndex);
-}
+		m_vPatterns.erase(m_vPatterns.begin() + stIndex);
+	}
 
-void TStringPatternArray::Clear()
-{
-	m_vPatterns.clear();
-}
+	void TStringPatternArray::Clear()
+	{
+		m_vPatterns.clear();
+	}
 
-const TStringPattern& TStringPatternArray::GetAt(size_t stIndex) const
-{
-	if (stIndex >= m_vPatterns.size())
-		THROW_CORE_EXCEPTION(eErr_BoundsExceeded);
+	const TStringPattern& TStringPatternArray::GetAt(size_t stIndex) const
+	{
+		if (stIndex >= m_vPatterns.size())
+			THROW_CORE_EXCEPTION(eErr_BoundsExceeded);
 
-	return m_vPatterns[stIndex];
-}
+		return m_vPatterns[stIndex];
+	}
 
-size_t TStringPatternArray::GetCount() const
-{
-	return m_vPatterns.size();
-}
-
-bool TStringPatternArray::MatchesAny(const TString& strTextToMatch) const
-{
-	for (const TStringPattern& pattern : m_vPatterns)
+	size_t TStringPatternArray::GetCount() const
 	{
-		if (pattern.Matches(strTextToMatch))
-			return true;
+		return m_vPatterns.size();
 	}
 
-	return false;
-}
-
-bool TStringPatternArray::MatchesAll(const TString& strTextToMatch) const
-{
-	for (const TStringPattern& pattern : m_vPatterns)
+	bool TStringPatternArray::MatchesAny(const TString& strTextToMatch) const
 	{
-		if (!pattern.Matches(strTextToMatch))
-			return false;
+		for (const TStringPattern& pattern : m_vPatterns)
+		{
+			if (pattern.Matches(strTextToMatch))
+				return true;
+		}
+
+		return false;
 	}
 
-	return true;
-}
+	bool TStringPatternArray::MatchesAll(const TString& strTextToMatch) const
+	{
+		for (const TStringPattern& pattern : m_vPatterns)
+		{
+			if (!pattern.Matches(strTextToMatch))
+				return false;
+		}
 
-void TStringPatternArray::FromStringArray(const TStringArray& arrSerializedPatterns)
-{
-	m_vPatterns.clear();
+		return true;
+	}
 
-	for (size_t stIndex = 0; stIndex < arrSerializedPatterns.GetCount(); ++stIndex)
+	void TStringPatternArray::FromStringArray(const TStringArray& arrSerializedPatterns)
 	{
-		m_vPatterns.push_back(TStringPattern::CreateFromSerializedString(arrSerializedPatterns.GetAt(stIndex)));
+		m_vPatterns.clear();
+
+		for (size_t stIndex = 0; stIndex < arrSerializedPatterns.GetCount(); ++stIndex)
+		{
+			m_vPatterns.push_back(TStringPattern::CreateFromSerializedString(arrSerializedPatterns.GetAt(stIndex)));
+		}
 	}
-}
 
-TStringArray TStringPatternArray::ToStringArray() const
-{
-	TStringArray arrSerialized;
-	for (const TStringPattern& pattern : m_vPatterns)
+	TStringArray TStringPatternArray::ToStringArray() const
 	{
-		arrSerialized.Add(pattern.ToSerializedString());
-	}
+		TStringArray arrSerialized;
+		for (const TStringPattern& pattern : m_vPatterns)
+		{
+			arrSerialized.Add(pattern.ToSerializedString());
+		}
 
-	return arrSerialized;
+		return arrSerialized;
+	}
 }
-
-END_CHCORE_NAMESPACE