diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2018-09-21 01:30:02 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2018-09-21 05:28:12 +0000 |
| commit | 9364e4b8ecbed6a555ba29d68678490d088c4c8d (patch) | |
| tree | 8b5d8309a663af8499102e17ad91194bed6f6cc9 | |
| parent | 12e253df9d5afee8d1cf56b4932917d0eb5d1f15 (diff) | |
Core: Modernize (minor)
Replace 2 loops with range loops, and use nullptr.
Change-Id: I9f8920bb978ed218c5ec9ca01105652ebb51d842
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| -rw-r--r-- | src/plugins/coreplugin/actionmanager/command.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/coreplugin/mainwindow.cpp | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/plugins/coreplugin/actionmanager/command.cpp b/src/plugins/coreplugin/actionmanager/command.cpp index 4d9715f8b82..c74dbedb103 100644 --- a/src/plugins/coreplugin/actionmanager/command.cpp +++ b/src/plugins/coreplugin/actionmanager/command.cpp @@ -313,8 +313,7 @@ void Action::addOverrideAction(QAction *action, const Context &context, bool scr if (context.isEmpty()) { m_contextActionMap.insert(Constants::C_GLOBAL, action); } else { - for (int i = 0; i < context.size(); ++i) { - Id id = context.at(i); + for (const Id &id : context) { if (m_contextActionMap.contains(id)) qWarning("%s", qPrintable(msgActionWarning(action, id, m_contextActionMap.value(id, nullptr)))); m_contextActionMap.insert(id, action); diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp index 6b86a9ca223..94bc49a7e92 100644 --- a/src/plugins/coreplugin/mainwindow.cpp +++ b/src/plugins/coreplugin/mainwindow.cpp @@ -355,7 +355,7 @@ void MainWindow::openDroppedFiles(const QList<DropSupport::FileSpec> &files) IContext *MainWindow::currentContextObject() const { - return m_activeContext.isEmpty() ? 0 : m_activeContext.first(); + return m_activeContext.isEmpty() ? nullptr : m_activeContext.first(); } QStatusBar *MainWindow::statusBar() const @@ -1086,8 +1086,7 @@ void MainWindow::updateContext() contexts.add(m_lowPrioAdditionalContexts); Context uniquecontexts; - for (int i = 0; i < contexts.size(); ++i) { - const Id id = contexts.at(i); + for (const Id &id : qAsConst(contexts)) { if (!uniquecontexts.contains(id)) uniquecontexts.add(id); } |