From 9dac0766503ec3fc6b8283f90149956c7e06cab2 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 20 Mar 2019 13:21:53 +0100 Subject: [PATCH] WinRt: Use current plugin setup naming pattern Change-Id: I13eddd9c92b41bfdc4964eecde64f9dd8f3cc147 Reviewed-by: Oliver Wolff --- src/plugins/winrt/winrtplugin.cpp | 11 +++-------- src/plugins/winrt/winrtplugin.h | 5 +---- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/plugins/winrt/winrtplugin.cpp b/src/plugins/winrt/winrtplugin.cpp index 496b7e33085..18293783dd0 100644 --- a/src/plugins/winrt/winrtplugin.cpp +++ b/src/plugins/winrt/winrtplugin.cpp @@ -43,7 +43,7 @@ using namespace ProjectExplorer; namespace WinRt { namespace Internal { -class WinRtPluginRunData +class WinRtPluginPrivate { public: WinRtRunConfigurationFactory runConfigFactory; @@ -58,14 +58,9 @@ public: WinRtDeviceFactory emulatorDeviceFactory{Constants::WINRT_DEVICE_TYPE_EMULATOR}; }; -WinRtPlugin::WinRtPlugin() -{ - setObjectName(QLatin1String("WinRtPlugin")); -} - WinRtPlugin::~WinRtPlugin() { - delete m_runData; + delete d; } bool WinRtPlugin::initialize(const QStringList &arguments, QString *errorMessage) @@ -73,7 +68,7 @@ bool WinRtPlugin::initialize(const QStringList &arguments, QString *errorMessage Q_UNUSED(arguments) Q_UNUSED(errorMessage) - m_runData = new WinRtPluginRunData; + d = new WinRtPluginPrivate; auto runConstraint = [](RunConfiguration *runConfig) { IDevice::ConstPtr device = DeviceKitAspect::device(runConfig->target()->kit()); diff --git a/src/plugins/winrt/winrtplugin.h b/src/plugins/winrt/winrtplugin.h index 66eff10c989..211fc7d83ca 100644 --- a/src/plugins/winrt/winrtplugin.h +++ b/src/plugins/winrt/winrtplugin.h @@ -30,22 +30,19 @@ namespace WinRt { namespace Internal { -class WinRtPluginRunData; - class WinRtPlugin : public ExtensionSystem::IPlugin { Q_OBJECT Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "WinRt.json") public: - WinRtPlugin(); ~WinRtPlugin() final; private: bool initialize(const QStringList &arguments, QString *errorMessage) final; void extensionsInitialized() final {} - WinRtPluginRunData *m_runData = nullptr; + class WinRtPluginPrivate *d = nullptr; }; } // namespace Internal