fix a few spelling mistakes

pull/923/head
Bret Curtis 9 years ago
parent f2b2a760b3
commit 2c90b0b78d

@ -75,7 +75,7 @@ namespace ESSImport
// unsure at which point between TGTN and CRED // unsure at which point between TGTN and CRED
if (esm.isNextSub("AADT")) 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(); esm.skipHSub();
} }

@ -264,7 +264,7 @@ void CSMWorld::IdTree::setNestedTable(const QModelIndex& index, const CSMWorld::
CSMWorld::NestedTableWrapperBase* CSMWorld::IdTree::nestedTable(const QModelIndex& index) const CSMWorld::NestedTableWrapperBase* CSMWorld::IdTree::nestedTable(const QModelIndex& index) const
{ {
if (!hasChildren(index)) 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()); return mNestedCollection->nestedTable(index.row(), index.column());
} }

@ -21,7 +21,7 @@ namespace CSMWorld
/// ///
/// This class provides way to construct mimedata object holding the universalid copy /// 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. /// 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. /// Please note, that tablemimedata object can hold multiple universalIds in the vector.
class TableMimeData : public QMimeData class TableMimeData : public QMimeData

@ -209,7 +209,7 @@ private:
}; };
/// Moves water mesh away from the camera slightly if the camera gets too close on the Z axis. /// 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. /// Must be added as a Cull callback.
class FudgeCallback : public osg::NodeCallback class FudgeCallback : public osg::NodeCallback
{ {

@ -490,7 +490,7 @@ namespace MWWorld
} }
catch (std::exception& e) 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) 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;
} }
} }

@ -577,7 +577,7 @@ public:
#endif #endif
/** Add a new node related to this. Adds a child past the LastChild. /** 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 ); TiXmlNode* InsertEndChild( const TiXmlNode& addThis );
@ -594,17 +594,17 @@ public:
TiXmlNode* LinkEndChild( TiXmlNode* addThis ); TiXmlNode* LinkEndChild( TiXmlNode* addThis );
/** Add a new node related to this. Adds a child before the specified child. /** 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 ); TiXmlNode* InsertBeforeChild( TiXmlNode* beforeThis, const TiXmlNode& addThis );
/** Add a new node related to this. Adds a child after the specified child. /** 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 ); TiXmlNode* InsertAfterChild( TiXmlNode* afterThis, const TiXmlNode& addThis );
/** Replace a child of this node. /** 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 ); TiXmlNode* ReplaceChild( TiXmlNode* replaceThis, const TiXmlNode& withThis );
@ -1471,7 +1471,7 @@ public:
@sa SetTabSize, Row, Column @sa SetTabSize, Row, Column
*/ */
int ErrorRow() const { return errorLocation.row+1; } 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()) /** SetTabSize() allows the error reporting functions (ErrorRow() and ErrorCol())
to report the correct values for row and column. It does not change the output to report the correct values for row and column. It does not change the output

@ -528,7 +528,7 @@ void VideoState::decode_thread_loop(VideoState *self)
} }
} }
catch(std::exception& e) { 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; self->mQuit = true;

Loading…
Cancel
Save