diff --git a/language/editor/persistentmovingrange.cpp b/language/editor/persistentmovingrange.cpp index ddbe9bb09d..eefa737622 100644 --- a/language/editor/persistentmovingrange.cpp +++ b/language/editor/persistentmovingrange.cpp @@ -1,76 +1,86 @@ /* Copyright 2010 David Nolden This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "persistentmovingrange.h" #include #include "simplerange.h" #include "persistentmovingrangeprivate.h" #include #include #include KDevelop::PersistentMovingRange::PersistentMovingRange(const SimpleRange& range, const IndexedString& document, bool shouldExpand) : m_p(new PersistentMovingRangePrivate) { VERIFY_FOREGROUND_LOCKED; m_p->m_range = range; m_p->m_document = document; m_p->m_shouldExpand = shouldExpand; m_p->connectTracker(); } void KDevelop::PersistentMovingRange::setZDepth(float depth) const { VERIFY_FOREGROUND_LOCKED; m_p->m_zDepth = depth; if(m_p->m_movingRange) m_p->m_movingRange->setZDepth(depth); } KDevelop::PersistentMovingRange::~PersistentMovingRange() { VERIFY_FOREGROUND_LOCKED; if(m_p->m_movingRange) delete m_p->m_movingRange; delete m_p; } KDevelop::SimpleRange KDevelop::PersistentMovingRange::range() const { VERIFY_FOREGROUND_LOCKED; m_p->updateRangeFromMoving(); return m_p->m_range; } +QString KDevelop::PersistentMovingRange::text() const +{ + VERIFY_FOREGROUND_LOCKED; + + if(m_p->m_movingRange) + return m_p->m_movingRange->document()->text(m_p->m_movingRange->toRange()); + + return QString(); +} + bool KDevelop::PersistentMovingRange::valid() const { VERIFY_FOREGROUND_LOCKED; return m_p->m_valid; } void KDevelop::PersistentMovingRange::setAttribute(KTextEditor::Attribute::Ptr attribute) { VERIFY_FOREGROUND_LOCKED; if(m_p->m_movingRange) m_p->m_movingRange->setAttribute(attribute); } diff --git a/language/editor/persistentmovingrange.h b/language/editor/persistentmovingrange.h index cfabc84b6e..e131a0fd7d 100644 --- a/language/editor/persistentmovingrange.h +++ b/language/editor/persistentmovingrange.h @@ -1,88 +1,93 @@ /* Copyright 2010 David Nolden This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #ifndef PERSISTENTMOVINGRANGE_H #define PERSISTENTMOVINGRANGE_H #include #include #include #include "documentrange.h" namespace KDevelop { struct PersistentMovingRangePrivate; /** * A range object that is automatically adapted to all changes a user does to a document. The object * also survives when the document is opened or closed, as long as the document is only edited from within * the application. * * This object must only be used from within the foreground, or with the foreground lock held. * * @todo The implementation of this object is not finished yet, the range is only persistent until the * document is closed/reloaded/cleared. * */ class KDEVPLATFORMLANGUAGE_EXPORT PersistentMovingRange : public KShared { public: typedef KSharedPtr Ptr; /** * Creates a new persistent moving range based on the current revision of the given document * */ PersistentMovingRange(const SimpleRange& range, const IndexedString& document, bool shouldExpand = false); ~PersistentMovingRange(); IndexedString document() const; /** * Returns the range in the current revision of the document */ SimpleRange range() const; /** * Changes the z-depth for highlighting (see KTextEditor::MovingRange) * */ void setZDepth(float depth) const; + /** + * Returns the text contained by the range. Currently only works when the range is open in the editor. + * */ + QString text() const; + /** * Change the highlighting attribute. * */ void setAttribute(KTextEditor::Attribute::Ptr attribute); /** * Whether this range is still valid. The range is invalidated if the document is changed externally, * as such a change can not be tracked correctly. * */ bool valid() const; private: PersistentMovingRange(const PersistentMovingRange& ); PersistentMovingRange& operator=(const PersistentMovingRange& rhs); PersistentMovingRangePrivate* m_p; }; } #endif // PERSISTENTMOVINGRANGE_H