From df703b8a5a5420b68e4a8c6dbe19187312d875db Mon Sep 17 00:00:00 2001
From: Alexis Murzeau <amubtdx@gmail.com>
Date: Thu, 4 Jun 2020 13:07:52 +0200
Subject: [PATCH] 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>
---
 src/plugins/beautifier/CMakeLists.txt                  | 2 +-
 src/plugins/beautifier/artisticstyle/artisticstyle.cpp | 1 -
 src/plugins/beautifier/beautifier.qbs                  | 2 --
 src/plugins/beautifier/beautifier_dependencies.pri     | 2 --
 src/plugins/beautifier/beautifierplugin.cpp            | 1 -
 src/plugins/beautifier/clangformat/clangformat.cpp     | 1 -
 src/plugins/beautifier/uncrustify/uncrustify.cpp       | 1 -
 7 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/plugins/beautifier/CMakeLists.txt b/src/plugins/beautifier/CMakeLists.txt
index f9955105ad9..a950aa72ece 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 eac8d98f51f..83b4e328e94 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 1a71cb00989..c308e06cb8a 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 a759c363223..350dc9e608f 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 046a54448a6..fa74da7e26f 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 d7a657bf3fa..16aee422c29 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 0ebbfa5fbbb..c8069a9df96 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>