Don't pass QPointer around

2 files changed, 7 insertions, 4 deletions

diff --git a/src/library/library.cpp b/src/library/library.cpp
index ccb416391e..d15c409787 100644
--- a/src/library/library.cpp
+++ b/src/library/library.cpp
@@ -211,6 +211,11 @@ Library::~Library() {
     // Empty but required due to forward declarations in header file!
 }
 
+TrackCollectionManager* Library::trackCollections() const {
+    // Cannot be implimented inline due to forward declarations
+    return m_pTrackCollectionManager;
+}
+
 void Library::stopPendingTasks() {
     if (m_pAnalysisFeature) {
         m_pAnalysisFeature->stopAnalysis();
diff --git a/src/library/library.h b/src/library/library.h
index a142d5401f..1554b6ca04 100644
--- a/src/library/library.h
+++ b/src/library/library.h
@@ -52,9 +52,7 @@ class Library: public QObject {
         return m_pDbConnectionPool;
     }
 
-    const QPointer<TrackCollectionManager>& trackCollections() const {
-        return m_pTrackCollectionManager;
-    }
+    TrackCollectionManager* trackCollections() const;
 
     // Deprecated: Obtain directly from TrackCollectionManager
     TrackCollection& trackCollection();
@@ -130,7 +128,7 @@ class Library: public QObject {
     // The Mixxx database connection pool
     const mixxx::DbConnectionPoolPtr m_pDbConnectionPool;
 
-    QPointer<TrackCollectionManager> m_pTrackCollectionManager;
+    const QPointer<TrackCollectionManager> m_pTrackCollectionManager;
 
     SidebarModel* m_pSidebarModel;