Fix a copy-paste error introduced in b754fb02

[lyx.git] / src / buffer_funcs.cpp

diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp
index 468a2589eefd9e2cc4c3b88ebf77a46fb8f6a9a8..073ddcb6f46f33c14d376a21cfc99eccba9be8a1 100644 (file)
--- a/src/buffer_funcs.cpp
+++ b/src/buffer_funcs.cpp
@@ -116,7 +116,7 @@ Buffer * checkAndLoadLyXFile(FileName const & filename, bool const acceptDirty)
 
 // FIXME newFile() should probably be a member method of Application...
 Buffer * newFile(string const & filename, string const & templatename,
-                bool const isNamed)
+                bool is_named)
 {
        // get a free buffer
        Buffer * b = theBufferList().newBuffer(filename);
@@ -143,13 +143,12 @@ Buffer * newFile(string const & filename, string const & templatename,
                }
        }
 
-       if (!isNamed) {
-               b->setUnnamed();
-               b->setFileName(filename);
-       } else
-               // in this case, the user chose the filename, so we assume that she
-               // really does want this file.
+       if (is_named)
+               // in this case, the user chose the filename, so we
+               // assume that she really does want this file.
                b->markDirty();
+       else
+               b->setUnnamed();
 
        b->setReadonly(false);
        b->setFullyLoaded(true);
@@ -175,87 +174,6 @@ Buffer * newUnnamedFile(FileName const & path, string const & prefix,
 }
 
 
-/* 
- * FIXME : merge with countChars. The structures of the two functions
- * are similar but, unfortunately, they seem to have a different
- * notion of what to count. Since nobody ever complained about that,
- * this proves (again) that any number beats no number ! (JMarc)
- */
-int countWords(DocIterator const & from, DocIterator const & to)
-{
-       int count = 0;
-       bool inword = false;
-       for (DocIterator dit = from ; dit != to ; ) {
-               if (!dit.inTexted()) {
-                       dit.forwardPos();
-                       continue;
-               }
-               
-               Paragraph const & par = dit.paragraph();
-               pos_type const pos = dit.pos();
-               
-               // Copied and adapted from isWordSeparator() in Paragraph
-               if (pos != dit.lastpos() && !par.isDeleted(pos)) {
-                       Inset const * ins = par.getInset(pos);
-                       if (ins && !ins->producesOutput()) {
-                               //skip this inset
-                               ++dit.top().pos();
-                               continue;
-                       }
-                       if (par.isWordSeparator(pos)) 
-                               inword = false;
-                       else if (!inword) {
-                               ++count;
-                               inword = true;
-                       }
-               }
-               dit.forwardPos();
-       }
-
-       return count;
-}
-
-
-int countChars(DocIterator const & from, DocIterator const & to, 
-              bool with_blanks)
-{
-       int chars = 0;
-       int blanks = 0;
-       for (DocIterator dit = from ; dit != to ; ) {
-               if (!dit.inTexted()) {
-                       dit.forwardPos();
-                       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->producesOutput()) {
-                                       //skip this inset
-                                       ++dit.top().pos();
-                                       continue;
-                               }
-                               if (ins->isLetter())
-                                       ++chars;
-                               else if (with_blanks && ins->isSpace())
-                                       ++blanks;
-                       } else {
-                               char_type const c = par.getChar(pos);
-                               if (isPrintableNonspace(c))
-                                       ++chars;
-                               else if (isSpace(c) && with_blanks)
-                                       ++blanks;
-                       }
-               }
-               dit.forwardPos();
-       }
-
-       return chars + blanks;
-}
-
-
 Buffer * loadIfNeeded(FileName const & fname)
 {
        Buffer * buffer = theBufferList().getBuffer(fname);