Bug fix in branches (was earlier fixed wrongly)

[lyx.git] / src / factory.C

diff --git a/src/factory.C b/src/factory.C
index 882c6cc896c3a4b41571bfd01ce57b621fc08f2c..4eabc25c46bce2c5260f3b9d53bae1954f777b94 100644 (file)
--- a/src/factory.C
+++ b/src/factory.C
@@ -18,6 +18,7 @@
 #include "debug.h"
 #include "FloatList.h"
 #include "funcrequest.h"
+#include "LColor.h"
 #include "lyxlex.h"
 
 #include "insets/insetbibitem.h"
@@ -54,7 +55,7 @@
 #include "support/lstrings.h"
 #include "support/std_sstream.h"
 
-using namespace lyx::support;
+using lyx::support::compare_ascii_no_case;
 
 using std::endl;
 
@@ -66,7 +67,7 @@ InsetOld * createInset(FuncRequest const & cmd)
 
        switch (cmd.action) {
        case LFUN_HFILL:
-               return new InsetHFill();
+               return new InsetHFill;
 
        case LFUN_INSET_MINIPAGE:
                return new InsetMinipage(params);
@@ -230,7 +231,7 @@ InsetOld * createInset(FuncRequest const & cmd)
                        return inset;
 
                } else if (name == "include") {
-                       InsetInclude::Params iip;
+                       InsetCommandParams iip;
                        InsetIncludeMailer::string2params(cmd.argument, iip);
                        return new InsetInclude(iip);
 
@@ -327,7 +328,7 @@ InsetOld * readInset(LyXLex & lex, Buffer const & buf)
                } else if (cmdName == "index") {
                        inset = new InsetIndex(inscmd);
                } else if (cmdName == "include") {
-                       inset = new InsetInclude(inscmd, buf);
+                       inset = new InsetInclude(inscmd);
                } else if (cmdName == "label") {
                        inset = new InsetLabel(inscmd);
                } else if (cmdName == "url"
@@ -369,10 +370,10 @@ InsetOld * readInset(LyXLex & lex, Buffer const & buf)
                                || tmptok == "Greyedout") {
                        inset = new InsetNote(buf.params(), tmptok);
                } else if (tmptok == "Branch") {
-                       inset = new InsetBranch(buf.params(), tmptok);
+                       inset = new InsetBranch(buf.params(), string());
                } else if (tmptok == "Include") {
                        InsetCommandParams p("Include");
-                       inset = new InsetInclude(p, buf);
+                       inset = new InsetInclude(p);
                } else if (tmptok == "Environment") {
                        lex.next();
                        inset = new InsetEnvironment(buf.params(), lex.getString());