whitespace

[lyx.git] / src / FuncRequest.cpp

diff --git a/src/FuncRequest.cpp b/src/FuncRequest.cpp
index 497c3b0ba1d38d7897eb558a40d802987b91e164..d37fd924a371bcfd3a96f74924d8f6fa0dd74010 100644 (file)
--- a/src/FuncRequest.cpp
+++ b/src/FuncRequest.cpp
@@ -35,18 +35,19 @@ FuncRequest::FuncRequest(Origin o)
 
 
 FuncRequest::FuncRequest(FuncCode act, Origin o)
-       : action_(act), origin_(o), x_(0), y_(0), button_(mouse_button::none)
+       : action_(act), origin_(o), x_(0), y_(0),
+       button_(mouse_button::none)
 {}
 
 
 FuncRequest::FuncRequest(FuncCode act, docstring const & arg, Origin o)
-       : argument_(arg), action_(act), origin_(o), x_(0), y_(0),
+       : action_(act), argument_(arg), origin_(o), x_(0), y_(0),
          button_(mouse_button::none)
 {}
 
 
 FuncRequest::FuncRequest(FuncCode act, string const & arg, Origin o)
-       : argument_(from_utf8(arg)), action_(act), origin_(o), x_(0), y_(0),
+       : action_(act), argument_(from_utf8(arg)), origin_(o), x_(0), y_(0),
          button_(mouse_button::none)
 {}
 
@@ -58,23 +59,17 @@ FuncRequest::FuncRequest(FuncCode act, int ax, int ay,
 
 
 FuncRequest::FuncRequest(FuncRequest const & cmd, docstring const & arg, Origin o)
-       : argument_(arg), action_(cmd.action_), origin_(o),
+       : action_(cmd.action()), argument_(arg), origin_(o),
          x_(cmd.x_), y_(cmd.y_), button_(cmd.button_)
 {}
 
 
 FuncRequest::FuncRequest(FuncRequest const & cmd, string const & arg, Origin o)
-       : argument_(from_utf8(arg)), action_(cmd.action_), origin_(o),
+       : action_(cmd.action()), argument_(from_utf8(arg)), origin_(o),
          x_(cmd.x_), y_(cmd.y_), button_(cmd.button_)
 {}
 
 
-mouse_button::state FuncRequest::button() const
-{
-       return button_;
-}
-
-
 namespace {
 
 // Extracts arguments from str into args. Arguments are delimted by
@@ -130,18 +125,18 @@ string FuncRequest::getLongArg(unsigned int i) const
 
 bool operator==(FuncRequest const & lhs, FuncRequest const & rhs)
 {
-       return lhs.action_ == rhs.action_ && lhs.argument() == rhs.argument();
+       return lhs.action() == rhs.action() && lhs.argument() == rhs.argument();
 }
 
 
 ostream & operator<<(ostream & os, FuncRequest const & cmd)
 {
        return os
-               << " action: " << cmd.action_ 
-               << " [" << lyxaction.getActionName(cmd.action_) << "] " 
+               << " action: " << cmd.action() 
+               << " [" << lyxaction.getActionName(cmd.action()) << "] " 
                << " arg: '" << to_utf8(cmd.argument()) << "'"
-               << " x: " << cmd.x_
-               << " y: " << cmd.y_;
+               << " x: " << cmd.x()
+               << " y: " << cmd.y();
 }