fix typo that put too many include paths for most people

[lyx.git] / src / intl.h

diff --git a/src/intl.h b/src/intl.h
index 0faf1a6712fc3fb5f7e2dad317d323c24a489665..e83ad9d7a5130668d6692f40ea538f6fad6428dd 100644 (file)
--- a/src/intl.h
+++ b/src/intl.h
@@ -1,107 +1,56 @@
 // -*- C++ -*-
-/* International support for LyX
-
-
- */
+/* International support for LyX */
 #ifndef INTL_H
 #define INTL_H
 
-#include FORMS_H_LOCATION
-
 #ifdef __GNUG__
 #pragma interface
 #endif
 
-#include <boost/smart_ptr.hpp>
-#include <sigc++/signal_system.h>
 #include "LString.h"
-#include "form1.h"
 #include "trans_mgr.h"
 
-class LyXText;
-class Combox;
-
-#ifdef SIGC_CXX_NAMESPACES
-using SigC::Object;
-using SigC::Connection;
-#endif
 
-/// default character set
-#define DEFCHSET "iso8859-1"
-
-
-/** The gui part and the non gui part should be split into two different
-  classes. Probably should the gui class just have a pointer to the non
-  gui class.
-  */
-class Intl : public Object {
+class Intl {
 public:
-       ///
+       /// which keymap is currently used ?
+       enum Keymap {
+               PRIMARY,
+               SECONDARY
+       };
+
        Intl();
-       ///
-       ~Intl();
-       
-       /// show key mapping dialog
-       void MenuKeymap(); 
-       ///
+
+       /// {en/dis}able the keymap
        void KeyMapOn(bool on);
-       ///
+
+       /// set the primary language keymap
        void KeyMapPrim();
-       ///
+
+       /// set the secondary language keymap
        void KeyMapSec();
 
        /// turn on/off key mappings, status in keymapon
        void ToggleKeyMap();
 
-       ///
-       int SetPrimary(string const &);
-
-       ///
-       int SetSecondary(string const &);
-
        /// initialize key mapper
        void InitKeyMapper(bool on);
 
        // Get the Translation Manager
        TransManager & getTrans();
-       ///
-       bool keymapon;
-       ///
-       bool primarykeymap;
-       ///
-       char * chsetcode;
-       ///
-       static void DispatchCallback(FL_OBJECT *, long);
+
+       /// using primary or secondary keymap ?
+       Keymap keymap;
+
 private:
-       /** Redraw the form (on receipt of a Signal indicating, for example,
-           that the xform colors have been re-mapped).
-       */
-       void redraw();
-       ///
-       void update();
-       ///
-       static void LCombo(int i, void *, Combox *); // callback
-       ///
-       void Keymap(long code);
-       ///
-       int curkeymap;
-       ///
-       int otherkeymap;
-       
-       ///
-       FD_KeyMap * fd_form_keymap;
-       ///
-       boost::scoped_ptr<Combox> Language;
-       ///
-       boost::scoped_ptr<Combox> Language2;
-       ///
+       /// is key mapping enabled ?
+       bool keymapon;
+       /// the primary language keymap
        string & prim_lang;
-       ///
+       /// the secondary language keymap
        string & sec_lang;
-       ///
+       /// the translation manager
        TransManager trans;
-       /// Redraw connection.
-       Connection r_;
 };
 
 
@@ -111,4 +60,4 @@ TransManager & Intl::getTrans()
        return trans;
 }
 
-#endif
+#endif /* INTL_H */