Commit a89643a8 authored by hjk's avatar hjk

debugger: more runconfig refactoring

parent dbdecb2f
......@@ -32,8 +32,7 @@
#include "debugger_global.h"
#include "debuggerconstants.h"
#include <coreplugin/ssh/sshconnection.h>
#include "debuggerrunner.h"
#include <QtCore/QObject>
#include <QtCore/QSharedPointer>
......@@ -102,42 +101,6 @@ class TrkGdbAdapter;
class BreakpointMarker;
} // namespace Internal
class DEBUGGER_EXPORT DebuggerStartParameters
{
public:
DebuggerStartParameters();
void clear();
QString executable;
QString displayName;
QString coreFile;
QStringList processArgs;
QStringList environment;
QString workingDirectory;
qint64 attachPID;
bool useTerminal;
QString crashParameter; // for AttachCrashedExternal
// for remote debugging
QString remoteChannel;
QString remoteArchitecture;
QString symbolFileName;
QString serverStartScript;
QString sysRoot;
QString debuggerCommand;
int toolChainType;
QByteArray remoteDumperLib;
QString qtInstallPath;
QString dumperLibrary;
QStringList dumperLibraryLocations;
Core::SshServerInfo sshserver;
DebuggerStartMode startMode;
};
typedef QSharedPointer<DebuggerStartParameters> DebuggerStartParametersPtr;
DEBUGGER_EXPORT QDebug operator<<(QDebug str, const DebuggerStartParameters &);
// Flags for initialization
enum DebuggerEngineTypeFlags
{
......
......@@ -28,6 +28,7 @@
**************************************************************************/
#include "debuggerrunner.h"
#include "debuggermanager.h"
#include <projectexplorer/debugginghelper.h>
#include <projectexplorer/environment.h>
......@@ -183,7 +184,7 @@ void DebuggerRunControl::start()
QString errorMessage;
QString settingsCategory;
QString settingsPage;
if (m_manager->checkDebugConfiguration(startParameters()->toolChainType, &errorMessage,
if (m_manager->checkDebugConfiguration(m_startParameters->toolChainType, &errorMessage,
&settingsCategory, &settingsPage)) {
m_manager->startNewDebugger(m_startParameters);
emit started();
......
......@@ -30,15 +30,58 @@
#ifndef DEBUGGERRUNNER_H
#define DEBUGGERRUNNER_H
#include "debuggermanager.h"
#include "debugger_global.h"
#include "debuggerconstants.h"
#include <coreplugin/ssh/sshconnection.h>
#include <projectexplorer/runconfiguration.h>
#include <QtCore/QStringList>
namespace ProjectExplorer {
class Environment;
}
namespace Debugger {
class DebuggerManager;
class DEBUGGER_EXPORT DebuggerStartParameters
{
public:
DebuggerStartParameters();
void clear();
QString executable;
QString displayName;
QString coreFile;
QStringList processArgs;
QStringList environment;
QString workingDirectory;
qint64 attachPID;
bool useTerminal;
QString crashParameter; // for AttachCrashedExternal
// for remote debugging
QString remoteChannel;
QString remoteArchitecture;
QString symbolFileName;
QString serverStartScript;
QString sysRoot;
QString debuggerCommand;
int toolChainType;
QByteArray remoteDumperLib;
QString qtInstallPath;
QString dumperLibrary;
QStringList dumperLibraryLocations;
Core::SshServerInfo sshserver;
DebuggerStartMode startMode;
};
typedef QSharedPointer<DebuggerStartParameters> DebuggerStartParametersPtr;
//DEBUGGER_EXPORT QDebug operator<<(QDebug str, const DebuggerStartParameters &);
namespace Internal {
class DEBUGGER_EXPORT DebuggerRunControlFactory
......@@ -84,7 +127,6 @@ public:
QString displayName() const;
Q_SLOT void debuggingFinished();
DebuggerStartParametersPtr startParameters() { return m_startParameters; }
signals:
void stopRequested();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment