walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

GUI: removed -std=posix and added -std=c++17

This commit is contained in:
Daniel Marjamäki 2019-04-12 11:52:28 +02:00
parent 773d19b2d6
commit f7be03fcbc
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gui/common.h
View File

@ -62,10 +62,10 @@
#define SETTINGS_STD_CPP03 "Platform CPP03" #define SETTINGS_STD_CPP03 "Platform CPP03"
#define SETTINGS_STD_CPP11 "Platform CPP11" #define SETTINGS_STD_CPP11 "Platform CPP11"
#define SETTINGS_STD_CPP14 "Platform CPP14" #define SETTINGS_STD_CPP14 "Platform CPP14"
#define SETTINGS_STD_CPP17 "Platform CPP17"
#define SETTINGS_STD_C89 "Platform C89" #define SETTINGS_STD_C89 "Platform C89"
#define SETTINGS_STD_C99 "Platform C99" #define SETTINGS_STD_C99 "Platform C99"
#define SETTINGS_STD_C11 "Platform C11" #define SETTINGS_STD_C11 "Platform C11"
#define SETTINGS_STD_POSIX "Platform Posix"
// Language enforcement // Language enforcement
#define SETTINGS_ENFORCED_LANGUAGE "Enforced language" #define SETTINGS_ENFORCED_LANGUAGE "Enforced language"

18
gui/mainwindow.cpp
View File

