diff options
| author | Martin Smith <martin.smith@digia.com> | 2015-04-10 12:54:57 +0200 |
|---|---|---|
| committer | Martin Smith <martin.smith@digia.com> | 2015-04-11 10:25:14 +0000 |
| commit | 8a2645b8f048092aee3e9cfa570171a1dfc58651 (patch) | |
| tree | 69b77618be033ee6dfffcaccaa37faaeeb2b472c /src/tools/qdoc/atom.cpp | |
| parent | 02a13a86fab1f928d5dd40069d121ded549366f1 (diff) | |
qdoc: More data member name changes
In preparation for refactoring the Node class hierarchy,
the names of a few enum types and the functions that set
and get them are changed so that they will not be confused
with other uses of the word Type.
Change-Id: I0496b46e5d7adffccadcb464aedb2806728e781d
Task-number: QTBUG-45450
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Diffstat (limited to 'src/tools/qdoc/atom.cpp')
| -rw-r--r-- | src/tools/qdoc/atom.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/tools/qdoc/atom.cpp b/src/tools/qdoc/atom.cpp index 745da21b30e..ebbe685985c 100644 --- a/src/tools/qdoc/atom.cpp +++ b/src/tools/qdoc/atom.cpp @@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE \also Text */ -/*! \enum Atom::Type +/*! \enum Atom::AtomType \value AbstractLeft \value AbstractRight @@ -237,27 +237,27 @@ static const struct { { 0, 0 } }; -/*! \fn Atom::Atom(Type type, const QString& string) +/*! \fn Atom::Atom(AtomType type, const QString& string) Constructs an atom of the specified \a type with the single parameter \a string and does not put the new atom in a list. */ -/*! \fn Atom::Atom(Type type, const QString& p1, const QString& p2) +/*! \fn Atom::Atom(AtomType type, const QString& p1, const QString& p2) Constructs an atom of the specified \a type with the two parameters \a p1 and \a p2 and does not put the new atom in a list. */ -/*! \fn Atom(Atom *previous, Type type, const QString& string) +/*! \fn Atom(Atom *previous, AtomType type, const QString& string) Constructs an atom of the specified \a type with the single parameter \a string and inserts the new atom into the list after the \a previous atom. */ -/*! \fn Atom::Atom(Atom* previous, Type type, const QString& p1, const QString& p2) +/*! \fn Atom::Atom(Atom* previous, AtomType type, const QString& p1, const QString& p2) Constructs an atom of the specified \a type with the two parameters \a p1 and \a p2 and inserts the new atom into @@ -289,19 +289,19 @@ static const struct { */ /*! - Return the next Atom in the list if it is of Type \a t. + Return the next Atom in the list if it is of AtomType \a t. Otherwise return 0. */ -const Atom* Atom::next(Type t) const +const Atom* Atom::next(AtomType t) const { return (next_ && (next_->type() == t)) ? next_ : 0; } /*! - Return the next Atom in the list if it is of Type \a t + Return the next Atom in the list if it is of AtomType \a t and its string part is \a s. Otherwise return 0. */ -const Atom* Atom::next(Type t, const QString& s) const +const Atom* Atom::next(AtomType t, const QString& s) const { return (next_ && (next_->type() == t) && (next_->string() == s)) ? next_ : 0; } @@ -311,7 +311,7 @@ const Atom* Atom::next(Type t, const QString& s) const \also type(), string() */ -/*! \fn Type Atom::type() const +/*! \fn AtomType Atom::type() const Return the type of this atom. \also string(), next() */ |