Moves textRow() from DocIterator to cursor.C where it belongs.

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

diff --git a/src/cursor.C b/src/cursor.C
index 4d95d0de0b632c4c3d09b0f0b0c3f2741f21616d..4dacb3674a0d1efb93fec32716b6c8351f4d519d 100644 (file)
--- a/src/cursor.C
+++ b/src/cursor.C
@@ -403,6 +403,20 @@ void LCursor::getPos(int & x, int & y) const
 }
 
 
+Row & LCursor::textRow()
+{
+       BOOST_ASSERT(!paragraph().rows().empty());
+       return paragraph().getRow(pos(), boundary());
+}
+
+
+Row const & LCursor::textRow() const
+{
+       BOOST_ASSERT(!paragraph().rows().empty());
+       return paragraph().getRow(pos(), boundary());
+}
+
+
 void LCursor::resetAnchor()
 {
        anchor_ = *this;

diff --git a/src/cursor.h b/src/cursor.h
index 46f1834f191df2957166ab25954d133c28701eee..133d6ebb96af47d4b553b5cb189fc79919c6fc00 100644 (file)
--- a/src/cursor.h
+++ b/src/cursor.h
@@ -102,6 +102,10 @@ public:
        bool & macromode() { return macromode_; }
        /// returns x,y position
        void getPos(int & x, int & y) const;
+       /// the row in the paragraph we're in
+       Row & textRow();
+       /// the row in the paragraph we're in
+       Row const & textRow() const;
 
        //
        // common part

diff --git a/src/dociterator.C b/src/dociterator.C
index 4d93aa7a0177228266c36fc14b7445103b7ba74f..7d86f24a5b1d77d0c33eb3a68279489a2643dcdd 100644 (file)
--- a/src/dociterator.C
+++ b/src/dociterator.C
@@ -170,20 +170,6 @@ Paragraph const & DocIterator::paragraph() const
 }
 
 
-Row & DocIterator::textRow()
-{
-       BOOST_ASSERT(!paragraph().rows().empty());
-       return paragraph().getRow(pos(), boundary_);
-}
-
-
-Row const & DocIterator::textRow() const
-{
-       BOOST_ASSERT(!paragraph().rows().empty());
-       return paragraph().getRow(pos(), boundary_);
-}
-
-
 pit_type DocIterator::lastpit() const
 {
        return inMathed() ? 0 : text()->paragraphs().size() - 1;

diff --git a/src/dociterator.h b/src/dociterator.h
index 7d4c4439681589200460d00067e4be9548204599..a452494d68dbed32d616ee2abf87eb9f911e5c36 100644 (file)
--- a/src/dociterator.h
+++ b/src/dociterator.h
@@ -154,10 +154,6 @@ public:
        Paragraph & paragraph();
        /// the paragraph we're in
        Paragraph const & paragraph() const;
-       /// the row in the paragraph we're in
-       Row & textRow();
-       /// the row in the paragraph we're in
-       Row const & textRow() const;
        ///
        LyXText * text();
        ///