diff options
| author | hjk <hjk@qt.io> | 2017-09-08 08:53:15 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2017-09-12 07:01:59 +0000 |
| commit | f84d44e4e886bedbb80dcde1d8ca021d3c026eb3 (patch) | |
| tree | b2e02639bcfbc0851023b5caf7988911441d1034 /src/plugins/debugger/loadcoredialog.cpp | |
| parent | 991663d13b2e3460d64a9aefcadc1be2a1812680 (diff) | |
| download | qt-creator-f84d44e4e886bedbb80dcde1d8ca021d3c026eb3.tar.gz | |
Debugger: Merge *Adapter classes into GdbEngine
The main reason for having the adapters (complex target specific state
handling) is mostly gone now, leaving us mainly with the drawbacks
of the solution: An additional indirection, and using a hierarchy
for code sharing. So drop that, and use if/else chains instead
of virtual functions now, and start simplifying the result.
Change-Id: Idcf3a28da103c01cfa80cf9bab8ef51fe879b6d7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/debugger/loadcoredialog.cpp')
| -rw-r--r-- | src/plugins/debugger/loadcoredialog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/debugger/loadcoredialog.cpp b/src/plugins/debugger/loadcoredialog.cpp index d0e8d87636..cb0fb49cee 100644 --- a/src/plugins/debugger/loadcoredialog.cpp +++ b/src/plugins/debugger/loadcoredialog.cpp @@ -28,7 +28,7 @@ #include "debuggerstartparameters.h" #include "debuggerdialogs.h" #include "debuggerkitinformation.h" -#include "gdb/coregdbadapter.h" +#include "gdb/gdbengine.h" #include <projectexplorer/kitinformation.h> #include <projectexplorer/projectexplorerconstants.h> @@ -364,7 +364,7 @@ void AttachCoreDialog::coreFileChanged(const QString &core) Kit *k = d->kitChooser->currentKit(); QTC_ASSERT(k, return); StandardRunnable debugger = DebuggerKitInformation::runnable(k); - GdbCoreEngine::CoreInfo cinfo = GdbCoreEngine::readExecutableNameFromCore(debugger, core); + CoreInfo cinfo = CoreInfo::readExecutableNameFromCore(debugger, core); if (!cinfo.foundExecutableName.isEmpty()) d->localExecFileName->setFileName(FileName::fromString(cinfo.foundExecutableName)); else if (!d->localExecFileName->isValid() && !cinfo.rawStringFromCore.isEmpty()) |