Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-25 11:22:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

replace 0 with Q_NULLPTR where applicable

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2020-03-26 23:03:50 +00:00
parent f706599f2e
commit 57f446b21b
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gui/kernel/qapplication.cpp
View file

@ -812,11 +812,11 @@ QApplication::~QApplication()
} }
delete qt_desktopWidget; delete qt_desktopWidget;
qt_desktopWidget = 0; qt_desktopWidget = Q_NULLPTR;
#ifndef QT_NO_CLIPBOARD #ifndef QT_NO_CLIPBOARD
delete qt_clipboard; delete qt_clipboard;
qt_clipboard = 0; qt_clipboard = Q_NULLPTR;
#endif #endif
#if defined(Q_WS_X11) #if defined(Q_WS_X11)
@ -2644,12 +2644,12 @@ QDesktopWidget *QApplication::desktop()
*/ */
QClipboard *QApplication::clipboard() QClipboard *QApplication::clipboard()
{ {
if (qt_clipboard == 0) { if (!qt_clipboard) {
if (Q_UNLIKELY(!qApp)) { if (Q_UNLIKELY(!qApp)) {
qWarning("QApplication: Must construct a QApplication before accessing a QClipboard"); qWarning("QApplication: Must construct a QApplication before accessing a QClipboard");
return 0; return Q_NULLPTR;
} }
qt_clipboard = new QClipboard(0); qt_clipboard = new QClipboard(Q_NULLPTR);
} }
return qt_clipboard; return qt_clipboard;
} }

2
src/gui/kernel/qwidget.cpp
View file

@ -1286,7 +1286,7 @@ void QWidgetPrivate::setWinId(WId id) // set widget identifier
// will have the same windowid (the root window id) as the // will have the same windowid (the root window id) as the
// qt_desktopWidget. We should not add the second desktop widget // qt_desktopWidget. We should not add the second desktop widget
// to the mapper. // to the mapper.
bool userDesktopWidget = qt_desktopWidget != 0 && qt_desktopWidget != q && q->windowType() == Qt::Desktop; bool userDesktopWidget = (qt_desktopWidget && qt_desktopWidget != q && q->windowType() == Qt::Desktop);
if (mapper && data.winid && !userDesktopWidget) { if (mapper && data.winid && !userDesktopWidget) {
mapper->remove(data.winid); mapper->remove(data.winid);
} }