Streamlining CollapseStatus stuff

[lyx.git] / src / BufferView.h

diff --git a/src/BufferView.h b/src/BufferView.h
index d4861f0ce569724e7179066f7f18d7146e18273c..93a4ae9be474f5be2838cee6d2a61bdfb9241bbc 100644 (file)
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -86,17 +86,14 @@ public:
        /// set the buffer we are viewing.
        /// \todo FIXME: eventually, we will create a new BufferView
        /// when switching Buffers, so this method should go.
-       void setBuffer(Buffer * b);
+       /// returns the buffer currently set
+       Buffer * setBuffer(Buffer * b);
        /// return the buffer being viewed.
        Buffer * buffer() const;
 
        /// resize the BufferView.
        void resize();
 
-       /// load a buffer into the view.
-  /// returns the buffer or 0 if not loaded
-       Buffer * loadLyXFile(support::FileName const & name, bool auto_open = false);
-
        /// perform pending metrics updates.
        /** \c Update::FitCursor means first to do a FitCursor, and to
         * force an update if screen position changes.
@@ -246,7 +243,7 @@ public:
                std::string data)> updateDialog;
 
        /// This signal is emitted when the layout at the cursor is changed.
-       boost::signal<void(std::string layout)> layoutChanged;
+       boost::signal<void(docstring layout)> layoutChanged;
 
 private:
        ///