diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/access/qabstractnetworkcache.cpp | 4 | ||||
| -rw-r--r-- | src/opengl/qgl.cpp | 6 | ||||
| -rw-r--r-- | src/sql/models/qsqlrelationaltablemodel.cpp | 10 | ||||
| -rw-r--r-- | src/xml/sax/qxml.cpp | 24 |
4 files changed, 22 insertions, 22 deletions
diff --git a/src/network/access/qabstractnetworkcache.cpp b/src/network/access/qabstractnetworkcache.cpp index 1008b8e7f0..0b94dff61e 100644 --- a/src/network/access/qabstractnetworkcache.cpp +++ b/src/network/access/qabstractnetworkcache.cpp @@ -475,7 +475,7 @@ QAbstractNetworkCache::~QAbstractNetworkCache() the QIODevice when done with it. If there is no cache for \a url, the url is invalid, or if there - is an internal cache error 0 is returned. + is an internal cache error \nullptr is returned. In the base class this is a pure virtual function. @@ -496,7 +496,7 @@ QAbstractNetworkCache::~QAbstractNetworkCache() Returns the device that should be populated with the data for the cache item \a metaData. When all of the data has been written insert() should be called. If metaData is invalid or the url in - the metadata is invalid 0 is returned. + the metadata is invalid \nullptr is returned. The cache owns the device and will take care of deleting it when it is inserted or removed. diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 47252f211a..8ef53afaea 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -4119,14 +4119,14 @@ void QGLWidget::swapBuffers() /*! \fn const QGLContext* QGLWidget::overlayContext() const - Returns the overlay context of this widget, or 0 if this widget - has no overlay. + Returns the overlay context of this widget, or \nullptr if this + widget has no overlay. \sa context() */ const QGLContext* QGLWidget::overlayContext() const { - return 0; + return nullptr; } /*! diff --git a/src/sql/models/qsqlrelationaltablemodel.cpp b/src/sql/models/qsqlrelationaltablemodel.cpp index 1f590c4ab2..34be010474 100644 --- a/src/sql/models/qsqlrelationaltablemodel.cpp +++ b/src/sql/models/qsqlrelationaltablemodel.cpp @@ -626,8 +626,8 @@ QString QSqlRelationalTableModel::selectStatement() const /*! Returns a QSqlTableModel object for accessing the table for which - \a column is a foreign key, or 0 if there is no relation for the - given \a column. + \a column is a foreign key, or \nullptr if there is no relation for + the given \a column. The returned object is owned by the QSqlRelationalTableModel. @@ -636,12 +636,12 @@ QString QSqlRelationalTableModel::selectStatement() const QSqlTableModel *QSqlRelationalTableModel::relationModel(int column) const { Q_D(const QSqlRelationalTableModel); - if ( column < 0 || column >= d->relations.count()) - return 0; + if (column < 0 || column >= d->relations.count()) + return nullptr; QRelation &relation = const_cast<QSqlRelationalTableModelPrivate *>(d)->relations[column]; if (!relation.isValid()) - return 0; + return nullptr; if (!relation.model) relation.populateModel(); diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp index fa31e71cc1..f4e6937146 100644 --- a/src/xml/sax/qxml.cpp +++ b/src/xml/sax/qxml.cpp @@ -2676,9 +2676,9 @@ void QXmlSimpleReaderPrivate::initIncrementalParsing() */ /*! - \fn QXmlEntityResolver* QXmlReader::entityResolver() const + \fn QXmlEntityResolver *QXmlReader::entityResolver() const - Returns the entity resolver or 0 if none was set. + Returns the entity resolver or \nullptr if none was set. \sa setEntityResolver() */ @@ -2692,9 +2692,9 @@ void QXmlSimpleReaderPrivate::initIncrementalParsing() */ /*! - \fn QXmlDTDHandler* QXmlReader::DTDHandler() const + \fn QXmlDTDHandler *QXmlReader::DTDHandler() const - Returns the DTD handler or 0 if none was set. + Returns the DTD handler or \nullptr if none was set. \sa setDTDHandler() */ @@ -2708,9 +2708,9 @@ void QXmlSimpleReaderPrivate::initIncrementalParsing() */ /*! - \fn QXmlContentHandler* QXmlReader::contentHandler() const + \fn QXmlContentHandler *QXmlReader::contentHandler() const - Returns the content handler or 0 if none was set. + Returns the content handler or \nullptr if none was set. \sa setContentHandler() */ @@ -2725,9 +2725,9 @@ void QXmlSimpleReaderPrivate::initIncrementalParsing() */ /*! - \fn QXmlErrorHandler* QXmlReader::errorHandler() const + \fn QXmlErrorHandler *QXmlReader::errorHandler() const - Returns the error handler or 0 if none is set. + Returns the error handler or \nullptr if none is set. \sa setErrorHandler() */ @@ -2741,9 +2741,9 @@ void QXmlSimpleReaderPrivate::initIncrementalParsing() */ /*! - \fn QXmlLexicalHandler* QXmlReader::lexicalHandler() const + \fn QXmlLexicalHandler *QXmlReader::lexicalHandler() const - Returns the lexical handler or 0 if none was set. + Returns the lexical handler or \nullptr if none was set. \sa setLexicalHandler() */ @@ -2757,9 +2757,9 @@ void QXmlSimpleReaderPrivate::initIncrementalParsing() */ /*! - \fn QXmlDeclHandler* QXmlReader::declHandler() const + \fn QXmlDeclHandler *QXmlReader::declHandler() const - Returns the declaration handler or 0 if none was set. + Returns the declaration handler or \nullptr if none was set. \sa setDeclHandler() */ |