@ -207,6 +207,7 @@ MainWindow::MainWindow(TranslationHandler* th, QSettings* settings) :
mUI.mActionCpp03->setActionGroup(mCppStandardActions); mUI.mActionCpp03->setActionGroup(mCppStandardActions);
mUI.mActionCpp11->setActionGroup(mCppStandardActions); mUI.mActionCpp11->setActionGroup(mCppStandardActions);
mUI.mActionCpp14->setActionGroup(mCppStandardActions); mUI.mActionCpp14->setActionGroup(mCppStandardActions);
mUI.mActionCpp17->setActionGroup(mCppStandardActions);
mUI.mActionEnforceC->setActionGroup(mSelectLanguageActions); mUI.mActionEnforceC->setActionGroup(mSelectLanguageActions);
mUI.mActionEnforceCpp->setActionGroup(mSelectLanguageActions); mUI.mActionEnforceCpp->setActionGroup(mSelectLanguageActions);
@ -283,18 +284,18 @@ void MainWindow::loadSettings()
const bool stdCpp03 = mSettings->value(SETTINGS_STD_CPP03, false).toBool(); const bool stdCpp03 = mSettings->value(SETTINGS_STD_CPP03, false).toBool();
mUI.mActionCpp03->setChecked(stdCpp03); mUI.mActionCpp03->setChecked(stdCpp03);
const bool stdCpp11 = mSettings->value(SETTINGS_STD_CPP11, true).toBool(); const bool stdCpp11 = mSettings->value(SETTINGS_STD_CPP11, false).toBool();
mUI.mActionCpp11->setChecked(stdCpp11 && !stdCpp03); mUI.mActionCpp11->setChecked(stdCpp11 && !stdCpp03);
const bool stdCpp14 = mSettings->value(SETTINGS_STD_CPP14, true).toBool(); const bool stdCpp14 = mSettings->value(SETTINGS_STD_CPP14, false).toBool();
mUI.mActionCpp14->setChecked(stdCpp14 && !stdCpp03 && !stdCpp11); mUI.mActionCpp14->setChecked(stdCpp14 && !stdCpp03 && !stdCpp11);
const bool stdCpp17 = mSettings->value(SETTINGS_STD_CPP17, true).toBool();
mUI.mActionCpp17->setChecked(stdCpp17 && !stdCpp03 && !stdCpp11 && !stdCpp14);
const bool stdC89 = mSettings->value(SETTINGS_STD_C89, false).toBool(); const bool stdC89 = mSettings->value(SETTINGS_STD_C89, false).toBool();
mUI.mActionC89->setChecked(stdC89); mUI.mActionC89->setChecked(stdC89);
const bool stdC11 = mSettings->value(SETTINGS_STD_C11, false).toBool(); const bool stdC11 = mSettings->value(SETTINGS_STD_C11, false).toBool();
mUI.mActionC11->setChecked(stdC11); mUI.mActionC11->setChecked(stdC11);
const bool stdC99 = mSettings->value(SETTINGS_STD_C99, true).toBool(); const bool stdC99 = mSettings->value(SETTINGS_STD_C99, true).toBool();
mUI.mActionC99->setChecked(stdC99 || (!stdC89 && !stdC11)); mUI.mActionC99->setChecked(stdC99 || (!stdC89 && !stdC11));
const bool stdPosix = mSettings->value(SETTINGS_STD_POSIX, false).toBool();
mUI.mActionPosix->setChecked(stdPosix);
// Main window settings // Main window settings
const bool showMainToolbar = mSettings->value(SETTINGS_TOOLBARS_MAIN_SHOW, true).toBool(); const bool showMainToolbar = mSettings->value(SETTINGS_TOOLBARS_MAIN_SHOW, true).toBool();
@ -361,10 +362,10 @@ void MainWindow::saveSettings() const
mSettings->setValue(SETTINGS_STD_CPP03, mUI.mActionCpp03->isChecked()); mSettings->setValue(SETTINGS_STD_CPP03, mUI.mActionCpp03->isChecked());
mSettings->setValue(SETTINGS_STD_CPP11, mUI.mActionCpp11->isChecked()); mSettings->setValue(SETTINGS_STD_CPP11, mUI.mActionCpp11->isChecked());
mSettings->setValue(SETTINGS_STD_CPP14, mUI.mActionCpp14->isChecked()); mSettings->setValue(SETTINGS_STD_CPP14, mUI.mActionCpp14->isChecked());
mSettings->setValue(SETTINGS_STD_CPP17, mUI.mActionCpp17->isChecked());
mSettings->setValue(SETTINGS_STD_C89, mUI.mActionC89->isChecked()); mSettings->setValue(SETTINGS_STD_C89, mUI.mActionC89->isChecked());
mSettings->setValue(SETTINGS_STD_C99, mUI.mActionC99->isChecked()); mSettings->setValue(SETTINGS_STD_C99, mUI.mActionC99->isChecked());
mSettings->setValue(SETTINGS_STD_C11, mUI.mActionC11->isChecked()); mSettings->setValue(SETTINGS_STD_C11, mUI.mActionC11->isChecked());
mSettings->setValue(SETTINGS_STD_POSIX, mUI.mActionPosix->isChecked());
// Main window settings // Main window settings
mSettings->setValue(SETTINGS_TOOLBARS_MAIN_SHOW, mUI.mToolBarMain->isVisible()); mSettings->setValue(SETTINGS_TOOLBARS_MAIN_SHOW, mUI.mToolBarMain->isVisible());
@ -829,7 +830,7 @@ Settings MainWindow::getCppcheckSettings()
const bool std = tryLoadLibrary(&result.library, "std.cfg"); const bool std = tryLoadLibrary(&result.library, "std.cfg");
bool posix = true; bool posix = true;
if (result.standards.posix) if (result.posix())
posix = tryLoadLibrary(&result.library, "posix.cfg"); posix = tryLoadLibrary(&result.library, "posix.cfg");
bool windows = true; bool windows = true;
if (result.isWindowsPlatform()) if (result.isWindowsPlatform())
@ -929,10 +930,11 @@ Settings MainWindow::getCppcheckSettings()
result.standards.cpp = Standards::CPP03; result.standards.cpp = Standards::CPP03;
else if (mSettings->value(SETTINGS_STD_CPP11, false).toBool()) else if (mSettings->value(SETTINGS_STD_CPP11, false).toBool())
result.standards.cpp = Standards::CPP11; result.standards.cpp = Standards::CPP11;
else if (mSettings->value(SETTINGS_STD_CPP14, true).toBool()) else if (mSettings->value(SETTINGS_STD_CPP14, false).toBool())
result.standards.cpp = Standards::CPP14; result.standards.cpp = Standards::CPP14;
else if (mSettings->value(SETTINGS_STD_CPP17, true).toBool())
result.standards.cpp = Standards::CPP17;
result.standards.c = mSettings->value(SETTINGS_STD_C99, true).toBool() ? Standards::C99 : (mSettings->value(SETTINGS_STD_C11, false).toBool() ? Standards::C11 : Standards::C89); result.standards.c = mSettings->value(SETTINGS_STD_C99, true).toBool() ? Standards::C99 : (mSettings->value(SETTINGS_STD_C11, false).toBool() ? Standards::C11 : Standards::C89);
result.standards.posix = mSettings->value(SETTINGS_STD_POSIX, false).toBool();
result.enforcedLang = (Settings::Language)mSettings->value(SETTINGS_ENFORCED_LANGUAGE, 0).toInt(); result.enforcedLang = (Settings::Language)mSettings->value(SETTINGS_ENFORCED_LANGUAGE, 0).toInt();
if (result.jobs <= 1) { if (result.jobs <= 1) {

12
gui/mainwindow.ui
View File

@ -62,7 +62,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>640</width> <width>640</width>
<height>25</height> <height>28</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="mMenuFile"> <widget class="QMenu" name="mMenuFile">
@ -137,6 +137,7 @@
<addaction name="mActionCpp03"/> <addaction name="mActionCpp03"/>
<addaction name="mActionCpp11"/> <addaction name="mActionCpp11"/>
<addaction name="mActionCpp14"/> <addaction name="mActionCpp14"/>
<addaction name="mActionCpp17"/>
</widget> </widget>
<widget class="QMenu" name="menuC_standard"> <widget class="QMenu" name="menuC_standard">
<property name="title"> <property name="title">
@ -156,7 +157,6 @@
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="menuC_standard"/> <addaction name="menuC_standard"/>
<addaction name="menuCpp_standard"/> <addaction name="menuCpp_standard"/>
<addaction name="mActionPosix"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="mActionAutoDetectLanguage"/> <addaction name="mActionAutoDetectLanguage"/>
<addaction name="mActionEnforceCpp"/> <addaction name="mActionEnforceCpp"/>
@ -811,6 +811,14 @@
<string>Check configuration (defines, includes)</string> <string>Check configuration (defines, includes)</string>
</property> </property>
</action> </action>
<action name="mActionCpp17">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>C++17</string>
</property>
</action>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget> <customwidget>