clean code to export between different flavours, output different code for sgml to...

[lyx.git] / src / chset.C

diff --git a/src/chset.C b/src/chset.C
index 737c2eeefd28c83b68f35832d9c07bee9839a407..e97330e2ff656542af8955fa7b42a7e54dca04d1 100644 (file)
--- a/src/chset.C
+++ b/src/chset.C
@@ -1,27 +1,42 @@
-#include <config.h>
+/**
+ * \file chset.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include <config.h>
 
 #include "chset.h"
+
+#include "debug.h"
+
 #include "support/filetools.h"
 #include "support/lyxlib.h"
-#include "debug.h"
 
 #include <boost/regex.hpp>
 
 #include <fstream>
 
-using std::ifstream;
-using std::getline;
-using std::pair;
-using std::make_pair;
-using std::endl;
+using lyx::support::atoi;
+using lyx::support::LibFileSearch;
+
 using boost::regex;
-using boost::regex_match;
 using boost::smatch;
 
+using std::endl;
+using std::getline;
+using std::make_pair;
+
+using std::ifstream;
+using std::pair;
+using std::string;
+
+
 bool CharacterSet::loadFile(string const & fname)
 {
        map_.clear();
@@ -51,11 +66,11 @@ bool CharacterSet::loadFile(string const & fname)
        while (getline(ifs, line)) {
                smatch sub;
                if (regex_match(line, sub, reg)) {
-                       int const n = lyx::atoi(sub[1]);
-                       string const str = sub[2];
+                       int const n = atoi(sub.str(1));
+                       string const str = sub.str(2);
                        if (lyxerr.debugging(Debug::KBMAP))
                                lyxerr << "Chardef: " << n
-                                      << " to [" << str << "]" << endl;
+                                      << " to [" << str << ']' << endl;
                        map_[str] = n;
                }
        }
@@ -66,7 +81,7 @@ bool CharacterSet::loadFile(string const & fname)
 
 pair<bool, int> const CharacterSet::encodeString(string const & str) const
 {
-       lyxerr[Debug::KBMAP] << "Checking if we know [" << str << "]" << endl;
+       lyxerr[Debug::KBMAP] << "Checking if we know [" << str << ']' << endl;
        bool ret = false;
        int val = 0;
        Cdef::const_iterator cit = map_.find(str);
@@ -76,7 +91,7 @@ pair<bool, int> const CharacterSet::encodeString(string const & str) const
        }
        lyxerr[Debug::KBMAP] << "   "
                             << (ret ? "yes we" : "no we don't")
-                            <<  " know [" << str << "]" << endl;
+                            <<  " know [" << str << ']' << endl;
        return make_pair(ret, val);
 }