diff --git a/src/plugins/coreplugin/icore.cpp b/src/plugins/coreplugin/icore.cpp index a9a1de9a0ff..3029f83a629 100644 --- a/src/plugins/coreplugin/icore.cpp +++ b/src/plugins/coreplugin/icore.cpp @@ -400,7 +400,7 @@ bool ICore::showOptionsDialog(const QString &group, const QString &page, QWidget bool ICore::showWarningWithOptions(const QString &title, const QString &text, const QString &details, - const QString &settingsCategory, + Id settingsCategory, const QString &settingsId, QWidget *parent) { diff --git a/src/plugins/coreplugin/icore.h b/src/plugins/coreplugin/icore.h index 473698753f1..99d4b338396 100644 --- a/src/plugins/coreplugin/icore.h +++ b/src/plugins/coreplugin/icore.h @@ -31,6 +31,7 @@ #define ICORE_H #include "core_global.h" +#include "id.h" #include #include @@ -87,7 +88,7 @@ public: static bool showWarningWithOptions(const QString &title, const QString &text, const QString &details = QString(), - const QString &settingsCategory = QString(), + Id settingsCategory = Id(), const QString &settingsId = QString(), QWidget *parent = 0); diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp index 8eba27071c6..1e9814721ea 100644 --- a/src/plugins/coreplugin/mainwindow.cpp +++ b/src/plugins/coreplugin/mainwindow.cpp @@ -1348,7 +1348,7 @@ void MainWindow::setFullScreen(bool on) bool MainWindow::showWarningWithOptions(const QString &title, const QString &text, const QString &details, - const QString &settingsCategory, + Id settingsCategory, const QString &settingsId, QWidget *parent) { @@ -1359,11 +1359,11 @@ bool MainWindow::showWarningWithOptions(const QString &title, if (!details.isEmpty()) msgBox.setDetailedText(details); QAbstractButton *settingsButton = 0; - if (!settingsId.isEmpty() || !settingsCategory.isEmpty()) + if (!settingsId.isEmpty() || settingsCategory.isValid()) settingsButton = msgBox.addButton(tr("Settings..."), QMessageBox::AcceptRole); msgBox.exec(); if (settingsButton && msgBox.clickedButton() == settingsButton) { - return showOptionsDialog(settingsCategory, settingsId); + return showOptionsDialog(settingsCategory.toString(), settingsId); } return false; } diff --git a/src/plugins/coreplugin/mainwindow.h b/src/plugins/coreplugin/mainwindow.h index d87303e627c..b895fb39c4a 100644 --- a/src/plugins/coreplugin/mainwindow.h +++ b/src/plugins/coreplugin/mainwindow.h @@ -144,7 +144,7 @@ public slots: bool showWarningWithOptions(const QString &title, const QString &text, const QString &details = QString(), - const QString &settingsCategory = QString(), + Id settingsCategory = Id(), const QString &settingsId = QString(), QWidget *parent = 0); diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index fb12b6fda45..1f46d4009ec 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -4991,7 +4991,7 @@ void GdbEngine::handleAdapterStartFailed(const QString &msg, Core::ICore::showWarningWithOptions(title, msg); } else { Core::ICore::showWarningWithOptions(title, msg, QString(), - _(Debugger::Constants::DEBUGGER_SETTINGS_CATEGORY), settingsIdHint); + Constants::DEBUGGER_SETTINGS_CATEGORY, settingsIdHint); } } notifyEngineSetupFailed();