A better fix for bug 675:

[lyx.git] / src / trans.h

diff --git a/src/trans.h b/src/trans.h
index a7edae7ce86798cb3feed6431a25441e4b8068f2..ce529a2b9f991c2d58bf850373d2e52e35dcdd86 100644 (file)
--- a/src/trans.h
+++ b/src/trans.h
@@ -14,11 +14,13 @@
 #ifndef TRANS_H
 #define TRANS_H
 
+#include "trans_decl.h"
+
 #include <map>
 
-#include "tex-accent.h"
-#include "support/std_string.h"
-#include "trans_decl.h"
+
+namespace lyx {
+
 
 class LyXLex;
 
@@ -35,36 +37,36 @@ public:
        ~Trans();
 
        ///
-       int Load(string const & language);
+       int load(std::string const & language);
        ///
-       bool IsDefined() const;
+       bool isDefined() const;
        ///
-       string const & GetName() const;
+       std::string const & getName() const;
        ///
-       string const process(char, TransManager &);
+       std::string const process(char, TransManager &);
        ///
        bool isAccentDefined(tex_accent, KmodInfo &) const;
 
 private:
        ///
-       void AddDeadkey(tex_accent, string const &);
+       void addDeadkey(tex_accent, std::string const &);
        ///
-       void FreeKeymap();
+       void freeKeymap();
        ///
-       int Load(LyXLex &);
+       int load(LyXLex &);
        ///
-       string const & Match(unsigned char c);
+       std::string const & match(unsigned char c);
        ///
-       void InsertException(KmodException & exclist, char c,
-                            string const & data, bool = false,
+       void insertException(KmodException & exclist, char c,
+                            std::string const & data, bool = false,
                             tex_accent = TEX_NOACCENT);
        ///
-       void FreeException(KmodException & exclist);
+       void freeException(KmodException & exclist);
 
        ///
-       string name_;
+       std::string name_;
        ///
-       std::map<int, string> keymap_;
+       std::map<int, std::string> keymap_;
        ///
        std::map<int, KmodInfo> kmod_list_;
 };
@@ -72,14 +74,17 @@ private:
 
 ///
 inline
-string const & Trans::Match(unsigned char c)
+std::string const & Trans::match(unsigned char c)
 {
-       std::map<int, string>::iterator it = keymap_.find(c);
+       std::map<int, std::string>::iterator it = keymap_.find(c);
        if (it != keymap_.end()) {
                return it->second;
        }
-       static string dummy;
+       static std::string dummy;
        return dummy;
 }
 
+
+} // namespace lyx
+
 #endif // TRANS_H