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

FakeVim: Modernize a bit

Browse Source 
Some ranged-for and const.

Change-Id: I6ff521393166aa4c61289de88e8c31320887b1b4
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2020-05-28 07:46:41 +02:00
parent 839e776012
commit cdfc62b287
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/fakevim/fakevimhandler.cpp
View File

@@ -1595,7 +1595,7 @@ public:
bool walk(const Inputs &inputs) bool walk(const Inputs &inputs)
{ {
foreach (const Input &input, inputs) { for (const Input &input : inputs) {
if (!walk(input)) if (!walk(input))
return false; return false;
} }
@@ -1633,7 +1633,7 @@ public:
void setInputs(const Inputs &key, const Inputs &inputs, bool unique = false) void setInputs(const Inputs &key, const Inputs &inputs, bool unique = false)
{ {
ModeMapping *current = &(*m_parent)[m_mode]; ModeMapping *current = &(*m_parent)[m_mode];
foreach (const Input &input, key) for (const Input &input : key)
current = &(*current)[input]; current = &(*current)[input];
if (!unique || current->value().isEmpty()) if (!unique || current->value().isEmpty())
current->setValue(inputs); current->setValue(inputs);
@@ -2855,7 +2855,7 @@ void FakeVimHandler::Private::prependMapping(const Inputs &inputs)
// FIXME: Implement Vim option maxmapdepth (default value is 1000). // FIXME: Implement Vim option maxmapdepth (default value is 1000).
if (g.mapDepth >= 1000) { if (g.mapDepth >= 1000) {
const int i = qMax(0, g.pendingInput.lastIndexOf(Input())); const int i = qMax(0, g.pendingInput.lastIndexOf(Input()));
QList<Input> inputs = g.pendingInput.mid(i); const QList<Input> inputs = g.pendingInput.mid(i);
clearPendingInput(); clearPendingInput();
g.pendingInput.append(inputs); g.pendingInput.append(inputs);
showMessage(MessageError, Tr::tr("Recursive mapping")); showMessage(MessageError, Tr::tr("Recursive mapping"));
@@ -5740,7 +5740,7 @@ bool FakeVimHandler::Private::handleExRegisterCommand(const ExCommand &cmd)
} }
QString info; QString info;
info += "--- Registers ---\n"; info += "--- Registers ---\n";
foreach (char reg, regs) { for (char reg : qAsConst(regs)) {
QString value = quoteUnprintable(registerContents(reg)); QString value = quoteUnprintable(registerContents(reg));
info += QString("\"%1 %2\n").arg(reg).arg(value); info += QString("\"%1 %2\n").arg(reg).arg(value);
} }
@@ -6689,7 +6689,7 @@ void FakeVimHandler::Private::setupCharClass()
m_charClass[i] = c.isSpace() ? 0 : 1; m_charClass[i] = c.isSpace() ? 0 : 1;
} }
const QString conf = config(ConfigIsKeyword).toString(); const QString conf = config(ConfigIsKeyword).toString();
foreach (const QString &part, conf.split(',')) { for (const QString &part : conf.split(',')) {
if (part.contains('-')) { if (part.contains('-')) {
const int from = someInt(part.section('-', 0, 0)); const int from = someInt(part.section('-', 0, 0));
const int to = someInt(part.section('-', 1, 1)); const int to = someInt(part.section('-', 1, 1));
@@ -7182,7 +7182,7 @@ void FakeVimHandler::Private::insertText(QTextCursor &tc, const QString &text)
passEventToEditor(event, tc); passEventToEditor(event, tc);
} }
foreach (QChar c, text) { for (QChar c : text) {
QKeyEvent event(QEvent::KeyPress, -1, Qt::NoModifier, QString(c)); QKeyEvent event(QEvent::KeyPress, -1, Qt::NoModifier, QString(c));
passEventToEditor(event, tc); passEventToEditor(event, tc);
} }
@@ -8134,9 +8134,9 @@ void FakeVimHandler::Private::replay(const QString &command, int repeat)
//qDebug() << "REPLAY: " << quoteUnprintable(command); //qDebug() << "REPLAY: " << quoteUnprintable(command);
clearCurrentMode(); clearCurrentMode();
Inputs inputs(command); const Inputs inputs(command);
for (int i = 0; i < repeat; ++i) { for (int i = 0; i < repeat; ++i) {
foreach (const Input &in, inputs) { for (const Input &in : inputs) {
if (handleDefaultKey(in) != EventHandled) if (handleDefaultKey(in) != EventHandled)
return; return;
} }
@@ -8765,9 +8765,9 @@ void FakeVimHandler::handleReplay(const QString &keys)
void FakeVimHandler::handleInput(const QString &keys) void FakeVimHandler::handleInput(const QString &keys)
{ {
Inputs inputs(keys); const Inputs inputs(keys);
d->enterFakeVim(); d->enterFakeVim();
foreach (const Input &input, inputs) for (const Input &input : inputs)
d->handleKey(input); d->handleKey(input);
d->leaveFakeVim(); d->leaveFakeVim();
} }

4
src/plugins/fakevim/fakevimplugin.cpp
View File

@@ -1409,7 +1409,7 @@ void FakeVimPluginPrivate::moveSomewhere(FakeVimHandler *handler, DistFunction f
while (repeat < 0 || repeat-- > 0) { while (repeat < 0 || repeat-- > 0) {
editors.removeOne(currentEditor); editors.removeOne(currentEditor);
int bestValue = -1; int bestValue = -1;
foreach (IEditor *editor, editors) { for (IEditor *editor : qAsConst(editors)) {
QWidget *w = editor->widget(); QWidget *w = editor->widget();
QRect editorRect(w->mapToGlobal(w->geometry().topLeft()), QRect editorRect(w->mapToGlobal(w->geometry().topLeft()),
w->mapToGlobal(w->geometry().bottomRight())); w->mapToGlobal(w->geometry().bottomRight()));
@@ -1441,7 +1441,7 @@ void FakeVimPluginPrivate::keepOnlyWindow()
QList<IEditor *> editors = EditorManager::visibleEditors(); QList<IEditor *> editors = EditorManager::visibleEditors();
editors.removeOne(currentEditor); editors.removeOne(currentEditor);
foreach (IEditor *editor, editors) { for (IEditor *editor : qAsConst(editors)) {
EditorManager::activateEditor(editor); EditorManager::activateEditor(editor);
triggerAction(Core::Constants::REMOVE_CURRENT_SPLIT); triggerAction(Core::Constants::REMOVE_CURRENT_SPLIT);
} }