ws changes only

[lyx.git] / src / insets / insetbibitem.C

diff --git a/src/insets/insetbibitem.C b/src/insets/insetbibitem.C
index ff10c841a7a3efae5a6eceb7424f367b456d6327..d794437d35da16bcd99e15b88d5850074ed45d3b 100644 (file)
--- a/src/insets/insetbibitem.C
+++ b/src/insets/insetbibitem.C
@@ -10,19 +10,24 @@
 #include <config.h>
 
 #include "insetbibitem.h"
+
 #include "buffer.h"
 #include "BufferView.h"
 #include "funcrequest.h"
+#include "lyxfont.h"
 #include "lyxlex.h"
+#include "paragraph.h"
 
 #include "frontends/font_metrics.h"
 
-#include "support/tostr.h"
 #include "support/lstrings.h"
+#include "support/tostr.h"
 
-using namespace lyx::support;
+using lyx::support::prefixIs;
+using lyx::support::strToInt;
 
 using std::max;
+using std::string;
 using std::auto_ptr;
 
 
@@ -87,7 +92,7 @@ void InsetBibitem::setCounter(int c)
 // as a LyX 2.x command, and lyxlex is not enough smart to understand
 // real LaTeX commands. Yes, that could be fixed, but would be a waste
 // of time cause LyX3 won't use lyxlex anyway.  (ale)
-void InsetBibitem::write(Buffer const *, std::ostream & os) const
+void InsetBibitem::write(Buffer const &, std::ostream & os) const
 {
        os << "\n\\bibitem ";
        if (!getOptions().empty())
@@ -98,7 +103,7 @@ void InsetBibitem::write(Buffer const *, std::ostream & os) const
 
 // This is necessary here because this is written without begin_inset
 // This should be changed!!! (Jug)
-void InsetBibitem::read(Buffer const *, LyXLex & lex)
+void InsetBibitem::read(Buffer const &, LyXLex & lex)
 {
        if (lex.eatLine()) {
                scanCommand(lex.getString());
@@ -119,7 +124,7 @@ string const InsetBibitem::getBibLabel() const
 }
 
 
-string const InsetBibitem::getScreenLabel(Buffer const *) const
+string const InsetBibitem::getScreenLabel(Buffer const &) const
 {
        return getContents() + " [" + getBibLabel() + ']';
 }
@@ -131,8 +136,8 @@ int bibitemMaxWidth(BufferView * bv, LyXFont const &)
        int w = 0;
        // Ha, now we are mainly at 1.2.0 and it is still here (Jug)
        // Does look like a hack? It is! (but will change at 0.13)
-       ParagraphList::iterator it = bv->buffer()->paragraphs.begin();
-       ParagraphList::iterator end = bv->buffer()->paragraphs.end();
+       ParagraphList::iterator it = bv->buffer()->paragraphs().begin();
+       ParagraphList::iterator end = bv->buffer()->paragraphs().end();
        for (; it != end; ++it) {
                if (it->bibitem()) {
 #warning metrics broken!
@@ -146,7 +151,7 @@ int bibitemMaxWidth(BufferView * bv, LyXFont const &)
 
 
 // ale070405
-string const bibitemWidest(Buffer const * buffer)
+string const bibitemWidest(Buffer const & buffer)
 {
        int w = 0;
        // Does look like a hack? It is! (but will change at 0.13)
@@ -154,8 +159,8 @@ string const bibitemWidest(Buffer const * buffer)
        InsetBibitem const * bitem = 0;
        LyXFont font;
 
-       ParagraphList::const_iterator it = buffer->paragraphs.begin();
-       ParagraphList::const_iterator end = buffer->paragraphs.end();
+       ParagraphList::const_iterator it = buffer.paragraphs().begin();
+       ParagraphList::const_iterator end = buffer.paragraphs().end();
 
        for (; it != end; ++it) {
                if (it->bibitem()) {