avoid float-conversion warning and simplify size computation

[lyx.git] / src / Author.h

diff --git a/src/Author.h b/src/Author.h
index 6842cf35caa217ca9ce05cdb5511fa62f8c49f61..f798b041b2df5e4b00e6eb62d8e794ae7e0357a3 100644 (file)
--- a/src/Author.h
+++ b/src/Author.h
@@ -14,66 +14,73 @@
 
 #include "support/docstring.h"
 
-#include <map>
-#include <iosfwd>
+#include <vector>
 
 
 namespace lyx {
 
-
 class Author {
 public:
-       Author() {}
-
-       Author(docstring const & name, docstring const & email)
-               : name_(name), email_(email), used_(true) {}
-
-       docstring const name() const {
-               return name_;
-       }
-
-       docstring const email() const {
-               return email_;
-       }
-
-       void used(bool u) const {
-               used_ = u;
-       }
-
-       bool used() const {
-               return used_;
-       }
-
+       ///
+       Author() : used_(false), buffer_id_(0) {};
+       ///
+       Author(docstring const & name, docstring const & email);
+       ///
+       docstring name() const { return name_; }
+       ///
+       docstring email() const { return email_; }
+       ///
+       int bufferId() const { return buffer_id_; }
+       ///
+       void setBufferId(int buffer_id) const { buffer_id_ = buffer_id; }
+       ///
+       void setUsed(bool u) const { used_ = u; }
+       ///
+       bool used() const { return used_; }
+       ///
        friend std::istream & operator>>(std::istream & os, Author & a);
+       ///
+       friend std::ostream & operator<<(std::ostream & os, Author const & a);
 
 private:
+       /// The author's name
        docstring name_;
-
+       /// The author's email address
        docstring email_;
-
+       ///
        mutable bool used_;
+       /// The id of the author in the lyx-file
+       mutable int buffer_id_;
 };
 
 
 class AuthorList {
 public:
+       ///
        AuthorList();
-
+       ///
        int record(Author const & a);
-
+       ///
        void record(int id, Author const & a);
-
+       ///
+       void recordCurrentAuthor(Author const & a);
+       ///
        Author const & get(int id) const;
-
-       typedef std::map<int, Author> Authors;
-
+       ///
+       void sort();
+       ///
+       typedef std::vector<Author> Authors;
+       ///
        Authors::const_iterator begin() const;
-
+       ///
        Authors::const_iterator end() const;
-
+       ///
+       friend
+       std::ostream & operator<<(std::ostream & os, AuthorList const & a);
 private:
+       ///
        int last_id_;
-
+       ///
        Authors authors_;
 };