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

Macros: Compile with QT_NO_CAST_FROM_ASCII

Browse Source 
Change-Id: Idd493b3e6e6b9ea2a33aea77d338d690d14d9b47
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
Orgad Shaneh
2012-11-26 20:55:11 +02:00
committed by Friedemann Kleint
parent d74784fab6
commit 9be874ba25
6 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -142,11 +142,11 @@ void MacroManager::MacroManagerPrivate::initialize()
macros.clear();
QDir dir(q->macrosDirectory());
QStringList filter;
filter << QString("*.")+Constants::M_EXTENSION;
filter << QLatin1String("*.") + QLatin1String(Constants::M_EXTENSION);
QStringList files = dir.entryList(filter, QDir::Files);
foreach (const QString &name, files) {
QString fileName = dir.absolutePath() + '/' + name;
QString fileName = dir.absolutePath() + QLatin1Char('/') + name;
Macro *macro = new Macro;
if (macro->loadHeader(fileName))
addMacro(macro);
@@ -175,7 +175,7 @@ void MacroManager::MacroManagerPrivate::removeMacro(const QString &name)
if (!macros.contains(name))
return;
// Remove shortcut
Core::ActionManager::unregisterShortcut(Core::Id(Constants::PREFIX_MACRO+name));
Core::ActionManager::unregisterShortcut(Core::Id(QLatin1String(Constants::PREFIX_MACRO) + name));
// Remove macro from the map
Macro *macro = macros.take(name);
@@ -190,7 +190,8 @@ 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(Constants::PREFIX_MACRO+macro->displayName()));
Core::Command *command = Core::ActionManager::command(
Core::Id(QLatin1String(Constants::PREFIX_MACRO)+macro->displayName()));
if (command && command->shortcut())
command->shortcut()->setWhatsThis(description);
}
@@ -233,8 +234,8 @@ void MacroManager::MacroManagerPrivate::showSaveDialog()
return;
// Save in the resource path
QString fileName = q->macrosDirectory() + '/' + dialog.name()
+ '.' + Constants::M_EXTENSION;
QString fileName = q->macrosDirectory() + QLatin1Char('/') + dialog.name()
+ QLatin1Char('.') + QLatin1String(Constants::M_EXTENSION);
currentMacro->setDescription(dialog.description());
currentMacro->save(fileName, mainWindow);
addMacro(currentMacro);