From f57d43045b618d5fe4194a246c5dc24f1d6799e8 Mon Sep 17 00:00:00 2001 From: Denis Shienkov Date: Wed, 8 May 2019 14:42:54 +0300 Subject: [PATCH] bare-metal: Return initializier lists instead of ctors Change-Id: Ifc764130ca9c20f77ae1e1549fddba41a900150a Reviewed-by: hjk --- src/plugins/baremetal/baremetaldevice.cpp | 2 +- src/plugins/baremetal/gdbserverprovider.cpp | 4 ++-- src/plugins/baremetal/openocdgdbserverprovider.cpp | 2 +- src/plugins/baremetal/stlinkutilgdbserverprovider.cpp | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/plugins/baremetal/baremetaldevice.cpp b/src/plugins/baremetal/baremetaldevice.cpp index 17c225529e9..80d920b9e0b 100644 --- a/src/plugins/baremetal/baremetaldevice.cpp +++ b/src/plugins/baremetal/baremetaldevice.cpp @@ -182,7 +182,7 @@ IDevice::Ptr BareMetalDeviceFactory::create() const { BareMetalDeviceConfigurationWizard wizard; if (wizard.exec() != QDialog::Accepted) - return IDevice::Ptr(); + return {}; return wizard.device(); } diff --git a/src/plugins/baremetal/gdbserverprovider.cpp b/src/plugins/baremetal/gdbserverprovider.cpp index 1c361522aa6..dedef56c4f0 100644 --- a/src/plugins/baremetal/gdbserverprovider.cpp +++ b/src/plugins/baremetal/gdbserverprovider.cpp @@ -133,12 +133,12 @@ void GdbServerProvider::setResetCommands(const QString &cmds) QString GdbServerProvider::executable() const { - return QString(); + return {}; } QStringList GdbServerProvider::arguments() const { - return QStringList(); + return {}; } bool GdbServerProvider::operator==(const GdbServerProvider &other) const diff --git a/src/plugins/baremetal/openocdgdbserverprovider.cpp b/src/plugins/baremetal/openocdgdbserverprovider.cpp index c751d9d24fc..c4ef7a5f050 100644 --- a/src/plugins/baremetal/openocdgdbserverprovider.cpp +++ b/src/plugins/baremetal/openocdgdbserverprovider.cpp @@ -105,7 +105,7 @@ QString OpenOcdGdbServerProvider::channel() const return args.join(QLatin1Char(' ')); } default: // wrong - return QString(); + return {}; } } diff --git a/src/plugins/baremetal/stlinkutilgdbserverprovider.cpp b/src/plugins/baremetal/stlinkutilgdbserverprovider.cpp index 5d228b9b733..7766319bb15 100644 --- a/src/plugins/baremetal/stlinkutilgdbserverprovider.cpp +++ b/src/plugins/baremetal/stlinkutilgdbserverprovider.cpp @@ -83,7 +83,7 @@ QString StLinkUtilGdbServerProvider::defaultInitCommands() QString StLinkUtilGdbServerProvider::defaultResetCommands() { - return QLatin1String(""); + return {}; } QString StLinkUtilGdbServerProvider::typeDisplayName() const @@ -101,9 +101,9 @@ QString StLinkUtilGdbServerProvider::channel() const return m_host + QLatin1Char(':') + QString::number(m_port); case StartupOnPipe: // Unsupported mode - return QString(); + return {}; default: // wrong - return QString(); + return {}; } }