Fix breakage caused by bad commits.

[lyx.git] / src / intl.h

diff --git a/src/intl.h b/src/intl.h
index b4ca4393a7b537ec9143127bbc3190606abfa5bd..6a113cd9a999eda37dcc21a927f6107e81131882 100644 (file)
--- a/src/intl.h
+++ b/src/intl.h
@@ -17,8 +17,6 @@
 
 #include "trans_mgr.h"
 
-#include "support/std_string.h"
-
 
 /**
  * This class is used for managing keymaps
@@ -35,19 +33,19 @@ public:
        Intl();
 
        /// {en/dis}able the keymap
-       void KeyMapOn(bool on);
+       void keyMapOn(bool on);
 
        /// set the primary language keymap
-       void KeyMapPrim();
+       void keyMapPrim();
 
        /// set the secondary language keymap
-       void KeyMapSec();
+       void keyMapSec();
 
        /// turn on/off key mappings, status in keymapon
-       void ToggleKeyMap();
+       void toggleKeyMap();
 
        /// initialize key mapper
-       void InitKeyMapper(bool on);
+       void initKeyMapper(bool on);
 
        // Get the Translation Manager
        TransManager & getTransManager();
@@ -59,9 +57,9 @@ private:
        /// is key mapping enabled ?
        bool keymapon;
        /// the primary language keymap
-       string & prim_lang;
+       std::string & prim_lang;
        /// the secondary language keymap
-       string & sec_lang;
+       std::string & sec_lang;
        /// the translation manager
        TransManager trans;
 };