Point fix, earlier forgotten

[lyx.git] / src / factory.C

diff --git a/src/factory.C b/src/factory.C
index ad09f2151730a625adbe6de46a2a0f58fd018c0b..18bbb04dc2c8d494653f85ef8f2cc5eee337caec 100644 (file)
--- a/src/factory.C
+++ b/src/factory.C
@@ -5,7 +5,7 @@
  *
  * \author André Pönitz
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
@@ -37,6 +37,7 @@
 #include "insets/insetmarginal.h"
 #include "insets/insetminipage.h"
 #include "insets/insetnote.h"
+#include "insets/insetbranch.h"
 #include "insets/insetoptarg.h"
 #include "insets/insetref.h"
 #include "insets/insetspace.h"
@@ -71,7 +72,19 @@ InsetOld * createInset(FuncRequest const & cmd)
                return new InsetMinipage(params);
 
        case LFUN_INSERT_NOTE:
-               return new InsetNote(params, "Note");
+               {
+                       string arg = cmd.getArg(0);
+                       if (arg.empty())
+                               arg = "Note";
+                       return new InsetNote(params, arg);
+               }
+       case LFUN_INSERT_BRANCH:
+               {
+                       string arg = cmd.getArg(0);
+                       if (arg.empty())
+                               arg = "none";
+                       return new InsetBranch(params, arg);
+               }
 
        case LFUN_INSET_ERT:
                return new InsetERT(params);
@@ -124,8 +137,7 @@ InsetOld * createInset(FuncRequest const & cmd)
                if (icp.getContents().empty()) {
                        lv->getDialogs().show("index", data, 0);
                } else {
-                       FuncRequest fr(bv, LFUN_INSET_APPLY, data);
-                       lv->dispatch(fr);
+                       lv->dispatch(FuncRequest(bv, LFUN_INSET_APPLY, data));
                }
                return 0;
        }
@@ -147,8 +159,8 @@ InsetOld * createInset(FuncRequest const & cmd)
                        InsetCaption * inset = new InsetCaption(params);
                        inset->setOwner(bv->theLockingInset());
                        inset->setAutoBreakRows(true);
-                       inset->setDrawFrame(0, InsetText::LOCKED);
-                       inset->setFrameColor(0, LColor::captionframe);
+                       inset->setDrawFrame(InsetText::LOCKED);
+                       inset->setFrameColor(LColor::captionframe);
                        return inset;
                }
                return 0;
@@ -187,7 +199,7 @@ InsetOld * createInset(FuncRequest const & cmd)
                        InsetCommandParams icp;
                        InsetCommandMailer::string2params(cmd.argument, icp);
                        InsetCitation * inset = new InsetCitation(icp);
-                       inset->setLoadingBuffer(bv->buffer(), false);
+                       inset->setLoadingBuffer(*bv->buffer(), false);
                        return inset;
 
                } else if (name == "ert") {
@@ -198,10 +210,10 @@ InsetOld * createInset(FuncRequest const & cmd)
                        return inset;
 
                } else if (name == "external") {
-                       Buffer const * buffer = cmd.view()->buffer();
+                       Buffer const & buffer = *cmd.view()->buffer();
                        InsetExternal::Params iep;
                        InsetExternalMailer::string2params(cmd.argument,
-                                                          *buffer, iep);
+                                                          buffer, iep);
                        InsetExternal * inset = new InsetExternal;
                        inset->setParams(iep, buffer);
                        return inset;
@@ -354,6 +366,8 @@ InsetOld * readInset(LyXLex & lex, Buffer const & buf)
                } else if (tmptok == "Note"     || tmptok == "Comment"
                                || tmptok == "Greyedout") {
                        inset = new InsetNote(buf.params, tmptok);
+               } else if (tmptok == "Branch") {
+                       inset = new InsetBranch(buf.params, tmptok);
                } else if (tmptok == "Include") {
                        InsetCommandParams p("Include");
                        inset = new InsetInclude(p, buf);
@@ -397,7 +411,7 @@ InsetOld * readInset(LyXLex & lex, Buffer const & buf)
                }
 
                if (inset)
-                       inset->read(&buf, lex);
+                       inset->read(buf, lex);
        }
 
        return inset;