From bafdb801100f83b0c4ff116be483a24507b71abf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Fri, 5 Jul 2013 21:53:19 +0200 Subject: [PATCH] Revert "GUI: Added --std setting for GTK" This reverts commit 5f5fdab650321f0a9845cc0af5ecd860fcb76afe. The --std setting for GTK has been removed --- gui/common.h | 1 - gui/main.ui | 9 --------- gui/mainwindow.cpp | 6 ------ 3 files changed, 16 deletions(-) diff --git a/gui/common.h b/gui/common.h index 5da5ab302..507ce269a 100644 --- a/gui/common.h +++ b/gui/common.h @@ -61,7 +61,6 @@ #define SETTINGS_STD_C89 "Platform C89" #define SETTINGS_STD_C99 "Platform C99" #define SETTINGS_STD_C11 "Platform C11" -#define SETTINGS_STD_GTK "Platform Gtk" #define SETTINGS_STD_POSIX "Platform Posix" // Other settings diff --git a/gui/main.ui b/gui/main.ui index d5e97395a..26dad61a5 100644 --- a/gui/main.ui +++ b/gui/main.ui @@ -148,7 +148,6 @@ - @@ -651,14 +650,6 @@ C99 - - - true - - - Gtk - - true diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp index 4fcd000a8..408127ba6 100644 --- a/gui/mainwindow.cpp +++ b/gui/mainwindow.cpp @@ -251,8 +251,6 @@ void MainWindow::LoadSettings() mUI.mActionC11->setChecked(stdC11); const bool stdC99 = mSettings->value(SETTINGS_STD_C99, true).toBool(); 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(); mUI.mActionPosix->setChecked(stdPosix); @@ -306,7 +304,6 @@ void MainWindow::SaveSettings() const mSettings->setValue(SETTINGS_STD_C89, mUI.mActionC89->isChecked()); mSettings->setValue(SETTINGS_STD_C99, mUI.mActionC99->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()); // Main window settings @@ -565,7 +562,6 @@ Settings MainWindow::GetCppcheckSettings() 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.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(); if (result._jobs <= 1) { @@ -591,7 +587,6 @@ void MainWindow::CheckDone() mPlatformActions->setEnabled(true); mCStandardActions->setEnabled(true); mCppStandardActions->setEnabled(true); - mUI.mActionGtk->setEnabled(true); mUI.mActionPosix->setEnabled(true); if (mScratchPad) mScratchPad->setEnabled(true); @@ -620,7 +615,6 @@ void MainWindow::CheckLockDownUI() mPlatformActions->setEnabled(false); mCStandardActions->setEnabled(false); mCppStandardActions->setEnabled(false); - mUI.mActionGtk->setEnabled(false); mUI.mActionPosix->setEnabled(false); if (mScratchPad) mScratchPad->setEnabled(false);