Fix SIGSEGV when introducing a new shortcut (#9869)

[lyx.git] / src / Changes.h

diff --git a/src/Changes.h b/src/Changes.h
index 87fdb712308e41cb6eb70b00949bac6c77167d17..27710476a66d5349d784d3af5bf872b033f8ec6f 100644 (file)
--- a/src/Changes.h
+++ b/src/Changes.h
@@ -21,6 +21,8 @@
 #include "support/types.h"
 #include "support/lyxtime.h"
 
+#include "texstream.h"
+
 #include <vector>
 
 
@@ -29,6 +31,7 @@ namespace lyx {
 class AuthorList;
 class Buffer;
 class DocIterator;
+class OutputParams;
 
 class Change {
 public:
@@ -39,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?
@@ -97,12 +100,13 @@ public:
        bool isChanged(pos_type start, pos_type end) const;
 
        /// return true if the whole range is deleted
-       bool isFullyDeleted(pos_type const start, pos_type const end) const;            
+       bool isDeleted(pos_type start, pos_type end) const;
 
        /// output latex to mark a transition between two change types
        /// returns length of text outputted
-       static int latexMarkChange(odocstream & os, BufferParams const & bparams,
-                                  Change const & oldChange, Change const & change);
+       static int latexMarkChange(otexstream & os, BufferParams const & bparams,
+                                  Change const & oldChange, Change const & change,
+                                  OutputParams const & runparams);
 
        /// output .lyx file format for transitions between changes
        static void lyxMarkChange(std::ostream & os, BufferParams const & bparams,
@@ -112,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 {