]> git.lyx.org Git - lyx.git/blobdiff - src/Changes.h
es.po: fix a typo introduced by last commit
[lyx.git] / src / Changes.h
index 435d44bca37d609a1404152272434e5181fdf086..27710476a66d5349d784d3af5bf872b033f8ec6f 100644 (file)
 
 #include "Color.h"
 
-#include "support/docstream.h"
 #include "support/strfwd.h"
 #include "support/types.h"
 #include "support/lyxtime.h"
 
+#include "texstream.h"
+
 #include <vector>
 
 
@@ -41,7 +42,7 @@ public:
                DELETED // deleted text
        };
 
-       explicit Change(Type t = UNCHANGED, int a = 0, time_t ct = current_time())
+       explicit Change(Type t = UNCHANGED, int a = 0, time_t ct = support::current_time())
                : type(t), author(a), changetime(ct) {}
 
        /// is the change similar to the given change such that both can be merged?
@@ -115,7 +116,8 @@ public:
        void checkAuthors(AuthorList const & authorList);
 
        ///
-       void addToToc(DocIterator const & cdit, Buffer const & buffer) const;
+       void addToToc(DocIterator const & cdit, Buffer const & buffer,
+               bool output_active) const;
 
 private:
        class Range {