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

QmlDesigner.NodeInstances: Use the 4.8 QDataStream

Browse Source 
The 4.8 Version of QDataStream is the lowest common denominator.        temporaryOutDataStream.setVersion(QDataStream::Qt_4_8);

Change-Id: I4aa681473b6349bd3e859f49d7233ff4a6d2911b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Marco Bubke
2012-09-20 11:30:11 +02:00
parent d8d862f261
commit f6f59c08d5
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,6 +100,7 @@ QDataStream &operator<<(QDataStream &out, const ValuesChangedCommand &command)
command.m_keyNumber = keyCounter; command.m_keyNumber = keyCounter;
QByteArray outDataStreamByteArray; QByteArray outDataStreamByteArray;
QDataStream temporaryOutDataStream(&outDataStreamByteArray, QIODevice::WriteOnly); QDataStream temporaryOutDataStream(&outDataStreamByteArray, QIODevice::WriteOnly);
temporaryOutDataStream.setVersion(QDataStream::Qt_4_8);
temporaryOutDataStream << command.valueChanges();; temporaryOutDataStream << command.valueChanges();;
@@ -125,6 +126,7 @@ void readSharedMemory(qint32 key, QVector<PropertyValueContainer> *valueChangeVe
if (canAttach) { if (canAttach) {
QDataStream in(QByteArray::fromRawData(static_cast<const char*>(sharedMemory.constData()), sharedMemory.size())); QDataStream in(QByteArray::fromRawData(static_cast<const char*>(sharedMemory.constData()), sharedMemory.size()));
in.setVersion(QDataStream::Qt_4_8);
in >> *valueChangeVector; in >> *valueChangeVector;
} }
} }

2
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceclientproxy.cpp
View File

@@ -93,6 +93,7 @@ void NodeInstanceClientProxy::writeCommand(const QVariant &command)
{ {
QByteArray block; QByteArray block;
QDataStream out(&block, QIODevice::WriteOnly); QDataStream out(&block, QIODevice::WriteOnly);
out.setVersion(QDataStream::Qt_4_8);
out << quint32(0); out << quint32(0);
out << quint32(m_writeCommandCounter); out << quint32(m_writeCommandCounter);
m_writeCommandCounter++; m_writeCommandCounter++;
@@ -164,6 +165,7 @@ void NodeInstanceClientProxy::readDataStream()
break; break;
QDataStream in(m_socket); QDataStream in(m_socket);
in.setVersion(QDataStream::Qt_4_8);
if (m_blockSize == 0) { if (m_blockSize == 0) {
in >> m_blockSize; in >> m_blockSize;

4
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstanceclientproxy.cpp
View File

@@ -93,6 +93,8 @@ void NodeInstanceClientProxy::writeCommand(const QVariant &command)
{ {
QByteArray block; QByteArray block;
QDataStream out(&block, QIODevice::WriteOnly); QDataStream out(&block, QIODevice::WriteOnly);
out.setVersion(QDataStream::Qt_4_8);
out << quint32(0); out << quint32(0);
out << quint32(m_writeCommandCounter); out << quint32(m_writeCommandCounter);
m_writeCommandCounter++; m_writeCommandCounter++;
@@ -164,6 +166,8 @@ void NodeInstanceClientProxy::readDataStream()
break; break;
QDataStream in(m_socket); QDataStream in(m_socket);
in.setVersion(QDataStream::Qt_4_8);
if (m_blockSize == 0) { if (m_blockSize == 0) {
in >> m_blockSize; in >> m_blockSize;