Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorMartin Hořeňovský2020-08-11 15:50:51 +0200
committerMartin Hořeňovský2020-08-11 17:47:54 +0200
commitaa28a917cbf2fe77b1c611b606dc8b1f39581142 (patch)
tree814a6c1a50078b805df2df6d1c691ab7b774d820 /src
parentb0531404e4cdd31d63bebbc21d9a4556922a0626 (diff)
downloadcatch3-aa28a917cbf2fe77b1c611b606dc8b1f39581142.tar.gz
Turn UseColour into enum class
Diffstat (limited to 'src')
-rw-r--r--src/catch2/catch_config.cpp2
-rw-r--r--src/catch2/catch_config.hpp4
-rw-r--r--src/catch2/interfaces/catch_interfaces_config.hpp6
-rw-r--r--src/catch2/internal/catch_console_colour.cpp4
4 files changed, 8 insertions, 8 deletions
diff --git a/src/catch2/catch_config.cpp b/src/catch2/catch_config.cpp
index a0aa3595..cc023998 100644
--- a/src/catch2/catch_config.cpp
+++ b/src/catch2/catch_config.cpp
@@ -74,7 +74,7 @@ namespace Catch {
double Config::minDuration() const { return m_data.minDuration; }
TestRunOrder Config::runOrder() const { return m_data.runOrder; }
unsigned int Config::rngSeed() const { return m_data.rngSeed; }
- UseColour::YesOrNo Config::useColour() const { return m_data.useColour; }
+ UseColour Config::useColour() const { return m_data.useColour; }
bool Config::shouldDebugBreak() const { return m_data.shouldDebugBreak; }
int Config::abortAfter() const { return m_data.abortAfter; }
bool Config::showInvisibles() const { return m_data.showInvisibles; }
diff --git a/src/catch2/catch_config.hpp b/src/catch2/catch_config.hpp
index d3c113ff..596726b5 100644
--- a/src/catch2/catch_config.hpp
+++ b/src/catch2/catch_config.hpp
@@ -46,7 +46,7 @@ namespace Catch {
ShowDurations showDurations = ShowDurations::DefaultForReporter;
double minDuration = -1;
TestRunOrder runOrder = TestRunOrder::Declared;
- UseColour::YesOrNo useColour = UseColour::Auto;
+ UseColour useColour = UseColour::Auto;
WaitForKeypress::When waitForKeypress = WaitForKeypress::Never;
std::string outputFilename;
@@ -98,7 +98,7 @@ namespace Catch {
double minDuration() const override;
TestRunOrder runOrder() const override;
unsigned int rngSeed() const override;
- UseColour::YesOrNo useColour() const override;
+ UseColour useColour() const override;
bool shouldDebugBreak() const override;
int abortAfter() const override;
bool showInvisibles() const override;
diff --git a/src/catch2/interfaces/catch_interfaces_config.hpp b/src/catch2/interfaces/catch_interfaces_config.hpp
index 2ebfd411..a2cb88a8 100644
--- a/src/catch2/interfaces/catch_interfaces_config.hpp
+++ b/src/catch2/interfaces/catch_interfaces_config.hpp
@@ -39,11 +39,11 @@ namespace Catch {
LexicographicallySorted,
Randomized
};
- struct UseColour { enum YesOrNo {
+ enum class UseColour {
Auto,
Yes,
No
- }; };
+ };
struct WaitForKeypress { enum When {
Never,
BeforeStart = 1,
@@ -73,7 +73,7 @@ namespace Catch {
virtual std::vector<std::string> const& getTestsOrTags() const = 0;
virtual TestRunOrder runOrder() const = 0;
virtual unsigned int rngSeed() const = 0;
- virtual UseColour::YesOrNo useColour() const = 0;
+ virtual UseColour useColour() const = 0;
virtual std::vector<std::string> const& getSectionsToRun() const = 0;
virtual Verbosity verbosity() const = 0;
diff --git a/src/catch2/internal/catch_console_colour.cpp b/src/catch2/internal/catch_console_colour.cpp
index a7bce470..3f41567a 100644
--- a/src/catch2/internal/catch_console_colour.cpp
+++ b/src/catch2/internal/catch_console_colour.cpp
@@ -106,7 +106,7 @@ namespace {
static Win32ColourImpl s_instance;
auto const* config = getCurrentContext().getConfig();
- UseColour::YesOrNo colourMode = config?
+ UseColour colourMode = config?
config->useColour() : UseColour::Auto;
if( colourMode == UseColour::Auto )
colourMode = UseColour::Yes;
@@ -179,7 +179,7 @@ namespace {
IColourImpl* platformColourInstance() {
ErrnoGuard guard;
auto const* config = getCurrentContext().getConfig();
- UseColour::YesOrNo colourMode = config
+ UseColour colourMode = config
? config->useColour()
: UseColour::Auto;
if( colourMode == UseColour::Auto )