feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Simplify analyzer config widgets

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

Merge-request: 265
Reviewed-by: hjk <qtc-committer@nokia.com>
This commit is contained in:
Kevin Funk
2011-03-04 16:00:03 +01:00
committed by hjk
parent ca2a10d633
commit 0932334109
4 changed files with 7 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/plugins/memcheck/memcheckconfigwidget.cpp
View File

@@ -62,12 +62,12 @@ MemcheckConfigWidget::MemcheckConfigWidget(AbstractMemcheckSettings *settings, Q
this, SLOT(slotRemoveSuppression())); this, SLOT(slotRemoveSuppression()));
m_ui->numCallers->setValue(m_settings->numCallers()); m_ui->numCallers->setValue(m_settings->numCallers());
connect(m_ui->numCallers, SIGNAL(valueChanged(int)), SLOT(setNumCallers(int))); connect(m_ui->numCallers, SIGNAL(valueChanged(int)), m_settings, SLOT(setNumCallers(int)));
connect(m_settings, SIGNAL(numCallersChanged(int)), SLOT(setNumCallers(int))); connect(m_settings, SIGNAL(numCallersChanged(int)), m_ui->numCallers, SLOT(setValue(int)));
m_ui->trackOrigins->setChecked(m_settings->trackOrigins()); m_ui->trackOrigins->setChecked(m_settings->trackOrigins());
connect(m_ui->trackOrigins, SIGNAL(toggled(bool)), SLOT(setTrackOrigins(bool))); connect(m_ui->trackOrigins, SIGNAL(toggled(bool)), m_settings, SLOT(setTrackOrigins(bool)));
connect(m_settings, SIGNAL(trackOriginsChanged(bool)), SLOT(setTrackOrigins(bool))); connect(m_settings, SIGNAL(trackOriginsChanged(bool)), m_ui->trackOrigins, SLOT(setChecked(bool)));
connect(m_settings, SIGNAL(suppressionFilesRemoved(QStringList)), connect(m_settings, SIGNAL(suppressionFilesRemoved(QStringList)),
this, SLOT(slotSuppressionsRemoved(QStringList))); this, SLOT(slotSuppressionsRemoved(QStringList)));
@@ -163,28 +163,6 @@ QStringList MemcheckConfigWidget::suppressions() const
return ret; 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() void MemcheckConfigWidget::slotSuppressionSelectionChanged()
{ {
m_ui->removeSuppression->setEnabled(m_ui->suppressionList->selectionModel()->hasSelection()); m_ui->removeSuppression->setEnabled(m_ui->suppressionList->selectionModel()->hasSelection());

9
src/plugins/memcheck/memcheckconfigwidget.h
View File

@@ -63,14 +63,7 @@ public:
void setSuppressions(const QStringList &files); void setSuppressions(const QStringList &files);
QStringList suppressions() const; QStringList suppressions() const;
// ### remove the following? public Q_SLOTS:
int numCallers() const;
bool trackOrigins() const;
public slots:
void setNumCallers(int callers);
void setTrackOrigins(bool enable);
void slotAddSuppression(); void slotAddSuppression();
void slotRemoveSuppression(); void slotRemoveSuppression();
void slotSuppressionsRemoved(const QStringList &files); void slotSuppressionsRemoved(const QStringList &files);

15
src/plugins/valgrindtoolbase/valgrindconfigwidget.cpp
View File

@@ -54,22 +54,11 @@ ValgrindConfigWidget::ValgrindConfigWidget(ValgrindSettings *settings, QWidget *
m_ui->valgrindExeChooser->setPromptDialogTitle(tr("Valgrind Command")); m_ui->valgrindExeChooser->setPromptDialogTitle(tr("Valgrind Command"));
m_ui->valgrindExeChooser->setPath(m_settings->valgrindExecutable()); m_ui->valgrindExeChooser->setPath(m_settings->valgrindExecutable());
connect(m_ui->valgrindExeChooser, SIGNAL(changed(QString)), SLOT(setValgrindExe(QString))); connect(m_ui->valgrindExeChooser, SIGNAL(changed(QString)), m_settings, SLOT(setValgrindExecutable(QString)));
connect(m_settings, SIGNAL(valgrindExecutableChanged(QString)), SLOT(setValgrindExe(QString))); connect(m_settings, SIGNAL(valgrindExecutableChanged(QString)), m_ui->valgrindExeChooser, SLOT(setPath(QString)));
} }
ValgrindConfigWidget::~ValgrindConfigWidget() ValgrindConfigWidget::~ValgrindConfigWidget()
{ {
delete m_ui; 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();
}

6
src/plugins/valgrindtoolbase/valgrindconfigwidget.h
View File

@@ -58,12 +58,6 @@ public:
ValgrindConfigWidget(ValgrindSettings *settings, QWidget *parent); ValgrindConfigWidget(ValgrindSettings *settings, QWidget *parent);
virtual ~ValgrindConfigWidget(); virtual ~ValgrindConfigWidget();
// ### remove the following?
QString valgrindExe() const;
public slots:
void setValgrindExe(const QString &exe);
private: private:
ValgrindSettings *m_settings; ValgrindSettings *m_settings;
Ui::ValgrindConfigWidget *m_ui; Ui::ValgrindConfigWidget *m_ui;