Skip to content

Commit b0fbbb5

Browse files
committed
Convert SHOWTIME_MODES to enum class
1 parent 8deb855 commit b0fbbb5

6 files changed

Lines changed: 17 additions & 17 deletions

File tree

cli/cmdlineparser.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -750,13 +750,13 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])
750750
else if (std::strncmp(argv[i], "--showtime=", 11) == 0) {
751751
const std::string showtimeMode = argv[i] + 11;
752752
if (showtimeMode == "file")
753-
mSettings->showtime = SHOWTIME_FILE;
753+
mSettings->showtime = SHOWTIME_MODES::SHOWTIME_FILE;
754754
else if (showtimeMode == "summary")
755-
mSettings->showtime = SHOWTIME_SUMMARY;
755+
mSettings->showtime = SHOWTIME_MODES::SHOWTIME_SUMMARY;
756756
else if (showtimeMode == "top5")
757-
mSettings->showtime = SHOWTIME_TOP5;
757+
mSettings->showtime = SHOWTIME_MODES::SHOWTIME_TOP5;
758758
else if (showtimeMode.empty())
759-
mSettings->showtime = SHOWTIME_NONE;
759+
mSettings->showtime = SHOWTIME_MODES::SHOWTIME_NONE;
760760
else {
761761
std::string message("cppcheck: error: unrecognized showtime mode: \"");
762762
message += showtimeMode;

lib/cppcheck.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
471471
}
472472

473473
Tokenizer mTokenizer(&mSettings, this);
474-
if (mSettings.showtime != SHOWTIME_NONE)
474+
if (mSettings.showtime != SHOWTIME_MODES::SHOWTIME_NONE)
475475
mTokenizer.setTimerResults(&S_timerResults);
476476

477477
try {

lib/settings.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Settings::Settings()
5555
quiet(false),
5656
relativePaths(false),
5757
reportProgress(false),
58-
showtime(SHOWTIME_NONE),
58+
showtime(SHOWTIME_MODES::SHOWTIME_NONE),
5959
verbose(false),
6060
xml(false),
6161
xml_version(2)

lib/timer.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ namespace {
4141

4242
void TimerResults::ShowResults(SHOWTIME_MODES mode) const
4343
{
44-
if (mode == SHOWTIME_NONE)
44+
if (mode == SHOWTIME_MODES::SHOWTIME_NONE)
4545
return;
4646

4747
std::cout << std::endl;
@@ -55,7 +55,7 @@ void TimerResults::ShowResults(SHOWTIME_MODES mode) const
5555
const double sec = iter->second.seconds();
5656
const double secAverage = sec / (double)(iter->second.mNumberOfResults);
5757
overallData.mClocks += iter->second.mClocks;
58-
if ((mode != SHOWTIME_TOP5) || (ordinal<=5)) {
58+
if ((mode != SHOWTIME_MODES::SHOWTIME_TOP5) || (ordinal<=5)) {
5959
std::cout << iter->first << ": " << sec << "s (avg. " << secAverage << "s - " << iter->second.mNumberOfResults << " result(s))" << std::endl;
6060
}
6161
++ordinal;
@@ -71,14 +71,14 @@ void TimerResults::AddResults(const std::string& str, std::clock_t clocks)
7171
mResults[str].mNumberOfResults++;
7272
}
7373

74-
Timer::Timer(const std::string& str, unsigned int showtimeMode, TimerResultsIntf* timerResults)
74+
Timer::Timer(const std::string& str, SHOWTIME_MODES showtimeMode, TimerResultsIntf* timerResults)
7575
: mStr(str)
7676
, mTimerResults(timerResults)
7777
, mStart(0)
7878
, mShowTimeMode(showtimeMode)
7979
, mStopped(false)
8080
{
81-
if (showtimeMode != SHOWTIME_NONE)
81+
if (showtimeMode != SHOWTIME_MODES::SHOWTIME_NONE)
8282
mStart = std::clock();
8383
}
8484

@@ -89,11 +89,11 @@ Timer::~Timer()
8989

9090
void Timer::Stop()
9191
{
92-
if ((mShowTimeMode != SHOWTIME_NONE) && !mStopped) {
92+
if ((mShowTimeMode != SHOWTIME_MODES::SHOWTIME_NONE) && !mStopped) {
9393
const std::clock_t end = std::clock();
9494
const std::clock_t diff = end - mStart;
9595

96-
if (mShowTimeMode == SHOWTIME_FILE) {
96+
if (mShowTimeMode == SHOWTIME_MODES::SHOWTIME_FILE) {
9797
const double sec = (double)diff / CLOCKS_PER_SEC;
9898
std::cout << mStr << ": " << sec << "s" << std::endl;
9999
} else {

lib/timer.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include <map>
2727
#include <string>
2828

29-
enum SHOWTIME_MODES {
29+
enum class SHOWTIME_MODES {
3030
SHOWTIME_NONE = 0,
3131
SHOWTIME_FILE,
3232
SHOWTIME_SUMMARY,
@@ -69,7 +69,7 @@ class CPPCHECKLIB TimerResults : public TimerResultsIntf {
6969

7070
class CPPCHECKLIB Timer {
7171
public:
72-
Timer(const std::string& str, unsigned int showtimeMode, TimerResultsIntf* timerResults = nullptr);
72+
Timer(const std::string& str, SHOWTIME_MODES showtimeMode, TimerResultsIntf* timerResults = nullptr);
7373
~Timer();
7474
void Stop();
7575

@@ -80,7 +80,7 @@ class CPPCHECKLIB Timer {
8080
const std::string mStr;
8181
TimerResultsIntf* mTimerResults;
8282
std::clock_t mStart;
83-
const unsigned int mShowTimeMode;
83+
const SHOWTIME_MODES mShowTimeMode;
8484
bool mStopped;
8585
};
8686
//---------------------------------------------------------------------------

test/testcmdlineparser.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -893,9 +893,9 @@ class TestCmdlineParser : public TestFixture {
893893
void showtime() {
894894
REDIRECT;
895895
const char * const argv[] = {"cppcheck", "--showtime=summary"};
896-
settings.showtime = SHOWTIME_NONE;
896+
settings.showtime = SHOWTIME_MODES::SHOWTIME_NONE;
897897
ASSERT(defParser.parseFromArgs(2, argv));
898-
ASSERT(settings.showtime == SHOWTIME_SUMMARY);
898+
ASSERT(settings.showtime == SHOWTIME_MODES::SHOWTIME_SUMMARY);
899899
}
900900

901901
void errorlist1() {

0 commit comments

Comments
 (0)