X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffuncrequest.h;h=118e4f45bfdeeccdbf12463affa64794dcbc40b8;hb=e7f4618bcce770369cf46335c2c7f0164b4b8857;hp=2671d9beee865f34be29a16565a8273caf1bdc50;hpb=1fc0c01877f19d8194b6b22e61aa3db5fa2b1671;p=lyx.git

diff --git a/src/funcrequest.h b/src/funcrequest.h
index 2671d9beee..118e4f45bf 100644
--- a/src/funcrequest.h
+++ b/src/funcrequest.h
@@ -20,6 +20,9 @@
 #include <iosfwd>
 
 
+namespace lyx {
+
+
 /**
  * This class encapsulates a LyX action and its argument
  * in order to pass it around easily.
@@ -29,7 +32,8 @@ public:
 	/// Where the request came from
 	enum Origin {
 		INTERNAL,
-		UI, // The menu or the toolbar
+		MENU, // A menu entry
+		TOOLBAR, // A toolbar icon
 		KEYBOARD, // a keyboard binding
 		COMMANDBUFFER
 	};
@@ -42,13 +46,13 @@ public:
 	FuncRequest(kb_action act, int x, int y, mouse_button::state button,
 		    Origin o = INTERNAL);
 	/// actions with extra argument
-	FuncRequest(kb_action act, lyx::docstring const & arg,
+	FuncRequest(kb_action act, docstring const & arg,
 		    Origin o = INTERNAL);
 	/// actions with extra argument. FIXME: remove this
 	FuncRequest(kb_action act, std::string const & arg,
 		    Origin o = INTERNAL);
 	/// for changing requests a bit
-	FuncRequest(FuncRequest const & cmd, lyx::docstring const & arg,
+	FuncRequest(FuncRequest const & cmd, docstring const & arg,
 		    Origin o = INTERNAL);
 	/// for changing requests a bit. FIXME: remove this
 	FuncRequest(FuncRequest const & cmd, std::string const & arg,
@@ -61,14 +65,14 @@ public:
 	std::string getArg(unsigned int i) const;
 
 	/// access the whole argument
-	lyx::docstring const & argument() const { return argument_; }
+	docstring const & argument() const { return argument_; }
 
 public:  // should be private
 	/// the action
 	kb_action action;
 private:
 	/// the action's string argument
-	lyx::docstring argument_;
+	docstring argument_;
 public:  // should be private
 	/// who initiated the action
 	Origin origin;
@@ -85,4 +89,7 @@ bool operator==(FuncRequest const & lhs, FuncRequest const & rhs);
 
 std::ostream & operator<<(std::ostream &, FuncRequest const &);
 
+
+} // namespace lyx
+
 #endif // FUNCREQUEST_H