ProjectExplorer: remove confusing function from Project

Change-Id: Ifaed5d8293dadd2ae3cfdab3b027434d4f8caa3e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp

@@ -1593,9 +1593,8 @@ FilePath CMakeBuildConfiguration::shadowBuildDirectory(const FilePath &projectFi
         return {};
 
     const QString projectName = projectFilePath.parentDir().fileName();
-    const FilePath projectDir = Project::projectDirectory(projectFilePath);
+    FilePath buildPath = buildDirectoryFromTemplate(
-    FilePath buildPath = buildDirectoryFromTemplate(projectDir, projectFilePath, projectName, k,
+        projectFilePath.absolutePath(), projectFilePath, projectName, k, bcName, buildType, "cmake");
-                                                    bcName, buildType, "cmake");
 
     if (CMakeGeneratorKitAspect::isMultiConfigGenerator(k)) {
         const QString path = buildPath.path();
@@ -1906,8 +1905,6 @@ CMakeBuildConfigurationFactory::CMakeBuildConfigurationFactory()
     setBuildGenerator([](const Kit *k, const FilePath &projectPath, bool forSetup) {
         QList<BuildInfo> result;
 
-        FilePath path = forSetup ? Project::projectDirectory(projectPath) : projectPath;
-
         // Skip the default shadow build directories for build types if we have presets
         const CMakeConfigItem presetItem = CMakeConfigurationKitAspect::cmakePresetConfigItem(k);
         if (!presetItem.isNull())

src/plugins/genericprojectmanager/genericbuildconfiguration.cpp

@@ -62,7 +62,7 @@ public:
         setBuildGenerator([](const Kit *, const FilePath &projectPath, bool forSetup) {
             BuildInfo info;
             info.typeName = ProjectExplorer::Tr::tr("Build");
-            info.buildDirectory = forSetup ? Project::projectDirectory(projectPath) : projectPath;
+            info.buildDirectory = forSetup ? projectPath.absolutePath() : projectPath;
 
             if (forSetup)  {
                 //: The name of the build configuration created by default for a generic project.

src/plugins/mesonprojectmanager/mesonbuildconfiguration.cpp

@@ -64,7 +64,7 @@ static FilePath shadowBuildDirectory(const FilePath &projectFilePath,
 
     const QString projectName = projectFilePath.parentDir().fileName();
     return MesonBuildConfiguration::buildDirectoryFromTemplate(
-        Project::projectDirectory(projectFilePath), projectFilePath,
+        projectFilePath.absolutePath(), projectFilePath,
         projectName, k, bcName, buildType, "meson");
 }
 

src/plugins/projectexplorer/project.cpp

@@ -793,20 +793,7 @@ void Project::toMap(Store &map) const
 
 FilePath Project::projectDirectory() const
 {
-    return projectDirectory(projectFilePath());
+    return projectFilePath().absolutePath();
-}
-
-/*!
-    Returns the directory that contains the file \a top.
-
-    This includes the absolute path.
-*/
-
-FilePath Project::projectDirectory(const FilePath &top)
-{
-    if (top.isEmpty())
-        return {};
-    return top.absolutePath();
 }
 
 void Project::changeRootProjectDirectory()

src/plugins/projectexplorer/project.h

@@ -70,7 +70,6 @@ public:
 
     Utils::FilePath projectFilePath() const;
     Utils::FilePath projectDirectory() const;
-    static Utils::FilePath projectDirectory(const Utils::FilePath &top);
 
     // This does not affect nodes, only the root path.
     void changeRootProjectDirectory();

src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp

@@ -44,8 +44,7 @@ static FilePath defaultBuildDirectory(const FilePath &projectFilePath, const Kit
 {
     const QString projectName = projectFilePath.completeBaseName();
     return BuildConfiguration::buildDirectoryFromTemplate(
-                Project::projectDirectory(projectFilePath),
+        projectFilePath.absolutePath(), projectFilePath, projectName, k, bcName, buildType, "qbs");
-                projectFilePath, projectName, k, bcName, buildType, "qbs");
 }
 
 // ---------------------------------------------------------------------------

src/plugins/qbsprojectmanager/qbsprojectimporter.cpp

@@ -74,8 +74,13 @@ static FilePath buildDir(const FilePath &projectFilePath, const Kit *k)
 {
     const QString projectName = projectFilePath.completeBaseName();
     return BuildConfiguration::buildDirectoryFromTemplate(
-                Project::projectDirectory(projectFilePath),
+        projectFilePath.absolutePath(),
-                projectFilePath, projectName, k, QString(), BuildConfiguration::Unknown, "qbs");
+        projectFilePath,
+        projectName,
+        k,
+        QString(),
+        BuildConfiguration::Unknown,
+        "qbs");
 }
 
 static bool hasBuildGraph(const FilePath &dir)

src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp

@@ -73,7 +73,7 @@ FilePath QmakeBuildConfiguration::shadowBuildDirectory(const FilePath &proFilePa
         return {};
 
     const QString projectName = proFilePath.completeBaseName();
-    return buildDirectoryFromTemplate(Project::projectDirectory(proFilePath), proFilePath,
+    return buildDirectoryFromTemplate(proFilePath.absolutePath(), proFilePath,
                                       projectName, k, suffix, buildType, "qmake");
 }