X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBuffer.h;h=e717e463bd08c0d9a80d296a0c9585327b98ca5b;hb=35bb9cb4a63bbbd103306ec749f082faf318c56b;hp=977d893c33ed7526025abd542dd82b7c076dc881;hpb=dba1e40b520f67faeb49759b7cec9ec4f981f9a1;p=lyx.git diff --git a/src/Buffer.h b/src/Buffer.h index 977d893c33..e717e463bd 100644 --- a/src/Buffer.h +++ b/src/Buffer.h @@ -82,6 +82,7 @@ class Buffer; typedef std::list ListOfBuffers; /// a list of Buffers we cloned typedef std::set CloneList; +typedef std::shared_ptr 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 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 *); @@ -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 @@ -737,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 @@ -775,7 +776,7 @@ public: int charCount(bool with_blanks) const; /// FIXME: dummy function for now - bool areChangesPresent() const { return true; } + bool areChangesPresent() const; /// void registerBibfiles(docstring_list const & bf) const;