From 3fa8db13e922c18b71418afa586b6143c7618523 Mon Sep 17 00:00:00 2001 From: Ivan Donchevskii Date: Wed, 14 Mar 2018 12:58:12 +0100 Subject: [PATCH] ClangStaticAnalyzer: Rename plugin to ClangTools ClangStaticAnalyzer is only one of the tools that we can use and it will stay inside ClangTools plugin. Change-Id: I74278e3fd12b792ab127d352db05d856c964968c Reviewed-by: Alessandro Portale Reviewed-by: Leena Miettinen --- .../ClangTools.json.in} | 4 ++-- .../clangstaticanalyzer_global.h | 0 .../clangstaticanalyzerconfigwidget.cpp | 4 ++-- .../clangstaticanalyzerconfigwidget.h | 4 ++-- .../clangstaticanalyzerconfigwidget.ui | 4 ++-- .../clangstaticanalyzerconstants.h | 2 +- .../clangstaticanalyzerdiagnostic.cpp | 4 ++-- .../clangstaticanalyzerdiagnostic.h | 6 +++--- .../clangstaticanalyzerdiagnosticmodel.cpp | 18 +++++++++--------- .../clangstaticanalyzerdiagnosticmodel.h | 4 ++-- .../clangstaticanalyzerdiagnosticview.cpp | 4 ++-- .../clangstaticanalyzerdiagnosticview.h | 4 ++-- .../clangstaticanalyzerlogfilereader.cpp | 6 +++--- .../clangstaticanalyzerlogfilereader.h | 6 +++--- ...staticanalyzerpreconfiguredsessiontests.cpp | 4 ++-- ...ngstaticanalyzerpreconfiguredsessiontests.h | 4 ++-- .../clangstaticanalyzerprojectsettings.cpp | 4 ++-- .../clangstaticanalyzerprojectsettings.h | 4 ++-- ...angstaticanalyzerprojectsettingsmanager.cpp | 4 ++-- ...clangstaticanalyzerprojectsettingsmanager.h | 4 ++-- ...langstaticanalyzerprojectsettingswidget.cpp | 4 ++-- .../clangstaticanalyzerprojectsettingswidget.h | 4 ++-- ...clangstaticanalyzerprojectsettingswidget.ui | 4 ++-- .../clangstaticanalyzerruncontrol.cpp | 4 ++-- .../clangstaticanalyzerruncontrol.h | 4 ++-- .../clangstaticanalyzerrunner.cpp | 4 ++-- .../clangstaticanalyzerrunner.h | 4 ++-- .../clangstaticanalyzersettings.cpp | 4 ++-- .../clangstaticanalyzersettings.h | 4 ++-- .../clangstaticanalyzertool.cpp | 4 ++-- .../clangstaticanalyzertool.h | 4 ++-- .../clangstaticanalyzerunittests.cpp | 4 ++-- .../clangstaticanalyzerunittests.h | 4 ++-- .../clangstaticanalyzerunittests.qrc | 0 .../clangstaticanalyzerutils.cpp | 4 ++-- .../clangstaticanalyzerutils.h | 4 ++-- .../clangtools.pro} | 4 ++-- .../clangtools.qbs} | 0 .../clangtools_dependencies.pri} | 2 +- .../clangtoolsplugin.cpp} | 18 +++++++++--------- .../clangtoolsplugin.h} | 14 +++++++------- .../unit-tests/mingw-includes/main.cpp | 0 .../mingw-includes/mingw-includes.pro | 0 .../mingw-includes/mingw-includes.qbs | 0 .../unit-tests/qt-essential-includes/main.cpp | 0 .../qt-essential-includes.pro | 0 .../qt-essential-includes.qbs | 0 .../unit-tests/qt-widgets-app/main.cpp | 0 .../unit-tests/qt-widgets-app/mainwindow.cpp | 0 .../unit-tests/qt-widgets-app/mainwindow.h | 0 .../unit-tests/qt-widgets-app/mainwindow.ui | 0 .../qt-widgets-app/qt-widgets-app.pro | 0 .../qt-widgets-app/qt-widgets-app.qbs | 0 .../simple-library/simple-library.cpp | 0 .../unit-tests/simple-library/simple-library.h | 0 .../simple-library/simple-library.pro | 0 .../simple-library/simple-library.qbs | 0 .../unit-tests/simple/main.cpp | 0 .../unit-tests/simple/simple.pro | 0 .../unit-tests/simple/simple.qbs | 0 .../unit-tests/stdc++11-includes/main.cpp | 0 .../stdc++11-includes/stdc++11-includes.pro | 0 .../stdc++11-includes/stdc++11-includes.qbs | 0 src/plugins/plugins.pro | 2 +- .../tst_clangstaticanalyzerlogfilereader.cpp | 4 ++-- .../tst_clangstaticanalyzerrunner.cpp | 6 +++--- 66 files changed, 102 insertions(+), 102 deletions(-) rename src/plugins/{clangstaticanalyzer/ClangStaticAnalyzer.json.in => clangtools/ClangTools.json.in} (93%) rename src/plugins/{clangstaticanalyzer => clangtools}/clangstaticanalyzer_global.h (100%) rename src/plugins/{clangstaticanalyzer => clangtools}/clangstaticanalyzerconfigwidget.cpp (98%) rename src/plugins/{clangstaticanalyzer => clangtools}/clangstaticanalyzerconfigwidget.h (96%) rename src/plugins/{clangstaticanalyzer => clangtools}/clangstaticanalyzerconfigwidget.ui (94%) rename src/plugins/{clangstaticanalyzer => clangtools}/clangstaticanalyzerconstants.h (97%) rename src/plugins/{clangstaticanalyzer => clangtools}/clangstaticanalyzerdiagnostic.cpp (95%) rename src/plugins/{clangstaticanalyzer => clangtools}/clangstaticanalyzerdiagnostic.h (93%) rename src/plugins/{clangstaticanalyzer => clangtools}/clangstaticanalyzerdiagnosticmodel.cpp (94%) rename src/plugins/{clangstaticanalyzer => clangtools}/clangstaticanalyzerdiagnosticmodel.h (97%) rename src/plugins/{clangstaticanalyzer => clangtools}/clangstaticanalyzerdiagnosticview.cpp (98%) rename src/plugins/{clangstaticanalyzer => clangtools}/clangstaticanalyzerdiagnosticview.h (95%) rename src/plugins/{clangstaticanalyzer => clangtools}/clangstaticanalyzerlogfilereader.cpp (98%) rename src/plugins/{clangstaticanalyzer => clangtools}/clangstaticanalyzerlogfilereader.h (91%) rename src/plugins/{clangstaticanalyzer => clangtools}/clangstaticanalyzerpreconfiguredsessiontests.cpp (99%) rename src/plugins/{clangstaticanalyzer => clangtools}/clangstaticanalyzerpreconfiguredsessiontests.h (95%) rename src/plugins/{clangstaticanalyzer => clangtools}/clangstaticanalyzerprojectsettings.cpp (98%) rename src/plugins/{clangstaticanalyzer => clangtools}/clangstaticanalyzerprojectsettings.h (97%) rename src/plugins/{clangstaticanalyzer => clangtools}/clangstaticanalyzerprojectsettingsmanager.cpp (96%) rename src/plugins/{clangstaticanalyzer => clangtools}/clangstaticanalyzerprojectsettingsmanager.h (96%) rename src/plugins/{clangstaticanalyzer => clangtools}/clangstaticanalyzerprojectsettingswidget.cpp (98%) rename src/plugins/{clangstaticanalyzer => clangtools}/clangstaticanalyzerprojectsettingswidget.h (96%) rename src/plugins/{clangstaticanalyzer => clangtools}/clangstaticanalyzerprojectsettingswidget.ui (93%) rename src/plugins/{clangstaticanalyzer => clangtools}/clangstaticanalyzerruncontrol.cpp (99%) rename src/plugins/{clangstaticanalyzer => clangtools}/clangstaticanalyzerruncontrol.h (97%) rename src/plugins/{clangstaticanalyzer => clangtools}/clangstaticanalyzerrunner.cpp (99%) rename src/plugins/{clangstaticanalyzer => clangtools}/clangstaticanalyzerrunner.h (97%) rename src/plugins/{clangstaticanalyzer => clangtools}/clangstaticanalyzersettings.cpp (98%) rename src/plugins/{clangstaticanalyzer => clangtools}/clangstaticanalyzersettings.h (96%) rename src/plugins/{clangstaticanalyzer => clangtools}/clangstaticanalyzertool.cpp (99%) rename src/plugins/{clangstaticanalyzer => clangtools}/clangstaticanalyzertool.h (97%) rename src/plugins/{clangstaticanalyzer => clangtools}/clangstaticanalyzerunittests.cpp (98%) rename src/plugins/{clangstaticanalyzer => clangtools}/clangstaticanalyzerunittests.h (95%) rename src/plugins/{clangstaticanalyzer => clangtools}/clangstaticanalyzerunittests.qrc (100%) rename src/plugins/{clangstaticanalyzer => clangtools}/clangstaticanalyzerutils.cpp (98%) rename src/plugins/{clangstaticanalyzer => clangtools}/clangstaticanalyzerutils.h (97%) rename src/plugins/{clangstaticanalyzer/clangstaticanalyzer.pro => clangtools/clangtools.pro} (96%) rename src/plugins/{clangstaticanalyzer/clangstaticanalyzer.qbs => clangtools/clangtools.qbs} (100%) rename src/plugins/{clangstaticanalyzer/clangstaticanalyzer_dependencies.pri => clangtools/clangtools_dependencies.pri} (82%) rename src/plugins/{clangstaticanalyzer/clangstaticanalyzerplugin.cpp => clangtools/clangtoolsplugin.cpp} (88%) rename src/plugins/{clangstaticanalyzer/clangstaticanalyzerplugin.h => clangtools/clangtoolsplugin.h} (83%) rename src/plugins/{clangstaticanalyzer => clangtools}/unit-tests/mingw-includes/main.cpp (100%) rename src/plugins/{clangstaticanalyzer => clangtools}/unit-tests/mingw-includes/mingw-includes.pro (100%) rename src/plugins/{clangstaticanalyzer => clangtools}/unit-tests/mingw-includes/mingw-includes.qbs (100%) rename src/plugins/{clangstaticanalyzer => clangtools}/unit-tests/qt-essential-includes/main.cpp (100%) rename src/plugins/{clangstaticanalyzer => clangtools}/unit-tests/qt-essential-includes/qt-essential-includes.pro (100%) rename src/plugins/{clangstaticanalyzer => clangtools}/unit-tests/qt-essential-includes/qt-essential-includes.qbs (100%) rename src/plugins/{clangstaticanalyzer => clangtools}/unit-tests/qt-widgets-app/main.cpp (100%) rename src/plugins/{clangstaticanalyzer => clangtools}/unit-tests/qt-widgets-app/mainwindow.cpp (100%) rename src/plugins/{clangstaticanalyzer => clangtools}/unit-tests/qt-widgets-app/mainwindow.h (100%) rename src/plugins/{clangstaticanalyzer => clangtools}/unit-tests/qt-widgets-app/mainwindow.ui (100%) rename src/plugins/{clangstaticanalyzer => clangtools}/unit-tests/qt-widgets-app/qt-widgets-app.pro (100%) rename src/plugins/{clangstaticanalyzer => clangtools}/unit-tests/qt-widgets-app/qt-widgets-app.qbs (100%) rename src/plugins/{clangstaticanalyzer => clangtools}/unit-tests/simple-library/simple-library.cpp (100%) rename src/plugins/{clangstaticanalyzer => clangtools}/unit-tests/simple-library/simple-library.h (100%) rename src/plugins/{clangstaticanalyzer => clangtools}/unit-tests/simple-library/simple-library.pro (100%) rename src/plugins/{clangstaticanalyzer => clangtools}/unit-tests/simple-library/simple-library.qbs (100%) rename src/plugins/{clangstaticanalyzer => clangtools}/unit-tests/simple/main.cpp (100%) rename src/plugins/{clangstaticanalyzer => clangtools}/unit-tests/simple/simple.pro (100%) rename src/plugins/{clangstaticanalyzer => clangtools}/unit-tests/simple/simple.qbs (100%) rename src/plugins/{clangstaticanalyzer => clangtools}/unit-tests/stdc++11-includes/main.cpp (100%) rename src/plugins/{clangstaticanalyzer => clangtools}/unit-tests/stdc++11-includes/stdc++11-includes.pro (100%) rename src/plugins/{clangstaticanalyzer => clangtools}/unit-tests/stdc++11-includes/stdc++11-includes.qbs (100%) diff --git a/src/plugins/clangstaticanalyzer/ClangStaticAnalyzer.json.in b/src/plugins/clangtools/ClangTools.json.in similarity index 93% rename from src/plugins/clangstaticanalyzer/ClangStaticAnalyzer.json.in rename to src/plugins/clangtools/ClangTools.json.in index ae40a9e8321..7eea61d1bce 100644 --- a/src/plugins/clangstaticanalyzer/ClangStaticAnalyzer.json.in +++ b/src/plugins/clangtools/ClangTools.json.in @@ -1,5 +1,5 @@ { - \"Name\" : \"ClangStaticAnalyzer\", + \"Name\" : \"ClangTools\", \"Version\" : \"$$QTCREATOR_VERSION\", \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", \"Vendor\" : \"The Qt Company Ltd\", @@ -13,7 +13,7 @@ \"Alternatively, this file may be used under the terms of the GNU General Public License version 3 as published by the Free Software Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT included in the packaging of this file. Please review the following information to ensure the GNU General Public License requirements will be met: https://www.gnu.org/licenses/gpl-3.0.html.\" ], \"Category\" : \"Code Analyzer\", - \"Description\" : \"ClangStaticAnalyzer Plugin.\", + \"Description\" : \"ClangTools Plugin.\", \"Url\" : \"http://www.qt.io\", $$dependencyList } diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzer_global.h b/src/plugins/clangtools/clangstaticanalyzer_global.h similarity index 100% rename from src/plugins/clangstaticanalyzer/clangstaticanalyzer_global.h rename to src/plugins/clangtools/clangstaticanalyzer_global.h diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerconfigwidget.cpp b/src/plugins/clangtools/clangstaticanalyzerconfigwidget.cpp similarity index 98% rename from src/plugins/clangstaticanalyzer/clangstaticanalyzerconfigwidget.cpp rename to src/plugins/clangtools/clangstaticanalyzerconfigwidget.cpp index dd3e59d2c4f..57c1030aaa6 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerconfigwidget.cpp +++ b/src/plugins/clangtools/clangstaticanalyzerconfigwidget.cpp @@ -31,7 +31,7 @@ #include #include -namespace ClangStaticAnalyzer { +namespace ClangTools { namespace Internal { ClangStaticAnalyzerConfigWidget::ClangStaticAnalyzerConfigWidget( @@ -124,4 +124,4 @@ void ClangStaticAnalyzerConfigWidget::updateDetectedVersionLabel( } } // namespace Internal -} // namespace ClangStaticAnalyzer +} // namespace ClangTools diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerconfigwidget.h b/src/plugins/clangtools/clangstaticanalyzerconfigwidget.h similarity index 96% rename from src/plugins/clangstaticanalyzer/clangstaticanalyzerconfigwidget.h rename to src/plugins/clangtools/clangstaticanalyzerconfigwidget.h index 6cc4e39eaf8..d780f422831 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerconfigwidget.h +++ b/src/plugins/clangtools/clangstaticanalyzerconfigwidget.h @@ -29,7 +29,7 @@ #include -namespace ClangStaticAnalyzer { +namespace ClangTools { namespace Internal { namespace Ui { class ClangStaticAnalyzerConfigWidget; } @@ -54,4 +54,4 @@ private: }; } // namespace Internal -} // namespace ClangStaticAnalyzer +} // namespace ClangTools diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerconfigwidget.ui b/src/plugins/clangtools/clangstaticanalyzerconfigwidget.ui similarity index 94% rename from src/plugins/clangstaticanalyzer/clangstaticanalyzerconfigwidget.ui rename to src/plugins/clangtools/clangstaticanalyzerconfigwidget.ui index d90dd98d8ac..d4cb9c60e8d 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerconfigwidget.ui +++ b/src/plugins/clangtools/clangstaticanalyzerconfigwidget.ui @@ -1,7 +1,7 @@ - ClangStaticAnalyzer::Internal::ClangStaticAnalyzerConfigWidget - + ClangTools::Internal::ClangStaticAnalyzerConfigWidget + 0 diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerconstants.h b/src/plugins/clangtools/clangstaticanalyzerconstants.h similarity index 97% rename from src/plugins/clangstaticanalyzer/clangstaticanalyzerconstants.h rename to src/plugins/clangtools/clangstaticanalyzerconstants.h index 63982c8f1ef..bbd28fd73b3 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerconstants.h +++ b/src/plugins/clangtools/clangstaticanalyzerconstants.h @@ -25,7 +25,7 @@ #pragma once -namespace ClangStaticAnalyzer { +namespace ClangTools { namespace Constants { const char SETTINGS_ID[] = "ClangStaticAnalyzer"; diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnostic.cpp b/src/plugins/clangtools/clangstaticanalyzerdiagnostic.cpp similarity index 95% rename from src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnostic.cpp rename to src/plugins/clangtools/clangstaticanalyzerdiagnostic.cpp index 173e5ee5964..13d151b4194 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnostic.cpp +++ b/src/plugins/clangtools/clangstaticanalyzerdiagnostic.cpp @@ -25,7 +25,7 @@ #include "clangstaticanalyzerdiagnostic.h" -namespace ClangStaticAnalyzer { +namespace ClangTools { namespace Internal { ExplainingStep::ExplainingStep() @@ -44,4 +44,4 @@ bool Diagnostic::isValid() const } } // namespace Internal -} // namespace ClangStaticAnalyzer +} // namespace ClangTools diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnostic.h b/src/plugins/clangtools/clangstaticanalyzerdiagnostic.h similarity index 93% rename from src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnostic.h rename to src/plugins/clangtools/clangstaticanalyzerdiagnostic.h index e40e90ec989..7809fa2adfc 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnostic.h +++ b/src/plugins/clangtools/clangstaticanalyzerdiagnostic.h @@ -31,7 +31,7 @@ #include #include -namespace ClangStaticAnalyzer { +namespace ClangTools { namespace Internal { class ExplainingStep @@ -63,6 +63,6 @@ public: }; } // namespace Internal -} // namespace ClangStaticAnalyzer +} // namespace ClangTools -Q_DECLARE_METATYPE(ClangStaticAnalyzer::Internal::Diagnostic) +Q_DECLARE_METATYPE(ClangTools::Internal::Diagnostic) diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticmodel.cpp b/src/plugins/clangtools/clangstaticanalyzerdiagnosticmodel.cpp similarity index 94% rename from src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticmodel.cpp rename to src/plugins/clangtools/clangstaticanalyzerdiagnosticmodel.cpp index 0362e6f2045..c8a8ba137c2 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticmodel.cpp +++ b/src/plugins/clangtools/clangstaticanalyzerdiagnosticmodel.cpp @@ -38,7 +38,7 @@ #include -namespace ClangStaticAnalyzer { +namespace ClangTools { namespace Internal { class DiagnosticItem : public Utils::TreeItem @@ -92,25 +92,25 @@ static QString createDiagnosticToolTipString(const Diagnostic &diagnostic) if (!diagnostic.category.isEmpty()) { lines << qMakePair( - QCoreApplication::translate("ClangStaticAnalyzer::Diagnostic", "Category:"), + QCoreApplication::translate("ClangTools::Diagnostic", "Category:"), diagnostic.category.toHtmlEscaped()); } if (!diagnostic.type.isEmpty()) { lines << qMakePair( - QCoreApplication::translate("ClangStaticAnalyzer::Diagnostic", "Type:"), + QCoreApplication::translate("ClangTools::Diagnostic", "Type:"), diagnostic.type.toHtmlEscaped()); } if (!diagnostic.issueContext.isEmpty() && !diagnostic.issueContextKind.isEmpty()) { lines << qMakePair( - QCoreApplication::translate("ClangStaticAnalyzer::Diagnostic", "Context:"), + QCoreApplication::translate("ClangTools::Diagnostic", "Context:"), diagnostic.issueContextKind.toHtmlEscaped() + QLatin1Char(' ') + diagnostic.issueContext.toHtmlEscaped()); } lines << qMakePair( - QCoreApplication::translate("ClangStaticAnalyzer::Diagnostic", "Location:"), + QCoreApplication::translate("ClangTools::Diagnostic", "Location:"), createFullLocationString(diagnostic.location)); QString html = QLatin1String("" @@ -139,17 +139,17 @@ static QString createExplainingStepToolTipString(const ExplainingStep &step) if (!step.message.isEmpty()) { lines << qMakePair( - QCoreApplication::translate("ClangStaticAnalyzer::ExplainingStep", "Message:"), + QCoreApplication::translate("ClangTools::ExplainingStep", "Message:"), step.message.toHtmlEscaped()); } if (!step.extendedMessage.isEmpty()) { lines << qMakePair( - QCoreApplication::translate("ClangStaticAnalyzer::ExplainingStep", "Extended message:"), + QCoreApplication::translate("ClangTools::ExplainingStep", "Extended message:"), step.extendedMessage.toHtmlEscaped()); } lines << qMakePair( - QCoreApplication::translate("ClangStaticAnalyzer::ExplainingStep", "Location:"), + QCoreApplication::translate("ClangTools::ExplainingStep", "Location:"), createFullLocationString(step.location)); QString html = QLatin1String("" @@ -354,4 +354,4 @@ void ClangStaticAnalyzerDiagnosticFilterModel::handleSuppressedDiagnosticsChange } } // namespace Internal -} // namespace ClangStaticAnalyzer +} // namespace ClangTools diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticmodel.h b/src/plugins/clangtools/clangstaticanalyzerdiagnosticmodel.h similarity index 97% rename from src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticmodel.h rename to src/plugins/clangtools/clangstaticanalyzerdiagnosticmodel.h index 8b4be2745b0..c2ae8c8626a 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticmodel.h +++ b/src/plugins/clangtools/clangstaticanalyzerdiagnosticmodel.h @@ -37,7 +37,7 @@ namespace ProjectExplorer { class Project; } -namespace ClangStaticAnalyzer { +namespace ClangTools { namespace Internal { class ClangStaticAnalyzerDiagnosticModel : public Utils::TreeModel<> @@ -76,4 +76,4 @@ private: }; } // namespace Internal -} // namespace ClangStaticAnalyzer +} // namespace ClangTools diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticview.cpp b/src/plugins/clangtools/clangstaticanalyzerdiagnosticview.cpp similarity index 98% rename from src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticview.cpp rename to src/plugins/clangtools/clangstaticanalyzerdiagnosticview.cpp index 097022df04a..29f810c2ab2 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticview.cpp +++ b/src/plugins/clangtools/clangstaticanalyzerdiagnosticview.cpp @@ -38,7 +38,7 @@ using namespace Debugger; -namespace ClangStaticAnalyzer { +namespace ClangTools { namespace Internal { ClangStaticAnalyzerDiagnosticView::ClangStaticAnalyzerDiagnosticView(QWidget *parent) @@ -82,4 +82,4 @@ QList ClangStaticAnalyzerDiagnosticView::customActions() const } } // namespace Internal -} // namespace ClangStaticAnalyzer +} // namespace ClangTools diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticview.h b/src/plugins/clangtools/clangstaticanalyzerdiagnosticview.h similarity index 95% rename from src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticview.h rename to src/plugins/clangtools/clangstaticanalyzerdiagnosticview.h index 39a58804f9f..319bea251a5 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticview.h +++ b/src/plugins/clangtools/clangstaticanalyzerdiagnosticview.h @@ -27,7 +27,7 @@ #include -namespace ClangStaticAnalyzer { +namespace ClangTools { namespace Internal { class ClangStaticAnalyzerDiagnosticView : public Debugger::DetailedErrorView @@ -46,4 +46,4 @@ private: }; } // namespace Internal -} // namespace ClangStaticAnalyzer +} // namespace ClangTools diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerlogfilereader.cpp b/src/plugins/clangtools/clangstaticanalyzerlogfilereader.cpp similarity index 98% rename from src/plugins/clangstaticanalyzer/clangstaticanalyzerlogfilereader.cpp rename to src/plugins/clangtools/clangstaticanalyzerlogfilereader.cpp index 6e361b0a1aa..d111412b175 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerlogfilereader.cpp +++ b/src/plugins/clangtools/clangstaticanalyzerlogfilereader.cpp @@ -34,12 +34,12 @@ #include #include -namespace ClangStaticAnalyzer { +namespace ClangTools { namespace Internal { class ClangStaticAnalyzerLogFileReader { - Q_DECLARE_TR_FUNCTIONS(ClangStaticAnalyzer::Internal::ClangStaticAnalyzerLogFileReader) + Q_DECLARE_TR_FUNCTIONS(ClangTools::Internal::ClangStaticAnalyzerLogFileReader) public: ClangStaticAnalyzerLogFileReader(const QString &filePath); @@ -384,4 +384,4 @@ int ClangStaticAnalyzerLogFileReader::readInteger(bool *convertedSuccessfully) } } // namespace Internal -} // namespace ClangStaticAnalyzer +} // namespace ClangTools diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerlogfilereader.h b/src/plugins/clangtools/clangstaticanalyzerlogfilereader.h similarity index 91% rename from src/plugins/clangstaticanalyzer/clangstaticanalyzerlogfilereader.h rename to src/plugins/clangtools/clangstaticanalyzerlogfilereader.h index 81179137615..9236fff2e98 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerlogfilereader.h +++ b/src/plugins/clangtools/clangstaticanalyzerlogfilereader.h @@ -30,15 +30,15 @@ #include #include -namespace ClangStaticAnalyzer { +namespace ClangTools { namespace Internal { class LogFileReader { - Q_DECLARE_TR_FUNCTIONS(ClangStaticAnalyzer::Internal::LogFileReader) + Q_DECLARE_TR_FUNCTIONS(ClangTools::Internal::LogFileReader) public: static QList read(const QString &filePath, QString *errorMessage); }; } // namespace Internal -} // namespace ClangStaticAnalyzer +} // namespace ClangTools diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerpreconfiguredsessiontests.cpp b/src/plugins/clangtools/clangstaticanalyzerpreconfiguredsessiontests.cpp similarity index 99% rename from src/plugins/clangstaticanalyzer/clangstaticanalyzerpreconfiguredsessiontests.cpp rename to src/plugins/clangtools/clangstaticanalyzerpreconfiguredsessiontests.cpp index c9ff00558db..405effc0807 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerpreconfiguredsessiontests.cpp +++ b/src/plugins/clangtools/clangstaticanalyzerpreconfiguredsessiontests.cpp @@ -93,7 +93,7 @@ private: QStringList m_projectsToWaitFor; }; -namespace ClangStaticAnalyzer { +namespace ClangTools { namespace Internal { void ClangStaticAnalyzerPreconfiguredSessionTests::initTestCase() @@ -232,4 +232,4 @@ bool ClangStaticAnalyzerPreconfiguredSessionTests::switchToProjectAndTarget(Proj } } // namespace Internal -} // namespace ClangStaticAnalyzerPlugin +} // namespace ClangTools diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerpreconfiguredsessiontests.h b/src/plugins/clangtools/clangstaticanalyzerpreconfiguredsessiontests.h similarity index 95% rename from src/plugins/clangstaticanalyzer/clangstaticanalyzerpreconfiguredsessiontests.h rename to src/plugins/clangtools/clangstaticanalyzerpreconfiguredsessiontests.h index d2a9a801137..654ab79a6b8 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerpreconfiguredsessiontests.h +++ b/src/plugins/clangtools/clangstaticanalyzerpreconfiguredsessiontests.h @@ -33,7 +33,7 @@ class Project; class Target; } -namespace ClangStaticAnalyzer { +namespace ClangTools { namespace Internal { class ClangStaticAnalyzerPreconfiguredSessionTests: public QObject @@ -52,4 +52,4 @@ private: }; } // namespace Internal -} // namespace ClangStaticAnalyzerPlugin +} // namespace ClangTools diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerprojectsettings.cpp b/src/plugins/clangtools/clangstaticanalyzerprojectsettings.cpp similarity index 98% rename from src/plugins/clangstaticanalyzer/clangstaticanalyzerprojectsettings.cpp rename to src/plugins/clangtools/clangstaticanalyzerprojectsettings.cpp index 4d37154c858..9d2c645add6 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerprojectsettings.cpp +++ b/src/plugins/clangtools/clangstaticanalyzerprojectsettings.cpp @@ -29,7 +29,7 @@ #include -namespace ClangStaticAnalyzer { +namespace ClangTools { namespace Internal { static QString suppressedDiagnosticsKey() @@ -142,4 +142,4 @@ SuppressedDiagnostic::SuppressedDiagnostic(const Diagnostic &diag) } } // namespace Internal -} // namespace ClangStaticAnalyzer +} // namespace ClangTools diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerprojectsettings.h b/src/plugins/clangtools/clangstaticanalyzerprojectsettings.h similarity index 97% rename from src/plugins/clangstaticanalyzer/clangstaticanalyzerprojectsettings.h rename to src/plugins/clangtools/clangstaticanalyzerprojectsettings.h index 31a39410055..30383f3640f 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerprojectsettings.h +++ b/src/plugins/clangtools/clangstaticanalyzerprojectsettings.h @@ -31,7 +31,7 @@ #include #include -namespace ClangStaticAnalyzer { +namespace ClangTools { namespace Internal { class Diagnostic; @@ -89,4 +89,4 @@ private: }; } // namespace Internal -} // namespace ClangStaticAnalyzer +} // namespace ClangTools diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerprojectsettingsmanager.cpp b/src/plugins/clangtools/clangstaticanalyzerprojectsettingsmanager.cpp similarity index 96% rename from src/plugins/clangstaticanalyzer/clangstaticanalyzerprojectsettingsmanager.cpp rename to src/plugins/clangtools/clangstaticanalyzerprojectsettingsmanager.cpp index c0b456345b6..263812f8eb8 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerprojectsettingsmanager.cpp +++ b/src/plugins/clangtools/clangstaticanalyzerprojectsettingsmanager.cpp @@ -29,7 +29,7 @@ #include -namespace ClangStaticAnalyzer { +namespace ClangTools { namespace Internal { ProjectSettingsManager::ProjectSettingsManager() @@ -55,4 +55,4 @@ void ProjectSettingsManager::handleProjectToBeRemoved(ProjectExplorer::Project * ProjectSettingsManager::SettingsMap ProjectSettingsManager::m_settings; } // namespace Internal -} // namespace ClangStaticAnalyzer +} // namespace ClangTools diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerprojectsettingsmanager.h b/src/plugins/clangtools/clangstaticanalyzerprojectsettingsmanager.h similarity index 96% rename from src/plugins/clangstaticanalyzer/clangstaticanalyzerprojectsettingsmanager.h rename to src/plugins/clangtools/clangstaticanalyzerprojectsettingsmanager.h index 50af6153726..bbfdf7e7152 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerprojectsettingsmanager.h +++ b/src/plugins/clangtools/clangstaticanalyzerprojectsettingsmanager.h @@ -30,7 +30,7 @@ namespace ProjectExplorer { class Project; } #include #include -namespace ClangStaticAnalyzer { +namespace ClangTools { namespace Internal { class ProjectSettings; @@ -49,4 +49,4 @@ private: }; } // namespace Internal -} // namespace ClangStaticAnalyzer +} // namespace ClangTools diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerprojectsettingswidget.cpp b/src/plugins/clangtools/clangstaticanalyzerprojectsettingswidget.cpp similarity index 98% rename from src/plugins/clangstaticanalyzer/clangstaticanalyzerprojectsettingswidget.cpp rename to src/plugins/clangtools/clangstaticanalyzerprojectsettingswidget.cpp index 3ec14f7d291..3ac9e81f1cb 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerprojectsettingswidget.cpp +++ b/src/plugins/clangtools/clangstaticanalyzerprojectsettingswidget.cpp @@ -33,7 +33,7 @@ #include -namespace ClangStaticAnalyzer { +namespace ClangTools { namespace Internal { class SuppressedDiagnosticsModel : public QAbstractTableModel @@ -163,6 +163,6 @@ QVariant SuppressedDiagnosticsModel::data(const QModelIndex &index, int role) co } } // namespace Internal -} // namespace ClangStaticAnalyzer +} // namespace ClangTools #include "clangstaticanalyzerprojectsettingswidget.moc" diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerprojectsettingswidget.h b/src/plugins/clangtools/clangstaticanalyzerprojectsettingswidget.h similarity index 96% rename from src/plugins/clangstaticanalyzer/clangstaticanalyzerprojectsettingswidget.h rename to src/plugins/clangtools/clangstaticanalyzerprojectsettingswidget.h index 18090788ac5..3896600115a 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerprojectsettingswidget.h +++ b/src/plugins/clangtools/clangstaticanalyzerprojectsettingswidget.h @@ -29,7 +29,7 @@ namespace ProjectExplorer { class Project; } -namespace ClangStaticAnalyzer { +namespace ClangTools { namespace Internal { class ProjectSettings; @@ -54,4 +54,4 @@ private: }; } // namespace Internal -} // namespace ClangStaticAnalyzer +} // namespace ClangTools diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerprojectsettingswidget.ui b/src/plugins/clangtools/clangstaticanalyzerprojectsettingswidget.ui similarity index 93% rename from src/plugins/clangstaticanalyzer/clangstaticanalyzerprojectsettingswidget.ui rename to src/plugins/clangtools/clangstaticanalyzerprojectsettingswidget.ui index b0fcb15038b..c120d3bb95f 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerprojectsettingswidget.ui +++ b/src/plugins/clangtools/clangstaticanalyzerprojectsettingswidget.ui @@ -1,7 +1,7 @@ - ClangStaticAnalyzer::Internal::ProjectSettingsWidget - + ClangTools::Internal::ProjectSettingsWidget + 0 diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp b/src/plugins/clangtools/clangstaticanalyzerruncontrol.cpp similarity index 99% rename from src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp rename to src/plugins/clangtools/clangstaticanalyzerruncontrol.cpp index 6f94ce23d2f..b7384cce0be 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp +++ b/src/plugins/clangtools/clangstaticanalyzerruncontrol.cpp @@ -106,7 +106,7 @@ static QStringList extraClangStaticAnalyzerAppendOptions() { return options; } -namespace ClangStaticAnalyzer { +namespace ClangTools { namespace Internal { class ProjectBuilder : public RunWorker @@ -665,4 +665,4 @@ void ClangStaticAnalyzerToolRunner::finalize() } } // namespace Internal -} // namespace ClangStaticAnalyzer +} // namespace ClangTools diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.h b/src/plugins/clangtools/clangstaticanalyzerruncontrol.h similarity index 97% rename from src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.h rename to src/plugins/clangtools/clangstaticanalyzerruncontrol.h index e5425d0c4be..d69948935c8 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.h +++ b/src/plugins/clangtools/clangstaticanalyzerruncontrol.h @@ -32,7 +32,7 @@ #include #include -namespace ClangStaticAnalyzer { +namespace ClangTools { namespace Internal { class ClangStaticAnalyzerRunner; @@ -97,4 +97,4 @@ private: }; } // namespace Internal -} // namespace ClangStaticAnalyzer +} // namespace ClangTools diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerrunner.cpp b/src/plugins/clangtools/clangstaticanalyzerrunner.cpp similarity index 99% rename from src/plugins/clangstaticanalyzer/clangstaticanalyzerrunner.cpp rename to src/plugins/clangtools/clangstaticanalyzerrunner.cpp index 386f26f623e..59d2ed3b4ad 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerrunner.cpp +++ b/src/plugins/clangtools/clangstaticanalyzerrunner.cpp @@ -38,7 +38,7 @@ static Q_LOGGING_CATEGORY(LOG, "qtc.clangstaticanalyzer.runner") -namespace ClangStaticAnalyzer { +namespace ClangTools { namespace Internal { static QString generalProcessError() @@ -197,4 +197,4 @@ QString ClangStaticAnalyzerRunner::actualLogFile() const } } // namespace Internal -} // namespace ClangStaticAnalyzer +} // namespace ClangTools diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerrunner.h b/src/plugins/clangtools/clangstaticanalyzerrunner.h similarity index 97% rename from src/plugins/clangstaticanalyzer/clangstaticanalyzerrunner.h rename to src/plugins/clangtools/clangstaticanalyzerrunner.h index eb20359062e..add441e5d95 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerrunner.h +++ b/src/plugins/clangtools/clangstaticanalyzerrunner.h @@ -31,7 +31,7 @@ #include #include -namespace ClangStaticAnalyzer { +namespace ClangTools { namespace Internal { QString finishedWithBadExitCode(int exitCode); // exposed for tests @@ -80,4 +80,4 @@ private: }; } // namespace Internal -} // namespace ClangStaticAnalyzer +} // namespace ClangTools diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzersettings.cpp b/src/plugins/clangtools/clangstaticanalyzersettings.cpp similarity index 98% rename from src/plugins/clangstaticanalyzer/clangstaticanalyzersettings.cpp rename to src/plugins/clangtools/clangstaticanalyzersettings.cpp index ad1ed074329..d7a0a61ebac 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzersettings.cpp +++ b/src/plugins/clangtools/clangstaticanalyzersettings.cpp @@ -38,7 +38,7 @@ static const char clangExecutableKey[] = "clangExecutable"; static const char simultaneousProcessesKey[] = "simultaneousProcesses"; -namespace ClangStaticAnalyzer { +namespace ClangTools { namespace Internal { ClangStaticAnalyzerSettings::ClangStaticAnalyzerSettings() @@ -120,4 +120,4 @@ void ClangStaticAnalyzerSettings::writeSettings() const } } // namespace Internal -} // namespace ClangStaticAnalyzer +} // namespace ClangTools diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzersettings.h b/src/plugins/clangtools/clangstaticanalyzersettings.h similarity index 96% rename from src/plugins/clangstaticanalyzer/clangstaticanalyzersettings.h rename to src/plugins/clangtools/clangstaticanalyzersettings.h index 1a2ff5286c3..e6a1f7fb134 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzersettings.h +++ b/src/plugins/clangtools/clangstaticanalyzersettings.h @@ -27,7 +27,7 @@ #include -namespace ClangStaticAnalyzer { +namespace ClangTools { namespace Internal { class ClangStaticAnalyzerSettings @@ -53,4 +53,4 @@ private: }; } // namespace Internal -} // namespace ClangStaticAnalyzer +} // namespace ClangTools diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp b/src/plugins/clangtools/clangstaticanalyzertool.cpp similarity index 99% rename from src/plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp rename to src/plugins/clangtools/clangstaticanalyzertool.cpp index 35af013f2b6..0132d4c3c93 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp +++ b/src/plugins/clangtools/clangstaticanalyzertool.cpp @@ -57,7 +57,7 @@ using namespace Debugger; using namespace ProjectExplorer; using namespace Utils; -namespace ClangStaticAnalyzer { +namespace ClangTools { namespace Internal { static ClangStaticAnalyzerTool *s_instance; @@ -267,4 +267,4 @@ void ClangStaticAnalyzerTool::handleStateUpdate() } } // namespace Internal -} // namespace ClangStaticAnalyzer +} // namespace ClangTools diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.h b/src/plugins/clangtools/clangstaticanalyzertool.h similarity index 97% rename from src/plugins/clangstaticanalyzer/clangstaticanalyzertool.h rename to src/plugins/clangtools/clangstaticanalyzertool.h index 334ec07b93c..999caab5b32 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.h +++ b/src/plugins/clangtools/clangstaticanalyzertool.h @@ -28,7 +28,7 @@ #include #include -namespace ClangStaticAnalyzer { +namespace ClangTools { namespace Internal { class ClangStaticAnalyzerDiagnosticFilterModel; @@ -76,4 +76,4 @@ private: }; } // namespace Internal -} // namespace ClangStaticAnalyzer +} // namespace ClangTools diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerunittests.cpp b/src/plugins/clangtools/clangstaticanalyzerunittests.cpp similarity index 98% rename from src/plugins/clangstaticanalyzer/clangstaticanalyzerunittests.cpp rename to src/plugins/clangtools/clangstaticanalyzerunittests.cpp index f589a978b39..33e8c0f7f3e 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerunittests.cpp +++ b/src/plugins/clangtools/clangstaticanalyzerunittests.cpp @@ -45,7 +45,7 @@ using namespace ProjectExplorer; using namespace Utils; -namespace ClangStaticAnalyzer { +namespace ClangTools { namespace Internal { void ClangStaticAnalyzerUnitTests::initTestCase() @@ -129,4 +129,4 @@ void ClangStaticAnalyzerUnitTests::addTestRow(const QByteArray &relativeFilePath } } // namespace Internal -} // namespace ClangStaticAnalyzerPlugin +} // namespace ClangTools diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerunittests.h b/src/plugins/clangtools/clangstaticanalyzerunittests.h similarity index 95% rename from src/plugins/clangstaticanalyzer/clangstaticanalyzerunittests.h rename to src/plugins/clangtools/clangstaticanalyzerunittests.h index 42c006b75bb..968dc3b3ca2 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerunittests.h +++ b/src/plugins/clangtools/clangstaticanalyzerunittests.h @@ -29,7 +29,7 @@ namespace CppTools { namespace Tests { class TemporaryCopiedDir; } } -namespace ClangStaticAnalyzer { +namespace ClangTools { namespace Internal { class ClangStaticAnalyzerUnitTests : public QObject @@ -53,4 +53,4 @@ private: }; } // namespace Internal -} // namespace ClangStaticAnalyzerPlugin +} // namespace ClangTools diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerunittests.qrc b/src/plugins/clangtools/clangstaticanalyzerunittests.qrc similarity index 100% rename from src/plugins/clangstaticanalyzer/clangstaticanalyzerunittests.qrc rename to src/plugins/clangtools/clangstaticanalyzerunittests.qrc diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerutils.cpp b/src/plugins/clangtools/clangstaticanalyzerutils.cpp similarity index 98% rename from src/plugins/clangstaticanalyzer/clangstaticanalyzerutils.cpp rename to src/plugins/clangtools/clangstaticanalyzerutils.cpp index 7a433aac49f..857ab731184 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerutils.cpp +++ b/src/plugins/clangtools/clangstaticanalyzerutils.cpp @@ -47,7 +47,7 @@ static bool isFileExecutable(const QString &executablePath) return fileInfo.isFile() && fileInfo.isExecutable(); } -namespace ClangStaticAnalyzer { +namespace ClangTools { namespace Internal { QString clangExecutableFromSettings(bool *isValid) @@ -153,4 +153,4 @@ ClangExecutableVersion clangExecutableVersion(const QString &executable) } } // namespace Internal -} // namespace ClangStaticAnalyzer +} // namespace ClangTools diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerutils.h b/src/plugins/clangtools/clangstaticanalyzerutils.h similarity index 97% rename from src/plugins/clangstaticanalyzer/clangstaticanalyzerutils.h rename to src/plugins/clangtools/clangstaticanalyzerutils.h index b026822bf04..a63c9db3707 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerutils.h +++ b/src/plugins/clangtools/clangstaticanalyzerutils.h @@ -36,7 +36,7 @@ QT_END_NAMESPACE namespace Debugger { class DiagnosticLocation; } -namespace ClangStaticAnalyzer { +namespace ClangTools { namespace Internal { bool isClangExecutableUsable(const QString &filePath, QString *errorMessage = 0); @@ -71,4 +71,4 @@ public: ClangExecutableVersion clangExecutableVersion(const QString &absolutePath); } // namespace Internal -} // namespace ClangStaticAnalyzer +} // namespace ClangTools diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzer.pro b/src/plugins/clangtools/clangtools.pro similarity index 96% rename from src/plugins/clangstaticanalyzer/clangstaticanalyzer.pro rename to src/plugins/clangtools/clangtools.pro index 3787c2ac6d8..77362b4721e 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzer.pro +++ b/src/plugins/clangtools/clangtools.pro @@ -6,7 +6,7 @@ SOURCES += \ clangstaticanalyzerdiagnosticmodel.cpp \ clangstaticanalyzerdiagnosticview.cpp \ clangstaticanalyzerlogfilereader.cpp \ - clangstaticanalyzerplugin.cpp \ + clangtoolsplugin.cpp \ clangstaticanalyzerprojectsettings.cpp \ clangstaticanalyzerprojectsettingsmanager.cpp \ clangstaticanalyzerprojectsettingswidget.cpp \ @@ -24,7 +24,7 @@ HEADERS += \ clangstaticanalyzerdiagnosticview.h \ clangstaticanalyzer_global.h \ clangstaticanalyzerlogfilereader.h \ - clangstaticanalyzerplugin.h \ + clangtoolsplugin.h \ clangstaticanalyzerprojectsettings.h \ clangstaticanalyzerprojectsettingsmanager.h \ clangstaticanalyzerprojectsettingswidget.h \ diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzer.qbs b/src/plugins/clangtools/clangtools.qbs similarity index 100% rename from src/plugins/clangstaticanalyzer/clangstaticanalyzer.qbs rename to src/plugins/clangtools/clangtools.qbs diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzer_dependencies.pri b/src/plugins/clangtools/clangtools_dependencies.pri similarity index 82% rename from src/plugins/clangstaticanalyzer/clangstaticanalyzer_dependencies.pri rename to src/plugins/clangtools/clangtools_dependencies.pri index f907aefc616..7dff1d46883 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzer_dependencies.pri +++ b/src/plugins/clangtools/clangtools_dependencies.pri @@ -1,4 +1,4 @@ -QTC_PLUGIN_NAME = ClangStaticAnalyzer +QTC_PLUGIN_NAME = ClangTools QTC_LIB_DEPENDS += \ extensionsystem \ utils diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.cpp b/src/plugins/clangtools/clangtoolsplugin.cpp similarity index 88% rename from src/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.cpp rename to src/plugins/clangtools/clangtoolsplugin.cpp index 1fad9589dd1..cd83c22e038 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.cpp +++ b/src/plugins/clangtools/clangtoolsplugin.cpp @@ -23,7 +23,7 @@ ** ****************************************************************************/ -#include "clangstaticanalyzerplugin.h" +#include "clangtoolsplugin.h" #include "clangstaticanalyzerconfigwidget.h" #include "clangstaticanalyzerconstants.h" @@ -60,7 +60,7 @@ using namespace ProjectExplorer; -namespace ClangStaticAnalyzer { +namespace ClangTools { namespace Internal { class ClangStaticAnalyzerOptionsPage : public Core::IOptionsPage @@ -70,7 +70,7 @@ public: { setId("Analyzer.ClangStaticAnalyzer.Settings"); // TODO: Get it from "clangstaticanalyzersettings.h" setDisplayName(QCoreApplication::translate( - "ClangStaticAnalyzer::Internal::ClangStaticAnalyzerOptionsPage", + "ClangTools::Internal::ClangStaticAnalyzerOptionsPage", "Clang Static Analyzer")); setCategory("T.Analyzer"); setDisplayCategory(QCoreApplication::translate("Analyzer", "Analyzer")); @@ -98,24 +98,24 @@ private: QPointer m_widget; }; -class ClangStaticAnalyzerPluginPrivate +class ClangToolsPluginPrivate { public: ClangStaticAnalyzerTool tool; ClangStaticAnalyzerOptionsPage optionsPage; }; -ClangStaticAnalyzerPlugin::~ClangStaticAnalyzerPlugin() +ClangToolsPlugin::~ClangToolsPlugin() { delete d; } -bool ClangStaticAnalyzerPlugin::initialize(const QStringList &arguments, QString *errorString) +bool ClangToolsPlugin::initialize(const QStringList &arguments, QString *errorString) { Q_UNUSED(arguments); Q_UNUSED(errorString); - d = new ClangStaticAnalyzerPluginPrivate; + d = new ClangToolsPluginPrivate; auto panelFactory = new ProjectPanelFactory(); panelFactory->setPriority(100); @@ -126,7 +126,7 @@ bool ClangStaticAnalyzerPlugin::initialize(const QStringList &arguments, QString return true; } -QList ClangStaticAnalyzerPlugin::createTestObjects() const +QList ClangToolsPlugin::createTestObjects() const { QList tests; #ifdef WITH_TESTS @@ -137,4 +137,4 @@ QList ClangStaticAnalyzerPlugin::createTestObjects() const } } // namespace Internal -} // namespace ClangStaticAnalyzerPlugin +} // namespace ClangTools diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.h b/src/plugins/clangtools/clangtoolsplugin.h similarity index 83% rename from src/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.h rename to src/plugins/clangtools/clangtoolsplugin.h index 3ad48a7fe02..1f14b0f4550 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.h +++ b/src/plugins/clangtools/clangtoolsplugin.h @@ -27,25 +27,25 @@ #include -namespace ClangStaticAnalyzer { +namespace ClangTools { namespace Internal { -class ClangStaticAnalyzerPlugin : public ExtensionSystem::IPlugin +class ClangToolsPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "ClangStaticAnalyzer.json") + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "ClangTools.json") public: - ClangStaticAnalyzerPlugin() = default; - ~ClangStaticAnalyzerPlugin() final; + ClangToolsPlugin() = default; + ~ClangToolsPlugin() final; private: bool initialize(const QStringList &arguments, QString *errorString) final; void extensionsInitialized() final {} QList createTestObjects() const final; - class ClangStaticAnalyzerPluginPrivate *d = nullptr; + class ClangToolsPluginPrivate *d = nullptr; }; } // namespace Internal -} // namespace ClangStaticAnalyzerPlugin +} // namespace ClangTools diff --git a/src/plugins/clangstaticanalyzer/unit-tests/mingw-includes/main.cpp b/src/plugins/clangtools/unit-tests/mingw-includes/main.cpp similarity index 100% rename from src/plugins/clangstaticanalyzer/unit-tests/mingw-includes/main.cpp rename to src/plugins/clangtools/unit-tests/mingw-includes/main.cpp diff --git a/src/plugins/clangstaticanalyzer/unit-tests/mingw-includes/mingw-includes.pro b/src/plugins/clangtools/unit-tests/mingw-includes/mingw-includes.pro similarity index 100% rename from src/plugins/clangstaticanalyzer/unit-tests/mingw-includes/mingw-includes.pro rename to src/plugins/clangtools/unit-tests/mingw-includes/mingw-includes.pro diff --git a/src/plugins/clangstaticanalyzer/unit-tests/mingw-includes/mingw-includes.qbs b/src/plugins/clangtools/unit-tests/mingw-includes/mingw-includes.qbs similarity index 100% rename from src/plugins/clangstaticanalyzer/unit-tests/mingw-includes/mingw-includes.qbs rename to src/plugins/clangtools/unit-tests/mingw-includes/mingw-includes.qbs diff --git a/src/plugins/clangstaticanalyzer/unit-tests/qt-essential-includes/main.cpp b/src/plugins/clangtools/unit-tests/qt-essential-includes/main.cpp similarity index 100% rename from src/plugins/clangstaticanalyzer/unit-tests/qt-essential-includes/main.cpp rename to src/plugins/clangtools/unit-tests/qt-essential-includes/main.cpp diff --git a/src/plugins/clangstaticanalyzer/unit-tests/qt-essential-includes/qt-essential-includes.pro b/src/plugins/clangtools/unit-tests/qt-essential-includes/qt-essential-includes.pro similarity index 100% rename from src/plugins/clangstaticanalyzer/unit-tests/qt-essential-includes/qt-essential-includes.pro rename to src/plugins/clangtools/unit-tests/qt-essential-includes/qt-essential-includes.pro diff --git a/src/plugins/clangstaticanalyzer/unit-tests/qt-essential-includes/qt-essential-includes.qbs b/src/plugins/clangtools/unit-tests/qt-essential-includes/qt-essential-includes.qbs similarity index 100% rename from src/plugins/clangstaticanalyzer/unit-tests/qt-essential-includes/qt-essential-includes.qbs rename to src/plugins/clangtools/unit-tests/qt-essential-includes/qt-essential-includes.qbs diff --git a/src/plugins/clangstaticanalyzer/unit-tests/qt-widgets-app/main.cpp b/src/plugins/clangtools/unit-tests/qt-widgets-app/main.cpp similarity index 100% rename from src/plugins/clangstaticanalyzer/unit-tests/qt-widgets-app/main.cpp rename to src/plugins/clangtools/unit-tests/qt-widgets-app/main.cpp diff --git a/src/plugins/clangstaticanalyzer/unit-tests/qt-widgets-app/mainwindow.cpp b/src/plugins/clangtools/unit-tests/qt-widgets-app/mainwindow.cpp similarity index 100% rename from src/plugins/clangstaticanalyzer/unit-tests/qt-widgets-app/mainwindow.cpp rename to src/plugins/clangtools/unit-tests/qt-widgets-app/mainwindow.cpp diff --git a/src/plugins/clangstaticanalyzer/unit-tests/qt-widgets-app/mainwindow.h b/src/plugins/clangtools/unit-tests/qt-widgets-app/mainwindow.h similarity index 100% rename from src/plugins/clangstaticanalyzer/unit-tests/qt-widgets-app/mainwindow.h rename to src/plugins/clangtools/unit-tests/qt-widgets-app/mainwindow.h diff --git a/src/plugins/clangstaticanalyzer/unit-tests/qt-widgets-app/mainwindow.ui b/src/plugins/clangtools/unit-tests/qt-widgets-app/mainwindow.ui similarity index 100% rename from src/plugins/clangstaticanalyzer/unit-tests/qt-widgets-app/mainwindow.ui rename to src/plugins/clangtools/unit-tests/qt-widgets-app/mainwindow.ui diff --git a/src/plugins/clangstaticanalyzer/unit-tests/qt-widgets-app/qt-widgets-app.pro b/src/plugins/clangtools/unit-tests/qt-widgets-app/qt-widgets-app.pro similarity index 100% rename from src/plugins/clangstaticanalyzer/unit-tests/qt-widgets-app/qt-widgets-app.pro rename to src/plugins/clangtools/unit-tests/qt-widgets-app/qt-widgets-app.pro diff --git a/src/plugins/clangstaticanalyzer/unit-tests/qt-widgets-app/qt-widgets-app.qbs b/src/plugins/clangtools/unit-tests/qt-widgets-app/qt-widgets-app.qbs similarity index 100% rename from src/plugins/clangstaticanalyzer/unit-tests/qt-widgets-app/qt-widgets-app.qbs rename to src/plugins/clangtools/unit-tests/qt-widgets-app/qt-widgets-app.qbs diff --git a/src/plugins/clangstaticanalyzer/unit-tests/simple-library/simple-library.cpp b/src/plugins/clangtools/unit-tests/simple-library/simple-library.cpp similarity index 100% rename from src/plugins/clangstaticanalyzer/unit-tests/simple-library/simple-library.cpp rename to src/plugins/clangtools/unit-tests/simple-library/simple-library.cpp diff --git a/src/plugins/clangstaticanalyzer/unit-tests/simple-library/simple-library.h b/src/plugins/clangtools/unit-tests/simple-library/simple-library.h similarity index 100% rename from src/plugins/clangstaticanalyzer/unit-tests/simple-library/simple-library.h rename to src/plugins/clangtools/unit-tests/simple-library/simple-library.h diff --git a/src/plugins/clangstaticanalyzer/unit-tests/simple-library/simple-library.pro b/src/plugins/clangtools/unit-tests/simple-library/simple-library.pro similarity index 100% rename from src/plugins/clangstaticanalyzer/unit-tests/simple-library/simple-library.pro rename to src/plugins/clangtools/unit-tests/simple-library/simple-library.pro diff --git a/src/plugins/clangstaticanalyzer/unit-tests/simple-library/simple-library.qbs b/src/plugins/clangtools/unit-tests/simple-library/simple-library.qbs similarity index 100% rename from src/plugins/clangstaticanalyzer/unit-tests/simple-library/simple-library.qbs rename to src/plugins/clangtools/unit-tests/simple-library/simple-library.qbs diff --git a/src/plugins/clangstaticanalyzer/unit-tests/simple/main.cpp b/src/plugins/clangtools/unit-tests/simple/main.cpp similarity index 100% rename from src/plugins/clangstaticanalyzer/unit-tests/simple/main.cpp rename to src/plugins/clangtools/unit-tests/simple/main.cpp diff --git a/src/plugins/clangstaticanalyzer/unit-tests/simple/simple.pro b/src/plugins/clangtools/unit-tests/simple/simple.pro similarity index 100% rename from src/plugins/clangstaticanalyzer/unit-tests/simple/simple.pro rename to src/plugins/clangtools/unit-tests/simple/simple.pro diff --git a/src/plugins/clangstaticanalyzer/unit-tests/simple/simple.qbs b/src/plugins/clangtools/unit-tests/simple/simple.qbs similarity index 100% rename from src/plugins/clangstaticanalyzer/unit-tests/simple/simple.qbs rename to src/plugins/clangtools/unit-tests/simple/simple.qbs diff --git a/src/plugins/clangstaticanalyzer/unit-tests/stdc++11-includes/main.cpp b/src/plugins/clangtools/unit-tests/stdc++11-includes/main.cpp similarity index 100% rename from src/plugins/clangstaticanalyzer/unit-tests/stdc++11-includes/main.cpp rename to src/plugins/clangtools/unit-tests/stdc++11-includes/main.cpp diff --git a/src/plugins/clangstaticanalyzer/unit-tests/stdc++11-includes/stdc++11-includes.pro b/src/plugins/clangtools/unit-tests/stdc++11-includes/stdc++11-includes.pro similarity index 100% rename from src/plugins/clangstaticanalyzer/unit-tests/stdc++11-includes/stdc++11-includes.pro rename to src/plugins/clangtools/unit-tests/stdc++11-includes/stdc++11-includes.pro diff --git a/src/plugins/clangstaticanalyzer/unit-tests/stdc++11-includes/stdc++11-includes.qbs b/src/plugins/clangtools/unit-tests/stdc++11-includes/stdc++11-includes.qbs similarity index 100% rename from src/plugins/clangstaticanalyzer/unit-tests/stdc++11-includes/stdc++11-includes.qbs rename to src/plugins/clangtools/unit-tests/stdc++11-includes/stdc++11-includes.qbs diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 66e05a85bdf..5d8b676a207 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -4,7 +4,7 @@ TEMPLATE = subdirs SUBDIRS = \ autotest \ - clangstaticanalyzer \ + clangtools \ coreplugin \ texteditor \ cppeditor \ diff --git a/tests/auto/clangstaticanalyzer/clangstaticanalyzerlogfilereader/tst_clangstaticanalyzerlogfilereader.cpp b/tests/auto/clangstaticanalyzer/clangstaticanalyzerlogfilereader/tst_clangstaticanalyzerlogfilereader.cpp index 076f576e82b..8bc4a045c21 100644 --- a/tests/auto/clangstaticanalyzer/clangstaticanalyzerlogfilereader/tst_clangstaticanalyzerlogfilereader.cpp +++ b/tests/auto/clangstaticanalyzer/clangstaticanalyzerlogfilereader/tst_clangstaticanalyzerlogfilereader.cpp @@ -23,7 +23,7 @@ ** ****************************************************************************/ -#include +#include #include @@ -32,7 +32,7 @@ enum { debug = 0 }; using namespace Debugger; -using namespace ClangStaticAnalyzer::Internal; +using namespace ClangTools::Internal; namespace { diff --git a/tests/auto/clangstaticanalyzer/clangstaticanalyzerrunner/tst_clangstaticanalyzerrunner.cpp b/tests/auto/clangstaticanalyzer/clangstaticanalyzerrunner/tst_clangstaticanalyzerrunner.cpp index 9c71b800ecb..97e618c01d4 100644 --- a/tests/auto/clangstaticanalyzer/clangstaticanalyzerrunner/tst_clangstaticanalyzerrunner.cpp +++ b/tests/auto/clangstaticanalyzer/clangstaticanalyzerrunner/tst_clangstaticanalyzerrunner.cpp @@ -23,15 +23,15 @@ ** ****************************************************************************/ -#include -#include +#include +#include #include #include #include -using namespace ClangStaticAnalyzer::Internal; +using namespace ClangTools::Internal; static QString clangExecutablePath() {