Merge earth-team into origin/master'

1 files changed, 0 insertions, 13 deletions

diff --git a/tools/qdoc3/node.h b/tools/qdoc3/node.h
index 2de2b5a..d1123dc 100644
--- a/tools/qdoc3/node.h
+++ b/tools/qdoc3/node.h
@@ -262,21 +262,12 @@ class InnerNode : public Node
     NodeList overloads(const QString &funcName) const;
     const QStringList& includes() const { return inc; }
 
-    QString author() const { return author_; }
-    void setAuthor(const QString& author) { author_ = author; }
-    QString publisher() const { return publisher_; }
-    void setPublisher(const QString& publisher) { publisher_ = publisher; }
-    QString permissions() const { return permissions_; }
-    void setPermissions(const QString& permissions) { permissions_ = permissions; }
     QStringList primaryKeys();
     QStringList secondaryKeys();
     const QStringList& pageKeywords() const { return pageKeywds; }
     virtual void addPageKeywords(const QString& t) { pageKeywds << t; }
     virtual bool isAbstract() const { return false; }
     virtual void setAbstract(bool ) { }
-    bool hasOtherMetadata() const { return !otherMetadataMap.isEmpty(); }
-    void insertOtherMetadata(const QString& name, const QString& content);
-    const QMap<QString, QString>& otherMetadata() const { return otherMetadataMap; }
 
  protected:
     InnerNode(Type type, InnerNode* parent, const QString& name);
@@ -289,9 +280,6 @@ class InnerNode : public Node
     void removeChild(Node* child);
     void removeRelated(Node* pseudoChild);
 
-    QString author_;
-    QString publisher_;
-    QString permissions_;
     QStringList pageKeywds;
     QStringList inc;
     NodeList children;
@@ -300,7 +288,6 @@ class InnerNode : public Node
     QMap<QString, Node*> childMap;
     QMap<QString, Node*> primaryFunctionMap;
     QMap<QString, NodeList> secondaryFunctionMap;
-    QMap<QString, QString> otherMetadataMap;
 };
 
 class LeafNode : public Node