feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake: Fix typo in symbol names

Browse Source 
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:
Tobias Hunger
2020-03-19 12:41:23 +01:00
parent 4657563e4a
commit 5de0e81d8b
11 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/cmakeprojectmanager/builddirmanager.cpp
View File

@@ -84,7 +84,8 @@ FilePath BuildDirManager::workDirectory(const BuildDirParameters &parameters) 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 &parameters) 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();
}

4
src/plugins/cmakeprojectmanager/builddirmanager.h
View File

@@ -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();

2
src/plugins/cmakeprojectmanager/builddirreader.h
View File

@@ -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;

4
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -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

4
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
View File

@@ -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();

6
src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp
View File

@@ -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,

2
src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
View File

@@ -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]() {

2
src/plugins/cmakeprojectmanager/fileapireader.cpp
View File

@@ -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);
}
});
}

2
src/plugins/cmakeprojectmanager/servermode.cpp
View File

@@ -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

2
src/plugins/cmakeprojectmanager/servermode.h
View File

@@ -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);

6
src/plugins/cmakeprojectmanager/servermodereader.cpp
View File

@@ -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();