X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FChanges.h;h=8f91407431e79765da73104a89828771dc729c8d;hb=e995e8556bd670c7183bab7e105073a5f4ccfbc0;hp=d7041480cb6e32639bdbceea3e4ad8302222994c;hpb=038cc706500567634c68d71342e8be54cf0e81bd;p=lyx.git diff --git a/src/Changes.h b/src/Changes.h index d7041480cb..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,7 +45,7 @@ public: int author; - time_type changetime; + time_t changetime; }; bool operator==(Change const & l, Change const & r); @@ -79,12 +81,15 @@ public: /// 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); + 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: