diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2020-09-27 09:11:35 +0200 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2020-09-27 09:20:10 +0200 |
| commit | c763ea7d43218eadee74602ef9434d67c2b32f2b (patch) | |
| tree | 5678175c05f8b61482054115458f92e617f361af | |
| parent | 6822f0a7ef609f88f4a62adbf3617babaf639ceb (diff) | |
BaseSqlTableModel: Delete redundant override
| -rw-r--r-- | src/library/basesqltablemodel.cpp | 11 | ||||
| -rw-r--r-- | src/library/basesqltablemodel.h | 4 | ||||
| -rw-r--r-- | src/library/basetracktablemodel.cpp | 5 |
3 files changed, 2 insertions, 18 deletions
diff --git a/src/library/basesqltablemodel.cpp b/src/library/basesqltablemodel.cpp index 72209d5a83..116dfbaf31 100644 --- a/src/library/basesqltablemodel.cpp +++ b/src/library/basesqltablemodel.cpp @@ -617,17 +617,6 @@ QVariant BaseSqlTableModel::rawValue( return m_trackSource->data(trackId, trackSourceColumn); } -QVariant BaseSqlTableModel::roleValue( - const QModelIndex& index, - QVariant&& rawValue, - int role) const { - if (role == Qt::DisplayRole && - index.column() == fieldIndex(ColumnCache::COLUMN_PLAYLISTTRACKSTABLE_DATETIMEADDED)) { - return mixxx::localDateTimeFromUtc(mixxx::convertVariantToDateTime(rawValue)); - } - return BaseTrackTableModel::roleValue(index, std::move(rawValue), role); -} - bool BaseSqlTableModel::setTrackValueForColumn( const TrackPointer& pTrack, int column, diff --git a/src/library/basesqltablemodel.h b/src/library/basesqltablemodel.h index 9dcfb26f90..3a5e3df2b6 100644 --- a/src/library/basesqltablemodel.h +++ b/src/library/basesqltablemodel.h @@ -75,10 +75,6 @@ class BaseSqlTableModel : public BaseTrackTableModel { /////////////////////////////////////////////////////////////////////////// QVariant rawValue( const QModelIndex& index) const override; - QVariant roleValue( - const QModelIndex& index, - QVariant&& rawValue, - int role) const override; bool setTrackValueForColumn( const TrackPointer& pTrack, diff --git a/src/library/basetracktablemodel.cpp b/src/library/basetracktablemodel.cpp index 6d958f1f68..e7790b2434 100644 --- a/src/library/basetracktablemodel.cpp +++ b/src/library/basetracktablemodel.cpp @@ -500,9 +500,8 @@ QVariant BaseTrackTableModel::roleValue( return QVariant(); } return QString("(%1)").arg(rawValue.toInt()); - } else if (column == fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_DATETIMEADDED)) { - return mixxx::localDateTimeFromUtc(mixxx::convertVariantToDateTime(rawValue)); - } else if (column == fieldIndex(ColumnCache::COLUMN_PLAYLISTTRACKSTABLE_DATETIMEADDED)) { + } else if (column == fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_DATETIMEADDED) || + column == fieldIndex(ColumnCache::COLUMN_PLAYLISTTRACKSTABLE_DATETIMEADDED)) { return mixxx::localDateTimeFromUtc(mixxx::convertVariantToDateTime(rawValue)); } else if (column == fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_BPM)) { bool ok; |