X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FChanges.h;h=8f91407431e79765da73104a89828771dc729c8d;hb=0362c6aae73c293d1c20277c12d362acfe0b2ef6;hp=b50c00e02cff2f61907f7b839d2b7fcd50f78f20;hpb=f630be890494c849981e4fb52ea4740506e92bed;p=lyx.git diff --git a/src/Changes.h b/src/Changes.h index b50c00e02c..8f91407431 100644 --- a/src/Changes.h +++ b/src/Changes.h @@ -15,7 +15,8 @@ #ifndef CHANGES_H #define CHANGES_H -#include "support/docstream.h" +#include "support/strfwd.h" +#include "support/types.h" #include "support/lyxtime.h" #include @@ -23,6 +24,7 @@ namespace lyx { +class AuthorList; class Change { public: @@ -33,7 +35,7 @@ public: DELETED // deleted text }; - explicit Change(Type t, int a = 0, time_type ct = current_time()) + explicit Change(Type t, int a = 0, time_t ct = current_time()) : type(t), author(a), changetime(ct) {} /// is the change similar to the given change such that both can be merged? @@ -43,12 +45,14 @@ public: int author; - time_type changetime; + time_t changetime; }; bool operator==(Change const & l, Change const & r); bool operator!=(Change const & l, Change const & r); +class BufferParams; + class Changes { public: /// set the pos to the given change @@ -76,13 +80,16 @@ public: /// output latex to mark a transition between two change types /// returns length of text outputted - static int latexMarkChange(odocstream & os, Change::Type oldChangeType, - Change::Type changeType, bool const & output); + static int latexMarkChange(odocstream & os, BufferParams const & bparams, + Change const & oldChange, Change const & change); /// output .lyx file format for transitions between changes static void lyxMarkChange(std::ostream & os, int & column, Change const & old, Change const & change); + /// + void checkAuthors(AuthorList const & authorList); + private: class Range { public: