more cursor dispatch

[lyx.git] / src / buffer_funcs.C

diff --git a/src/buffer_funcs.C b/src/buffer_funcs.C
index 2069ed51c9a4161c109788dbf181405bf187eaa0..dbb5e556d9cdfdc63d7aa26b3172f6db5448e3f5 100644 (file)
--- a/src/buffer_funcs.C
+++ b/src/buffer_funcs.C
@@ -13,24 +13,37 @@
 #include <config.h>
 
 #include "buffer_funcs.h"
-#include "bufferlist.h"
+
 #include "buffer.h"
+#include "bufferlist.h"
+#include "bufferparams.h"
+#include "errorlist.h"
 #include "gettext.h"
+#include "LaTeX.h"
 #include "paragraph.h"
+#include "lyxvc.h"
+#include "texrow.h"
 #include "vc-backend.h"
-#include "LaTeX.h"
 
 #include "frontends/Alert.h"
 
-#include "support/filetools.h"
 #include "support/FileInfo.h"
+#include "support/filetools.h"
 #include "support/lyxlib.h"
 
+using lyx::support::bformat;
+using lyx::support::FileInfo;
+using lyx::support::IsFileWriteable;
+using lyx::support::LibFileSearch;
+using lyx::support::MakeDisplayPath;
+using lyx::support::OnlyFilename;
+using lyx::support::OnlyPath;
+using lyx::support::unlink;
 
-extern BufferList bufferlist;
+using std::string;
 
-using namespace lyx::support;
 
+extern BufferList bufferlist;
 
 namespace {
 
@@ -118,7 +131,7 @@ bool loadLyXFile(Buffer * b, string const & s)
                // Fall through
        case 1:
                if (readFile(b, s)) {
-                       b->lyxvc.file_found_hook(s);
+                       b->lyxvc().file_found_hook(s);
                        return true;
                }
                break;
@@ -164,12 +177,12 @@ Buffer * newFile(string const & filename, string const & templatename,
                        string const text  = bformat(_("The specified document template\n%1$s\ncould not be read."), file);
                        Alert::error(_("Could not read template"), text);
                        // no template, start with empty buffer
-                       b->paragraphs.push_back(Paragraph());
-                       b->paragraphs.begin()->layout(b->params.getLyXTextClass().defaultLayout());
+                       b->paragraphs().push_back(Paragraph());
+                       b->paragraphs().begin()->layout(b->params().getLyXTextClass().defaultLayout());
                }
        } else {  // start with empty buffer
-               b->paragraphs.push_back(Paragraph());
-               b->paragraphs.begin()->layout(b->params.getLyXTextClass().defaultLayout());
+               b->paragraphs().push_back(Paragraph());
+               b->paragraphs().begin()->layout(b->params().getLyXTextClass().defaultLayout());
        }
 
        if (!isNamed) {
@@ -178,7 +191,8 @@ Buffer * newFile(string const & filename, string const & templatename,
        }
 
        b->setReadonly(false);
-       b->updateDocLang(b->params.language);
+       b->fully_loaded(true);
+       b->updateDocLang(b->params().language);
 
        return b;
 }
@@ -193,9 +207,9 @@ void bufferErrors(Buffer const & buf, TeXErrors const & terr)
                int par_id = -1;
                int posstart = -1;
                int const errorrow = cit->error_in_line;
-               buf.texrow.getIdFromRow(errorrow, par_id, posstart);
+               buf.texrow().getIdFromRow(errorrow, par_id, posstart);
                int posend = -1;
-               buf.texrow.getIdFromRow(errorrow + 1, par_id, posend);
+               buf.texrow().getIdFromRow(errorrow + 1, par_id, posend);
                buf.error(ErrorItem(cit->error_desc,
                                         cit->error_text,
                                         par_id, posstart, posend));