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

Rename accidentaly renamed signal kitUpdated back to proFileUpdated

Browse Source 
Change-Id: I48884e1efd7637fe8da6382c12bb9bfe4fbde1ee
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Daniel Teske
2012-10-16 15:56:24 +02:00
parent 07565f155f
commit 9619ef7f75
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
View File

@@ -151,7 +151,7 @@ QString Qt4RunConfiguration::disabledReason() const
return QString();
}
void Qt4RunConfiguration::kitUpdated(Qt4ProjectManager::Qt4ProFileNode *pro, bool success, bool parseInProgress)
void Qt4RunConfiguration::proFileUpdated(Qt4ProjectManager::Qt4ProFileNode *pro, bool success, bool parseInProgress)
{
if (m_proFilePath != pro->path()) {
if (!parseInProgress) {
@@ -184,8 +184,8 @@ void Qt4RunConfiguration::ctor()
connect(target(), SIGNAL(environmentChanged()),
this, SIGNAL(baseEnvironmentChanged()));
connect(target()->project(), SIGNAL(kitUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool,bool)),
this, SLOT(kitUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool,bool)));
connect(target()->project(), SIGNAL(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool,bool)),
this, SLOT(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool,bool)));
connect(target(), SIGNAL(kitChanged()),
this, SLOT(kitChanged()));
}

2
src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h
View File

@@ -113,7 +113,7 @@ signals:
private slots:
void kitChanged();
void kitUpdated(Qt4ProjectManager::Qt4ProFileNode *pro, bool success, bool parseInProgress);
void proFileUpdated(Qt4ProjectManager::Qt4ProFileNode *pro, bool success, bool parseInProgress);
protected:
Qt4RunConfiguration(ProjectExplorer::Target *parent, Qt4RunConfiguration *source);

4
src/plugins/qt4projectmanager/qt4nodes.cpp
View File

@@ -1530,7 +1530,7 @@ void Qt4ProFileNode::emitProFileUpdatedRecursive()
{
foreach (ProjectExplorer::NodesWatcher *watcher, watchers())
if (Internal::Qt4NodesWatcher *qt4Watcher = qobject_cast<Internal::Qt4NodesWatcher*>(watcher))
emit qt4Watcher->kitUpdated(this, m_validParse, m_parseInProgress);
emit qt4Watcher->proFileUpdated(this, m_validParse, m_parseInProgress);
foreach (ProjectNode *subNode, subProjectNodes()) {
if (Qt4ProFileNode *node = qobject_cast<Qt4ProFileNode *>(subNode)) {
@@ -1556,7 +1556,7 @@ void Qt4ProFileNode::setParseInProgress(bool b)
m_parseInProgress = b;
foreach (ProjectExplorer::NodesWatcher *watcher, watchers())
if (Internal::Qt4NodesWatcher *qt4Watcher = qobject_cast<Internal::Qt4NodesWatcher*>(watcher))
emit qt4Watcher->kitUpdated(this, m_validParse, m_parseInProgress);
emit qt4Watcher->proFileUpdated(this, m_validParse, m_parseInProgress);
}
void Qt4ProFileNode::setValidParseRecursive(bool b)

2
src/plugins/qt4projectmanager/qt4nodes.h
View File

@@ -257,7 +257,7 @@ signals:
const QHash<Qt4Variable, QStringList> &oldValues,
const QHash<Qt4Variable, QStringList> &newValues);
void kitUpdated(Qt4ProjectManager::Qt4ProFileNode *projectNode, bool success, bool parseInProgress);
void proFileUpdated(Qt4ProjectManager::Qt4ProFileNode *projectNode, bool success, bool parseInProgress);
private:
// let them emit signals

4
src/plugins/qt4projectmanager/qt4project.cpp
View File

@@ -423,8 +423,8 @@ bool Qt4Project::fromMap(const QVariantMap &map)
updateCodeModels();
// We have the profile nodes now, so we know the runconfigs!
connect(m_nodesWatcher, SIGNAL(kitUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool,bool)),
this, SIGNAL(kitUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool,bool)));
connect(m_nodesWatcher, SIGNAL(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool,bool)),
this, SIGNAL(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool,bool)));
// Now we emit update once :)
m_rootProjectNode->emitProFileUpdatedRecursive();

2
src/plugins/qt4projectmanager/qt4project.h
View File

@@ -144,7 +144,7 @@ public:
void emitBuildDirectoryInitialized();
signals:
void kitUpdated(Qt4ProjectManager::Qt4ProFileNode *node, bool, bool);
void proFileUpdated(Qt4ProjectManager::Qt4ProFileNode *node, bool, bool);
void buildDirectoryInitialized();
void proFilesEvaluated();