diff options
| author | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2018-08-29 14:36:47 +0200 |
|---|---|---|
| committer | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2018-08-30 11:01:08 +0000 |
| commit | 5c658ac96854a4ffd5c546f5391cd4b64b4b75cd (patch) | |
| tree | 1202366f2ccb5862b2cc985b4d29e163b7630742 /src/plugins/diffeditor/diffutils.cpp | |
| parent | 7777df42cf0962f6f3f4c08f44f7a0ed241ce04a (diff) | |
| download | qt-creator-5c658ac96854a4ffd5c546f5391cd4b64b4b75cd.tar.gz | |
Beautifier: Move formatting tools to TextEditor
Formatting is moved from Beautifier plugin to formattexteditor.h/.cpp.
Diff and Differ classes are extracted from DiffEditor to Utils
to prevent extra TextEditor dependencies.
This change will make possible to use formatCurrentFile
and similar functions not only from Beautifier code.
Change-Id: Ic5ca668afe88f4e9376d49e6bd3594807172b0dd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/diffeditor/diffutils.cpp')
| -rw-r--r-- | src/plugins/diffeditor/diffutils.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/diffeditor/diffutils.cpp b/src/plugins/diffeditor/diffutils.cpp index e2a1831251..e233173629 100644 --- a/src/plugins/diffeditor/diffutils.cpp +++ b/src/plugins/diffeditor/diffutils.cpp @@ -24,15 +24,17 @@ ****************************************************************************/ #include "diffutils.h" -#include "differ.h" -#include "texteditor/fontsettings.h" +#include <texteditor/fontsettings.h> +#include <utils/differ.h> #include <QFutureInterfaceBase> #include <QRegularExpression> #include <QStringList> #include <QTextStream> +using namespace Utils; + namespace DiffEditor { static QList<TextLineData> assemblyRows(const QList<TextLineData> &lines, @@ -103,7 +105,7 @@ static void handleDifference(const QString &text, * The number of equalities on both lists must be the same. */ ChunkData DiffUtils::calculateOriginalData(const QList<Diff> &leftDiffList, - const QList<Diff> &rightDiffList) + const QList<Diff> &rightDiffList) { int i = 0; int j = 0; |