From f2079654cc44b19a7a90ead0721583f3429ef598 Mon Sep 17 00:00:00 2001 From: Evelynne Date: Fri, 31 Jan 2025 20:10:25 +0100 Subject: [PATCH] clean-up --- src/library/playlisttablemodel.cpp | 2 +- src/library/scanner/libraryscanner.cpp | 5 ++--- src/library/scanner/libraryscanner.h | 2 -- src/library/trackcollection.cpp | 4 ++-- src/library/trackcollection.h | 5 ----- 5 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/library/playlisttablemodel.cpp b/src/library/playlisttablemodel.cpp index 81590bd35b06..5d21d21ca1dc 100644 --- a/src/library/playlisttablemodel.cpp +++ b/src/library/playlisttablemodel.cpp @@ -185,7 +185,7 @@ void PlaylistTableModel::selectPlaylist(int playlistId) { columns[0] = LIBRARYTABLE_ID; // columns[1] = PLAYLISTTRACKSTABLE_POSITION from above - // columns[2] = PLAYLISTTRACKSTABLE_DATETIMEADDED from above + // columns[2] = PLAYLISTTRACKSTABLE_DATETIMEADDED from above columns[3] = LIBRARYTABLE_PREVIEW; columns[4] = LIBRARYTABLE_COVERART; setTable(playlistTableName, diff --git a/src/library/scanner/libraryscanner.cpp b/src/library/scanner/libraryscanner.cpp index 607810309d85..2f01d5b3d487 100644 --- a/src/library/scanner/libraryscanner.cpp +++ b/src/library/scanner/libraryscanner.cpp @@ -94,13 +94,13 @@ void updateQueryPlannerStatisticsForDatabase(const QSqlDatabase& database) { } // anonymous namespace -LibraryScanner::LibraryScanner(mixxx::DbConnectionPoolPtr pDbConnectionPool, +LibraryScanner::LibraryScanner( + mixxx::DbConnectionPoolPtr pDbConnectionPool, const UserSettingsPointer& pConfig) : m_pDbConnectionPool(std::move(pDbConnectionPool)), m_analysisDao(pConfig), m_trackDao(m_cueDao, m_playlistDao, - m_groupedPlaylistsDao, m_analysisDao, m_libraryHashDao, pConfig), @@ -173,7 +173,6 @@ void LibraryScanner::run() { m_cueDao.initialize(dbConnection); m_trackDao.initialize(dbConnection); m_playlistDao.initialize(dbConnection); - m_groupedPlaylistsDao.initialize(dbConnection); m_analysisDao.initialize(dbConnection); m_directoryDao.initialize(dbConnection); diff --git a/src/library/scanner/libraryscanner.h b/src/library/scanner/libraryscanner.h index a15c5d2b5318..9cda0d72d0cc 100644 --- a/src/library/scanner/libraryscanner.h +++ b/src/library/scanner/libraryscanner.h @@ -11,7 +11,6 @@ #include "library/dao/analysisdao.h" #include "library/dao/cuedao.h" #include "library/dao/directorydao.h" -#include "library/dao/groupedplaylistsdao.h" #include "library/dao/libraryhashdao.h" #include "library/dao/playlistdao.h" #include "library/dao/trackdao.h" @@ -105,7 +104,6 @@ class LibraryScanner : public QThread { LibraryHashDAO m_libraryHashDao; CueDAO m_cueDao; PlaylistDAO m_playlistDao; - GroupedPlaylistsDAO m_groupedPlaylistsDao; DirectoryDAO m_directoryDao; AnalysisDao m_analysisDao; TrackDAO m_trackDao; diff --git a/src/library/trackcollection.cpp b/src/library/trackcollection.cpp index a5c255c859dd..ab73a7a9940e 100644 --- a/src/library/trackcollection.cpp +++ b/src/library/trackcollection.cpp @@ -16,12 +16,12 @@ mixxx::Logger kLogger("TrackCollection"); } // anonymous namespace TrackCollection::TrackCollection( - QObject* parent, const UserSettingsPointer& pConfig) + QObject* parent, + const UserSettingsPointer& pConfig) : QObject(parent), m_analysisDao(pConfig), m_trackDao(m_cueDao, m_playlistDao, - m_groupedPlaylistsDao, m_analysisDao, m_libraryHashDao, pConfig) { diff --git a/src/library/trackcollection.h b/src/library/trackcollection.h index eec513b34104..4aef098808a4 100644 --- a/src/library/trackcollection.h +++ b/src/library/trackcollection.h @@ -60,10 +60,6 @@ class TrackCollection : public QObject, DEBUG_ASSERT_QOBJECT_THREAD_AFFINITY(this); return m_playlistDao; } - GroupedPlaylistsDAO& getGroupedPlaylistsDAO() { - DEBUG_ASSERT_QOBJECT_THREAD_AFFINITY(this); - return m_groupedPlaylistsDao; - } const DirectoryDAO& getDirectoryDAO() const { DEBUG_ASSERT_QOBJECT_THREAD_AFFINITY(this); return m_directoryDao; @@ -175,7 +171,6 @@ class TrackCollection : public QObject, QSqlDatabase m_database; PlaylistDAO m_playlistDao; - GroupedPlaylistsDAO m_groupedPlaylistsDao; CrateStorage m_crates; CueDAO m_cueDao; DirectoryDAO m_directoryDao;