Buffer: Pimpl private methods and fix a few constness issue.

[lyx.git] / src / Buffer.h

diff --git a/src/Buffer.h b/src/Buffer.h
index 297e63208ce126bf5110d47a62f428f3292ffd73..dae42584f95b71d76f7f9acd85924b38c0abcb81 100644 (file)
--- a/src/Buffer.h
+++ b/src/Buffer.h
@@ -12,13 +12,13 @@
 #ifndef BUFFER_H
 #define BUFFER_H
 
+#include "OutputEnums.h"
 #include "update_flags.h"
 
 #include "insets/InsetCode.h"
 
 #include "support/strfwd.h"
 #include "support/types.h"
-#include "support/SignalSlot.h"
 
 #include <list>
 #include <set>
@@ -249,8 +249,6 @@ public:
        /// return true if the main lyx file does not need saving
        bool isClean() const;
        ///
-       bool isBakClean() const;
-       ///
        bool isDepClean(std::string const & name) const;
 
        /// whether or not disk file has been externally modified
@@ -262,9 +260,6 @@ public:
        /// mark the main lyx file as not needing saving
        void markClean() const;
 
-       ///
-       void markBakClean() const;
-
        ///
        void markDepClean(std::string const & name);
 
@@ -491,8 +486,6 @@ public:
        void errors(std::string const & err, bool from_master = false) const;
        /// This function is called when the buffer busy status change.
        void setBusy(bool on) const;
-       /// This function is called when the buffer readonly status change.
-       void setReadOnly(bool on) const;
        /// Update window titles of all users.
        void updateTitles() const;
        /// Reset autosave timers for all users.
@@ -552,13 +545,13 @@ public:
        /// Updates screen labels and some other information associated with
        /// insets and paragraphs. Actually, it's more like a general "recurse
        /// through the Buffer" routine, that visits all the insets and paragraphs.
-       void updateLabels() const { updateLabels(UpdateMaster, false); }
+       void updateLabels() const { updateLabels(UpdateMaster, InternalUpdate); }
        /// \param scope: whether to start with the master document or just
        /// do this one.
        /// \param output: whether we are preparing for output.
-       void updateLabels(UpdateScope scope, bool output) const;
+       void updateLabels(UpdateScope scope, UpdateType utype) const;
        /// 
-       void updateLabels(ParIterator & parit, bool output) const;
+       void updateLabels(ParIterator & parit, UpdateType utype) const;
 
        /// Spellcheck starting from \p from.
        /// \p from initial position, will then points to the next misspelled
@@ -570,19 +563,6 @@ public:
                WordLangTuple & word_lang, docstring_list & suggestions) const;
 
 private:
-       /// search for macro in local (buffer) table or in children
-       MacroData const * getBufferMacro(docstring const & name,
-                                        DocIterator const & pos) const;
-       /** Update macro table starting with position of it
-           \param it in some text inset
-       */
-       void updateMacros(DocIterator & it,
-                                    DocIterator & scope) const;
-       ///
-       void setLabel(ParIterator & it) const;
-       ///
-       void collectRelatives(BufferSet & bufs) const;
-
        ///
        bool readFileHelper(support::FileName const & s);
        ///
@@ -593,28 +573,10 @@ private:
        ReadStatus readFile(Lexer &, support::FileName const & filename,
                            bool fromString = false);
 
-       /** If we have branches that use the file suffix
-           feature, return the file name with suffix appended.
-       */
-       support::FileName exportFileName() const;
-
        /// Use the Pimpl idiom to hide the internals.
        class Impl;
        /// The pointer never changes although *pimpl_'s contents may.
        Impl * const d;
-       ///
-       frontend::GuiBufferDelegate * gui_;
-
-       /// This function is called when the buffer structure is changed.
-       Signal structureChanged_;
-       /// This function is called when some parsing error shows up.
-       //Signal errors(std::string const &) = 0;
-       /// This function is called when some message shows up.
-       //Signal message(docstring const &) = 0;
-       /// This function is called when the buffer busy status change.
-       //Signal setBusy(bool) = 0;
-       /// Reset autosave timers for all users.
-       Signal resetAutosaveTimers_;
 };