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

"Fix" some deprecation warning

Browse Source 
Change-Id: Idcf8215d0a1b97a8169077604d16d3f3b0fb8fc8
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
hjk
2019-02-26 18:03:03 +01:00
parent b5c3ce57ca
commit 55b87968f4
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
share/qtcreator/qml/qmlpuppet/container/imagecontainer.cpp
View File

@@ -129,14 +129,14 @@ static void writeSharedMemory(SharedMemory *sharedMemory, const QImage &image)
sharedMemory->lock(); sharedMemory->lock();
qint32 headerData[5]; qint32 headerData[5];
headerData[0] = image.byteCount(); headerData[0] = qint32(image.sizeInBytes());
headerData[1] = image.bytesPerLine(); headerData[1] = image.bytesPerLine();
headerData[2] = image.size().width(); headerData[2] = image.size().width();
headerData[3] = image.size().height(); headerData[3] = image.size().height();
headerData[4] = image.format(); headerData[4] = image.format();
std::memcpy(sharedMemory->data(), headerData, 20); std::memcpy(sharedMemory->data(), headerData, 20);
std::memcpy(reinterpret_cast<char*>(sharedMemory->data()) + 20, image.constBits(), image.byteCount()); std::memcpy(reinterpret_cast<char*>(sharedMemory->data()) + 20, image.constBits(), image.sizeInBytes());
sharedMemory->unlock(); sharedMemory->unlock();
} }
@@ -145,8 +145,8 @@ static void writeStream(QDataStream &out, const QImage &image)
out << qint32(image.bytesPerLine()); out << qint32(image.bytesPerLine());
out << image.size(); out << image.size();
out << qint32(image.format()); out << qint32(image.format());
out << qint32(image.byteCount()); out << qint32(image.sizeInBytes());
out.writeRawData(reinterpret_cast<const char*>(image.constBits()), image.byteCount()); out.writeRawData(reinterpret_cast<const char*>(image.constBits()), image.sizeInBytes());
} }
QDataStream &operator<<(QDataStream &out, const ImageContainer &container) QDataStream &operator<<(QDataStream &out, const ImageContainer &container)
@@ -163,7 +163,8 @@ QDataStream &operator<<(QDataStream &out, const ImageContainer &container)
out << qint32(0); out << qint32(0);
writeStream(out, image); writeStream(out, image);
} else { } else {
SharedMemory *sharedMemory = createSharedMemory(container.keyNumber(), image.byteCount() + extraDataSize); const qint32 totalSize = qint32(image.sizeInBytes()) + extraDataSize;
SharedMemory *sharedMemory = createSharedMemory(container.keyNumber(), totalSize);
out << qint32(sharedMemory != nullptr); // send if shared memory is used out << qint32(sharedMemory != nullptr); // send if shared memory is used