diff options
author | hjk <hjk121@nokiamail.com> | 2014-09-20 21:54:00 +0200 |
---|---|---|
committer | hjk <hjk121@nokiamail.com> | 2014-09-23 10:48:15 +0200 |
commit | e2aa0bbecd086b1420f8b94b56fbd58577f2cb5c (patch) | |
tree | ac869dab5e0d86d55ed2b0e55dcb7f0dfe3d1b70 /src/plugins/texteditor/refactoringchanges.cpp | |
parent | d33727b67a09a0c2d0cfabaacde695b883aa0b9e (diff) |
TextEditor: Clean up RefactoringChanges
Namespaces; use QVector instead of QList for
QPair<QTextCursor, QTextCursor>.
Change-Id: I60c3bede66c404ded96b982299cf853b0b9d4f8e
Reviewed-by: David Schulz <david.schulz@digia.com>
Diffstat (limited to 'src/plugins/texteditor/refactoringchanges.cpp')
-rw-r--r-- | src/plugins/texteditor/refactoringchanges.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/plugins/texteditor/refactoringchanges.cpp b/src/plugins/texteditor/refactoringchanges.cpp index 0dab146b704..a7474e2029e 100644 --- a/src/plugins/texteditor/refactoringchanges.cpp +++ b/src/plugins/texteditor/refactoringchanges.cpp @@ -43,7 +43,7 @@ #include <QDebug> #include <QApplication> -using namespace TextEditor; +namespace TextEditor { RefactoringChanges::RefactoringChanges() : m_data(new RefactoringChangesData) @@ -56,10 +56,10 @@ RefactoringChanges::RefactoringChanges(RefactoringChangesData *data) RefactoringChanges::~RefactoringChanges() {} -QList<QPair<QTextCursor, QTextCursor > > RefactoringChanges::rangesToSelections(QTextDocument *document, - const QList<Range> &ranges) +RefactoringSelections RefactoringChanges::rangesToSelections(QTextDocument *document, + const QList<Range> &ranges) { - QList<QPair<QTextCursor, QTextCursor> > selections; + RefactoringSelections selections; foreach (const Range &range, ranges) { QTextCursor start(document); @@ -179,7 +179,7 @@ RefactoringFile::RefactoringFile(const QString &fileName, const QSharedPointer<R { QList<Core::IEditor *> editors = Core::DocumentModel::editorsForFilePath(fileName); if (!editors.isEmpty()) - m_editor = qobject_cast<TextEditor::BaseTextEditorWidget *>(editors.first()->widget()); + m_editor = qobject_cast<BaseTextEditorWidget *>(editors.first()->widget()); } RefactoringFile::~RefactoringFile() @@ -351,10 +351,10 @@ void RefactoringFile::apply() c.beginEditBlock(); // build indent selections now, applying the changeset will change locations - const QList<QPair<QTextCursor, QTextCursor> > &indentSelections = + const RefactoringSelections &indentSelections = RefactoringChanges::rangesToSelections(doc, m_indentRanges); m_indentRanges.clear(); - const QList<QPair<QTextCursor, QTextCursor> > &reindentSelections = + const RefactoringSelections &reindentSelections = RefactoringChanges::rangesToSelections(doc, m_reindentRanges); m_reindentRanges.clear(); @@ -385,7 +385,7 @@ void RefactoringFile::apply() void RefactoringFile::indentOrReindent(void (RefactoringChangesData::*mf)(const QTextCursor &, const QString &, const BaseTextDocument *) const, - const QList<QPair<QTextCursor, QTextCursor> > &ranges) + const RefactoringSelections &ranges) { typedef QPair<QTextCursor, QTextCursor> CursorPair; @@ -419,3 +419,5 @@ void RefactoringChangesData::reindentSelection(const QTextCursor &, const QStrin void RefactoringChangesData::fileChanged(const QString &) { } + +} // namespace TextEditor |