BareMetal: De-slot

Change-Id: I9b6470d670de3bd520f9db891e070199e2f57643
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>

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<Debugger::DebuggerRunControl> m_runControl;
-    BareMetalDebugSupport::State m_state;
+    State m_state;
 };
 
 } // namespace Internal

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;

src/plugins/baremetal/baremetalgdbcommandsdeploystep.h

@@ -68,8 +68,6 @@ class BareMetalGdbCommandsDeployStepWidget: public ProjectExplorer::BuildStepCon
 
 public:
     explicit BareMetalGdbCommandsDeployStepWidget(BareMetalGdbCommandsDeployStep &step);
-
-public slots:
     void update();
 
 private:

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 &regularText, const QString &errorText);
 
     BareMetalRunConfigurationWidgetPrivate * const d;

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;

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:
+private:
-    void populate();
-
-private slots:
     void currentIndexChanged(int index);
     void manageButtonClicked();
-
-protected:
     bool providerMatches(const GdbServerProvider *) const;
     QString providerText(const GdbServerProvider *) const;
 
-private:
     QComboBox *m_chooser;
     QPushButton *m_manageButton;
 };

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;
 

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;