SCons: msvc does not need this /TP option any more after we rename .C => .cpp. Also...

[lyx.git] / src / factory.cpp

diff --git a/src/factory.cpp b/src/factory.cpp
index f46d9c85a8714751f0e41a6d11deee192909136a..c790a377037479a1c6cc2a138a036d0158318351 100644 (file)
--- a/src/factory.cpp
+++ b/src/factory.cpp
@@ -68,6 +68,10 @@
 
 #include <sstream>
 
+using std::auto_ptr;
+using std::endl;
+using std::string;
+
 
 namespace lyx {
 
@@ -75,14 +79,10 @@ namespace Alert = frontend::Alert;
 
 using support::compare_ascii_no_case;
 
-using std::auto_ptr;
-using std::endl;
-using std::string;
-
 
 Inset * createInset(BufferView * bv, FuncRequest const & cmd)
 {
-       BufferParams const & params = bv->buffer()->params();
+       BufferParams const & params = bv->buffer().params();
 
        try {
 
@@ -207,7 +207,7 @@ Inset * createInset(BufferView * bv, FuncRequest const & cmd)
                                r = 2;
                        if (c <= 0)
                                c = 2;
-                       return new InsetTabular(*bv->buffer(), r, c);
+                       return new InsetTabular(bv->buffer(), r, c);
                }
 
                case LFUN_CAPTION_INSERT: {
@@ -270,7 +270,7 @@ Inset * createInset(BufferView * bv, FuncRequest const & cmd)
                                return new InsetListings(params, par);
 
                        } else if (name == "external") {
-                               Buffer const & buffer = *bv->buffer();
+                               Buffer const & buffer = bv->buffer();
                                InsetExternalParams iep;
                                InsetExternalMailer::string2params(to_utf8(cmd.argument()),
                                        buffer, iep);
@@ -279,7 +279,7 @@ Inset * createInset(BufferView * bv, FuncRequest const & cmd)
                                return inset.release();
 
                        } else if (name == "graphics") {
-                               Buffer const & buffer = *bv->buffer();
+                               Buffer const & buffer = bv->buffer();
                                InsetGraphicsParams igp;
                                InsetGraphicsMailer::string2params(to_utf8(cmd.argument()),
                                        buffer, igp);
@@ -314,7 +314,7 @@ Inset * createInset(BufferView * bv, FuncRequest const & cmd)
                                InsetCommandParams icp(name);
                                InsetCommandMailer::string2params(name, to_utf8(cmd.argument()),
                                        icp);
-                               return new InsetRef(icp, *bv->buffer());
+                               return new InsetRef(icp, bv->buffer());
 
                        } else if (name == "toc") {
                                InsetCommandParams icp("tableofcontents");
@@ -538,9 +538,7 @@ Inset * readInset(Lexer & lex, Buffer const & buf)
 
                inset->read(buf, lex);
 
-#ifdef WITH_WARNINGS
-#warning hack..
-#endif
+// FIXME: hack..
                if (inset->lyxCode() == Inset::MATHMACRO_CODE) {
                        MathMacroTemplate const * tmpl =
                                static_cast<MathMacroTemplate*>(inset.get());