diff options
author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2012-09-06 23:44:08 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-07 13:59:27 +0200 |
commit | 1578f745bf94f9522f0805019becf10c146a67de (patch) | |
tree | 506aa016864d65dde1c60939ba57fe040120af97 /src/quick/scenegraph | |
parent | 5b47966f5c7910e29f456d9a809f120a99c10ee4 (diff) |
doc: fix some typos in .cpp files
Change-Id: Ica7685aefde84ec80d8af7a67541af454de4adce
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
Diffstat (limited to 'src/quick/scenegraph')
-rw-r--r-- | src/quick/scenegraph/coreapi/qsggeometry.cpp | 2 | ||||
-rw-r--r-- | src/quick/scenegraph/coreapi/qsgmaterial.cpp | 4 | ||||
-rw-r--r-- | src/quick/scenegraph/qsgdistancefieldglyphnode.cpp | 2 | ||||
-rw-r--r-- | src/quick/scenegraph/util/qsgsimplematerial.cpp | 2 | ||||
-rw-r--r-- | src/quick/scenegraph/util/qsgtexture.cpp | 2 | ||||
-rw-r--r-- | src/quick/scenegraph/util/qsgtexturematerial.cpp | 4 |
6 files changed, 8 insertions, 8 deletions
diff --git a/src/quick/scenegraph/coreapi/qsggeometry.cpp b/src/quick/scenegraph/coreapi/qsggeometry.cpp index 8855e5c8c2..50fd336365 100644 --- a/src/quick/scenegraph/coreapi/qsggeometry.cpp +++ b/src/quick/scenegraph/coreapi/qsggeometry.cpp @@ -224,7 +224,7 @@ const QSGGeometry::AttributeSet &QSGGeometry::defaultAttributes_ColoredPoint2D() to be used for textured 2D geometry. The vertex data is internally stored as a \c {void *} and is accessible with the vertexData() function. Convenience accessors for the common attribute sets are - availble with vertexDataAsPoint2D() and + available with vertexDataAsPoint2D() and vertexDataAsTexturedPoint2D(). Vertex data is allocated by passing a vertex count to the constructor or by calling allocate() later. diff --git a/src/quick/scenegraph/coreapi/qsgmaterial.cpp b/src/quick/scenegraph/coreapi/qsgmaterial.cpp index 50d445c28f..8d37992928 100644 --- a/src/quick/scenegraph/coreapi/qsgmaterial.cpp +++ b/src/quick/scenegraph/coreapi/qsgmaterial.cpp @@ -277,7 +277,7 @@ void QSGMaterialShader::updateState(const RenderState & /* state */, QSGMaterial /*! This function is called when the shader is initialized to compile the - actual QOpenGLShaderProgram. Do not call it explicitely. + actual QOpenGLShaderProgram. Do not call it explicitly. The default implementation will extract the vertexShader() and fragmentShader() and bind the names returned from attributeNames() @@ -625,7 +625,7 @@ int QSGMaterial::compare(const QSGMaterial *other) const \fn QSGMaterialShader *QSGMaterial::createShader() const This function returns a new instance of a the QSGMaterialShader - implementatation used to render geometry for a specifc implementation + implementatation used to render geometry for a specific implementation of QSGMaterial. The function will be called only once for each material type that diff --git a/src/quick/scenegraph/qsgdistancefieldglyphnode.cpp b/src/quick/scenegraph/qsgdistancefieldglyphnode.cpp index 3f5fb0447a..7e09e68c11 100644 --- a/src/quick/scenegraph/qsgdistancefieldglyphnode.cpp +++ b/src/quick/scenegraph/qsgdistancefieldglyphnode.cpp @@ -312,7 +312,7 @@ void QSGDistanceFieldGlyphNode::updateGeometry() subNode->setPreferredAntialiasingMode(m_antialiasingMode); subNode->setGlyphs(m_originalPosition, subNodeGlyphRun); subNode->update(); - subNode->updateGeometry(); // we have to explicity call this now as preprocess won't be called before it's rendered + subNode->updateGeometry(); // we have to explicitly call this now as preprocess won't be called before it's rendered appendChildNode(subNode); ++ite; diff --git a/src/quick/scenegraph/util/qsgsimplematerial.cpp b/src/quick/scenegraph/util/qsgsimplematerial.cpp index 73f1a2da17..87d1104f3b 100644 --- a/src/quick/scenegraph/util/qsgsimplematerial.cpp +++ b/src/quick/scenegraph/util/qsgsimplematerial.cpp @@ -138,7 +138,7 @@ \warning The QSGSimpleMaterialShader relies on template instantiation to create a QSGMaterialType which the scene graph renderer internally uses to identify this shader. For this reason, - the unique QSGSimpleMaterialShader implemenation must be + the unique QSGSimpleMaterialShader implementation must be instantiated with a unique C++ type. \sa {Simple Material Example} diff --git a/src/quick/scenegraph/util/qsgtexture.cpp b/src/quick/scenegraph/util/qsgtexture.cpp index 98378ca5db..3564a64a16 100644 --- a/src/quick/scenegraph/util/qsgtexture.cpp +++ b/src/quick/scenegraph/util/qsgtexture.cpp @@ -655,7 +655,7 @@ void QSGPlainTexture::bind() /*! \fn bool QSGDynamicTexture::updateTexture() - Call this function to explicitely update the dynamic texture. Calling bind() will bind + Call this function to explicitly update the dynamic texture. Calling bind() will bind the content that was previously updated. The function returns true if the texture was changed as a resul of the update; otherwise diff --git a/src/quick/scenegraph/util/qsgtexturematerial.cpp b/src/quick/scenegraph/util/qsgtexturematerial.cpp index e10514ca0a..bc96025e9c 100644 --- a/src/quick/scenegraph/util/qsgtexturematerial.cpp +++ b/src/quick/scenegraph/util/qsgtexturematerial.cpp @@ -144,7 +144,7 @@ void QSGOpaqueTextureMaterialShader::updateState(const RenderState &state, QSGMa attribute set compatible with this material. The texture to be rendered is can be set using setTexture(). How the - texure should be rendered can be specified using setMipmapFiltering(), + texture should be rendered can be specified using setMipmapFiltering(), setFiltering(), setHorizontalWrapMode() and setVerticalWrapMode(). The rendering state is set on the texture instance just before it is bound. @@ -334,7 +334,7 @@ int QSGOpaqueTextureMaterial::compare(const QSGMaterial *o) const attribute set compatible with this material. The texture to be rendered is set using setTexture(). How the - texure should be rendered can be specified using setMipmapFiltering(), + texture should be rendered can be specified using setMipmapFiltering(), setFiltering(), setHorizontalWrapMode() and setVerticalWrapMode(). The rendering state is set on the texture instance just before it is bound. |