From 635acfa2abddf3b1bc52acb13f39a037e598d6ea Mon Sep 17 00:00:00 2001
From: Kimmo Varis <kimmov@gmail.com>
Date: Mon, 13 Jul 2009 16:47:38 +0300
Subject: [PATCH] GUI: Remove security-category.

The security-category was removed from core in commits 03f3ee62a0d9a7e38f1dfcbefae872cd08990dbc and 11bc5195b84c18cc59f336cc0588dc07294a1de7.
---
 gui/common.h        |  2 --
 gui/main.ui         |  3 +--
 gui/mainwindow.cpp  | 12 ------------
 gui/mainwindow.h    |  6 ------
 gui/resultstree.cpp |  6 ------
 5 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/gui/common.h b/gui/common.h
index 7b216fbd1..d26f3366b 100644
--- a/gui/common.h
+++ b/gui/common.h
@@ -27,7 +27,6 @@ typedef enum
 {
     SHOW_ALL = 0,
     SHOW_STYLE,
-    SHOW_SECURITY,
     SHOW_ERRORS,
     SHOW_NONE
 }
@@ -40,7 +39,6 @@ ShowTypes;
 #define SETTINGS_WINDOW_WIDTH           "Window width"
 #define SETTINGS_WINDOW_HEIGHT          "Window height"
 #define SETTINGS_SHOW_ALL               "Show all"
-#define SETTINGS_SHOW_SECURITY          "Show security"
 #define SETTINGS_SHOW_STYLE             "Show style"
 #define SETTINGS_SHOW_ERRORS            "Show errors"
 #define SETTINGS_CHECK_PATH             "Check path"
diff --git a/gui/main.ui b/gui/main.ui
index a4ef46453..3c72e5d6c 100644
--- a/gui/main.ui
+++ b/gui/main.ui
@@ -69,7 +69,7 @@
      <x>0</x>
      <y>0</y>
      <width>640</width>
-     <height>24</height>
+     <height>22</height>
     </rect>
    </property>
    <widget class="QMenu" name="mMenuFile">
@@ -84,7 +84,6 @@
      <string>&amp;View</string>
     </property>
     <addaction name="mActionShowAll"/>
-    <addaction name="mActionShowSecurity"/>
     <addaction name="mActionShowStyle"/>
     <addaction name="mActionShowErrors"/>
     <addaction name="mActionCheckAll"/>
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 581e60fdb..8af59f1a6 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -56,7 +56,6 @@ MainWindow::MainWindow() :
     connect(mUI.mActionClearResults, SIGNAL(triggered()), this, SLOT(ClearResults()));
 
     connect(mUI.mActionShowAll, SIGNAL(toggled(bool)), this, SLOT(ShowAll(bool)));
-    connect(mUI.mActionShowSecurity, SIGNAL(toggled(bool)), this, SLOT(ShowSecurity(bool)));
     connect(mUI.mActionShowStyle, SIGNAL(toggled(bool)), this, SLOT(ShowStyle(bool)));
     connect(mUI.mActionShowErrors, SIGNAL(toggled(bool)), this, SLOT(ShowErrors(bool)));
     connect(mUI.mActionCheckAll, SIGNAL(triggered()), this, SLOT(CheckAll()));
@@ -149,14 +148,12 @@ void MainWindow::LoadSettings()
 
 
     mUI.mActionShowAll->setChecked(mSettings->value(SETTINGS_SHOW_ALL, true).toBool());
-    mUI.mActionShowSecurity->setChecked(mSettings->value(SETTINGS_SHOW_SECURITY, true).toBool());
     mUI.mActionShowStyle->setChecked(mSettings->value(SETTINGS_SHOW_STYLE, true).toBool());
     mUI.mActionShowErrors->setChecked(mSettings->value(SETTINGS_SHOW_ERRORS, true).toBool());
 
 
     mUI.mResults->ShowResults(SHOW_ALL, mUI.mActionShowAll->isChecked());
     mUI.mResults->ShowResults(SHOW_ERRORS, mUI.mActionShowErrors->isChecked());
-    mUI.mResults->ShowResults(SHOW_SECURITY, mUI.mActionShowSecurity->isChecked());
     mUI.mResults->ShowResults(SHOW_STYLE, mUI.mActionShowStyle->isChecked());
 
     mUI.mActionToolbar->setChecked(mSettings->value(SETTINGS_TOOLBARS_SHOW, true).toBool());
@@ -178,7 +175,6 @@ void MainWindow::SaveSettings()
 
 
     mSettings->setValue(SETTINGS_SHOW_ALL, mUI.mActionShowAll->isChecked());
-    mSettings->setValue(SETTINGS_SHOW_SECURITY, mUI.mActionShowSecurity->isChecked());
     mSettings->setValue(SETTINGS_SHOW_STYLE, mUI.mActionShowStyle->isChecked());
     mSettings->setValue(SETTINGS_SHOW_ERRORS, mUI.mActionShowErrors->isChecked());
     mSettings->setValue(SETTINGS_TOOLBARS_SHOW, mUI.mToolBar->isVisible());
@@ -415,11 +411,6 @@ void MainWindow::ShowAll(bool checked)
     mUI.mResults->ShowResults(SHOW_ALL, checked);
 }
 
-void MainWindow::ShowSecurity(bool checked)
-{
-    mUI.mResults->ShowResults(SHOW_SECURITY, checked);
-}
-
 void MainWindow::ShowStyle(bool checked)
 {
     mUI.mResults->ShowResults(SHOW_STYLE, checked);
@@ -471,9 +462,6 @@ void MainWindow::ToggleAllChecked(bool checked)
     mUI.mActionShowAll->setChecked(checked);
     ShowAll(checked);
 
-    mUI.mActionShowSecurity->setChecked(checked);
-    ShowSecurity(checked);
-
     mUI.mActionShowStyle->setChecked(checked);
     ShowStyle(checked);
 
diff --git a/gui/mainwindow.h b/gui/mainwindow.h
index b2aa4b2ee..b073dd184 100644
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@@ -73,12 +73,6 @@ public slots:
     */
     void ShowAll(bool checked);
 
-    /**
-    * @brief Show errors with type "security"
-    * @param checked Should errors be shown (true) or hidden (false)
-    */
-    void ShowSecurity(bool checked);
-
     /**
     * @brief Show errors with type "style"
     * @param checked Should errors be shown (true) or hidden (false)
diff --git a/gui/resultstree.cpp b/gui/resultstree.cpp
index 342ebfa4d..c9f984624 100644
--- a/gui/resultstree.cpp
+++ b/gui/resultstree.cpp
@@ -189,8 +189,6 @@ ShowTypes ResultsTree::SeverityToShowType(const QString & severity)
         return SHOW_ERRORS;
     if (severity == "style")
         return SHOW_STYLE;
-    if (severity == "security")
-        return SHOW_SECURITY;
 
     return SHOW_NONE;
 }
@@ -617,10 +615,6 @@ QString ResultsTree::ShowTypeToString(ShowTypes type)
         return tr("style");
         break;
 
-    case SHOW_SECURITY:
-        return tr("security");
-        break;
-
     case SHOW_ERRORS:
         return tr("error");
         break;