Amend 207eaeee9071cb

[lyx.git] / src / Trans.h

diff --git a/src/Trans.h b/src/Trans.h
index 4befc657402071db3f2755ba1f150efd5f0c835a..61a57b8e1ef32fe5669abd5c3bcba8fa95ddd493 100644 (file)
--- a/src/Trans.h
+++ b/src/Trans.h
@@ -26,9 +26,10 @@ namespace lyx {
 
 class Cursor;
 class Text;
-class Lexer;
 class TransManager;
 
+namespace support { class Lexer; }
+
 ///
 enum tex_accent {
        ///
@@ -149,7 +150,7 @@ private:
        ///
        void freeKeymap();
        ///
-       int load(Lexer &);
+       int load(support::Lexer &);
        ///
        docstring const & match(char_type c);
        ///
@@ -238,11 +239,11 @@ public:
        ///
        TransInitState();
        ///
-       virtual docstring const normalkey(char_type);
+       docstring const normalkey(char_type) override;
        ///
-       virtual bool backspace() { return true; }
+       bool backspace() override { return true; }
        ///
-       virtual docstring const deadkey(char_type, KmodInfo);
+       docstring const deadkey(char_type, KmodInfo) override;
 };
 
 
@@ -252,14 +253,14 @@ public:
        ///
        TransDeadkeyState();
        ///
-       virtual docstring const normalkey(char_type);
+       docstring const normalkey(char_type) override;
        ///
-       virtual bool backspace() {
+       bool backspace() override {
                currentState = init_state_;
                return false;
        }
        ///
-       virtual docstring const deadkey(char_type, KmodInfo);
+       docstring const deadkey(char_type, KmodInfo) override;
 };
 
 
@@ -269,9 +270,9 @@ public:
        ///
        TransCombinedState();
        ///
-       virtual docstring const normalkey(char_type);
+       docstring const normalkey(char_type) override;
        ///
-       virtual bool backspace() {
+       bool backspace() override {
                // cancel the second deadkey
                deadkey2_ = 0;
                deadkey2_info_.accent = TEX_NOACCENT;
@@ -280,7 +281,7 @@ public:
                return false;
        }
        ///
-       virtual docstring const deadkey(char_type, KmodInfo);
+       docstring const deadkey(char_type, KmodInfo) override;
 };