analyzer: merge valgrind related settings

This mainly reduces the number of tabs in the settings dialog.

Change-Id: I62ba5c74585648c8f495602cd4d676d0628de9b5
Reviewed-on: http://codereview.qt.nokia.com/1575
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

1 files changed, 23 insertions, 9 deletions

diff --git a/src/plugins/valgrind/valgrindconfigwidget.h b/src/plugins/valgrind/valgrindconfigwidget.h
index b63b88248f..948e87ff96 100644
--- a/src/plugins/valgrind/valgrindconfigwidget.h
+++ b/src/plugins/valgrind/valgrindconfigwidget.h
@@ -32,12 +32,15 @@
 **
 **************************************************************************/
 
-
-#ifndef ANALYZER_INTERNAL_VALGRINDCONFIGWIDGET_H
-#define ANALYZER_INTERNAL_VALGRINDCONFIGWIDGET_H
+#ifndef ANALYZER_VALGRINDCONFIGWIDGET_H
+#define ANALYZER_VALGRINDCONFIGWIDGET_H
 
 #include <QtGui/QWidget>
 
+QT_BEGIN_NAMESPACE
+class QStandardItemModel;
+QT_END_NAMESPACE
+
 namespace Valgrind {
 namespace Internal {
 
@@ -45,22 +48,33 @@ namespace Ui {
 class ValgrindConfigWidget;
 }
 
-class ValgrindSettings;
+class ValgrindBaseSettings;
 
 class ValgrindConfigWidget : public QWidget
 {
     Q_OBJECT
 
 public:
-    ValgrindConfigWidget(ValgrindSettings *settings, QWidget *parent);
+    ValgrindConfigWidget(ValgrindBaseSettings *settings, QWidget *parent, bool global);
     virtual ~ValgrindConfigWidget();
 
+    void setSuppressions(const QStringList &files);
+    QStringList suppressions() const;
+
+public Q_SLOTS:
+    void slotAddSuppression();
+    void slotRemoveSuppression();
+    void slotSuppressionsRemoved(const QStringList &files);
+    void slotSuppressionsAdded(const QStringList &files);
+    void slotSuppressionSelectionChanged();
+
 private:
-    ValgrindSettings *m_settings;
+    ValgrindBaseSettings *m_settings;
     Ui::ValgrindConfigWidget *m_ui;
+    QStandardItemModel *m_model;
 };
 
-}
-}
+} // namespace Internal
+} // namespace Valgrind
 
-#endif // ANALYZER_INTERNAL_VALGRINDCONFIGWIDGET_H
+#endif // ANALYZER_VALGRINDCONFIGWIDGET_H