Remove updateInfo() calls in favor of doing the relevant work

[lyx.git] / src / factory.cpp

diff --git a/src/factory.cpp b/src/factory.cpp
index a03f88fa2838900d71da17959df81bcd4d2afc1d..3937a9e7f882b8c6f27069fceda8d29880063d1d 100644 (file)
--- a/src/factory.cpp
+++ b/src/factory.cpp
@@ -59,7 +59,7 @@
 #include "insets/InsetVSpace.h"
 #include "insets/InsetWrap.h"
 
-#include "mathed/MathMacroTemplate.h"
+#include "mathed/InsetMathMacroTemplate.h"
 #include "mathed/InsetMathHull.h"
 
 #include "frontends/alert.h"
@@ -263,7 +263,6 @@ Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd)
 
                case LFUN_INFO_INSERT: {
                        InsetInfo * inset = new InsetInfo(buf, to_utf8(cmd.argument()));
-                       inset->updateInfo();
                        return inset;
                }
 
@@ -283,30 +282,30 @@ Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd)
                        case NO_CODE:
                                lyxerr << "No such inset '" << name << "'.";
                                return 0;
-                       
+
                        case BIBITEM_CODE: {
                                InsetCommandParams icp(code);
                                InsetCommand::string2params(to_utf8(cmd.argument()), icp);
                                return new InsetBibitem(buf, icp);
                        }
-                       
+
                        case BIBTEX_CODE: {
                                InsetCommandParams icp(code);
                                InsetCommand::string2params(to_utf8(cmd.argument()), icp);
                                return new InsetBibtex(buf, icp);
                        }
-                       
+
                        case CITE_CODE: {
                                InsetCommandParams icp(code);
                                InsetCommand::string2params(to_utf8(cmd.argument()), icp);
                                return new InsetCitation(buf, icp);
                        }
-                       
+
                        case ERT_CODE: {
                                return new InsetERT(buf,
                                        InsetERT::string2params(to_utf8(cmd.argument())));
                        }
-                       
+
                        case EXTERNAL_CODE: {
                                InsetExternalParams iep;
                                InsetExternal::string2params(to_utf8(cmd.argument()), *buf, iep);
@@ -315,7 +314,7 @@ Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd)
                                inset->setParams(iep);
                                return inset.release();
                        }
-                       
+
                        case GRAPHICS_CODE: {
                                InsetGraphicsParams igp;
                                InsetGraphics::string2params(to_utf8(cmd.argument()), *buf, igp);
@@ -323,54 +322,54 @@ Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd)
                                inset->setParams(igp);
                                return inset.release();
                        }
-                       
+
                        case HYPERLINK_CODE: {
                                InsetCommandParams icp(code);
                                InsetCommand::string2params(to_utf8(cmd.argument()), icp);
                                return new InsetHyperlink(buf, icp);
                        }
-                       
+
                        case INCLUDE_CODE: {
                                InsetCommandParams icp(code);
                                InsetCommand::string2params(to_utf8(cmd.argument()), icp);
                                return new InsetInclude(buf, icp);
                        }
-                       
+
                        case INDEX_CODE: {
                                docstring arg = cmd.argument();
                                return new InsetIndex(buf, InsetIndexParams(arg));
                        }
-                       
+
                        case INDEX_PRINT_CODE:  {
                                InsetCommandParams icp(code);
                                InsetCommand::string2params(to_utf8(cmd.argument()), icp);
                                return new InsetPrintIndex(buf, icp);
                        }
-                       
+
                        case LABEL_CODE: {
                                InsetCommandParams icp(code);
                                InsetCommand::string2params(to_utf8(cmd.argument()), icp);
                                return new InsetLabel(buf, icp);
                        }
-                       
+
                        case LINE_CODE: {
                                InsetCommandParams icp(code);
                                InsetCommand::string2params(to_utf8(cmd.argument()), icp);
                                return new InsetLine(buf, icp);
                        }
-                               
+
                        case LISTINGS_CODE: {
                                InsetListingsParams par;
                                InsetListings::string2params(to_utf8(cmd.argument()), par);
                                return new InsetListings(buf, par);
                        }
-                       
+
                        case NOMENCL_CODE: {
                                InsetCommandParams icp(code);
                                InsetCommand::string2params(to_utf8(cmd.argument()), icp);
                                return new InsetNomencl(buf, icp);
                        }
-                       
+
                        case REF_CODE: {
                                InsetCommandParams icp(code);
                                InsetCommand::string2params(to_utf8(cmd.argument()), icp);
@@ -388,13 +387,13 @@ Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd)
                                InsetSpace::string2params(to_utf8(cmd.argument()), isp);
                                return new InsetSpace(isp);
                        }
-                       
+
                        case TOC_CODE: {
                                InsetCommandParams icp(code);
                                InsetCommand::string2params(to_utf8(cmd.argument()), icp);
                                return new InsetTOC(buf, icp);
                        }
-                       
+
                        case VSPACE_CODE: {
                                VSpace vspace;
                                InsetVSpace::string2params(to_utf8(cmd.argument()), vspace);
@@ -403,12 +402,12 @@ Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd)
 
                        case PREVIEW_CODE:
                                return new InsetPreview(buf);
-                       
+
                        default:
                                lyxerr << "Inset '" << name << "' not permitted with LFUN_INSET_INSERT."
                                                << endl;
                                return 0;
-                       
+
                        }
                } //end LFUN_INSET_INSERT
 
@@ -521,7 +520,7 @@ Inset * readInset(Lexer & lex, Buffer * buf)
        lex >> tmptok;
 
        // test the different insets
-       
+
        // FIXME It would be better if we did not have this branch and could
        // just do one massive switch for all insets. But at present, it's
        // easier to do it this way, and we can't do the massive switch until
@@ -533,9 +532,9 @@ Inset * readInset(Lexer & lex, Buffer * buf)
                lex.next();
                string const insetType = lex.getString();
                lex.pushToken(insetType);
-               
+
                InsetCode const code = insetCode(insetType);
-               
+
                //FIXME If we do the one massive switch, we cannot do this here, since
                //we do not know in advance that we're dealing with a command inset.
                //Worst case, we could put it in each case below. Better, we could
@@ -550,7 +549,7 @@ Inset * readInset(Lexer & lex, Buffer * buf)
                        case BIBTEX_CODE:
                                inset.reset(new InsetBibtex(buf, inscmd));
                                break;
-                       case CITE_CODE: 
+                       case CITE_CODE:
                                inset.reset(new InsetCitation(buf, inscmd));
                                break;
                        case HYPERLINK_CODE:
@@ -591,7 +590,7 @@ Inset * readInset(Lexer & lex, Buffer * buf)
                                return 0;
                }
                inset->setBuffer(*buf);
-       } else { 
+       } else {
                // FIXME This branch should be made to use inset codes
                // as the preceding branch does. Unfortunately, that
                // will take some doing. It requires converting the
@@ -606,7 +605,7 @@ Inset * readInset(Lexer & lex, Buffer * buf)
                } else if (tmptok == "External") {
                        inset.reset(new InsetExternal(buf));
                } else if (tmptok == "FormulaMacro") {
-                       inset.reset(new MathMacroTemplate(buf));
+                       inset.reset(new InsetMathMacroTemplate(buf));
                } else if (tmptok == "Formula") {
                        inset.reset(new InsetMathHull(buf));
                } else if (tmptok == "Graphics") {