From 2c90b0b78df3523233d359bcc7eca6d917b5d7b0 Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Thu, 7 Apr 2016 11:55:49 +0200 Subject: [PATCH] fix a few spelling mistakes --- apps/essimporter/importacdt.cpp | 2 +- apps/opencs/model/world/idtree.cpp | 2 +- apps/opencs/model/world/tablemimedata.hpp | 2 +- apps/openmw/mwrender/water.cpp | 2 +- apps/openmw/mwworld/cellstore.cpp | 4 ++-- extern/oics/tinyxml.h | 10 +++++----- extern/osg-ffmpeg-videoplayer/videostate.cpp | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/apps/essimporter/importacdt.cpp b/apps/essimporter/importacdt.cpp index 239c46698..fb0dccaf5 100644 --- a/apps/essimporter/importacdt.cpp +++ b/apps/essimporter/importacdt.cpp @@ -75,7 +75,7 @@ namespace ESSImport // unsure at which point between TGTN and CRED if (esm.isNextSub("AADT")) { - // occured when a creature was in the middle of its attack, 44 bytes + // occurred when a creature was in the middle of its attack, 44 bytes esm.skipHSub(); } diff --git a/apps/opencs/model/world/idtree.cpp b/apps/opencs/model/world/idtree.cpp index 124a94e8c..7c4551a90 100644 --- a/apps/opencs/model/world/idtree.cpp +++ b/apps/opencs/model/world/idtree.cpp @@ -264,7 +264,7 @@ void CSMWorld::IdTree::setNestedTable(const QModelIndex& index, const CSMWorld:: CSMWorld::NestedTableWrapperBase* CSMWorld::IdTree::nestedTable(const QModelIndex& index) const { if (!hasChildren(index)) - throw std::logic_error("Tried to retrive nested table, but index has no children"); + throw std::logic_error("Tried to retrieve nested table, but index has no children"); return mNestedCollection->nestedTable(index.row(), index.column()); } diff --git a/apps/opencs/model/world/tablemimedata.hpp b/apps/opencs/model/world/tablemimedata.hpp index a42e97561..3be8054bd 100644 --- a/apps/opencs/model/world/tablemimedata.hpp +++ b/apps/opencs/model/world/tablemimedata.hpp @@ -21,7 +21,7 @@ namespace CSMWorld /// /// This class provides way to construct mimedata object holding the universalid copy /// Universalid is used in the majority of the tables to store type, id, argument types. -/// This way universalid grants a way to retrive record from the concrete table. +/// This way universalid grants a way to retrieve record from the concrete table. /// Please note, that tablemimedata object can hold multiple universalIds in the vector. class TableMimeData : public QMimeData diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp index 2ce4f517c..ab828a3ad 100644 --- a/apps/openmw/mwrender/water.cpp +++ b/apps/openmw/mwrender/water.cpp @@ -209,7 +209,7 @@ private: }; /// Moves water mesh away from the camera slightly if the camera gets too close on the Z axis. -/// The offset works around graphics artifacts that occured with the GL_DEPTH_CLAMP when the camera gets extremely close to the mesh (seen on NVIDIA at least). +/// The offset works around graphics artifacts that occurred with the GL_DEPTH_CLAMP when the camera gets extremely close to the mesh (seen on NVIDIA at least). /// Must be added as a Cull callback. class FudgeCallback : public osg::NodeCallback { diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp index 87a836f71..1ca452efe 100644 --- a/apps/openmw/mwworld/cellstore.cpp +++ b/apps/openmw/mwworld/cellstore.cpp @@ -490,7 +490,7 @@ namespace MWWorld } catch (std::exception& e) { - std::cerr << "An error occured listing references for cell " << getCell()->getDescription() << ": " << e.what() << std::endl; + std::cerr << "An error occurred listing references for cell " << getCell()->getDescription() << ": " << e.what() << std::endl; } } @@ -542,7 +542,7 @@ namespace MWWorld } catch (std::exception& e) { - std::cerr << "An error occured loading references for cell " << getCell()->getDescription() << ": " << e.what() << std::endl; + std::cerr << "An error occurred loading references for cell " << getCell()->getDescription() << ": " << e.what() << std::endl; } } diff --git a/extern/oics/tinyxml.h b/extern/oics/tinyxml.h index 50ad417fe..7237825c5 100644 --- a/extern/oics/tinyxml.h +++ b/extern/oics/tinyxml.h @@ -577,7 +577,7 @@ public: #endif /** Add a new node related to this. Adds a child past the LastChild. - Returns a pointer to the new object or NULL if an error occured. + Returns a pointer to the new object or NULL if an error occurred. */ TiXmlNode* InsertEndChild( const TiXmlNode& addThis ); @@ -594,17 +594,17 @@ public: TiXmlNode* LinkEndChild( TiXmlNode* addThis ); /** Add a new node related to this. Adds a child before the specified child. - Returns a pointer to the new object or NULL if an error occured. + Returns a pointer to the new object or NULL if an error occurred. */ TiXmlNode* InsertBeforeChild( TiXmlNode* beforeThis, const TiXmlNode& addThis ); /** Add a new node related to this. Adds a child after the specified child. - Returns a pointer to the new object or NULL if an error occured. + Returns a pointer to the new object or NULL if an error occurred. */ TiXmlNode* InsertAfterChild( TiXmlNode* afterThis, const TiXmlNode& addThis ); /** Replace a child of this node. - Returns a pointer to the new object or NULL if an error occured. + Returns a pointer to the new object or NULL if an error occurred. */ TiXmlNode* ReplaceChild( TiXmlNode* replaceThis, const TiXmlNode& withThis ); @@ -1471,7 +1471,7 @@ public: @sa SetTabSize, Row, Column */ int ErrorRow() const { return errorLocation.row+1; } - int ErrorCol() const { return errorLocation.col+1; } ///< The column where the error occured. See ErrorRow() + int ErrorCol() const { return errorLocation.col+1; } ///< The column where the error occurred. See ErrorRow() /** SetTabSize() allows the error reporting functions (ErrorRow() and ErrorCol()) to report the correct values for row and column. It does not change the output diff --git a/extern/osg-ffmpeg-videoplayer/videostate.cpp b/extern/osg-ffmpeg-videoplayer/videostate.cpp index 3c9279ea2..5849e8718 100644 --- a/extern/osg-ffmpeg-videoplayer/videostate.cpp +++ b/extern/osg-ffmpeg-videoplayer/videostate.cpp @@ -528,7 +528,7 @@ void VideoState::decode_thread_loop(VideoState *self) } } catch(std::exception& e) { - std::cerr << "An error occured playing the video: " << e.what () << std::endl; + std::cerr << "An error occurred playing the video: " << e.what () << std::endl; } self->mQuit = true;