Index: src/libchcore/TSubTaskContext.h
===================================================================
diff -u -N -r9ebcc7abf1e0e70f0db2d08b2691351a26ef259b -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3
--- src/libchcore/TSubTaskContext.h	(.../TSubTaskContext.h)	(revision 9ebcc7abf1e0e70f0db2d08b2691351a26ef259b)
+++ src/libchcore/TSubTaskContext.h	(.../TSubTaskContext.h)	(revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
@@ -36,91 +36,90 @@
 	class log_file;
 }
 
-BEGIN_CHCORE_NAMESPACE
+namespace chcore
+{
+	class TWorkerThreadController;
+	class TTaskConfigTracker;
+	class TLocalFilesystem;
+	class TConfig;
+	class TFileFiltersArray;
 
-class TWorkerThreadController;
-class TTaskConfigTracker;
-class TLocalFilesystem;
-class TConfig;
-class TFileFiltersArray;
+	///////////////////////////////////////////////////////////////////////////
+	// TSubTaskContext
 
-///////////////////////////////////////////////////////////////////////////
-// TSubTaskContext
+	class LIBCHCORE_API TSubTaskContext
+	{
+	public:
+		TSubTaskContext(TConfig& rConfig, const TBasePathDataContainerPtr& spBasePaths,
+			const TFileFiltersArray& rFilters,
+			TTaskConfigTracker& rCfgTracker, icpf::log_file& rLog,
+			TWorkerThreadController& rThreadController, const IFilesystemPtr& spFilesystem);
+		~TSubTaskContext();
 
-class LIBCHCORE_API TSubTaskContext
-{
-public:
-	TSubTaskContext(TConfig& rConfig, const TBasePathDataContainerPtr& spBasePaths,
-					const TFileFiltersArray& rFilters,
-					TTaskConfigTracker& rCfgTracker, icpf::log_file& rLog,
-					TWorkerThreadController& rThreadController, const IFilesystemPtr& spFilesystem);
-	~TSubTaskContext();
+		TConfig& GetConfig();
+		const TConfig& GetConfig() const;
 
-	TConfig& GetConfig();
-	const TConfig& GetConfig() const;
+		EOperationType GetOperationType() const;
+		void SetOperationType(EOperationType eOperationType);
 
-	EOperationType GetOperationType() const;
-	void SetOperationType(EOperationType eOperationType);
+		TBasePathDataContainerPtr GetBasePaths() const;
 
-	TBasePathDataContainerPtr GetBasePaths() const;
+		const TFileFiltersArray& GetFilters() const;
+		TFileInfoArray& GetFilesCache();
+		const TFileInfoArray& GetFilesCache() const;
 
-	const TFileFiltersArray& GetFilters() const;
-	TFileInfoArray& GetFilesCache();
-	const TFileInfoArray& GetFilesCache() const;
+		TSmartPath GetDestinationPath() const;
+		void SetDestinationPath(const TSmartPath& pathDestination);
 
-	TSmartPath GetDestinationPath() const;
-	void SetDestinationPath(const TSmartPath& pathDestination);
+		TTaskConfigTracker& GetCfgTracker();
+		const TTaskConfigTracker& GetCfgTracker() const;
 
-	TTaskConfigTracker& GetCfgTracker();
-	const TTaskConfigTracker& GetCfgTracker() const;
+		icpf::log_file& GetLog();
+		const icpf::log_file& GetLog() const;
 
-	icpf::log_file& GetLog();
-	const icpf::log_file& GetLog() const;
+		TWorkerThreadController& GetThreadController();
+		const TWorkerThreadController& GetThreadController() const;
 
-	TWorkerThreadController& GetThreadController();
-	const TWorkerThreadController& GetThreadController() const;
+		IFilesystemPtr GetLocalFilesystem();
+		const IFilesystemPtr GetLocalFilesystem() const;
 
-	IFilesystemPtr GetLocalFilesystem();
-	const IFilesystemPtr GetLocalFilesystem() const;
+	private:
+		TSubTaskContext(const TSubTaskContext& rSrc);
+		TSubTaskContext& operator=(const TSubTaskContext& rSrc);
 
-private:
-	TSubTaskContext(const TSubTaskContext& rSrc);
-	TSubTaskContext& operator=(const TSubTaskContext& rSrc);
+	private:
+		TConfig& m_rConfig;
 
-private:
-	TConfig& m_rConfig;
+		EOperationType m_eOperationType;
 
-	EOperationType m_eOperationType;
-
-	// information about input paths
+		// information about input paths
 #pragma warning(push)
 #pragma warning(disable: 4251)
-	TBasePathDataContainerPtr m_spBasePaths;
+		TBasePathDataContainerPtr m_spBasePaths;
 #pragma warning(pop)
 
-	const TFileFiltersArray& m_rFilters;
+		const TFileFiltersArray& m_rFilters;
 
-	// data on which to operate
-	TFileInfoArray m_tFilesCache;
+		// data on which to operate
+		TFileInfoArray m_tFilesCache;
 
-	TSmartPath m_pathDestination;
+		TSmartPath m_pathDestination;
 
-	// configuration changes tracking
-	TTaskConfigTracker& m_rCfgTracker;
+		// configuration changes tracking
+		TTaskConfigTracker& m_rCfgTracker;
 
-	// local filesystem access functions
+		// local filesystem access functions
 #pragma warning(push)
 #pragma warning(disable: 4251)
-	IFilesystemPtr m_spFilesystem;
+		IFilesystemPtr m_spFilesystem;
 #pragma warning(pop)
 
-	// additional data
-	icpf::log_file& m_rLog;
+		// additional data
+		icpf::log_file& m_rLog;
 
-	// thread control
-	TWorkerThreadController& m_rThreadController;
-};
+		// thread control
+		TWorkerThreadController& m_rThreadController;
+	};
+}
 
-END_CHCORE_NAMESPACE
-
 #endif // __TSUBTASKCONTEXT_H__