diff options
author | Alex Neundorf <neundorf@kde.org> | 2010-11-11 21:13:39 (GMT) |
---|---|---|
committer | Alex Neundorf <neundorf@kde.org> | 2010-11-11 21:13:39 (GMT) |
commit | 156ae39905f2d44cefdfa71d0757ae4766dc3b34 (patch) | |
tree | 10a2e024a5ae708a51953f97d5b4c9bfe6c3d798 /Source | |
parent | e547fa763be0de7dad5bd4e5138e9c4133d4fca8 (diff) | |
download | CMake-156ae39905f2d44cefdfa71d0757ae4766dc3b34.zip CMake-156ae39905f2d44cefdfa71d0757ae4766dc3b34.tar.gz CMake-156ae39905f2d44cefdfa71d0757ae4766dc3b34.tar.bz2 |
Don't disable colors in the CodeBlocks generator and minor cleanup.
Since now the only users of SetToolSupportsColor() are gone, this
method is removed too.
Alex
Diffstat (limited to 'Source')
-rw-r--r-- | Source/cmExtraCodeBlocksGenerator.cxx | 9 | ||||
-rw-r--r-- | Source/cmExtraCodeBlocksGenerator.h | 1 | ||||
-rw-r--r-- | Source/cmExtraEclipseCDT4Generator.cxx | 10 | ||||
-rw-r--r-- | Source/cmExtraEclipseCDT4Generator.h | 2 | ||||
-rw-r--r-- | Source/cmGlobalGenerator.h | 1 |
5 files changed, 0 insertions, 23 deletions
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx index 191ad2c..a5650d4 100644 --- a/Source/cmExtraCodeBlocksGenerator.cxx +++ b/Source/cmExtraCodeBlocksGenerator.cxx @@ -63,15 +63,6 @@ cmExtraCodeBlocksGenerator::cmExtraCodeBlocksGenerator() } -void cmExtraCodeBlocksGenerator::SetGlobalGenerator( - cmGlobalGenerator* generator) -{ - cmExternalMakefileProjectGenerator::SetGlobalGenerator(generator); - cmGlobalUnixMakefileGenerator3* mf = (cmGlobalUnixMakefileGenerator3*) - generator; - mf->SetToolSupportsColor(false); -} - void cmExtraCodeBlocksGenerator::Generate() { // for each sub project in the project create a codeblocks project diff --git a/Source/cmExtraCodeBlocksGenerator.h b/Source/cmExtraCodeBlocksGenerator.h index b66b24a..57751fc 100644 --- a/Source/cmExtraCodeBlocksGenerator.h +++ b/Source/cmExtraCodeBlocksGenerator.h @@ -27,7 +27,6 @@ class cmExtraCodeBlocksGenerator : public cmExternalMakefileProjectGenerator { public: cmExtraCodeBlocksGenerator(); - virtual void SetGlobalGenerator(cmGlobalGenerator* generator); virtual const char* GetName() const { return cmExtraCodeBlocksGenerator::GetActualName();} diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx index 862a9ae..8f89b5e 100644 --- a/Source/cmExtraEclipseCDT4Generator.cxx +++ b/Source/cmExtraEclipseCDT4Generator.cxx @@ -52,16 +52,6 @@ void cmExtraEclipseCDT4Generator } //---------------------------------------------------------------------------- -void cmExtraEclipseCDT4Generator -::SetGlobalGenerator(cmGlobalGenerator* generator) -{ - cmExternalMakefileProjectGenerator::SetGlobalGenerator(generator); - cmGlobalUnixMakefileGenerator3* mf - = static_cast<cmGlobalUnixMakefileGenerator3*>(generator); - mf->SetToolSupportsColor(true); -} - -//---------------------------------------------------------------------------- void cmExtraEclipseCDT4Generator::Generate() { const cmMakefile* mf diff --git a/Source/cmExtraEclipseCDT4Generator.h b/Source/cmExtraEclipseCDT4Generator.h index 118c79a..2ad599d 100644 --- a/Source/cmExtraEclipseCDT4Generator.h +++ b/Source/cmExtraEclipseCDT4Generator.h @@ -40,8 +40,6 @@ public: virtual void GetDocumentation(cmDocumentationEntry& entry, const char* fullName) const; - virtual void SetGlobalGenerator(cmGlobalGenerator* generator); - virtual void Generate(); private: diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index d60e18d..e68ed08 100644 --- a/Source/cmGlobalGenerator.h +++ b/Source/cmGlobalGenerator.h @@ -161,7 +161,6 @@ public: bool GetForceUnixPaths() {return this->ForceUnixPaths;} bool GetToolSupportsColor() { return this->ToolSupportsColor; } - void SetToolSupportsColor(bool enable) { this->ToolSupportsColor = enable; } ///! return the language for the given extension const char* GetLanguageFromExtension(const char* ext); |