Compile fixes following this weekends commits.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3371 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index e065672754bba0fc2beae28677d56498ff3abae3..351944958a89cae1da35fa3267ed9a68cbe81981 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2002-01-14  Angus Leeming  <a.leeming@ic.ac.uk>
+
+       * ToolbarDefaults.C: remove trailing comma closing namespace.
+
+       * WorkArea.h: remove WorkArea:: from declaration of event_cb.
+
+       * lyxfunc.[Ch]: clean-up declaration of verboseDispatch functions
+       as in WorkArea.
+
+       * trans.C (Load): comment out unused variable, allowed.
+
 2002-01-11  Angus Leeming  <a.leeming@ic.ac.uk>
 
        * minibuffer.[Ch] (append_char): new method to recieve input from the

diff --git a/src/ToolbarDefaults.C b/src/ToolbarDefaults.C
index b81d79bd846f65639770848357ac6bd1861d4d58..9f4dddc0c2770ed9de6060dae719d567c38488f2 100644 (file)
--- a/src/ToolbarDefaults.C
+++ b/src/ToolbarDefaults.C
@@ -47,7 +47,7 @@ struct keyword_item toolTags[TO_LAST - 1] = {
        { "separator", TO_SEPARATOR }
 };
 
-}; // end of anon namespace
+} // end of anon namespace
 
 
 ToolbarDefaults::ToolbarDefaults()

diff --git a/src/WorkArea.h b/src/WorkArea.h
index 872323573eb5f181a15ca336dfb8ed2e410e37f8..6a1dde6b5f412bdc5136bb3a2319939f7300deaa 100644 (file)
--- a/src/WorkArea.h
+++ b/src/WorkArea.h
@@ -130,7 +130,7 @@ public:
        SigC::Signal0<void> selectionRequested;
  
        /// handles SelectionRequest X Event, to fill the clipboard
-       void WorkArea::event_cb(XEvent * xev);
+       void event_cb(XEvent * xev);
 private:
        ///
        void createPixmap(int, int);

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 26c1f9fa9d3399273bfc4e7b6146e363ccb39461..cdccd0689faf48e56f0a247acec12bd6227001a9 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -754,7 +754,7 @@ void LyXFunc::miniDispatch(string const & s)
 }
 
 
-void const LyXFunc::verboseDispatch(string const & s, bool show_sc) 
+void LyXFunc::verboseDispatch(string const & s, bool show_sc) 
 {
        int action = lyxaction.LookupFunc(frontStrip(s));
  
@@ -768,7 +768,7 @@ void const LyXFunc::verboseDispatch(string const & s, bool show_sc)
 }
 
 
-void const LyXFunc::verboseDispatch(int ac, bool show_sc) 
+void LyXFunc::verboseDispatch(int ac, bool show_sc) 
 {
        string argument;
        kb_action action;
@@ -781,8 +781,8 @@ void const LyXFunc::verboseDispatch(int ac, bool show_sc)
 
 
 
-void const LyXFunc::verboseDispatch(kb_action action,
-                                   string const & argument, bool show_sc)
+void LyXFunc::verboseDispatch(kb_action action,
+                             string const & argument, bool show_sc)
 {
        string res = dispatch(action, argument);
 

diff --git a/src/lyxfunc.h b/src/lyxfunc.h
index 925984661542fbe4009b847a6ec30cf37ed63af0..9cd6458def1c9d28723a9a2fd1e2c71166595594 100644 (file)
--- a/src/lyxfunc.h
+++ b/src/lyxfunc.h
@@ -35,18 +35,18 @@ public:
 
        /// The same as dispatch, but also shows shortcuts and command
        /// name in minibuffer if show_sc is true (more to come?) 
-       void const LyXFunc::verboseDispatch(kb_action action,
-                                           string const & argument,
-                                           bool show_sc);
+       void verboseDispatch(kb_action action,
+                            string const & argument,
+                            bool show_sc);
        
        /// Same as above, using a pseudoaction as argument
-       void const LyXFunc::verboseDispatch(int ac, bool show_sc);
+       void verboseDispatch(int ac, bool show_sc);
 
        /// Same as above, when the command is provided as a string
-       void const LyXFunc::verboseDispatch(string const & s, bool show_sc);
+       void verboseDispatch(string const & s, bool show_sc);
 
        /// 
-       void LyXFunc::miniDispatch(string const & s);
+       void miniDispatch(string const & s);
 
        ///
        void initMiniBuffer();

diff --git a/src/trans.C b/src/trans.C
index d9a9529279460b785e5715e305a47a976d2c98d2..81c4b71dfedf32388f4103d18e97ee8cf0eb2275 100644 (file)
--- a/src/trans.C
+++ b/src/trans.C
@@ -152,7 +152,7 @@ int Trans::Load(LyXLex & lex)
                        } else
                                return -1;
 
-                       string const allowed = lex.getString();
+                       /* string const allowed = lex.getString(); */
                        AddDeadkey(accent, keys /*, allowed*/);
 #else
                        AddDeadkey(accent, keys);