Remove use of "register" modifier (it's deprecated)

src/app/file/png_format.cpp

@@ -248,9 +248,9 @@ bool PngFormat::onLoad(FileOp* fop)
 
       /* RGB_ALPHA */
       if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA) {
-        register uint8_t* src_address = row_pointer;
+        uint8_t* src_address = row_pointer;
-        register uint32_t* dst_address = (uint32_t*)image->getPixelAddress(0, y);
+        uint32_t* dst_address = (uint32_t*)image->getPixelAddress(0, y);
-        register unsigned int x, r, g, b, a;
+        unsigned int x, r, g, b, a;
 
         for (x=0; x<width; x++) {
           r = *(src_address++);
@@ -262,9 +262,9 @@ bool PngFormat::onLoad(FileOp* fop)
       }
       /* RGB */
       else if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB) {
-        register uint8_t* src_address = row_pointer;
+        uint8_t* src_address = row_pointer;
-        register uint32_t* dst_address = (uint32_t*)image->getPixelAddress(0, y);
+        uint32_t* dst_address = (uint32_t*)image->getPixelAddress(0, y);
-        register unsigned int x, r, g, b;
+        unsigned int x, r, g, b;
 
         for (x=0; x<width; x++) {
           r = *(src_address++);
@@ -275,9 +275,9 @@ bool PngFormat::onLoad(FileOp* fop)
       }
       /* GRAY_ALPHA */
       else if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY_ALPHA) {
-        register uint8_t* src_address = row_pointer;
+        uint8_t* src_address = row_pointer;
-        register uint16_t* dst_address = (uint16_t*)image->getPixelAddress(0, y);
+        uint16_t* dst_address = (uint16_t*)image->getPixelAddress(0, y);
-        register unsigned int x, k, a;
+        unsigned int x, k, a;
 
         for (x=0; x<width; x++) {
           k = *(src_address++);
@@ -287,9 +287,9 @@ bool PngFormat::onLoad(FileOp* fop)
       }
       /* GRAY */
       else if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY) {
-        register uint8_t* src_address = row_pointer;
+        uint8_t* src_address = row_pointer;
-        register uint16_t* dst_address = (uint16_t*)image->getPixelAddress(0, y);
+        uint16_t* dst_address = (uint16_t*)image->getPixelAddress(0, y);
-        register unsigned int x, k;
+        unsigned int x, k;
 
         for (x=0; x<width; x++) {
           k = *(src_address++);
@@ -298,9 +298,9 @@ bool PngFormat::onLoad(FileOp* fop)
       }
       /* PALETTE */
       else if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE) {
-        register uint8_t* src_address = row_pointer;
+        uint8_t* src_address = row_pointer;
-        register uint8_t* dst_address = (uint8_t*)image->getPixelAddress(0, y);
+        uint8_t* dst_address = (uint8_t*)image->getPixelAddress(0, y);
-        register unsigned int x, c;
+        unsigned int x, c;
 
         for (x=0; x<width; x++) {
           c = *(src_address++);
@@ -458,9 +458,9 @@ bool PngFormat::onSave(FileOp* fop)
     for (y = 0; y < height; y++) {
       /* RGB_ALPHA */
       if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA) {
-        register uint32_t* src_address = (uint32_t*)image->getPixelAddress(0, y);
+        uint32_t* src_address = (uint32_t*)image->getPixelAddress(0, y);
-        register uint8_t* dst_address = row_pointer;
+        uint8_t* dst_address = row_pointer;
-        register unsigned int x, c;
+        unsigned int x, c;
 
         for (x=0; x<width; x++) {
           c = *(src_address++);
@@ -472,9 +472,9 @@ bool PngFormat::onSave(FileOp* fop)
       }
       /* RGB */
       else if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB) {
-        register uint32_t* src_address = (uint32_t*)image->getPixelAddress(0, y);
+        uint32_t* src_address = (uint32_t*)image->getPixelAddress(0, y);
-        register uint8_t* dst_address = row_pointer;
+        uint8_t* dst_address = row_pointer;
-        register unsigned int x, c;
+        unsigned int x, c;
 
         for (x=0; x<width; x++) {
           c = *(src_address++);
@@ -485,9 +485,9 @@ bool PngFormat::onSave(FileOp* fop)
       }
       /* GRAY_ALPHA */
       else if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY_ALPHA) {
-        register uint16_t* src_address = (uint16_t*)image->getPixelAddress(0, y);
+        uint16_t* src_address = (uint16_t*)image->getPixelAddress(0, y);
-        register uint8_t* dst_address = row_pointer;
+        uint8_t* dst_address = row_pointer;
-        register unsigned int x, c;
+        unsigned int x, c;
 
         for (x=0; x<width; x++) {
           c = *(src_address++);
@@ -497,9 +497,9 @@ bool PngFormat::onSave(FileOp* fop)
       }
       /* GRAY */
       else if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY) {
-        register uint16_t* src_address = (uint16_t*)image->getPixelAddress(0, y);
+        uint16_t* src_address = (uint16_t*)image->getPixelAddress(0, y);
-        register uint8_t* dst_address = row_pointer;
+        uint8_t* dst_address = row_pointer;
-        register unsigned int x, c;
+        unsigned int x, c;
 
         for (x=0; x<width; x++) {
           c = *(src_address++);
@@ -508,9 +508,9 @@ bool PngFormat::onSave(FileOp* fop)
       }
       /* PALETTE */
       else if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE) {
-        register uint8_t* src_address = (uint8_t*)image->getPixelAddress(0, y);
+        uint8_t* src_address = (uint8_t*)image->getPixelAddress(0, y);
-        register uint8_t* dst_address = row_pointer;
+        uint8_t* dst_address = row_pointer;
-        register unsigned int x;
+        unsigned int x;
 
         for (x=0; x<width; x++)
           *(dst_address++) = *(src_address++);

src/app/modules/palettes.cpp

@@ -117,7 +117,7 @@ void set_black_palette()
 // Changes a color of the current system palette
 void set_current_color(int index, int r, int g, int b)
 {
-  register int c;
+  int c;
 
   ASSERT(index >= 0 && index <= 255);
   ASSERT(r >= 0 && r <= 255);

src/app/settings/ui_settings_impl.cpp

@@ -473,8 +473,8 @@ void UIDocumentSettingsImpl::setGridColor(const app::Color& color)
 
 void UIDocumentSettingsImpl::snapToGrid(gfx::Point& point) const
 {
-  register int w = m_gridBounds.w;
+  int w = m_gridBounds.w;
-  register int h = m_gridBounds.h;
+  int h = m_gridBounds.h;
   div_t d, dx, dy;
 
   dx = div(m_gridBounds.x, w);

src/app/tools/point_shape.cpp

@@ -35,9 +35,8 @@ using namespace filters;
   
 void PointShape::doInkHline(int x1, int y, int x2, ToolLoop* loop)
 {
-  register TiledMode tiledMode = loop->getDocumentSettings()->getTiledMode();
+  TiledMode tiledMode = loop->getDocumentSettings()->getTiledMode();
-  register int w, size; // width or height
+  int x, w, size; // width or height
-  register int x;
 
   // Tiled in Y axis
   if (tiledMode & TILED_Y_AXIS) {

src/app/tools/point_shapes.h

@@ -49,7 +49,7 @@ public:
   {
     Brush* brush = loop->getBrush();
     std::vector<BrushScanline>::const_iterator scanline = brush->scanline().begin();
-    register int v, h = brush->bounds().h;
+    int v, h = brush->bounds().h;
 
     x += brush->bounds().x;
     y += brush->bounds().y;

src/app/util/render.cpp

@@ -592,8 +592,7 @@ void RenderEngine::renderLayer(
         }
 
         if (src_image) {
-          int output_opacity;
+          int t, output_opacity;
-          register int t;
 
           output_opacity = MID(0, cel->opacity(), 255);
           output_opacity = INT_MULT(output_opacity, global_opacity, t);

src/gfx/rect.h

@@ -66,7 +66,7 @@ public:
   RectT(const PointT<T>& point1, const PointT<T>& point2) {
     PointT<T> leftTop = point1;
     PointT<T> rightBottom = point2;
-    register T t;
+    T t;
 
     if (leftTop.x > rightBottom.x) {
       t = leftTop.x;

src/raster/blend.cpp

@@ -49,7 +49,7 @@ BLEND_COLOR graya_blenders[] =
 
 int rgba_blend_normal(int back, int front, int opacity)
 {
-  register int t;
+  int t;
 
   if ((back & 0xff000000) == 0) {
     return
@@ -91,9 +91,8 @@ int rgba_blend_copy(int back, int front, int opacity)
 
 int rgba_blend_forpath(int back, int front, int opacity)
 {
-  int F_r, F_g, F_b, F_a;
+  int t, F_r, F_g, F_b, F_a;
-  register int t;
+  
-
   F_r = rgba_getr(front);
   F_g = rgba_getg(front);
   F_b = rgba_getb(front);
@@ -202,7 +201,7 @@ int rgba_blend_blue_tint(int back, int front, int opacity)
 
 int graya_blend_normal(int back, int front, int opacity)
 {
-  register int t;
+  int t;
 
   if ((back & 0xff00) == 0) {
     return
@@ -238,8 +237,7 @@ int graya_blend_copy(int back, int front, int opacity)
 
 int graya_blend_forpath(int back, int front, int opacity)
 {
-  int F_k, F_a;
+  int t, F_k, F_a;
-  register int t;
 
   F_k = graya_getv(front);
   F_a = graya_geta(front);

src/raster/image_impl.h

@@ -174,7 +174,7 @@ namespace raster {
       address_t dst_address;
       int xbeg, xend, xsrc, xdst;
       int ybeg, yend, ysrc, ydst;
-      register uint32_t mask_color = src->maskColor();
+      uint32_t mask_color = src->maskColor();
 
       // nothing to do
       if (!opacity)
@@ -350,7 +350,7 @@ namespace raster {
     }
     // with mask
     else {
-      register int mask_color = src->maskColor();
+      int mask_color = src->maskColor();
 
       for (ydst=ybeg; ydst<=yend; ++ydst, ++ysrc) {
         src_address = src->getPixelAddress(xsrc, ysrc);

src/raster/palette.cpp

@@ -117,7 +117,7 @@ void Palette::copyColorsTo(Palette* dst) const
 
 int Palette::countDiff(const Palette* other, int* from, int* to) const
 {
-  register int c, diff = 0;
+  int c, diff = 0;
   int min = MIN(this->m_colors.size(), other->m_colors.size());
   int max = MAX(this->m_colors.size(), other->m_colors.size());
 
@@ -488,7 +488,7 @@ static unsigned int col_diff[3*128];
 
 static void bestfit_init()
 {
-  register int i, k;
+  int i, k;
 
   for (i=1; i<64; i++) {
     k = i * i;

src/raster/rotate.cpp

@@ -196,7 +196,7 @@ public:
   void feedLine(Image* spr, int spr_x, int spr_y) {
     ASSERT(m_it != m_end);
 
-    register int c = spr->getPixel(spr_x, spr_y);
+    int c = spr->getPixel(spr_x, spr_y);
     if ((rgba_geta(m_mask_color) == 0) || ((c & rgba_rgb_mask) != (m_mask_color & rgba_rgb_mask)))
       *m_it = m_blender(*m_it, c, 255);
 
@@ -218,7 +218,7 @@ public:
   void feedLine(Image* spr, int spr_x, int spr_y) {
     ASSERT(m_it != m_end);
 
-    register int c = spr->getPixel(spr_x, spr_y);
+    int c = spr->getPixel(spr_x, spr_y);
     if ((graya_geta(m_mask_color) == 0) || ((c & graya_v_mask) != (m_mask_color & graya_v_mask)))
       *m_it = m_blender(*m_it, c, 255);
 
@@ -239,7 +239,7 @@ public:
   void feedLine(Image* spr, int spr_x, int spr_y) {
     ASSERT(m_it != m_end);
 
-    register int c = spr->getPixel(spr_x, spr_y);
+    int c = spr->getPixel(spr_x, spr_y);
     if (c != m_mask_color)
       *m_it = c;
     ++m_it;
@@ -254,7 +254,7 @@ public:
   void feedLine(Image* spr, int spr_x, int spr_y) {
     ASSERT(m_it != m_end);
 
-    register int c = spr->getPixel(spr_x, spr_y);
+    int c = spr->getPixel(spr_x, spr_y);
     if (c != 0)                 // TODO
       *m_it = c;
     ++m_it;