compilation fix for Qt 4.5

[lyx.git] / src / Changes.h

diff --git a/src/Changes.h b/src/Changes.h
index 09ac0aa0fe7d3dd52271f2a1574ab23693d9a432..435d44bca37d609a1404152272434e5181fdf086 100644 (file)
--- a/src/Changes.h
+++ b/src/Changes.h
@@ -15,8 +15,9 @@
 #ifndef CHANGES_H
 #define CHANGES_H
 
-#include "ColorCode.h"
+#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:
@@ -45,7 +47,7 @@ public:
        /// is the change similar to the given change such that both can be merged?
        bool isSimilarTo(Change const & change) const;
        /// The color of this change on screen
-       ColorCode color() const;
+       Color color() const;
        ///
        bool changed() const { return type != UNCHANGED; }
        ///
@@ -58,6 +60,8 @@ public:
        bool deleted() const { return type == DELETED; }
        ///
        void setDeleted() { type = DELETED; }
+       /// Is this change made by the current author ?
+       bool currentAuthor() const { return author == 0; }
 
        Type type;
 
@@ -94,14 +98,18 @@ public:
        /// return true if there is a change in the given range (excluding end)
        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;
+
        /// 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, int & column,
-               Change const & old, Change const & change);
+       static void lyxMarkChange(std::ostream & os, BufferParams const & bparams,
+               int & column, Change const & old, Change const & change);
 
        ///
        void checkAuthors(AuthorList const & authorList);