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

Revert "GUI: Added --std setting for GTK" 

This reverts commit 5f5fdab650.

The --std setting for GTK has been removed
This commit is contained in:
Daniel Marjamäki 2013-07-05 21:53:19 +02:00
parent 00886b4d06
commit bafdb80110
3 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gui/common.h
View File

@ -61,7 +61,6 @@
#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_GTK "Platform Gtk"
#define SETTINGS_STD_POSIX "Platform Posix" #define SETTINGS_STD_POSIX "Platform Posix"
// Other settings // Other settings

9
gui/main.ui
View File

@ -148,7 +148,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="mActionGtk"/>
<addaction name="mActionPosix"/> <addaction name="mActionPosix"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="mActionPlatforms"/> <addaction name="mActionPlatforms"/>
@ -651,14 +650,6 @@
<string>C99</string> <string>C99</string>
</property> </property>
</action> </action>
<action name="mActionGtk">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Gtk</string>
</property>
</action>
<action name="mActionPosix"> <action name="mActionPosix">
<property name="checkable"> <property name="checkable">
<bool>true</bool> <bool>true</bool>

6
gui/mainwindow.cpp
View File

@ -251,8 +251,6 @@ void MainWindow::LoadSettings()
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 stdGtk = mSettings->value(SETTINGS_STD_GTK, false).toBool();
mUI.mActionGtk->setChecked(stdGtk);
const bool stdPosix = mSettings->value(SETTINGS_STD_POSIX, false).toBool(); const bool stdPosix = mSettings->value(SETTINGS_STD_POSIX, false).toBool();
mUI.mActionPosix->setChecked(stdPosix); mUI.mActionPosix->setChecked(stdPosix);
@ -306,7 +304,6 @@ void MainWindow::SaveSettings() const
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_GTK, mUI.mActionGtk->isChecked());
mSettings->setValue(SETTINGS_STD_POSIX, mUI.mActionPosix->isChecked()); mSettings->setValue(SETTINGS_STD_POSIX, mUI.mActionPosix->isChecked());
// Main window settings // Main window settings
@ -565,7 +562,6 @@ Settings MainWindow::GetCppcheckSettings()
result.platformType = (Settings::PlatformType) mSettings->value(SETTINGS_CHECKED_PLATFORM, 0).toInt(); result.platformType = (Settings::PlatformType) mSettings->value(SETTINGS_CHECKED_PLATFORM, 0).toInt();
result.standards.cpp = mSettings->value(SETTINGS_STD_CPP11, true).toBool() ? Standards::CPP11 : Standards::CPP03; result.standards.cpp = mSettings->value(SETTINGS_STD_CPP11, true).toBool() ? Standards::CPP11 : Standards::CPP03;
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.gtk = mSettings->value(SETTINGS_STD_GTK, false).toBool();
result.standards.posix = mSettings->value(SETTINGS_STD_POSIX, false).toBool(); result.standards.posix = mSettings->value(SETTINGS_STD_POSIX, false).toBool();
if (result._jobs <= 1) { if (result._jobs <= 1) {
@ -591,7 +587,6 @@ void MainWindow::CheckDone()
mPlatformActions->setEnabled(true); mPlatformActions->setEnabled(true);
mCStandardActions->setEnabled(true); mCStandardActions->setEnabled(true);
mCppStandardActions->setEnabled(true); mCppStandardActions->setEnabled(true);
mUI.mActionGtk->setEnabled(true);
mUI.mActionPosix->setEnabled(true); mUI.mActionPosix->setEnabled(true);
if (mScratchPad) if (mScratchPad)
mScratchPad->setEnabled(true); mScratchPad->setEnabled(true);
@ -620,7 +615,6 @@ void MainWindow::CheckLockDownUI()
mPlatformActions->setEnabled(false); mPlatformActions->setEnabled(false);
mCStandardActions->setEnabled(false); mCStandardActions->setEnabled(false);
mCppStandardActions->setEnabled(false); mCppStandardActions->setEnabled(false);
mUI.mActionGtk->setEnabled(false);
mUI.mActionPosix->setEnabled(false); mUI.mActionPosix->setEnabled(false);
if (mScratchPad) if (mScratchPad)
mScratchPad->setEnabled(false); mScratchPad->setEnabled(false);