albumart-qt: Resolve Qt deprecation warnings

Author: radioactiveman

src/albumart-qt/albumart.cc

@@ -45,12 +45,20 @@ class AlbumArtQt : public GeneralPlugin {
 
 class ArtLabel : public QLabel {
 public:
-    ArtLabel (QWidget * parent = 0, Qt::WindowFlags f = 0) : QLabel(parent, f)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+    ArtLabel (QWidget * parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags()) : QLabel (parent, f)
+#else
+    ArtLabel (QWidget * parent = nullptr, Qt::WindowFlags f = 0) : QLabel (parent, f)
+#endif
     {
         init ();
     }
 
-    ArtLabel (const QString & text, QWidget * parent = 0, Qt::WindowFlags f = 0) : QLabel (text, parent, f)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+    ArtLabel (const QString & text, QWidget * parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags()) : QLabel (text, parent, f)
+#else
+    ArtLabel (const QString & text, QWidget * parent = nullptr, Qt::WindowFlags f = 0) : QLabel (text, parent, f)
+#endif
     {
         init ();
     }
@@ -74,14 +82,24 @@ class ArtLabel : public QLabel {
     virtual void resizeEvent (QResizeEvent * event)
     {
         QLabel::resizeEvent (event);
-        const QPixmap * pm = pixmap ();
 
-        if ( ! origPixmap.isNull () && pm && ! pm->isNull () &&
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
+        QPixmap pm = pixmap (Qt::ReturnByValue);
+        if (! origPixmap.isNull () && ! pm.isNull () &&
+                (size ().width () <= origSize.width () + MARGIN ||
+                 size ().height () <= origSize.height () + MARGIN ||
+                 pm.size ().width () != origSize.width () ||
+                 pm.size ().height () != origSize.height ()))
+            drawArt ();
+#else
+        const QPixmap * pm = pixmap ();
+        if (! origPixmap.isNull () && pm && ! pm->isNull () &&
                 (size ().width () <= origSize.width () + MARGIN ||
                  size ().height () <= origSize.height () + MARGIN ||
                  pm->size ().width () != origSize.width () ||
                  pm->size ().height () != origSize.height ()))
             drawArt ();
+#endif
     }
 
 private:
@@ -126,7 +144,7 @@ class ArtLabel : public QLabel {
         }
 
 #ifdef Q_OS_MAC
-	repaint();
+        repaint();
 #endif
     }
 };