Clean up a bit.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23058 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index c95054b72bed0edac67981d8b09f7e5aaadffda6..33eb3d907abc0520587981f981b161cfce96b1f5 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -567,7 +567,7 @@ bool Buffer::readDocument(Lexer & lex)
        }
 
        // read main text
-       bool const res = text().read(*this, lex, errorList, &inset());
+       bool const res = text().read(*this, lex, errorList, &(d->inset));
 
        updateMacros();
        updateMacroInstances();

diff --git a/src/Text.cpp b/src/Text.cpp
index 50ac94aa08d1d212131a7bb606e7b2313cfa9f40..110bbe612fc9a49840edfcceb662d11c2ddd1fff 100644 (file)
--- a/src/Text.cpp
+++ b/src/Text.cpp
@@ -1160,7 +1160,7 @@ void Text::write(Buffer const & buf, ostream & os) const
 
 
 bool Text::read(Buffer const & buf, Lexer & lex, 
-               ErrorList & errorList, Inset * insetPtr)
+               ErrorList & errorList, InsetText * insetPtr)
 {
        depth_type depth = 0;
 

diff --git a/src/Text.h b/src/Text.h
index 387cc6e428f17b7a9f4bc0d928c950c465e8dd4a..0f8ba1c7f0a7bc1edbd3f99f72fe82dd8dd117c6 100644 (file)
--- a/src/Text.h
+++ b/src/Text.h
@@ -260,12 +260,8 @@ public:
        void write(Buffer const & buf, std::ostream & os) const;
        /// returns whether we've seen our usual 'end' marker
        /// insetPtr is the containing Inset
-       /// FIXME This should really take an InsetText, but it can't yet
-       /// do so because Buffer::inset() returns an Inset and we have no
-       /// access to the InsetText hidden away in Buffer::Impl. This is 
-       /// easy enough to fix but will have to wait a bit.
        bool read(Buffer const & buf, Lexer & lex, ErrorList & errorList, 
-                 Inset * insetPtr);
+                 InsetText * insetPtr);
 
        /// delete double spaces, leading spaces, and empty paragraphs around old cursor.
        /// \retval true if a change has happened and we need a redraw.