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

Core: Fix some 0 as nullptr warnings

Browse Source 
Change-Id: Ie8018b72c68bd8e14021bb63140c9e4c0a6deb94
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-12-12 16:21:39 +01:00
parent 6e0d44b0ff
commit 3690d15965
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/coreplugin/actionmanager/actionmanager.cpp
View File

@@ -335,7 +335,7 @@ QList<Command *> ActionManager::commands()
*/ */
void ActionManager::unregisterAction(QAction *action, Id id) void ActionManager::unregisterAction(QAction *action, Id id)
{ {
Action *a = d->m_idCmdMap.value(id, 0); Action *a = d->m_idCmdMap.value(id, nullptr);
if (!a) { if (!a) {
qWarning() << "unregisterAction: id" << id.name() qWarning() << "unregisterAction: id" << id.name()
<< "is registered with a different command type."; << "is registered with a different command type.";
@@ -468,7 +468,7 @@ void ActionManagerPrivate::showShortcutPopup(const QString &shortcut)
Action *ActionManagerPrivate::overridableAction(Id id) Action *ActionManagerPrivate::overridableAction(Id id)
{ {
Action *a = m_idCmdMap.value(id, 0); Action *a = m_idCmdMap.value(id, nullptr);
if (!a) { if (!a) {
a = new Action(id); a = new Action(id);
m_idCmdMap.insert(id, a); m_idCmdMap.insert(id, a);