From f09eca2925f9611bf2721818e5dc12c6baa6d6d5 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Fri, 18 Jun 2010 21:16:12 +0200
Subject: [PATCH] inline last use of ProFileReader::readProFile()
---
src/plugins/qt4projectmanager/profilereader.cpp | 10 ----------
src/plugins/qt4projectmanager/profilereader.h | 2 --
.../qt-maemo/maemopackagecontents.cpp | 8 ++++++--
3 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/src/plugins/qt4projectmanager/profilereader.cpp b/src/plugins/qt4projectmanager/profilereader.cpp
index a2ea7ff2dfa..21930b8dc72 100644
--- a/src/plugins/qt4projectmanager/profilereader.cpp
+++ b/src/plugins/qt4projectmanager/profilereader.cpp
@@ -89,16 +89,6 @@ ProFileReader::~ProFileReader()
pf->deref();
}
-bool ProFileReader::readProFile(const QString &fileName)
-{
- if (ProFile *pro = parsedProFile(fileName)) {
- bool ok = accept(pro);
- pro->deref();
- return ok;
- }
- return false;
-}
-
void ProFileReader::aboutToEval(ProFile *, ProFile *pro, EvalFileType type)
{
if (m_ignoreLevel || (type != EvalProjectFile && type != EvalIncludeFile)) {
diff --git a/src/plugins/qt4projectmanager/profilereader.h b/src/plugins/qt4projectmanager/profilereader.h
index c133652586f..007fcb30043 100644
--- a/src/plugins/qt4projectmanager/profilereader.h
+++ b/src/plugins/qt4projectmanager/profilereader.h
@@ -71,8 +71,6 @@ public:
ProFileReader(ProFileOption *option);
~ProFileReader();
- // fileName is expected to be absolute and cleanPath()ed.
- bool readProFile(const QString &fileName);
QList<ProFile*> includeFiles() const;
ProFile *proFileFor(const QString &name);
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp
index 65142a6a991..2efa3ce7057 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp
@@ -421,8 +421,12 @@ void MaemoPackageContents::parseProFile(ParseType type) const
m_proFile = m_proFileReader->parsedProFile(m_proFileName, false,
m_proFileLines.join("\n"));
} else {
- m_proFile = m_proFileReader->readProFile(m_proFileName)
- ? m_proFileReader->proFileFor(m_proFileName) : 0;
+ m_proFile = 0;
+ if (ProFile *pro = m_proFileReader->parsedProFile(m_proFileName)) {
+ if (m_proFileReader->accept(pro))
+ m_proFile = pro;
+ pro->deref();
+ }
}
}
--
GitLab