More 'standard conformant blurb' nonsense.

[lyx.git] / src / chset.C

diff --git a/src/chset.C b/src/chset.C
index 20e28319c5bb4b3b01cbb0ff5178bfb123de6015..e8072d739e58be96f4d23f982f78c216b04db494 100644 (file)
--- a/src/chset.C
+++ b/src/chset.C
@@ -1,9 +1,5 @@
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "chset.h"
 #include "support/filetools.h"
 #include "support/lyxlib.h"
@@ -13,6 +9,8 @@
 
 #include <fstream>
 
+using namespace lyx::support;
+
 using std::ifstream;
 using std::getline;
 using std::pair;
@@ -62,11 +60,11 @@ bool CharacterSet::loadFile(string const & fname)
                cmatch sub;
 #endif
                if (regex_match(STRCONV(line), sub, reg)) {
-                       int const n = lyx::atoi(STRCONV(sub.str(1)));
+                       int const n = atoi(STRCONV(sub.str(1)));
                        string const str = STRCONV(sub.str(2));
                        if (lyxerr.debugging(Debug::KBMAP))
                                lyxerr << "Chardef: " << n
-                                      << " to [" << str << "]" << endl;
+                                      << " to [" << str << ']' << endl;
                        map_[str] = n;
                }
        }
@@ -77,7 +75,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);
@@ -87,7 +85,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);
 }