ProjectExplorer: Rename Tool{C,c}hainConfigWidget

That's the trend.

Change-Id: I24a328f1190200b4499c6a11d9d3df074ce5973d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

src/plugins/baremetal/iarewtoolchain.cpp

@@ -257,7 +257,7 @@ static QString buildDisplayName(Abi::Architecture arch, Utils::Id language,
 
 class IarToolChain;
 
-class IarToolChainConfigWidget final : public ToolChainConfigWidget
+class IarToolChainConfigWidget final : public ToolchainConfigWidget
 {
 public:
     explicit IarToolChainConfigWidget(IarToolChain *tc);
@@ -303,7 +303,7 @@ public:
     void addToEnvironment(Environment &env) const final;
     QList<OutputLineParser *> createOutputParsers() const final { return {new IarParser()}; }
 
-    std::unique_ptr<ToolChainConfigWidget> createConfigurationWidget() final;
+    std::unique_ptr<ToolchainConfigWidget> createConfigurationWidget() final;
 
     bool operator==(const ToolChain &other) const final;
 
@@ -389,7 +389,7 @@ void IarToolChain::addToEnvironment(Environment &env) const
         env.prependOrSetPath(compilerCommand().parentDir());
 }
 
-std::unique_ptr<ToolChainConfigWidget> IarToolChain::createConfigurationWidget()
+std::unique_ptr<ToolchainConfigWidget> IarToolChain::createConfigurationWidget()
 {
     return std::make_unique<IarToolChainConfigWidget>(this);
 }
@@ -566,7 +566,7 @@ Toolchains IarToolChainFactory::autoDetectToolchain(const Candidate &candidate,
 // IarToolChainConfigWidget
 
 IarToolChainConfigWidget::IarToolChainConfigWidget(IarToolChain *tc) :
-    ToolChainConfigWidget(tc),
+    ToolchainConfigWidget(tc),
     m_compilerCommand(new PathChooser),
     m_abiWidget(new AbiWidget)
 {
@@ -588,7 +588,7 @@ IarToolChainConfigWidget::IarToolChainConfigWidget(IarToolChain *tc) :
     connect(m_platformCodeGenFlagsLineEdit, &QLineEdit::editingFinished,
             this, &IarToolChainConfigWidget::handlePlatformCodeGenFlagsChange);
     connect(m_abiWidget, &AbiWidget::abiChanged,
-            this, &ToolChainConfigWidget::dirty);
+            this, &ToolchainConfigWidget::dirty);
 }
 
 void IarToolChainConfigWidget::applyImpl()

src/plugins/baremetal/keiltoolchain.cpp

@@ -395,7 +395,7 @@ static void addDefaultCpuArgs(const FilePath &compiler, QStringList &extraArgs)
 
 class KeilToolChain;
 
-class KeilToolChainConfigWidget final : public ToolChainConfigWidget
+class KeilToolChainConfigWidget final : public ToolchainConfigWidget
 {
 public:
     explicit KeilToolChainConfigWidget(KeilToolChain *tc);
@@ -443,7 +443,7 @@ public:
 
     QList<OutputLineParser *> createOutputParsers() const final { return {new KeilParser}; }
 
-    std::unique_ptr<ToolChainConfigWidget> createConfigurationWidget() final;
+    std::unique_ptr<ToolchainConfigWidget> createConfigurationWidget() final;
 
     bool operator==(const ToolChain &other) const final;
 
@@ -515,7 +515,7 @@ void KeilToolChain::addToEnvironment(Environment &env) const
         env.prependOrSetPath(compilerCommand().parentDir());
 }
 
-std::unique_ptr<ToolChainConfigWidget> KeilToolChain::createConfigurationWidget()
+std::unique_ptr<ToolchainConfigWidget> KeilToolChain::createConfigurationWidget()
 {
     return std::make_unique<KeilToolChainConfigWidget>(this);
 }
@@ -725,7 +725,7 @@ Toolchains KeilToolChainFactory::autoDetectToolchain(const Candidate &candidate,
 // KeilToolchainConfigWidget
 
 KeilToolChainConfigWidget::KeilToolChainConfigWidget(KeilToolChain *tc) :
-    ToolChainConfigWidget(tc),
+    ToolchainConfigWidget(tc),
     m_compilerCommand(new PathChooser),
     m_abiWidget(new AbiWidget)
 {
@@ -747,7 +747,7 @@ KeilToolChainConfigWidget::KeilToolChainConfigWidget(KeilToolChain *tc) :
     connect(m_platformCodeGenFlagsLineEdit, &QLineEdit::editingFinished,
             this, &KeilToolChainConfigWidget::handlePlatformCodeGenFlagsChange);
     connect(m_abiWidget, &AbiWidget::abiChanged,
-            this, &ToolChainConfigWidget::dirty);
+            this, &ToolchainConfigWidget::dirty);
 }
 
 void KeilToolChainConfigWidget::applyImpl()

src/plugins/baremetal/sdcctoolchain.cpp

@@ -178,7 +178,7 @@ static FilePath compilerPathFromEnvironment(const QString &compilerName)
 
 class SdccToolChain;
 
-class SdccToolChainConfigWidget final : public ToolChainConfigWidget
+class SdccToolChainConfigWidget final : public ToolchainConfigWidget
 {
 public:
     explicit SdccToolChainConfigWidget(SdccToolChain *tc);
@@ -218,7 +218,7 @@ public:
     void addToEnvironment(Environment &env) const final;
     QList<OutputLineParser *> createOutputParsers() const final  { return {new SdccParser}; }
 
-    std::unique_ptr<ToolChainConfigWidget> createConfigurationWidget() final;
+    std::unique_ptr<ToolchainConfigWidget> createConfigurationWidget() final;
 
     bool operator==(const ToolChain &other) const final;
 
@@ -283,7 +283,7 @@ void SdccToolChain::addToEnvironment(Environment &env) const
         env.prependOrSetPath(compilerCommand().parentDir());
 }
 
-std::unique_ptr<ToolChainConfigWidget> SdccToolChain::createConfigurationWidget()
+std::unique_ptr<ToolchainConfigWidget> SdccToolChain::createConfigurationWidget()
 {
     return std::make_unique<SdccToolChainConfigWidget>(this);
 }
@@ -448,7 +448,7 @@ Toolchains SdccToolChainFactory::autoDetectToolchain(const Candidate &candidate,
 // SdccToolChainConfigWidget
 
 SdccToolChainConfigWidget::SdccToolChainConfigWidget(SdccToolChain *tc) :
-    ToolChainConfigWidget(tc),
+    ToolchainConfigWidget(tc),
     m_compilerCommand(new PathChooser),
     m_abiWidget(new AbiWidget)
 {
@@ -465,7 +465,7 @@ SdccToolChainConfigWidget::SdccToolChainConfigWidget(SdccToolChain *tc) :
     connect(m_compilerCommand, &PathChooser::rawPathChanged,
             this, &SdccToolChainConfigWidget::handleCompilerCommandChange);
     connect(m_abiWidget, &AbiWidget::abiChanged,
-            this, &ToolChainConfigWidget::dirty);
+            this, &ToolchainConfigWidget::dirty);
 }
 
 void SdccToolChainConfigWidget::applyImpl()

src/plugins/cppeditor/projectinfo_test.cpp

@@ -344,7 +344,7 @@ private:
     void addToEnvironment(Utils::Environment &) const override {}
     Utils::FilePath makeCommand(const Utils::Environment &) const override { return {}; }
     QList<Utils::OutputLineParser *> createOutputParsers() const override { return {}; }
-    std::unique_ptr<ToolChainConfigWidget> createConfigurationWidget() override
+    std::unique_ptr<ToolchainConfigWidget> createConfigurationWidget() override
     {
         return {};
     };

src/plugins/nim/project/nimtoolchain.cpp

@@ -120,11 +120,11 @@ bool NimToolChain::parseVersion(const FilePath &path, std::tuple<int, int, int>
 
 // NimToolChainConfigWidget
 
-class NimToolChainConfigWidget : public ToolChainConfigWidget
+class NimToolChainConfigWidget : public ToolchainConfigWidget
 {
 public:
     explicit NimToolChainConfigWidget(NimToolChain *tc)
-        : ToolChainConfigWidget(tc)
+        : ToolchainConfigWidget(tc)
         , m_compilerCommand(new PathChooser)
         , m_compilerVersion(new QLineEdit)
     {
@@ -196,7 +196,7 @@ void NimToolChainConfigWidget::fillUI()
     m_compilerVersion->setText(tc->compilerVersion());
 }
 
-std::unique_ptr<ToolChainConfigWidget> NimToolChain::createConfigurationWidget()
+std::unique_ptr<ToolchainConfigWidget> NimToolChain::createConfigurationWidget()
 {
     return std::make_unique<NimToolChainConfigWidget>(this);
 }

src/plugins/nim/project/nimtoolchain.h

@@ -24,7 +24,7 @@ public:
     Utils::FilePath makeCommand(const Utils::Environment &env) const final;
     QString compilerVersion() const;
     QList<Utils::OutputLineParser *> createOutputParsers() const final;
-    std::unique_ptr<ProjectExplorer::ToolChainConfigWidget> createConfigurationWidget() final;
+    std::unique_ptr<ProjectExplorer::ToolchainConfigWidget> createConfigurationWidget() final;
 
     void fromMap(const Utils::Store &data) final;
 

src/plugins/projectexplorer/customtoolchain.cpp

@@ -80,7 +80,7 @@ public:
     void toMap(Store &data) const override;
     void fromMap(const Store &data) override;
 
-    std::unique_ptr<ToolChainConfigWidget> createConfigurationWidget() override;
+    std::unique_ptr<ToolchainConfigWidget> createConfigurationWidget() override;
 
     bool operator ==(const ToolChain &) const override;
 
@@ -381,7 +381,7 @@ public:
 // CustomToolChainConfigWidget
 // --------------------------------------------------------------------------
 
-class CustomToolChainConfigWidget final : public ToolChainConfigWidget
+class CustomToolChainConfigWidget final : public ToolchainConfigWidget
 {
 public:
     explicit CustomToolChainConfigWidget(CustomToolChain *);
@@ -410,7 +410,7 @@ private:
 };
 
 CustomToolChainConfigWidget::CustomToolChainConfigWidget(CustomToolChain *tc) :
-    ToolChainConfigWidget(tc),
+    ToolchainConfigWidget(tc),
     m_compilerCommand(new PathChooser),
     m_makeCommand(new PathChooser),
     m_abiWidget(new AbiWidget),
@@ -459,15 +459,15 @@ CustomToolChainConfigWidget::CustomToolChainConfigWidget(CustomToolChain *tc) :
     m_predefinedDetails->updateSummaryText();
     m_headerDetails->updateSummaryText();
 
-    connect(m_compilerCommand, &PathChooser::rawPathChanged, this, &ToolChainConfigWidget::dirty);
+    connect(m_compilerCommand, &PathChooser::rawPathChanged, this, &ToolchainConfigWidget::dirty);
-    connect(m_makeCommand, &PathChooser::rawPathChanged, this, &ToolChainConfigWidget::dirty);
+    connect(m_makeCommand, &PathChooser::rawPathChanged, this, &ToolchainConfigWidget::dirty);
-    connect(m_abiWidget, &AbiWidget::abiChanged, this, &ToolChainConfigWidget::dirty);
+    connect(m_abiWidget, &AbiWidget::abiChanged, this, &ToolchainConfigWidget::dirty);
     connect(m_predefinedMacros, &QPlainTextEdit::textChanged,
             this, [this] { updateSummaries(m_predefinedDetails); });
     connect(m_headerPaths, &QPlainTextEdit::textChanged,
             this, [this] { updateSummaries(m_headerDetails); });
-    connect(m_cxx11Flags, &QLineEdit::textChanged, this, &ToolChainConfigWidget::dirty);
+    connect(m_cxx11Flags, &QLineEdit::textChanged, this, &ToolchainConfigWidget::dirty);
-    connect(m_mkspecs, &QLineEdit::textChanged, this, &ToolChainConfigWidget::dirty);
+    connect(m_mkspecs, &QLineEdit::textChanged, this, &ToolchainConfigWidget::dirty);
     connect(m_errorParserComboBox, &QComboBox::currentIndexChanged,
             this, &CustomToolChainConfigWidget::errorParserChanged);
     errorParserChanged();
@@ -549,7 +549,7 @@ void CustomToolChainConfigWidget::makeReadOnlyImpl()
     m_mainLayout->setEnabled(false);
 }
 
-std::unique_ptr<ToolChainConfigWidget> CustomToolChain::createConfigurationWidget()
+std::unique_ptr<ToolchainConfigWidget> CustomToolChain::createConfigurationWidget()
 {
     return std::make_unique<CustomToolChainConfigWidget>(this);
 }

src/plugins/projectexplorer/gcctoolchain.cpp

@@ -104,7 +104,7 @@ const QStringList gccPredefinedMacrosOptions(Id languageId)
 }
 
 class TargetTripleWidget;
-class GccToolChainConfigWidget : public ToolChainConfigWidget
+class GccToolChainConfigWidget : public ToolchainConfigWidget
 {
 public:
     explicit GccToolChainConfigWidget(GccToolChain *tc);
@@ -1062,7 +1062,7 @@ bool GccToolChain::operator ==(const ToolChain &other) const
             && m_platformLinkerFlags == gccTc->m_platformLinkerFlags;
 }
 
-std::unique_ptr<ToolChainConfigWidget> GccToolChain::createConfigurationWidget()
+std::unique_ptr<ToolchainConfigWidget> GccToolChain::createConfigurationWidget()
 {
     return std::make_unique<GccToolChainConfigWidget>(this);
 }
@@ -1708,7 +1708,7 @@ private:
 }
 
 GccToolChainConfigWidget::GccToolChainConfigWidget(GccToolChain *tc) :
