From 5de0e81d8bd2da30ce20f802c1e4922662f17473 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Thu, 19 Mar 2020 12:41:23 +0100 Subject: [PATCH] CMake: Fix typo in symbol names I can't spell occurred:-/ Similar typos in 3rd party code (sqlite) has been left in place. Change-Id: I7cfa9911fc434d42ce3df8e9c7ccb83dc00401e8 Reviewed-by: hjk --- .../cmakeprojectmanager/builddirmanager.cpp | 17 +++++++++-------- .../cmakeprojectmanager/builddirmanager.h | 4 ++-- .../cmakeprojectmanager/builddirreader.h | 2 +- .../cmakebuildconfiguration.cpp | 4 ++-- .../cmakebuildconfiguration.h | 4 ++-- .../cmakebuildsettingswidget.cpp | 6 +++--- .../cmakeprojectmanager/cmakebuildsystem.cpp | 2 +- .../cmakeprojectmanager/fileapireader.cpp | 2 +- src/plugins/cmakeprojectmanager/servermode.cpp | 2 +- src/plugins/cmakeprojectmanager/servermode.h | 2 +- .../cmakeprojectmanager/servermodereader.cpp | 6 +++--- 11 files changed, 26 insertions(+), 25 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/builddirmanager.cpp b/src/plugins/cmakeprojectmanager/builddirmanager.cpp index 854483c315a..404ce58c55a 100644 --- a/src/plugins/cmakeprojectmanager/builddirmanager.cpp +++ b/src/plugins/cmakeprojectmanager/builddirmanager.cpp @@ -84,7 +84,8 @@ FilePath BuildDirManager::workDirectory(const BuildDirParameters ¶meters) co if (cmake && cmake->autoCreateBuildDirectory()) { if (!QDir().mkpath(bdir.toString())) - emitErrorOccured(tr("Failed to create build directory \"%1\".").arg(bdir.toUserOutput())); + emitErrorOccurred( + tr("Failed to create build directory \"%1\".").arg(bdir.toUserOutput())); return bdir; } @@ -95,8 +96,8 @@ FilePath BuildDirManager::workDirectory(const BuildDirParameters ¶meters) co tmpDirIt = ret.first; if (!tmpDirIt->second->isValid()) { - emitErrorOccured(tr("Failed to create temporary directory \"%1\".") - .arg(QDir::toNativeSeparators(tmpDirIt->second->path()))); + emitErrorOccurred(tr("Failed to create temporary directory \"%1\".") + .arg(QDir::toNativeSeparators(tmpDirIt->second->path()))); return bdir; } } @@ -121,10 +122,10 @@ void BuildDirManager::emitDataAvailable() emit dataAvailable(); } -void BuildDirManager::emitErrorOccured(const QString &message) const +void BuildDirManager::emitErrorOccurred(const QString &message) const { m_isHandlingError = true; - emit errorOccured(message); + emit errorOccurred(message); m_isHandlingError = false; } @@ -160,9 +161,9 @@ void BuildDirManager::updateReaderType(const BuildDirParameters &p, this, &BuildDirManager::emitDataAvailable); connect(m_reader.get(), - &BuildDirReader::errorOccured, + &BuildDirReader::errorOccurred, this, - &BuildDirManager::emitErrorOccured); + &BuildDirManager::emitErrorOccurred); connect(m_reader.get(), &BuildDirReader::dirty, this, &BuildDirManager::becameDirty); connect(m_reader.get(), &BuildDirReader::isReadyNow, this, todo); } @@ -268,7 +269,7 @@ void BuildDirManager::stopParsingAndClearState() qCDebug(cmakeBuildDirManagerLog) << "stopping parsing run!"; if (m_reader) { if (m_reader->isParsing()) - m_reader->errorOccured(tr("Parsing has been canceled.")); + m_reader->errorOccurred(tr("Parsing has been canceled.")); disconnect(m_reader.get(), nullptr, this, nullptr); m_reader->stop(); } diff --git a/src/plugins/cmakeprojectmanager/builddirmanager.h b/src/plugins/cmakeprojectmanager/builddirmanager.h index 3138b24a813..c7652911d56 100644 --- a/src/plugins/cmakeprojectmanager/builddirmanager.h +++ b/src/plugins/cmakeprojectmanager/builddirmanager.h @@ -105,14 +105,14 @@ signals: void requestDelayedReparse() const; void parsingStarted() const; void dataAvailable() const; - void errorOccured(const QString &err) const; + void errorOccurred(const QString &err) const; private: void updateReparseParameters(const int parameters); int takeReparseParameters(); void emitDataAvailable(); - void emitErrorOccured(const QString &message) const; + void emitErrorOccurred(const QString &message) const; void emitReparseRequest() const; bool checkConfiguration(); diff --git a/src/plugins/cmakeprojectmanager/builddirreader.h b/src/plugins/cmakeprojectmanager/builddirreader.h index 71b5edb974f..73f716afeca 100644 --- a/src/plugins/cmakeprojectmanager/builddirreader.h +++ b/src/plugins/cmakeprojectmanager/builddirreader.h @@ -76,7 +76,7 @@ signals: void configurationStarted() const; void dataAvailable() const; void dirty() const; - void errorOccured(const QString &message) const; + void errorOccurred(const QString &message) const; protected: BuildDirParameters m_parameters; diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index 9d6da30f235..5b83dee63a2 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp @@ -355,7 +355,7 @@ void CMakeBuildConfiguration::setError(const QString &message) qCDebug(cmakeBuildConfigurationLog) << "Emitting enabledChanged signal"; emit enabledChanged(); } - emit errorOccured(m_error); + emit errorOccurred(m_error); } void CMakeBuildConfiguration::setWarning(const QString &message) @@ -363,7 +363,7 @@ void CMakeBuildConfiguration::setWarning(const QString &message) if (m_warning == message) return; m_warning = message; - emit warningOccured(m_warning); + emit warningOccurred(m_warning); } QString CMakeBuildConfiguration::error() const diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h index a45b871f852..a1e70b0229a 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h @@ -66,8 +66,8 @@ public: ProjectExplorer::BuildSystem *buildSystem() const final; signals: - void errorOccured(const QString &message); - void warningOccured(const QString &message); + void errorOccurred(const QString &message); + void warningOccurred(const QString &message); void configurationForCMakeChanged(); diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp index 3464fd7291c..02812820f6a 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp @@ -268,7 +268,7 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildConfiguration *bc) m_showProgressTimer.stop(); m_progressIndicator->hide(); }); - connect(m_buildConfiguration, &CMakeBuildConfiguration::errorOccured, + connect(m_buildConfiguration, &CMakeBuildConfiguration::errorOccurred, this, [this]() { m_showProgressTimer.stop(); m_progressIndicator->hide(); @@ -323,8 +323,8 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildConfiguration *bc) m_configView->edit(idx); }); - connect(bc, &CMakeBuildConfiguration::errorOccured, this, &CMakeBuildSettingsWidget::setError); - connect(bc, &CMakeBuildConfiguration::warningOccured, this, &CMakeBuildSettingsWidget::setWarning); + connect(bc, &CMakeBuildConfiguration::errorOccurred, this, &CMakeBuildSettingsWidget::setError); + connect(bc, &CMakeBuildConfiguration::warningOccurred, this, &CMakeBuildSettingsWidget::setWarning); updateFromKit(); connect(m_buildConfiguration->target(), &ProjectExplorer::Target::kitChanged, diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp index c346e368ef0..e6be6c76f58 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp @@ -118,7 +118,7 @@ CMakeBuildSystem::CMakeBuildSystem(CMakeBuildConfiguration *bc) connect(&m_buildDirManager, &BuildDirManager::dataAvailable, this, &CMakeBuildSystem::handleParsingSucceeded); - connect(&m_buildDirManager, &BuildDirManager::errorOccured, + connect(&m_buildDirManager, &BuildDirManager::errorOccurred, this, &CMakeBuildSystem::handleParsingFailed); connect(&m_buildDirManager, &BuildDirManager::parsingStarted, this, [this]() { diff --git a/src/plugins/cmakeprojectmanager/fileapireader.cpp b/src/plugins/cmakeprojectmanager/fileapireader.cpp index 089354dc805..665d690859f 100644 --- a/src/plugins/cmakeprojectmanager/fileapireader.cpp +++ b/src/plugins/cmakeprojectmanager/fileapireader.cpp @@ -258,7 +258,7 @@ void FileApiReader::endState(const QFileInfo &replyFi) if (value->errorMessage.isEmpty()) { emit this->dataAvailable(); } else { - emit this->errorOccured(value->errorMessage); + emit this->errorOccurred(value->errorMessage); } }); } diff --git a/src/plugins/cmakeprojectmanager/servermode.cpp b/src/plugins/cmakeprojectmanager/servermode.cpp index ce57e9d9790..bfd52f793b9 100644 --- a/src/plugins/cmakeprojectmanager/servermode.cpp +++ b/src/plugins/cmakeprojectmanager/servermode.cpp @@ -488,7 +488,7 @@ void ServerMode::reportError(const QString &msg) { qCWarning(cmakeServerMode) << "Report Error:" << msg; emit message(msg); - emit errorOccured(msg); + emit errorOccurred(msg); } } // namespace Internal diff --git a/src/plugins/cmakeprojectmanager/servermode.h b/src/plugins/cmakeprojectmanager/servermode.h index dc22825153c..a7eff58eb6e 100644 --- a/src/plugins/cmakeprojectmanager/servermode.h +++ b/src/plugins/cmakeprojectmanager/servermode.h @@ -64,7 +64,7 @@ signals: void connected(); void disconnected(); void message(const QString &msg); - void errorOccured(const QString &msg); + void errorOccurred(const QString &msg); // Forward stuff from the server void cmakeReply(const QVariantMap &data, const QString &inResponseTo, const QVariant &cookie); diff --git a/src/plugins/cmakeprojectmanager/servermodereader.cpp b/src/plugins/cmakeprojectmanager/servermodereader.cpp index f86081bd382..7445d75dde5 100644 --- a/src/plugins/cmakeprojectmanager/servermodereader.cpp +++ b/src/plugins/cmakeprojectmanager/servermodereader.cpp @@ -350,8 +350,8 @@ void ServerModeReader::createNewServer() m_parameters.platform, m_parameters.toolset, true, 1); - connect(m_cmakeServer.get(), &ServerMode::errorOccured, - this, &ServerModeReader::errorOccured); + connect(m_cmakeServer.get(), &ServerMode::errorOccurred, + this, &ServerModeReader::errorOccurred); connect(m_cmakeServer.get(), &ServerMode::cmakeReply, this, &ServerModeReader::handleReply); connect(m_cmakeServer.get(), &ServerMode::cmakeError, @@ -485,7 +485,7 @@ void ServerModeReader::reportError() { stop(); Core::MessageManager::write(tr("CMake Project parsing failed.")); - emit errorOccured(m_delayedErrorMessage); + emit errorOccurred(m_delayedErrorMessage); if (m_future) m_future->reportCanceled();