From 7339ab60e64f88f5c1e08e36c4c8d456ba8b10e2 Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@nokia.com>
Date: Tue, 5 Jun 2012 17:27:10 +0200
Subject: [PATCH] Qt4PriFileNode: Add const to baseVPaths and fullVPaths
Change-Id: Ia36969f0802c96c657079d6f71d49fb484a600ad
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
---
src/plugins/qt4projectmanager/qt4nodes.cpp | 5 +++--
src/plugins/qt4projectmanager/qt4nodes.h | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index 93eecf273ac..c119c4e6828 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -543,7 +543,7 @@ struct InternalNode
};
}
-QStringList Qt4PriFileNode::baseVPaths(QtSupport::ProFileReader *reader, const QString &projectDir)
+QStringList Qt4PriFileNode::baseVPaths(QtSupport::ProFileReader *reader, const QString &projectDir) const
{
QStringList result;
if (!reader)
@@ -555,7 +555,8 @@ QStringList Qt4PriFileNode::baseVPaths(QtSupport::ProFileReader *reader, const Q
return result;
}
-QStringList Qt4PriFileNode::fullVPaths(const QStringList &baseVPaths, QtSupport::ProFileReader *reader, FileType type, const QString &qmakeVariable, const QString &projectDir)
+QStringList Qt4PriFileNode::fullVPaths(const QStringList &baseVPaths, QtSupport::ProFileReader *reader,
+ FileType type, const QString &qmakeVariable, const QString &projectDir) const
{
QStringList vPaths;
if (!reader)
diff --git a/src/plugins/qt4projectmanager/qt4nodes.h b/src/plugins/qt4projectmanager/qt4nodes.h
index 8327bac154f..2c3ff687ea6 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.h
+++ b/src/plugins/qt4projectmanager/qt4nodes.h
@@ -190,8 +190,9 @@ private:
bool priFileWritable(const QString &path);
bool saveModifiedEditors();
QStringList formResources(const QString &formFile) const;
- QStringList baseVPaths(QtSupport::ProFileReader *reader, const QString &projectDir);
- QStringList fullVPaths(const QStringList &baseVPaths, QtSupport::ProFileReader *reader, FileType type, const QString &qmakeVariable, const QString &projectDir);
+ QStringList baseVPaths(QtSupport::ProFileReader *reader, const QString &projectDir) const;
+ QStringList fullVPaths(const QStringList &baseVPaths, QtSupport::ProFileReader *reader,
+ FileType type, const QString &qmakeVariable, const QString &projectDir) const;
void watchFolders(const QSet<QString> &folders);
Qt4Project *m_project;
--
GitLab