diff options
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; |