From fbc043c96d66d35c02d50f75c7bdea5876bc7d2c Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Wed, 13 Mar 2019 18:14:34 +0100
Subject: [PATCH] QmlPreview: Simplify QmlPreviewRunner

Change-Id: Icdbc65ec39dd63d59f5bc96b21649a9d488be920
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
---
 .../qmlpreview/qmlpreviewruncontrol.cpp       | 25 +++++++++----------
 src/plugins/qmlpreview/qmlpreviewruncontrol.h |  2 +-
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp b/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp
index 81532553db9..0a8ac9fb1ad 100644
--- a/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp
+++ b/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp
@@ -50,21 +50,20 @@ QmlPreviewRunner::QmlPreviewRunner(ProjectExplorer::RunControl *runControl,
     : RunWorker(runControl)
 {
     setId("QmlPreviewRunner");
-    m_connectionManager.reset(new Internal::QmlPreviewConnectionManager(this));
-    m_connectionManager->setFileLoader(fileLoader);
-    m_connectionManager->setFileClassifier(fileClassifier);
-    m_connectionManager->setFpsHandler(fpsHandler);
+    m_connectionManager.setFileLoader(fileLoader);
+    m_connectionManager.setFileClassifier(fileClassifier);
+    m_connectionManager.setFpsHandler(fpsHandler);
 
     connect(this, &QmlPreviewRunner::loadFile,
-            m_connectionManager.data(), &Internal::QmlPreviewConnectionManager::loadFile);
+            &m_connectionManager, &Internal::QmlPreviewConnectionManager::loadFile);
     connect(this, &QmlPreviewRunner::rerun,
-            m_connectionManager.data(), &Internal::QmlPreviewConnectionManager::rerun);
+            &m_connectionManager, &Internal::QmlPreviewConnectionManager::rerun);
 
     connect(this, &QmlPreviewRunner::zoom,
-            m_connectionManager.data(), &Internal::QmlPreviewConnectionManager::zoom);
+            &m_connectionManager, &Internal::QmlPreviewConnectionManager::zoom);
     connect(this, &QmlPreviewRunner::language,
-            m_connectionManager.data(), &Internal::QmlPreviewConnectionManager::language);
-    connect(m_connectionManager.data(), &Internal::QmlPreviewConnectionManager::connectionOpened,
+            &m_connectionManager, &Internal::QmlPreviewConnectionManager::language);
+    connect(&m_connectionManager, &Internal::QmlPreviewConnectionManager::connectionOpened,
             this, [this, initialZoom, initialLocale]() {
         if (initialZoom > 0)
             emit zoom(initialZoom);
@@ -73,7 +72,7 @@ QmlPreviewRunner::QmlPreviewRunner(ProjectExplorer::RunControl *runControl,
         emit ready();
     });
 
-    connect(m_connectionManager.data(), &Internal::QmlPreviewConnectionManager::restart,
+    connect(&m_connectionManager, &Internal::QmlPreviewConnectionManager::restart,
             runControl, [runControl]() {
         if (!runControl->isRunning())
             return;
@@ -90,14 +89,14 @@ QmlPreviewRunner::QmlPreviewRunner(ProjectExplorer::RunControl *runControl,
 
 void QmlPreviewRunner::start()
 {
-    m_connectionManager->setTarget(runControl()->target());
-    m_connectionManager->connectToServer(serverUrl());
+    m_connectionManager.setTarget(runControl()->target());
+    m_connectionManager.connectToServer(serverUrl());
     reportStarted();
 }
 
 void QmlPreviewRunner::stop()
 {
-    m_connectionManager->disconnectFromServer();
+    m_connectionManager.disconnectFromServer();
     reportStopped();
 }
 
diff --git a/src/plugins/qmlpreview/qmlpreviewruncontrol.h b/src/plugins/qmlpreview/qmlpreviewruncontrol.h
index 889e7f641b8..7a25a62c109 100644
--- a/src/plugins/qmlpreview/qmlpreviewruncontrol.h
+++ b/src/plugins/qmlpreview/qmlpreviewruncontrol.h
@@ -56,7 +56,7 @@ private:
     void start() override;
     void stop() override;
 
-    QScopedPointer<Internal::QmlPreviewConnectionManager> m_connectionManager;
+    Internal::QmlPreviewConnectionManager m_connectionManager;
 };
 
 class LocalQmlPreviewSupport : public ProjectExplorer::SimpleTargetRunner