forked from qt-creator/qt-creator
Revert "analyzer: move convenience factory back to base plugin"
This reverts commit 06a41da04e.
Change-Id: I06a41da04e726ffd35da18d99cd2f46cb99467bf
Reviewed-on: http://codereview.qt.nokia.com/1094
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
@@ -42,8 +42,6 @@
|
||||
#include "analyzerutils.h"
|
||||
#include "ianalyzertool.h"
|
||||
|
||||
#include "startremotedialog.h"
|
||||
|
||||
#include <coreplugin/coreconstants.h>
|
||||
#include <coreplugin/findplaceholder.h>
|
||||
#include <coreplugin/icore.h>
|
||||
@@ -848,6 +846,11 @@ void AnalyzerManager::stopTool()
|
||||
stopAction()->trigger();
|
||||
}
|
||||
|
||||
void AnalyzerManager::startLocalTool(IAnalyzerTool *tool, StartMode mode)
|
||||
{
|
||||
m_instance->d->startLocalTool(tool, mode);
|
||||
}
|
||||
|
||||
QAction *AnalyzerManager::stopAction()
|
||||
{
|
||||
return m_instance->d->m_stopAction;
|
||||
@@ -867,36 +870,6 @@ IAnalyzerTool *AnalyzerManager::toolFromId(const QByteArray &id)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void startRemoteTool(IAnalyzerTool *tool, StartMode mode)
|
||||
{
|
||||
StartRemoteDialog dlg;
|
||||
if (dlg.exec() != QDialog::Accepted)
|
||||
return;
|
||||
|
||||
AnalyzerStartParameters sp;
|
||||
sp.toolId = tool->id();
|
||||
sp.startMode = mode;
|
||||
sp.connParams = dlg.sshParams();
|
||||
sp.debuggee = dlg.executable();
|
||||
sp.debuggeeArgs = dlg.arguments();
|
||||
sp.displayName = dlg.executable();
|
||||
sp.workingDirectory = dlg.workingDirectory();
|
||||
|
||||
AnalyzerRunControl *rc = new AnalyzerRunControl(tool, sp, 0);
|
||||
QObject::connect(AnalyzerManager::stopAction(), SIGNAL(triggered()), rc, SLOT(stopIt()));
|
||||
|
||||
ProjectExplorer::ProjectExplorerPlugin::instance()->startRunControl(rc, tool->id());
|
||||
}
|
||||
|
||||
void AnalyzerManager::defaultStartTool(IAnalyzerTool *tool, StartMode mode)
|
||||
{
|
||||
if (mode == StartLocal)
|
||||
m_instance->d->startLocalTool(tool, mode);
|
||||
if (mode == StartRemote)
|
||||
startRemoteTool(tool, mode);
|
||||
// m_instance->d->startRemoteTool(tool, mode);
|
||||
}
|
||||
|
||||
} // namespace Analyzer
|
||||
|
||||
#include "analyzermanager.moc"
|
||||
|
||||
Reference in New Issue
Block a user