ClangTools: Merge ClangTidyClazyTool into ClangTool

Change-Id: Ieb6c4994ddcff9339a9cfb25c82e23dd2d2e8912
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Nikolai Kosjar
2019-09-25 15:07:59 +02:00
parent 4750969c2b
commit d5bae3c1eb
12 changed files with 546 additions and 680 deletions

View File

@@ -25,10 +25,10 @@
#include "clangtoolsplugin.h"
#include "clangtool.h"
#include "clangtoolsconstants.h"
#include "clangtoolsprojectsettingswidget.h"
#include "clangtidyclazytool.h"
#include "clangtoolsprojectsettings.h"
#include "clangtoolsprojectsettingswidget.h"
#include "settingswidget.h"
#ifdef WITH_TESTS
@@ -98,7 +98,7 @@ private:
class ClangToolsPluginPrivate
{
public:
ClangTidyClazyTool clangTidyClazyTool;
ClangTool clangTool;
ClangToolsOptionsPage optionsPage;
ClangToolsProjectSettingsManager settingsManager;
};
@@ -115,9 +115,8 @@ bool ClangToolsPlugin::initialize(const QStringList &arguments, QString *errorSt
d = new ClangToolsPluginPrivate;
ActionManager::registerAction(d->clangTidyClazyTool.startAction(),
Constants::RUN_ON_PROJECT);
ActionManager::registerAction(d->clangTidyClazyTool.startOnCurrentFileAction(),
ActionManager::registerAction(d->clangTool.startAction(), Constants::RUN_ON_PROJECT);
ActionManager::registerAction(d->clangTool.startOnCurrentFileAction(),
Constants::RUN_ON_CURRENT_FILE);
auto panelFactory = new ProjectPanelFactory();