zlib stuff

[lyx.git] / src / buffer_funcs.C

diff --git a/src/buffer_funcs.C b/src/buffer_funcs.C
index 0eaca7c0dd7070f0834e218c729ca0d29f2f2c62..bf9073fb664393b077a9cda64be3f0e0032d08f3 100644 (file)
--- a/src/buffer_funcs.C
+++ b/src/buffer_funcs.C
@@ -32,6 +32,8 @@
 
 extern BufferList bufferlist;
 
+using namespace lyx::support;
+
 
 namespace {
 
@@ -98,7 +100,7 @@ bool readFile(Buffer * b, string const & s)
                                        b->markDirty();
                                } else {
                                        // Here, we should delete the autosave
-                                       lyx::unlink(a);
+                                       unlink(a);
                                }
                        }
                }
@@ -126,8 +128,8 @@ bool loadLyXFile(Buffer * b, string const & s)
                        b->lyxvc.file_found_hook(s);
                        return true;
                }
-               break; 
-       case -1: 
+               break;
+       case -1:
                string const file = MakeDisplayPath(s, 20);
                // Here we probably should run
                if (LyXVC::file_not_found_hook(s)) {
@@ -150,7 +152,7 @@ bool loadLyXFile(Buffer * b, string const & s)
 }
 
 
-Buffer * newFile(string const & filename, string const & templatename, 
+Buffer * newFile(string const & filename, string const & templatename,
                 bool isNamed)
 {
        // get a free buffer
@@ -198,7 +200,7 @@ Buffer * newFile(string const & filename, string const & templatename,
 }
 
 
-void parseErrors(Buffer const & buf, TeXErrors const & terr) 
+void bufferErrors(Buffer const & buf, TeXErrors const & terr) 
 {
        TeXErrors::Errors::const_iterator cit = terr.begin();
        TeXErrors::Errors::const_iterator end = terr.end();
@@ -210,20 +212,20 @@ void parseErrors(Buffer const & buf, TeXErrors const & terr)
                buf.texrow.getIdFromRow(errorrow, par_id, posstart);
                int posend = -1;
                buf.texrow.getIdFromRow(errorrow + 1, par_id, posend);
-               buf.parseError(ErrorItem(cit->error_desc,
+               buf.error(ErrorItem(cit->error_desc,
                                         cit->error_text,
                                         par_id, posstart, posend));
        }
 }
 
 
-void parseErrors(Buffer const & buf, ErrorList const & el) 
+void bufferErrors(Buffer const & buf, ErrorList const & el) 
 {
        ErrorList::const_iterator it = el.begin();
        ErrorList::const_iterator end = el.end();
 
        for (; it != end; ++it) 
-               buf.parseError(*it);
+               buf.error(*it);
 }