From 910eb46c2b7f4c723b5575e9a2b1ed09a43ef7b9 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sat, 18 Mar 2017 23:19:21 +0200 Subject: [PATCH] BareMetal: De-slot Change-Id: I9b6470d670de3bd520f9db891e070199e2f57643 Reviewed-by: Denis Shienkov Reviewed-by: Tobias Hunger --- src/plugins/baremetal/baremetaldebugsupport.h | 9 ++++----- .../baremetal/baremetaldeviceconfigurationwidget.h | 4 +--- src/plugins/baremetal/baremetalgdbcommandsdeploystep.h | 2 -- src/plugins/baremetal/baremetalrunconfigurationwidget.h | 4 +--- src/plugins/baremetal/gdbserverprovider.h | 6 ++---- src/plugins/baremetal/gdbserverproviderchooser.h | 9 ++------- src/plugins/baremetal/openocdgdbserverprovider.h | 3 +-- src/plugins/baremetal/stlinkutilgdbserverprovider.h | 3 +-- 8 files changed, 12 insertions(+), 28 deletions(-) diff --git a/src/plugins/baremetal/baremetaldebugsupport.h b/src/plugins/baremetal/baremetaldebugsupport.h index 61f649ec651..d683831c377 100644 --- a/src/plugins/baremetal/baremetaldebugsupport.h +++ b/src/plugins/baremetal/baremetaldebugsupport.h @@ -43,7 +43,9 @@ public: explicit BareMetalDebugSupport(Debugger::DebuggerRunControl *runControl); ~BareMetalDebugSupport(); -private slots: +private: + enum State { Inactive, StartingRunner, Running }; + void remoteSetupRequested(); void debuggingFinished(); void remoteOutputMessage(const QByteArray &output); @@ -53,9 +55,6 @@ private slots: void progressReport(const QString &progressOutput); void appRunnerError(const QString &error); -private: - enum State { Inactive, StartingRunner, Running }; - void adapterSetupDone(); void adapterSetupFailed(const QString &error); @@ -66,7 +65,7 @@ private: ProjectExplorer::ApplicationLauncher *m_appLauncher; const QPointer m_runControl; - BareMetalDebugSupport::State m_state; + State m_state; }; } // namespace Internal diff --git a/src/plugins/baremetal/baremetaldeviceconfigurationwidget.h b/src/plugins/baremetal/baremetaldeviceconfigurationwidget.h index 520eeb81d80..7c55b1aa00e 100644 --- a/src/plugins/baremetal/baremetaldeviceconfigurationwidget.h +++ b/src/plugins/baremetal/baremetaldeviceconfigurationwidget.h @@ -42,10 +42,8 @@ public: explicit BareMetalDeviceConfigurationWidget( const ProjectExplorer::IDevice::Ptr &deviceConfig, QWidget *parent = 0); -private slots: - void gdbServerProviderChanged(); - private: + void gdbServerProviderChanged(); void updateDeviceFromUi(); GdbServerProviderChooser *m_gdbServerProviderChooser; diff --git a/src/plugins/baremetal/baremetalgdbcommandsdeploystep.h b/src/plugins/baremetal/baremetalgdbcommandsdeploystep.h index 0c0b610f7db..0278dbc0ac2 100644 --- a/src/plugins/baremetal/baremetalgdbcommandsdeploystep.h +++ b/src/plugins/baremetal/baremetalgdbcommandsdeploystep.h @@ -68,8 +68,6 @@ class BareMetalGdbCommandsDeployStepWidget: public ProjectExplorer::BuildStepCon public: explicit BareMetalGdbCommandsDeployStepWidget(BareMetalGdbCommandsDeployStep &step); - -public slots: void update(); private: diff --git a/src/plugins/baremetal/baremetalrunconfigurationwidget.h b/src/plugins/baremetal/baremetalrunconfigurationwidget.h index d6c0d5347cb..76f9cc86b77 100644 --- a/src/plugins/baremetal/baremetalrunconfigurationwidget.h +++ b/src/plugins/baremetal/baremetalrunconfigurationwidget.h @@ -50,11 +50,9 @@ public: Q_SLOT void runConfigurationEnabledChange(); -private slots: +private: void updateTargetInformation(); void handleWorkingDirectoryChanged(); - -private: void setLabelText(QLabel &label, const QString ®ularText, const QString &errorText); BareMetalRunConfigurationWidgetPrivate * const d; diff --git a/src/plugins/baremetal/gdbserverprovider.h b/src/plugins/baremetal/gdbserverprovider.h index aa91100946f..0130d2f9fb2 100644 --- a/src/plugins/baremetal/gdbserverprovider.h +++ b/src/plugins/baremetal/gdbserverprovider.h @@ -145,14 +145,12 @@ public: signals: void dirty(); -protected slots: - void setErrorMessage(const QString &); - void clearErrorMessage(); - protected: virtual void applyImpl() = 0; virtual void discardImpl() = 0; + void setErrorMessage(const QString &); + void clearErrorMessage(); void addErrorLabel(); GdbServerProvider::StartupMode startupModeFromIndex(int idx) const; diff --git a/src/plugins/baremetal/gdbserverproviderchooser.h b/src/plugins/baremetal/gdbserverproviderchooser.h index a5e090516ad..424d89201e2 100644 --- a/src/plugins/baremetal/gdbserverproviderchooser.h +++ b/src/plugins/baremetal/gdbserverproviderchooser.h @@ -49,22 +49,17 @@ public: QString currentProviderId() const; void setCurrentProviderId(const QString &id); + void populate(); signals: void providerChanged(); -public slots: - void populate(); - -private slots: +private: void currentIndexChanged(int index); void manageButtonClicked(); - -protected: bool providerMatches(const GdbServerProvider *) const; QString providerText(const GdbServerProvider *) const; -private: QComboBox *m_chooser; QPushButton *m_manageButton; }; diff --git a/src/plugins/baremetal/openocdgdbserverprovider.h b/src/plugins/baremetal/openocdgdbserverprovider.h index 4b43d89dc11..94481775edb 100644 --- a/src/plugins/baremetal/openocdgdbserverprovider.h +++ b/src/plugins/baremetal/openocdgdbserverprovider.h @@ -95,10 +95,9 @@ class OpenOcdGdbServerProviderConfigWidget : public GdbServerProviderConfigWidge public: explicit OpenOcdGdbServerProviderConfigWidget(OpenOcdGdbServerProvider *); -private slots: +private: void startupModeChanged(); -private: void applyImpl() final; void discardImpl() final; diff --git a/src/plugins/baremetal/stlinkutilgdbserverprovider.h b/src/plugins/baremetal/stlinkutilgdbserverprovider.h index 6b536dd2a56..900e4080286 100644 --- a/src/plugins/baremetal/stlinkutilgdbserverprovider.h +++ b/src/plugins/baremetal/stlinkutilgdbserverprovider.h @@ -101,10 +101,9 @@ class StLinkUtilGdbServerProviderConfigWidget : public GdbServerProviderConfigWi public: explicit StLinkUtilGdbServerProviderConfigWidget(StLinkUtilGdbServerProvider *); -private slots: +private: void startupModeChanged(); -private: void applyImpl() final; void discardImpl() final;