diff options
17 files changed, 40 insertions, 54 deletions
diff --git a/src/plugins/baremetal/baremetaldevice.cpp b/src/plugins/baremetal/baremetaldevice.cpp index e482073021c..2f50336c79e 100644 --- a/src/plugins/baremetal/baremetaldevice.cpp +++ b/src/plugins/baremetal/baremetaldevice.cpp @@ -119,7 +119,7 @@ void BareMetalDevice::fromMap(const QVariantMap &map) gdbServerProvider = provider->id(); } else { const QSsh::SshConnectionParameters sshParams = sshParameters(); - DefaultGdbServerProvider *newProvider = new DefaultGdbServerProvider; + auto newProvider = new DefaultGdbServerProvider; newProvider->setDisplayName(name); newProvider->m_host = sshParams.host(); newProvider->m_port = sshParams.port(); diff --git a/src/plugins/baremetal/baremetaldevice.h b/src/plugins/baremetal/baremetaldevice.h index 1a2fdbe8c5d..c608bc8c4e5 100644 --- a/src/plugins/baremetal/baremetaldevice.h +++ b/src/plugins/baremetal/baremetaldevice.h @@ -36,15 +36,15 @@ class GdbServerProvider; class BareMetalDevice : public ProjectExplorer::IDevice { public: - typedef QSharedPointer<BareMetalDevice> Ptr; - typedef QSharedPointer<const BareMetalDevice> ConstPtr; + using Ptr = QSharedPointer<BareMetalDevice>; + using ConstPtr = QSharedPointer<const BareMetalDevice>; static Ptr create(); static Ptr create(const QString &name, Core::Id type, MachineType machineType, Origin origin = ManuallyAdded, Core::Id id = Core::Id()); static Ptr create(const BareMetalDevice &other); - ~BareMetalDevice(); + ~BareMetalDevice() override; QString displayType() const override; ProjectExplorer::IDeviceWidget *createWidget() override; QList<Core::Id> actionIds() const override; @@ -63,11 +63,11 @@ public: void unregisterProvider(GdbServerProvider *provider); void providerUpdated(GdbServerProvider *provider); - virtual void fromMap(const QVariantMap &map) override; - virtual QVariantMap toMap() const override; + void fromMap(const QVariantMap &map) override; + QVariantMap toMap() const override; protected: - BareMetalDevice() {} + BareMetalDevice() = default; BareMetalDevice(const QString &name, Core::Id type, MachineType machineType, Origin origin, Core::Id id); BareMetalDevice(const BareMetalDevice &other); diff --git a/src/plugins/baremetal/baremetaldeviceconfigurationwidget.h b/src/plugins/baremetal/baremetaldeviceconfigurationwidget.h index 7c55b1aa00e..e56e7e76ced 100644 --- a/src/plugins/baremetal/baremetaldeviceconfigurationwidget.h +++ b/src/plugins/baremetal/baremetaldeviceconfigurationwidget.h @@ -40,11 +40,11 @@ class BareMetalDeviceConfigurationWidget public: explicit BareMetalDeviceConfigurationWidget( - const ProjectExplorer::IDevice::Ptr &deviceConfig, QWidget *parent = 0); + const ProjectExplorer::IDevice::Ptr &deviceConfig, QWidget *parent = nullptr); private: void gdbServerProviderChanged(); - void updateDeviceFromUi(); + void updateDeviceFromUi() override; GdbServerProviderChooser *m_gdbServerProviderChooser; }; diff --git a/src/plugins/baremetal/baremetaldeviceconfigurationwizard.h b/src/plugins/baremetal/baremetaldeviceconfigurationwizard.h index dd496590213..4663516fd96 100644 --- a/src/plugins/baremetal/baremetaldeviceconfigurationwizard.h +++ b/src/plugins/baremetal/baremetaldeviceconfigurationwizard.h @@ -38,7 +38,7 @@ class BareMetalDeviceConfigurationWizard : public Utils::Wizard Q_OBJECT public: - BareMetalDeviceConfigurationWizard(QWidget *parent = 0); + BareMetalDeviceConfigurationWizard(QWidget *parent = nullptr); ProjectExplorer::IDevice::Ptr device() const; diff --git a/src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h b/src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h index af61c11d651..f47c8a79e9e 100644 --- a/src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h +++ b/src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h @@ -42,10 +42,10 @@ class BareMetalDeviceConfigurationWizardSetupPage : public QWizardPage Q_OBJECT public: - explicit BareMetalDeviceConfigurationWizardSetupPage(QWidget *parent = 0); + explicit BareMetalDeviceConfigurationWizardSetupPage(QWidget *parent = nullptr); - void initializePage(); - bool isComplete() const; + void initializePage() override; + bool isComplete() const override; QString configurationName() const; QString gdbServerProviderId() const; diff --git a/src/plugins/baremetal/baremetalgdbcommandsdeploystep.cpp b/src/plugins/baremetal/baremetalgdbcommandsdeploystep.cpp index 64ae0057d6c..8e8015280bc 100644 --- a/src/plugins/baremetal/baremetalgdbcommandsdeploystep.cpp +++ b/src/plugins/baremetal/baremetalgdbcommandsdeploystep.cpp @@ -37,7 +37,7 @@ const char GdbCommandsKey[] = "BareMetal.GdbCommandsStep.Commands"; BareMetalGdbCommandsDeployStepWidget::BareMetalGdbCommandsDeployStepWidget(BareMetalGdbCommandsDeployStep &step) : BuildStepConfigWidget(&step), m_step(step) { - QFormLayout *fl = new QFormLayout(this); + auto fl = new QFormLayout(this); fl->setMargin(0); fl->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow); setLayout(fl); diff --git a/src/plugins/baremetal/defaultgdbserverprovider.cpp b/src/plugins/baremetal/defaultgdbserverprovider.cpp index 567b9369189..10ade873960 100644 --- a/src/plugins/baremetal/defaultgdbserverprovider.cpp +++ b/src/plugins/baremetal/defaultgdbserverprovider.cpp @@ -47,12 +47,7 @@ DefaultGdbServerProvider::DefaultGdbServerProvider() { } -DefaultGdbServerProvider::DefaultGdbServerProvider(const DefaultGdbServerProvider &other) - : GdbServerProvider(other) - , m_host(other.m_host) - , m_port(other.m_port) -{ -} +DefaultGdbServerProvider::DefaultGdbServerProvider(const DefaultGdbServerProvider &other) = default; quint16 DefaultGdbServerProvider::port() const { @@ -162,7 +157,7 @@ GdbServerProvider *DefaultGdbServerProviderFactory::restore(const QVariantMap &d if (p->fromMap(updated)) return p; delete p; - return 0; + return nullptr; } DefaultGdbServerProviderConfigWidget::DefaultGdbServerProviderConfigWidget( diff --git a/src/plugins/baremetal/gdbserverprovider.cpp b/src/plugins/baremetal/gdbserverprovider.cpp index 179a207a6cb..cf633d86024 100644 --- a/src/plugins/baremetal/gdbserverprovider.cpp +++ b/src/plugins/baremetal/gdbserverprovider.cpp @@ -229,7 +229,7 @@ QString GdbServerProviderFactory::idFromMap(const QVariantMap &data) return data.value(QLatin1String(idKeyC)).toString(); } -void GdbServerProviderFactory::idToMap(QVariantMap &data, const QString id) +void GdbServerProviderFactory::idToMap(QVariantMap &data, const QString &id) { data.insert(QLatin1String(idKeyC), id); } diff --git a/src/plugins/baremetal/gdbserverprovider.h b/src/plugins/baremetal/gdbserverprovider.h index eabac0fa292..8ca0777ea74 100644 --- a/src/plugins/baremetal/gdbserverprovider.h +++ b/src/plugins/baremetal/gdbserverprovider.h @@ -126,7 +126,7 @@ public: virtual GdbServerProvider *restore(const QVariantMap &data) = 0; static QString idFromMap(const QVariantMap &data); - static void idToMap(QVariantMap &data, const QString id); + static void idToMap(QVariantMap &data, const QString &id); protected: void setId(const QString &id); @@ -174,7 +174,7 @@ private: void setFromProvider(); GdbServerProvider *m_provider; - QLabel *m_errorLabel = 0; + QLabel *m_errorLabel = nullptr; }; class HostWidget : public QWidget @@ -182,7 +182,7 @@ class HostWidget : public QWidget Q_OBJECT public: - explicit HostWidget(QWidget *parent = 0); + explicit HostWidget(QWidget *parent = nullptr); void setHost(const QString &host); QString host() const; diff --git a/src/plugins/baremetal/gdbserverproviderchooser.h b/src/plugins/baremetal/gdbserverproviderchooser.h index 424d89201e2..c2827921cac 100644 --- a/src/plugins/baremetal/gdbserverproviderchooser.h +++ b/src/plugins/baremetal/gdbserverproviderchooser.h @@ -45,7 +45,7 @@ class GdbServerProviderChooser : public QWidget public: explicit GdbServerProviderChooser( - bool useManageButton = true, QWidget *parent = 0); + bool useManageButton = true, QWidget *parent = nullptr); QString currentProviderId() const; void setCurrentProviderId(const QString &id); diff --git a/src/plugins/baremetal/gdbserverprovidermanager.cpp b/src/plugins/baremetal/gdbserverprovidermanager.cpp index 0af2d0d94a9..e08b9bb30f1 100644 --- a/src/plugins/baremetal/gdbserverprovidermanager.cpp +++ b/src/plugins/baremetal/gdbserverprovidermanager.cpp @@ -48,7 +48,7 @@ const char countKeyC[] = "GdbServerProvider.Count"; const char fileVersionKeyC[] = "Version"; const char fileNameKeyC[] = "/gdbserverproviders.xml"; -static GdbServerProviderManager *m_instance = 0; +static GdbServerProviderManager *m_instance = nullptr; GdbServerProviderManager::GdbServerProviderManager() : m_configFile(Utils::FileName::fromString(Core::ICore::userResourcePath() + fileNameKeyC)) @@ -76,7 +76,7 @@ GdbServerProviderManager::~GdbServerProviderManager() qDeleteAll(m_providers); m_providers.clear(); delete m_writer; - m_instance = 0; + m_instance = nullptr; } GdbServerProviderManager *GdbServerProviderManager::instance() @@ -154,7 +154,7 @@ QList<GdbServerProviderFactory *> GdbServerProviderManager::factories() GdbServerProvider *GdbServerProviderManager::findProvider(const QString &id) { if (id.isEmpty() || !m_instance) - return 0; + return nullptr; return Utils::findOrDefault(m_instance->m_providers, Utils::equal(&GdbServerProvider::id, id)); } @@ -162,7 +162,7 @@ GdbServerProvider *GdbServerProviderManager::findProvider(const QString &id) GdbServerProvider *GdbServerProviderManager::findByDisplayName(const QString &displayName) { if (displayName.isEmpty()) - return 0; + return nullptr; return Utils::findOrDefault(m_instance->m_providers, Utils::equal(&GdbServerProvider::displayName, displayName)); diff --git a/src/plugins/baremetal/gdbserverprovidermanager.h b/src/plugins/baremetal/gdbserverprovidermanager.h index a26c5bfe13f..8a6ed109bac 100644 --- a/src/plugins/baremetal/gdbserverprovidermanager.h +++ b/src/plugins/baremetal/gdbserverprovidermanager.h @@ -46,7 +46,7 @@ class GdbServerProviderManager : public QObject public: static GdbServerProviderManager *instance(); - ~GdbServerProviderManager(); + ~GdbServerProviderManager() override; static QList<GdbServerProvider *> providers(); static QList<GdbServerProviderFactory *> factories(); diff --git a/src/plugins/baremetal/gdbserverproviderprocess.h b/src/plugins/baremetal/gdbserverproviderprocess.h index 4065ec5d10e..8640db5aef1 100644 --- a/src/plugins/baremetal/gdbserverproviderprocess.h +++ b/src/plugins/baremetal/gdbserverproviderprocess.h @@ -38,7 +38,7 @@ class GdbServerProviderProcess : public ProjectExplorer::DeviceProcess public: explicit GdbServerProviderProcess( const QSharedPointer<const ProjectExplorer::IDevice> &device, - QObject *parent = 0); + QObject *parent = nullptr); void start(const ProjectExplorer::Runnable &runnable) override; void interrupt() override; diff --git a/src/plugins/baremetal/gdbserverproviderssettingspage.cpp b/src/plugins/baremetal/gdbserverproviderssettingspage.cpp index 3eb43c89118..60af0a9d2b9 100644 --- a/src/plugins/baremetal/gdbserverproviderssettingspage.cpp +++ b/src/plugins/baremetal/gdbserverproviderssettingspage.cpp @@ -105,13 +105,13 @@ GdbServerProvider *GdbServerProviderModel::provider(const QModelIndex &index) co if (GdbServerProviderNode *node = nodeForIndex(index)) return node->provider; - return 0; + return nullptr; } GdbServerProviderNode *GdbServerProviderModel::nodeForIndex(const QModelIndex &index) const { if (!index.isValid()) - return 0; + return nullptr; return static_cast<GdbServerProviderNode *>(itemForIndex(index)); } @@ -316,7 +316,7 @@ GdbServerProvidersSettingsWidget::GdbServerProvidersSettingsWidget addMenu->addAction(action); } - connect(m_cloneButton, &QAbstractButton::clicked, this, [this] { createProvider(0); }); + connect(m_cloneButton, &QAbstractButton::clicked, this, [this] { createProvider(nullptr); }); m_addButton->setMenu(addMenu); @@ -336,15 +336,15 @@ void GdbServerProvidersSettingsWidget::providerSelectionChanged() w->setVisible(false); GdbServerProviderNode *node = m_model.nodeForIndex(current); - w = node ? node->widget : 0; + w = node ? node->widget : nullptr; m_container->setWidget(w); - m_container->setVisible(w != 0); + m_container->setVisible(w != nullptr); updateState(); } void GdbServerProvidersSettingsWidget::createProvider(GdbServerProviderFactory *f) { - GdbServerProvider *provider = 0; + GdbServerProvider *provider = nullptr; if (!f) { GdbServerProvider *old = m_model.provider(currentIndex()); if (!old) @@ -427,7 +427,7 @@ void GdbServerProvidersSettingsPage::finish() m_configWidget, &GdbServerProvidersSettingsWidget::providerSelectionChanged); delete m_configWidget; - m_configWidget = 0; + m_configWidget = nullptr; } } // namespace Internal diff --git a/src/plugins/baremetal/gdbserverproviderssettingspage.h b/src/plugins/baremetal/gdbserverproviderssettingspage.h index 28c5bc3b4c1..d1b6119fd9b 100644 --- a/src/plugins/baremetal/gdbserverproviderssettingspage.h +++ b/src/plugins/baremetal/gdbserverproviderssettingspage.h @@ -86,9 +86,9 @@ public: explicit GdbServerProvidersSettingsPage(QObject *parent = nullptr); private: - QWidget *widget(); - void apply(); - void finish(); + QWidget *widget() override; + void apply() override; + void finish() override; GdbServerProvidersSettingsWidget *m_configWidget = nullptr; }; diff --git a/src/plugins/baremetal/openocdgdbserverprovider.cpp b/src/plugins/baremetal/openocdgdbserverprovider.cpp index 0e21b9d0b3c..33d05c88a2a 100644 --- a/src/plugins/baremetal/openocdgdbserverprovider.cpp +++ b/src/plugins/baremetal/openocdgdbserverprovider.cpp @@ -63,16 +63,7 @@ OpenOcdGdbServerProvider::OpenOcdGdbServerProvider() } OpenOcdGdbServerProvider::OpenOcdGdbServerProvider( - const OpenOcdGdbServerProvider &other) - : GdbServerProvider(other) - , m_host(other.m_host) - , m_port(other.m_port) - , m_executableFile(other.m_executableFile) - , m_rootScriptsDir(other.m_rootScriptsDir) - , m_configurationFile(other.m_configurationFile) - , m_additionalArguments(other.m_additionalArguments) -{ -} + const OpenOcdGdbServerProvider &other) = default; QString OpenOcdGdbServerProvider::defaultInitCommands() { @@ -246,7 +237,7 @@ GdbServerProvider *OpenOcdGdbServerProviderFactory::restore(const QVariantMap &d if (p->fromMap(updated)) return p; delete p; - return 0; + return nullptr; } OpenOcdGdbServerProviderConfigWidget::OpenOcdGdbServerProviderConfigWidget( diff --git a/src/plugins/baremetal/stlinkutilgdbserverprovider.cpp b/src/plugins/baremetal/stlinkutilgdbserverprovider.cpp index ada59255fd0..146f826e26a 100644 --- a/src/plugins/baremetal/stlinkutilgdbserverprovider.cpp +++ b/src/plugins/baremetal/stlinkutilgdbserverprovider.cpp @@ -238,7 +238,7 @@ GdbServerProvider *StLinkUtilGdbServerProviderFactory::restore(const QVariantMap if (p->fromMap(updated)) return p; delete p; - return 0; + return nullptr; } StLinkUtilGdbServerProviderConfigWidget::StLinkUtilGdbServerProviderConfigWidget( |