Plugins: Code cosmetics

Get closer to a uniform pattern of code layout (public/private,
pimpl naming...)

Change-Id: If2bc6dcee3df9127274f479b4ebc270d283dcb65
Reviewed-by: Xing Xiong
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

3 files changed, 6 insertions, 17 deletions

diff --git a/src/plugins/baremetal/baremetalplugin.cpp b/src/plugins/baremetal/baremetalplugin.cpp
index 302e71ede4..60afa6f911 100644
--- a/src/plugins/baremetal/baremetalplugin.cpp
+++ b/src/plugins/baremetal/baremetalplugin.cpp
@@ -46,7 +46,7 @@ using namespace ProjectExplorer;
 namespace BareMetal {
 namespace Internal {
 
-class BareMetalPluginRunData
+class BareMetalPluginPrivate
 {
 public:
     BareMetalDeviceFactory deviceFactory;
@@ -56,14 +56,9 @@ public:
     GdbServerProviderManager gdbServerProviderManager;
 };
 
-BareMetalPlugin::BareMetalPlugin()
-{
-    setObjectName(QLatin1String("BareMetalPlugin"));
-}
-
 BareMetalPlugin::~BareMetalPlugin()
 {
-    delete m_runData;
+    delete d;
 }
 
 bool BareMetalPlugin::initialize(const QStringList &arguments, QString *errorString)
@@ -71,7 +66,7 @@ bool BareMetalPlugin::initialize(const QStringList &arguments, QString *errorStr
     Q_UNUSED(arguments)
     Q_UNUSED(errorString)
 
-    m_runData = new BareMetalPluginRunData;
+    d = new BareMetalPluginPrivate;
 
     auto constraint = [](RunConfiguration *runConfig) {
         const QByteArray idStr = runConfig->id().name();
diff --git a/src/plugins/baremetal/baremetalplugin.h b/src/plugins/baremetal/baremetalplugin.h
index 17ecbcc85d..7824b43a10 100644
--- a/src/plugins/baremetal/baremetalplugin.h
+++ b/src/plugins/baremetal/baremetalplugin.h
@@ -31,23 +31,17 @@
 namespace BareMetal {
 namespace Internal {
 
-class BareMetalPluginRunData;
-
 class BareMetalPlugin : public ExtensionSystem::IPlugin
 {
    Q_OBJECT
    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "BareMetal.json")
 
-public:
-   BareMetalPlugin();
-
-private:
    ~BareMetalPlugin() final;
 
    bool initialize(const QStringList &arguments, QString *errorString) final;
    void extensionsInitialized() final;
 
-   BareMetalPluginRunData *m_runData;
+   class BareMetalPluginPrivate *d;
 };
 
 } // namespace Internal
diff --git a/src/plugins/baremetal/gdbserverprovidermanager.h b/src/plugins/baremetal/gdbserverprovidermanager.h
index 8a6ed109ba..a7a38a6c44 100644
--- a/src/plugins/baremetal/gdbserverprovidermanager.h
+++ b/src/plugins/baremetal/gdbserverprovidermanager.h
@@ -36,7 +36,7 @@ namespace BareMetal {
 namespace Internal {
 
 class BareMetalPlugin;
-class BareMetalPluginRunData;
+class BareMetalPluginPrivate;
 class GdbServerProvider;
 class GdbServerProviderFactory;
 
@@ -75,7 +75,7 @@ private:
     const QList<GdbServerProviderFactory *> m_factories;
 
     friend class BareMetalPlugin; // for restoreProviders
-    friend class BareMetalPluginRunData; // for constructor
+    friend class BareMetalPluginPrivate; // for constructor
     friend class GdbServerProvider;
 };