diff options
Diffstat (limited to 'src/plugins/debugger/gdb')
-rw-r--r-- | src/plugins/debugger/gdb/gdbengine.cpp | 6 | ||||
-rw-r--r-- | src/plugins/debugger/gdb/gdboptionspage.cpp | 2 | ||||
-rw-r--r-- | src/plugins/debugger/gdb/termgdbadapter.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index 8f41a77dd9..338ea71c33 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -4701,7 +4701,7 @@ void GdbEngine::loadInitScript() void GdbEngine::loadPythonDumpers() { const QByteArray dumperSourcePath = - Core::ICore::instance()->resourcePath().toLocal8Bit() + "/dumper/"; + Core::ICore::resourcePath().toLocal8Bit() + "/dumper/"; postCommand("python execfile('" + dumperSourcePath + "bridge.py')", ConsoleCommand|NonCriticalResponse); @@ -4791,9 +4791,9 @@ void GdbEngine::handleAdapterStartFailed(const QString &msg, if (!msg.isEmpty()) { const QString title = tr("Adapter start failed"); if (settingsIdHint.isEmpty()) { - Core::ICore::instance()->showWarningWithOptions(title, msg); + Core::ICore::showWarningWithOptions(title, msg); } else { - Core::ICore::instance()->showWarningWithOptions(title, msg, QString(), + Core::ICore::showWarningWithOptions(title, msg, QString(), _(Debugger::Constants::DEBUGGER_SETTINGS_CATEGORY), settingsIdHint); } } diff --git a/src/plugins/debugger/gdb/gdboptionspage.cpp b/src/plugins/debugger/gdb/gdboptionspage.cpp index 5dd3b83bfb..6609b50812 100644 --- a/src/plugins/debugger/gdb/gdboptionspage.cpp +++ b/src/plugins/debugger/gdb/gdboptionspage.cpp @@ -337,7 +337,7 @@ QWidget *GdbOptionsPage::createPage(QWidget *parent) void GdbOptionsPage::apply() { - m_group.apply(Core::ICore::instance()->settings()); + m_group.apply(Core::ICore::settings()); } void GdbOptionsPage::finish() diff --git a/src/plugins/debugger/gdb/termgdbadapter.cpp b/src/plugins/debugger/gdb/termgdbadapter.cpp index 4ad17d8048..74cd6c79c1 100644 --- a/src/plugins/debugger/gdb/termgdbadapter.cpp +++ b/src/plugins/debugger/gdb/termgdbadapter.cpp @@ -70,7 +70,7 @@ TermGdbAdapter::TermGdbAdapter(GdbEngine *engine) } #else m_stubProc.setMode(Utils::ConsoleProcess::Debug); - m_stubProc.setSettings(Core::ICore::instance()->settings()); + m_stubProc.setSettings(Core::ICore::settings()); #endif connect(&m_stubProc, SIGNAL(processError(QString)), SLOT(stubError(QString))); |