last Friday's text*.C -> text_func shuffle

[lyx.git] / src / lyxfunc.C

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 6799685caf4d0baf867b5a07ab1ba018603de3d8..9036b814eef0d7f0879bb5a2b4a4902832c22764 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -78,6 +78,8 @@
 #include <utility>
 #include <algorithm>
 
+using namespace lyx::support;
+
 using std::pair;
 using std::make_pair;
 using std::endl;
@@ -537,7 +539,7 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & ev) const
                disable = !mathcursor;
                break;
 
-       case LFUN_DIALOG_SHOW: {
+       case LFUN_DIALOG_SHOW: {
                string const name = ev.getArg(0);
                if (!buf) {
                        disable = !(name == "aboutlyx" ||
@@ -948,7 +950,7 @@ void LyXFunc::dispatch(FuncRequest const & ev, bool verbose)
                                        }
                                        goto exit_with_message;
                                case LFUN_DOWN:
-                                       if (boost::next(TEXT()->cursor.row()) != TEXT()->rows().end())
+                                       if (boost::next(TEXT()->cursorRow()) != TEXT()->rows().end())
                                                TEXT()->cursorDown(view());
                                        else
                                                TEXT()->cursorRight(view());
@@ -1937,6 +1939,6 @@ string const LyXFunc::view_status_message()
 
 BufferView * LyXFunc::view() const
 {
-       lyx::Assert(owner);
+       Assert(owner);
        return owner->view().get();
 }