From 8a7f32d3aa45fd1d34bbb7a704fc8aa39c334544 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 9 Aug 2019 16:52:54 +0200
Subject: [PATCH] [libcalamaresui] Polish ImageRegistry

 - do static initialization more carefully
 - float -> qreal (double) because that's what the Qt API expects,
   to reduce type-conversion warnings
 - apply current coding style
---
 src/libcalamaresui/utils/ImageRegistry.cpp | 45 +++++++++++++---------
 src/libcalamaresui/utils/ImageRegistry.h   | 23 +++++++----
 2 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/src/libcalamaresui/utils/ImageRegistry.cpp b/src/libcalamaresui/utils/ImageRegistry.cpp
index 96ea92bbb..5cffac11c 100644
--- a/src/libcalamaresui/utils/ImageRegistry.cpp
+++ b/src/libcalamaresui/utils/ImageRegistry.cpp
@@ -2,6 +2,8 @@
  *
  *   SPDX-License-Identifier: GPLv3+
  *   License-Filename: LICENSES/GPLv3+-ImageRegistry
+ * 
+ *   Copyright 2019, Adriaan de Groot <groot@kde.org>
  */
 
 /*
@@ -23,25 +25,22 @@
 
 #include "ImageRegistry.h"
 
-#include <QSvgRenderer>
 #include <QPainter>
+#include <QSvgRenderer>
 #include <qicon.h>
 
 static QHash< QString, QHash< int, QHash< qint64, QPixmap > > > s_cache;
-ImageRegistry* ImageRegistry::s_instance = 0;
 
 
 ImageRegistry*
 ImageRegistry::instance()
 {
+    static ImageRegistry* s_instance = new ImageRegistry();
     return s_instance;
 }
 
 
-ImageRegistry::ImageRegistry()
-{
-    s_instance = this;
-}
+ImageRegistry::ImageRegistry() {}
 
 
 QIcon
@@ -52,16 +51,20 @@ ImageRegistry::icon( const QString& image, CalamaresUtils::ImageMode mode )
 
 
 qint64
-ImageRegistry::cacheKey( const QSize& size, float opacity, QColor tint )
+ImageRegistry::cacheKey( const QSize& size, qreal opacity, QColor tint )
 {
-    return size.width() * 100 + size.height() * 10 + ( opacity * 100.0 ) + tint.value();
+    return size.width() * 100 + size.height() * 10 + static_cast< qint64 >( opacity * 100.0 ) + tint.value();
 }
 
 
 QPixmap
-ImageRegistry::pixmap( const QString& image, const QSize& size, CalamaresUtils::ImageMode mode, float opacity, QColor tint )
+ImageRegistry::pixmap( const QString& image,
+                       const QSize& size,
+                       CalamaresUtils::ImageMode mode,
+                       qreal opacity,
+                       QColor tint )
 {
-    Q_ASSERT( !(size.width() < 0 || size.height() < 0) );
+    Q_ASSERT( !( size.width() < 0 || size.height() < 0 ) );
     if ( size.width() < 0 || size.height() < 0 )
     {
         return QPixmap();
@@ -110,23 +113,20 @@ ImageRegistry::pixmap( const QString& image, const QSize& size, CalamaresUtils::
 
             resultImage.setAlphaChannel( p.toImage().alphaChannel() );
             p = QPixmap::fromImage( resultImage );
-       }
+        }
 
         pixmap = p;
     }
     else
+    {
         pixmap = QPixmap( image );
+    }
 
     if ( !pixmap.isNull() )
     {
-        switch ( mode )
+        if ( mode == CalamaresUtils::RoundedCorners )
         {
-            case CalamaresUtils::RoundedCorners:
-                pixmap = CalamaresUtils::createRoundedImage( pixmap, size );
-                break;
-
-            default:
-                break;
+            pixmap = CalamaresUtils::createRoundedImage( pixmap, size );
         }
 
         if ( !size.isNull() && pixmap.size() != size )
@@ -140,7 +140,9 @@ ImageRegistry::pixmap( const QString& image, const QSize& size, CalamaresUtils::
                 pixmap = pixmap.scaledToWidth( size.width(), Qt::SmoothTransformation );
             }
             else
+            {
                 pixmap = pixmap.scaled( size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation );
+            }
         }
 
         putInCache( image, size, mode, opacity, pixmap, tint );
@@ -151,7 +153,12 @@ ImageRegistry::pixmap( const QString& image, const QSize& size, CalamaresUtils::
 
 
 void
-ImageRegistry::putInCache( const QString& image, const QSize& size, CalamaresUtils::ImageMode mode, float opacity, const QPixmap& pixmap, QColor tint )
+ImageRegistry::putInCache( const QString& image,
+                           const QSize& size,
+                           CalamaresUtils::ImageMode mode,
+                           qreal opacity,
+                           const QPixmap& pixmap,
+                           QColor tint )
 {
     QHash< qint64, QPixmap > subsubcache;
     QHash< int, QHash< qint64, QPixmap > > subcache;
diff --git a/src/libcalamaresui/utils/ImageRegistry.h b/src/libcalamaresui/utils/ImageRegistry.h
index e35eaf74a..06ab45831 100644
--- a/src/libcalamaresui/utils/ImageRegistry.h
+++ b/src/libcalamaresui/utils/ImageRegistry.h
@@ -2,6 +2,8 @@
  *
  *   SPDX-License-Identifier: GPLv3+
  *   License-Filename: LICENSES/GPLv3+-ImageRegistry
+ * 
+ *   Copyright 2019, Adriaan de Groot <groot@kde.org>
  */
 
 /*
@@ -26,8 +28,8 @@
 
 #include <QPixmap>
 
-#include "utils/CalamaresUtilsGui.h"
 #include "UiDllMacro.h"
+#include "utils/CalamaresUtilsGui.h"
 
 class UIDLLEXPORT ImageRegistry
 {
@@ -37,13 +39,20 @@ public:
     explicit ImageRegistry();
 
     QIcon icon( const QString& image, CalamaresUtils::ImageMode mode = CalamaresUtils::Original );
-    QPixmap pixmap( const QString& image, const QSize& size, CalamaresUtils::ImageMode mode = CalamaresUtils::Original, float opacity = 1.0, QColor tint = QColor( 0, 0, 0, 0 ) );
+    QPixmap pixmap( const QString& image,
+                    const QSize& size,
+                    CalamaresUtils::ImageMode mode = CalamaresUtils::Original,
+                    qreal opacity = 1.0,
+                    QColor tint = QColor( 0, 0, 0, 0 ) );
 
 private:
-    qint64 cacheKey( const QSize& size, float opacity, QColor tint );
-    void putInCache( const QString& image, const QSize& size, CalamaresUtils::ImageMode mode, float opacity, const QPixmap& pixmap, QColor tint );
-
-    static ImageRegistry* s_instance;
+    qint64 cacheKey( const QSize& size, qreal opacity, QColor tint );
+    void putInCache( const QString& image,
+                     const QSize& size,
+                     CalamaresUtils::ImageMode mode,
+                     qreal opacity,
+                     const QPixmap& pixmap,
+                     QColor tint );
 };
 
-#endif // IMAGE_REGISTRY_H
+#endif  // IMAGE_REGISTRY_H