From d9fb6e6dbb2b322556d581265da2442e3b91a6a3 Mon Sep 17 00:00:00 2001
From: Stephen Kelly <stephen.kelly@kdab.com>
Date: Sat, 15 Jun 2013 11:49:45 +0200
Subject: Remove use of 'register' from Qt.

It is deprecated and clang is starting to warn about it.

Patch mostly generated by clang itself, with some careful grep
and sed for the platform-specific parts.

Change-Id: I8058e6db0f1b41b33a9e8f17a712739159982450
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/plugins/imageformats/ico/qicohandler.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/plugins/imageformats')

diff --git a/src/plugins/imageformats/ico/qicohandler.cpp b/src/plugins/imageformats/ico/qicohandler.cpp
index a45c3875bc..b1a674365d 100644
--- a/src/plugins/imageformats/ico/qicohandler.cpp
+++ b/src/plugins/imageformats/ico/qicohandler.cpp
@@ -448,7 +448,7 @@ void ICOReader::read4BitBMP(QImage & image)
                 image = QImage();
                 break;
             }
-            register uchar *p = image.scanLine(h);
+            uchar *p = image.scanLine(h);
             uchar *b = buf;
             for (int i=0; i<icoAttrib.w/2; i++) {   // convert nibbles to bytes
                 *p++ = *b >> 4;
@@ -487,7 +487,7 @@ void ICOReader::read16_24_32BMP(QImage & image)
 {
     if (iod) {
         int h = icoAttrib.h;
-        register QRgb *p;
+        QRgb *p;
         QRgb  *end;
         uchar *buf = new uchar[image.bytesPerLine()];
         int    bpl = ((icoAttrib.w*icoAttrib.nbits+31)/32)*4;
-- 
cgit v1.2.3