From 6572cfa5bbae6dcbd4eb664329968de80b503f85 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Tue, 21 Feb 2012 12:00:45 +0100
Subject: [PATCH] ToolChain: Remove unnecessary parameter
Change-Id: I7918a0eb89b2d3a3edcbb6bec4021db89c546a72
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
---
src/plugins/projectexplorer/gcctoolchain.cpp | 2 +-
src/plugins/projectexplorer/toolchainconfigwidget.cpp | 2 +-
src/plugins/projectexplorer/toolchainconfigwidget.h | 2 +-
src/plugins/projectexplorer/toolchainoptionspage.cpp | 9 +++++----
src/plugins/projectexplorer/toolchainoptionspage.h | 2 +-
src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.cpp | 2 +-
6 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp
index 7cf7be1858a..ec4c0c91a49 100644
--- a/src/plugins/projectexplorer/gcctoolchain.cpp
+++ b/src/plugins/projectexplorer/gcctoolchain.cpp
@@ -795,7 +795,7 @@ void Internal::GccToolChainConfigWidget::handleAbiChange()
m_autoDebuggerCommand = ToolChainManager::instance()->defaultDebugger(abi);
setDebuggerCommand(m_autoDebuggerCommand);
}
- emit dirty(toolChain());
+ emit dirty();
}
// --------------------------------------------------------------------------
diff --git a/src/plugins/projectexplorer/toolchainconfigwidget.cpp b/src/plugins/projectexplorer/toolchainconfigwidget.cpp
index 9a3ee94a976..bb730b31f4c 100644
--- a/src/plugins/projectexplorer/toolchainconfigwidget.cpp
+++ b/src/plugins/projectexplorer/toolchainconfigwidget.cpp
@@ -149,7 +149,7 @@ void ToolChainConfigWidget::emitDirty()
d->m_mkspecEdited = (mkspecListFromString(d->m_mkspecEdit->text()) != d->m_suggestedMkspec);
if (d->m_mkspecResetButton)
d->m_mkspecResetButton->setEnabled(d->m_mkspecEdited);
- emit dirty(toolChain());
+ emit dirty();
}
void ToolChainConfigWidget::resetMkspecList()
diff --git a/src/plugins/projectexplorer/toolchainconfigwidget.h b/src/plugins/projectexplorer/toolchainconfigwidget.h
index 7b194ba233a..1bc25b6661e 100644
--- a/src/plugins/projectexplorer/toolchainconfigwidget.h
+++ b/src/plugins/projectexplorer/toolchainconfigwidget.h
@@ -71,7 +71,7 @@ public:
virtual void makeReadOnly();
signals:
- void dirty(ProjectExplorer::ToolChain *);
+ void dirty();
protected slots:
void emitDirty();
diff --git a/src/plugins/projectexplorer/toolchainoptionspage.cpp b/src/plugins/projectexplorer/toolchainoptionspage.cpp
index 26d9dd26a4d..5387a0e79e7 100644
--- a/src/plugins/projectexplorer/toolchainoptionspage.cpp
+++ b/src/plugins/projectexplorer/toolchainoptionspage.cpp
@@ -285,10 +285,11 @@ bool ToolChainModel::isDirty(ToolChain *tc) const
return false;
}
-void ToolChainModel::setDirty(ToolChain *tc)
+void ToolChainModel::setDirty()
{
+ ToolChainConfigWidget *w = qobject_cast<ToolChainConfigWidget *>(sender());
foreach (ToolChainNode *n, m_manualRoot->childNodes) {
- if (n->toolChain == tc) {
+ if (n->widget == w) {
n->changed = true;
emit dataChanged(index(n, 0), index(n, columnCount(QModelIndex())));
}
@@ -404,8 +405,8 @@ ToolChainNode *ToolChainModel::createNode(ToolChainNode *parent, ToolChain *tc,
ToolChainNode *node = new ToolChainNode(parent, tc, changed);
if (node->widget) {
m_configWidgetParent->layout()->addWidget(node->widget);
- connect(node->widget, SIGNAL(dirty(ProjectExplorer::ToolChain*)),
- this, SLOT(setDirty(ProjectExplorer::ToolChain*)));
+ connect(node->widget, SIGNAL(dirty()),
+ this, SLOT(setDirty()));
}
return node;
}
diff --git a/src/plugins/projectexplorer/toolchainoptionspage.h b/src/plugins/projectexplorer/toolchainoptionspage.h
index d0cb0eee200..67814b112fb 100644
--- a/src/plugins/projectexplorer/toolchainoptionspage.h
+++ b/src/plugins/projectexplorer/toolchainoptionspage.h
@@ -96,7 +96,7 @@ signals:
private slots:
void addToolChain(ProjectExplorer::ToolChain *);
void removeToolChain(ProjectExplorer::ToolChain *);
- void setDirty(ProjectExplorer::ToolChain *);
+ void setDirty();
private:
QModelIndex index(ToolChainNode *, int column = 0) const;
diff --git a/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.cpp b/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.cpp
index 92edcb67fc8..036da9e6d00 100644
--- a/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.cpp
@@ -369,7 +369,7 @@ void WinscwToolChainConfigWidget::handleCompilerPathUpdate()
void WinscwToolChainConfigWidget::makeDirty()
{
- emit dirty(toolChain());
+ emit dirty();
}
// --------------------------------------------------------------------------
--
GitLab