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

GenericProject: Simnplfy code handling includes

Browse Source 
Change-Id: I42ee45920907d3d55a3adf77901b37fbf45bb70b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Daniel Teske
2013-10-22 16:38:28 +02:00
parent f18eb67276
commit 26b989b0ce
2 changed files with 1 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/genericprojectmanager/genericproject.cpp
View File

@@ -254,7 +254,7 @@ void GenericProject::refresh(RefreshOptions options)
part->displayName = displayName(); part->displayName = displayName();
part->projectFile = projectFilePath(); part->projectFile = projectFilePath();
part->includePaths += allIncludePaths(); part->includePaths += projectIncludePaths();
Kit *k = activeTarget() ? activeTarget()->kit() : KitManager::defaultKit(); Kit *k = activeTarget() ? activeTarget()->kit() : KitManager::defaultKit();
if (ToolChain *tc = ToolChainKitInformation::toolChain(k)) { if (ToolChain *tc = ToolChainKitInformation::toolChain(k)) {
@@ -337,15 +337,6 @@ QStringList GenericProject::processEntries(const QStringList &paths,
return absolutePaths; return absolutePaths;
} }
QStringList GenericProject::allIncludePaths() const
{
QStringList paths;
paths += m_includePaths;
paths += m_projectIncludePaths;
paths.removeDuplicates();
return paths;
}
QStringList GenericProject::projectIncludePaths() const QStringList GenericProject::projectIncludePaths() const
{ {
return m_projectIncludePaths; return m_projectIncludePaths;
@@ -356,16 +347,6 @@ QStringList GenericProject::files() const
return m_files; return m_files;
} }
QStringList GenericProject::includePaths() const
{
return m_includePaths;
}
void GenericProject::setIncludePaths(const QStringList &includePaths)
{
m_includePaths = includePaths;
}
QByteArray GenericProject::defines() const QByteArray GenericProject::defines() const
{ {
return m_defines; return m_defines;
@@ -430,8 +411,6 @@ bool GenericProject::fromMap(const QVariantMap &map)
t->addRunConfiguration(new QtSupport::CustomExecutableRunConfiguration(t)); t->addRunConfiguration(new QtSupport::CustomExecutableRunConfiguration(t));
} }
setIncludePaths(allIncludePaths());
refresh(Everything); refresh(Everything);
return true; return true;
} }

2
src/plugins/genericprojectmanager/genericproject.h
View File

@@ -86,7 +86,6 @@ public:
void setIncludePaths(const QStringList &includePaths); void setIncludePaths(const QStringList &includePaths);
QByteArray defines() const; QByteArray defines() const;
QStringList allIncludePaths() const;
QStringList projectIncludePaths() const; QStringList projectIncludePaths() const;
QStringList files() const; QStringList files() const;
@@ -112,7 +111,6 @@ private:
QStringList m_rawFileList; QStringList m_rawFileList;
QStringList m_files; QStringList m_files;
QHash<QString, QString> m_rawListEntries; QHash<QString, QString> m_rawListEntries;
QStringList m_includePaths;
QStringList m_projectIncludePaths; QStringList m_projectIncludePaths;
QByteArray m_defines; QByteArray m_defines;