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/diffeditorplugin.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/diffeditorplugin.cpp')
| -rw-r--r-- | src/plugins/diffeditor/diffeditorplugin.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/diffeditor/diffeditorplugin.cpp b/src/plugins/diffeditor/diffeditorplugin.cpp index 4411c84c67..6d3ba8858d 100644 --- a/src/plugins/diffeditor/diffeditorplugin.cpp +++ b/src/plugins/diffeditor/diffeditorplugin.cpp @@ -29,7 +29,6 @@ #include "diffeditorcontroller.h" #include "diffeditordocument.h" #include "diffeditorfactory.h" -#include "differ.h" #include <QAction> #include <QFileDialog> @@ -50,10 +49,12 @@ #include <texteditor/texteditor.h> #include <utils/algorithm.h> +#include <utils/differ.h> #include <utils/mapreduce.h> #include <utils/qtcassert.h> using namespace Core; +using namespace Utils; namespace DiffEditor { namespace Internal { |