Index: src/libchcore/TFeedbackHandlerWrapper.h
===================================================================
diff -u -N -r671f4b1792a20d98b186f4e0a9cc6a620dede019 -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3
--- src/libchcore/TFeedbackHandlerWrapper.h	(.../TFeedbackHandlerWrapper.h)	(revision 671f4b1792a20d98b186f4e0a9cc6a620dede019)
+++ src/libchcore/TFeedbackHandlerWrapper.h	(.../TFeedbackHandlerWrapper.h)	(revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
@@ -23,37 +23,36 @@
 #include "IFeedbackHandler.h"
 #include <boost\smart_ptr\shared_ptr.hpp>
 
-BEGIN_CHCORE_NAMESPACE
-
-class TScopedRunningTimeTracker;
-
-class TFeedbackHandlerWrapper : public IFeedbackHandler
+namespace chcore
 {
-public:
-	TFeedbackHandlerWrapper(const IFeedbackHandlerPtr& spFeedbackHandler, TScopedRunningTimeTracker& rTimeGuard);
-	virtual ~TFeedbackHandlerWrapper();
+	class TScopedRunningTimeTracker;
 
-	TFeedbackHandlerWrapper(const TFeedbackHandlerWrapper&) = delete;
-	TFeedbackHandlerWrapper& operator=(const TFeedbackHandlerWrapper&) = delete;
+	class TFeedbackHandlerWrapper : public IFeedbackHandler
+	{
+	public:
+		TFeedbackHandlerWrapper(const IFeedbackHandlerPtr& spFeedbackHandler, TScopedRunningTimeTracker& rTimeGuard);
+		virtual ~TFeedbackHandlerWrapper();
 
-	virtual EFeedbackResult FileError(const TString& strSrcPath, const TString& strDstPath, EFileError eFileError, unsigned long ulError) override;
-	virtual EFeedbackResult FileAlreadyExists(const TFileInfoPtr& spSrcFileInfo, const TFileInfoPtr& spDstFileInfo) override;
-	virtual EFeedbackResult NotEnoughSpace(const TString& strSrcPath, const TString& strDstPath, unsigned long long ullRequiredSize) override;
-	virtual EFeedbackResult OperationFinished() override;
-	virtual EFeedbackResult OperationError() override;
+		TFeedbackHandlerWrapper(const TFeedbackHandlerWrapper&) = delete;
+		TFeedbackHandlerWrapper& operator=(const TFeedbackHandlerWrapper&) = delete;
 
-	virtual void RestoreDefaults() override;
+		virtual EFeedbackResult FileError(const TString& strSrcPath, const TString& strDstPath, EFileError eFileError, unsigned long ulError) override;
+		virtual EFeedbackResult FileAlreadyExists(const TFileInfoPtr& spSrcFileInfo, const TFileInfoPtr& spDstFileInfo) override;
+		virtual EFeedbackResult NotEnoughSpace(const TString& strSrcPath, const TString& strDstPath, unsigned long long ullRequiredSize) override;
+		virtual EFeedbackResult OperationFinished() override;
+		virtual EFeedbackResult OperationError() override;
 
-	virtual void Store(const ISerializerContainerPtr& spContainer) const override;
-	virtual void Load(const ISerializerContainerPtr& spContainer) override;
+		virtual void RestoreDefaults() override;
 
-private:
-	IFeedbackHandlerPtr m_spFeedbackHandler;
-	TScopedRunningTimeTracker& m_rTimeGuard;
-};
+		virtual void Store(const ISerializerContainerPtr& spContainer) const override;
+		virtual void Load(const ISerializerContainerPtr& spContainer) override;
 
-typedef boost::shared_ptr<TFeedbackHandlerWrapper> TFeedbackHandlerWrapperPtr;
+	private:
+		IFeedbackHandlerPtr m_spFeedbackHandler;
+		TScopedRunningTimeTracker& m_rTimeGuard;
+	};
 
-END_CHCORE_NAMESPACE
+	typedef boost::shared_ptr<TFeedbackHandlerWrapper> TFeedbackHandlerWrapperPtr;
+}
 
 #endif