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

Nim: Remove some unused functions, inline others

Browse Source 
That's adapting to the introduction and use of extra runconfig aspects
a while ago.

Change-Id: I216aa409679b6b81bf3b6fa7c4473147616962a6
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2017-11-21 16:22:34 +01:00
parent cacab453f7
commit c751e6afa7
2 changed files with 3 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/nim/project/nimrunconfiguration.cpp
View File

@@ -37,7 +37,6 @@
#include <QDir> #include <QDir>
#include <QFileInfo> #include <QFileInfo>
#include <QVariantMap>
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace Utils; using namespace Utils;
@@ -82,7 +81,6 @@ Runnable NimRunConfiguration::runnable() const
return result; return result;
} }
QVariantMap NimRunConfiguration::toMap() const QVariantMap NimRunConfiguration::toMap() const
{ {
auto result = RunConfiguration::toMap(); auto result = RunConfiguration::toMap();
@@ -99,27 +97,15 @@ bool NimRunConfiguration::fromMap(const QVariantMap &map)
return true; 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() void NimRunConfiguration::updateConfiguration()
{ {
auto buildConfiguration = qobject_cast<NimBuildConfiguration *>(activeBuildConfiguration()); auto buildConfiguration = qobject_cast<NimBuildConfiguration *>(activeBuildConfiguration());
QTC_ASSERT(buildConfiguration, return); QTC_ASSERT(buildConfiguration, return);
setActiveBuildConfiguration(buildConfiguration); setActiveBuildConfiguration(buildConfiguration);
const QFileInfo outFileInfo = buildConfiguration->outFilePath().toFileInfo(); const QFileInfo outFileInfo = buildConfiguration->outFilePath().toFileInfo();
setExecutable(outFileInfo.absoluteFilePath()); m_executable = outFileInfo.absoluteFilePath();
setWorkingDirectory(outFileInfo.absoluteDir().absolutePath()); const QString workingDirectory = outFileInfo.absoluteDir().absolutePath();
m_workingDirectoryAspect->setDefaultWorkingDirectory(FileName::fromString(workingDirectory));
} }
void NimRunConfiguration::setActiveBuildConfiguration(NimBuildConfiguration *activeBuildConfiguration) void NimRunConfiguration::setActiveBuildConfiguration(NimBuildConfiguration *activeBuildConfiguration)

10
src/plugins/nim/project/nimrunconfiguration.h
View File

@@ -50,17 +50,7 @@ public:
QVariantMap toMap() const override; QVariantMap toMap() const override;
bool fromMap(const QVariantMap &map) 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: private:
void setExecutable(const QString &path);
void setWorkingDirectory(const QString &path);
void setCommandLineArguments(const QString &args);
void updateConfiguration(); void updateConfiguration();
void setActiveBuildConfiguration(NimBuildConfiguration *activeBuildConfiguration); void setActiveBuildConfiguration(NimBuildConfiguration *activeBuildConfiguration);