-    ToolChainConfigWidget(tc),
+    ToolchainConfigWidget(tc),
     m_abiWidget(new AbiWidget),
     m_subType(tc->m_subType),
     m_compilerCommand(new PathChooser),
@@ -1740,9 +1740,9 @@ GccToolChainConfigWidget::GccToolChainConfigWidget(GccToolChain *tc) :
             this, &GccToolChainConfigWidget::handlePlatformCodeGenFlagsChange);
     connect(m_platformLinkerFlagsLineEdit, &QLineEdit::editingFinished,
             this, &GccToolChainConfigWidget::handlePlatformLinkerFlagsChange);
-    connect(m_abiWidget, &AbiWidget::abiChanged, this, &ToolChainConfigWidget::dirty);
+    connect(m_abiWidget, &AbiWidget::abiChanged, this, &ToolchainConfigWidget::dirty);
     connect(m_targetTripleWidget, &TargetTripleWidget::valueChanged,
-            this, &ToolChainConfigWidget::dirty);
+            this, &ToolchainConfigWidget::dirty);
 
     if (m_subType == GccToolChain::Clang) {
         if (!HostOsInfo::isWindowsHost() || tc->typeId() != Constants::CLANG_TOOLCHAIN_TYPEID)

src/plugins/projectexplorer/gcctoolchain.h

@@ -55,7 +55,7 @@ public:
     void toMap(Utils::Store &data) const override;
     void fromMap(const Utils::Store &data) override;
 
-    std::unique_ptr<ToolChainConfigWidget> createConfigurationWidget() override;
+    std::unique_ptr<ToolchainConfigWidget> createConfigurationWidget() override;
 
     bool operator ==(const ToolChain &) const override;
 

src/plugins/projectexplorer/msvctoolchain.cpp

@@ -1263,11 +1263,11 @@ static QString msvcVarsToDisplay(const MsvcToolChain &tc)
     return varsBatDisplay;
 }
 
