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

inline last use of ProFileReader::readProFile()

Browse Source
This commit is contained in:
Oswald Buddenhagen
2010-06-18 21:16:12 +02:00
parent 82e10eae3b
commit f09eca2925
3 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qt4projectmanager/profilereader.cpp
View File

@@ -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)) {

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

@@ -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);

8
src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp
View File

@@ -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();
}
}
}