Merge pull request #2289 from laanwj/201301_qimage_bits

laanwj · laanwj · commit 6749082294ad · 2013-02-10T09:27:31.000-08:00
Use QImage.bits instead of QImage.constBits to ease backporting
diff --git a/src/qt/notificator.cpp b/src/qt/notificator.cpp
@@ -113,7 +113,7 @@ FreedesktopImage::FreedesktopImage(const QImage &img):
 {
     // Convert 00xAARRGGBB to RGBA bytewise (endian-independent) format
     QImage tmp = img.convertToFormat(QImage::Format_ARGB32);
-    const uint32_t *data = reinterpret_cast<const uint32_t*>(tmp.constBits());
+    const uint32_t *data = reinterpret_cast<const uint32_t*>(tmp.bits());
 
     unsigned int num_pixels = width * height;
     image.resize(num_pixels * BYTES_PER_PIXEL);

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ FreedesktopImage::FreedesktopImage(const QImage &img):`
`113`	`113`	`{`
`114`	`114`	`// Convert 00xAARRGGBB to RGBA bytewise (endian-independent) format`
`115`	`115`	`QImage tmp = img.convertToFormat(QImage::Format_ARGB32);`
`116`		`- const uint32_t data = reinterpret_cast<const uint32_t>(tmp.constBits());`
	`116`	`+ const uint32_t data = reinterpret_cast<const uint32_t>(tmp.bits());`
`117`	`117`
`118`	`118`	`unsigned int num_pixels = width * height;`
`119`	`119`	`image.resize(num_pixels * BYTES_PER_PIXEL);`