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

Use Id::fromString instead of the constructor.

Browse Source 
Change-Id: Ie18714ac2872a085e8c20d445472901cc9f6b6c5
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
This commit is contained in:
hjk
2013-01-16 14:18:35 +01:00
committed by Christian Kandeler
parent b7faf4d674
commit 028fc3dd8c
10 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/macros/macromanager.cpp
View File

@@ -155,14 +155,18 @@ void MacroManager::MacroManagerPrivate::initialize()
}
}
static Core::Id makeId(const QString &name)
{
return Core::Id::fromString(QLatin1String(Constants::PREFIX_MACRO) + name);
}
void MacroManager::MacroManagerPrivate::addMacro(Macro *macro)
{
// Add sortcut
Core::Context context(TextEditor::Constants::C_TEXTEDITOR);
QShortcut *shortcut = new QShortcut(Core::ICore::mainWindow());
shortcut->setWhatsThis(macro->description());
const Core::Id macroId(QLatin1String(Constants::PREFIX_MACRO) + macro->displayName());
Core::ActionManager::registerShortcut(shortcut, macroId, context);
Core::ActionManager::registerShortcut(shortcut, makeId(macro->displayName()), context);
connect(shortcut, SIGNAL(activated()), mapper, SLOT(map()));
mapper->setMapping(shortcut, macro->displayName());
@@ -175,7 +179,7 @@ void MacroManager::MacroManagerPrivate::removeMacro(const QString &name)
if (!macros.contains(name))
return;
// Remove shortcut
Core::ActionManager::unregisterShortcut(Core::Id(QLatin1String(Constants::PREFIX_MACRO) + name));
Core::ActionManager::unregisterShortcut(makeId(name));
// Remove macro from the map
Macro *macro = macros.take(name);
@@ -190,8 +194,7 @@ void MacroManager::MacroManagerPrivate::changeMacroDescription(Macro *macro, con
macro->save(macro->fileName(), Core::ICore::mainWindow());
// Change shortcut what's this
Core::Command *command = Core::ActionManager::command(
Core::Id(QLatin1String(Constants::PREFIX_MACRO)+macro->displayName()));
Core::Command *command = Core::ActionManager::command(makeId(macro->displayName()));
if (command && command->shortcut())
command->shortcut()->setWhatsThis(description);
}

2
src/plugins/macros/macrooptionswidget.cpp
View File

@@ -111,7 +111,7 @@ void MacroOptionsWidget::createTable()
macroItem->setData(0, WRITE_ROLE, it.value()->isWritable());
Core::Command *command =
Core::ActionManager::command(Core::Id(QLatin1String(Constants::PREFIX_MACRO)
Core::ActionManager::command(Core::Id::fromString(QLatin1String(Constants::PREFIX_MACRO)
+ it.value()->displayName()));
if (command && command->shortcut())
macroItem->setText(2, command->shortcut()->key().toString());