Further cleanup of InsetFlex, InsetCollapsable and InsetLayout:

[lyx.git] / src / Lexer.cpp

diff --git a/src/Lexer.cpp b/src/Lexer.cpp
index 4db980859f9d70b7277e2f79c172670d9a936d5e..e3f1bae89acc46e511f5f83d6780e2c2c2deaae7 100644 (file)
--- a/src/Lexer.cpp
+++ b/src/Lexer.cpp
@@ -25,7 +25,7 @@
 #include "support/types.h"
 #include "support/unicode.h"
 
-#include <boost/utility.hpp>
+#include <boost/noncopyable.hpp>
 
 #include <functional>
 #include <istream>
@@ -38,7 +38,6 @@ namespace lyx {
 
 using support::compare_ascii_no_case;
 using support::FileName;
-using support::getFormatFromContents;
 using support::isStrDbl;
 using support::isStrInt;
 using support::ltrim;
@@ -253,7 +252,7 @@ void Lexer::Pimpl::popTable()
 bool Lexer::Pimpl::setFile(FileName const & filename)
 {
        // Check the format of the file.
-       string const format = getFormatFromContents(filename);
+       string const format = filename.guessFormatFromContents();
 
        if (format == "gzip" || format == "zip" || format == "compress") {
                LYXERR(Debug::LYXLEX) << "lyxlex: compressed" << endl;