From c751e6afa7cfa9da2a7377d0a1f40debceab1ed7 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 21 Nov 2017 16:22:34 +0100 Subject: [PATCH] Nim: Remove some unused functions, inline others That's adapting to the introduction and use of extra runconfig aspects a while ago. Change-Id: I216aa409679b6b81bf3b6fa7c4473147616962a6 Reviewed-by: David Schulz --- .../nim/project/nimrunconfiguration.cpp | 20 +++---------------- src/plugins/nim/project/nimrunconfiguration.h | 10 ---------- 2 files changed, 3 insertions(+), 27 deletions(-) diff --git a/src/plugins/nim/project/nimrunconfiguration.cpp b/src/plugins/nim/project/nimrunconfiguration.cpp index cbf31afd1ba..341eeba5f4b 100644 --- a/src/plugins/nim/project/nimrunconfiguration.cpp +++ b/src/plugins/nim/project/nimrunconfiguration.cpp @@ -37,7 +37,6 @@ #include #include -#include using namespace ProjectExplorer; using namespace Utils; @@ -82,7 +81,6 @@ Runnable NimRunConfiguration::runnable() const return result; } - QVariantMap NimRunConfiguration::toMap() const { auto result = RunConfiguration::toMap(); @@ -99,27 +97,15 @@ bool NimRunConfiguration::fromMap(const QVariantMap &map) return true; } -void NimRunConfiguration::setExecutable(const QString &executable) -{ - if (m_executable == executable) - return; - m_executable = executable; - emit executableChanged(executable); -} - -void NimRunConfiguration::setWorkingDirectory(const QString &workingDirectory) -{ - m_workingDirectoryAspect->setDefaultWorkingDirectory(FileName::fromString(workingDirectory)); -} - void NimRunConfiguration::updateConfiguration() { auto buildConfiguration = qobject_cast(activeBuildConfiguration()); QTC_ASSERT(buildConfiguration, return); setActiveBuildConfiguration(buildConfiguration); const QFileInfo outFileInfo = buildConfiguration->outFilePath().toFileInfo(); - setExecutable(outFileInfo.absoluteFilePath()); - setWorkingDirectory(outFileInfo.absoluteDir().absolutePath()); + m_executable = outFileInfo.absoluteFilePath(); + const QString workingDirectory = outFileInfo.absoluteDir().absolutePath(); + m_workingDirectoryAspect->setDefaultWorkingDirectory(FileName::fromString(workingDirectory)); } void NimRunConfiguration::setActiveBuildConfiguration(NimBuildConfiguration *activeBuildConfiguration) diff --git a/src/plugins/nim/project/nimrunconfiguration.h b/src/plugins/nim/project/nimrunconfiguration.h index 5ab1ce6130c..51b160e8472 100644 --- a/src/plugins/nim/project/nimrunconfiguration.h +++ b/src/plugins/nim/project/nimrunconfiguration.h @@ -50,17 +50,7 @@ public: QVariantMap toMap() const override; bool fromMap(const QVariantMap &map) override; -signals: - void executableChanged(const QString &args); - void runModeChanged(ProjectExplorer::ApplicationLauncher::Mode); - void workingDirectoryChanged(const QString &workingDirectory); - void commandLineArgumentsChanged(const QString &args); - void runInTerminalChanged(bool); - private: - void setExecutable(const QString &path); - void setWorkingDirectory(const QString &path); - void setCommandLineArguments(const QString &args); void updateConfiguration(); void setActiveBuildConfiguration(NimBuildConfiguration *activeBuildConfiguration);