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

macros: Remove foreach / Q_FOREACH usage

Browse Source 
Task-number: QTCREATORBUG-27464
Change-Id: Id779aaf869406571288519083883ab57e5c29cec
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Artem Sokolovskii
2022-06-02 14:23:03 +02:00
parent 7020b0a44a
commit 30e60e9979
14 changed files with 33 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/macros/actionmacrohandler.cpp
View File

@@ -53,8 +53,8 @@ ActionMacroHandler::ActionMacroHandler()
this, &ActionMacroHandler::addCommand);
// Register all existing scriptable actions
QList<Command *> commands = ActionManager::commands();
foreach (Command *command, commands) {
const QList<Command *> commands = ActionManager::commands();
for (Command *command : commands) {
if (command->isScriptable())
registerCommand(command->id());
}

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

@@ -143,7 +143,7 @@ bool Macro::save(const QString &fileName, QWidget *parent)
QDataStream stream(saver.file());
stream << d->version;
stream << d->description;
foreach (const MacroEvent &event, d->events) {
for (const MacroEvent &event : qAsConst(d->events)) {
event.save(stream);
}
saver.setResult(&stream);

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

@@ -131,9 +131,9 @@ void MacroManagerPrivate::initialize()
const QDir dir(MacroManager::macrosDirectory());
QStringList filter;
filter << QLatin1String("*.") + QLatin1String(Constants::M_EXTENSION);
QStringList files = dir.entryList(filter, QDir::Files);
const QStringList files = dir.entryList(filter, QDir::Files);
foreach (const QString &name, files) {
for (const QString &name : files) {
QString fileName = dir.absolutePath() + QLatin1Char('/') + name;
auto macro = new Macro;
if (macro->loadHeader(fileName))
@@ -196,10 +196,11 @@ void MacroManagerPrivate::changeMacroDescription(Macro *macro, const QString &de
bool MacroManagerPrivate::executeMacro(Macro *macro)
{
bool error = !macro->load();
foreach (const MacroEvent &macroEvent, macro->events()) {
const QList<MacroEvent> macroEvents = macro->events();
for (const MacroEvent &macroEvent : macroEvents) {
if (error)
break;
foreach (IMacroHandler *handler, handlers) {
for (IMacroHandler *handler : qAsConst(handlers)) {
if (handler->canExecuteEvent(macroEvent)) {
if (!handler->executeEvent(macroEvent))
error = true;
@@ -255,8 +256,8 @@ MacroManager::MacroManager() :
MacroManager::~MacroManager()
{
// Cleanup macro
QStringList macroList = d->macros.keys();
foreach (const QString &name, macroList)
const QStringList macroList = d->macros.keys();
for (const QString &name : macroList)
d->removeMacro(name);
// Cleanup handlers
@@ -277,7 +278,7 @@ void MacroManager::startMacro()
Core::ActionManager::command(Constants::END_MACRO)->action()->setEnabled(true);
Core::ActionManager::command(Constants::EXECUTE_LAST_MACRO)->action()->setEnabled(false);
Core::ActionManager::command(Constants::SAVE_LAST_MACRO)->action()->setEnabled(false);
foreach (IMacroHandler *handler, d->handlers)
for (IMacroHandler *handler : qAsConst(d->handlers))
handler->startRecording(d->currentMacro);
const QString endShortcut = Core::ActionManager::command(Constants::END_MACRO)
@@ -302,7 +303,7 @@ void MacroManager::endMacro()
Core::ActionManager::command(Constants::END_MACRO)->action()->setEnabled(false);
Core::ActionManager::command(Constants::EXECUTE_LAST_MACRO)->action()->setEnabled(true);
Core::ActionManager::command(Constants::SAVE_LAST_MACRO)->action()->setEnabled(true);
foreach (IMacroHandler *handler, d->handlers)
for (IMacroHandler *handler : qAsConst(d->handlers))
handler->endRecordingMacro(d->currentMacro);
d->isRecording = false;

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

@@ -130,7 +130,7 @@ void MacroOptionsWidget::remove()
void MacroOptionsWidget::apply()
{
// Remove macro
foreach (const QString &name, m_macroToRemove) {
for (const QString &name : qAsConst(m_macroToRemove)) {
MacroManager::instance()->deleteMacro(name);
m_macroToChange.remove(name);
}