Index: src/libchcore/TLocalFilesystemFind.cpp
===================================================================
diff -u -N -r9ebcc7abf1e0e70f0db2d08b2691351a26ef259b -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3
--- src/libchcore/TLocalFilesystemFind.cpp	(.../TLocalFilesystemFind.cpp)	(revision 9ebcc7abf1e0e70f0db2d08b2691351a26ef259b)
+++ src/libchcore/TLocalFilesystemFind.cpp	(.../TLocalFilesystemFind.cpp)	(revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
@@ -21,65 +21,64 @@
 #include "TLocalFilesystem.h"
 #include "TFileInfo.h"
 
-BEGIN_CHCORE_NAMESPACE
-
-TLocalFilesystemFind::TLocalFilesystemFind(const TSmartPath& pathDir, const TSmartPath& pathMask) :
-	m_pathDir(pathDir),
-	m_pathMask(pathMask),
-	m_hFind(INVALID_HANDLE_VALUE)
+namespace chcore
 {
-}
+	TLocalFilesystemFind::TLocalFilesystemFind(const TSmartPath& pathDir, const TSmartPath& pathMask) :
+		m_pathDir(pathDir),
+		m_pathMask(pathMask),
+		m_hFind(INVALID_HANDLE_VALUE)
+	{
+	}
 
-TLocalFilesystemFind::~TLocalFilesystemFind()
-{
-	Close();
-}
-
-bool TLocalFilesystemFind::FindNext(TFileInfoPtr& rspFileInfo)
-{
-	WIN32_FIND_DATA wfd;
-	TSmartPath pathCurrent = m_pathDir + m_pathMask;
-
-	// Iterate through dirs & files
-	bool bContinue = true;
-	if (m_hFind != INVALID_HANDLE_VALUE)
-		bContinue = (FindNextFile(m_hFind, &wfd) != FALSE);
-	else
+	TLocalFilesystemFind::~TLocalFilesystemFind()
 	{
-		m_hFind = FindFirstFile(TLocalFilesystem::PrependPathExtensionIfNeeded(pathCurrent).ToString(), &wfd);	// in this case we always continue
-		bContinue = (m_hFind != INVALID_HANDLE_VALUE);
+		Close();
 	}
-	if (bContinue)
+
+	bool TLocalFilesystemFind::FindNext(TFileInfoPtr& rspFileInfo)
 	{
-		do
+		WIN32_FIND_DATA wfd;
+		TSmartPath pathCurrent = m_pathDir + m_pathMask;
+
+		// Iterate through dirs & files
+		bool bContinue = true;
+		if (m_hFind != INVALID_HANDLE_VALUE)
+			bContinue = (FindNextFile(m_hFind, &wfd) != FALSE);
+		else
 		{
-			if (!(wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
+			m_hFind = FindFirstFile(TLocalFilesystem::PrependPathExtensionIfNeeded(pathCurrent).ToString(), &wfd);	// in this case we always continue
+			bContinue = (m_hFind != INVALID_HANDLE_VALUE);
+		}
+		if (bContinue)
+		{
+			do
 			{
-				rspFileInfo->Init(m_pathDir + PathFromString(wfd.cFileName), wfd.dwFileAttributes, (((ULONGLONG)wfd.nFileSizeHigh) << 32) + wfd.nFileSizeLow, wfd.ftCreationTime,
-					wfd.ftLastAccessTime, wfd.ftLastWriteTime, 0);
-				return true;
-			}
-			else if (wfd.cFileName[0] != _T('.') || (wfd.cFileName[1] != _T('\0') && (wfd.cFileName[1] != _T('.') || wfd.cFileName[2] != _T('\0'))))
-			{
-				// Add directory itself
-				rspFileInfo->Init(m_pathDir + PathFromString(wfd.cFileName),
-					wfd.dwFileAttributes, (((ULONGLONG)wfd.nFileSizeHigh) << 32) + wfd.nFileSizeLow, wfd.ftCreationTime,
-					wfd.ftLastAccessTime, wfd.ftLastWriteTime, 0);
-				return true;
-			}
-		} while (m_hFind != INVALID_HANDLE_VALUE && ::FindNextFile(m_hFind, &wfd));	// checking m_hFind in case other thread changed it (it shouldn't happen though)
+				if (!(wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
+				{
+					rspFileInfo->Init(m_pathDir + PathFromString(wfd.cFileName), wfd.dwFileAttributes, (((ULONGLONG)wfd.nFileSizeHigh) << 32) + wfd.nFileSizeLow, wfd.ftCreationTime,
+						wfd.ftLastAccessTime, wfd.ftLastWriteTime, 0);
+					return true;
+				}
+				else if (wfd.cFileName[0] != _T('.') || (wfd.cFileName[1] != _T('\0') && (wfd.cFileName[1] != _T('.') || wfd.cFileName[2] != _T('\0'))))
+				{
+					// Add directory itself
+					rspFileInfo->Init(m_pathDir + PathFromString(wfd.cFileName),
+						wfd.dwFileAttributes, (((ULONGLONG)wfd.nFileSizeHigh) << 32) + wfd.nFileSizeLow, wfd.ftCreationTime,
+						wfd.ftLastAccessTime, wfd.ftLastWriteTime, 0);
+					return true;
+				}
+			} while (m_hFind != INVALID_HANDLE_VALUE && ::FindNextFile(m_hFind, &wfd));	// checking m_hFind in case other thread changed it (it shouldn't happen though)
 
-		Close();
+			Close();
+		}
+
+		return false;
 	}
 
-	return false;
+	void TLocalFilesystemFind::Close()
+	{
+		if (m_hFind != INVALID_HANDLE_VALUE)
+			FindClose(m_hFind);
+		m_hFind = INVALID_HANDLE_VALUE;
+	}
 }
-
-void TLocalFilesystemFind::Close()
-{
-	if (m_hFind != INVALID_HANDLE_VALUE)
-		FindClose(m_hFind);
-	m_hFind = INVALID_HANDLE_VALUE;
-}
-
-END_CHCORE_NAMESPACE