QtGui: replace 0 with \nullptr in documentation

Replace 0 with \nullptr in the documentation.
As a drive-by also replace some 0 with nullptr in the corresponding
code.

Change-Id: Ieffbfffa76e3018257b667a3e8ad6e3b88486cde
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
This commit is contained in:
Christian Ehrlicher 2019-01-27 17:49:29 +01:00
parent 2bfb89e133
commit ae44da62ef
11 changed files with 28 additions and 29 deletions

View File

@ -340,7 +340,7 @@ void QImageIOHandler::setDevice(QIODevice *device)
/*! /*!
Returns the device currently assigned to the QImageIOHandler. If Returns the device currently assigned to the QImageIOHandler. If
not device has been assigned, 0 is returned. not device has been assigned, \nullptr is returned.
*/ */
QIODevice *QImageIOHandler::device() const QIODevice *QImageIOHandler::device() const
{ {

View File

@ -756,13 +756,13 @@ void QImageReader::setDevice(QIODevice *device)
d->device = device; d->device = device;
d->deleteDevice = false; d->deleteDevice = false;
delete d->handler; delete d->handler;
d->handler = 0; d->handler = nullptr;
d->text.clear(); d->text.clear();
} }
/*! /*!
Returns the device currently assigned to QImageReader, or 0 if no Returns the device currently assigned to QImageReader, or \nullptr
device has been assigned. if no device has been assigned.
*/ */
QIODevice *QImageReader::device() const QIODevice *QImageReader::device() const
{ {

View File

@ -407,8 +407,8 @@ void QImageWriter::setDevice(QIODevice *device)
} }
/*! /*!
Returns the device currently assigned to QImageWriter, or 0 if no Returns the device currently assigned to QImageWriter, or \nullptr
device has been assigned. if no device has been assigned.
*/ */
QIODevice *QImageWriter::device() const QIODevice *QImageWriter::device() const
{ {

View File

@ -659,7 +659,7 @@ void QMovie::setDevice(QIODevice *device)
/*! /*!
Returns the device QMovie reads image data from. If no device has Returns the device QMovie reads image data from. If no device has
currently been assigned, 0 is returned. currently been assigned, \nullptr is returned.
\sa setDevice(), fileName() \sa setDevice(), fileName()
*/ */

View File

@ -1200,8 +1200,8 @@ QT_END_INCLUDE_NAMESPACE
\obsolete \obsolete
Returns a string that specifies the picture format of the file \a Returns a string that specifies the picture format of the file \a
fileName, or 0 if the file cannot be read or if the format is not fileName, or \nullptr if the file cannot be read or if the format
recognized. is not recognized.
\sa load(), save() \sa load(), save()
*/ */
@ -1543,7 +1543,7 @@ const QPicture &QPictureIO::picture() const { return d->pi; }
int QPictureIO::status() const { return d->iostat; } int QPictureIO::status() const { return d->iostat; }
/*! /*!
Returns the picture format string or 0 if no format has been Returns the picture format string or \nullptr if no format has been
explicitly set. explicitly set.
*/ */
const char *QPictureIO::format() const { return d->frmt; } const char *QPictureIO::format() const { return d->frmt; }

View File

@ -564,8 +564,8 @@ void QCursor::setShape(Qt::CursorShape shape)
} }
/*! /*!
Returns the cursor bitmap, or 0 if it is one of the standard Returns the cursor bitmap, or \nullptr if it is one of the
cursors. standard cursors.
*/ */
const QBitmap *QCursor::bitmap() const const QBitmap *QCursor::bitmap() const
{ {
@ -575,8 +575,8 @@ const QBitmap *QCursor::bitmap() const
} }
/*! /*!
Returns the cursor bitmap mask, or 0 if it is one of the standard Returns the cursor bitmap mask, or \nullptr if it is one of the
cursors. standard cursors.
*/ */
const QBitmap *QCursor::mask() const const QBitmap *QCursor::mask() const

View File

@ -414,15 +414,14 @@ int QOpenGLContextPrivate::maxTextureSize()
/*! /*!
Returns the last context which called makeCurrent in the current thread, Returns the last context which called makeCurrent in the current thread,
or 0, if no context is current. or \nullptr, if no context is current.
*/ */
QOpenGLContext* QOpenGLContext::currentContext() QOpenGLContext* QOpenGLContext::currentContext()
{ {
QGuiGLThreadContext *threadContext = qwindow_context_storage()->localData(); QGuiGLThreadContext *threadContext = qwindow_context_storage()->localData();
if (threadContext) { if (threadContext)
return threadContext->context; return threadContext->context;
} return nullptr;
return 0;
} }
/*! /*!

View File

@ -90,11 +90,11 @@ QWindow *QPlatformWindow::window() const
} }
/*! /*!
Returns the parent platform window (or 0 if orphan). Returns the parent platform window (or \nullptr if orphan).
*/ */
QPlatformWindow *QPlatformWindow::parent() const QPlatformWindow *QPlatformWindow::parent() const
{ {
return window()->parent() ? window()->parent()->handle() : 0; return window()->parent() ? window()->parent()->handle() : nullptr;
} }
/*! /*!

View File

@ -1521,7 +1521,7 @@ QPainter::~QPainter()
/*! /*!
Returns the paint device on which this painter is currently Returns the paint device on which this painter is currently
painting, or 0 if the painter is not active. painting, or \nullptr if the painter is not active.
\sa isActive() \sa isActive()
*/ */

View File

@ -206,8 +206,8 @@ void QTextDocumentWriter::setDevice (QIODevice *device)
} }
/*! /*!
Returns the device currently assigned, or 0 if no device has been Returns the device currently assigned, or \nullptr if no device
assigned. has been assigned.
*/ */
QIODevice *QTextDocumentWriter::device () const QIODevice *QTextDocumentWriter::device () const
{ {

View File

@ -704,8 +704,8 @@ QTextFrame::iterator &QTextFrame::iterator::operator=(const iterator &other) Q_D
#endif #endif
/*! /*!
Returns the current frame pointed to by the iterator, or 0 if the Returns the current frame pointed to by the iterator, or \nullptr
iterator currently points to a block. if the iterator currently points to a block.
\sa currentBlock() \sa currentBlock()
*/ */
@ -1291,12 +1291,12 @@ QVector<QTextLayout::FormatRange> QTextBlock::textFormats() const
} }
/*! /*!
Returns the text document this text block belongs to, or 0 if the Returns the text document this text block belongs to, or \nullptr
text block does not belong to any document. if the text block does not belong to any document.
*/ */
const QTextDocument *QTextBlock::document() const const QTextDocument *QTextBlock::document() const
{ {
return p ? p->document() : 0; return p ? p->document() : nullptr;
} }
/*! /*!
@ -1306,7 +1306,7 @@ const QTextDocument *QTextBlock::document() const
QTextList *QTextBlock::textList() const QTextList *QTextBlock::textList() const
{ {
if (!isValid()) if (!isValid())
return 0; return nullptr;
const QTextBlockFormat fmt = blockFormat(); const QTextBlockFormat fmt = blockFormat();
QTextObject *obj = p->document()->objectForFormat(fmt); QTextObject *obj = p->document()->objectForFormat(fmt);