Remove QSharedPointer<> for RunConfiguration

src/plugins/debugger/debuggerplugin.cpp

@@ -1258,7 +1258,7 @@ void DebuggerPlugin::startExternalApplication()
     if (dlg.breakAtMain())
         m_manager->breakByFunctionMain();
 
-    if (RunControl *runControl = m_debuggerRunControlFactory->create(sp, ProjectExplorer::Constants::DEBUGMODE))
+    if (RunControl *runControl = m_debuggerRunControlFactory->create(sp))
         ProjectExplorerPlugin::instance()->startRunControl(runControl, ProjectExplorer::Constants::DEBUGMODE);
 }
 
@@ -1279,7 +1279,7 @@ void DebuggerPlugin::attachExternalApplication(qint64 pid, const QString &crashP
     sp->attachPID = pid;
     sp->crashParameter = crashParameter;
     sp->startMode = crashParameter.isEmpty() ? AttachExternal : AttachCrashedExternal;
-    if (RunControl *runControl = m_debuggerRunControlFactory->create(sp, ProjectExplorer::Constants::DEBUGMODE))
+    if (RunControl *runControl = m_debuggerRunControlFactory->create(sp))
         ProjectExplorerPlugin::instance()->startRunControl(runControl, ProjectExplorer::Constants::DEBUGMODE);
 }
 
@@ -1311,8 +1311,7 @@ void DebuggerPlugin::attachCore(const QString &core, const QString &exe)
     sp->executable = exe;
     sp->coreFile = core;
     sp->startMode = AttachCore;
-    if (RunControl *runControl = m_debuggerRunControlFactory
-            ->create(sp, ProjectExplorer::Constants::DEBUGMODE))
+    if (RunControl *runControl = m_debuggerRunControlFactory->create(sp))
         ProjectExplorerPlugin::instance()->startRunControl(runControl, ProjectExplorer::Constants::DEBUGMODE);
 }
 
@@ -1347,7 +1346,7 @@ void DebuggerPlugin::startRemoteApplication()
         sp->serverStartScript = dlg.serverStartScript();
     sp->sysRoot = dlg.sysroot();
 
-    if (RunControl *runControl = m_debuggerRunControlFactory->create(sp, ProjectExplorer::Constants::DEBUGMODE))
+    if (RunControl *runControl = m_debuggerRunControlFactory->create(sp))
         ProjectExplorerPlugin::instance()->startRunControl(runControl, ProjectExplorer::Constants::DEBUGMODE);
 }
 

src/plugins/debugger/debuggerrunner.cpp

@@ -63,10 +63,10 @@ DebuggerRunControlFactory::DebuggerRunControlFactory(DebuggerManager *manager)
     : m_manager(manager)
 {}
 
-bool DebuggerRunControlFactory::canRun(const RunConfigurationPtr &runConfiguration, const QString &mode) const
+bool DebuggerRunControlFactory::canRun(RunConfiguration *runConfiguration, const QString &mode) const
 {
     return mode == ProjectExplorer::Constants::DEBUGMODE
-       && !runConfiguration.objectCast<LocalApplicationRunConfiguration>().isNull();
+            && qobject_cast<LocalApplicationRunConfiguration *>(runConfiguration);
 }
 
 QString DebuggerRunControlFactory::displayName() const
@@ -74,22 +74,21 @@ QString DebuggerRunControlFactory::displayName() const
     return tr("Debug");
 }
 
-RunControl *DebuggerRunControlFactory::create(const DebuggerStartParametersPtr &sp, const QString &mode)
+RunControl *DebuggerRunControlFactory::create(const DebuggerStartParametersPtr &sp)
 {
     return new DebuggerRunControl(m_manager, sp);
 }
 
