NEW_INSETS changes, + some small things in insettabular.C

[lyx.git] / src / trans_mgr.h

diff --git a/src/trans_mgr.h b/src/trans_mgr.h
index e393e347907cf194be3899212469bc2282c789a5..1a6917386f585e9708336643c3e1ab2654074819 100644 (file)
--- a/src/trans_mgr.h
+++ b/src/trans_mgr.h
@@ -18,7 +18,7 @@ class Trans;
 class TransState {
 public:
        ///
-       virtual ~TransState();
+       virtual ~TransState() {}
        ///
        virtual string normalkey(char, char *) = 0;
        ///
@@ -61,38 +61,37 @@ public:
 
 
 /// Init State
-class TransInitState: 
+class TransInitState : 
        virtual public TransFSMData,
        public TransState {
 public:
-               ///
-               TransInitState();
-               ///
-               virtual string normalkey(char, char *);
-               ///
-               virtual bool backspace() { return true; }
-               ///
-               virtual string deadkey(char, KmodInfo);
+       ///
+       TransInitState();
+       ///
+       virtual string normalkey(char, char *);
+       ///
+       virtual bool backspace() { return true; }
+       ///
+       virtual string deadkey(char, KmodInfo);
 };
 
 
 /// Deadkey State
-class TransDeadkeyState: 
+class TransDeadkeyState : 
        virtual public TransFSMData,
        public TransState {
 public:
-               ///
-               TransDeadkeyState();
-               ///
-               virtual string normalkey(char, char *);
-               ///
-               virtual bool backspace()
-       {
+       ///
+       TransDeadkeyState();
+       ///
+       virtual string normalkey(char, char *);
+       ///
+       virtual bool backspace() {
                currentState = init_state_;
                return false;
        }
-               ///
-               virtual string deadkey(char, KmodInfo);
+       ///
+       virtual string deadkey(char, KmodInfo);
 };
 
 
@@ -101,13 +100,12 @@ class TransCombinedState:
        virtual public TransFSMData,
        public TransState {
 public:
-               ///
-               TransCombinedState();
-               ///
-               virtual string normalkey(char, char *);
-               ///
-               virtual bool backspace()
-       {
+       ///
+       TransCombinedState();
+       ///
+       virtual string normalkey(char, char *);
+       ///
+       virtual bool backspace() {
                // cancel the second deadkey
                deadkey2_ = 0;
                deadkey2_info_.accent = TEX_NOACCENT;
@@ -115,13 +113,13 @@ public:
                
                return false;
        }
-               ///
-               virtual string deadkey(char, KmodInfo);
+       ///
+       virtual string deadkey(char, KmodInfo);
 };
 
 
 ///
-class TransFSM:        
+class TransFSM :       
        virtual public TransFSMData,
        public TransInitState,
        public TransDeadkeyState,
@@ -132,9 +130,9 @@ public:
        TransFSM();
 };
 
+
 ///
-class TransManager
-{
+class TransManager {
 private:
        ///
        TransFSM trans_fsm_;
@@ -149,7 +147,7 @@ private:
        ///
        CharacterSet chset_;
        ///
-       void insert(string, LyXText *);
+       void insert(string const &, LyXText *);
        ///
        void insertVerbatim(string const &, LyXText *);
 public:
@@ -170,8 +168,7 @@ public:
        ///
        bool setCharset(const char *);
        ///
-       bool backspace()
-       {
+       bool backspace() {
                return trans_fsm_.currentState->backspace();
        }
        ///
@@ -182,7 +179,6 @@ public:
        inline string normalkey(char, char *);
        ///
        void deadkey(char, tex_accent, LyXText *);
-    
 };