From eedf02e40f471fdef41a9f9fce0160e5681c3dc9 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 28 Sep 2021 12:29:29 +0200 Subject: Incredibuild: Use more FilePath in CommandBuilder Change-Id: I31e2be7cbd8f5ac58db4bead1fa3266bb80df868 Reviewed-by: Christian Stenger --- src/plugins/incredibuild/commandbuilder.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/plugins/incredibuild/commandbuilder.cpp') diff --git a/src/plugins/incredibuild/commandbuilder.cpp b/src/plugins/incredibuild/commandbuilder.cpp index b7ae39a266..d4b6ee4286 100644 --- a/src/plugins/incredibuild/commandbuilder.cpp +++ b/src/plugins/incredibuild/commandbuilder.cpp @@ -25,27 +25,27 @@ #include "commandbuilder.h" +using namespace Utils; + namespace IncrediBuild { namespace Internal { -namespace Constants { -const QLatin1String CUSTOMCOMMANDBUILDER_COMMAND("IncrediBuild.BuildConsole.%1.Command"); -const QLatin1String CUSTOMCOMMANDBUILDER_ARGS("IncrediBuild.BuildConsole.%1.Arguments"); -} // namespace Constants +const char CUSTOMCOMMANDBUILDER_COMMAND[] = "IncrediBuild.BuildConsole.%1.Command"; +const char CUSTOMCOMMANDBUILDER_ARGS[] = "IncrediBuild.BuildConsole.%1.Arguments"; void CommandBuilder::fromMap(const QVariantMap &map) { - m_command = map.value(QString(Constants::CUSTOMCOMMANDBUILDER_COMMAND).arg(id())).toString(); - m_args = map.value(QString(Constants::CUSTOMCOMMANDBUILDER_ARGS).arg(id())).toString(); + m_command = FilePath::fromVariant(map.value(QString(CUSTOMCOMMANDBUILDER_COMMAND).arg(id()))); + m_args = map.value(QString(CUSTOMCOMMANDBUILDER_ARGS).arg(id())).toString(); } void CommandBuilder::toMap(QVariantMap *map) const { - (*map)[QString(Constants::CUSTOMCOMMANDBUILDER_COMMAND).arg(id())] = QVariant(m_command); - (*map)[QString(Constants::CUSTOMCOMMANDBUILDER_ARGS).arg(id())] = QVariant(m_args); + (*map)[QString(CUSTOMCOMMANDBUILDER_COMMAND).arg(id())] = m_command.toVariant(); + (*map)[QString(CUSTOMCOMMANDBUILDER_ARGS).arg(id())] = QVariant(m_args); } -void CommandBuilder::setCommand(const QString &command) +void CommandBuilder::setCommand(const FilePath &command) { m_command = command; } -- cgit v1.2.1