1 files changed, 18 insertions, 41 deletions

diff --git a/src/tools/qdoc/doc.cpp b/src/tools/qdoc/doc.cpp
index 92c6d405de..f322bd9360 100644
--- a/src/tools/qdoc/doc.cpp
+++ b/src/tools/qdoc/doc.cpp
@@ -69,7 +69,6 @@ struct Macro
 
 enum {
     CMD_A,
-    CMD_ABSTRACT,
     CMD_ANNOTATEDLIST,
     CMD_B,
     CMD_BADCODE,
@@ -85,7 +84,6 @@ enum {
     CMD_DOTS,
     CMD_E,
     CMD_ELSE,
-    CMD_ENDABSTRACT,
     CMD_ENDCHAPTER,
     CMD_ENDCODE,
     CMD_ENDDIV,
@@ -187,7 +185,6 @@ static struct {
     QString *alias;
 } cmds[] = {
     { "a", CMD_A, 0 },
-    { "abstract", CMD_ABSTRACT, 0 },
     { "annotatedlist", CMD_ANNOTATEDLIST, 0 },
     { "b", CMD_B, 0 },
     { "badcode", CMD_BADCODE, 0 },
@@ -203,7 +200,6 @@ static struct {
     { "dots", CMD_DOTS, 0 },
     { "e", CMD_E, 0 },
     { "else", CMD_ELSE, 0 },
-    { "endabstract", CMD_ENDABSTRACT, 0 },
     { "endchapter", CMD_ENDCHAPTER, 0 },
     { "endcode", CMD_ENDCODE, 0 },
     { "enddiv", CMD_ENDDIV, 0 },
@@ -469,16 +465,16 @@ private:
     void endSection(int unit, int endCmd);
     void parseAlso();
     void append(const QString &string);
-    void append(Atom::Type type, const QString& string = QString());
-    void append(Atom::Type type, const QString& p1, const QString& p2);
+    void append(Atom::AtomType type, const QString& string = QString());
+    void append(Atom::AtomType type, const QString& p1, const QString& p2);
     void append(const QString& p1, const QString& p2);
     void appendChar(QChar ch);
     void appendWord(const QString &word);
     void appendToCode(const QString &code);
-    void appendToCode(const QString &code, Atom::Type defaultType);
+    void appendToCode(const QString &code, Atom::AtomType defaultType);
     void startNewPara();
-    void enterPara(Atom::Type leftType = Atom::ParaLeft,
-                   Atom::Type rightType = Atom::ParaRight,
+    void enterPara(Atom::AtomType leftType = Atom::ParaLeft,
+                   Atom::AtomType rightType = Atom::ParaRight,
                    const QString& string = QString());
     void leavePara();
     void leaveValue();
@@ -525,8 +521,8 @@ private:
     bool inTableRow;
     bool inTableItem;
     bool indexStartedPara; // ### rename
-    Atom::Type pendingParaLeftType;
-    Atom::Type pendingParaRightType;
+    Atom::AtomType pendingParaLeftType;
+    Atom::AtomType pendingParaRightType;
     QString pendingParaString;
 
     int braceDepth;
@@ -631,12 +627,6 @@ void DocParser::parse(const QString& source,
                     append(Atom::FormattingRight,ATOM_FORMATTING_PARAMETER);
                     priv->params.insert(p1);
                     break;
-                case CMD_ABSTRACT:
-                    if (openCommand(cmd)) {
-                        leavePara();
-                        append(Atom::AbstractLeft);
-                    }
-                    break;
                 case CMD_BADCODE:
                     leavePara();
                     append(Atom::CodeBad,getCode(CMD_BADCODE, marker));
@@ -748,12 +738,6 @@ void DocParser::parse(const QString& source,
                         location().warning(tr("Unexpected '\\%1'").arg(cmdName(CMD_ELSE)));
                     }
                     break;
-                case CMD_ENDABSTRACT:
-                    if (closeCommand(cmd)) {
-                        leavePara();
-                        append(Atom::AbstractRight);
-                    }
-                    break;
                 case CMD_ENDCHAPTER:
                     endSection(Doc::Chapter, cmd);
                     break;
@@ -1830,11 +1814,6 @@ bool DocParser::openCommand(int cmd)
         if (outer == CMD_LIST) {
             ok = (cmd == CMD_FOOTNOTE || cmd == CMD_LIST);
         }
-        else if (outer == CMD_ABSTRACT) {
-            ok = (cmd == CMD_LIST ||
-                  cmd == CMD_QUOTATION ||
-                  cmd == CMD_TABLE);
-        }
         else if (outer == CMD_SIDEBAR) {
             ok = (cmd == CMD_LIST ||
                   cmd == CMD_QUOTATION ||
@@ -1984,9 +1963,9 @@ void DocParser::parseAlso()
     }
 }
 
-void DocParser::append(Atom::Type type, const QString &string)
+void DocParser::append(Atom::AtomType type, const QString &string)
 {
-    Atom::Type lastType = priv->text.lastAtom()->type();
+    Atom::AtomType lastType = priv->text.lastAtom()->type();
     if ((lastType == Atom::Code) && priv->text.lastAtom()->string().endsWith(QLatin1String("\n\n")))
         priv->text.lastAtom()->chopString();
     priv->text << Atom(type, string);
@@ -1994,15 +1973,15 @@ void DocParser::append(Atom::Type type, const QString &string)
 
 void DocParser::append(const QString &string)
 {
-    Atom::Type lastType = priv->text.lastAtom()->type();
+    Atom::AtomType lastType = priv->text.lastAtom()->type();
     if ((lastType == Atom::Code) && priv->text.lastAtom()->string().endsWith(QLatin1String("\n\n")))
         priv->text.lastAtom()->chopString();
     priv->text << Atom(string); // The Atom type is Link.
 }
 
-void DocParser::append(Atom::Type type, const QString& p1, const QString& p2)
+void DocParser::append(Atom::AtomType type, const QString& p1, const QString& p2)
 {
-    Atom::Type lastType = priv->text.lastAtom()->type();
+    Atom::AtomType lastType = priv->text.lastAtom()->type();
     if ((lastType == Atom::Code) && priv->text.lastAtom()->string().endsWith(QLatin1String("\n\n")))
         priv->text.lastAtom()->chopString();
     priv->text << Atom(type, p1, p2);
@@ -2010,7 +1989,7 @@ void DocParser::append(Atom::Type type, const QString& p1, const QString& p2)
 
 void DocParser::append(const QString& p1, const QString& p2)
 {
-    Atom::Type lastType = priv->text.lastAtom()->type();
+    Atom::AtomType lastType = priv->text.lastAtom()->type();
     if ((lastType == Atom::Code) && priv->text.lastAtom()->string().endsWith(QLatin1String("\n\n")))
         priv->text.lastAtom()->chopString();
     if (p2.isEmpty())
@@ -2043,15 +2022,15 @@ void DocParser::appendWord(const QString &word)
 
 void DocParser::appendToCode(const QString& markedCode)
 {
-    Atom::Type lastType = priv->text.lastAtom()->type();
+    Atom::AtomType lastType = priv->text.lastAtom()->type();
     if (lastType != Atom::Qml && lastType != Atom::Code && lastType != Atom::JavaScript)
         append(Atom::Qml);
     priv->text.lastAtom()->appendString(markedCode);
 }
 
-void DocParser::appendToCode(const QString &markedCode, Atom::Type defaultType)
+void DocParser::appendToCode(const QString &markedCode, Atom::AtomType defaultType)
 {
-    Atom::Type lastType = priv->text.lastAtom()->type();
+    Atom::AtomType lastType = priv->text.lastAtom()->type();
     if (lastType != Atom::Qml && lastType != Atom::Code && lastType != Atom::JavaScript)
         append(defaultType, markedCode);
     else
@@ -2064,8 +2043,8 @@ void DocParser::startNewPara()
     enterPara();
 }
 
-void DocParser::enterPara(Atom::Type leftType,
-                          Atom::Type rightType,
+void DocParser::enterPara(Atom::AtomType leftType,
+                          Atom::AtomType rightType,
                           const QString& string)
 {
     if (paraState == OutsideParagraph) {
@@ -2674,8 +2653,6 @@ void DocParser::skipToNextPreprocessorCommand()
 int DocParser::endCmdFor(int cmd)
 {
     switch (cmd) {
-    case CMD_ABSTRACT:
-        return CMD_ENDABSTRACT;
     case CMD_BADCODE:
         return CMD_ENDCODE;
     case CMD_CHAPTER: