From 946ff68c42f9f763f1e3e6979ca8de7ff6984d43 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 11 Sep 2012 13:03:14 +0200 Subject: remove references to qMemSet & qMemCopy Change-Id: Ie6e24798368305fb1eaa01d0e5fccdb5bb5aa33b Reviewed-by: Thiago Macieira --- src/plugins/directshow/player/directshowioreader.cpp | 4 ++-- src/plugins/directshow/player/directshowiosource.cpp | 4 ++-- src/plugins/directshow/player/videosurfacefilter.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/directshow/player/directshowioreader.cpp b/src/plugins/directshow/player/directshowioreader.cpp index e5a841f7b..3f61230dd 100644 --- a/src/plugins/directshow/player/directshowioreader.cpp +++ b/src/plugins/directshow/player/directshowioreader.cpp @@ -429,7 +429,7 @@ HRESULT DirectShowIOReader::blockingRead( *bytesRead = m_device->read(reinterpret_cast(buffer), maxBytes); if (*bytesRead != length) { - qMemSet(buffer + *bytesRead, 0, length - *bytesRead); + ::memset(buffer + *bytesRead, 0, length - *bytesRead); return S_FALSE; } else { @@ -459,7 +459,7 @@ bool DirectShowIOReader::nonBlockingRead( *bytesRead = m_device->read(reinterpret_cast(buffer), maxBytes); if (*bytesRead != length) { - qMemSet(buffer + *bytesRead, 0, length - *bytesRead); + ::memset(buffer + *bytesRead, 0, length - *bytesRead); *result = S_FALSE; } else { diff --git a/src/plugins/directshow/player/directshowiosource.cpp b/src/plugins/directshow/player/directshowiosource.cpp index 190b5b79c..8bad33e91 100644 --- a/src/plugins/directshow/player/directshowiosource.cpp +++ b/src/plugins/directshow/player/directshowiosource.cpp @@ -527,7 +527,7 @@ HRESULT DirectShowIOSource::QueryPinInfo(PIN_INFO *pInfo) const int bytes = qMin(MAX_FILTER_NAME, (m_pinId.length() + 1) * 2); - qMemCopy(pInfo->achName, m_pinId.utf16(), bytes); + ::memcpy(pInfo->achName, m_pinId.utf16(), bytes); return S_OK; } @@ -542,7 +542,7 @@ HRESULT DirectShowIOSource::QueryId(LPWSTR *Id) *Id = static_cast(::CoTaskMemAlloc(bytes)); - qMemCopy(*Id, m_pinId.utf16(), bytes); + ::memcpy(*Id, m_pinId.utf16(), bytes); return S_OK; } diff --git a/src/plugins/directshow/player/videosurfacefilter.cpp b/src/plugins/directshow/player/videosurfacefilter.cpp index 84bd9cf82..5accfed89 100644 --- a/src/plugins/directshow/player/videosurfacefilter.cpp +++ b/src/plugins/directshow/player/videosurfacefilter.cpp @@ -396,7 +396,7 @@ HRESULT VideoSurfaceFilter::QueryPinInfo(PIN_INFO *pInfo) const int bytes = qMin(MAX_FILTER_NAME, (m_pinId.length() + 1) * 2); - qMemCopy(pInfo->achName, m_pinId.utf16(), bytes); + ::memcpy(pInfo->achName, m_pinId.utf16(), bytes); return S_OK; } @@ -411,7 +411,7 @@ HRESULT VideoSurfaceFilter::QueryId(LPWSTR *Id) *Id = static_cast(::CoTaskMemAlloc(bytes)); - qMemCopy(*Id, m_pinId.utf16(), bytes); + ::memcpy(*Id, m_pinId.utf16(), bytes); return S_OK; } -- cgit v1.2.3