X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FChanges.h;h=84c4fea707e67d684287cb6e83cd36d3e0d368b4;hb=4be1b1a2a4f475297088820279494aa12aa3859d;hp=8343aab578042ce92d33fe7363068abd3ae45cff;hpb=b86942b4f466d2ebc8d7b1285df816bc91527057;p=lyx.git diff --git a/src/Changes.h b/src/Changes.h index 8343aab578..84c4fea707 100644 --- a/src/Changes.h +++ b/src/Changes.h @@ -17,6 +17,7 @@ #include "Color.h" +#include "support/docstream.h" #include "support/strfwd.h" #include "support/types.h" #include "support/lyxtime.h" @@ -29,6 +30,7 @@ namespace lyx { class AuthorList; class Buffer; class DocIterator; +class OutputParams; class Change { public: @@ -39,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? @@ -97,12 +99,13 @@ public: bool isChanged(pos_type start, pos_type end) const; /// return true if the whole range is deleted - bool isDeleted(pos_type start, pos_type 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,