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

CompilationDatabase: Simplify rootPathFromSettings function call

Browse Source 
Change-Id: I073f6d0f9ad4100f1c93344624efd34a9fb4c225
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-12-10 17:30:09 +01:00
parent 571fb04d59
commit ad729a4085
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
View File

@@ -449,12 +449,12 @@ CompilationDatabaseProject::CompilationDatabaseProject(const Utils::FilePath &pr
{projectFile.stringAppended(Constants::COMPILATIONDATABASEPROJECT_FILES_SUFFIX)}); {projectFile.stringAppended(Constants::COMPILATIONDATABASEPROJECT_FILES_SUFFIX)});
} }
Utils::FilePath CompilationDatabaseProject::rootPathFromSettings() const static FilePath rootPathFromSettings(const FilePath &projectDirectory)
{ {
#ifdef WITH_TESTS #ifdef WITH_TESTS
return Utils::FilePath::fromString(projectDirectory().fileName()); return FilePath::fromString(projectDirectory.fileName());
#else #else
return Utils::FilePath::fromString( return FilePath::fromString(
namedSettings(ProjectExplorer::Constants::PROJECT_ROOT_PATH_KEY).toString()); namedSettings(ProjectExplorer::Constants::PROJECT_ROOT_PATH_KEY).toString());
#endif #endif
} }
@@ -465,7 +465,9 @@ void CompilationDatabaseBuildSystem::reparseProject()
QTC_CHECK(isParsing()); QTC_CHECK(isParsing());
m_parser->stop(); m_parser->stop();
} }
const FilePath rootPath = static_cast<CompilationDatabaseProject *>(project())->rootPathFromSettings();
const FilePath rootPath = rootPathFromSettings(projectDirectory());
m_parser = new CompilationDbParser(project()->displayName(), m_parser = new CompilationDbParser(project()->displayName(),
projectFilePath(), projectFilePath(),
rootPath, rootPath,

1
src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.h
View File

@@ -58,7 +58,6 @@ public:
bool needsConfiguration() const override { return false; } bool needsConfiguration() const override { return false; }
Utils::FilePath rootPathFromSettings() const;
ProjectExplorer::Kit *kit() const { return m_kit.get(); } ProjectExplorer::Kit *kit() const { return m_kit.get(); }
private: private: