]> git.lyx.org Git - features.git/commitdiff
Author: cosmetics.
authorVincent van Ravesteijn <vfr@lyx.org>
Wed, 17 Nov 2010 16:12:43 +0000 (16:12 +0000)
committerVincent van Ravesteijn <vfr@lyx.org>
Wed, 17 Nov 2010 16:12:43 +0000 (16:12 +0000)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36341 a592a061-630c-0410-9148-cb99ea01b6c8

src/Author.cpp
src/Author.h

index 08349265009da4d6124626b13e1dede3310f1a70..f1d346ea75619429cebd664ee4ea620097eb4f93 100644 (file)
@@ -51,8 +51,8 @@ bool operator==(Author const & l, Author const & r)
 ostream & operator<<(ostream & os, Author const & a)
 {
        // FIXME UNICODE
-       os << a.buffer_id() << " \"" << to_utf8(a.name())
-                       << "\" " << to_utf8(a.email());
+       os << a.buffer_id_ << " \"" << to_utf8(a.name_)
+                       << "\" " << to_utf8(a.email_);
                
        return os;
 }
@@ -70,7 +70,7 @@ istream & operator>>(istream & is, Author & a)
 
 
 bool author_smaller(Author const & lhs, Author const & rhs) {
-       return lhs.buffer_id() < rhs.buffer_id();
+       return lhs.bufferId() < rhs.bufferId();
 }
 
 
@@ -86,7 +86,7 @@ int AuthorList::record(Author const & a)
        // author, we copy the buffer_id, so that it will
        // keep the same id in the file.
        if (authors_.size() > 0 && a == authors_[0])
-               authors_[0].setBufferId(a.buffer_id());
+               authors_[0].setBufferId(a.bufferId());
 
        Authors::const_iterator it(authors_.begin());
        Authors::const_iterator itend(authors_.end());
index afc39576918b19212754dfe4d10c896527dced99..7d9f3ddf8e04f911b09283d08771094c13e5c0da 100644 (file)
@@ -30,7 +30,7 @@ public:
        ///
        docstring email() const { return email_; }
        ///
-       int buffer_id() const { return buffer_id_; }
+       int bufferId() const { return buffer_id_; }
        ///
        void setBufferId(int buffer_id) const { buffer_id_ = buffer_id; }
        ///
@@ -39,6 +39,8 @@ public:
        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