citation patch from Angus

[lyx.git] / src / trans_mgr.h

diff --git a/src/trans_mgr.h b/src/trans_mgr.h
index 7e23cc46dd81c7b721e17915820f942cad25f25a..f3abf31c13d8c45063450fc3035f9a4ff2e6d78e 100644 (file)
--- a/src/trans_mgr.h
+++ b/src/trans_mgr.h
@@ -61,53 +61,45 @@ public:
 
 
 /// Init State
-class TransInitState: 
-       virtual public TransFSMData,
-       public TransState {
+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: 
-       virtual public TransFSMData,
-       public TransState {
+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);
 };
 
 
 /// Combined State
-class TransCombinedState: 
-       virtual public TransFSMData,
-       public TransState {
+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,26 +107,24 @@ public:
                
                return false;
        }
-               ///
-               virtual string deadkey(char, KmodInfo);
+       ///
+       virtual string deadkey(char, KmodInfo);
 };
 
 
 ///
-class TransFSM:        
-       virtual public TransFSMData,
-       public TransInitState,
-       public TransDeadkeyState,
-       public TransCombinedState
-{
+class TransFSM : virtual public TransFSMData,
+                public TransInitState,
+                public TransDeadkeyState,
+                public TransCombinedState {
 public:
        ///
        TransFSM();
 };
 
+
 ///
-class TransManager
-{
+class TransManager {
 private:
        ///
        TransFSM trans_fsm_;
@@ -149,7 +139,7 @@ private:
        ///
        CharacterSet chset_;
        ///
-       void insert(string, LyXText *);
+       void insert(string const &, LyXText *);
        ///
        void insertVerbatim(string const &, LyXText *);
 public:
@@ -170,8 +160,7 @@ public:
        ///
        bool setCharset(const char *);
        ///
-       bool backspace()
-       {
+       bool backspace() {
                return trans_fsm_.currentState->backspace();
        }
        ///