Change a couple instances of QFontMetrics::width()

[lyx.git] / src / Buffer.h

diff --git a/src/Buffer.h b/src/Buffer.h
index 48ed0e7c36be7779af78124402ec07fd122e31d9..e717e463bd08c0d9a80d296a0c9585327b98ca5b 100644 (file)
--- a/src/Buffer.h
+++ b/src/Buffer.h
@@ -82,6 +82,7 @@ class Buffer;
 typedef std::list<Buffer *> ListOfBuffers;
 /// a list of Buffers we cloned
 typedef std::set<Buffer *> CloneList;
+typedef std::shared_ptr<CloneList> CloneList_ptr;
 
 
 /** The buffer object.
@@ -153,7 +154,7 @@ public:
 
        /// Constructor
        explicit Buffer(std::string const & file, bool readonly = false,
-               Buffer const * cloned_buffer = 0);
+               Buffer const * cloned_buffer = nullptr);
 
        /// Destructor
        ~Buffer();
@@ -231,7 +232,7 @@ private:
        ///
        typedef std::map<Buffer const *, Buffer *> BufferMap;
        ///
-       void cloneWithChildren(BufferMap &, CloneList *) const;
+       void cloneWithChildren(BufferMap &, CloneList_ptr) const;
        /// save checksum of the given file.
        void saveCheckSum() const;
        /// read a new file
@@ -347,7 +348,7 @@ public:
        /// returns the main language for the buffer (document)
        Language const * language() const;
        /// get l10n translated to the buffers language
-       docstring const B_(std::string const & l10n) const;
+       docstring B_(std::string const & l10n) const;
 
        ///
        int runChktex();
@@ -439,7 +440,7 @@ public:
        std::string latexName(bool no_path = true) const;
 
        /// Get the name and type of the log.
-       std::string logName(LogType * type = 0) const;
+       std::string logName(LogType * type = nullptr) const;
 
        /// Set document's parent Buffer.
        void setParent(Buffer const *);
@@ -461,10 +462,10 @@ public:
        /// the children appear.
        ListOfBuffers getChildren() const;
 
-       /// \return a list of all descendents of this Buffer (children,
+       /// \return a list of all descendants of this Buffer (children,
        /// grandchildren, etc). this list has no duplicates and is in
        /// the order in which the children appear.
-       ListOfBuffers getDescendents() const;
+       ListOfBuffers getDescendants() const;
 
        /// Collect all relative buffers, in the order in which they appear.
        /// I.e., the "root" Buffer is first, then its first child, then any
@@ -624,7 +625,7 @@ public:
        mutable UserMacroSet usermacros;
 
        /// Replace the inset contents for insets which InsetCode is equal
-       /// to the passed \p inset_code.
+       /// to the passed \p inset_code. Handles undo.
        void changeRefsIfUnique(docstring const & from, docstring const & to);
 
        /// get source code (latex/docbook) for some paragraphs, or all paragraphs
@@ -681,7 +682,9 @@ public:
        ExportStatus preview(std::string const & format) const;
        /// true if there was a previous preview this session of this buffer and
        /// there was an error on the previous preview of this buffer.
-       bool lastPreviewError() const;
+       bool freshStartRequired() const;
+       ///
+       void requireFreshStart(bool const b) const;
 
 private:
        ///
@@ -735,7 +738,7 @@ public:
        /// \param output: whether we are preparing for output.
        void updateBuffer(UpdateScope scope, UpdateType utype) const;
        ///
-       void updateBuffer(ParIterator & parit, UpdateType utype) const;
+       void updateBuffer(ParIterator & parit, UpdateType utype, bool const deleted = false) const;
 
        /// Spellcheck starting from \p from.
        /// \p from initial position, will then points to the next misspelled
@@ -772,11 +775,9 @@ public:
        int wordCount() const;
        int charCount(bool with_blanks) const;
 
-       // this is const because it does not modify the buffer's real contents,
-       // only the mutable flag.
-       void setChangesPresent(bool) const;
+       /// FIXME: dummy function for now
        bool areChangesPresent() const;
-       void updateChangesPresent() const;
+
        ///
        void registerBibfiles(docstring_list const & bf) const;
        ///