From 3b7dd942e6640660759b1a21cc23dc8cb09f0f6d Mon Sep 17 00:00:00 2001
From: Angus Leeming <leeming@lyx.org>
Date: Mon, 14 Jan 2002 12:56:05 +0000
Subject: [PATCH] Compile fixes following this weekends commits.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3371 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/ChangeLog         | 11 +++++++++++
 src/ToolbarDefaults.C |  2 +-
 src/WorkArea.h        |  2 +-
 src/lyxfunc.C         |  8 ++++----
 src/lyxfunc.h         | 12 ++++++------
 src/trans.C           |  2 +-
 6 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index e065672754..351944958a 100644
--- 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 b81d79bd84..9f4dddc0c2 100644
--- 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 872323573e..6a1dde6b5f 100644
--- 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 26c1f9fa9d..cdccd0689f 100644
--- 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 9259846615..9cd6458def 100644
--- 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 d9a9529279..81c4b71dfe 100644
--- 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);