feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

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

Browse Source 
Change-Id: I8193e4d43c198674469d8d374bc66b7970b90f0a
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
hjk
2013-03-19 12:44:33 +01:00
parent 07cab1ab75
commit 3824d90168
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/debugger/debuggermainwindow.cpp
View File

@@ -449,7 +449,7 @@ QDockWidget *DebuggerMainWindow::createDockWidget(const DebuggerLanguage &langua
QAction *toggleViewAction = dockWidget->toggleViewAction(); QAction *toggleViewAction = dockWidget->toggleViewAction();
Command *cmd = Core::ActionManager::registerAction(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); cmd->setAttribute(Command::CA_Hide);
d->m_menuCommandsToAdd.append(cmd); d->m_menuCommandsToAdd.append(cmd);

10
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -1453,7 +1453,7 @@ bool DebuggerPluginPrivate::parseArgument(QStringList::const_iterator &it,
sp.startMessage = tr("Attaching to core file %1.").arg(sp.coreFile); sp.startMessage = tr("Attaching to core file %1.").arg(sp.coreFile);
} }
else if (key == QLatin1String("kit")) { 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()); AttachCoreDialog dlg(mainWindow());
dlg.setKitId(Id(configValue(_("LastExternalKit")).toString())); dlg.setKitId(Id::fromSetting(configValue(_("LastExternalKit"))));
dlg.setLocalExecutableFile(configValue(_("LastExternalExecutableFile")).toString()); dlg.setLocalExecutableFile(configValue(_("LastExternalExecutableFile")).toString());
dlg.setLocalCoreFile(configValue(_("LastLocalCoreFile")).toString()); dlg.setLocalCoreFile(configValue(_("LastLocalCoreFile")).toString());
dlg.setRemoteCoreFile(configValue(_("LastRemoteCoreFile")).toString()); dlg.setRemoteCoreFile(configValue(_("LastRemoteCoreFile")).toString());
@@ -1631,7 +1631,7 @@ void DebuggerPluginPrivate::attachCore()
setConfigValue(_("LastExternalExecutableFile"), dlg.localExecutableFile()); setConfigValue(_("LastExternalExecutableFile"), dlg.localExecutableFile());
setConfigValue(_("LastLocalCoreFile"), dlg.localCoreFile()); setConfigValue(_("LastLocalCoreFile"), dlg.localCoreFile());
setConfigValue(_("LastRemoteCoreFile"), dlg.remoteCoreFile()); setConfigValue(_("LastRemoteCoreFile"), dlg.remoteCoreFile());
setConfigValue(_("LastExternalKit"), dlg.kit()->id().toString()); setConfigValue(_("LastExternalKit"), dlg.kit()->id().toSetting());
setConfigValue(_("LastExternalStartScript"), dlg.overrideStartScript()); setConfigValue(_("LastExternalStartScript"), dlg.overrideStartScript());
setConfigValue(_("LastForceLocalCoreFile"), dlg.forcesLocalCoreFile()); setConfigValue(_("LastForceLocalCoreFile"), dlg.forcesLocalCoreFile());
@@ -1767,9 +1767,9 @@ void DebuggerPluginPrivate::attachToQmlPort()
else else
dlg.setPort(sp.qmlServerPort); dlg.setPort(sp.qmlServerPort);
const QVariant kitId = configValue(_("LastProfile")); const Id kitId = Id::fromSetting(configValue(_("LastProfile")));
if (kitId.isValid()) if (kitId.isValid())
dlg.setKitId(Id(kitId.toString())); dlg.setKitId(kitId);
if (dlg.exec() != QDialog::Accepted) if (dlg.exec() != QDialog::Accepted)
return; return;