Changeset View
Changeset View
Standalone View
Standalone View
src/kstatusnotifieritem.cpp
Show First 20 Lines • Show All 1103 Lines • ▼ Show 20 Line(s) | |||||
1104 | } | 1104 | } | ||
1105 | 1105 | | |||
1106 | KDbusImageStruct KStatusNotifierItemPrivate::imageToStruct(const QImage &image) | 1106 | KDbusImageStruct KStatusNotifierItemPrivate::imageToStruct(const QImage &image) | ||
1107 | { | 1107 | { | ||
1108 | KDbusImageStruct icon; | 1108 | KDbusImageStruct icon; | ||
1109 | icon.width = image.size().width(); | 1109 | icon.width = image.size().width(); | ||
1110 | icon.height = image.size().height(); | 1110 | icon.height = image.size().height(); | ||
1111 | if (image.format() == QImage::Format_ARGB32) { | 1111 | if (image.format() == QImage::Format_ARGB32) { | ||
1112 | icon.data = QByteArray((char *)image.bits(), image.byteCount()); | 1112 | icon.data = QByteArray((char *)image.bits(), image.sizeInBytes()); | ||
1113 | } else { | 1113 | } else { | ||
1114 | QImage image32 = image.convertToFormat(QImage::Format_ARGB32); | 1114 | QImage image32 = image.convertToFormat(QImage::Format_ARGB32); | ||
1115 | icon.data = QByteArray((char *)image32.bits(), image32.byteCount()); | 1115 | icon.data = QByteArray((char *)image32.bits(), image32.sizeInBytes()); | ||
1116 | } | 1116 | } | ||
1117 | 1117 | | |||
1118 | //swap to network byte order if we are little endian | 1118 | //swap to network byte order if we are little endian | ||
1119 | if (QSysInfo::ByteOrder == QSysInfo::LittleEndian) { | 1119 | if (QSysInfo::ByteOrder == QSysInfo::LittleEndian) { | ||
1120 | quint32 *uintBuf = (quint32 *) icon.data.data(); | 1120 | quint32 *uintBuf = (quint32 *) icon.data.data(); | ||
1121 | for (uint i = 0; i < icon.data.size() / sizeof(quint32); ++i) { | 1121 | for (uint i = 0; i < icon.data.size() / sizeof(quint32); ++i) { | ||
1122 | *uintBuf = qToBigEndian(*uintBuf); | 1122 | *uintBuf = qToBigEndian(*uintBuf); | ||
1123 | ++uintBuf; | 1123 | ++uintBuf; | ||
Show All 23 Lines |