a new biblio::asValidLatexString helper function.

[lyx.git] / src / pariterator.h

diff --git a/src/pariterator.h b/src/pariterator.h
index d74c08b40efa0e099d72fc497496bf94a6724186..4ce2b05994d379408e9a05e5e8067382607d01ff 100644 (file)
--- a/src/pariterator.h
+++ b/src/pariterator.h
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* \file iterators.h
+/* \file pariterator.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -9,8 +9,8 @@
  * Full author contact details are available in file CREDITS.
  */
 
-#ifndef ITERATORS_H
-#define ITERATORS_H
+#ifndef PARITERATOR_H
+#define PARITERATOR_H
 
 #include "dociterator.h"
 
@@ -28,7 +28,7 @@ class ParagraphList;
 
 
 class ParIterator : public std::iterator<std::forward_iterator_tag, Paragraph>,
-                   public DocumentIterator
+                   public DocIterator
 {
 public:
        ///
@@ -36,7 +36,7 @@ public:
        ///
        ParIterator(ParIterator const &);
        ///
-       ParIterator(DocumentIterator const &);
+       ParIterator(DocIterator const &);
 
        ///
        void operator=(ParIterator const &);
@@ -57,7 +57,7 @@ public:
 };
 
 
-DocumentIterator makeDocumentIterator(ParIterator const &, lyx::pos_type);
+DocIterator makeDocIterator(ParIterator const &, lyx::pos_type);
 
 ParIterator par_iterator_begin(InsetBase & inset);
 
@@ -73,13 +73,13 @@ bool operator!=(ParIterator const & iter1, ParIterator const & iter2);
 
 class ParConstIterator : public std::iterator<std::forward_iterator_tag,
                         Paragraph>,
-                        public DocumentIterator
+                        public DocIterator
 {
 public:
        ///
        ParConstIterator(ParConstIterator const &);
        ///
-       ParConstIterator(DocumentIterator const &);
+       ParConstIterator(DocIterator const &);
        ///
 
        ParConstIterator & operator++();