Andre's s/getTextClass/textClass/ cleanup.

[lyx.git] / src / buffer_funcs.cpp

diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp
index 23ad4eb1284fa5a4d3127ffa6403ed57915c47a1..6e8e612f94480f6c191a88de63209102359fdab1 100644 (file)
--- a/src/buffer_funcs.cpp
+++ b/src/buffer_funcs.cpp
@@ -80,7 +80,14 @@ Buffer * checkAndLoadLyXFile(FileName const & filename)
                return checkAndLoadLyXFile(filename);
        }
 
-       if (filename.isReadableFile()) {
+       if (filename.exists()) {
+               if (!filename.isReadableFile()) {
+                       docstring text = bformat(_("The file %1$s exists but is not "
+                               "readable by the current user."),
+                               from_utf8(filename.absFilename()));
+                       Alert::error(_("File not readable!"), text);
+                       return 0;
+               }
                Buffer * b = theBufferList().newBuffer(filename.absFilename());
                if (!b)
                        // Buffer creation is not possible.
@@ -188,16 +195,19 @@ int countChars(DocIterator const & from, DocIterator const & to, bool with_blank
        int chars = 0;
        int blanks = 0;
        for (DocIterator dit = from ; dit != to ; dit.forwardPos()) {
-               if (dit.inTexted()
-                   && dit.pos() != dit.lastpos()
-                   && !dit.paragraph().isDeleted(dit.pos())) {
-                       if (dit.paragraph().isInset(dit.pos())) {
-                               if (dit.paragraph().getInset(dit.pos())->isLetter())
+
+               if (!dit.inTexted()) continue;
+               Paragraph const & par = dit.paragraph();
+               pos_type const pos = dit.pos();
+
+               if (pos != dit.lastpos() && !par.isDeleted(pos)) {
+                       if (Inset const * ins = par.getInset(pos)) {
+                               if (ins->isLetter())
                                        ++chars;
-                               else if (dit.paragraph().getInset(dit.pos())->isSpace() && with_blanks)
+                               else if (with_blanks && ins->isSpace())
                                        ++blanks;
                        } else {
-                               char_type const c = dit.paragraph().getChar(dit.pos());
+                               char_type const c = par.getChar(pos);
                                if (isPrintableNonspace(c))
                                        ++chars;
                                else if (isSpace(c) && with_blanks)
@@ -284,7 +294,7 @@ bool needEnumCounterReset(ParIterator const & it)
 // set the label of a paragraph. This includes the counters.
 void setLabel(Buffer const & buf, ParIterator & it)
 {
-       TextClass const & textclass = buf.params().getTextClass();
+       TextClass const & textclass = buf.params().textClass();
        Paragraph & par = it.paragraph();
        LayoutPtr const & layout = par.layout();
        Counters & counters = textclass.counters();
@@ -472,7 +482,7 @@ void updateLabels(Buffer const & buf, bool childonly)
 {
        Buffer const * const master = buf.masterBuffer();
        // Use the master text class also for child documents
-       TextClass const & textclass = master->params().getTextClass();
+       TextClass const & textclass = master->params().textClass();
 
        if (!childonly) {
                // If this is a child document start with the master
@@ -506,14 +516,4 @@ void updateLabels(Buffer const & buf, bool childonly)
 }
 
 
-void checkBufferStructure(Buffer & buffer, ParIterator const & par_it)
-{
-       if (par_it->layout()->toclevel != Layout::NOT_IN_TOC) {
-               Buffer const * master = buffer.masterBuffer();
-               master->tocBackend().updateItem(par_it);
-               master->structureChanged();
-       }
-}
-
-
 } // namespace lyx