-class MsvcBasedToolChainConfigWidget : public ToolChainConfigWidget
+class MsvcBasedToolChainConfigWidget : public ToolchainConfigWidget
 {
 public:
     explicit MsvcBasedToolChainConfigWidget(ToolChain *tc)
-        : ToolChainConfigWidget(tc)
+        : ToolchainConfigWidget(tc)
         , m_nameDisplayLabel(new QLabel(this))
         , m_varsBatDisplayLabel(new QLabel(this))
     {
@@ -1356,8 +1356,8 @@ public:
         connect(m_varsBatArchCombo, &QComboBox::currentTextChanged,
                 this, &MsvcToolChainConfigWidget::handleVcVarsArchChange);
         connect(m_varsBatArgumentsEdit, &QLineEdit::textChanged,
-                this, &ToolChainConfigWidget::dirty);
+                this, &ToolchainConfigWidget::dirty);
-        connect(m_abiWidget, &AbiWidget::abiChanged, this, &ToolChainConfigWidget::dirty);
+        connect(m_abiWidget, &AbiWidget::abiChanged, this, &ToolchainConfigWidget::dirty);
     }
 
 private:
@@ -1503,7 +1503,7 @@ QString MsvcToolChainConfigWidget::vcVarsArguments() const
     return varsBatArg;
 }
 
