Commit 3824d901 authored by hjk's avatar hjk

Debugger: Remove deprecated use of Core::Id(QString)

Change-Id: I8193e4d43c198674469d8d374bc66b7970b90f0a
Reviewed-by: default avatarEike Ziller <eike.ziller@digia.com>
Reviewed-by: default avatarhjk <hjk121@nokiamail.com>
parent 07cab1ab
......@@ -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);
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment