tostr -> convert and some bformat work

[lyx.git] / src / lyxlex_pimpl.C

diff --git a/src/lyxlex_pimpl.C b/src/lyxlex_pimpl.C
index e1c061d1a751ca0dd434bc0d3be8a5745d0185cd..af2b2577a4aa8f87c66a0c31d8363f44afe42f39 100644 (file)
--- a/src/lyxlex_pimpl.C
+++ b/src/lyxlex_pimpl.C
@@ -21,7 +21,7 @@
 #include "support/lstrings.h"
 
 using lyx::support::compare_ascii_no_case;
-using lyx::support::getExtFromContents;
+using lyx::support::getFormatFromContents;
 using lyx::support::MakeDisplayPath;
 using lyx::support::split;
 using lyx::support::subst;
@@ -35,18 +35,21 @@ using std::ios;
 using std::istream;
 using std::ostream;
 
-// namespace {
-struct compare_tags {
+namespace {
+
+struct compare_tags
+       : public std::binary_function<keyword_item, keyword_item, bool> {
        // used by lower_bound, sort and sorted
-       inline
-       int operator()(keyword_item const & a, keyword_item const & b) const {
+       bool operator()(keyword_item const & a, keyword_item const & b) const
+       {
                // we use the ascii version, because in turkish, 'i'
                // is not the lowercase version of 'I', and thus
                // turkish locale breaks parsing of tags.
                return compare_ascii_no_case(a.tag, b.tag) < 0;
        }
 };
-// } // end of anon namespace
+
+} // end of anon namespace
 
 
 LyXLex::Pimpl::Pimpl(keyword_item * tab, int num)
@@ -128,9 +131,8 @@ void LyXLex::Pimpl::popTable()
 
 bool LyXLex::Pimpl::setFile(string const & filename)
 {
-
        // Check the format of the file.
-       string const format = getExtFromContents(filename);
+       string const format = getFormatFromContents(filename);
 
        if (format == "gzip" || format == "zip" || format == "compress") {
                lyxerr[Debug::LYXLEX] << "lyxlex: compressed" << endl;