feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Do not use qMemSet and qMemCopy.

Browse Source 
They are deprecated in Qt 5. Call std::memset and std::memcpy instead.

Change-Id: I53c22283208b4d6fdfcba870c3b141f3c02001bd
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Christian Kandeler
2012-09-20 14:25:01 +02:00
parent 0b28569ec6
commit 6d06d47a6e
4 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.cpp
View File

@@ -33,6 +33,8 @@
#include <QSharedMemory>
#include <QCache>
#include <cstring>
namespace QmlDesigner {
static QCache<qint32, QSharedMemory> globalSharedMemoryCache(10000);
@@ -104,7 +106,7 @@ QDataStream &operator<<(QDataStream &out, const ValuesChangedCommand &command)
QSharedMemory *sharedMemory = createSharedMemory(keyCounter, outDataStreamByteArray.size());
if (sharedMemory) {
qMemCopy(sharedMemory->data(), outDataStreamByteArray.constData(), sharedMemory->size());
std::memcpy(sharedMemory->data(), outDataStreamByteArray.constData(), sharedMemory->size());
out << command.keyNumber();
return out;
}