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

Core: Modernize (minor)

Browse Source 
Replace 2 loops with range loops, and use nullptr.

Change-Id: I9f8920bb978ed218c5ec9ca01105652ebb51d842
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Orgad Shaneh
2018-09-21 01:30:02 +03:00
committed by Orgad Shaneh
parent 12e253df9d
commit 9364e4b8ec
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/coreplugin/actionmanager/command.cpp
View File

@@ -313,8 +313,7 @@ void Action::addOverrideAction(QAction *action, const Context &context, bool scr
if (context.isEmpty()) { if (context.isEmpty()) {
m_contextActionMap.insert(Constants::C_GLOBAL, action); m_contextActionMap.insert(Constants::C_GLOBAL, action);
} else { } else {
for (int i = 0; i < context.size(); ++i) { for (const Id &id : context) {
Id id = context.at(i);
if (m_contextActionMap.contains(id)) if (m_contextActionMap.contains(id))
qWarning("%s", qPrintable(msgActionWarning(action, id, m_contextActionMap.value(id, nullptr)))); qWarning("%s", qPrintable(msgActionWarning(action, id, m_contextActionMap.value(id, nullptr))));
m_contextActionMap.insert(id, action); m_contextActionMap.insert(id, action);

5
src/plugins/coreplugin/mainwindow.cpp
View File

@@ -355,7 +355,7 @@ void MainWindow::openDroppedFiles(const QList<DropSupport::FileSpec> &files)
IContext *MainWindow::currentContextObject() const IContext *MainWindow::currentContextObject() const
{ {
return m_activeContext.isEmpty() ? 0 : m_activeContext.first(); return m_activeContext.isEmpty() ? nullptr : m_activeContext.first();
} }
QStatusBar *MainWindow::statusBar() const QStatusBar *MainWindow::statusBar() const
@@ -1086,8 +1086,7 @@ void MainWindow::updateContext()
contexts.add(m_lowPrioAdditionalContexts); contexts.add(m_lowPrioAdditionalContexts);
Context uniquecontexts; Context uniquecontexts;
for (int i = 0; i < contexts.size(); ++i) { for (const Id &id : qAsConst(contexts)) {
const Id id = contexts.at(i);
if (!uniquecontexts.contains(id)) if (!uniquecontexts.contains(id))
uniquecontexts.add(id); uniquecontexts.add(id);
} }