Commit 1ff1b8db authored by Orgad Shaneh's avatar Orgad Shaneh Committed by hjk

Debugger: Remove unused values from DebuggerStartMode

Change-Id: I84ec3dea504e51bb925c925564aa9b5c84133fbf
Reviewed-by: default avatarhjk <hjk121@nokiamail.com>
parent bb497cec
...@@ -53,11 +53,8 @@ AttachCrashedExternal, \ ...@@ -53,11 +53,8 @@ AttachCrashedExternal, \
AttachCore, \ AttachCore, \
AttachToRemoteServer, \ AttachToRemoteServer, \
AttachToRemoteProcess, \ AttachToRemoteProcess, \
LoadRemoteCore, \
StartRemoteProcess, \ StartRemoteProcess, \
StartRemoteGdb, \ = range(0, 9)
StartRemoteEngine \
= range(0, 12)
# Known special formats. Keep in sync with DisplayFormat in watchhandler.h # Known special formats. Keep in sync with DisplayFormat in watchhandler.h
......
...@@ -292,14 +292,7 @@ int indexOfCommand(const QList<CommandPtrType> &l, int token) ...@@ -292,14 +292,7 @@ int indexOfCommand(const QList<CommandPtrType> &l, int token)
static inline bool validMode(DebuggerStartMode sm) static inline bool validMode(DebuggerStartMode sm)
{ {
switch (sm) { return sm != NoStartMode;
case NoStartMode:
case StartRemoteGdb:
return false;
default:
break;
}
return true;
} }
// Accessed by RunControlFactory // Accessed by RunControlFactory
......
...@@ -123,10 +123,7 @@ enum DebuggerStartMode ...@@ -123,10 +123,7 @@ enum DebuggerStartMode
AttachCore, // Attach to a core file AttachCore, // Attach to a core file
AttachToRemoteServer, // Attach to a running gdbserver AttachToRemoteServer, // Attach to a running gdbserver
AttachToRemoteProcess, // Attach to a running remote process AttachToRemoteProcess, // Attach to a running remote process
LoadRemoteCore, // Load a remote core file StartRemoteProcess // Start and attach to a remote process
StartRemoteProcess, // Start and attach to a remote process
StartRemoteGdb, // Start gdb itself remotely
StartRemoteEngine // Start ipc guest engine on other machine
}; };
enum DebuggerCloseMode enum DebuggerCloseMode
......
...@@ -867,7 +867,6 @@ public slots: ...@@ -867,7 +867,6 @@ public slots:
void continueOnAttach(Debugger::DebuggerState state); void continueOnAttach(Debugger::DebuggerState state);
void attachExternalApplication(ProjectExplorer::RunControl *rc); void attachExternalApplication(ProjectExplorer::RunControl *rc);
void attachToQmlPort(); void attachToQmlPort();
void startRemoteEngine();
void runScheduled(); void runScheduled();
void attachCore(); void attachCore();
...@@ -1812,29 +1811,6 @@ void DebuggerPluginPrivate::attachToQmlPort() ...@@ -1812,29 +1811,6 @@ void DebuggerPluginPrivate::attachToQmlPort()
DebuggerRunControlFactory::createAndScheduleRun(sp); DebuggerRunControlFactory::createAndScheduleRun(sp);
} }
void DebuggerPluginPrivate::startRemoteEngine()
{
DebuggerStartParameters sp;
StartRemoteEngineDialog dlg(ICore::mainWindow());
if (dlg.exec() != QDialog::Accepted)
return;
sp.connParams.host = dlg.host();
sp.connParams.userName = dlg.username();
sp.connParams.password = dlg.password();
sp.connParams.timeout = 5;
sp.connParams.authenticationType
= QSsh::SshConnectionParameters::AuthenticationTypeTryAllPasswordBasedMethods;
sp.connParams.port = 22;
sp.connParams.options = QSsh::SshIgnoreDefaultProxy;
sp.executable = dlg.inferiorPath();
sp.serverStartScript = dlg.enginePath();
sp.startMode = StartRemoteEngine;
DebuggerRunControlFactory::createAndScheduleRun(sp);
}
void DebuggerPluginPrivate::enableReverseDebuggingTriggered(const QVariant &value) void DebuggerPluginPrivate::enableReverseDebuggingTriggered(const QVariant &value)
{ {
QTC_ASSERT(m_reverseToolButton, return); QTC_ASSERT(m_reverseToolButton, return);
......
...@@ -1851,10 +1851,6 @@ QString GdbEngine::cleanupFullName(const QString &fileName) ...@@ -1851,10 +1851,6 @@ QString GdbEngine::cleanupFullName(const QString &fileName)
if (fi.isReadable()) if (fi.isReadable())
cleanFilePath = QDir::cleanPath(fi.absoluteFilePath()); cleanFilePath = QDir::cleanPath(fi.absoluteFilePath());
} }
if (startMode() == StartRemoteGdb) {
cleanFilePath.replace(0, startParameters().remoteMountPoint.length(),
startParameters().localMountDir);
}
if (!boolSetting(AutoEnrichParameters)) if (!boolSetting(AutoEnrichParameters))
return cleanFilePath; return cleanFilePath;
......
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