From d803a9846974e31db1325b4bbd6862bfffa988fa Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 30 Apr 2019 14:08:00 +0200 Subject: AutoTools: Inline AutoTools::defaultBuildDirectory() Only one caller. Change-Id: I9cf92417deaf48a513bdfefd0c65419726e5959a Reviewed-by: Christian Kandeler --- src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp | 4 ++-- src/plugins/autotoolsprojectmanager/autotoolsproject.cpp | 5 ----- src/plugins/autotoolsprojectmanager/autotoolsproject.h | 1 - 3 files changed, 2 insertions(+), 8 deletions(-) (limited to 'src/plugins/autotoolsprojectmanager') diff --git a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp index b721a606ac..97c37d2df2 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp +++ b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp @@ -115,8 +115,8 @@ QList AutotoolsBuildConfigurationFactory::availableBuilds(const Targe QList AutotoolsBuildConfigurationFactory::availableSetups(const Kit *k, const QString &projectPath) const { - BuildInfo info = createBuildInfo(k, - Utils::FileName::fromString(AutotoolsProject::defaultBuildDirectory(projectPath))); + const QString path = QFileInfo(projectPath).absolutePath(); + BuildInfo info = createBuildInfo(k, Utils::FileName::fromString(path)); //: The name of the build configuration created by default for a autotools project. info.displayName = tr("Default"); return {info}; diff --git a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp index 9d0e79949e..a6c48db149 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp +++ b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp @@ -91,11 +91,6 @@ AutotoolsProject::~AutotoolsProject() } } -QString AutotoolsProject::defaultBuildDirectory(const QString &projectPath) -{ - return QFileInfo(projectPath).absolutePath(); -} - // This function, is called at the very beginning, to // restore the settings if there are some stored. Project::RestoreResult AutotoolsProject::fromMap(const QVariantMap &map, QString *errorMessage) diff --git a/src/plugins/autotoolsprojectmanager/autotoolsproject.h b/src/plugins/autotoolsprojectmanager/autotoolsproject.h index 36bf187a07..66c3dc45af 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsproject.h +++ b/src/plugins/autotoolsprojectmanager/autotoolsproject.h @@ -56,7 +56,6 @@ public: explicit AutotoolsProject(const Utils::FileName &fileName); ~AutotoolsProject() override; - static QString defaultBuildDirectory(const QString &projectPath); QStringList buildTargets() const; protected: -- cgit v1.2.3