[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.5/kdelibs/kate/smart
From:       Dirk Mueller <mueller () kde ! org>
Date:       2010-07-17 10:03:21
Message-ID: 20100717100321.79031AC76A () svn ! kde ! org
[Download RAW message or body]

SVN commit 1150979 by mueller:

fix build


 M  +1 -0      katesmartcursor.cpp  
 M  +1 -0      katesmartmanager.cpp  
 M  +0 -79     katesmartmanager.h  


--- branches/KDE/4.5/kdelibs/kate/smart/katesmartcursor.cpp #1150978:1150979
@@ -25,6 +25,7 @@
 #include "kateedit.h"
 #include "katesmartmanager.h"
 #include "katesmartrange.h"
+#include "katesmartgroup.h"
 
 #include <ktexteditor/smartcursornotifier.h>
 #include <ktexteditor/smartcursorwatcher.h>
--- branches/KDE/4.5/kdelibs/kate/smart/katesmartmanager.cpp #1150978:1150979
@@ -25,6 +25,7 @@
 #include "kateedit.h"
 #include "katesmartcursor.h"
 #include "katesmartrange.h"
+#include "katesmartgroup.h"
 
 #include <QThreadStorage>
 #include <QMutexLocker>
--- branches/KDE/4.5/kdelibs/kate/smart/katesmartmanager.h #1150978:1150979
@@ -106,83 +106,4 @@
     KateTranslationDebugger* m_currentKateTranslationDebugger;
 };
 
-/**
- * This class holds a ground of cursors and ranges which involve a certain
- * number of lines in a document.  It allows us to optimize away having to
- * iterate though every single cursor and range when anything changes in the
- * document.
- *
- * Needs a comprehensive regression and performance test suite...
- */
-class KateSmartGroup
-{
-  public:
-    KateSmartGroup(int startLine, int endLine, KateSmartGroup* previous, KateSmartGroup* next);
-
-    inline int startLine() const { return m_startLine; }
-    inline int newStartLine() const { return m_newStartLine; }
-    inline int endLine() const { return m_endLine; }
-    inline int newEndLine() const { return m_newEndLine; }
-    inline void setEndLine(int endLine) { m_newEndLine = m_endLine = endLine; }
-    inline void setNewEndLine(int endLine) { m_newEndLine = endLine; }
-    inline int length() const { return m_endLine - m_startLine + 1; }
-    inline bool containsLine(int line) const { return line >= m_newStartLine && line <= m_newEndLine; }
-
-    inline KateSmartGroup* previous() const { return m_previous; }
-    inline void setPrevious(KateSmartGroup* previous) { m_previous = previous; }
-
-    inline KateSmartGroup* next() const { return m_next; }
-    inline void setNext(KateSmartGroup* next) { m_next = next; }
-
-    void addCursor(KateSmartCursor* cursor);
-    void changeCursorFeedback(KateSmartCursor* cursor);
-    void removeCursor(KateSmartCursor* cursor);
-    // Cursors requiring position change feedback
-    const QSet<KateSmartCursor*>& feedbackCursors() const;
-    // Cursors not requiring feedback
-    const QSet<KateSmartCursor*>& normalCursors() const;
-
-    // Cursor movement!
-    /**
-     * A cursor has joined this group.
-     *
-     * The cursor already has its new position.
-     */
-    void joined(KateSmartCursor* cursor);
-
-    /**
-     * A cursor is leaving this group.
-     *
-     * The cursor still has its old position.
-     */
-    void leaving(KateSmartCursor* cursor);
-
-    // Merge with the next Smart Group, because this group became too small.
-    void merge();
-
-    // First pass for translation
-    void translateChanged(const KateEditInfo& edit);
-    void translateShifted(const KateEditInfo& edit);
-
-    // Second pass for finalizing the translation
-    void translatedChanged(const KateEditInfo& edit);
-    void translatedShifted(const KateEditInfo& edit);
-
-    // Third pass, when all translations are complete
-    void translatedChanged2(const KateEditInfo& edit);
-    
-    void deleteCursors(bool includingInternal);
-    void deleteCursorsInternal(QSet<KateSmartCursor*>& set);
-
-    void debugOutput() const;
-
-  private:
-    int m_startLine, m_newStartLine, m_endLine, m_newEndLine;
-    KateSmartGroup* m_next;
-    KateSmartGroup* m_previous;
-
-    QSet<KateSmartCursor*> m_feedbackCursors;
-    QSet<KateSmartCursor*> m_normalCursors;
-};
-
 #endif
[prev in list] [next in list] [prev in thread] [next in thread]