lyxfunc.h #included frontends/LyXKeySym.h for a typedef only. No more.

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

src/BufferView_pimpl.C

@@ -48,6 +48,7 @@
 #include "frontends/Alert.h"
 #include "frontends/Dialogs.h"
 #include "frontends/FileDialog.h"
+#include "frontends/LyXKeySym.h"
 #include "frontends/LyXView.h"
 #include "frontends/LyXScreenFactory.h"
 #include "frontends/screen.h"

src/BufferView_pimpl.h

@@ -18,22 +18,23 @@
 #ifndef BUFFERVIEW_PIMPL_H
 #define BUFFERVIEW_PIMPL_H
 
-#include "errorlist.h"
 #include "BufferView.h"
+#include "errorlist.h"
 
 #include "insets/inset.h"
 
 #include "frontends/key_state.h"
-#include "frontends/LyXKeySym.h"
 #include "frontends/Timeout.h"
 
 #include "support/types.h"
 
 #include <boost/scoped_ptr.hpp>
+#include <boost/shared_ptr.hpp>
 #include <boost/signals/trackable.hpp>
 
 
 class Change;
+class LyXKeySym;
 class LyXView;
 class WorkArea;
 class LyXScreen;
@@ -77,6 +78,8 @@ struct BufferView::Pimpl : public boost::signals::trackable {
 	 */
 	void scroll(int lines);
 	///
+	typedef boost::shared_ptr<LyXKeySym> LyXKeySymPtr;
+	///
 	void workAreaKeyPress(LyXKeySymPtr key, key_modifier::state state);
 	///
 	void selectionRequested();

src/ChangeLog

@@ -1,3 +1,21 @@
+2003-09-06  Angus Leeming  <leeming@lyx.org>
+
+	* BufferView_pimpl.h:
+	* kbmap.h:
+	* kbsequence.h:
+	* lyxfunc.h: forward declare LyXKeySym rather than
+	#include "frontends/LyXKeySym.h".
+
+	* BufferView_pimpl.C:
+	* kbmap.C:
+	* kbsequence.C:
+	* lyxfunc.C: associated changes.
+
+2003-09-06  Angus Leeming  <leeming@lyx.org>
+
+	* BufferView.[Ch] (ChangeInsets): moved to BufferView_pimpl.[Ch].
+	As a result, can remove the #include "insets/inset.h" from BufferView.h
+
 2003-09-06  Angus Leeming  <leeming@lyx.org>
 
 	* BufferView.[Ch] (ChangeInsets): moved to BufferView_pimpl.[Ch].

src/frontends/ChangeLog

@@ -1,3 +1,9 @@
+2003-09-06  Angus Leeming  <leeming@lyx.org>
+
+	* LyXKeySym.h: remove LyXKeySymPtr typedef.
+	* WorkArea.h: forward declare LyXKeySym rather than
+	#include "frontends/LyXKeySym.h".
+
 2003-09-05  Martin Vermeer  <martin.vermeer@hut.fi>
 
 	* Alert_pimpl.h: re-add missing system headers, needed for 2.95.2.

src/frontends/LyXKeySym.h

@@ -13,7 +13,6 @@
 #define LYXKEYSYM_H
 
 #include "support/std_string.h"
-#include <boost/shared_ptr.hpp>
 
 /**
  * This is a base class for representing a keypress.
@@ -57,6 +56,4 @@ public:
  */
 bool operator==(LyXKeySym const & k1, LyXKeySym const & k2);
 
-typedef boost::shared_ptr<LyXKeySym> LyXKeySymPtr;
-
 #endif

src/frontends/WorkArea.h

@@ -14,17 +14,19 @@
 #define WORKAREA_H
 
 #include "frontends/key_state.h"
-#include "frontends/LyXKeySym.h"
 
+#include <boost/shared_ptr.hpp>
 #include <boost/signals/signal0.hpp>
 #include <boost/signals/signal1.hpp>
 #include <boost/signals/signal2.hpp>
 #include <boost/signals/signal3.hpp>
 
+#include "support/std_string.h"
 #include <utility>
 
 class Painter;
 class FuncRequest;
+class LyXKeySym;
 
 /**
  * The work area class represents the widget that provides the
@@ -35,6 +37,7 @@ class FuncRequest;
  */
 class WorkArea {
 public:
+	typedef boost::shared_ptr<LyXKeySym> LyXKeySymPtr;
 
 	WorkArea() {}
 

src/frontends/qt2/ChangeLog

@@ -1,3 +1,7 @@
+2003-09-06  Angus Leeming  <leeming@lyx.org>
+
+	* QContentPane.C: add a typedef for LyXKeySymPtr.
+
 2003-09-06  Angus Leeming  <leeming@lyx.org>
 
 	* QCitationDialog.C:

src/frontends/qt2/QContentPane.C

@@ -137,6 +137,8 @@ void QContentPane::wheelEvent(QWheelEvent * e)
 
 void QContentPane::keyPressEvent(QKeyEvent * e)
 {
+	typedef boost::shared_ptr<LyXKeySym> LyXKeySymPtr;
+
 	QLyXKeySym * sym = new QLyXKeySym();
 	sym->set(e);
 	wa_->workAreaKeyPress(LyXKeySymPtr(sym), q_key_state(e->state()));

src/kbmap.C

@@ -14,11 +14,15 @@
 #include <config.h>
 
 #include "kbmap.h"
+
+#include "debug.h"
 #include "kbsequence.h"
 #include "LyXAction.h"
-#include "support/filetools.h"
 #include "lyxlex.h"
-#include "debug.h"
+
+#include "frontends/LyXKeySym.h"
+
+#include "support/filetools.h"
 
 using std::endl;
 using lyx::support::i18nLibFileSearch;

src/kbmap.h

@@ -16,11 +16,13 @@
 
 #include "support/std_string.h"
 #include "frontends/key_state.h"
-#include "frontends/LyXKeySym.h"
+
+#include <boost/shared_ptr.hpp>
 
 #include <vector>
 
 class kb_sequence;
+class LyXKeySym;
 
 /// Defines key maps and actions for key sequences
 class kb_keymap {
@@ -39,6 +41,8 @@ public:
 	/// print all available keysyms
 	string const print() const;
 
+	///
+	typedef boost::shared_ptr<LyXKeySym> LyXKeySymPtr;
 	/**
 	 * Look up a key press in the keymap.
 	 * @param key the keysym

src/kbsequence.C

@@ -12,13 +12,15 @@
 
 #include <config.h>
 
-#include "gettext.h"
-
-#include "frontends/LyXKeySymFactory.h"
 #include "kbsequence.h"
+
+#include "gettext.h"
 #include "kbmap.h"
 #include "lfuns.h"
 
+#include "frontends/LyXKeySym.h"
+#include "frontends/LyXKeySymFactory.h"
+
 using std::make_pair;
 
 

src/kbsequence.h

@@ -14,15 +14,19 @@
 #define KBSEQUENCE_H
 
 #include "frontends/key_state.h"
-#include "frontends/LyXKeySym.h"
+
+#include <boost/shared_ptr.hpp>
+
 #include "support/std_string.h"
 #include <vector>
 
 class kb_keymap;
+class LyXKeySym;
 
 /// Holds a key sequence and the current and standard keymaps
 class kb_sequence {
 public:
+	typedef boost::shared_ptr<LyXKeySym> LyXKeySymPtr;
 	typedef std::vector<LyXKeySymPtr> KeySequence;
 
 	friend class kb_keymap;

src/lyxfunc.C

@@ -55,6 +55,7 @@
 #include "frontends/Dialogs.h"
 #include "frontends/FileDialog.h"
 #include "frontends/lyx_gui.h"
+#include "frontends/LyXKeySym.h"
 #include "frontends/LyXView.h"
 #include "frontends/Menubar.h"
 #include "frontends/Toolbar.h"

src/lyxfunc.h

@@ -19,9 +19,11 @@
 #include "lfuns.h"
 #include "support/std_string.h"
 
+#include <boost/shared_ptr.hpp>
 #include <boost/signals/trackable.hpp>
 
 class FuncStatus;
+class LyXKeySym;
 class LyXView;
 class LyXText;
 class FuncRequest;
@@ -52,6 +54,8 @@ public:
 	/// return the status bar state string
 	string const view_status_message();
 
+	///
+	typedef boost::shared_ptr<LyXKeySym> LyXKeySymPtr;
 	///
 	void processKeySym(LyXKeySymPtr key, key_modifier::state state);