-RunControl *DebuggerRunControlFactory::create(const RunConfigurationPtr &runConfiguration,
+RunControl *DebuggerRunControlFactory::create(RunConfiguration *runConfiguration,
                                               const QString &mode)
 {
     QTC_ASSERT(mode == ProjectExplorer::Constants::DEBUGMODE, return 0);
-    LocalApplicationRunConfigurationPtr rc =
-        runConfiguration.objectCast<LocalApplicationRunConfiguration>();
-    QTC_ASSERT(!rc.isNull(), return 0);
+    LocalApplicationRunConfiguration *rc = qobject_cast<LocalApplicationRunConfiguration *>(runConfiguration);
+    QTC_ASSERT(rc, return 0);
     return new DebuggerRunControl(m_manager, rc);
 }
 
-QWidget *DebuggerRunControlFactory::configurationWidget(const RunConfigurationPtr &runConfiguration)
+QWidget *DebuggerRunControlFactory::configurationWidget(RunConfiguration *runConfiguration)
 {
     // NBS TODO: Add GDB-specific configuration widget
     Q_UNUSED(runConfiguration)
@@ -106,7 +105,7 @@ QWidget *DebuggerRunControlFactory::configurationWidget(const RunConfigurationPt
 
 
 DebuggerRunControl::DebuggerRunControl(DebuggerManager *manager,
-       QSharedPointer<LocalApplicationRunConfiguration> runConfiguration)
+       LocalApplicationRunConfiguration *runConfiguration)
   : RunControl(runConfiguration),
     m_startParameters(new DebuggerStartParameters()),
     m_manager(manager),
@@ -158,7 +157,7 @@ DebuggerRunControl::DebuggerRunControl(DebuggerManager *manager,
 }
 
 DebuggerRunControl::DebuggerRunControl(DebuggerManager *manager, const DebuggerStartParametersPtr &startParameters)
-    : RunControl(RunConfigurationPtr(0)),
+    : RunControl(0),
       m_startParameters(startParameters),
       m_manager(manager),
       m_running(false)

src/plugins/debugger/debuggerrunner.h

@@ -35,22 +35,12 @@
 #include <projectexplorer/runconfiguration.h>
 #include <projectexplorer/applicationrunconfiguration.h>
 
-namespace ProjectExplorer {
-class LocalApplicationRunConfiguration;
-}
-
 namespace Debugger {
 class DebuggerManager;
 
 namespace Internal {
 class StartData;
 
-typedef QSharedPointer<ProjectExplorer::RunConfiguration>
-    RunConfigurationPtr;
-
-typedef QSharedPointer<ProjectExplorer::LocalApplicationRunConfiguration>
-    LocalApplicationRunConfigurationPtr;
-
 class DebuggerRunControlFactory
     : public ProjectExplorer::IRunControlFactory
 {
@@ -60,14 +50,15 @@ public:
     explicit DebuggerRunControlFactory(DebuggerManager *manager);
 
     // ProjectExplorer::IRunControlFactory
-    bool canRun(const RunConfigurationPtr &runConfiguration, const QString &mode) const;
-    virtual ProjectExplorer::RunControl *create(const RunConfigurationPtr &runConfiguration,
+    bool canRun(ProjectExplorer::RunConfiguration *runConfiguration, const QString &mode) const;
+    virtual ProjectExplorer::RunControl *create(ProjectExplorer::RunConfiguration *runConfiguration,
                                                 const QString &mode);
     virtual QString displayName() const;
 
-    virtual QWidget *configurationWidget(const RunConfigurationPtr &runConfiguration);
+    virtual QWidget *configurationWidget(ProjectExplorer::RunConfiguration *runConfiguration);
 
-    ProjectExplorer::RunControl *create(const DebuggerStartParametersPtr &sp, const QString &mode);
+
+    ProjectExplorer::RunControl *create(const DebuggerStartParametersPtr &sp);
 
 private:
     DebuggerStartParametersPtr m_startParameters;
@@ -82,9 +73,10 @@ class DebuggerRunControl
 
 public:
     DebuggerRunControl(DebuggerManager *manager,
-                       LocalApplicationRunConfigurationPtr runConfiguration);
+                       ProjectExplorer::LocalApplicationRunConfiguration *runConfiguration);
     DebuggerRunControl(DebuggerManager *manager, const DebuggerStartParametersPtr &startParameters);
 
+
     // ProjectExplorer::RunControl
     virtual void start();
     virtual void stop();