Angus insetindex patch + protect patch from Dekel

[lyx.git] / src / intl.h

diff --git a/src/intl.h b/src/intl.h
index afb1ce44db29d63216476d02c8590361dc615378..e85036ceaba903745c6f95838c81fe06fd185008 100644 (file)
--- a/src/intl.h
+++ b/src/intl.h
@@ -3,19 +3,22 @@
 
 
  */
-#ifndef _INTL_H
-#define _INTL_H
+#ifndef INTL_H
+#define INTL_H
+
+#include FORMS_H_LOCATION
 
 #ifdef __GNUG__
 #pragma interface
 #endif
 
+#include "LString.h"
 #include "form1.h"
 
 class LyXText;
 class Combox;
 class TransManager;
-class LString;
+
 
 /// default character set
 #define DEFCHSET "iso8859-1"
@@ -30,8 +33,6 @@ class Intl
 public:
        ///
        Intl();
-       ///
-       ~Intl();
        
        /// show key mapping dialog
        void MenuKeymap(); 
@@ -46,26 +47,25 @@ public:
        void ToggleKeyMap();
 
        ///
-       int SetPrimary(LString const &);
+       int SetPrimary(string const &);
 
        ///
-       int SetSecondary(LString const &);
-
-       // insert correct stuff into paragraph
-       //void TranslateAndInsert(char c, LyXText *text);
+       int SetSecondary(string const &);
 
        /// initialize key mapper
        void InitKeyMapper(bool on);
 
        /// Get the Translation Manager
-       inline TransManager *getTrans();
+       TransManager * getTrans();
        ///
        bool keymapon;
        ///
-       char *chsetcode;
-private:
+       bool primarykeymap;
        ///
-       //int SelectCharset(char const *code);
+       char * chsetcode;
+       ///
+       static void DispatchCallback(FL_OBJECT *, long);
+private:
        ///
        void update();
        ///
@@ -75,30 +75,27 @@ private:
        ///
        void Keymap(long code);
        ///
-       static void DispatchCallback(FL_OBJECT*,long);
-       ///
-       bool primarykeymap;
-       ///
        int curkeymap;
        ///
        int otherkeymap;
        
        ///
-       FD_KeyMap *fd_form_keymap;
+       FD_KeyMap * fd_form_keymap;
        ///
-       Combox *Language;
+       Combox * Language;
        ///
-       Combox *Language2;
+       Combox * Language2;
        ///
-       LString& prim_lang;
+       string & prim_lang;
        ///
-       LString& sec_lang;
+       string & sec_lang;
        ///
-       TransManager *trans;
+       TransManager * trans;
 };
 
 
-TransManager* Intl::getTrans()
+inline
+TransManager * Intl::getTrans()
 {
        return trans;
 }