Skip to content

Commit

Permalink
clean-up
Browse files Browse the repository at this point in the history
  • Loading branch information
evelynnev committed Jan 31, 2025
1 parent 50d2097 commit f207965
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 13 deletions.
2 changes: 1 addition & 1 deletion src/library/playlisttablemodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
5 changes: 2 additions & 3 deletions src/library/scanner/libraryscanner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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,

Check failure on line 102 in src/library/scanner/libraryscanner.cpp

View workflow job for this annotation

GitHub Actions / Ubuntu 24.04

no matching function for call to ‘TrackDAO::TrackDAO(CueDAO&, PlaylistDAO&, AnalysisDao&, LibraryHashDAO&, const UserSettingsPointer&)’

Check failure on line 102 in src/library/scanner/libraryscanner.cpp

View workflow job for this annotation

GitHub Actions / Ubuntu 24.04

no matching function for call to ‘TrackDAO::TrackDAO(CueDAO&, PlaylistDAO&, AnalysisDao&, LibraryHashDAO&, const UserSettingsPointer&)’

Check failure on line 102 in src/library/scanner/libraryscanner.cpp

View workflow job for this annotation

GitHub Actions / Windows 2019 (MSVC)

'TrackDAO::TrackDAO': no overloaded function takes 5 arguments

Check failure on line 102 in src/library/scanner/libraryscanner.cpp

View workflow job for this annotation

GitHub Actions / Windows 2019 (MSVC)

'TrackDAO::TrackDAO': no overloaded function takes 5 arguments

Check failure on line 102 in src/library/scanner/libraryscanner.cpp

View workflow job for this annotation

GitHub Actions / coverage

no matching function for call to ‘TrackDAO::TrackDAO(CueDAO&, PlaylistDAO&, AnalysisDao&, LibraryHashDAO&, const UserSettingsPointer&)’

Check failure on line 102 in src/library/scanner/libraryscanner.cpp

View workflow job for this annotation

GitHub Actions / clazy

no matching constructor for initialization of 'TrackDAO'

Check failure on line 102 in src/library/scanner/libraryscanner.cpp

View workflow job for this annotation

GitHub Actions / coverage

no matching function for call to ‘TrackDAO::TrackDAO(CueDAO&, PlaylistDAO&, AnalysisDao&, LibraryHashDAO&, const UserSettingsPointer&)’

Check failure on line 102 in src/library/scanner/libraryscanner.cpp

View workflow job for this annotation

GitHub Actions / clazy

no matching constructor for initialization of 'TrackDAO'
m_playlistDao,
m_groupedPlaylistsDao,
m_analysisDao,
m_libraryHashDao,
pConfig),
Expand Down Expand Up @@ -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);

Expand Down
2 changes: 0 additions & 2 deletions src/library/scanner/libraryscanner.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/library/trackcollection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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,

Check failure on line 23 in src/library/trackcollection.cpp

View workflow job for this annotation

GitHub Actions / coverage

no matching function for call to ‘TrackDAO::TrackDAO(CueDAO&, PlaylistDAO&, AnalysisDao&, LibraryHashDAO&, const UserSettingsPointer&)’

Check failure on line 23 in src/library/trackcollection.cpp

View workflow job for this annotation

GitHub Actions / clazy

no matching constructor for initialization of 'TrackDAO'

Check failure on line 23 in src/library/trackcollection.cpp

View workflow job for this annotation

GitHub Actions / coverage

no matching function for call to ‘TrackDAO::TrackDAO(CueDAO&, PlaylistDAO&, AnalysisDao&, LibraryHashDAO&, const UserSettingsPointer&)’

Check failure on line 23 in src/library/trackcollection.cpp

View workflow job for this annotation

GitHub Actions / clazy

no matching constructor for initialization of 'TrackDAO'
m_playlistDao,
m_groupedPlaylistsDao,
m_analysisDao,
m_libraryHashDao,
pConfig) {
Expand Down
5 changes: 0 additions & 5 deletions src/library/trackcollection.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit f207965

Please sign in to comment.