diff options
| author | Alexis Murzeau <amubtdx@gmail.com> | 2020-06-04 13:07:52 +0200 |
|---|---|---|
| committer | Alexis Murzeau <amubtdx@gmail.com> | 2020-06-05 08:18:08 +0000 |
| commit | df703b8a5a5420b68e4a8c6dbe19187312d875db (patch) | |
| tree | ad53f3cde9347526e7179c19fda0902282785634 /src/plugins/beautifier | |
| parent | 461319954882f25743a78e747cfb27805726aa20 (diff) | |
Beautifier: Remove dependency on CppEditor and DiffEditor
Beautifier plugin depends on CppEditor and DiffEditor at the project level,
but it does not require them to be built and used.
There is also unused includes to "cppeditor/cppeditorconstants.h".
So this commit remove the unused includes (which makes Beautifier not use
any of CppEditor code) and the dependencies on CppEditor and DiffEditor.
This allow the user to disable CppEditor plugin and use LSP instead with
the basic TextEditor.
Change-Id: If83f30e754746f1635934e5f952bf9254e83c42f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/beautifier')
| -rw-r--r-- | src/plugins/beautifier/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/beautifier/artisticstyle/artisticstyle.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/beautifier/beautifier.qbs | 2 | ||||
| -rw-r--r-- | src/plugins/beautifier/beautifier_dependencies.pri | 2 | ||||
| -rw-r--r-- | src/plugins/beautifier/beautifierplugin.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/beautifier/clangformat/clangformat.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/beautifier/uncrustify/uncrustify.cpp | 1 |
7 files changed, 1 insertions, 9 deletions
diff --git a/src/plugins/beautifier/CMakeLists.txt b/src/plugins/beautifier/CMakeLists.txt index f9955105ad..a950aa72ec 100644 --- a/src/plugins/beautifier/CMakeLists.txt +++ b/src/plugins/beautifier/CMakeLists.txt @@ -1,6 +1,6 @@ add_qtc_plugin(Beautifier DEPENDS Qt5::Xml - PLUGIN_DEPENDS Core CppEditor DiffEditor ProjectExplorer TextEditor + PLUGIN_DEPENDS Core ProjectExplorer TextEditor SOURCES abstractsettings.cpp abstractsettings.h artisticstyle/artisticstyle.cpp artisticstyle/artisticstyle.h diff --git a/src/plugins/beautifier/artisticstyle/artisticstyle.cpp b/src/plugins/beautifier/artisticstyle/artisticstyle.cpp index eac8d98f51..83b4e328e9 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstyle.cpp +++ b/src/plugins/beautifier/artisticstyle/artisticstyle.cpp @@ -40,7 +40,6 @@ #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/ieditor.h> #include <coreplugin/idocument.h> -#include <cppeditor/cppeditorconstants.h> #include <projectexplorer/project.h> #include <projectexplorer/projectnodes.h> #include <projectexplorer/projecttree.h> diff --git a/src/plugins/beautifier/beautifier.qbs b/src/plugins/beautifier/beautifier.qbs index 1a71cb0098..c308e06cb8 100644 --- a/src/plugins/beautifier/beautifier.qbs +++ b/src/plugins/beautifier/beautifier.qbs @@ -7,8 +7,6 @@ QtcPlugin { Depends { name: "Qt.xml" } Depends { name: "Utils" } Depends { name: "Core" } - Depends { name: "CppEditor" } - Depends { name: "DiffEditor" } Depends { name: "TextEditor" } Depends { name: "ProjectExplorer" } diff --git a/src/plugins/beautifier/beautifier_dependencies.pri b/src/plugins/beautifier/beautifier_dependencies.pri index a759c36322..350dc9e608 100644 --- a/src/plugins/beautifier/beautifier_dependencies.pri +++ b/src/plugins/beautifier/beautifier_dependencies.pri @@ -1,7 +1,5 @@ QTC_PLUGIN_NAME = Beautifier QTC_LIB_DEPENDS += utils QTC_PLUGIN_DEPENDS += coreplugin \ - cppeditor \ - diffeditor \ projectexplorer \ texteditor diff --git a/src/plugins/beautifier/beautifierplugin.cpp b/src/plugins/beautifier/beautifierplugin.cpp index 046a54448a..fa74da7e26 100644 --- a/src/plugins/beautifier/beautifierplugin.cpp +++ b/src/plugins/beautifier/beautifierplugin.cpp @@ -41,7 +41,6 @@ #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/ieditor.h> #include <coreplugin/messagemanager.h> -#include <cppeditor/cppeditorconstants.h> #include <projectexplorer/project.h> #include <projectexplorer/projectnodes.h> #include <projectexplorer/projecttree.h> diff --git a/src/plugins/beautifier/clangformat/clangformat.cpp b/src/plugins/beautifier/clangformat/clangformat.cpp index d7a657bf3f..16aee422c2 100644 --- a/src/plugins/beautifier/clangformat/clangformat.cpp +++ b/src/plugins/beautifier/clangformat/clangformat.cpp @@ -40,7 +40,6 @@ #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/ieditor.h> #include <coreplugin/idocument.h> -#include <cppeditor/cppeditorconstants.h> #include <texteditor/formattexteditor.h> #include <texteditor/texteditor.h> #include <utils/algorithm.h> diff --git a/src/plugins/beautifier/uncrustify/uncrustify.cpp b/src/plugins/beautifier/uncrustify/uncrustify.cpp index 0ebbfa5fbb..c8069a9df9 100644 --- a/src/plugins/beautifier/uncrustify/uncrustify.cpp +++ b/src/plugins/beautifier/uncrustify/uncrustify.cpp @@ -40,7 +40,6 @@ #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/ieditor.h> #include <coreplugin/idocument.h> -#include <cppeditor/cppeditorconstants.h> #include <projectexplorer/project.h> #include <projectexplorer/projectnodes.h> #include <projectexplorer/projecttree.h> |