Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 01:00:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix typos

Browse source
This commit is contained in:
Atlante45 2017-01-17 15:39:54 -08:00
parent 57d324a9e9
commit ff3f175fb7
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assignment-client/src/scripts/EntityScriptServer.cpp
View file

@ -97,7 +97,7 @@ void EntityScriptServer::run() {
auto tree = _entityViewer.getTree().get(); auto tree = _entityViewer.getTree().get();
connect(tree, &EntityTree::deletingEntity, this, &EntityScriptServer::deletingEntity, Qt::QueuedConnection); connect(tree, &EntityTree::deletingEntity, this, &EntityScriptServer::deletingEntity, Qt::QueuedConnection);
connect(tree, &EntityTree::addingEntity, this, &EntityScriptServer::addingEntity, Qt::QueuedConnection); connect(tree, &EntityTree::addingEntity, this, &EntityScriptServer::addingEntity, Qt::QueuedConnection);
connect(tree, &EntityTree::entityScriptChanging, this, &EntityScriptServer::entitySciptChanging, Qt::QueuedConnection); connect(tree, &EntityTree::entityScriptChanging, this, &EntityScriptServer::entityScriptChanging, Qt::QueuedConnection);
} }
void EntityScriptServer::nodeActivated(SharedNodePointer activatedNode) { void EntityScriptServer::nodeActivated(SharedNodePointer activatedNode) {
@ -222,7 +222,7 @@ void EntityScriptServer::deletingEntity(const EntityItemID& entityID) {
} }
} }
void EntityScriptServer::entitySciptChanging(const EntityItemID& entityID, const bool reload) { void EntityScriptServer::entityScriptChanging(const EntityItemID& entityID, const bool reload) {
if (_entityViewer.getTree() && !_shuttingDown) { if (_entityViewer.getTree() && !_shuttingDown) {
_entitiesScriptEngine->unloadEntityScript(entityID); _entitiesScriptEngine->unloadEntityScript(entityID);
checkAndCallPreload(entityID, reload); checkAndCallPreload(entityID, reload);

2
assignment-client/src/scripts/EntityScriptServer.h
View file

@ -48,7 +48,7 @@ private:
void shutdown(); void shutdown();
void addingEntity(const EntityItemID& entityID); void addingEntity(const EntityItemID& entityID);
void deletingEntity(const EntityItemID& entityID); void deletingEntity(const EntityItemID& entityID);
void entitySciptChanging(const EntityItemID& entityID, const bool reload); void entityScriptChanging(const EntityItemID& entityID, const bool reload);
void checkAndCallPreload(const EntityItemID& entityID, const bool reload = false); void checkAndCallPreload(const EntityItemID& entityID, const bool reload = false);
bool _shuttingDown { false }; bool _shuttingDown { false };

4
libraries/entities-renderer/src/EntityTreeRenderer.cpp
View file

@ -196,7 +196,7 @@ void EntityTreeRenderer::init() {
connect(entityTree.get(), &EntityTree::deletingEntity, this, &EntityTreeRenderer::deletingEntity, Qt::QueuedConnection); connect(entityTree.get(), &EntityTree::deletingEntity, this, &EntityTreeRenderer::deletingEntity, Qt::QueuedConnection);
connect(entityTree.get(), &EntityTree::addingEntity, this, &EntityTreeRenderer::addingEntity, Qt::QueuedConnection); connect(entityTree.get(), &EntityTree::addingEntity, this, &EntityTreeRenderer::addingEntity, Qt::QueuedConnection);
connect(entityTree.get(), &EntityTree::entityScriptChanging, connect(entityTree.get(), &EntityTree::entityScriptChanging,
this, &EntityTreeRenderer::entitySciptChanging, Qt::QueuedConnection); this, &EntityTreeRenderer::entityScriptChanging, Qt::QueuedConnection);
} }
void EntityTreeRenderer::shutdown() { void EntityTreeRenderer::shutdown() {
@ -923,7 +923,7 @@ void EntityTreeRenderer::addEntityToScene(EntityItemPointer entity) {
} }
void EntityTreeRenderer::entitySciptChanging(const EntityItemID& entityID, const bool reload) { void EntityTreeRenderer::entityScriptChanging(const EntityItemID& entityID, const bool reload) {
if (_tree && !_shuttingDown) { if (_tree && !_shuttingDown) {
_entitiesScriptEngine->unloadEntityScript(entityID); _entitiesScriptEngine->unloadEntityScript(entityID);
checkAndCallPreload(entityID, reload); checkAndCallPreload(entityID, reload);

2
libraries/entities-renderer/src/EntityTreeRenderer.h
View file

@ -122,7 +122,7 @@ signals:
public slots: public slots:
void addingEntity(const EntityItemID& entityID); void addingEntity(const EntityItemID& entityID);
void deletingEntity(const EntityItemID& entityID); void deletingEntity(const EntityItemID& entityID);
void entitySciptChanging(const EntityItemID& entityID, const bool reload); void entityScriptChanging(const EntityItemID& entityID, const bool reload);
void entityCollisionWithEntity(const EntityItemID& idA, const EntityItemID& idB, const Collision& collision); void entityCollisionWithEntity(const EntityItemID& idA, const EntityItemID& idB, const Collision& collision);
void updateEntityRenderStatus(bool shouldRenderEntities); void updateEntityRenderStatus(bool shouldRenderEntities);
void updateZone(const EntityItemID& id); void updateZone(const EntityItemID& id);

2
libraries/ui/src/Tooltip.cpp
View file

@ -114,7 +114,7 @@ void Tooltip::handleAPIResponse(QNetworkReply& requestReply) {
if (_description.isEmpty()) { if (_description.isEmpty()) {
const QString DESCRIPTION_KEY = "description"; const QString DESCRIPTION_KEY = "description";
// we have an empty description - did a non-empty desciption come back? // we have an empty description - did a non-empty description come back?
if (placeObject.contains(DESCRIPTION_KEY)) { if (placeObject.contains(DESCRIPTION_KEY)) {
QString placeDescription = placeObject[DESCRIPTION_KEY].toString(); QString placeDescription = placeObject[DESCRIPTION_KEY].toString();