From ad729a4085ff159e2a612e689369a2b7220ba233 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Tue, 10 Dec 2019 17:30:09 +0100
Subject: [PATCH] CompilationDatabase: Simplify rootPathFromSettings function
 call

Change-Id: I073f6d0f9ad4100f1c93344624efd34a9fb4c225
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 .../compilationdatabaseproject.cpp                     | 10 ++++++----
 .../compilationdatabaseproject.h                       |  1 -
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
index 5f280b19f71..d5362c177f2 100644
--- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
+++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
@@ -449,12 +449,12 @@ CompilationDatabaseProject::CompilationDatabaseProject(const Utils::FilePath &pr
         {projectFile.stringAppended(Constants::COMPILATIONDATABASEPROJECT_FILES_SUFFIX)});
 }
 
-Utils::FilePath CompilationDatabaseProject::rootPathFromSettings() const
+static FilePath rootPathFromSettings(const FilePath &projectDirectory)
 {
 #ifdef WITH_TESTS
-    return Utils::FilePath::fromString(projectDirectory().fileName());
+    return FilePath::fromString(projectDirectory.fileName());
 #else
-    return Utils::FilePath::fromString(
+    return FilePath::fromString(
         namedSettings(ProjectExplorer::Constants::PROJECT_ROOT_PATH_KEY).toString());
 #endif
 }
@@ -465,7 +465,9 @@ void CompilationDatabaseBuildSystem::reparseProject()
         QTC_CHECK(isParsing());
         m_parser->stop();
     }
-    const FilePath rootPath = static_cast<CompilationDatabaseProject *>(project())->rootPathFromSettings();
+
+    const FilePath rootPath = rootPathFromSettings(projectDirectory());
+
     m_parser = new CompilationDbParser(project()->displayName(),
                                        projectFilePath(),
                                        rootPath,
diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.h b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.h
index 463126a5a35..3a67bafc9bc 100644
--- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.h
+++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.h
@@ -58,7 +58,6 @@ public:
 
     bool needsConfiguration() const override { return false; }
 
-    Utils::FilePath rootPathFromSettings() const;
     ProjectExplorer::Kit *kit() const { return m_kit.get(); }
 
 private: