* lyxfunc.h:

* BufferView_pimpl.h: delete LyXKeySymPtr typedef

* kbmap.h: include LyXKeysym.h and remove forward declaration of LyXKeySym,
  and delete LyXKeySymPtr typedef

* kbsequence.h:
* frontends/WorkArea.h: delete LyXKeySymPtr typedef, include LyXKeySym.h
   and don't include boost/shared_ptr.hpp, remove forward declaration of
   LyXKeySym.

* frontends/LyXKeySym.h: include boost/shared_ptr.hpp, and add typedef
  for LyXKeySymPtr

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

diff --git a/src/BufferView_pimpl.h b/src/BufferView_pimpl.h
index 7c14f6c9e43f6213a0161146fa8f1792f29ef1b7..5ba3484684cc31b80c9e20c347e8cdfb6472d3bd 100644 (file)
--- a/src/BufferView_pimpl.h
+++ b/src/BufferView_pimpl.h
@@ -76,8 +76,6 @@ public:
        /// Wheel mouse scroll, move by multiples of text->defaultRowHeight().
        void scroll(int lines);
        ///
-       typedef boost::shared_ptr<LyXKeySym> LyXKeySymPtr;
-       ///
        void workAreaKeyPress(LyXKeySymPtr key, key_modifier::state state);
        ///
        void selectionRequested();

diff --git a/src/frontends/LyXKeySym.h b/src/frontends/LyXKeySym.h
index 12373c156e26befb4d2c02f963ccaaf46eddddf1..11b0677c8e52386f8fa9dc5f62ba3908720b99a3 100644 (file)
--- a/src/frontends/LyXKeySym.h
+++ b/src/frontends/LyXKeySym.h
@@ -16,6 +16,8 @@
 
 #include "key_state.h"
 
+#include <boost/shared_ptr.hpp>
+
 /**
  * This is a base class for representing a keypress.
  * Each frontend has to implement this to provide
@@ -64,4 +66,6 @@ public:
  */
 bool operator==(LyXKeySym const & k1, LyXKeySym const & k2);
 
+typedef boost::shared_ptr<LyXKeySym> LyXKeySymPtr;
+
 #endif

diff --git a/src/frontends/WorkArea.h b/src/frontends/WorkArea.h
index e1fb7fffb7c23676fe2da4cd1ad31179f9dfe2d3..8e0aa57e9948f4363f1b4ebbe8941f57e525658a 100644 (file)
--- a/src/frontends/WorkArea.h
+++ b/src/frontends/WorkArea.h
@@ -14,14 +14,13 @@
 #define WORKAREA_H
 
 #include "frontends/key_state.h"
+#include "frontends/LyXKeySym.h"
 
-#include <boost/shared_ptr.hpp>
 #include <boost/signal.hpp>
 
 
 class Painter;
 class FuncRequest;
-class LyXKeySym;
 
 /**
  * The work area class represents the widget that provides the
@@ -32,8 +31,6 @@ class LyXKeySym;
  */
 class WorkArea {
 public:
-       typedef boost::shared_ptr<LyXKeySym> LyXKeySymPtr;
-
        WorkArea() {}
 
        virtual ~WorkArea() {}

diff --git a/src/kbmap.h b/src/kbmap.h
index bde8793a20c8ab124a9ca1b336b8ef9d8e918dec..d342510b0c6bb59c62d23b063ab1feec258c8855 100644 (file)
--- a/src/kbmap.h
+++ b/src/kbmap.h
@@ -17,6 +17,7 @@
 #include "funcrequest.h"
 
 #include "frontends/key_state.h"
+#include "frontends/LyXKeySym.h"
 
 #include <boost/shared_ptr.hpp>
 
@@ -24,7 +25,6 @@
 #include <deque>
 
 class kb_sequence;
-class LyXKeySym;
 
 /// Defines key maps and actions for key sequences
 class kb_keymap {
@@ -43,8 +43,6 @@ public:
        /// print all available keysyms
        std::string const print() const;
 
-       ///
-       typedef boost::shared_ptr<LyXKeySym> LyXKeySymPtr;
        /**
         * Look up a key press in the keymap.
         * @param key the keysym

diff --git a/src/kbsequence.h b/src/kbsequence.h
index 3d894a1ec31c54d1fe602cb7db77656a7d757095..ba0181bcb059f65a21a26a27f35908491f2aa357 100644 (file)
--- a/src/kbsequence.h
+++ b/src/kbsequence.h
@@ -14,20 +14,17 @@
 #define KBSEQUENCE_H
 
 #include "frontends/key_state.h"
-
-#include <boost/shared_ptr.hpp>
+#include "frontends/LyXKeySym.h"
 
 #include <string>
 #include <vector>
 
 class kb_keymap;
-class LyXKeySym;
 class FuncRequest;
 
 /// 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;

diff --git a/src/lyxfunc.h b/src/lyxfunc.h
index 0bc95eb9ac8ac6169ea59862abd818e6b83edadd..c01819217625db02f9b9cde38751973d92decbd9 100644 (file)
--- a/src/lyxfunc.h
+++ b/src/lyxfunc.h
@@ -47,8 +47,6 @@ public:
        /// return the status bar state string
        std::string const viewStatusMessage();
 
-       ///
-       typedef boost::shared_ptr<LyXKeySym> LyXKeySymPtr;
        ///
        void processKeySym(LyXKeySymPtr key, key_modifier::state state);