Index: src/ch/FeedbackHandler.h =================================================================== diff -u -N -r4fe995b304ea342b50293f92d3c1992b43b820f7 -rc085b65f1de24f25feab2bac2d5882abf04aabcf --- src/ch/FeedbackHandler.h (.../FeedbackHandler.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7) +++ src/ch/FeedbackHandler.h (.../FeedbackHandler.h) (revision c085b65f1de24f25feab2bac2d5882abf04aabcf) @@ -29,11 +29,11 @@ CFeedbackHandler(); virtual ~CFeedbackHandler(); - virtual chcore::TFeedbackResult FileError(const chcore::TString& strSrcPath, const chcore::TString& strDstPath, chcore::EFileError eFileError, unsigned long ulError) override; - virtual chcore::TFeedbackResult FileAlreadyExists(const chcore::TFileInfo& spSrcFileInfo, const chcore::TFileInfo& spDstFileInfo) override; - virtual chcore::TFeedbackResult NotEnoughSpace(const chcore::TString& strSrcPath, const chcore::TString& strDstPath, unsigned long long ullRequiredSize) override; - virtual chcore::TFeedbackResult OperationFinished() override; - virtual chcore::TFeedbackResult OperationError() override; + chcore::TFeedbackResult FileError(const chcore::TString& strSrcPath, const chcore::TString& strDstPath, chcore::EFileError eFileError, unsigned long ulError) override; + chcore::TFeedbackResult FileAlreadyExists(const chcore::TFileInfo& spSrcFileInfo, const chcore::TFileInfo& spDstFileInfo) override; + chcore::TFeedbackResult NotEnoughSpace(const chcore::TString& strSrcPath, const chcore::TString& strDstPath, unsigned long long ullRequiredSize) override; + chcore::TFeedbackResult OperationFinished() override; + chcore::TFeedbackResult OperationError() override; protected: friend class CFeedbackHandlerFactory; Index: src/ch/FeedbackHandlerFactory.h =================================================================== diff -u -N -r4fe995b304ea342b50293f92d3c1992b43b820f7 -rc085b65f1de24f25feab2bac2d5882abf04aabcf --- src/ch/FeedbackHandlerFactory.h (.../FeedbackHandlerFactory.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7) +++ src/ch/FeedbackHandlerFactory.h (.../FeedbackHandlerFactory.h) (revision c085b65f1de24f25feab2bac2d5882abf04aabcf) @@ -1,36 +1,36 @@ -// ============================================================================ -// Copyright (C) 2001-2015 by Jozef Starosczyk -// ixen@copyhandler.com -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Library General Public License -// (version 2) as published by the Free Software Foundation; -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU Library General Public -// License along with this program; if not, write to the -// Free Software Foundation, Inc., -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -// ============================================================================ -#ifndef __FEEDBACKHANDLERFACTORY_H__ -#define __FEEDBACKHANDLERFACTORY_H__ - -#include "..\libchcore\IFeedbackHandlerFactory.h" -#include "..\libchcore\IFeedbackHandler.h" - -class CFeedbackHandlerFactory : public chcore::IFeedbackHandlerFactory -{ -public: - CFeedbackHandlerFactory(); - virtual ~CFeedbackHandlerFactory(); - - virtual chcore::IFeedbackHandlerPtr Create() override; -}; - -typedef std::shared_ptr CFeedbackHandlerFactoryPtr; - -#endif +// ============================================================================ +// Copyright (C) 2001-2015 by Jozef Starosczyk +// ixen@copyhandler.com +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU Library General Public License +// (version 2) as published by the Free Software Foundation; +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU Library General Public +// License along with this program; if not, write to the +// Free Software Foundation, Inc., +// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// ============================================================================ +#ifndef __FEEDBACKHANDLERFACTORY_H__ +#define __FEEDBACKHANDLERFACTORY_H__ + +#include "..\libchcore\IFeedbackHandlerFactory.h" +#include "..\libchcore\IFeedbackHandler.h" + +class CFeedbackHandlerFactory : public chcore::IFeedbackHandlerFactory +{ +public: + CFeedbackHandlerFactory(); + virtual ~CFeedbackHandlerFactory(); + + chcore::IFeedbackHandlerPtr Create() override; +}; + +typedef std::shared_ptr CFeedbackHandlerFactoryPtr; + +#endif Index: src/ch/ch.h =================================================================== diff -u -N -rb556d023b748dfea230575959b6513acf29fd7b3 -rc085b65f1de24f25feab2bac2d5882abf04aabcf --- src/ch/ch.h (.../ch.h) (revision b556d023b748dfea230575959b6513acf29fd7b3) +++ src/ch/ch.h (.../ch.h) (revision c085b65f1de24f25feab2bac2d5882abf04aabcf) @@ -34,10 +34,10 @@ CCopyHandlerApp(); ~CCopyHandlerApp(); - virtual BOOL InitInstance() override; - virtual int ExitInstance() override; + BOOL InitInstance() override; + int ExitInstance() override; - virtual void HtmlHelp(DWORD_PTR dwData, UINT nCmd) override; + void HtmlHelp(DWORD_PTR dwData, UINT nCmd) override; PCTSTR GetHelpPath() const { return m_pszHelpFilePath; }; Index: src/libchcore/TFakeFileSerializer.h =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rc085b65f1de24f25feab2bac2d5882abf04aabcf --- src/libchcore/TFakeFileSerializer.h (.../TFakeFileSerializer.h) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TFakeFileSerializer.h (.../TFakeFileSerializer.h) (revision c085b65f1de24f25feab2bac2d5882abf04aabcf) @@ -32,9 +32,9 @@ TFakeFileSerializer(const TFakeFileSerializer& rSrc) = delete; TFakeFileSerializer& operator=(const TFakeFileSerializer& rSrc) = delete; - virtual TSmartPath GetLocation() const override; - virtual ISerializerContainerPtr GetContainer(const TString& strContainerName) override; - virtual void Flush() override; + TSmartPath GetLocation() const override; + ISerializerContainerPtr GetContainer(const TString& strContainerName) override; + void Flush() override; private: TSmartPath m_pathFileSerializer; Index: src/libchcore/TFeedbackHandlerBase.h =================================================================== diff -u -N -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 -rc085b65f1de24f25feab2bac2d5882abf04aabcf --- src/libchcore/TFeedbackHandlerBase.h (.../TFeedbackHandlerBase.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) +++ src/libchcore/TFeedbackHandlerBase.h (.../TFeedbackHandlerBase.h) (revision c085b65f1de24f25feab2bac2d5882abf04aabcf) @@ -46,14 +46,14 @@ bool HasNotEnoughSpacePermanentResponse(EFeedbackResult& rePermanentResult) const; // resets the permanent status from all responses - virtual void RestoreDefaults() override; + void RestoreDefaults() override; // serialization void Store(const ISerializerContainerPtr& spContainer) const override; static void InitColumns(const ISerializerContainerPtr& spContainer); void Load(const ISerializerContainerPtr& spContainer) override; - virtual DWORD GetRetryInterval() const override; + DWORD GetRetryInterval() const override; private: enum EModifications Index: src/libchcore/TFeedbackHandlerWrapper.h =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rc085b65f1de24f25feab2bac2d5882abf04aabcf --- src/libchcore/TFeedbackHandlerWrapper.h (.../TFeedbackHandlerWrapper.h) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TFeedbackHandlerWrapper.h (.../TFeedbackHandlerWrapper.h) (revision c085b65f1de24f25feab2bac2d5882abf04aabcf) @@ -34,18 +34,18 @@ TFeedbackHandlerWrapper(const TFeedbackHandlerWrapper&) = delete; TFeedbackHandlerWrapper& operator=(const TFeedbackHandlerWrapper&) = delete; - virtual TFeedbackResult FileError(const TString& strSrcPath, const TString& strDstPath, EFileError eFileError, unsigned long ulError) override; - virtual TFeedbackResult FileAlreadyExists(const TFileInfo& spSrcFileInfo, const TFileInfo& spDstFileInfo) override; - virtual TFeedbackResult NotEnoughSpace(const TString& strSrcPath, const TString& strDstPath, unsigned long long ullRequiredSize) override; - virtual TFeedbackResult OperationFinished() override; - virtual TFeedbackResult OperationError() override; + TFeedbackResult FileError(const TString& strSrcPath, const TString& strDstPath, EFileError eFileError, unsigned long ulError) override; + TFeedbackResult FileAlreadyExists(const TFileInfo& spSrcFileInfo, const TFileInfo& spDstFileInfo) override; + TFeedbackResult NotEnoughSpace(const TString& strSrcPath, const TString& strDstPath, unsigned long long ullRequiredSize) override; + TFeedbackResult OperationFinished() override; + TFeedbackResult OperationError() override; - virtual void RestoreDefaults() override; + void RestoreDefaults() override; - virtual void Store(const ISerializerContainerPtr& spContainer) const override; - virtual void Load(const ISerializerContainerPtr& spContainer) override; + void Store(const ISerializerContainerPtr& spContainer) const override; + void Load(const ISerializerContainerPtr& spContainer) override; - virtual DWORD GetRetryInterval() const override; + DWORD GetRetryInterval() const override; private: IFeedbackHandlerPtr m_spFeedbackHandler; Index: src/libchcore/TLocalFilesystem.h =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rc085b65f1de24f25feab2bac2d5882abf04aabcf --- src/libchcore/TLocalFilesystem.h (.../TLocalFilesystem.h) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TLocalFilesystem.h (.../TLocalFilesystem.h) (revision c085b65f1de24f25feab2bac2d5882abf04aabcf) @@ -47,7 +47,7 @@ bool PathExist(const TSmartPath& strPath) override; // check for file or folder existence void SetFileDirBasicInfo(const TSmartPath& pathFileDir, DWORD dwAttributes, const TFileTime& ftCreationTime, const TFileTime& ftLastAccessTime, const TFileTime& ftLastWriteTime) override; - virtual void SetAttributes(const TSmartPath& pathFileDir, DWORD dwAttributes) override; + void SetAttributes(const TSmartPath& pathFileDir, DWORD dwAttributes) override; void CreateDirectory(const TSmartPath& pathDirectory, bool bCreateFullPath) override; void RemoveDirectory(const TSmartPath& pathFile) override; Index: src/libchcore/TLocalFilesystemFind.h =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rc085b65f1de24f25feab2bac2d5882abf04aabcf --- src/libchcore/TLocalFilesystemFind.h (.../TLocalFilesystemFind.h) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TLocalFilesystemFind.h (.../TLocalFilesystemFind.h) (revision c085b65f1de24f25feab2bac2d5882abf04aabcf) @@ -31,8 +31,8 @@ public: virtual ~TLocalFilesystemFind(); - virtual bool FindNext(TFileInfoPtr& rspFileInfo) override; - virtual void Close() override; + bool FindNext(TFileInfoPtr& rspFileInfo) override; + void Close() override; private: TLocalFilesystemFind(const TSmartPath& pathDir, const TSmartPath& pathMask, const logger::TLogFileDataPtr& spLogFileData); Index: src/libchcore/TSQLiteSerializerFactory.h =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rc085b65f1de24f25feab2bac2d5882abf04aabcf --- src/libchcore/TSQLiteSerializerFactory.h (.../TSQLiteSerializerFactory.h) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TSQLiteSerializerFactory.h (.../TSQLiteSerializerFactory.h) (revision c085b65f1de24f25feab2bac2d5882abf04aabcf) @@ -30,8 +30,8 @@ explicit TSQLiteSerializerFactory(const TSmartPath& pathSerializeDir); virtual ~TSQLiteSerializerFactory(); - virtual ISerializerPtr CreateTaskManagerSerializer(bool bForceRecreate = false) override; - virtual ISerializerPtr CreateTaskSerializer(const TString& strNameHint = _T(""), bool bForceRecreate = false) override; + ISerializerPtr CreateTaskManagerSerializer(bool bForceRecreate = false) override; + ISerializerPtr CreateTaskSerializer(const TString& strNameHint = _T(""), bool bForceRecreate = false) override; private: TSmartPath m_pathSerializeDir; Index: src/libchcore/TSubTaskCopyMove.h =================================================================== diff -u -N -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 -rc085b65f1de24f25feab2bac2d5882abf04aabcf --- src/libchcore/TSubTaskCopyMove.h (.../TSubTaskCopyMove.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) +++ src/libchcore/TSubTaskCopyMove.h (.../TSubTaskCopyMove.h) (revision c085b65f1de24f25feab2bac2d5882abf04aabcf) @@ -48,9 +48,9 @@ void Reset() override; - virtual void InitBeforeExec() override; - virtual ESubOperationResult Exec(const IFeedbackHandlerPtr& spFeedbackHandler) override; - virtual ESubOperationType GetSubOperationType() const override { return eSubOperation_Copying; } + void InitBeforeExec() override; + ESubOperationResult Exec(const IFeedbackHandlerPtr& spFeedbackHandler) override; + ESubOperationType GetSubOperationType() const override { return eSubOperation_Copying; } void Store(const ISerializerPtr& spSerializer) const override; void Load(const ISerializerPtr& spSerializer) override; Index: src/libchcore/TSubTaskDelete.h =================================================================== diff -u -N -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 -rc085b65f1de24f25feab2bac2d5882abf04aabcf --- src/libchcore/TSubTaskDelete.h (.../TSubTaskDelete.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) +++ src/libchcore/TSubTaskDelete.h (.../TSubTaskDelete.h) (revision c085b65f1de24f25feab2bac2d5882abf04aabcf) @@ -38,9 +38,9 @@ void Reset() override; - virtual void InitBeforeExec() override; - virtual ESubOperationResult Exec(const IFeedbackHandlerPtr& spFeedbackHandler) override; - virtual ESubOperationType GetSubOperationType() const override { return eSubOperation_Deleting; } + void InitBeforeExec() override; + ESubOperationResult Exec(const IFeedbackHandlerPtr& spFeedbackHandler) override; + ESubOperationType GetSubOperationType() const override { return eSubOperation_Deleting; } void Store(const ISerializerPtr& spSerializer) const override; void Load(const ISerializerPtr& spSerializer) override; Index: src/libchcore/TSubTaskFastMove.h =================================================================== diff -u -N -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 -rc085b65f1de24f25feab2bac2d5882abf04aabcf --- src/libchcore/TSubTaskFastMove.h (.../TSubTaskFastMove.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) +++ src/libchcore/TSubTaskFastMove.h (.../TSubTaskFastMove.h) (revision c085b65f1de24f25feab2bac2d5882abf04aabcf) @@ -41,16 +41,16 @@ void Reset() override; - virtual void InitBeforeExec() override; - virtual ESubOperationResult Exec(const IFeedbackHandlerPtr& spFeedbackHandler) override; - virtual ESubOperationType GetSubOperationType() const override { return eSubOperation_FastMove; } + void InitBeforeExec() override; + ESubOperationResult Exec(const IFeedbackHandlerPtr& spFeedbackHandler) override; + ESubOperationType GetSubOperationType() const override { return eSubOperation_FastMove; } void Store(const ISerializerPtr& spSerializer) const override; void Load(const ISerializerPtr& spSerializer) override; void InitColumns(const ISerializerContainerPtr& spContainer) const; - virtual void GetStatsSnapshot(TSubTaskStatsSnapshotPtr& rStats) const override; + void GetStatsSnapshot(TSubTaskStatsSnapshotPtr& rStats) const override; private: #pragma warning(push) Index: src/libchcore/TSubTaskScanDirectory.h =================================================================== diff -u -N -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 -rc085b65f1de24f25feab2bac2d5882abf04aabcf --- src/libchcore/TSubTaskScanDirectory.h (.../TSubTaskScanDirectory.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) +++ src/libchcore/TSubTaskScanDirectory.h (.../TSubTaskScanDirectory.h) (revision c085b65f1de24f25feab2bac2d5882abf04aabcf) @@ -43,9 +43,9 @@ void Reset() override; - virtual void InitBeforeExec() override; - virtual ESubOperationResult Exec(const IFeedbackHandlerPtr& spFeedbackHandler) override; - virtual ESubOperationType GetSubOperationType() const override { return eSubOperation_Scanning; } + void InitBeforeExec() override; + ESubOperationResult Exec(const IFeedbackHandlerPtr& spFeedbackHandler) override; + ESubOperationType GetSubOperationType() const override { return eSubOperation_Scanning; } void Store(const ISerializerPtr& spSerializer) const override; void Load(const ISerializerPtr& spSerializer) override; Index: src/libchcore/TSubTaskStatsInfo.h =================================================================== diff -u -N -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -rc085b65f1de24f25feab2bac2d5882abf04aabcf --- src/libchcore/TSubTaskStatsInfo.h (.../TSubTaskStatsInfo.h) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TSubTaskStatsInfo.h (.../TSubTaskStatsInfo.h) (revision c085b65f1de24f25feab2bac2d5882abf04aabcf) @@ -114,12 +114,12 @@ TSubTaskStatsInfo& operator=(const TSubTaskStatsInfo&) = delete; // is running? - virtual void MarkAsRunning() override; - virtual void MarkAsNotRunning() override; + void MarkAsRunning() override; + void MarkAsNotRunning() override; // time tracking - virtual void EnableTimeTracking() override; - virtual void DisableTimeTracking() override; + void EnableTimeTracking() override; + void DisableTimeTracking() override; void UpdateTime(boost::upgrade_lock& lock) const; Index: src/libchcore/TTaskLocalStats.h =================================================================== diff -u -N -ra4635addad389b9e117679437a3e1b64a739ea96 -rc085b65f1de24f25feab2bac2d5882abf04aabcf --- src/libchcore/TTaskLocalStats.h (.../TTaskLocalStats.h) (revision a4635addad389b9e117679437a3e1b64a739ea96) +++ src/libchcore/TTaskLocalStats.h (.../TTaskLocalStats.h) (revision c085b65f1de24f25feab2bac2d5882abf04aabcf) @@ -51,12 +51,12 @@ protected: // running/not running state - virtual void MarkAsRunning() override; - virtual void MarkAsNotRunning() override; + void MarkAsRunning() override; + void MarkAsNotRunning() override; // time tracking - virtual void EnableTimeTracking() override; - virtual void DisableTimeTracking() override; + void EnableTimeTracking() override; + void DisableTimeTracking() override; #pragma warning(push) #pragma warning(disable: 4251)