Skip to content

Commit 6bf21e8

Browse files
firewavefirewave
committed
moved Language from settings.h to standards.h [skip ci]
1 parent e3b3048 commit 6bf21e8

8 files changed

Lines changed: 26 additions & 28 deletions

File tree

‎cli/cmdlineparser.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -797,9 +797,9 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
797797
}
798798

799799
if (str == "c")
800-
mSettings.enforcedLang = Settings::Language::C;
800+
mSettings.enforcedLang = Standards::Language::C;
801801
else if (str == "c++")
802-
mSettings.enforcedLang = Settings::Language::CPP;
802+
mSettings.enforcedLang = Standards::Language::CPP;
803803
else {
804804
mLogger.printError("unknown language '" + str + "' enforced.");
805805
return Result::Fail;

‎gui/mainwindow.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -392,10 +392,10 @@ void MainWindow::loadSettings()
392392
mUI->mActionToolBarFilter->setChecked(showFilterToolbar);
393393
mUI->mToolBarFilter->setVisible(showFilterToolbar);
394394

395-
const Settings::Language enforcedLanguage = (Settings::Language)mSettings->value(SETTINGS_ENFORCED_LANGUAGE, 0).toInt();
396-
if (enforcedLanguage == Settings::CPP)
395+
const Standards::Language enforcedLanguage = (Standards::Language)mSettings->value(SETTINGS_ENFORCED_LANGUAGE, 0).toInt();
396+
if (enforcedLanguage == Standards::Language::CPP)
397397
mUI->mActionEnforceCpp->setChecked(true);
398-
else if (enforcedLanguage == Settings::C)
398+
else if (enforcedLanguage == Standards::Language::C)
399399
mUI->mActionEnforceC->setChecked(true);
400400
else
401401
mUI->mActionAutoDetectLanguage->setChecked(true);
@@ -469,11 +469,11 @@ void MainWindow::saveSettings() const
469469
mSettings->setValue(SETTINGS_TOOLBARS_FILTER_SHOW, mUI->mToolBarFilter->isVisible());
470470

471471
if (mUI->mActionEnforceCpp->isChecked())
472-
mSettings->setValue(SETTINGS_ENFORCED_LANGUAGE, Settings::CPP);
472+
mSettings->setValue(SETTINGS_ENFORCED_LANGUAGE, Standards::Language::CPP);
473473
else if (mUI->mActionEnforceC->isChecked())
474-
mSettings->setValue(SETTINGS_ENFORCED_LANGUAGE, Settings::C);
474+
mSettings->setValue(SETTINGS_ENFORCED_LANGUAGE, Standards::Language::C);
475475
else
476-
mSettings->setValue(SETTINGS_ENFORCED_LANGUAGE, Settings::None);
476+
mSettings->setValue(SETTINGS_ENFORCED_LANGUAGE, Standards::Language::None);
477477

478478
mApplications->saveSettings();
479479

@@ -1091,7 +1091,7 @@ Settings MainWindow::getCppcheckSettings()
10911091
result.platform.set((Platform::Type) mSettings->value(SETTINGS_CHECKED_PLATFORM, 0).toInt());
10921092
result.standards.setCPP(mSettings->value(SETTINGS_STD_CPP, QString()).toString().toStdString());
10931093
result.standards.setC(mSettings->value(SETTINGS_STD_C, QString()).toString().toStdString());
1094-
result.enforcedLang = (Settings::Language)mSettings->value(SETTINGS_ENFORCED_LANGUAGE, 0).toInt();
1094+
result.enforcedLang = (Standards::Language)mSettings->value(SETTINGS_ENFORCED_LANGUAGE, 0).toInt();
10951095

10961096
if (result.jobs <= 1) {
10971097
result.jobs = 1;

‎lib/cppcheck.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,13 +188,13 @@ static void createDumpFile(const Settings& settings,
188188

189189
std::string language;
190190
switch (settings.enforcedLang) {
191-
case Settings::Language::C:
191+
case Standards::Language::C:
192192
language = " language=\"c\"";
193193
break;
194-
case Settings::Language::CPP:
194+
case Standards::Language::CPP:
195195
language = " language=\"cpp\"";
196196
break;
197-
case Settings::Language::None:
197+
case Standards::Language::None:
198198
if (Path::isCPP(filename))
199199
language = " language=\"cpp\"";
200200
else if (Path::isC(filename))

‎lib/settings.h‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,12 +182,8 @@ class CPPCHECKLIB WARN_UNUSED Settings {
182182
bool dump{};
183183
std::string dumpFile;
184184

185-
enum Language {
186-
None, C, CPP
187-
};
188-
189185
/** @brief Name of the language that is enforced. Empty per default. */
190-
Language enforcedLang{};
186+
Standards::Language enforcedLang{};
191187

192188
#if defined(USE_WINDOWS_SEH) || defined(USE_UNIX_SIGNAL_HANDLING)
193189
/** @brief Is --exception-handling given */

‎lib/standards.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
* This struct contains all possible standards that cppcheck recognize.
3535
*/
3636
struct Standards {
37+
enum Language { None, C, CPP };
38+
3739
/** C code standard */
3840
enum cstd_t { C89, C99, C11, CLatest = C11 } c = CLatest;
3941

‎lib/tokenlist.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ void TokenList::determineCppC()
8484
mIsC = Path::isC(getSourceFilePath());
8585
mIsCpp = Path::isCPP(getSourceFilePath());
8686
} else {
87-
mIsC = mSettings->enforcedLang == Settings::Language::C || (mSettings->enforcedLang == Settings::Language::None && Path::isC(getSourceFilePath()));
88-
mIsCpp = mSettings->enforcedLang == Settings::Language::CPP || (mSettings->enforcedLang == Settings::Language::None && Path::isCPP(getSourceFilePath()));
87+
mIsC = mSettings->enforcedLang == Standards::Language::C || (mSettings->enforcedLang == Standards::Language::None && Path::isC(getSourceFilePath()));
88+
mIsCpp = mSettings->enforcedLang == Standards::Language::CPP || (mSettings->enforcedLang == Standards::Language::None && Path::isCPP(getSourceFilePath()));
8989
}
9090
}
9191

‎test/testcmdlineparser.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -631,17 +631,17 @@ class TestCmdlineParser : public TestFixture {
631631
void enforceLanguage1() {
632632
REDIRECT;
633633
const char * const argv[] = {"cppcheck", "file.cpp"};
634-
settings->enforcedLang = Settings::Language::None;
634+
settings->enforcedLang = Standards::Language::None;
635635
ASSERT_EQUALS(CmdLineParser::Result::Success, parser->parseFromArgs(2, argv));
636-
ASSERT_EQUALS(Settings::Language::None, settings->enforcedLang);
636+
ASSERT_EQUALS(Standards::Language::None, settings->enforcedLang);
637637
}
638638

639639
void enforceLanguage2() {
640640
REDIRECT;
641641
const char * const argv[] = {"cppcheck", "-x", "c++", "file.cpp"};
642-
settings->enforcedLang = Settings::Language::None;
642+
settings->enforcedLang = Standards::Language::None;
643643
ASSERT_EQUALS(CmdLineParser::Result::Success, parser->parseFromArgs(4, argv));
644-
ASSERT_EQUALS(Settings::Language::CPP, settings->enforcedLang);
644+
ASSERT_EQUALS(Standards::Language::CPP, settings->enforcedLang);
645645
}
646646

647647
void enforceLanguage3() {
@@ -661,17 +661,17 @@ class TestCmdlineParser : public TestFixture {
661661
void enforceLanguage5() {
662662
REDIRECT;
663663
const char * const argv[] = {"cppcheck", "--language=c++", "file.cpp"};
664-
settings->enforcedLang = Settings::Language::None;
664+
settings->enforcedLang = Standards::Language::None;
665665
ASSERT_EQUALS(CmdLineParser::Result::Success, parser->parseFromArgs(3, argv));
666-
ASSERT_EQUALS(Settings::Language::CPP, settings->enforcedLang);
666+
ASSERT_EQUALS(Standards::Language::CPP, settings->enforcedLang);
667667
}
668668

669669
void enforceLanguage6() {
670670
REDIRECT;
671671
const char * const argv[] = {"cppcheck", "--language=c", "file.cpp"};
672-
settings->enforcedLang = Settings::Language::None;
672+
settings->enforcedLang = Standards::Language::None;
673673
ASSERT_EQUALS(CmdLineParser::Result::Success, parser->parseFromArgs(3, argv));
674-
ASSERT_EQUALS(Settings::Language::C, settings->enforcedLang);
674+
ASSERT_EQUALS(Standards::Language::C, settings->enforcedLang);
675675
}
676676

677677
void enforceLanguage7() {

‎test/testunusedvar.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1822,7 +1822,7 @@ class TestUnusedVar : public TestFixture {
18221822
errout.str());
18231823

18241824
Settings s = settings;
1825-
s.enforcedLang = Settings::C;
1825+
s.enforcedLang = Standards::Language::C;
18261826
checkStructMemberUsage("struct A {\n" // #10852
18271827
" struct B {\n"
18281828
" int x;\n"

0 commit comments

Comments
 (0)