From 0932334109a9a3cfc445eae4497de56671b36ff0 Mon Sep 17 00:00:00 2001
From: Kevin Funk <kevin.funk@kdab.com>
Date: Fri, 4 Mar 2011 16:00:03 +0100
Subject: [PATCH] Simplify analyzer config widgets

Interconnect signal/slots directly instead of adding other slots in the
config widgets class.

Merge-request: 265
Reviewed-by: hjk <qtc-committer@nokia.com>
---
 src/plugins/memcheck/memcheckconfigwidget.cpp | 30 +++----------------
 src/plugins/memcheck/memcheckconfigwidget.h   |  9 +-----
 .../valgrindtoolbase/valgrindconfigwidget.cpp | 15 ++--------
 .../valgrindtoolbase/valgrindconfigwidget.h   |  6 ----
 4 files changed, 7 insertions(+), 53 deletions(-)

diff --git a/src/plugins/memcheck/memcheckconfigwidget.cpp b/src/plugins/memcheck/memcheckconfigwidget.cpp
index 413b9f8018a..933c0c767eb 100644
--- a/src/plugins/memcheck/memcheckconfigwidget.cpp
+++ b/src/plugins/memcheck/memcheckconfigwidget.cpp
@@ -62,12 +62,12 @@ MemcheckConfigWidget::MemcheckConfigWidget(AbstractMemcheckSettings *settings, Q
             this, SLOT(slotRemoveSuppression()));
 
     m_ui->numCallers->setValue(m_settings->numCallers());
-    connect(m_ui->numCallers, SIGNAL(valueChanged(int)), SLOT(setNumCallers(int)));
-    connect(m_settings, SIGNAL(numCallersChanged(int)), SLOT(setNumCallers(int)));
+    connect(m_ui->numCallers, SIGNAL(valueChanged(int)), m_settings, SLOT(setNumCallers(int)));
+    connect(m_settings, SIGNAL(numCallersChanged(int)), m_ui->numCallers, SLOT(setValue(int)));
 
     m_ui->trackOrigins->setChecked(m_settings->trackOrigins());
-    connect(m_ui->trackOrigins, SIGNAL(toggled(bool)), SLOT(setTrackOrigins(bool)));
-    connect(m_settings, SIGNAL(trackOriginsChanged(bool)), SLOT(setTrackOrigins(bool)));
+    connect(m_ui->trackOrigins, SIGNAL(toggled(bool)), m_settings, SLOT(setTrackOrigins(bool)));
+    connect(m_settings, SIGNAL(trackOriginsChanged(bool)), m_ui->trackOrigins, SLOT(setChecked(bool)));
 
     connect(m_settings, SIGNAL(suppressionFilesRemoved(QStringList)),
             this, SLOT(slotSuppressionsRemoved(QStringList)));
@@ -163,28 +163,6 @@ QStringList MemcheckConfigWidget::suppressions() const
     return ret;
 }
 
-void MemcheckConfigWidget::setNumCallers(int callers)
-{
-    m_ui->numCallers->setValue(callers);
-    m_settings->setNumCallers(callers);
-}
-
-int MemcheckConfigWidget::numCallers() const
-{
-    return m_ui->numCallers->value();
-}
-
-void MemcheckConfigWidget::setTrackOrigins(bool enable)
-{
-    m_ui->trackOrigins->setChecked(enable);
-    m_settings->setTrackOrigins(enable);
-}
-
-bool MemcheckConfigWidget::trackOrigins() const
-{
-    return m_ui->trackOrigins->isChecked();
-}
-
 void MemcheckConfigWidget::slotSuppressionSelectionChanged()
 {
     m_ui->removeSuppression->setEnabled(m_ui->suppressionList->selectionModel()->hasSelection());
diff --git a/src/plugins/memcheck/memcheckconfigwidget.h b/src/plugins/memcheck/memcheckconfigwidget.h
index a846ab9709e..e1c1f979414 100644
--- a/src/plugins/memcheck/memcheckconfigwidget.h
+++ b/src/plugins/memcheck/memcheckconfigwidget.h
@@ -63,14 +63,7 @@ public:
     void setSuppressions(const QStringList &files);
     QStringList suppressions() const;
 
-    // ### remove the following?
-    int numCallers() const;
-    bool trackOrigins() const;
-
-public slots:
-    void setNumCallers(int callers);
-    void setTrackOrigins(bool enable);
-
+public Q_SLOTS:
     void slotAddSuppression();
     void slotRemoveSuppression();
     void slotSuppressionsRemoved(const QStringList &files);
diff --git a/src/plugins/valgrindtoolbase/valgrindconfigwidget.cpp b/src/plugins/valgrindtoolbase/valgrindconfigwidget.cpp
index 7e03254b6d8..3c13f79fa7e 100644
--- a/src/plugins/valgrindtoolbase/valgrindconfigwidget.cpp
+++ b/src/plugins/valgrindtoolbase/valgrindconfigwidget.cpp
@@ -54,22 +54,11 @@ ValgrindConfigWidget::ValgrindConfigWidget(ValgrindSettings *settings, QWidget *
     m_ui->valgrindExeChooser->setPromptDialogTitle(tr("Valgrind Command"));
 
     m_ui->valgrindExeChooser->setPath(m_settings->valgrindExecutable());
-    connect(m_ui->valgrindExeChooser, SIGNAL(changed(QString)), SLOT(setValgrindExe(QString)));
-    connect(m_settings, SIGNAL(valgrindExecutableChanged(QString)), SLOT(setValgrindExe(QString)));
+    connect(m_ui->valgrindExeChooser, SIGNAL(changed(QString)), m_settings, SLOT(setValgrindExecutable(QString)));
+    connect(m_settings, SIGNAL(valgrindExecutableChanged(QString)), m_ui->valgrindExeChooser, SLOT(setPath(QString)));
 }
 
 ValgrindConfigWidget::~ValgrindConfigWidget()
 {
     delete m_ui;
 }
-
-void ValgrindConfigWidget::setValgrindExe(const QString &exe)
-{
-    m_ui->valgrindExeChooser->setPath(exe);
-    m_settings->setValgrindExecutable(exe);
-}
-
-QString ValgrindConfigWidget::valgrindExe() const
-{
-    return m_ui->valgrindExeChooser->path();
-}
diff --git a/src/plugins/valgrindtoolbase/valgrindconfigwidget.h b/src/plugins/valgrindtoolbase/valgrindconfigwidget.h
index 9157b87da3c..891f7f8fbab 100644
--- a/src/plugins/valgrindtoolbase/valgrindconfigwidget.h
+++ b/src/plugins/valgrindtoolbase/valgrindconfigwidget.h
@@ -58,12 +58,6 @@ public:
     ValgrindConfigWidget(ValgrindSettings *settings, QWidget *parent);
     virtual ~ValgrindConfigWidget();
 
-    // ### remove the following?
-    QString valgrindExe() const;
-
-public slots:
-    void setValgrindExe(const QString &exe);
-
 private:
     ValgrindSettings *m_settings;
     Ui::ValgrindConfigWidget *m_ui;