diff options
author | Uwe Klotz <uklotz@mixxx.org> | 2019-09-29 14:26:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-29 14:26:06 +0200 |
commit | 95388238416f4c4042c8d2f60d39a04e9b5c8278 (patch) | |
tree | 985ddc0a6a6f1ec06cff33e6c9d4165a2b66704f /src/library/basesqltablemodel.cpp | |
parent | e83391331111f987d7dfee3f2885ac574ddd6f46 (diff) | |
parent | 85999453769063e2399a536a1f8bd815d879efd8 (diff) |
Merge pull request #2292 from ferranpujolcamins/new-signals-slots-syntax-library
New signals slots syntax in library
Diffstat (limited to 'src/library/basesqltablemodel.cpp')
-rw-r--r-- | src/library/basesqltablemodel.cpp | 37 |
1 files changed, 24 insertions, 13 deletions
diff --git a/src/library/basesqltablemodel.cpp b/src/library/basesqltablemodel.cpp index ff3d5dd923..96270efa87 100644 --- a/src/library/basesqltablemodel.cpp +++ b/src/library/basesqltablemodel.cpp @@ -2,7 +2,6 @@ #include <QtDebug> #include <QUrl> -#include <QTableView> #include "library/basesqltablemodel.h" @@ -21,6 +20,7 @@ #include "util/duration.h" #include "util/assert.h" #include "util/performancetimer.h" +#include "widget/wlibrarytableview.h" static const bool sDebug = false; @@ -44,10 +44,14 @@ BaseSqlTableModel::BaseSqlTableModel(QObject* pParent, m_bInitialized(false), m_currentSearch("") { DEBUG_ASSERT(m_pTrackCollection); - connect(&PlayerInfo::instance(), SIGNAL(trackLoaded(QString, TrackPointer)), - this, SLOT(trackLoaded(QString, TrackPointer))); - connect(&m_pTrackCollection->getTrackDAO(), SIGNAL(forceModelUpdate()), - this, SLOT(select())); + connect(&PlayerInfo::instance(), + &PlayerInfo::trackLoaded, + this, + &BaseSqlTableModel::trackLoaded); + connect(&m_pTrackCollection->getTrackDAO(), + &TrackDAO::forceModelUpdate, + this, + &BaseSqlTableModel::select); // TODO(rryan): This is a virtual function call from a constructor. trackLoaded(m_previewDeckGroup, PlayerInfo::instance().getTrackInfo(m_previewDeckGroup)); } @@ -412,8 +416,10 @@ void BaseSqlTableModel::setTable(const QString& tableName, m_tableColumns = tableColumns; if (m_trackSource) { - disconnect(m_trackSource.data(), SIGNAL(tracksChanged(QSet<TrackId>)), - this, SLOT(tracksChanged(QSet<TrackId>))); + disconnect(m_trackSource.data(), + &BaseTrackCache::tracksChanged, + this, + &BaseSqlTableModel::tracksChanged); } m_trackSource = trackSource; if (m_trackSource) { @@ -424,8 +430,11 @@ void BaseSqlTableModel::setTable(const QString& tableName, // TODO: A better fix is to have cache and trackpointers defer saving // and deleting, so those operations only take place at the top of // the call stack. - connect(m_trackSource.data(), SIGNAL(tracksChanged(QSet<TrackId>)), - this, SLOT(tracksChanged(QSet<TrackId>)), Qt::QueuedConnection); + connect(m_trackSource.data(), + &BaseTrackCache::tracksChanged, + this, + &BaseSqlTableModel::tracksChanged, + Qt::QueuedConnection); } // Build a map from the column names to their indices, used by fieldIndex() @@ -1104,7 +1113,7 @@ QMimeData* BaseSqlTableModel::mimeData(const QModelIndexList &indexes) const { } QAbstractItemDelegate* BaseSqlTableModel::delegateForColumn(const int i, QObject* pParent) { - QTableView* pTableView = qobject_cast<QTableView*>(pParent); + auto* pTableView = qobject_cast<WLibraryTableView*>(pParent); DEBUG_ASSERT(pTableView); if (i == fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_RATING)) { @@ -1117,11 +1126,13 @@ QAbstractItemDelegate* BaseSqlTableModel::delegateForColumn(const int i, QObject return new LocationDelegate(pTableView); } else if (i == fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_COVERART)) { CoverArtDelegate* pCoverDelegate = new CoverArtDelegate(pTableView); - connect(pCoverDelegate, SIGNAL(coverReadyForCell(int, int)), - this, SLOT(refreshCell(int, int))); + connect(pCoverDelegate, + &CoverArtDelegate::coverReadyForCell, + this, + &BaseSqlTableModel::refreshCell); return pCoverDelegate; } - return NULL; + return nullptr; } void BaseSqlTableModel::refreshCell(int row, int column) { |