1 files changed, 68 insertions, 21 deletions

diff --git a/src/tools/qdoc/atom.cpp b/src/tools/qdoc/atom.cpp
index 6f9da3790d..de99dc4d5a 100644
--- a/src/tools/qdoc/atom.cpp
+++ b/src/tools/qdoc/atom.cpp
@@ -42,31 +42,12 @@
 #include <qregexp.h>
 #include "atom.h"
 #include "location.h"
+#include "qdocdatabase.h"
 #include <stdio.h>
+#include <qdebug.h>
 
 QT_BEGIN_NAMESPACE
 
-QLatin1String Atom::BOLD_          ("bold");
-QLatin1String Atom::INDEX_         ("index");
-QLatin1String Atom::ITALIC_        ("italic");
-QLatin1String Atom::LINK_          ("link");
-QLatin1String Atom::PARAMETER_     ("parameter");
-QLatin1String Atom::SPAN_          ("span");
-QLatin1String Atom::SUBSCRIPT_     ("subscript");
-QLatin1String Atom::SUPERSCRIPT_   ("superscript");
-QLatin1String Atom::TELETYPE_      ("teletype");
-QLatin1String Atom::UICONTROL_     ("uicontrol");
-QLatin1String Atom::UNDERLINE_     ("underline");
-
-QLatin1String Atom::BULLET_        ("bullet");
-QLatin1String Atom::TAG_           ("tag");
-QLatin1String Atom::VALUE_         ("value");
-QLatin1String Atom::LOWERALPHA_    ("loweralpha");
-QLatin1String Atom::LOWERROMAN_    ("lowerroman");
-QLatin1String Atom::NUMERIC_       ("numeric");
-QLatin1String Atom::UPPERALPHA_    ("upperalpha");
-QLatin1String Atom::UPPERROMAN_    ("upperroman");
-
 /*! \class Atom
     \brief The Atom class is the fundamental unit for representing
     documents internally.
@@ -165,6 +146,8 @@ QLatin1String Atom::UPPERROMAN_    ("upperroman");
   \value UnknownCommand
 */
 
+QString Atom::noError_ = QString();
+
 static const struct {
     const char *english;
     int no;
@@ -387,4 +370,68 @@ void Atom::dump() const
             str.toLatin1().data());
 }
 
+/*!
+  The only constructor for LinkAtom. It creates an Atom of
+  type Atom::Link. \a p1 being the link target. \a p2 is the
+  parameters in square brackets. Normally there is just one
+  word in the square brackets, but there can be up to three
+  words separated by spaces. The constructor splits \a p2 on
+  the space character.
+ */
+LinkAtom::LinkAtom(const QString& p1, const QString& p2)
+    : Atom(p1), genus_(Node::DontCare), goal_(Node::NoType), domain_(0)
+{
+    QStringList params = p2.toLower().split(QLatin1Char(' '));
+    foreach (const QString& p, params) {
+        if (!domain_) {
+            domain_ = QDocDatabase::qdocDB()->findTree(p);
+            if (domain_)
+                continue;
+        }
+        if (goal_ == Node::NoType) {
+            goal_ = Node::goal(p);
+            if (goal_ != Node::NoType)
+                continue;
+        }
+        if (p == "qml") {
+            genus_ = Node::QML;
+            continue;
+        }
+        if (p == "cpp") {
+            genus_ = Node::CPP;
+            continue;
+        }
+        error_ = p2;
+        break;
+    }
+}
+
+/*!
+  Standard copy constructor of LinkAtom \a t.
+ */
+LinkAtom::LinkAtom(const LinkAtom& t)
+    : Atom(Link, t.string()),
+      genus_(t.genus_),
+      goal_(t.goal_),
+      domain_(t.domain_),
+      error_(t.error_)
+{
+    // nothing
+}
+
+/*!
+  Special copy constructor of LinkAtom \a t, where
+  where the new LinkAtom will not be the first one
+  in the list.
+ */
+LinkAtom::LinkAtom(Atom* previous, const LinkAtom& t)
+    : Atom(previous, Link, t.string()),
+      genus_(t.genus_),
+      goal_(t.goal_),
+      domain_(t.domain_),
+      error_(t.error_)
+{
+    previous->next_ = this;
+}
+
 QT_END_NAMESPACE