diff options
author | Nico Vertriest <nico.vertriest@digia.com> | 2015-05-19 15:03:12 +0200 |
---|---|---|
committer | Nico Vertriest <nico.vertriest@digia.com> | 2015-07-22 13:47:23 +0000 |
commit | e6ddae07e1e571a7a6e0c531b961dbddcd217643 (patch) | |
tree | 84c366f499a91152456cc8a85995d97ec6bc6e94 /src/corelib | |
parent | 9499cf33b7284d1a2626fecc1abde75e1dc52c23 (diff) |
Doc:added doc to undocumented functions
Task-number: QTBUG-36985
Change-Id: Ic358682b276d67ef804f727bcf14191718613469
Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/codecs/qtextcodec.cpp | 9 | ||||
-rw-r--r-- | src/corelib/itemmodels/qitemselectionmodel.cpp | 8 | ||||
-rw-r--r-- | src/corelib/kernel/qmetaobject.cpp | 23 | ||||
-rw-r--r-- | src/corelib/kernel/qmetatype.cpp | 13 | ||||
-rw-r--r-- | src/corelib/kernel/qobject.cpp | 7 | ||||
-rw-r--r-- | src/corelib/tools/qcollator.cpp | 2 | ||||
-rw-r--r-- | src/corelib/tools/qpair.qdoc | 5 | ||||
-rw-r--r-- | src/corelib/tools/qset.qdoc | 3 | ||||
-rw-r--r-- | src/corelib/xml/qxmlstream.cpp | 6 |
9 files changed, 58 insertions, 18 deletions
diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp index 8fef333a77..c6d5c7388d 100644 --- a/src/corelib/codecs/qtextcodec.cpp +++ b/src/corelib/codecs/qtextcodec.cpp @@ -1153,17 +1153,8 @@ QTextCodec *QTextCodec::codecForUtfText(const QByteArray &ba) Returns the codec used by QObject::tr() on its argument. If this function returns 0 (the default), tr() assumes Latin-1. - - \sa setCodecForTr() */ -/*! - \fn QTextCodec::setCodecForTr ( QTextCodec * c ) - \obsolete - - Sets the codec used by QObject::tr() on its argument to c. If c - is 0 (the default), tr() assumes Latin-1. -*/ /*! \internal diff --git a/src/corelib/itemmodels/qitemselectionmodel.cpp b/src/corelib/itemmodels/qitemselectionmodel.cpp index 47fcab9b24..de28953fb5 100644 --- a/src/corelib/itemmodels/qitemselectionmodel.cpp +++ b/src/corelib/itemmodels/qitemselectionmodel.cpp @@ -1736,13 +1736,19 @@ const QItemSelection QItemSelectionModel::selection() const \property QItemSelectionModel::selectedIndexes */ + /*! \since 5.5 - \property QItemSelectionModel::model + \property QItemSelectionModel::selection \internal */ +/*! + \since 5.5 + \property QItemSelectionModel::model + \internal +*/ /*! \since 5.5 diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp index fc161e6f89..6858209b12 100644 --- a/src/corelib/kernel/qmetaobject.cpp +++ b/src/corelib/kernel/qmetaobject.cpp @@ -1534,6 +1534,29 @@ bool QMetaObject::invokeMethod(QObject *obj, */ /*! + \fn QMetaObject::Connection::Connection(const Connection &other) + + Constructs a copy of \a other. +*/ + +/*! + \fn QMetaObject::Connection::Connection &operator=(const Connection &other) + + Assigns \a other to this connection and returns a reference to this connection. +*/ + +/*! + \fn QMetaObject::Connection &QMetaObject::Connection::operator=(Connection &&other) + + Move-assigns \a other to this object. +*/ +/*! + \fn QMetaObject::Connection::Connection(Connection &&o) + + Move-constructs a Connection instance, making it point to the same object that \a o was pointing to. +*/ + +/*! \class QMetaMethod \inmodule QtCore diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index 729ca0e0d1..7fadb66319 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -421,6 +421,16 @@ struct DefinedTypesFilter { */ /*! + \fn void *QMetaType::construct(int type, const void *copy) + \deprecated + + Constructs a value of the given type which is a copy of \a copy. + The default value for \a copy is 0. + + Deprecated, use the static function QMetaType::create(int type, + const void *copy) instead. +*/ +/*! \fn void *QMetaType::construct(void *where, const void *copy = 0) const \since 5.0 @@ -1179,10 +1189,7 @@ bool QMetaType::isRegistered(int type) } /*! - \fn int qMetaTypeTypeImpl(const char *typeName, int length) \internal - - Implementation of QMetaType::type(). */ template <bool tryNormalizedType> static inline int qMetaTypeTypeImpl(const char *typeName, int length) diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index d07120e5a8..6bc4d7e7ed 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -4898,8 +4898,15 @@ QMetaObject::Connection& QMetaObject::Connection::operator=(const QMetaObject::C return *this; } +/*! + Creates a Connection instance. +*/ + QMetaObject::Connection::Connection() : d_ptr(0) {} +/*! + Destructor for QMetaObject::Connection. +*/ QMetaObject::Connection::~Connection() { if (d_ptr) diff --git a/src/corelib/tools/qcollator.cpp b/src/corelib/tools/qcollator.cpp index 615b7a4e3e..59f8f66869 100644 --- a/src/corelib/tools/qcollator.cpp +++ b/src/corelib/tools/qcollator.cpp @@ -87,7 +87,7 @@ QCollator::QCollator(const QCollator &other) } /*! - Destructor for QCollator. + Destroys the collator. */ QCollator::~QCollator() { diff --git a/src/corelib/tools/qpair.qdoc b/src/corelib/tools/qpair.qdoc index 2a421a1bbf..7cba7480f0 100644 --- a/src/corelib/tools/qpair.qdoc +++ b/src/corelib/tools/qpair.qdoc @@ -109,7 +109,7 @@ \endcode Swap overloads are found in namespace \c std as well as via - argument-dependent lookup (ADL) in \c{T}'s namespace. + argument-dependent lookup (ADL) in the namespace of \c{T} . */ /*! @@ -136,8 +136,7 @@ \fn QPair::QPair(QPair<TT1, TT2> &&p) \since 5.2 - Move-constructs a QPair instance, making it point to the same object that - \a p was pointing to. + Move-constructs a QPair instance, making it point to the same object that \a p was pointing to. */ /*! diff --git a/src/corelib/tools/qset.qdoc b/src/corelib/tools/qset.qdoc index c38fe858fb..072e65af0e 100644 --- a/src/corelib/tools/qset.qdoc +++ b/src/corelib/tools/qset.qdoc @@ -129,7 +129,8 @@ /*! \fn QSet::QSet(QSet && other) - Move-constructs a QSet instance, making it point to the same object that \a other was pointing to. + Move-constructs a QSet instance, making it point to the same object that + \a other was pointing to. */ diff --git a/src/corelib/xml/qxmlstream.cpp b/src/corelib/xml/qxmlstream.cpp index bbd751efd0..13c84db9ae 100644 --- a/src/corelib/xml/qxmlstream.cpp +++ b/src/corelib/xml/qxmlstream.cpp @@ -2396,6 +2396,12 @@ QXmlStreamAttribute& QXmlStreamAttribute::operator=(const QXmlStreamAttribute &o */ /*! + \fn QXmlStreamAttributes::QXmlStreamAttributes() + + A constructor for QXmlStreamAttributes. +*/ + +/*! \typedef QXmlStreamNotationDeclarations \relates QXmlStreamNotationDeclaration |