Store and use QImage rather than QPixmap.

[lyx.git] / src / funcrequest.h

diff --git a/src/funcrequest.h b/src/funcrequest.h
index 439671b7803bc97d876271efa5082208c4386116..d38ed13bfc04bcde45730507352ea4cbb399efcb 100644 (file)
--- a/src/funcrequest.h
+++ b/src/funcrequest.h
@@ -14,9 +14,10 @@
 
 #include "lfuns.h"
 #include "frontends/mouse_state.h"
-#include "support/std_string.h"
 
-class BufferView;
+#include <string>
+#include <iosfwd>
+
 
 /**
  * This class encapsulates a LyX action and its argument
@@ -31,42 +32,21 @@ public:
        /// actions without extra argument
        FuncRequest(kb_action act, int x, int y, mouse_button::state button);
        /// actions with extra argument
-       FuncRequest(kb_action act, string const & arg);
-       /// actions without extra argument
-       FuncRequest(BufferView * bv, kb_action act);
-       /// actions with extra argument
-       FuncRequest(BufferView * bv, kb_action act, string const & arg);
-       /// for mouse events
-       FuncRequest(BufferView * bv, kb_action act,
-               int x, int y, mouse_button::state button);
-       /// for changing requests a bit
-       FuncRequest(FuncRequest const & cmd, string const & arg);
+       FuncRequest(kb_action act, std::string const & arg);
        /// for changing requests a bit
-       FuncRequest(FuncRequest const & cmd, BufferView * bv);
+       FuncRequest(FuncRequest const & cmd, std::string const & arg);
 
-       /// access to the view
-       BufferView * view() const;
-       /// access to the view
-       void setView(BufferView * bv);
        /// access to button
        mouse_button::state button() const;
 
-       /// output a message
-       void message(string const & msg) const;
-       /// output an error message
-       void errorMessage(string const & msg) const;
+       /// argument parsing, extract argument i as std::string
+       std::string getArg(unsigned int i) const;
 
-       /// argument parsing, extract argument i as string
-       string getArg(unsigned int i) const;
-
-private:
-       /// the BufferView we are talking to
-       BufferView * view_;
-public:  // should be private, too...
+public:  // should be private
        /// the action
        kb_action action;
-       /// the action's string argument
-       string argument;
+       /// the action's std::string argument
+       std::string argument;
        /// the x coordinate of a mouse press
        int x;
        /// the y coordinate of a mouse press
@@ -75,4 +55,9 @@ public:  // should be private, too...
        mouse_button::state button_;
 };
 
+
+bool operator==(FuncRequest const & lhs, FuncRequest const & rhs);
+
+std::ostream & operator<<(std::ostream &, FuncRequest const &);
+
 #endif // FUNCREQUEST_H