forked from qt-creator/qt-creator
Merge CppTools into CppEditor
There was no proper separation of responsibilities between these plugins. In particular, CppTools had lots of editor-related functionality, so it's not clear why it was separated out in the first place. In fact, for a lot of code, it seemed quite arbitrary where it was put (just one example: switchHeaderSource() was in CppTools, wheras switchDeclarationDefinition() was in CppEditor). Merging the plugins will enable us to get rid of various convoluted pseudo-abstractions that were only introduced to keep up the artificial separation. Change-Id: Iafc3bce625b4794f6d4aa03df6cddc7f2d26716a Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
@@ -34,9 +34,9 @@
|
||||
#include "ui_clazychecks.h"
|
||||
#include "ui_tidychecks.h"
|
||||
|
||||
#include <cpptools/cppcodemodelsettings.h>
|
||||
#include <cpptools/cpptoolsconstants.h>
|
||||
#include <cpptools/cpptoolsreuse.h>
|
||||
#include <cppeditor/cppcodemodelsettings.h>
|
||||
#include <cppeditor/cppeditorconstants.h>
|
||||
#include <cppeditor/cpptoolsreuse.h>
|
||||
#include <projectexplorer/selectablefilesmodel.h>
|
||||
#include <projectexplorer/session.h>
|
||||
|
||||
@@ -57,7 +57,7 @@
|
||||
#include <QUuid>
|
||||
#include <QVBoxLayout>
|
||||
|
||||
using namespace CppTools;
|
||||
using namespace CppEditor;
|
||||
|
||||
namespace ClangTools {
|
||||
namespace Internal {
|
||||
@@ -448,7 +448,7 @@ public:
|
||||
if (role == LinkRole || role == Qt::ToolTipRole) {
|
||||
// 'clang-analyzer-' group
|
||||
if (node->isDir)
|
||||
return CppTools::Constants::CLANG_STATIC_ANALYZER_DOCUMENTATION_URL;
|
||||
return CppEditor::Constants::CLANG_STATIC_ANALYZER_DOCUMENTATION_URL;
|
||||
return clangTidyDocUrl(node->fullPath.toString());
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user