ws changes only

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

diff --git a/src/insets/insetbibitem.C b/src/insets/insetbibitem.C
index cc26ab979b102faac373a923540ca4d869badb27..d794437d35da16bcd99e15b88d5850074ed45d3b 100644 (file)
--- a/src/insets/insetbibitem.C
+++ b/src/insets/insetbibitem.C
@@ -5,27 +5,34 @@
  *
  * \author Alejandro Aguilar Sierra
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 #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 lyx::support::prefixIs;
+using lyx::support::strToInt;
 
 using std::max;
+using std::string;
+using std::auto_ptr;
 
 
 int InsetBibitem::key_counter = 0;
-const string key_prefix = "key-";
+string const key_prefix = "key-";
 
 
 InsetBibitem::InsetBibitem(InsetCommandParams const & p)
@@ -38,27 +45,18 @@ InsetBibitem::InsetBibitem(InsetCommandParams const & p)
 
 InsetBibitem::~InsetBibitem()
 {
-       InsetCommandMailer mailer("bibitem", *this);
-       mailer.hideDialog();
+       InsetCommandMailer("bibitem", *this).hideDialog();
 }
 
 
-Inset * InsetBibitem::clone(Buffer const &) const
+auto_ptr<InsetBase> InsetBibitem::clone() const
 {
        InsetBibitem * b = new InsetBibitem(params());
        b->setCounter(counter);
-       return b;
+       return auto_ptr<InsetBase>(b);
 }
 
 
-// Inset * InsetBibitem::clone(Buffer const &, bool) const
-// {
-//     InsetBibitem * b = new InsetBibitem(params());
-//     b->setCounter(counter);
-//     return b;
-// }
-
-
 dispatch_result InsetBibitem::localDispatch(FuncRequest const & cmd)
 {
        switch (cmd.action) {
@@ -72,20 +70,8 @@ dispatch_result InsetBibitem::localDispatch(FuncRequest const & cmd)
                InsetCommandMailer::string2params(cmd.argument, p);
                if (p.getCmdName().empty())
                        return DISPATCHED;
-
-               if (view() && p.getContents() != params().getContents()) {
-                       view()->ChangeCitationsIfUnique(params().getContents(),
-                                                       p.getContents());
-               }
-
                setParams(p);
                cmd.view()->updateInset(this);
-
-               // We need to do a redraw because the maximum
-               // InsetBibitem width could have changed
-#warning please check you mean repaint() not update(),
-#warning and whether the repaint() is needed at all
-               cmd.view()->repaint();
                cmd.view()->fitCursor();
                return DISPATCHED;
        }
@@ -106,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())
@@ -117,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());
@@ -138,23 +124,24 @@ string const InsetBibitem::getBibLabel() const
 }
 
 
-string const InsetBibitem::getScreenLabel(Buffer const *) const
+string const InsetBibitem::getScreenLabel(Buffer const &) const
 {
        return getContents() + " [" + getBibLabel() + ']';
 }
 
 
 // ale070405 This function maybe shouldn't be here. We'll fix this at 0.13.
-int bibitemMaxWidth(BufferView * bv, LyXFont const & font)
+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()) {
-                       int const wx = it->bibitem()->width(bv, font);
+#warning metrics broken!
+                       int const wx = it->bibitem()->width();
                        if (wx > w)
                                w = wx;
                }
@@ -164,7 +151,7 @@ int bibitemMaxWidth(BufferView * bv, LyXFont const & font)
 
 
 // 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)
@@ -172,8 +159,9 @@ 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()) {
                        int const wx =