-std::unique_ptr<ToolChainConfigWidget> MsvcToolChain::createConfigurationWidget()
+std::unique_ptr<ToolchainConfigWidget> MsvcToolChain::createConfigurationWidget()
 {
     return std::make_unique<MsvcToolChainConfigWidget>(this);
 }
@@ -1800,7 +1800,7 @@ void ClangClToolChain::fromMap(const Store &data)
     m_clangPath = FilePath::fromString(clangPath);
 }
 
-std::unique_ptr<ToolChainConfigWidget> ClangClToolChain::createConfigurationWidget()
+std::unique_ptr<ToolchainConfigWidget> ClangClToolChain::createConfigurationWidget()
 {
     return std::make_unique<ClangClToolChainConfigWidget>(this);
 }

src/plugins/projectexplorer/msvctoolchain.h

@@ -40,7 +40,7 @@ public:
     void toMap(Utils::Store &data) const override;
     void fromMap(const Utils::Store &data) override;
 
-    std::unique_ptr<ToolChainConfigWidget> createConfigurationWidget() override;
+    std::unique_ptr<ToolchainConfigWidget> createConfigurationWidget() override;
     bool hostPrefersToolchain() const override;
 
     MacroInspectionRunner createMacroInspectionRunner() const override;
@@ -139,7 +139,7 @@ public:
     QList<Utils::OutputLineParser *> createOutputParsers() const override;
     void toMap(Utils::Store &data) const override;
     void fromMap(const Utils::Store &data) override;
