diff options
author | Olivier Goffart <ogoffart@woboq.com> | 2012-04-20 19:55:49 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-23 09:52:33 +0200 |
commit | 42e93ffffa23b466f6641f86de18e6a7dd71166c (patch) | |
tree | c86d77224c72acdd3e52b4a7f2d6be4832db0a77 /src/quick | |
parent | b50aa539e854f1a10c5f012a448ab6977c3fc9ac (diff) |
qMalloc, qFree, qRealloc, qMemCopy, qMemSet are deprecated
Use the stdlib version directly instead
Change-Id: Ifc600f6c418b395c4ada9e5beb207ad3985575e3
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Diffstat (limited to 'src/quick')
-rw-r--r-- | src/quick/scenegraph/coreapi/qsgdefaultrenderer.cpp | 2 | ||||
-rw-r--r-- | src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgdefaultrenderer.cpp b/src/quick/scenegraph/coreapi/qsgdefaultrenderer.cpp index 7a219585b0..56d549e94f 100644 --- a/src/quick/scenegraph/coreapi/qsgdefaultrenderer.cpp +++ b/src/quick/scenegraph/coreapi/qsgdefaultrenderer.cpp @@ -453,7 +453,7 @@ void QSGDefaultRenderer::buildLists(QSGNode *node) } Q_ASSERT(m_tempNodes.size() == m_transparentNodes.size() - baseCount); - qMemCopy(&m_transparentNodes.at(baseCount), &m_tempNodes.at(0), m_tempNodes.size() * sizeof(QSGGeometryNode *)); + memcpy(&m_transparentNodes.at(baseCount), &m_tempNodes.at(0), m_tempNodes.size() * sizeof(QSGGeometryNode *)); } } else { for (QSGNode *c = node->firstChild(); c; c = c->nextSibling()) diff --git a/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp b/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp index 2b2ccfe317..aa2c78f84a 100644 --- a/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp +++ b/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp @@ -164,7 +164,7 @@ void QSGDefaultDistanceFieldGlyphCache::storeGlyphs(const QHash<glyph_t, QImage> uchar *inBits = glyph.scanLine(0); uchar *outBits = texInfo->image.scanLine(int(c.y)) + int(c.x); for (int y = 0; y < glyph.height(); ++y) { - qMemCopy(outBits, inBits, glyph.width()); + memcpy(outBits, inBits, glyph.width()); inBits += glyph.bytesPerLine(); outBits += texInfo->image.bytesPerLine(); } |