Index: src/libchcore/TSubTaskScanDirectory.h =================================================================== diff -u -N -r7d59ab9183c933f2fc2682a95fb5d26cf2f952d7 -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 --- src/libchcore/TSubTaskScanDirectory.h (.../TSubTaskScanDirectory.h) (revision 7d59ab9183c933f2fc2682a95fb5d26cf2f952d7) +++ src/libchcore/TSubTaskScanDirectory.h (.../TSubTaskScanDirectory.h) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3) @@ -29,40 +29,39 @@ #include "TBasePathData.h" #include "CommonDataTypes.h" -BEGIN_CHCORE_NAMESPACE +namespace chcore +{ + class TFileFiltersArray; -class TFileFiltersArray; + /////////////////////////////////////////////////////////////////////////// + // TSubTaskScanDirectories -/////////////////////////////////////////////////////////////////////////// -// TSubTaskScanDirectories + class LIBCHCORE_API TSubTaskScanDirectories : public TSubTaskBase + { + public: + TSubTaskScanDirectories(TSubTaskContext& rContext); + virtual ~TSubTaskScanDirectories(); -class LIBCHCORE_API TSubTaskScanDirectories : public TSubTaskBase -{ -public: - TSubTaskScanDirectories(TSubTaskContext& rContext); - virtual ~TSubTaskScanDirectories(); + virtual void Reset(); - virtual void Reset(); + virtual ESubOperationResult Exec(const IFeedbackHandlerPtr& spFeedbackHandler) override; + virtual ESubOperationType GetSubOperationType() const override { return eSubOperation_Scanning; } - virtual ESubOperationResult Exec(const IFeedbackHandlerPtr& spFeedbackHandler) override; - virtual ESubOperationType GetSubOperationType() const override { return eSubOperation_Scanning; } + virtual void Store(const ISerializerPtr& spSerializer) const; + virtual void Load(const ISerializerPtr& spSerializer); - virtual void Store(const ISerializerPtr& spSerializer) const; - virtual void Load(const ISerializerPtr& spSerializer); + virtual void GetStatsSnapshot(TSubTaskStatsSnapshotPtr& spStats) const; - virtual void GetStatsSnapshot(TSubTaskStatsSnapshotPtr& spStats) const; + private: + int ScanDirectory(TSmartPath pathDirName, const TBasePathDataPtr& spBasePathData, + bool bRecurse, bool bIncludeDirs, const TFileFiltersArray& afFilters); -private: - int ScanDirectory(TSmartPath pathDirName, const TBasePathDataPtr& spBasePathData, - bool bRecurse, bool bIncludeDirs, const TFileFiltersArray& afFilters); - -private: + private: #pragma warning(push) #pragma warning(disable: 4251) - TSubTaskStatsInfo m_tSubTaskStats; + TSubTaskStatsInfo m_tSubTaskStats; #pragma warning(pop) -}; + }; +} -END_CHCORE_NAMESPACE - #endif