-    std::unique_ptr<ToolChainConfigWidget> createConfigurationWidget() override;
+    std::unique_ptr<ToolchainConfigWidget> createConfigurationWidget() override;
     BuiltInHeaderPathsRunner createBuiltInHeaderPathsRunner(
             const Utils::Environment &env) const override;
 

src/plugins/projectexplorer/toolchain.h

@@ -41,7 +41,7 @@ QString languageId(Language l);
 } // namespace Deprecated
 
 class GccToolChain;
-class ToolChainConfigWidget;
+class ToolchainConfigWidget;
 class ToolChainFactory;
 class Kit;
 
@@ -138,7 +138,7 @@ public:
 
     virtual bool operator ==(const ToolChain &) const;
 
-    virtual std::unique_ptr<ToolChainConfigWidget> createConfigurationWidget() = 0;
+    virtual std::unique_ptr<ToolchainConfigWidget> createConfigurationWidget() = 0;
     ToolChain *clone() const;
 
     // Used by the toolchainmanager to save user-generated tool chains.

src/plugins/projectexplorer/toolchainconfigwidget.cpp

@@ -20,7 +20,7 @@ using namespace Utils;
 
 namespace ProjectExplorer {
 
-ToolChainConfigWidget::ToolChainConfigWidget(ToolChain *tc) :
+ToolchainConfigWidget::ToolchainConfigWidget(ToolChain *tc) :
     m_toolChain(tc)
 {
     Q_ASSERT(tc);
@@ -46,38 +46,38 @@ ToolChainConfigWidget::ToolChainConfigWidget(ToolChain *tc) :
 
     m_mainLayout->addRow(Tr::tr("Name:"), m_nameLineEdit);
 
-    connect(m_nameLineEdit, &QLineEdit::textChanged, this, &ToolChainConfigWidget::dirty);
+    connect(m_nameLineEdit, &QLineEdit::textChanged, this, &ToolchainConfigWidget::dirty);
 }
 
-void ToolChainConfigWidget::apply()
+void ToolchainConfigWidget::apply()
 {
     m_toolChain->setDisplayName(m_nameLineEdit->text());
     applyImpl();
 }
 
-void ToolChainConfigWidget::discard()
+void ToolchainConfigWidget::discard()
 {
     m_nameLineEdit->setText(m_toolChain->displayName());
     discardImpl();
 }
 
-bool ToolChainConfigWidget::isDirty() const
+bool ToolchainConfigWidget::isDirty() const
 {
     return m_nameLineEdit->text() != m_toolChain->displayName() || isDirtyImpl();
 }
 
-ToolChain *ToolChainConfigWidget::toolChain() const
+ToolChain *ToolchainConfigWidget::toolChain() const
 {
     return m_toolChain;
 }
 
-void ToolChainConfigWidget::makeReadOnly()
+void ToolchainConfigWidget::makeReadOnly()
 {
     m_nameLineEdit->setEnabled(false);
     makeReadOnlyImpl();
 }
 
-void ToolChainConfigWidget::addErrorLabel()
+void ToolchainConfigWidget::addErrorLabel()
 {
     if (!m_errorLabel) {
         m_errorLabel = new QLabel;
@@ -86,7 +86,7 @@ void ToolChainConfigWidget::addErrorLabel()
     m_mainLayout->addRow(m_errorLabel);
 }
 
-void ToolChainConfigWidget::setErrorMessage(const QString &m)
+void ToolchainConfigWidget::setErrorMessage(const QString &m)
 {
     QTC_ASSERT(m_errorLabel, return);
     if (m.isEmpty()) {
@@ -98,7 +98,7 @@ void ToolChainConfigWidget::setErrorMessage(const QString &m)
     }
 }
 
-void ToolChainConfigWidget::clearErrorMessage()
+void ToolchainConfigWidget::clearErrorMessage()
 {
     QTC_ASSERT(m_errorLabel, return);
     m_errorLabel->clear();
@@ -106,7 +106,7 @@ void ToolChainConfigWidget::clearErrorMessage()
     m_errorLabel->setVisible(false);
 }
 
-QStringList ToolChainConfigWidget::splitString(const QString &s)
+QStringList ToolchainConfigWidget::splitString(const QString &s)
 {
     ProcessArgs::SplitError splitError;
     const OsType osType = HostOsInfo::hostOs();

src/plugins/projectexplorer/toolchainconfigwidget.h

@@ -21,12 +21,12 @@ class ToolChain;
 // ToolChainConfigWidget
 // --------------------------------------------------------------------------
 
-class PROJECTEXPLORER_EXPORT ToolChainConfigWidget : public QScrollArea
+class PROJECTEXPLORER_EXPORT ToolchainConfigWidget : public QScrollArea
 {
     Q_OBJECT
 
 public:
-    explicit ToolChainConfigWidget(ToolChain *tc);
+    explicit ToolchainConfigWidget(ToolChain *tc);
 
     ToolChain *toolChain() const;
 

src/plugins/projectexplorer/toolchainoptionspage.cpp

@@ -82,7 +82,7 @@ public:
         return {};
     }
 
-    ToolChainConfigWidget *widget()
+    ToolchainConfigWidget *widget()
     {
         if (!m_widget) {
            m_widget = toolChain->createConfigurationWidget().release();
@@ -90,7 +90,7 @@ public:
                 m_parentWidget->addWidget(m_widget);
                 if (toolChain->isAutoDetected())
                     m_widget->makeReadOnly();
-                QObject::connect(m_widget, &ToolChainConfigWidget::dirty,
+                QObject::connect(m_widget, &ToolchainConfigWidget::dirty,
                                  [this] {
                     changed = true;
                     update();
@@ -104,7 +104,7 @@ public:
     bool changed;
 
 private:
-    ToolChainConfigWidget *m_widget = nullptr;
+    ToolchainConfigWidget *m_widget = nullptr;
     QStackedWidget *m_parentWidget = nullptr;
 };
 

src/plugins/projectexplorer/toolchainsettingsaccessor.cpp

@@ -319,7 +319,7 @@ public:
     void addToEnvironment(Environment &env) const override { Q_UNUSED(env) }
     FilePath makeCommand(const Environment &) const override { return "make"; }
     QList<OutputLineParser *> createOutputParsers() const override { return {}; }
-    std::unique_ptr<ToolChainConfigWidget> createConfigurationWidget() override { return nullptr; }
+    std::unique_ptr<ToolchainConfigWidget> createConfigurationWidget() override { return nullptr; }
     bool operator ==(const ToolChain &other) const override {
         if (!ToolChain::operator==(other))
             return false;

src/plugins/qnx/qnxtoolchain.cpp

@@ -24,7 +24,7 @@ namespace Qnx::Internal {
 
 // QnxToolChainConfigWidget
 
-class QnxToolChainConfigWidget : public ToolChainConfigWidget
+class QnxToolChainConfigWidget : public ToolchainConfigWidget
 {
 public:
     QnxToolChainConfigWidget(QnxToolChain *tc);
@@ -116,7 +116,7 @@ QnxToolChain::QnxToolChain()
     });
 }
 
-std::unique_ptr<ToolChainConfigWidget> QnxToolChain::createConfigurationWidget()
+std::unique_ptr<ToolchainConfigWidget> QnxToolChain::createConfigurationWidget()
 {
     return std::make_unique<QnxToolChainConfigWidget>(this);
 }
@@ -167,7 +167,7 @@ bool QnxToolChain::operator ==(const ToolChain &other) const
 //---------------------------------------------------------------------------------
 
 QnxToolChainConfigWidget::QnxToolChainConfigWidget(QnxToolChain *tc)
-    : ToolChainConfigWidget(tc)
+    : ToolchainConfigWidget(tc)
     , m_compilerCommand(new PathChooser)
     , m_sdpPath(new PathChooser)
     , m_abiWidget(new AbiWidget)
@@ -191,10 +191,10 @@ QnxToolChainConfigWidget::QnxToolChainConfigWidget(QnxToolChain *tc)
     m_mainLayout->addRow(Tr::tr("SDP path:"), m_sdpPath);
     m_mainLayout->addRow(Tr::tr("&ABI:"), m_abiWidget);
 
-    connect(m_compilerCommand, &PathChooser::rawPathChanged, this, &ToolChainConfigWidget::dirty);
+    connect(m_compilerCommand, &PathChooser::rawPathChanged, this, &ToolchainConfigWidget::dirty);
     connect(m_sdpPath, &PathChooser::rawPathChanged,
             this, &QnxToolChainConfigWidget::handleSdpPathChange);
-    connect(m_abiWidget, &AbiWidget::abiChanged, this, &ToolChainConfigWidget::dirty);
+    connect(m_abiWidget, &AbiWidget::abiChanged, this, &ToolchainConfigWidget::dirty);
 }
 
 void QnxToolChainConfigWidget::applyImpl()

src/plugins/qnx/qnxtoolchain.h

@@ -12,7 +12,7 @@ class QnxToolChain : public ProjectExplorer::GccToolChain
 public:
     QnxToolChain();
 
-    std::unique_ptr<ProjectExplorer::ToolChainConfigWidget> createConfigurationWidget() override;
+    std::unique_ptr<ProjectExplorer::ToolchainConfigWidget> createConfigurationWidget() override;
 
     void addToEnvironment(Utils::Environment &env) const override;
     QStringList suggestedMkspecList() const override;