From ad02e86e7ace4f4b526381bc7e9ce187bebba9ce Mon Sep 17 00:00:00 2001
From: ck <qt-info@nokia.com>
Date: Tue, 6 Jul 2010 14:32:33 +0200
Subject: [PATCH] Qt4Projectmanager: Constify some member functions.
Reviewed-by: dt
---
src/plugins/qt4projectmanager/qt4nodes.cpp | 10 +++++-----
src/plugins/qt4projectmanager/qt4nodes.h | 6 +++---
src/plugins/qt4projectmanager/qt4runconfiguration.cpp | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index b0d71bdbe42..9d91bf4effd 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -888,21 +888,21 @@ QStringList Qt4PriFileNode::varNames(FileType type)
return vars;
}
-Qt4ProFileNode *Qt4ProFileNode::findProFileFor(const QString &fileName)
+const Qt4ProFileNode *Qt4ProFileNode::findProFileFor(const QString &fileName) const
{
if (fileName == path())
return this;
foreach (ProjectNode *pn, subProjectNodes())
if (Qt4ProFileNode *qt4ProFileNode = qobject_cast<Qt4ProFileNode *>(pn))
- if (Qt4ProFileNode *result = qt4ProFileNode->findProFileFor(fileName))
+ if (const Qt4ProFileNode *result = qt4ProFileNode->findProFileFor(fileName))
return result;
return 0;
}
-TargetInformation Qt4ProFileNode::targetInformation(const QString &fileName)
+TargetInformation Qt4ProFileNode::targetInformation(const QString &fileName) const
{
TargetInformation result;
- Qt4ProFileNode *qt4ProFileNode = findProFileFor(fileName);
+ const Qt4ProFileNode *qt4ProFileNode = findProFileFor(fileName);
if (!qt4ProFileNode)
return result;
@@ -1596,7 +1596,7 @@ TargetInformation Qt4ProFileNode::targetInformation(ProFileReader *reader) const
return result;
}
-TargetInformation Qt4ProFileNode::targetInformation()
+TargetInformation Qt4ProFileNode::targetInformation() const
{
return m_qt4targetInformation;
}
diff --git a/src/plugins/qt4projectmanager/qt4nodes.h b/src/plugins/qt4projectmanager/qt4nodes.h
index f9d4551f37c..9735b684fa8 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.h
+++ b/src/plugins/qt4projectmanager/qt4nodes.h
@@ -254,9 +254,9 @@ public:
QString uiDirectory() const;
static QString uiHeaderFile(const QString &uiDir, const QString &formFile);
- Qt4ProFileNode *findProFileFor(const QString &string);
- TargetInformation targetInformation(const QString &fileName);
- TargetInformation targetInformation();
+ const Qt4ProFileNode *findProFileFor(const QString &string) const;
+ TargetInformation targetInformation(const QString &fileName) const;
+ TargetInformation targetInformation() const;
void update();
void scheduleUpdate();
diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
index e3ca670490f..a50d08eca1e 100644
--- a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
@@ -556,7 +556,7 @@ ProjectExplorer::Environment Qt4RunConfiguration::baseEnvironment() const
// On windows the user could be linking to a library found via a -L/some/dir switch
// to find those libraries while actually running we explicitly prepend those
// dirs to the path
- Qt4ProFileNode *node = qt4Target()->qt4Project()->rootProjectNode()->findProFileFor(m_proFilePath);
+ const Qt4ProFileNode *node = qt4Target()->qt4Project()->rootProjectNode()->findProFileFor(m_proFilePath);
if (node)
foreach(const QString dir, node->variableValue(LibDirectoriesVar))
env.prependOrSetPath(dir);
--
GitLab