diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2014-10-14 19:08:58 +0300 |
---|---|---|
committer | hjk <hjk121@nokiamail.com> | 2014-10-14 18:19:38 +0200 |
commit | 1ff1b8dbfdefba6a64d58692aacce9a90e44d665 (patch) | |
tree | fe495b837c2200e4e09c126f2c67227a28fbaba4 /src/plugins/debugger | |
parent | bb497cece25ea7e98569603a91b4517b2edc6852 (diff) | |
download | qt-creator-1ff1b8dbfdefba6a64d58692aacce9a90e44d665.tar.gz |
Debugger: Remove unused values from DebuggerStartMode
Change-Id: I84ec3dea504e51bb925c925564aa9b5c84133fbf
Reviewed-by: hjk <hjk121@nokiamail.com>
Diffstat (limited to 'src/plugins/debugger')
-rw-r--r-- | src/plugins/debugger/cdb/cdbengine.cpp | 9 | ||||
-rw-r--r-- | src/plugins/debugger/debuggerconstants.h | 5 | ||||
-rw-r--r-- | src/plugins/debugger/debuggerplugin.cpp | 24 | ||||
-rw-r--r-- | src/plugins/debugger/gdb/gdbengine.cpp | 4 |
4 files changed, 2 insertions, 40 deletions
diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp index ea3862a42c..51585d35b6 100644 --- a/src/plugins/debugger/cdb/cdbengine.cpp +++ b/src/plugins/debugger/cdb/cdbengine.cpp @@ -292,14 +292,7 @@ int indexOfCommand(const QList<CommandPtrType> &l, int token) static inline bool validMode(DebuggerStartMode sm) { - switch (sm) { - case NoStartMode: - case StartRemoteGdb: - return false; - default: - break; - } - return true; + return sm != NoStartMode; } // Accessed by RunControlFactory diff --git a/src/plugins/debugger/debuggerconstants.h b/src/plugins/debugger/debuggerconstants.h index a7b422b7bc..11c0389a7a 100644 --- a/src/plugins/debugger/debuggerconstants.h +++ b/src/plugins/debugger/debuggerconstants.h @@ -123,10 +123,7 @@ enum DebuggerStartMode AttachCore, // Attach to a core file AttachToRemoteServer, // Attach to a running gdbserver AttachToRemoteProcess, // Attach to a running remote process - LoadRemoteCore, // Load a remote core file - StartRemoteProcess, // Start and attach to a remote process - StartRemoteGdb, // Start gdb itself remotely - StartRemoteEngine // Start ipc guest engine on other machine + StartRemoteProcess // Start and attach to a remote process }; enum DebuggerCloseMode diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 6e40f64afa..4094e2f76b 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -867,7 +867,6 @@ public slots: void continueOnAttach(Debugger::DebuggerState state); void attachExternalApplication(ProjectExplorer::RunControl *rc); void attachToQmlPort(); - void startRemoteEngine(); void runScheduled(); void attachCore(); @@ -1812,29 +1811,6 @@ void DebuggerPluginPrivate::attachToQmlPort() 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) { QTC_ASSERT(m_reverseToolButton, return); diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index e7a4293128..176c35d876 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -1851,10 +1851,6 @@ QString GdbEngine::cleanupFullName(const QString &fileName) if (fi.isReadable()) cleanFilePath = QDir::cleanPath(fi.absoluteFilePath()); } - if (startMode() == StartRemoteGdb) { - cleanFilePath.replace(0, startParameters().remoteMountPoint.length(), - startParameters().localMountDir); - } if (!boolSetting(AutoEnrichParameters)) return cleanFilePath; |