Fix breakage caused by bad commits.

[lyx.git] / src / intl.h

diff --git a/src/intl.h b/src/intl.h
index e2dfad5922881dbc3496b0f80dceea326722e095..6a113cd9a999eda37dcc21a927f6107e81131882 100644 (file)
--- a/src/intl.h
+++ b/src/intl.h
@@ -1,22 +1,20 @@
 // -*- C++ -*-
 /**
  * \file intl.h
- * Copyright 1995-2002 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
  * \author unknown
- * \author John Levon <moz@compsoc.man.ac.uk>
+ * \author Lars Gullik Bjønnes
+ * \author Angus Leeming
+ * \author John Levon
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
- 
 #ifndef INTL_H
 #define INTL_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "LString.h"
 #include "trans_mgr.h"
 
 
@@ -35,22 +33,22 @@ 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 & getTrans();
+       TransManager & getTransManager();
 
        /// using primary or secondary keymap ?
        Keymap keymap;
@@ -59,16 +57,16 @@ 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;
 };
 
 
 inline
-TransManager & Intl::getTrans()
+TransManager & Intl::getTransManager()
 {
        return trans;
 }