X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FChanges.h;h=9219edc6539dcd26c6588f916ffa1618671d8267;hb=cde541d785aaac9d45d636a7f9071353dd932eb6;hp=cb5f57b080a360a939cf8ffc030ce4866a097a24;hpb=3b6931719aa7e1269997d2e950b3ce436d5bd34d;p=lyx.git diff --git a/src/Changes.h b/src/Changes.h index cb5f57b080..9219edc653 100644 --- a/src/Changes.h +++ b/src/Changes.h @@ -41,7 +41,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? @@ -103,7 +103,7 @@ public: /// output latex to mark a transition between two change types /// returns length of text outputted - static int latexMarkChange(odocstream & os, BufferParams const & bparams, + static int latexMarkChange(otexstream & os, BufferParams const & bparams, Change const & oldChange, Change const & change, OutputParams const & runparams); @@ -115,7 +115,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 {