forked from qt-creator/qt-creator
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 <hjk@qt.io>
This commit is contained in:
@@ -84,7 +84,8 @@ FilePath BuildDirManager::workDirectory(const BuildDirParameters ¶meters) co
|
|||||||
|
|
||||||
if (cmake && cmake->autoCreateBuildDirectory()) {
|
if (cmake && cmake->autoCreateBuildDirectory()) {
|
||||||
if (!QDir().mkpath(bdir.toString()))
|
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;
|
return bdir;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -95,8 +96,8 @@ FilePath BuildDirManager::workDirectory(const BuildDirParameters ¶meters) co
|
|||||||
tmpDirIt = ret.first;
|
tmpDirIt = ret.first;
|
||||||
|
|
||||||
if (!tmpDirIt->second->isValid()) {
|
if (!tmpDirIt->second->isValid()) {
|
||||||
emitErrorOccured(tr("Failed to create temporary directory \"%1\".")
|
emitErrorOccurred(tr("Failed to create temporary directory \"%1\".")
|
||||||
.arg(QDir::toNativeSeparators(tmpDirIt->second->path())));
|
.arg(QDir::toNativeSeparators(tmpDirIt->second->path())));
|
||||||
return bdir;
|
return bdir;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -121,10 +122,10 @@ void BuildDirManager::emitDataAvailable()
|
|||||||
emit dataAvailable();
|
emit dataAvailable();
|
||||||
}
|
}
|
||||||
|
|
||||||
void BuildDirManager::emitErrorOccured(const QString &message) const
|
void BuildDirManager::emitErrorOccurred(const QString &message) const
|
||||||
{
|
{
|
||||||
m_isHandlingError = true;
|
m_isHandlingError = true;
|
||||||
emit errorOccured(message);
|
emit errorOccurred(message);
|
||||||
m_isHandlingError = false;
|
m_isHandlingError = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -160,9 +161,9 @@ void BuildDirManager::updateReaderType(const BuildDirParameters &p,
|
|||||||
this,
|
this,
|
||||||
&BuildDirManager::emitDataAvailable);
|
&BuildDirManager::emitDataAvailable);
|
||||||
connect(m_reader.get(),
|
connect(m_reader.get(),
|
||||||
&BuildDirReader::errorOccured,
|
&BuildDirReader::errorOccurred,
|
||||||
this,
|
this,
|
||||||
&BuildDirManager::emitErrorOccured);
|
&BuildDirManager::emitErrorOccurred);
|
||||||
connect(m_reader.get(), &BuildDirReader::dirty, this, &BuildDirManager::becameDirty);
|
connect(m_reader.get(), &BuildDirReader::dirty, this, &BuildDirManager::becameDirty);
|
||||||
connect(m_reader.get(), &BuildDirReader::isReadyNow, this, todo);
|
connect(m_reader.get(), &BuildDirReader::isReadyNow, this, todo);
|
||||||
}
|
}
|
||||||
@@ -268,7 +269,7 @@ void BuildDirManager::stopParsingAndClearState()
|
|||||||
qCDebug(cmakeBuildDirManagerLog) << "stopping parsing run!";
|
qCDebug(cmakeBuildDirManagerLog) << "stopping parsing run!";
|
||||||
if (m_reader) {
|
if (m_reader) {
|
||||||
if (m_reader->isParsing())
|
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);
|
disconnect(m_reader.get(), nullptr, this, nullptr);
|
||||||
m_reader->stop();
|
m_reader->stop();
|
||||||
}
|
}
|
||||||
|
@@ -105,14 +105,14 @@ signals:
|
|||||||
void requestDelayedReparse() const;
|
void requestDelayedReparse() const;
|
||||||
void parsingStarted() const;
|
void parsingStarted() const;
|
||||||
void dataAvailable() const;
|
void dataAvailable() const;
|
||||||
void errorOccured(const QString &err) const;
|
void errorOccurred(const QString &err) const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void updateReparseParameters(const int parameters);
|
void updateReparseParameters(const int parameters);
|
||||||
int takeReparseParameters();
|
int takeReparseParameters();
|
||||||
|
|
||||||
void emitDataAvailable();
|
void emitDataAvailable();
|
||||||
void emitErrorOccured(const QString &message) const;
|
void emitErrorOccurred(const QString &message) const;
|
||||||
void emitReparseRequest() const;
|
void emitReparseRequest() const;
|
||||||
bool checkConfiguration();
|
bool checkConfiguration();
|
||||||
|
|
||||||
|
@@ -76,7 +76,7 @@ signals:
|
|||||||
void configurationStarted() const;
|
void configurationStarted() const;
|
||||||
void dataAvailable() const;
|
void dataAvailable() const;
|
||||||
void dirty() const;
|
void dirty() const;
|
||||||
void errorOccured(const QString &message) const;
|
void errorOccurred(const QString &message) const;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
BuildDirParameters m_parameters;
|
BuildDirParameters m_parameters;
|
||||||
|
@@ -355,7 +355,7 @@ void CMakeBuildConfiguration::setError(const QString &message)
|
|||||||
qCDebug(cmakeBuildConfigurationLog) << "Emitting enabledChanged signal";
|
qCDebug(cmakeBuildConfigurationLog) << "Emitting enabledChanged signal";
|
||||||
emit enabledChanged();
|
emit enabledChanged();
|
||||||
}
|
}
|
||||||
emit errorOccured(m_error);
|
emit errorOccurred(m_error);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CMakeBuildConfiguration::setWarning(const QString &message)
|
void CMakeBuildConfiguration::setWarning(const QString &message)
|
||||||
@@ -363,7 +363,7 @@ void CMakeBuildConfiguration::setWarning(const QString &message)
|
|||||||
if (m_warning == message)
|
if (m_warning == message)
|
||||||
return;
|
return;
|
||||||
m_warning = message;
|
m_warning = message;
|
||||||
emit warningOccured(m_warning);
|
emit warningOccurred(m_warning);
|
||||||
}
|
}
|
||||||
|
|
||||||
QString CMakeBuildConfiguration::error() const
|
QString CMakeBuildConfiguration::error() const
|
||||||
|
@@ -66,8 +66,8 @@ public:
|
|||||||
ProjectExplorer::BuildSystem *buildSystem() const final;
|
ProjectExplorer::BuildSystem *buildSystem() const final;
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void errorOccured(const QString &message);
|
void errorOccurred(const QString &message);
|
||||||
void warningOccured(const QString &message);
|
void warningOccurred(const QString &message);
|
||||||
|
|
||||||
void configurationForCMakeChanged();
|
void configurationForCMakeChanged();
|
||||||
|
|
||||||
|
@@ -268,7 +268,7 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildConfiguration *bc)
|
|||||||
m_showProgressTimer.stop();
|
m_showProgressTimer.stop();
|
||||||
m_progressIndicator->hide();
|
m_progressIndicator->hide();
|
||||||
});
|
});
|
||||||
connect(m_buildConfiguration, &CMakeBuildConfiguration::errorOccured,
|
connect(m_buildConfiguration, &CMakeBuildConfiguration::errorOccurred,
|
||||||
this, [this]() {
|
this, [this]() {
|
||||||
m_showProgressTimer.stop();
|
m_showProgressTimer.stop();
|
||||||
m_progressIndicator->hide();
|
m_progressIndicator->hide();
|
||||||
@@ -323,8 +323,8 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildConfiguration *bc)
|
|||||||
m_configView->edit(idx);
|
m_configView->edit(idx);
|
||||||
});
|
});
|
||||||
|
|
||||||
connect(bc, &CMakeBuildConfiguration::errorOccured, this, &CMakeBuildSettingsWidget::setError);
|
connect(bc, &CMakeBuildConfiguration::errorOccurred, this, &CMakeBuildSettingsWidget::setError);
|
||||||
connect(bc, &CMakeBuildConfiguration::warningOccured, this, &CMakeBuildSettingsWidget::setWarning);
|
connect(bc, &CMakeBuildConfiguration::warningOccurred, this, &CMakeBuildSettingsWidget::setWarning);
|
||||||
|
|
||||||
updateFromKit();
|
updateFromKit();
|
||||||
connect(m_buildConfiguration->target(), &ProjectExplorer::Target::kitChanged,
|
connect(m_buildConfiguration->target(), &ProjectExplorer::Target::kitChanged,
|
||||||
|
@@ -118,7 +118,7 @@ CMakeBuildSystem::CMakeBuildSystem(CMakeBuildConfiguration *bc)
|
|||||||
connect(&m_buildDirManager, &BuildDirManager::dataAvailable,
|
connect(&m_buildDirManager, &BuildDirManager::dataAvailable,
|
||||||
this, &CMakeBuildSystem::handleParsingSucceeded);
|
this, &CMakeBuildSystem::handleParsingSucceeded);
|
||||||
|
|
||||||
connect(&m_buildDirManager, &BuildDirManager::errorOccured,
|
connect(&m_buildDirManager, &BuildDirManager::errorOccurred,
|
||||||
this, &CMakeBuildSystem::handleParsingFailed);
|
this, &CMakeBuildSystem::handleParsingFailed);
|
||||||
|
|
||||||
connect(&m_buildDirManager, &BuildDirManager::parsingStarted, this, [this]() {
|
connect(&m_buildDirManager, &BuildDirManager::parsingStarted, this, [this]() {
|
||||||
|
@@ -258,7 +258,7 @@ void FileApiReader::endState(const QFileInfo &replyFi)
|
|||||||
if (value->errorMessage.isEmpty()) {
|
if (value->errorMessage.isEmpty()) {
|
||||||
emit this->dataAvailable();
|
emit this->dataAvailable();
|
||||||
} else {
|
} else {
|
||||||
emit this->errorOccured(value->errorMessage);
|
emit this->errorOccurred(value->errorMessage);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@@ -488,7 +488,7 @@ void ServerMode::reportError(const QString &msg)
|
|||||||
{
|
{
|
||||||
qCWarning(cmakeServerMode) << "Report Error:" << msg;
|
qCWarning(cmakeServerMode) << "Report Error:" << msg;
|
||||||
emit message(msg);
|
emit message(msg);
|
||||||
emit errorOccured(msg);
|
emit errorOccurred(msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace Internal
|
} // namespace Internal
|
||||||
|
@@ -64,7 +64,7 @@ signals:
|
|||||||
void connected();
|
void connected();
|
||||||
void disconnected();
|
void disconnected();
|
||||||
void message(const QString &msg);
|
void message(const QString &msg);
|
||||||
void errorOccured(const QString &msg);
|
void errorOccurred(const QString &msg);
|
||||||
|
|
||||||
// Forward stuff from the server
|
// Forward stuff from the server
|
||||||
void cmakeReply(const QVariantMap &data, const QString &inResponseTo, const QVariant &cookie);
|
void cmakeReply(const QVariantMap &data, const QString &inResponseTo, const QVariant &cookie);
|
||||||
|
@@ -350,8 +350,8 @@ void ServerModeReader::createNewServer()
|
|||||||
m_parameters.platform, m_parameters.toolset,
|
m_parameters.platform, m_parameters.toolset,
|
||||||
true, 1);
|
true, 1);
|
||||||
|
|
||||||
connect(m_cmakeServer.get(), &ServerMode::errorOccured,
|
connect(m_cmakeServer.get(), &ServerMode::errorOccurred,
|
||||||
this, &ServerModeReader::errorOccured);
|
this, &ServerModeReader::errorOccurred);
|
||||||
connect(m_cmakeServer.get(), &ServerMode::cmakeReply,
|
connect(m_cmakeServer.get(), &ServerMode::cmakeReply,
|
||||||
this, &ServerModeReader::handleReply);
|
this, &ServerModeReader::handleReply);
|
||||||
connect(m_cmakeServer.get(), &ServerMode::cmakeError,
|
connect(m_cmakeServer.get(), &ServerMode::cmakeError,
|
||||||
@@ -485,7 +485,7 @@ void ServerModeReader::reportError()
|
|||||||
{
|
{
|
||||||
stop();
|
stop();
|
||||||
Core::MessageManager::write(tr("CMake Project parsing failed."));
|
Core::MessageManager::write(tr("CMake Project parsing failed."));
|
||||||
emit errorOccured(m_delayedErrorMessage);
|
emit errorOccurred(m_delayedErrorMessage);
|
||||||
|
|
||||||
if (m_future)
|
if (m_future)
|
||||||
m_future->reportCanceled();
|
m_future->reportCanceled();
|
||||||
|
Reference in New Issue
Block a user