From 3824d901685b3013e7074ecac4ad16638a8f40e9 Mon Sep 17 00:00:00 2001
From: hjk <hjk121@nokiamail.com>
Date: Tue, 19 Mar 2013 12:44:33 +0100
Subject: [PATCH] Debugger: Remove deprecated use of Core::Id(QString)
Change-Id: I8193e4d43c198674469d8d374bc66b7970b90f0a
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
---
src/plugins/debugger/debuggermainwindow.cpp | 2 +-
src/plugins/debugger/debuggerplugin.cpp | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/plugins/debugger/debuggermainwindow.cpp b/src/plugins/debugger/debuggermainwindow.cpp
index 1b153dfa0a8..ad40e0e3277 100644
--- a/src/plugins/debugger/debuggermainwindow.cpp
+++ b/src/plugins/debugger/debuggermainwindow.cpp
@@ -449,7 +449,7 @@ QDockWidget *DebuggerMainWindow::createDockWidget(const DebuggerLanguage &langua
QAction *toggleViewAction = dockWidget->toggleViewAction();
Command *cmd = Core::ActionManager::registerAction(toggleViewAction,
- Core::Id(QLatin1String("Debugger.") + widget->objectName()), globalContext);
+ Core::Id("Debugger.").withSuffix(widget->objectName()), globalContext);
cmd->setAttribute(Command::CA_Hide);
d->m_menuCommandsToAdd.append(cmd);
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 479d0f38b78..243716343b1 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -1453,7 +1453,7 @@ bool DebuggerPluginPrivate::parseArgument(QStringList::const_iterator &it,
sp.startMessage = tr("Attaching to core file %1.").arg(sp.coreFile);
}
else if (key == QLatin1String("kit")) {
- kit = KitManager::instance()->find(Id(val));
+ kit = KitManager::instance()->find(Id::fromString(val));
}
}
}
@@ -1618,7 +1618,7 @@ void DebuggerPluginPrivate::attachCore()
{
AttachCoreDialog dlg(mainWindow());
- dlg.setKitId(Id(configValue(_("LastExternalKit")).toString()));
+ dlg.setKitId(Id::fromSetting(configValue(_("LastExternalKit"))));
dlg.setLocalExecutableFile(configValue(_("LastExternalExecutableFile")).toString());
dlg.setLocalCoreFile(configValue(_("LastLocalCoreFile")).toString());
dlg.setRemoteCoreFile(configValue(_("LastRemoteCoreFile")).toString());
@@ -1631,7 +1631,7 @@ void DebuggerPluginPrivate::attachCore()
setConfigValue(_("LastExternalExecutableFile"), dlg.localExecutableFile());
setConfigValue(_("LastLocalCoreFile"), dlg.localCoreFile());
setConfigValue(_("LastRemoteCoreFile"), dlg.remoteCoreFile());
- setConfigValue(_("LastExternalKit"), dlg.kit()->id().toString());
+ setConfigValue(_("LastExternalKit"), dlg.kit()->id().toSetting());
setConfigValue(_("LastExternalStartScript"), dlg.overrideStartScript());
setConfigValue(_("LastForceLocalCoreFile"), dlg.forcesLocalCoreFile());
@@ -1767,9 +1767,9 @@ void DebuggerPluginPrivate::attachToQmlPort()
else
dlg.setPort(sp.qmlServerPort);
- const QVariant kitId = configValue(_("LastProfile"));
+ const Id kitId = Id::fromSetting(configValue(_("LastProfile")));
if (kitId.isValid())
- dlg.setKitId(Id(kitId.toString()));
+ dlg.setKitId(kitId);
if (dlg.exec() != QDialog::Accepted)
return;
--
GitLab