Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
}
delete qt_desktopWidget;
- qt_desktopWidget = 0;
+ qt_desktopWidget = Q_NULLPTR;
#ifndef QT_NO_CLIPBOARD
delete qt_clipboard;
- qt_clipboard = 0;
+ qt_clipboard = Q_NULLPTR;
#endif
#if defined(Q_WS_X11)
*/
QClipboard *QApplication::clipboard()
{
- if (qt_clipboard == 0) {
+ if (!qt_clipboard) {
if (Q_UNLIKELY(!qApp)) {
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;
}
// will have the same windowid (the root window id) as the
// qt_desktopWidget. We should not add the second desktop widget
// 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) {
mapper->remove(data.winid);
}