Commit a7a92390 authored by Daniel Pfeifer's avatar Daniel Pfeifer

mark functions with CM_OVERRIDE

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