From b7171a2b97f7671125abe6ebb8bfffd31ff3e14f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Mon, 4 Jan 2021 18:46:27 +0100 Subject: LIBRARYTABLE_LOCATION to LIBRARYTABLE_LOCATION_ID because the column holds only a reference to the track locations table. Use the enum COLUMN_TRACKLOCATIONSTABLE_LOCATION instead of COLUMN_LIBRARYTABLE_NATIVELOCATION becase it points only to the id column. Delete also enums for non existing Playlist table columns. --- src/library/dao/playlistdao.h | 3 --- src/library/dao/trackschema.h | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'src/library/dao') diff --git a/src/library/dao/playlistdao.h b/src/library/dao/playlistdao.h index 2d4fcabeb4..77d9c06156 100644 --- a/src/library/dao/playlistdao.h +++ b/src/library/dao/playlistdao.h @@ -22,9 +22,6 @@ const QString PLAYLISTTABLE_DATEMODIFIED = "date_modified"; const QString PLAYLISTTRACKSTABLE_TRACKID = "track_id"; const QString PLAYLISTTRACKSTABLE_POSITION = "position"; const QString PLAYLISTTRACKSTABLE_PLAYLISTID = "playlist_id"; -const QString PLAYLISTTRACKSTABLE_LOCATION = "location"; -const QString PLAYLISTTRACKSTABLE_ARTIST = "artist"; -const QString PLAYLISTTRACKSTABLE_TITLE = "title"; const QString PLAYLISTTRACKSTABLE_DATETIMEADDED = "pl_datetime_added"; #define AUTODJ_TABLE "Auto DJ" diff --git a/src/library/dao/trackschema.h b/src/library/dao/trackschema.h index befc626e47..4a41101f5f 100644 --- a/src/library/dao/trackschema.h +++ b/src/library/dao/trackschema.h @@ -16,7 +16,7 @@ const QString LIBRARYTABLE_COMPOSER = "composer"; const QString LIBRARYTABLE_GROUPING = "grouping"; const QString LIBRARYTABLE_TRACKNUMBER = "tracknumber"; const QString LIBRARYTABLE_FILETYPE = "filetype"; -const QString LIBRARYTABLE_LOCATION = "location"; +const QString LIBRARYTABLE_LOCATION_ID = "location"; const QString LIBRARYTABLE_COMMENT = "comment"; const QString LIBRARYTABLE_DURATION = "duration"; const QString LIBRARYTABLE_BITRATE = "bitrate"; -- cgit v1.2.3