convert author names and status messages to docstring

[lyx.git] / src / frontends / controllers / ControlCommandBuffer.C

diff --git a/src/frontends/controllers/ControlCommandBuffer.C b/src/frontends/controllers/ControlCommandBuffer.C
index 7c84fe9f153c66ab0347d24b4b88e563739c22cc..ef4bcb6a281f0c45842c72d684907409fa5e330d 100644 (file)
--- a/src/frontends/controllers/ControlCommandBuffer.C
+++ b/src/frontends/controllers/ControlCommandBuffer.C
@@ -13,28 +13,33 @@
 #include <config.h>
 
 #include "ControlCommandBuffer.h"
-#include "bufferview_funcs.h"
+
+#include "BufferView.h"
+#include "cursor.h"
 #include "lyxfunc.h"
 #include "LyXAction.h"
 #include "funcrequest.h"
 
 #include "frontends/LyXView.h"
+
 #include "support/lyxalgo.h"
 #include "support/lstrings.h"
 
-using bv_funcs::currentState;
-
-using lyx::support::prefixIs;
-
 using std::back_inserter;
 using std::transform;
 using std::string;
 using std::vector;
 
+namespace lyx {
+
+using support::prefixIs;
+
+namespace frontend {
 
 namespace {
 
-struct prefix_p {
+class prefix_p {
+public:
        string p;
        prefix_p(string const & s)
                : p(s) {}
@@ -50,7 +55,7 @@ ControlCommandBuffer::ControlCommandBuffer(LyXView & lv)
        : lv_(lv), history_pos_(history_.end())
 {
        transform(lyxaction.func_begin(), lyxaction.func_end(),
-               back_inserter(commands_), lyx::firster());
+               back_inserter(commands_), firster());
 }
 
 
@@ -66,17 +71,17 @@ string const ControlCommandBuffer::historyUp()
 string const ControlCommandBuffer::historyDown()
 {
        if (history_pos_ == history_.end())
-               return "";
+               return string();
        if (history_pos_ + 1 == history_.end())
-               return "";
+               return string();
 
        return *(++history_pos_);
 }
 
 
-string const ControlCommandBuffer::getCurrentState() const
+docstring const ControlCommandBuffer::getCurrentState() const
 {
-       return currentState(lv_.view().get());
+       return lv_.view()->cursor().currentState();
 }
 
 
@@ -85,7 +90,7 @@ ControlCommandBuffer::completions(string const & prefix, string & new_prefix)
 {
        vector<string> comp;
 
-       lyx::copy_if(commands_.begin(), commands_.end(),
+       copy_if(commands_.begin(), commands_.end(),
                back_inserter(comp), prefix_p(prefix));
 
        if (comp.empty()) {
@@ -98,14 +103,14 @@ ControlCommandBuffer::completions(string const & prefix, string & new_prefix)
                return vector<string>();
        }
 
-       // find maximal avaliable prefix
+       // find maximal available prefix
        string const tmp = comp[0];
-       string test(prefix);
+       string test = prefix;
        if (tmp.length() > test.length())
                test += tmp[test.length()];
        while (test.length() < tmp.length()) {
                vector<string> vtmp;
-               lyx::copy_if(comp.begin(), comp.end(),
+               copy_if(comp.begin(), comp.end(),
                        back_inserter(vtmp), prefix_p(test));
                if (vtmp.size() != comp.size()) {
                        test.erase(test.length() - 1);
@@ -126,5 +131,10 @@ void ControlCommandBuffer::dispatch(string const & str)
 
        history_.push_back(str);
        history_pos_ = history_.end();
-       lv_.getLyXFunc().dispatch(lyxaction.lookupFunc(str), true);
+       FuncRequest func = lyxaction.lookupFunc(str);
+       func.origin = FuncRequest::COMMANDBUFFER;
+       lv_.dispatch(func);
 }
+
+} // namespace frontend
+} // namespace lyx