Remove more naked new pointers

src/library/features/baseplaylist/baseplaylistfeature.cpp

@@ -118,7 +118,8 @@ QPointer<PlaylistTableModel> BasePlaylistFeature::getPlaylistTableModel(int pane
     }
     auto it = m_playlistTableModel.find(paneId);
     if (it == m_playlistTableModel.end() || it->isNull()) {
-        it = m_playlistTableModel.insert(paneId, constructTableModel());
+        auto pTableModel = constructTableModel();
+        it = m_playlistTableModel.insert(paneId, pTableModel.toWeakRef());
     }
     return *it;
 }

src/library/features/baseplaylist/baseplaylistfeature.h

@@ -85,7 +85,7 @@ class BasePlaylistFeature : public LibraryFeature {
     QString getValidPlaylistName() const;
 
     QPointer<PlaylistTableModel> getPlaylistTableModel(int paneId = -1);
-    virtual PlaylistTableModel* constructTableModel() = 0;
+    virtual parented_ptr<PlaylistTableModel> constructTableModel() = 0;
 
     virtual QSet<int> playlistIdsFromIndex(const QModelIndex& index) const;
     int playlistIdFromIndex(const QModelIndex& index) const;

src/library/features/browse/browsefeature.cpp

@@ -28,8 +28,7 @@ BrowseFeature::BrowseFeature(UserSettingsPointer pConfig,
         : LibraryFeature(pConfig, pLibrary, pTrackCollection, parent),
           m_browseModel(this, pTrackCollection, pRecordingManager),
           m_proxyModel(&m_browseModel),
-          m_pTrackCollection(pTrackCollection),
-          m_pLastRightClickedItem(NULL) {
+          m_pTrackCollection(pTrackCollection) {
     connect(this, SIGNAL(requestAddDir(QString)),
             parent, SLOT(slotRequestAddDir(QString)));
 
@@ -54,7 +53,8 @@ BrowseFeature::BrowseFeature(UserSettingsPointer pConfig,
     // The invisible root item of the child model
     auto pRootItem = std::make_unique<TreeItem>(this);
 
-    m_pQuickLinkItem = pRootItem->appendChild(tr("Quick Links"), QUICK_LINK_NODE);
+    m_pQuickLinkItem = parented_ptr<TreeItem>(
+            pRootItem->appendChild(tr("Quick Links"), QUICK_LINK_NODE));
 
     // Create the 'devices' shortcut
 #if defined(__WINDOWS__)
@@ -132,11 +132,11 @@ QString BrowseFeature::getSettingsName() const {
 }
 
 void BrowseFeature::slotAddQuickLink() {
-    if (!m_pLastRightClickedItem) {
+    if (!m_lastRightClickedIndex.isValid()) {
         return;
     }
 
-    QVariant vpath = m_pLastRightClickedItem->getData();
+    QVariant vpath = m_lastRightClickedIndex.data(AbstractRole::RoleData);
     QString spath = vpath.toString();
     QString name = extractNameFromPath(spath);
     m_pQuickLinkItem->appendChild(name, vpath);
@@ -145,10 +145,10 @@ void BrowseFeature::slotAddQuickLink() {
 }
 
 void BrowseFeature::slotAddToLibrary() {
-    if (!m_pLastRightClickedItem) {
+    if (!m_lastRightClickedIndex.isValid()) {
         return;
     }
-    QString spath = m_pLastRightClickedItem->getData().toString();
+    QString spath = m_lastRightClickedIndex.data(AbstractRole::RoleData).toString();
     emit(requestAddDir(spath));
 
     QMessageBox msgBox;
@@ -178,11 +178,11 @@ void BrowseFeature::slotLibraryScanFinished() {
 }
 
 void BrowseFeature::slotRemoveQuickLink() {
-    if (!m_pLastRightClickedItem) {
+    if (!m_lastRightClickedIndex.isValid()) {
         return;
     }
 
-    QString spath = m_pLastRightClickedItem->getData().toString();
+    QString spath = m_lastRightClickedIndex.data(AbstractRole::RoleData).toString();
     int index = m_quickLinkList.indexOf(spath);
 
     if (index == -1) {
@@ -260,14 +260,13 @@ void BrowseFeature::activateChild(const QModelIndex& index) {
 }
 
 void BrowseFeature::onRightClickChild(const QPoint& globalPos, QModelIndex index) {
-    TreeItem *item = static_cast<TreeItem*>(index.internalPointer());
-    m_pLastRightClickedItem = item;
+    TreeItem* item = static_cast<TreeItem*>(index.internalPointer());
+    m_lastRightClickedIndex = index;
 
-    if (!item) {
+    if (!index.isValid())
         return;
-    }
 
-    QString path = item->getData().toString();
+    QString path = index.data(AbstractRole::RoleData).toString();
 
     if (path == QUICK_LINK_NODE || path == DEVICE_NODE) {
         return;
@@ -296,6 +295,9 @@ void BrowseFeature::onRightClickChild(const QPoint& globalPos, QModelIndex index
 // This is called whenever you double click or use the triangle symbol to expand
 // the subtree. The method will read the subfolders.
 void BrowseFeature::onLazyChildExpandation(const QModelIndex& index) {
+    if (!index.isValid())
+        return;
+
     TreeItem *item = static_cast<TreeItem*>(index.internalPointer());
     if (!item) {
         return;

src/library/features/browse/browsefeature.h

@@ -77,8 +77,8 @@ class BrowseFeature : public LibraryFeature {
     QAction* m_pAddQuickLinkAction;
     QAction* m_pRemoveQuickLinkAction;
     QAction* m_pAddtoLibraryAction;
-    TreeItem* m_pLastRightClickedItem;
-    TreeItem* m_pQuickLinkItem;
+    QPersistentModelIndex m_lastRightClickedIndex;
+    parented_ptr<TreeItem> m_pQuickLinkItem;
     QStringList m_quickLinkList;
     QPersistentModelIndex m_lastClickedChild;
 

src/library/features/history/historyfeature.cpp

@@ -152,9 +152,9 @@ QModelIndex HistoryFeature::constructChildModel(int selected_id) {
     return index;
 }
 
-PlaylistTableModel* HistoryFeature::constructTableModel() {
-    return new PlaylistTableModel(this, m_pTrackCollection, 
-                                  "mixxx.db.model.setlog", true);
+parented_ptr<PlaylistTableModel> HistoryFeature::constructTableModel() {
+    return make_parented<PlaylistTableModel>(this, m_pTrackCollection, 
+            "mixxx.db.model.setlog", true);
 }
 
 QSet<int> HistoryFeature::playlistIdsFromIndex(const QModelIndex& index) const {

src/library/features/history/historyfeature.h

@@ -39,7 +39,7 @@ class HistoryFeature : public BasePlaylistFeature {
     const TreeItemModel* getConstChildModel() const override;
     void buildPlaylistList() override;
     QModelIndex constructChildModel(int selected_id);
-    PlaylistTableModel* constructTableModel() override;
+    parented_ptr<PlaylistTableModel> constructTableModel() override;
     QSet<int> playlistIdsFromIndex(const QModelIndex &index) const override;
     QModelIndex indexFromPlaylistId(int playlistId) const override;
 

src/library/features/playlist/playlistfeature.cpp

@@ -207,8 +207,9 @@ void PlaylistFeature::decorateChild(TreeItem* item, int playlist_id) {
     }
 }
 
-PlaylistTableModel* PlaylistFeature::constructTableModel() {
-    return new PlaylistTableModel(this, m_pTrackCollection, "mixxx.db.model.playlist");
+parented_ptr<PlaylistTableModel> PlaylistFeature::constructTableModel() {
+    return make_parented<PlaylistTableModel>(this, m_pTrackCollection, 
+                                             "mixxx.db.model.playlist");
 }
 
 void PlaylistFeature::slotPlaylistTableChanged(int playlistId) {

src/library/features/playlist/playlistfeature.h

@@ -41,7 +41,7 @@ class PlaylistFeature : public BasePlaylistFeature {
     const TreeItemModel* getConstChildModel() const override;
     void buildPlaylistList();
     void decorateChild(TreeItem *pChild, int playlist_id);
-    PlaylistTableModel* constructTableModel();
+    parented_ptr<PlaylistTableModel> constructTableModel();
 
   private:
     QString getRootViewHtml() const;