Commit a7a92390 authored by Daniel Pfeifer's avatar Daniel Pfeifer
Browse files

mark functions with CM_OVERRIDE

parent 9e2d6f0c
...@@ -46,7 +46,7 @@ public: ...@@ -46,7 +46,7 @@ public:
/** /**
* Destruct IFW generator * Destruct IFW generator
*/ */
virtual ~cmCPackIFWGenerator(); ~cmCPackIFWGenerator() CM_OVERRIDE;
/** /**
* Compare \a version with QtIFW framework version * Compare \a version with QtIFW framework version
...@@ -70,18 +70,18 @@ protected: ...@@ -70,18 +70,18 @@ protected:
* @brief Initialize generator * @brief Initialize generator
* @return 0 on failure * @return 0 on failure
*/ */
virtual int InitializeInternal(); int InitializeInternal() CM_OVERRIDE;
virtual int PackageFiles(); int PackageFiles() CM_OVERRIDE;
virtual const char* GetPackagingInstallPrefix(); const char* GetPackagingInstallPrefix() CM_OVERRIDE;
/** /**
* @brief Extension of binary installer * @brief Extension of binary installer
* @return Executable suffix or value from default implementation * @return Executable suffix or value from default implementation
*/ */
virtual const char* GetOutputExtension(); const char* GetOutputExtension() CM_OVERRIDE;
virtual std::string GetComponentInstallDirNameSuffix( std::string GetComponentInstallDirNameSuffix(
const std::string& componentName); const std::string& componentName) CM_OVERRIDE;
/** /**
* @brief Get Component * @brief Get Component
...@@ -92,8 +92,8 @@ protected: ...@@ -92,8 +92,8 @@ protected:
* *
* @return Pointer to component * @return Pointer to component
*/ */
virtual cmCPackComponent* GetComponent(const std::string& projectName, cmCPackComponent* GetComponent(const std::string& projectName,
const std::string& componentName); const std::string& componentName) CM_OVERRIDE;
/** /**
* @brief Get group of component * @brief Get group of component
...@@ -104,12 +104,13 @@ protected: ...@@ -104,12 +104,13 @@ protected:
* *
* @return Pointer to component group * @return Pointer to component group
*/ */
virtual cmCPackComponentGroup* GetComponentGroup( cmCPackComponentGroup* GetComponentGroup(
const std::string& projectName, const std::string& groupName); const std::string& projectName, const std::string& groupName) CM_OVERRIDE;
enum cmCPackGenerator::CPackSetDestdirSupport SupportsSetDestdir() const; enum cmCPackGenerator::CPackSetDestdirSupport SupportsSetDestdir() const
virtual bool SupportsAbsoluteDestination() const; CM_OVERRIDE;
virtual bool SupportsComponentInstallation() const; bool SupportsAbsoluteDestination() const CM_OVERRIDE;
bool SupportsComponentInstallation() const CM_OVERRIDE;
protected: protected:
// Methods // Methods
......
...@@ -27,10 +27,10 @@ public: ...@@ -27,10 +27,10 @@ public:
* Construct generator * Construct generator
*/ */
cmCPack7zGenerator(); cmCPack7zGenerator();
virtual ~cmCPack7zGenerator(); ~cmCPack7zGenerator() CM_OVERRIDE;
protected: protected:
virtual const char* GetOutputExtension() { return ".7z"; } const char* GetOutputExtension() CM_OVERRIDE { return ".7z"; }
}; };
#endif #endif
...@@ -32,14 +32,14 @@ public: ...@@ -32,14 +32,14 @@ public:
* Construct generator * Construct generator
*/ */
cmCPackArchiveGenerator(cmArchiveWrite::Compress, std::string const& format); cmCPackArchiveGenerator(cmArchiveWrite::Compress, std::string const& format);
virtual ~cmCPackArchiveGenerator(); ~cmCPackArchiveGenerator() CM_OVERRIDE;
// Used to add a header to the archive // Used to add a header to the archive
virtual int GenerateHeader(std::ostream* os); virtual int GenerateHeader(std::ostream* os);
// component support // component support
virtual bool SupportsComponentInstallation() const; bool SupportsComponentInstallation() const CM_OVERRIDE;
protected: protected:
virtual int InitializeInternal(); int InitializeInternal() CM_OVERRIDE;
/** /**
* Add the files belonging to the specified component * Add the files belonging to the specified component
* to the provided (already opened) archive. * to the provided (already opened) archive.
...@@ -55,7 +55,7 @@ protected: ...@@ -55,7 +55,7 @@ protected:
* method will call either PackageComponents or * method will call either PackageComponents or
* PackageComponentsAllInOne. * PackageComponentsAllInOne.
*/ */
int PackageFiles(); int PackageFiles() CM_OVERRIDE;
/** /**
* The method used to package files when component * The method used to package files when component
* install is used. This will create one * install is used. This will create one
...@@ -67,7 +67,7 @@ protected: ...@@ -67,7 +67,7 @@ protected:
* components will be put in a single installer. * components will be put in a single installer.
*/ */
int PackageComponentsAllInOne(); int PackageComponentsAllInOne();
virtual const char* GetOutputExtension() = 0; const char* GetOutputExtension() CM_OVERRIDE = 0;
cmArchiveWrite::Compress Compress; cmArchiveWrite::Compress Compress;
std::string ArchiveFormat; std::string ArchiveFormat;
}; };
......
...@@ -28,7 +28,7 @@ public: ...@@ -28,7 +28,7 @@ public:
* Construct generator * Construct generator
*/ */
cmCPackDebGenerator(); cmCPackDebGenerator();
virtual ~cmCPackDebGenerator(); ~cmCPackDebGenerator() CM_OVERRIDE;
static bool CanGenerate() static bool CanGenerate()
{ {
...@@ -45,7 +45,7 @@ public: ...@@ -45,7 +45,7 @@ public:
} }
protected: protected:
virtual int InitializeInternal(); int InitializeInternal() CM_OVERRIDE;
/** /**
* This method factors out the work done in component packaging case. * This method factors out the work done in component packaging case.
*/ */
...@@ -62,11 +62,11 @@ protected: ...@@ -62,11 +62,11 @@ protected:
* components will be put in a single installer. * components will be put in a single installer.
*/ */
int PackageComponentsAllInOne(const std::string& compInstDirName); int PackageComponentsAllInOne(const std::string& compInstDirName);
virtual int PackageFiles(); int PackageFiles() CM_OVERRIDE;
virtual const char* GetOutputExtension() { return ".deb"; } const char* GetOutputExtension() CM_OVERRIDE { return ".deb"; }
virtual bool SupportsComponentInstallation() const; bool SupportsComponentInstallation() const CM_OVERRIDE;
virtual std::string GetComponentInstallDirNameSuffix( std::string GetComponentInstallDirNameSuffix(
const std::string& componentName); const std::string& componentName) CM_OVERRIDE;
private: private:
int createDeb(); int createDeb();
......
...@@ -101,7 +101,7 @@ public: ...@@ -101,7 +101,7 @@ public:
* Construct generator * Construct generator
*/ */
cmCPackGenerator(); cmCPackGenerator();
virtual ~cmCPackGenerator(); ~cmCPackGenerator() CM_OVERRIDE;
//! Set and get the options //! Set and get the options
void SetOption(const std::string& op, const char* value); void SetOption(const std::string& op, const char* value);
......
...@@ -28,7 +28,7 @@ public: ...@@ -28,7 +28,7 @@ public:
cmTypeMacro(cmCPackGeneratorFactory, cmObject); cmTypeMacro(cmCPackGeneratorFactory, cmObject);
cmCPackGeneratorFactory(); cmCPackGeneratorFactory();
~cmCPackGeneratorFactory(); ~cmCPackGeneratorFactory() CM_OVERRIDE;
//! Get the generator //! Get the generator
cmCPackGenerator* NewGenerator(const std::string& name); cmCPackGenerator* NewGenerator(const std::string& name);
......
...@@ -42,7 +42,7 @@ public: ...@@ -42,7 +42,7 @@ public:
cmTypeMacro(cmCPackLog, cmObject); cmTypeMacro(cmCPackLog, cmObject);
cmCPackLog(); cmCPackLog();
~cmCPackLog(); ~cmCPackLog() CM_OVERRIDE;
enum __log_tags enum __log_tags
{ {
......
...@@ -36,21 +36,22 @@ public: ...@@ -36,21 +36,22 @@ public:
* Construct generator * Construct generator
*/ */
cmCPackNSISGenerator(bool nsis64 = false); cmCPackNSISGenerator(bool nsis64 = false);
virtual ~cmCPackNSISGenerator(); ~cmCPackNSISGenerator() CM_OVERRIDE;
protected: protected:
virtual int InitializeInternal(); int InitializeInternal() CM_OVERRIDE;
void CreateMenuLinks(std::ostream& str, std::ostream& deleteStr); void CreateMenuLinks(std::ostream& str, std::ostream& deleteStr);
int PackageFiles(); int PackageFiles() CM_OVERRIDE;
virtual const char* GetOutputExtension() { return ".exe"; } const char* GetOutputExtension() CM_OVERRIDE { return ".exe"; }
virtual const char* GetOutputPostfix() { return "win32"; } const char* GetOutputPostfix() CM_OVERRIDE { return "win32"; }
bool GetListOfSubdirectories(const char* dir, bool GetListOfSubdirectories(const char* dir,
std::vector<std::string>& dirs); std::vector<std::string>& dirs);
enum cmCPackGenerator::CPackSetDestdirSupport SupportsSetDestdir() const; enum cmCPackGenerator::CPackSetDestdirSupport SupportsSetDestdir() const
virtual bool SupportsAbsoluteDestination() const; CM_OVERRIDE;
virtual bool SupportsComponentInstallation() const; bool SupportsAbsoluteDestination() const CM_OVERRIDE;
bool SupportsComponentInstallation() const CM_OVERRIDE;
/// Produce a string that contains the NSIS code to describe a /// Produce a string that contains the NSIS code to describe a
/// particular component. Any added macros will be emitted via /// particular component. Any added macros will be emitted via
......
...@@ -32,7 +32,7 @@ public: ...@@ -32,7 +32,7 @@ public:
* Construct generator * Construct generator
*/ */
cmCPackRPMGenerator(); cmCPackRPMGenerator();
virtual ~cmCPackRPMGenerator(); ~cmCPackRPMGenerator() CM_OVERRIDE;
static bool CanGenerate() static bool CanGenerate()
{ {
...@@ -49,8 +49,8 @@ public: ...@@ -49,8 +49,8 @@ public:
} }
protected: protected:
virtual int InitializeInternal(); int InitializeInternal() CM_OVERRIDE;
virtual int PackageFiles(); int PackageFiles() CM_OVERRIDE;
/** /**
* This method factors out the work done in component packaging case. * This method factors out the work done in component packaging case.
*/ */
...@@ -67,10 +67,10 @@ protected: ...@@ -67,10 +67,10 @@ protected:
* components will be put in a single installer. * components will be put in a single installer.
*/ */
int PackageComponentsAllInOne(const std::string& compInstDirName); int PackageComponentsAllInOne(const std::string& compInstDirName);
virtual const char* GetOutputExtension() { return ".rpm"; } const char* GetOutputExtension() CM_OVERRIDE { return ".rpm"; }
virtual bool SupportsComponentInstallation() const; bool SupportsComponentInstallation() const CM_OVERRIDE;
virtual std::string GetComponentInstallDirNameSuffix( std::string GetComponentInstallDirNameSuffix(
const std::string& componentName); const std::string& componentName) CM_OVERRIDE;
void AddGeneratedPackageNames(); void AddGeneratedPackageNames();
}; };
......
...@@ -28,13 +28,13 @@ public: ...@@ -28,13 +28,13 @@ public:
* Construct generator * Construct generator
*/ */
cmCPackSTGZGenerator(); cmCPackSTGZGenerator();
virtual ~cmCPackSTGZGenerator(); ~cmCPackSTGZGenerator() CM_OVERRIDE;
protected: protected:
int PackageFiles(); int PackageFiles() CM_OVERRIDE;
virtual int InitializeInternal(); int InitializeInternal() CM_OVERRIDE;
int GenerateHeader(std::ostream* os); int GenerateHeader(std::ostream* os) CM_OVERRIDE;
virtual const char* GetOutputExtension() { return ".sh"; } const char* GetOutputExtension() CM_OVERRIDE { return ".sh"; }
}; };
#endif #endif
...@@ -27,10 +27,10 @@ public: ...@@ -27,10 +27,10 @@ public:
* Construct generator * Construct generator
*/ */
cmCPackTGZGenerator(); cmCPackTGZGenerator();
virtual ~cmCPackTGZGenerator(); ~cmCPackTGZGenerator() CM_OVERRIDE;
protected: protected:
virtual const char* GetOutputExtension() { return ".tar.gz"; } const char* GetOutputExtension() CM_OVERRIDE { return ".tar.gz"; }
}; };
#endif #endif
...@@ -27,10 +27,10 @@ public: ...@@ -27,10 +27,10 @@ public:
* Construct generator * Construct generator
*/ */
cmCPackTXZGenerator(); cmCPackTXZGenerator();
virtual ~cmCPackTXZGenerator(); ~cmCPackTXZGenerator() CM_OVERRIDE;
protected: protected:
virtual const char* GetOutputExtension() { return ".tar.xz"; } const char* GetOutputExtension() CM_OVERRIDE { return ".tar.xz"; }
}; };
#endif #endif
...@@ -26,10 +26,10 @@ public: ...@@ -26,10 +26,10 @@ public:
* Construct generator * Construct generator
*/ */
cmCPackTarBZip2Generator(); cmCPackTarBZip2Generator();
virtual ~cmCPackTarBZip2Generator(); ~cmCPackTarBZip2Generator() CM_OVERRIDE;
protected: protected:
virtual const char* GetOutputExtension() { return ".tar.bz2"; } const char* GetOutputExtension() CM_OVERRIDE { return ".tar.bz2"; }
}; };
#endif #endif
...@@ -26,10 +26,10 @@ public: ...@@ -26,10 +26,10 @@ public:
* Construct generator * Construct generator
*/ */
cmCPackTarCompressGenerator(); cmCPackTarCompressGenerator();
virtual ~cmCPackTarCompressGenerator(); ~cmCPackTarCompressGenerator() CM_OVERRIDE;
protected: protected:
virtual const char* GetOutputExtension() { return ".tar.Z"; } const char* GetOutputExtension() CM_OVERRIDE { return ".tar.Z"; }
}; };
#endif #endif
...@@ -27,10 +27,10 @@ public: ...@@ -27,10 +27,10 @@ public:
* Construct generator * Construct generator
*/ */
cmCPackZIPGenerator(); cmCPackZIPGenerator();
virtual ~cmCPackZIPGenerator(); ~cmCPackZIPGenerator() CM_OVERRIDE;
protected: protected:
virtual const char* GetOutputExtension() { return ".zip"; } const char* GetOutputExtension() CM_OVERRIDE { return ".zip"; }
}; };
#endif #endif
...@@ -183,7 +183,7 @@ public: ...@@ -183,7 +183,7 @@ public:
{ {
this->InitializeParser(); this->InitializeParser();
} }
~LogParser() { this->CleanupParser(); } ~LogParser() CM_OVERRIDE { this->CleanupParser(); }
int InitializeParser() CM_OVERRIDE int InitializeParser() CM_OVERRIDE
{ {
......
...@@ -24,20 +24,20 @@ public: ...@@ -24,20 +24,20 @@ public:
/** Construct with a CTest instance and update log stream. */ /** Construct with a CTest instance and update log stream. */
cmCTestBZR(cmCTest* ctest, std::ostream& log); cmCTestBZR(cmCTest* ctest, std::ostream& log);
virtual ~cmCTestBZR(); ~cmCTestBZR() CM_OVERRIDE;
private: private:
// Implement cmCTestVC internal API. // Implement cmCTestVC internal API.
virtual void NoteOldRevision(); void NoteOldRevision() CM_OVERRIDE;
virtual void NoteNewRevision(); void NoteNewRevision() CM_OVERRIDE;
virtual bool UpdateImpl(); bool UpdateImpl() CM_OVERRIDE;
// URL of repository directory checked out in the working tree. // URL of repository directory checked out in the working tree.
std::string URL; std::string URL;
std::string LoadInfo(); std::string LoadInfo();
void LoadModifications(); void LoadModifications() CM_OVERRIDE;
void LoadRevisions(); void LoadRevisions() CM_OVERRIDE;
// Parsing helper classes. // Parsing helper classes.
class InfoParser; class InfoParser;
......
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
class cmCTestBatchTestHandler : public cmCTestMultiProcessHandler class cmCTestBatchTestHandler : public cmCTestMultiProcessHandler
{ {
public: public:
~cmCTestBatchTestHandler(); ~cmCTestBatchTestHandler() CM_OVERRIDE;
virtual void RunTests(); void RunTests() CM_OVERRIDE;
protected: protected:
void WriteBatchScript(); void WriteBatchScript();
......
...@@ -30,12 +30,12 @@ public: ...@@ -30,12 +30,12 @@ public:
/* /*
* The main entry point for this class * The main entry point for this class
*/ */
int ProcessHandler(); int ProcessHandler() CM_OVERRIDE;
//! Set all the build and test arguments //! Set all the build and test arguments
virtual int ProcessCommandLineArguments( int ProcessCommandLineArguments(const std::string& currentArg, size_t& idx,
const std::string& currentArg, size_t& idx, const std::vector<std::string>& allArgs)
const std::vector<std::string>& allArgs); CM_OVERRIDE;
/* /*
* Get the output variable * Get the output variable
...@@ -44,7 +44,7 @@ public: ...@@ -44,7 +44,7 @@ public:
cmCTestBuildAndTestHandler(); cmCTestBuildAndTestHandler();
virtual void Initialize(); void Initialize() CM_OVERRIDE;
protected: protected:
///! Run CMake and build a test and then run it as a single test. ///! Run CMake and build a test and then run it as a single test.
......
...@@ -26,12 +26,12 @@ class cmCTestBuildCommand : public cmCTestHandlerCommand ...@@ -26,12 +26,12 @@ class cmCTestBuildCommand : public cmCTestHandlerCommand
{ {
public: public:
cmCTestBuildCommand(); cmCTestBuildCommand();
~cmCTestBuildCommand(); ~cmCTestBuildCommand() CM_OVERRIDE;
/** /**
* This is a virtual constructor for the command. * This is a virtual constructor for the command.
*/ */
virtual cmCommand* Clone() cmCommand* Clone() CM_OVERRIDE