feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

TextEditor: Clean up RefactoringChanges

Browse Source 
Namespaces; use QVector instead of QList for
QPair<QTextCursor, QTextCursor>.

Change-Id: I60c3bede66c404ded96b982299cf853b0b9d4f8e
Reviewed-by: David Schulz <david.schulz@digia.com>
This commit is contained in:
hjk
2014-09-20 21:54:00 +02:00
parent d33727b67a
commit e2aa0bbecd
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/texteditor/refactoringchanges.cpp
View File

@@ -43,7 +43,7 @@
#include <QDebug> #include <QDebug>
#include <QApplication> #include <QApplication>
using namespace TextEditor; namespace TextEditor {
RefactoringChanges::RefactoringChanges() RefactoringChanges::RefactoringChanges()
: m_data(new RefactoringChangesData) : m_data(new RefactoringChangesData)
@@ -56,10 +56,10 @@ RefactoringChanges::RefactoringChanges(RefactoringChangesData *data)
RefactoringChanges::~RefactoringChanges() RefactoringChanges::~RefactoringChanges()
{} {}
QList<QPair<QTextCursor, QTextCursor > > RefactoringChanges::rangesToSelections(QTextDocument *document, RefactoringSelections RefactoringChanges::rangesToSelections(QTextDocument *document,
const QList<Range> &ranges) const QList<Range> &ranges)
{ {
QList<QPair<QTextCursor, QTextCursor> > selections; RefactoringSelections selections;
foreach (const Range &range, ranges) { foreach (const Range &range, ranges) {
QTextCursor start(document); QTextCursor start(document);
@@ -179,7 +179,7 @@ RefactoringFile::RefactoringFile(const QString &fileName, const QSharedPointer<R
{ {
QList<Core::IEditor *> editors = Core::DocumentModel::editorsForFilePath(fileName); QList<Core::IEditor *> editors = Core::DocumentModel::editorsForFilePath(fileName);
if (!editors.isEmpty()) if (!editors.isEmpty())
m_editor = qobject_cast<TextEditor::BaseTextEditorWidget *>(editors.first()->widget()); m_editor = qobject_cast<BaseTextEditorWidget *>(editors.first()->widget());
} }
RefactoringFile::~RefactoringFile() RefactoringFile::~RefactoringFile()
@@ -351,10 +351,10 @@ void RefactoringFile::apply()
c.beginEditBlock(); c.beginEditBlock();
// build indent selections now, applying the changeset will change locations // build indent selections now, applying the changeset will change locations
const QList<QPair<QTextCursor, QTextCursor> > &indentSelections = const RefactoringSelections &indentSelections =
RefactoringChanges::rangesToSelections(doc, m_indentRanges); RefactoringChanges::rangesToSelections(doc, m_indentRanges);
m_indentRanges.clear(); m_indentRanges.clear();
const QList<QPair<QTextCursor, QTextCursor> > &reindentSelections = const RefactoringSelections &reindentSelections =
RefactoringChanges::rangesToSelections(doc, m_reindentRanges); RefactoringChanges::rangesToSelections(doc, m_reindentRanges);
m_reindentRanges.clear(); m_reindentRanges.clear();
@@ -385,7 +385,7 @@ void RefactoringFile::apply()
void RefactoringFile::indentOrReindent(void (RefactoringChangesData::*mf)(const QTextCursor &, void RefactoringFile::indentOrReindent(void (RefactoringChangesData::*mf)(const QTextCursor &,
const QString &, const QString &,
const BaseTextDocument *) const, const BaseTextDocument *) const,
const QList<QPair<QTextCursor, QTextCursor> > &ranges) const RefactoringSelections &ranges)
{ {
typedef QPair<QTextCursor, QTextCursor> CursorPair; typedef QPair<QTextCursor, QTextCursor> CursorPair;
@@ -419,3 +419,5 @@ void RefactoringChangesData::reindentSelection(const QTextCursor &, const QStrin
void RefactoringChangesData::fileChanged(const QString &) void RefactoringChangesData::fileChanged(const QString &)
{ {
} }
} // namespace TextEditor

7
src/plugins/texteditor/refactoringchanges.h
View File

@@ -50,6 +50,7 @@ class RefactoringChanges;
class RefactoringFile; class RefactoringFile;
class RefactoringChangesData; class RefactoringChangesData;
typedef QSharedPointer<RefactoringFile> RefactoringFilePtr; typedef QSharedPointer<RefactoringFile> RefactoringFilePtr;
typedef QVector<QPair<QTextCursor, QTextCursor> > RefactoringSelections;
// ### listen to the m_editor::destroyed signal? // ### listen to the m_editor::destroyed signal?
class TEXTEDITOR_EXPORT RefactoringFile class TEXTEDITOR_EXPORT RefactoringFile
@@ -99,7 +100,7 @@ protected:
void indentOrReindent(void (RefactoringChangesData::*mf)(const QTextCursor &, void indentOrReindent(void (RefactoringChangesData::*mf)(const QTextCursor &,
const QString &, const QString &,
const BaseTextDocument *) const, const BaseTextDocument *) const,
const QList<QPair<QTextCursor, QTextCursor> > &ranges); const RefactoringSelections &ranges);
protected: protected:
QString m_fileName; QString m_fileName;
@@ -140,9 +141,7 @@ protected:
explicit RefactoringChanges(RefactoringChangesData *data); explicit RefactoringChanges(RefactoringChangesData *data);
static BaseTextEditorWidget *openEditor(const QString &fileName, bool activate, int line, int column); static BaseTextEditorWidget *openEditor(const QString &fileName, bool activate, int line, int column);
static RefactoringSelections rangesToSelections(QTextDocument *document, const QList<Range> &ranges);
static QList<QPair<QTextCursor, QTextCursor> > rangesToSelections(QTextDocument *document,
const QList<Range> &ranges);
protected: protected:
QSharedPointer<RefactoringChangesData> m_data; QSharedPointer<RefactoringChangesData> m_data;