Merge pull request #3134 from uklotzde/2.3_basesqltablemodel

BaseSqlTableModel: Delete redundant override

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;