From 74a3786dc5e25b68b207053867d19255048a6f6f Mon Sep 17 00:00:00 2001 From: Vincent van Ravesteijn Date: Wed, 17 Nov 2010 16:12:43 +0000 Subject: [PATCH] Author: cosmetics. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36341 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/Author.cpp | 8 ++++---- src/Author.h | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Author.cpp b/src/Author.cpp index 0834926500..f1d346ea75 100644 --- a/src/Author.cpp +++ b/src/Author.cpp @@ -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()); diff --git a/src/Author.h b/src/Author.h index afc3957691..7d9f3ddf8e 100644 --- a/src/Author.h +++ b/src/Author.h @@ -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