* languages: use nb_NO instead of no_NO for norwegian (bug 2850).

[lyx.git] / src / trans_decl.h

diff --git a/src/trans_decl.h b/src/trans_decl.h
index 57ff760d76985791608063257c3cf7255e85f364..9d6aa5b467d92f9983944f854d5721cbc324709a 100644 (file)
--- a/src/trans_decl.h
+++ b/src/trans_decl.h
@@ -13,10 +13,13 @@
 #ifndef TRANS_DECL_H
 #define TRANS_DECL_H
 
-#include "support/std_string.h"
 #include "tex-accent.h"
 
 #include <list>
+#include <string>
+
+
+namespace lyx {
 
 
 ///
@@ -24,7 +27,7 @@ struct Keyexc {
        /// character to make exception
        char c;
        /// exception data
-       string data;
+       std::string data;
        /// Combination with another deadkey
        bool combined;
        /// The accent comined with
@@ -35,9 +38,10 @@ struct Keyexc {
 typedef std::list<Keyexc> KmodException;
 
 ///
-struct KmodInfo {
+class KmodInfo {
+public:
        ///
-       string data;
+       std::string data;
        ///
        tex_accent accent;
        ///
@@ -46,4 +50,7 @@ struct KmodInfo {
        KmodInfo();
 };
 
+
+} // namespace lyx
+
 #endif