Create DlgTrackInfo and DlgTagFetcher only on demand

1 files changed, 12 insertions, 6 deletions

diff --git a/src/library/dlgtagfetcher.h b/src/library/dlgtagfetcher.h
index c15230cd3e..006f6ad00d 100644
--- a/src/library/dlgtagfetcher.h
+++ b/src/library/dlgtagfetcher.h
@@ -13,12 +13,13 @@
 /// Use TrackPointer to load a track into the dialog or
 /// QModelIndex along with TrackModel to enable previous and next buttons
 /// to switch tracks within the context of the TrackModel.
-class DlgTagFetcher : public QDialog,  public Ui::DlgTagFetcher {
-  Q_OBJECT
+class DlgTagFetcher : public QDialog, public Ui::DlgTagFetcher {
+    Q_OBJECT
 
   public:
     // TODO: Remove dependency on TrackModel
-    explicit DlgTagFetcher(QWidget* parent, const TrackModel* trackModel = nullptr);
+    explicit DlgTagFetcher(
+            const TrackModel* pTrackModel = nullptr);
     ~DlgTagFetcher() override = default;
 
     void init();
@@ -49,12 +50,19 @@ class DlgTagFetcher : public QDialog,  public Ui::DlgTagFetcher {
     void updateStack();
     void addDivider(const QString& text, QTreeWidget* parent) const;
 
+    const TrackModel* const m_pTrackModel;
+
     TagFetcher m_tagFetcher;
 
     TrackPointer m_track;
 
+    QModelIndex m_currentTrackIndex;
+
     struct Data {
-        Data() : m_pending(true), m_selectedResult(-1) {}
+        Data()
+                : m_pending(true),
+                  m_selectedResult(-1) {
+        }
 
         bool m_pending;
         int m_selectedResult;
@@ -68,6 +76,4 @@ class DlgTagFetcher : public QDialog,  public Ui::DlgTagFetcher {
         UnknownError,
     };
     NetworkResult m_networkResult;
-    const TrackModel* m_pTrackModel;
-    QModelIndex m_currentTrackIndex;
 };