DlgFullSizeCover is no longer a singleton

9 files changed, 23 insertions, 28 deletions

diff --git a/src/dlgcoverartfullsize.cpp b/src/dlgcoverartfullsize.cpp
index 9addfae8d4..3775fb6929 100644
--- a/src/dlgcoverartfullsize.cpp
+++ b/src/dlgcoverartfullsize.cpp
@@ -2,7 +2,8 @@
 
 #include "dlgcoverartfullsize.h"
 
-DlgCoverArtFullSize::DlgCoverArtFullSize() {
+DlgCoverArtFullSize::DlgCoverArtFullSize(QWidget* parent)
+        : QDialog(parent) {
     setupUi(this);
     setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
 }
diff --git a/src/dlgcoverartfullsize.h b/src/dlgcoverartfullsize.h
index 36b6911fe7..cf63f03d8f 100644
--- a/src/dlgcoverartfullsize.h
+++ b/src/dlgcoverartfullsize.h
@@ -5,21 +5,17 @@
 
 #include "ui_dlgcoverartfullsize.h"
 #include "library/coverartcache.h"
-#include "util/singleton.h"
 
 class DlgCoverArtFullSize
         : public QDialog,
-          public Ui::DlgCoverArtFullSize,
-          public Singleton<DlgCoverArtFullSize>
+          public Ui::DlgCoverArtFullSize
 {
     Q_OBJECT
   public:
-    void init(CoverInfo info);
-
-  protected:
-    DlgCoverArtFullSize();
+    DlgCoverArtFullSize(QWidget* parent=0);
     virtual ~DlgCoverArtFullSize();
-    friend class Singleton<DlgCoverArtFullSize>;
+
+    void init(CoverInfo info);
 };
 
 #endif // DLGCOVERARTFULLSIZE_H
diff --git a/src/dlgtrackinfo.cpp b/src/dlgtrackinfo.cpp
index 11e734835c..29cc411d10 100644
--- a/src/dlgtrackinfo.cpp
+++ b/src/dlgtrackinfo.cpp
@@ -4,7 +4,6 @@
 #include <QDesktopServices>
 #include <QtDebug>
 
-#include "dlgcoverartfullsize.h"
 #include "dlgtrackinfo.h"
 #include "trackinfoobject.h"
 #include "library/coverartcache.h"
diff --git a/src/mixxx.cpp b/src/mixxx.cpp
index 52d4125b4c..8f5bc0a339 100644
--- a/src/mixxx.cpp
+++ b/src/mixxx.cpp
@@ -32,7 +32,6 @@
 #include "deck.h"
 #include "defs_urls.h"
 #include "dlgabout.h"
-#include "dlgcoverartfullsize.h"
 #include "dlgpreferences.h"
 #include "dlgdevelopertools.h"
 #include "engine/enginemaster.h"
@@ -271,7 +270,6 @@ MixxxMainWindow::MixxxMainWindow(QApplication* pApp, const CmdlineArgs& args)
 #endif
 
     CoverArtCache::create();
-    DlgCoverArtFullSize::Singleton::create();
 
     m_pLibrary = new Library(this, m_pConfig,
                              m_pRecordingManager);
@@ -538,8 +536,6 @@ MixxxMainWindow::~MixxxMainWindow() {
     qDebug() << "delete library " << qTime.elapsed();
     delete m_pLibrary;
 
-    DlgCoverArtFullSize::Singleton::destroy();
-
     // RecordingManager depends on config, engine
     qDebug() << "delete RecordingManager " << qTime.elapsed();
     delete m_pRecordingManager;
diff --git a/src/widget/wcoverart.cpp b/src/widget/wcoverart.cpp
index 6e97f9202a..082746b258 100644
--- a/src/widget/wcoverart.cpp
+++ b/src/widget/wcoverart.cpp
@@ -5,7 +5,6 @@
 #include <QIcon>
 #include <QPainter>
 
-#include "dlgcoverartfullsize.h"
 #include "wcoverart.h"
 #include "wskincolor.h"
 #include "library/coverartcache.h"
@@ -19,7 +18,8 @@ WCoverArt::WCoverArt(QWidget* parent,
           m_pMenu(new WCoverArtMenu(this)),
           m_loadedCover(m_pCoverCache->getDefaultCoverArt()),
           m_loadedCoverScaled(scaledCoverArt(m_loadedCover)),
-          m_trackDAO(pTrackCollection->getTrackDAO()) {
+          m_trackDAO(pTrackCollection->getTrackDAO()),
+          m_pDlgFullSize(new DlgCoverArtFullSize()) {
     setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
 
     connect(m_pCoverCache, SIGNAL(pixmapFound(int, QPixmap)),
@@ -32,6 +32,7 @@ WCoverArt::WCoverArt(QWidget* parent,
 
 WCoverArt::~WCoverArt() {
     delete m_pMenu;
+    delete m_pDlgFullSize;
 }
 
 void WCoverArt::setup(QDomNode node, const SkinContext& context) {
@@ -148,15 +149,14 @@ void WCoverArt::mousePressEvent(QMouseEvent* event) {
         TrackPointer pTrack = m_trackDAO.getTrack(m_lastRequestedCover.trackId);
         m_pMenu->show(event->globalPos(), m_lastRequestedCover, pTrack);
     } else if (event->button() == Qt::LeftButton) { // init/close fullsize cover
-        DlgCoverArtFullSize* dlgFullSize = DlgCoverArtFullSize::instance();
-        if (dlgFullSize->isVisible()) {
-            dlgFullSize->close();
+        if (m_pDlgFullSize->isVisible()) {
+            m_pDlgFullSize->close();
         } else {
-            dlgFullSize->init(m_lastRequestedCover);
+            m_pDlgFullSize->init(m_lastRequestedCover);
         }
     }
 }
 
 void WCoverArt::leaveEvent(QEvent*) {
-        DlgCoverArtFullSize::instance()->close();
+    m_pDlgFullSize->close();
 }
diff --git a/src/widget/wcoverart.h b/src/widget/wcoverart.h
index 88edf3f3e6..6e0fa12f42 100644
--- a/src/widget/wcoverart.h
+++ b/src/widget/wcoverart.h
@@ -6,6 +6,7 @@
 #include <QMouseEvent>
 #include <QWidget>
 
+#include "dlgcoverartfullsize.h"
 #include "trackinfoobject.h"
 #include "library/coverartcache.h"
 #include "library/trackcollection.h"
@@ -48,6 +49,7 @@ class WCoverArt : public QWidget, public WBaseWidget {
     QPixmap m_loadedCoverScaled;
     TrackDAO& m_trackDAO;
     CoverInfo m_lastRequestedCover;
+    DlgCoverArtFullSize* m_pDlgFullSize;
 };
 
 #endif // WCOVERART_H
diff --git a/src/widget/wcoverartlabel.cpp b/src/widget/wcoverartlabel.cpp
index d71fe27c70..3aeb7064e5 100644
--- a/src/widget/wcoverartlabel.cpp
+++ b/src/widget/wcoverartlabel.cpp
@@ -4,7 +4,8 @@ WCoverArtLabel::WCoverArtLabel(QWidget* parent)
         : QLabel(parent),
           m_pTrack(TrackPointer()),
           m_coverInfo(CoverInfo()),
-          m_pCoverMenu(new WCoverArtMenu(this)) {
+          m_pCoverMenu(new WCoverArtMenu(this)),
+          m_pDlgFullSize(new DlgCoverArtFullSize()) {
     setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
     setFrameShape(QFrame::Box);
     setAlignment(Qt::AlignCenter);
@@ -19,6 +20,7 @@ WCoverArtLabel::WCoverArtLabel(QWidget* parent)
 
 WCoverArtLabel::~WCoverArtLabel() {
     delete m_pCoverMenu;
+    delete m_pDlgFullSize;
 }
 
 void WCoverArtLabel::setCoverArt(TrackPointer track, CoverInfo info, QPixmap px) {
@@ -45,15 +47,14 @@ void WCoverArtLabel::mousePressEvent(QMouseEvent* event) {
     }
 
     if (event->button() == Qt::LeftButton) {
-        DlgCoverArtFullSize* dlgFullSize = DlgCoverArtFullSize::instance();
-        if (dlgFullSize->isVisible()) {
-            dlgFullSize->close();
+        if (m_pDlgFullSize->isVisible()) {
+            m_pDlgFullSize->close();
         } else {
-            dlgFullSize->init(m_coverInfo);
+            m_pDlgFullSize->init(m_coverInfo);
         }
     }
 }
 
 void WCoverArtLabel::leaveEvent(QEvent*) {
-    DlgCoverArtFullSize::instance()->close();
+    m_pDlgFullSize->close();
 }
diff --git a/src/widget/wcoverartlabel.h b/src/widget/wcoverartlabel.h
index c3440a0611..66ca5414b0 100644
--- a/src/widget/wcoverartlabel.h
+++ b/src/widget/wcoverartlabel.h
@@ -30,6 +30,7 @@ class WCoverArtLabel : public QLabel {
     TrackPointer m_pTrack;
     CoverInfo m_coverInfo;
     WCoverArtMenu* m_pCoverMenu;
+    DlgCoverArtFullSize* m_pDlgFullSize;
 };
 
 #endif // WCOVERARTLABEL_H
diff --git a/src/widget/wcoverartmenu.cpp b/src/widget/wcoverartmenu.cpp
index f7724aa40c..e27145affa 100644
--- a/src/widget/wcoverartmenu.cpp
+++ b/src/widget/wcoverartmenu.cpp
@@ -2,7 +2,6 @@
 #include <QIcon>
 #include <QStringBuilder>
 
-#include "dlgcoverartfullsize.h"
 #include "wcoverartmenu.h"
 #include "library/coverartcache.h"
 #include "library/dao/coverartdao.h"