summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Maloney <asmaloney@gmail.com>2017-03-22 11:24:42 -0400
committerAndy Maloney <asmaloney@gmail.com>2017-04-06 14:00:13 +0000
commitd9b4b28c5383a5d338a670e48aa1a4e4ba9fa3d9 (patch)
treebc7d359859651e468821be3fa08e626f05d1c4aa
parent6729e2cf8ed26c4087b700cf883a379594d6b78f (diff)
Fix spelling in comments and docs
Change-Id: Ib93da3bc94ee43980d1190955c8c37e886c4b0fa Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r--src/animation/backend/bezierevaluator.cpp2
-rw-r--r--src/core/nodes/qnode.cpp2
-rw-r--r--src/extras/3dtext/qextrudedtextgeometry.cpp2
-rw-r--r--src/input/frontend/qinputsequence.cpp2
-rw-r--r--src/logic/qlogicaspect.cpp2
-rw-r--r--src/render/backend/renderview.cpp2
-rw-r--r--src/render/framegraph/qrendercapture.cpp4
-rw-r--r--src/render/framegraph/qsortpolicy.cpp4
-rw-r--r--src/render/frontend/qrenderaspect.cpp4
-rw-r--r--src/render/materialsystem/qrenderpass.cpp2
-rw-r--r--src/render/texture/gltexture.cpp4
11 files changed, 15 insertions, 15 deletions
diff --git a/src/animation/backend/bezierevaluator.cpp b/src/animation/backend/bezierevaluator.cpp
index 6ed8b1aa2..9d81a2f2f 100644
--- a/src/animation/backend/bezierevaluator.cpp
+++ b/src/animation/backend/bezierevaluator.cpp
@@ -83,7 +83,7 @@ float BezierEvaluator::valueForTime(float time) const
{
const float u = parameterForTime(time);
- // Calulate powers of u and (1-u) that we need
+ // Calculate powers of u and (1-u) that we need
const float u2 = u * u;
const float u3 = u2 * u;
const float mu = 1.0f - u;
diff --git a/src/core/nodes/qnode.cpp b/src/core/nodes/qnode.cpp
index 6caf03337..42c8887ce 100644
--- a/src/core/nodes/qnode.cpp
+++ b/src/core/nodes/qnode.cpp
@@ -204,7 +204,7 @@ void QNodePrivate::_q_addChild(QNode *childNode)
// removed from the scene as part of the destruction of the parent, when the
// parent's children are deleted in the QObject dtor, we still have access to
// the parentId. If we didn't store this, we wouldn't have access at that time
- // because the parent woudl then only be a QObject, the QNode part would have
+ // because the parent would then only be a QObject, the QNode part would have
// been destroyed already.
QNodePrivate::get(childNode)->m_parentId = m_id;
diff --git a/src/extras/3dtext/qextrudedtextgeometry.cpp b/src/extras/3dtext/qextrudedtextgeometry.cpp
index ee4b71117..4a460bfc7 100644
--- a/src/extras/3dtext/qextrudedtextgeometry.cpp
+++ b/src/extras/3dtext/qextrudedtextgeometry.cpp
@@ -105,7 +105,7 @@ TriangulationData triangulate(const QString &text, const QFont &font)
for (QPolygonF &p : polygons)
path.addPolygon(p);
- // Extract polylines out of the path, this allows us to retrive indicies for each glyph outline
+ // Extract polylines out of the path, this allows us to retrieve indices for each glyph outline
QPolylineSet polylines = qPolyline(path);
QVector<IndexType> tmpIndices;
tmpIndices.resize(polylines.indices.size());
diff --git a/src/input/frontend/qinputsequence.cpp b/src/input/frontend/qinputsequence.cpp
index 17499b59b..766674840 100644
--- a/src/input/frontend/qinputsequence.cpp
+++ b/src/input/frontend/qinputsequence.cpp
@@ -76,7 +76,7 @@ QInputSequencePrivate::QInputSequencePrivate()
Represents a set of QAbstractActionInput's that must be triggerd one after the other.
- The following example shows a chord that will be triggered by pressing the A and S keys together with a tolerence of 10 miliseconds between presses.
+ The following example shows a chord that will be triggered by pressing the A and S keys together with a tolerance of 10 miliseconds between presses.
\qml
InputChord {
tolerance: 10
diff --git a/src/logic/qlogicaspect.cpp b/src/logic/qlogicaspect.cpp
index 4aabf8888..04add1408 100644
--- a/src/logic/qlogicaspect.cpp
+++ b/src/logic/qlogicaspect.cpp
@@ -122,7 +122,7 @@ QVector<QAspectJobPtr> QLogicAspect::jobsToExecute(qint64 time)
d->m_manager->setDeltaTime(dt);
d->m_time = time;
- // Create jobs that will get exectued by the threadpool
+ // Create jobs that will get executed by the threadpool
QVector<QAspectJobPtr> jobs;
jobs.append(d->m_callbackJob);
return jobs;
diff --git a/src/render/backend/renderview.cpp b/src/render/backend/renderview.cpp
index 5c17d9a24..410f7a681 100644
--- a/src/render/backend/renderview.cpp
+++ b/src/render/backend/renderview.cpp
@@ -597,7 +597,7 @@ void RenderView::setUniformBlockValue(ShaderParameterPack &uniformPack,
// If two shaders define the same block with the exact same layout, in that case the UBO could be shared
// but how do we know that ? We'll need to compare ShaderUniformBlocks
- // Note: we assume that if a buffer is shared accross multiple shaders
+ // Note: we assume that if a buffer is shared across multiple shaders
// then it implies that they share the same layout
// Temporarly disabled
diff --git a/src/render/framegraph/qrendercapture.cpp b/src/render/framegraph/qrendercapture.cpp
index 6576fdac3..e1b11e3e0 100644
--- a/src/render/framegraph/qrendercapture.cpp
+++ b/src/render/framegraph/qrendercapture.cpp
@@ -123,7 +123,7 @@ namespace Qt3DRender {
* the request. The requestId does not have to be unique. Only one render capture result
* is produced per requestCapture call even if the frame graph has multiple leaf nodes.
* The function returns a QRenderCaptureReply object, which receives the captured image
- * when it is done. The user is reponsible for deallocating the returned object.
+ * when it is done. The user is responsible for deallocating the returned object.
*/
/*!
@@ -256,7 +256,7 @@ QRenderCapture::QRenderCapture(Qt3DCore::QNode *parent)
* the request. The requestId does not have to be unique. Only one render capture result
* is produced per requestCapture call even if the frame graph has multiple leaf nodes.
* The function returns a QRenderCaptureReply object, which receives the captured image
- * when it is done. The user is reponsible for deallocating the returned object.
+ * when it is done. The user is responsible for deallocating the returned object.
*/
QRenderCaptureReply *QRenderCapture::requestCapture(int captureId)
{
diff --git a/src/render/framegraph/qsortpolicy.cpp b/src/render/framegraph/qsortpolicy.cpp
index 2eb0dff19..b1e0f4956 100644
--- a/src/render/framegraph/qsortpolicy.cpp
+++ b/src/render/framegraph/qsortpolicy.cpp
@@ -65,7 +65,7 @@ QSortPolicyPrivate::QSortPolicyPrivate()
The sort types determine how drawable entities are sorted before drawing to
determine the drawing order. When QSortPolicy is present in the FrameGraph,
the sorting mechanism is determined by the SortTypes list. Multiple sort types
- can be used simultanously. If QSortPolicy is not present in the FrameGraph,
+ can be used simultaneously. If QSortPolicy is not present in the FrameGraph,
entities are drawn in the order they appear in the entity hierarchy.
*/
@@ -81,7 +81,7 @@ QSortPolicyPrivate::QSortPolicyPrivate()
The sort types determine how drawable entities are sorted before drawing to
determine the drawing order. When SortPolicy is present in the FrameGraph,
the sorting mechanism is determined by the SortTypes list. Multiple sort
- types can be used simultanously. If SortPolicy is not present in the FrameGraph,
+ types can be used simultaneously. If SortPolicy is not present in the FrameGraph,
entities are drawn in the order they appear in the entity hierarchy.
*/
diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp
index 7965b3672..a135c34e4 100644
--- a/src/render/frontend/qrenderaspect.cpp
+++ b/src/render/frontend/qrenderaspect.cpp
@@ -389,7 +389,7 @@ QVector<Qt3DCore::QAspectJobPtr> QRenderAspect::jobsToExecute(qint64 time)
d->m_renderer->dumpInfo();
#endif
- // Create jobs that will get exectued by the threadpool
+ // Create jobs that will get executed by the threadpool
QVector<QAspectJobPtr> jobs;
// 1 LoadBufferJobs, GeometryJobs, SceneLoaderJobs, LoadTextureJobs
@@ -486,7 +486,7 @@ void QRenderAspect::onRegistered()
d->m_renderer->setNodeManagers(d->m_nodeManagers);
// Create a helper for deferring creation of an offscreen surface used during cleanup
- // to the main thread, after we knwo what the surface format in use is.
+ // to the main thread, after we know what the surface format in use is.
d->m_offscreenHelper = new Render::OffscreenSurfaceHelper(d->m_renderer);
d->m_offscreenHelper->moveToThread(QCoreApplication::instance()->thread());
d->m_renderer->setOffscreenSurfaceHelper(d->m_offscreenHelper);
diff --git a/src/render/materialsystem/qrenderpass.cpp b/src/render/materialsystem/qrenderpass.cpp
index dd6363816..6f5949781 100644
--- a/src/render/materialsystem/qrenderpass.cpp
+++ b/src/render/materialsystem/qrenderpass.cpp
@@ -236,7 +236,7 @@ QVector<QFilterKey *> QRenderPass::filterKeys() const
/*!
Adds a render \a state to the rendering pass. That implies that
when the pass is executed at render time, the globally set render state will
- be modifed by the states defined locally by the Qt3DRender::QRenderPass.
+ be modified by the states defined locally by the Qt3DRender::QRenderPass.
\note not defining any Qt3DRender::QRenderState in a pass will result in the pass using
the globally set render state for a given FrameGraph branch execution path.
diff --git a/src/render/texture/gltexture.cpp b/src/render/texture/gltexture.cpp
index 98af9b6f4..a2e0dc5d0 100644
--- a/src/render/texture/gltexture.cpp
+++ b/src/render/texture/gltexture.cpp
@@ -401,7 +401,7 @@ void GLTexture::uploadGLTextureData()
for (int layer = 0; layer < data->layers(); layer++) {
for (int face = 0; face < data->faces(); face++) {
for (int level = 0; level < mipLevels; level++) {
- // ensure we don't accidently cause a detach / copy of the raw bytes
+ // ensure we don't accidentally cause a detach / copy of the raw bytes
const QByteArray bytes(data->data(layer, face, level));
uploadGLData(m_gl, level, layer,
static_cast<QOpenGLTexture::CubeMapFace>(QOpenGLTexture::CubeMapPositiveX + face),
@@ -416,7 +416,7 @@ void GLTexture::uploadGLTextureData()
for (int i = 0; i < m_images.size(); i++) {
const QTextureImageDataPtr &imgData = m_imageData.at(i);
- // ensure we don't accidently cause a detach / copy of the raw bytes
+ // ensure we don't accidentally cause a detach / copy of the raw bytes
const QByteArray bytes(imgData->data());
uploadGLData(m_gl, m_images[i].mipLevel, m_images[i].layer,
static_cast<QOpenGLTexture::CubeMapFace>(m_images[i].face),