From 989818fb29993339916a2981e28131e80868e591 Mon Sep 17 00:00:00 2001 From: Aaron Kennedy Date: Thu, 30 Jul 2009 17:37:48 +1000 Subject: Revert "qdoc: Fixed some qdoc errors." This reverts commit 1099908428c594d67fe1da740126f4acfcdc8a0a. Conflicts: src/corelib/kernel/qabstractitemmodel.cpp src/corelib/kernel/qmetaobjectbuilder.cpp --- src/corelib/animation/qabstractanimation.cpp | 2 +- src/corelib/kernel/qmetaobjectbuilder.cpp | 49 +++++++++++----------------- src/gui/widgets/qbuttongroup.cpp | 13 ++++---- 3 files changed, 26 insertions(+), 38 deletions(-) diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp index 62c55c3..ced86d2 100644 --- a/src/corelib/animation/qabstractanimation.cpp +++ b/src/corelib/animation/qabstractanimation.cpp @@ -41,7 +41,7 @@ /*! \class QAbstractAnimation - \ingroup group_animation + \ingroup animation \brief The QAbstractAnimation class is the base of all animations. \since 4.6 diff --git a/src/corelib/kernel/qmetaobjectbuilder.cpp b/src/corelib/kernel/qmetaobjectbuilder.cpp index dd831a8..58ee454 100644 --- a/src/corelib/kernel/qmetaobjectbuilder.cpp +++ b/src/corelib/kernel/qmetaobjectbuilder.cpp @@ -75,13 +75,6 @@ QT_BEGIN_NAMESPACE \value AllPrimaryMembers Add everything except the class name, super class, and static metacall function. */ -/*! - \enum QMetaObjectBuilder::MetaObjectFlag - This enum defines flags for the class being constructed. - - \value DynamicMetaObject - */ - // copied from moc's generator.cpp uint qvariant_nameToType(const char* name) { @@ -393,8 +386,7 @@ int QMetaObjectBuilder::methodCount() const /*! Returns the number of constructors in this class. - \sa addConstructor(), constructor(), removeConstructor() - \sa indexOfConstructor() + \sa addConstructor(), constructor(), removeConstructor(), indexOfConstructor() */ int QMetaObjectBuilder::constructorCount() const { @@ -428,8 +420,8 @@ int QMetaObjectBuilder::enumeratorCount() const Returns the number of items of class information in this class, exclusing the number of items of class information in the base class. - \sa addClassInfo(), classInfoName(), classInfoValue() - \sa removeClassInfo(), indexOfClassInfo() + \sa addClassInfo(), classInfoName(), classInfoValue(), removeClassInfo() + \sa indexOfClassInfo() */ int QMetaObjectBuilder::classInfoCount() const { @@ -641,7 +633,7 @@ QMetaPropertyBuilder QMetaObjectBuilder::addProperty(const QMetaProperty& protot \a name. Returns an object that can be used to adjust the other attributes of the enumerator. - \sa enumerator(), enumeratorCount(), removeEnumerator() + \sa enumerator(), enumeratorCount(), removeEnumerator(), \sa indexOfEnumerator() */ QMetaEnumBuilder QMetaObjectBuilder::addEnumerator(const QByteArray& name) @@ -657,7 +649,7 @@ QMetaEnumBuilder QMetaObjectBuilder::addEnumerator(const QByteArray& name) QMetaObject. Returns an object that can be used to adjust the attributes of the enumerator. - \sa enumerator(), enumeratorCount(), removeEnumerator() + \sa enumerator(), enumeratorCount(), removeEnumerator(), \sa indexOfEnumerator() */ QMetaEnumBuilder QMetaObjectBuilder::addEnumerator(const QMetaEnum& prototype) @@ -674,8 +666,8 @@ QMetaEnumBuilder QMetaObjectBuilder::addEnumerator(const QMetaEnum& prototype) Adds \a name and \a value as an item of class information to this class. Returns the index of the new item of class information. - \sa classInfoCount(), classInfoName(), classInfoValue() - \sa removeClassInfo(), indexOfClassInfo() + \sa classInfoCount(), classInfoName(), classInfoValue(), removeClassInfo() + \sa indexOfClassInfo() */ int QMetaObjectBuilder::addClassInfo(const QByteArray& name, const QByteArray& value) { @@ -872,8 +864,8 @@ const QMetaObject *QMetaObjectBuilder::relatedMetaObject(int index) const Returns the name of the item of class information at \a index in this class. - \sa classInfoCount(), addClassInfo(), classInfoValue() - \sa removeClassInfo(), indexOfClassInfo() + \sa classInfoCount(), addClassInfo(), classInfoValue(), removeClassInfo() + \sa indexOfClassInfo() */ QByteArray QMetaObjectBuilder::classInfoName(int index) const { @@ -887,8 +879,8 @@ QByteArray QMetaObjectBuilder::classInfoName(int index) const Returns the value of the item of class information at \a index in this class. - \sa classInfoCount(), addClassInfo(), classInfoName() - \sa removeClassInfo(), indexOfClassInfo() + \sa classInfoCount(), addClassInfo(), classInfoName(), removeClassInfo() + \sa indexOfClassInfo() */ QByteArray QMetaObjectBuilder::classInfoValue(int index) const { @@ -949,7 +941,7 @@ void QMetaObjectBuilder::removeProperty(int index) Removes the enumerator at \a index from this class. The indices of all following enumerators will be adjusted downwards by 1. - \sa enumeratorCount(), addEnumerator(), enumerator() + \sa enumertorCount(), addEnumerator(), enumerator() \sa indexOfEnumerator() */ void QMetaObjectBuilder::removeEnumerator(int index) @@ -962,8 +954,8 @@ void QMetaObjectBuilder::removeEnumerator(int index) Removes the item of class information at \a index from this class. The indices of all following items will be adjusted downwards by 1. - \sa classInfoCount(), addClassInfo(), classInfoName() - \sa classInfoValue() indexOfClassInfo() + \sa classInfoCount(), addClassInfo(), classInfoName(), classInfoValue() + \sa indexOfClassInfo() */ void QMetaObjectBuilder::removeClassInfo(int index) { @@ -1042,12 +1034,10 @@ int QMetaObjectBuilder::indexOfSlot(const QByteArray& signature) } /*! - Finds a constructor with the specified \a signature and returns its - index; otherwise returns -1. The \a signature will be normalized by - this method. + Finds a constructor with the specified \a signature and returns its index; + otherwise returns -1. The \a signature will be normalized by this method. - \sa constructor(), constructorCount(), addConstructor() - \sa removeConstructor() + \sa constructor(), constructorCount(), addConstructor(), removeConstructor() */ int QMetaObjectBuilder::indexOfConstructor(const QByteArray& signature) { @@ -1078,8 +1068,7 @@ int QMetaObjectBuilder::indexOfProperty(const QByteArray& name) Finds an enumerator with the specified \a name and returns its index; otherwise returns -1. - \sa enumerator(), enumeratorCount(), addEnumerator() - \sa removeEnumerator() + \sa enumertor(), enumeratorCount(), addEnumerator(), removeEnumerator() */ int QMetaObjectBuilder::indexOfEnumerator(const QByteArray& name) { @@ -1924,7 +1913,7 @@ QByteArray QMetaMethodBuilder::tag() const /*! Sets the tag associated with this method to \a value. - \sa tag() + \sa setTag() */ void QMetaMethodBuilder::setTag(const QByteArray& value) { diff --git a/src/gui/widgets/qbuttongroup.cpp b/src/gui/widgets/qbuttongroup.cpp index da0d519..3e91aad 100644 --- a/src/gui/widgets/qbuttongroup.cpp +++ b/src/gui/widgets/qbuttongroup.cpp @@ -178,11 +178,10 @@ /*! \fn void QButtonGroup::addButton(QAbstractButton *button); - Adds the given \a button to the end of the group's internal list - of buttons. An id will be assigned to the button by this - QButtonGroup. Automatically assigned ids are guaranteed to be - negative, starting with -2. If you are also assigning your own - ids, use positive values to avoid conflicts. + Adds the given \a button to the end of the group's internal list of buttons. + An \a id will be assigned to the button by this QButtonGroup. Automatically + assigned ids are guaranteed to be negative, starting with -2. If you are also + assigning your own ids, use positive values to avoid conflicts. \sa removeButton() buttons() */ @@ -190,8 +189,8 @@ /*! \fn void QButtonGroup::addButton(QAbstractButton *button, int id); - Adds the given \a button to the button group, with the given - \a id. It is recommended to assign only positive ids. + Adds the given \a button to the button group, with the given \a + id. It is recommended to assign only positive ids. \sa removeButton() buttons() */ -- cgit v0.12