QXpmHandler: clean up write_xpm_image: scope variables better

... and fix spacing around operators and after flow-control keywords.

Change-Id: Iefaa03074536d13a655c91fb42aef6aa96c2665b
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>

1 files changed, 4 insertions, 5 deletions

diff --git a/src/gui/image/qxpmhandler.cpp b/src/gui/image/qxpmhandler.cpp
index f9247f9ff0..ae3fc8128d 100644
--- a/src/gui/image/qxpmhandler.cpp
+++ b/src/gui/image/qxpmhandler.cpp
@@ -1128,12 +1128,11 @@ static bool write_xpm_image(const QImage &sourceImage, QIODevice *device, const
     const int w = image.width();
     const int h = image.height();
     int ncolors = 0;
-    int x, y;
 
     // build color table
-    for(y=0; y<h; y++) {
+    for (int y = 0; y < h; ++y) {
         const QRgb *yp = reinterpret_cast<const QRgb *>(image.constScanLine(y));
-        for(x=0; x<w; x++) {
+        for (int x = 0; x < w; ++x) {
             QRgb color = *(yp + x);
             const auto [it, inserted] = colorMap.try_emplace(color, ncolors);
             if (inserted)
@@ -1168,10 +1167,10 @@ static bool write_xpm_image(const QImage &sourceImage, QIODevice *device, const
 
     // write pixels, limit to 4 characters per pixel
     QByteArray line;
-    for(y=0; y<h; y++) {
+    for (int y = 0; y < h; ++y) {
         line.clear();
         const QRgb *yp = reinterpret_cast<const QRgb *>(image.constScanLine(y));
-        for(x=0; x<w; x++) {
+        for (int x = 0; x < w; ++x) {
             int color = (int)(*(yp + x));
             line.append(xpm_color_name(cpp, colorMap[color]));
         }