[vlc-commits] [Git][videolan/vlc][master] 2 commits: qt: use `QByteArrayLiteral` in various models
Steve Lhomme (@robUx4)
gitlab at videolan.org
Fri Jul 17 06:51:03 UTC 2026
Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
34c55bae by Fatih Uzunoglu at 2026-07-17T06:06:24+00:00
qt: use `QByteArrayLiteral` in various models
Particularly in `QAbstractItemModel::roleNames()`,
and `MLBaseModel::nameToCriteria()`.
- - - - -
fd4be126 by Fatih Uzunoglu at 2026-07-17T06:06:24+00:00
qt: use `QStringLiteral` in `NetworkBaseModel::artworkFallbackForType()`
- - - - -
29 changed files:
- modules/gui/qt/dialogs/dialogs/dialogmodel.cpp
- modules/gui/qt/dialogs/toolbar/controlbar_profile_model.cpp
- modules/gui/qt/maininterface/navigationmodel.cpp
- modules/gui/qt/medialibrary/mlalbummodel.cpp
- modules/gui/qt/medialibrary/mlartistmodel.cpp
- modules/gui/qt/medialibrary/mlaudiomodel.cpp
- modules/gui/qt/medialibrary/mlbookmarkmodel.cpp
- modules/gui/qt/medialibrary/mlfoldersmodel.cpp
- modules/gui/qt/medialibrary/mlgenremodel.cpp
- modules/gui/qt/medialibrary/mlmediamodel.cpp
- modules/gui/qt/medialibrary/mlplaylistlistmodel.cpp
- modules/gui/qt/medialibrary/mlplaylistmodel.cpp
- modules/gui/qt/medialibrary/mlrecentmediamodel.cpp
- modules/gui/qt/medialibrary/mlurlmodel.cpp
- modules/gui/qt/medialibrary/mlvideofoldersmodel.cpp
- modules/gui/qt/medialibrary/mlvideogroupsmodel.cpp
- modules/gui/qt/medialibrary/mlvideomodel.cpp
- modules/gui/qt/network/addonsmodel.cpp
- modules/gui/qt/network/networkbasemodel.cpp
- modules/gui/qt/network/networkdevicemodel.cpp
- modules/gui/qt/network/networkmediamodel.cpp
- modules/gui/qt/network/networksourcesmodel.cpp
- modules/gui/qt/network/standardpathmodel.cpp
- modules/gui/qt/player/control_list_model.cpp
- modules/gui/qt/player/input_models.cpp
- modules/gui/qt/playlist/playlist_model.cpp
- modules/gui/qt/util/audio_device_model.cpp
- modules/gui/qt/util/renderer_manager.cpp
- modules/gui/qt/util/varchoicemodel.cpp
Changes:
=====================================
modules/gui/qt/dialogs/dialogs/dialogmodel.cpp
=====================================
@@ -83,8 +83,8 @@ QHash<int, QByteArray> DialogErrorModel::roleNames() const /* override */
{
return
{
- { DialogErrorModel::DIALOG_TITLE, "title" },
- { DialogErrorModel::DIALOG_TEXT, "text" }
+ { DialogErrorModel::DIALOG_TITLE, QByteArrayLiteral("title") },
+ { DialogErrorModel::DIALOG_TEXT, QByteArrayLiteral("text") }
};
}
=====================================
modules/gui/qt/dialogs/toolbar/controlbar_profile_model.cpp
=====================================
@@ -590,10 +590,10 @@ QHash<int, QByteArray> ControlbarProfileModel::roleNames() const
{
return {
{
- Qt::DisplayRole, "name"
+ Qt::DisplayRole, QByteArrayLiteral("name")
},
{
- MODEL_ROLE, "model"
+ MODEL_ROLE, QByteArrayLiteral("model")
}
};
}
=====================================
modules/gui/qt/maininterface/navigationmodel.cpp
=====================================
@@ -387,12 +387,12 @@ NavigationModel::~NavigationModel()
QHash<int,QByteArray> NavigationModel::roleNames() const
{
return {
- {TITLE, "title" },
- {URI, "uri" },
- {DEPTH, "depth" },
- {ICON, "icon"},
- {EXPANDABLE, "expandable" },
- {EXPANDED, "expanded" },
+ {TITLE, QByteArrayLiteral("title") },
+ {URI, QByteArrayLiteral("uri") },
+ {DEPTH, QByteArrayLiteral("depth") },
+ {ICON, QByteArrayLiteral("icon") },
+ {EXPANDABLE, QByteArrayLiteral("expandable") },
+ {EXPANDED, QByteArrayLiteral("expanded") },
};
}
=====================================
modules/gui/qt/medialibrary/mlalbummodel.cpp
=====================================
@@ -29,28 +29,28 @@ MLAlbumModel::MLAlbumModel(QObject *parent)
QHash<int, QByteArray> MLAlbumModel::roleNames() const
{
return {
- {ALBUM_ID,"id"},
- {ALBUM_TITLE, "title"},
- {ALBUM_RELEASE_YEAR, "release_year"},
- {ALBUM_SHORT_SUMMARY, "shortsummary"},
- {ALBUM_COVER, "cover"},
- {ALBUM_MAIN_ARTIST, "main_artist"},
- {ALBUM_NB_TRACKS, "nb_tracks"},
- {ALBUM_DURATION, "duration"},
- {ALBUM_TITLE_FIRST_SYMBOL, "title_first_symbol"},
- {ALBUM_MAIN_ARTIST_FIRST_SYMBOL, "main_artist_first_symbol"}
+ {ALBUM_ID, QByteArrayLiteral("id")},
+ {ALBUM_TITLE, QByteArrayLiteral("title")},
+ {ALBUM_RELEASE_YEAR, QByteArrayLiteral("release_year")},
+ {ALBUM_SHORT_SUMMARY, QByteArrayLiteral("shortsummary")},
+ {ALBUM_COVER, QByteArrayLiteral("cover")},
+ {ALBUM_MAIN_ARTIST, QByteArrayLiteral("main_artist")},
+ {ALBUM_NB_TRACKS, QByteArrayLiteral("nb_tracks")},
+ {ALBUM_DURATION, QByteArrayLiteral("duration")},
+ {ALBUM_TITLE_FIRST_SYMBOL, QByteArrayLiteral("title_first_symbol")},
+ {ALBUM_MAIN_ARTIST_FIRST_SYMBOL, QByteArrayLiteral("main_artist_first_symbol")}
};
}
vlc_ml_sorting_criteria_t MLAlbumModel::nameToCriteria(QByteArray name) const
{
return QHash<QByteArray, vlc_ml_sorting_criteria_t> {
- {"id", VLC_ML_SORTING_DEFAULT},
- {"title", VLC_ML_SORTING_ALPHA},
- {"release_year", VLC_ML_SORTING_RELEASEDATE},
- {"main_artist", VLC_ML_SORTING_ARTIST},
+ {QByteArrayLiteral("id"), VLC_ML_SORTING_DEFAULT},
+ {QByteArrayLiteral("title"), VLC_ML_SORTING_ALPHA},
+ {QByteArrayLiteral("release_year"), VLC_ML_SORTING_RELEASEDATE},
+ {QByteArrayLiteral("main_artist"), VLC_ML_SORTING_ARTIST},
// {"nb_tracks"},
- {"duration", VLC_ML_SORTING_DURATION},
+ {QByteArrayLiteral("duration"), VLC_ML_SORTING_DURATION},
}.value(name, VLC_ML_SORTING_DEFAULT);
}
=====================================
modules/gui/qt/medialibrary/mlartistmodel.cpp
=====================================
@@ -50,20 +50,20 @@ QVariant MLArtistModel::itemRoleData(const MLItem *item, const int role) const
QHash<int, QByteArray> MLArtistModel::roleNames() const
{
return {
- { ARTIST_ID, "id" },
- { ARTIST_NAME, "name" },
- { ARTIST_SHORT_BIO, "short_bio" },
- { ARTIST_COVER, "cover" },
- { ARTIST_NB_ALBUMS, "nb_albums" },
- { ARTIST_NB_TRACKS, "nb_tracks" }
+ { ARTIST_ID, QByteArrayLiteral("id") },
+ { ARTIST_NAME, QByteArrayLiteral("name") },
+ { ARTIST_SHORT_BIO, QByteArrayLiteral("short_bio") },
+ { ARTIST_COVER, QByteArrayLiteral("cover") },
+ { ARTIST_NB_ALBUMS, QByteArrayLiteral("nb_albums") },
+ { ARTIST_NB_TRACKS, QByteArrayLiteral("nb_tracks") }
};
}
vlc_ml_sorting_criteria_t MLArtistModel::nameToCriteria(QByteArray name) const
{
return QHash<QByteArray, vlc_ml_sorting_criteria_t> {
- {"name", VLC_ML_SORTING_ALPHA},
- {"nb_tracks", VLC_ML_SORTING_TRACKNUMBER},
+ {QByteArrayLiteral("name"), VLC_ML_SORTING_ALPHA},
+ {QByteArrayLiteral("nb_tracks"), VLC_ML_SORTING_TRACKNUMBER},
}.value(name, VLC_ML_SORTING_DEFAULT);
}
=====================================
modules/gui/qt/medialibrary/mlaudiomodel.cpp
=====================================
@@ -60,15 +60,15 @@ QHash<int, QByteArray> MLAudioModel::roleNames() const
QHash<int, QByteArray> hash = MLMediaModel::roleNames();
hash.insert({
- {AUDIO_COVER, "cover"}, // TODO: remove (a similar roleName already "small_cover")
- {AUDIO_TRACK_NUMBER, "track_number"},
- {AUDIO_DISC_NUMBER, "disc_number"},
- {AUDIO_ARTIST, "main_artist"},
- {AUDIO_ARTIST_FIRST_SYMBOL, "main_artist_first_symbol"},
- {AUDIO_ALBUM, "album_title"},
- {AUDIO_ALBUM_FIRST_SYMBOL, "album_title_first_symbol"},
- {AUDIO_ALBUM_ID, "album_id"},
- {AUDIO_ALBUM_ID_SERIALIZED, "album_id_serialized"},
+ {AUDIO_COVER, QByteArrayLiteral("cover")}, // TODO: remove (a similar roleName already "small_cover")
+ {AUDIO_TRACK_NUMBER, QByteArrayLiteral("track_number")},
+ {AUDIO_DISC_NUMBER, QByteArrayLiteral("disc_number")},
+ {AUDIO_ARTIST, QByteArrayLiteral("main_artist")},
+ {AUDIO_ARTIST_FIRST_SYMBOL, QByteArrayLiteral("main_artist_first_symbol")},
+ {AUDIO_ALBUM, QByteArrayLiteral("album_title")},
+ {AUDIO_ALBUM_FIRST_SYMBOL, QByteArrayLiteral("album_title_first_symbol")},
+ {AUDIO_ALBUM_ID, QByteArrayLiteral("album_id")},
+ {AUDIO_ALBUM_ID_SERIALIZED, QByteArrayLiteral("album_id_serialized")},
});
return hash;
@@ -77,13 +77,13 @@ QHash<int, QByteArray> MLAudioModel::roleNames() const
vlc_ml_sorting_criteria_t MLAudioModel::nameToCriteria(QByteArray name) const
{
return QHash<QByteArray, vlc_ml_sorting_criteria_t> {
- {"id", VLC_ML_SORTING_DEFAULT},
- {"title", VLC_ML_SORTING_ALPHA},
- {"album_title", VLC_ML_SORTING_ALBUM},
- {"track_number", VLC_ML_SORTING_TRACKNUMBER},
- {"release_year", VLC_ML_SORTING_RELEASEDATE},
- {"main_artist", VLC_ML_SORTING_ARTIST},
- {"duration", VLC_ML_SORTING_DURATION},
+ {QByteArrayLiteral("id"), VLC_ML_SORTING_DEFAULT},
+ {QByteArrayLiteral("title"), VLC_ML_SORTING_ALPHA},
+ {QByteArrayLiteral("album_title"), VLC_ML_SORTING_ALBUM},
+ {QByteArrayLiteral("track_number"), VLC_ML_SORTING_TRACKNUMBER},
+ {QByteArrayLiteral("release_year"), VLC_ML_SORTING_RELEASEDATE},
+ {QByteArrayLiteral("main_artist"), VLC_ML_SORTING_ARTIST},
+ {QByteArrayLiteral("duration"), VLC_ML_SORTING_DURATION},
}.value(name, VLC_ML_SORTING_DEFAULT);
}
=====================================
modules/gui/qt/medialibrary/mlbookmarkmodel.cpp
=====================================
@@ -147,10 +147,10 @@ bool MLBookmarkModel::setData(const QModelIndex &index, const QVariant &value, i
QHash<int, QByteArray> MLBookmarkModel::roleNames() const{
return QHash<int, QByteArray>{
- {BookmarkRoles::NameRole, "name"},
- {BookmarkRoles::TimeRole, "time"},
- {BookmarkRoles::PositionRole, "position"},
- {BookmarkRoles::DescriptionRole, "description"}
+ {BookmarkRoles::NameRole, QByteArrayLiteral("name")},
+ {BookmarkRoles::TimeRole, QByteArrayLiteral("time")},
+ {BookmarkRoles::PositionRole, QByteArrayLiteral("position")},
+ {BookmarkRoles::DescriptionRole, QByteArrayLiteral("description")}
};
}
=====================================
modules/gui/qt/medialibrary/mlfoldersmodel.cpp
=====================================
@@ -92,9 +92,9 @@ QVariant MLFoldersBaseModel::data( const QModelIndex &index ,
QHash<int, QByteArray> MLFoldersBaseModel::roleNames() const
{
return {
- {DisplayUrl, "display_url"},
- {Banned, "banned"},
- {MRL, "url"}
+ {DisplayUrl, QByteArrayLiteral("display_url")},
+ {Banned, QByteArrayLiteral("banned")},
+ {MRL, QByteArrayLiteral("url")}
};
}
=====================================
modules/gui/qt/medialibrary/mlgenremodel.cpp
=====================================
@@ -69,13 +69,13 @@ QVariant MLGenreModel::itemRoleData(const MLItem *item, const int role) const
QHash<int, QByteArray> MLGenreModel::roleNames() const
{
return {
- { GENRE_ID, "id" },
- { GENRE_NAME, "name" },
- { GENRE_NB_TRACKS, "nb_tracks" },
- { GENRE_ARTISTS, "artists" },
- { GENRE_TRACKS, "tracks" },
- { GENRE_ALBUMS, "albums" },
- { GENRE_COVER, "cover" }
+ { GENRE_ID, QByteArrayLiteral("id") },
+ { GENRE_NAME, QByteArrayLiteral("name") },
+ { GENRE_NB_TRACKS, QByteArrayLiteral("nb_tracks") },
+ { GENRE_ARTISTS, QByteArrayLiteral("artists") },
+ { GENRE_TRACKS, QByteArrayLiteral("tracks") },
+ { GENRE_ALBUMS, QByteArrayLiteral("albums") },
+ { GENRE_COVER, QByteArrayLiteral("cover") }
};
}
@@ -120,7 +120,7 @@ void MLGenreModel::onVlcMlEvent(const MLEvent &event)
vlc_ml_sorting_criteria_t MLGenreModel::nameToCriteria(QByteArray name) const
{
return QHash<QByteArray, vlc_ml_sorting_criteria_t> {
- {"name", VLC_ML_SORTING_ALPHA},
+ {QByteArrayLiteral("name"), VLC_ML_SORTING_ALPHA},
}.value(name, VLC_ML_SORTING_DEFAULT);
}
=====================================
modules/gui/qt/medialibrary/mlmediamodel.cpp
=====================================
@@ -109,29 +109,29 @@ void MLMediaModel::deleteFileFromSource(const QModelIndex &index)
vlc_ml_sorting_criteria_t MLMediaModel::nameToCriteria(QByteArray name) const
{
return QHash<QByteArray, vlc_ml_sorting_criteria_t> {
- {"title", VLC_ML_SORTING_ALPHA},
- {"duration", VLC_ML_SORTING_DURATION},
- {"insertion", VLC_ML_SORTING_INSERTIONDATE},
+ {QByteArrayLiteral("title"), VLC_ML_SORTING_ALPHA},
+ {QByteArrayLiteral("duration"), VLC_ML_SORTING_DURATION},
+ {QByteArrayLiteral("insertion"), VLC_ML_SORTING_INSERTIONDATE},
}.value(name, VLC_ML_SORTING_DEFAULT);
}
QHash<int, QByteArray> MLMediaModel::roleNames() const
{
return {
- {MEDIA_ID, "id"},
- {MEDIA_TITLE, "title"},
- {MEDIA_TITLE_FIRST_SYMBOL, "title_first_symbol"},
- {MEDIA_FILENAME, "fileName"},
- {MEDIA_SMALL_COVER, "small_cover"},
- {MEDIA_DURATION, "duration"},
- {MEDIA_MRL, "mrl"},
- {MEDIA_IS_VIDEO, "isVideo"},
- {MEDIA_IS_FAVORITE, "isFavorite"},
- {MEDIA_IS_LOCAL, "isLocal"},
- {MEDIA_PROGRESS, "progress"},
- {MEDIA_PLAYCOUNT, "playcount"},
- {MEDIA_LAST_PLAYED_DATE, "last_played_date"},
- {MEDIA_IS_DELETABLE_FILE, "isDeletableFile"},
+ {MEDIA_ID, QByteArrayLiteral("id")},
+ {MEDIA_TITLE, QByteArrayLiteral("title")},
+ {MEDIA_TITLE_FIRST_SYMBOL, QByteArrayLiteral("title_first_symbol")},
+ {MEDIA_FILENAME, QByteArrayLiteral("fileName")},
+ {MEDIA_SMALL_COVER, QByteArrayLiteral("small_cover")},
+ {MEDIA_DURATION, QByteArrayLiteral("duration")},
+ {MEDIA_MRL, QByteArrayLiteral("mrl")},
+ {MEDIA_IS_VIDEO, QByteArrayLiteral("isVideo")},
+ {MEDIA_IS_FAVORITE, QByteArrayLiteral("isFavorite")},
+ {MEDIA_IS_LOCAL, QByteArrayLiteral("isLocal")},
+ {MEDIA_PROGRESS, QByteArrayLiteral("progress")},
+ {MEDIA_PLAYCOUNT, QByteArrayLiteral("playcount")},
+ {MEDIA_LAST_PLAYED_DATE, QByteArrayLiteral("last_played_date")},
+ {MEDIA_IS_DELETABLE_FILE, QByteArrayLiteral("isDeletableFile")},
};
}
=====================================
modules/gui/qt/medialibrary/mlplaylistlistmodel.cpp
=====================================
@@ -268,14 +268,14 @@ QHash<int, QByteArray> MLPlaylistListModel::roleNames() const /* override */
{
return
{
- { PLAYLIST_ID, "id" },
- { PLAYLIST_NAME, "name" },
- { PLAYLIST_THUMBNAIL, "thumbnail" },
- { PLAYLIST_DURATION, "duration" },
- { PLAYLIST_COUNT, "count" },
- { PLAYLIST_NB_AUDIO, "nb_audio" },
- { PLAYLIST_NB_VIDEO, "nb_video" },
- { PLAYLIST_NB_UNKNOWN,"nb_unknown"}
+ { PLAYLIST_ID, QByteArrayLiteral("id") },
+ { PLAYLIST_NAME, QByteArrayLiteral("name") },
+ { PLAYLIST_THUMBNAIL, QByteArrayLiteral("thumbnail") },
+ { PLAYLIST_DURATION, QByteArrayLiteral("duration") },
+ { PLAYLIST_COUNT, QByteArrayLiteral("count") },
+ { PLAYLIST_NB_AUDIO, QByteArrayLiteral("nb_audio") },
+ { PLAYLIST_NB_VIDEO, QByteArrayLiteral("nb_video") },
+ { PLAYLIST_NB_UNKNOWN,QByteArrayLiteral("nb_unknown") }
};
}
=====================================
modules/gui/qt/medialibrary/mlplaylistmodel.cpp
=====================================
@@ -294,20 +294,20 @@ QHash<int, QByteArray> MLPlaylistModel::roleNames() const /* override */
{
return
{
- { MEDIA_ID, "id" },
- { MEDIA_IS_NEW, "isNew" },
- { MEDIA_TITLE, "title" },
- { MEDIA_THUMBNAIL, "thumbnail" },
- { MEDIA_DURATION, "duration" },
- { MEDIA_PROGRESS, "progress" },
- { MEDIA_PLAYCOUNT, "playcount" },
- { MEDIA_RESOLUTION, "resolution_name" },
- { MEDIA_CHANNEL, "channel" },
- { MEDIA_MRL, "mrl" },
- { MEDIA_DISPLAY_MRL, "display_mrl" },
- { MEDIA_AUDIO_TRACK, "audioDesc" },
- { MEDIA_VIDEO_TRACK, "videoDesc" },
- { MEDIA_TITLE_FIRST_SYMBOL, "title_first_symbol" }
+ { MEDIA_ID, QByteArrayLiteral("id") },
+ { MEDIA_IS_NEW, QByteArrayLiteral("isNew") },
+ { MEDIA_TITLE, QByteArrayLiteral("title") },
+ { MEDIA_THUMBNAIL, QByteArrayLiteral("thumbnail") },
+ { MEDIA_DURATION, QByteArrayLiteral("duration") },
+ { MEDIA_PROGRESS, QByteArrayLiteral("progress") },
+ { MEDIA_PLAYCOUNT, QByteArrayLiteral("playcount") },
+ { MEDIA_RESOLUTION, QByteArrayLiteral("resolution_name") },
+ { MEDIA_CHANNEL, QByteArrayLiteral("channel") },
+ { MEDIA_MRL, QByteArrayLiteral("mrl") },
+ { MEDIA_DISPLAY_MRL, QByteArrayLiteral("display_mrl") },
+ { MEDIA_AUDIO_TRACK, QByteArrayLiteral("audioDesc") },
+ { MEDIA_VIDEO_TRACK, QByteArrayLiteral("videoDesc") },
+ { MEDIA_TITLE_FIRST_SYMBOL, QByteArrayLiteral("title_first_symbol") }
};
}
@@ -370,10 +370,10 @@ QVariant MLPlaylistModel::itemRoleData(const MLItem *item, int role) const /* ov
vlc_ml_sorting_criteria_t MLPlaylistModel::nameToCriteria(QByteArray name) const /* override */
{
return QHash<QByteArray, vlc_ml_sorting_criteria_t> {
- {"id", VLC_ML_SORTING_DEFAULT},
- {"title", VLC_ML_SORTING_ALPHA},
- {"duration", VLC_ML_SORTING_DURATION},
- {"playcount", VLC_ML_SORTING_PLAYCOUNT},
+ {QByteArrayLiteral("id"), VLC_ML_SORTING_DEFAULT},
+ {QByteArrayLiteral("title"), VLC_ML_SORTING_ALPHA},
+ {QByteArrayLiteral("duration"), VLC_ML_SORTING_DURATION},
+ {QByteArrayLiteral("playcount"), VLC_ML_SORTING_PLAYCOUNT},
}.value(name, VLC_ML_SORTING_DEFAULT);
}
=====================================
modules/gui/qt/medialibrary/mlrecentmediamodel.cpp
=====================================
@@ -44,7 +44,7 @@ QHash<int, QByteArray> MLRecentMediaModel::roleNames() const
QHash<int, QByteArray> hash = MLMediaModel::roleNames();
hash.insert({
- { RECENT_MEDIA_URL, "url" },
+ { RECENT_MEDIA_URL, QByteArrayLiteral("url") },
});
return hash;
=====================================
modules/gui/qt/medialibrary/mlurlmodel.cpp
=====================================
@@ -50,10 +50,10 @@ QVariant MLUrlModel::itemRoleData(const MLItem *item, int role) const
QHash<int, QByteArray> MLUrlModel::roleNames() const
{
return {
- { URL_ID, "id" },
- { URL_URL, "url" },
- { URL_LAST_PLAYED_DATE, "last_played_date" },
- { URL_IS_DELETABLE, "isDeletable" },
+ { URL_ID, QByteArrayLiteral("id") },
+ { URL_URL, QByteArrayLiteral("url") },
+ { URL_LAST_PLAYED_DATE, QByteArrayLiteral("last_played_date") },
+ { URL_IS_DELETABLE, QByteArrayLiteral("isDeletable") },
};
}
=====================================
modules/gui/qt/medialibrary/mlvideofoldersmodel.cpp
=====================================
@@ -51,13 +51,13 @@ static const int MLVIDEOFOLDERSMODEL_COVER_HEIGHT = 162 * 3;
QHash<int, QByteArray> MLVideoFoldersModel::roleNames() const /* override */
{
return {
- { FOLDER_ID, "id" },
- { FOLDER_TITLE, "title" },
- { FOLDER_TITLE_FIRST_SYMBOL, "title_first_symbol" },
- { FOLDER_THUMBNAIL, "thumbnail" },
- { FOLDER_DURATION, "duration" },
- { FOLDER_COUNT, "count" },
- { FOLDER_NB_VIDEOS, "nb_videos" },
+ { FOLDER_ID, QByteArrayLiteral("id") },
+ { FOLDER_TITLE, QByteArrayLiteral("title") },
+ { FOLDER_TITLE_FIRST_SYMBOL, QByteArrayLiteral("title_first_symbol") },
+ { FOLDER_THUMBNAIL, QByteArrayLiteral("thumbnail") },
+ { FOLDER_DURATION, QByteArrayLiteral("duration") },
+ { FOLDER_COUNT, QByteArrayLiteral("count") },
+ { FOLDER_NB_VIDEOS, QByteArrayLiteral("nb_videos") },
};
}
@@ -101,8 +101,8 @@ QVariant MLVideoFoldersModel::itemRoleData(const MLItem * item, const int role)
vlc_ml_sorting_criteria_t MLVideoFoldersModel::nameToCriteria(QByteArray name) const /* override */
{
return QHash<QByteArray, vlc_ml_sorting_criteria_t> {
- { "title", VLC_ML_SORTING_ALPHA },
- { "duration", VLC_ML_SORTING_DURATION },
+ { QByteArrayLiteral("title"), VLC_ML_SORTING_ALPHA },
+ { QByteArrayLiteral("duration"), VLC_ML_SORTING_DURATION },
}.value(name, VLC_ML_SORTING_DEFAULT);
}
=====================================
modules/gui/qt/medialibrary/mlvideogroupsmodel.cpp
=====================================
@@ -60,11 +60,11 @@ QHash<int, QByteArray> MLVideoGroupsModel::roleNames() const /* override */
const QHash<int, QByteArray> groupRoles =
{
- {GROUP_IS_VIDEO, "isVideo"},
- {GROUP_TITLE_FIRST_SYMBOL, "group_title_first_symbol"},
- {GROUP_DATE, "date"},
- {GROUP_COUNT, "count"},
- {GROUP_NB_VIDEOS, "nb_videos"},
+ {GROUP_IS_VIDEO, QByteArrayLiteral("isVideo")},
+ {GROUP_TITLE_FIRST_SYMBOL, QByteArrayLiteral("group_title_first_symbol")},
+ {GROUP_DATE, QByteArrayLiteral("date")},
+ {GROUP_COUNT, QByteArrayLiteral("count")},
+ {GROUP_NB_VIDEOS, QByteArrayLiteral("nb_videos")},
};
hash.insert(groupRoles);
@@ -145,9 +145,9 @@ QVariant MLVideoGroupsModel::itemRoleData(const MLItem * item, const int role) c
vlc_ml_sorting_criteria_t MLVideoGroupsModel::nameToCriteria(QByteArray name) const /* override */
{
return QHash<QByteArray, vlc_ml_sorting_criteria_t> {
- { "title", VLC_ML_SORTING_ALPHA },
- { "duration", VLC_ML_SORTING_DURATION },
- { "date", VLC_ML_SORTING_INSERTIONDATE },
+ { QByteArrayLiteral("title"), VLC_ML_SORTING_ALPHA },
+ { QByteArrayLiteral("duration"), VLC_ML_SORTING_DURATION },
+ { QByteArrayLiteral("date"), VLC_ML_SORTING_INSERTIONDATE },
}.value(name, VLC_ML_SORTING_DEFAULT);
}
=====================================
modules/gui/qt/medialibrary/mlvideomodel.cpp
=====================================
@@ -84,14 +84,14 @@ QHash<int, QByteArray> MLVideoModel::roleNames() const
QHash<int, QByteArray> hash = MLMediaModel::roleNames();
hash.insert({
- {VIDEO_THUMBNAIL, "thumbnail"}, // TODO: remove (a similar roleName already "small_cover")
- {VIDEO_IS_NEW, "isNew"},
- {VIDEO_RESOLUTION, "resolution_name"},
- {VIDEO_CHANNEL, "channel"},
- {VIDEO_DISPLAY_MRL, "display_mrl"},
- {VIDEO_VIDEO_TRACK, "videoDesc"},
- {VIDEO_AUDIO_TRACK, "audioDesc"},
- {VIDEO_SUBTITLE_TRACK, "subtitleDesc"},
+ {VIDEO_THUMBNAIL, QByteArrayLiteral("thumbnail")}, // TODO: remove (a similar roleName already "small_cover")
+ {VIDEO_IS_NEW, QByteArrayLiteral("isNew")},
+ {VIDEO_RESOLUTION, QByteArrayLiteral("resolution_name")},
+ {VIDEO_CHANNEL, QByteArrayLiteral("channel")},
+ {VIDEO_DISPLAY_MRL, QByteArrayLiteral("display_mrl")},
+ {VIDEO_VIDEO_TRACK, QByteArrayLiteral("videoDesc")},
+ {VIDEO_AUDIO_TRACK, QByteArrayLiteral("audioDesc")},
+ {VIDEO_SUBTITLE_TRACK, QByteArrayLiteral("subtitleDesc")},
});
return hash;
@@ -100,9 +100,9 @@ QHash<int, QByteArray> MLVideoModel::roleNames() const
vlc_ml_sorting_criteria_t MLVideoModel::nameToCriteria(QByteArray name) const
{
return QHash<QByteArray, vlc_ml_sorting_criteria_t> {
- {"title", VLC_ML_SORTING_ALPHA},
- {"duration", VLC_ML_SORTING_DURATION},
- {"playcount", VLC_ML_SORTING_PLAYCOUNT},
+ {QByteArrayLiteral("title"), VLC_ML_SORTING_ALPHA},
+ {QByteArrayLiteral("duration"), VLC_ML_SORTING_DURATION},
+ {QByteArrayLiteral("playcount"), VLC_ML_SORTING_PLAYCOUNT},
}.value(name, VLC_ML_SORTING_DEFAULT);
}
=====================================
modules/gui/qt/network/addonsmodel.cpp
=====================================
@@ -379,23 +379,23 @@ Qt::ItemFlags AddonsModel::flags( const QModelIndex &index ) const
QHash<int, QByteArray> AddonsModel::roleNames() const
{
return {
- { Role::NAME, "name" },
- { Role::AUTHOR, "author"},
- { Role::SUMMARY, "summary" },
- { Role::DESCRIPTION, "description" },
- { Role::DOWNLOADS, "downloads" },
- { Role::SCORE, "score" },
- { Role::STATE, "state" },
- { Role::ARTWORK, "artwork" },
- { Role::TYPE, "type" },
- { Role::LINK, "link" },
- { Role::FILENAME, "filename" },
- { Role::ADDON_VERSION, "version" },
- { Role::UUID, "uuid" },
- { Role::DOWNLOAD_COUNT, "downloadCount" },
- { Role::BROKEN, "broken" },
- { Role::MANAGEABLE, "manageable" },
- { Role::UPDATABLE, "updatable" },
+ { Role::NAME, QByteArrayLiteral("name") },
+ { Role::AUTHOR, QByteArrayLiteral("author") },
+ { Role::SUMMARY, QByteArrayLiteral("summary") },
+ { Role::DESCRIPTION, QByteArrayLiteral("description") },
+ { Role::DOWNLOADS, QByteArrayLiteral("downloads") },
+ { Role::SCORE, QByteArrayLiteral("score") },
+ { Role::STATE, QByteArrayLiteral("state") },
+ { Role::ARTWORK, QByteArrayLiteral("artwork") },
+ { Role::TYPE, QByteArrayLiteral("type") },
+ { Role::LINK, QByteArrayLiteral("link") },
+ { Role::FILENAME, QByteArrayLiteral("filename") },
+ { Role::ADDON_VERSION, QByteArrayLiteral("version") },
+ { Role::UUID, QByteArrayLiteral("uuid") },
+ { Role::DOWNLOAD_COUNT, QByteArrayLiteral("downloadCount") },
+ { Role::BROKEN, QByteArrayLiteral("broken") },
+ { Role::MANAGEABLE, QByteArrayLiteral("manageable") },
+ { Role::UPDATABLE, QByteArrayLiteral("updatable") },
};
}
=====================================
modules/gui/qt/network/networkbasemodel.cpp
=====================================
@@ -42,28 +42,28 @@ QString NetworkBaseModel::artworkFallbackForType(const ItemType type) const
{
switch (type) {
case TYPE_DISC:
- return "qrc:///sd/disc.svg";
+ return QStringLiteral("qrc:///sd/disc.svg");
case TYPE_CARD:
- return "qrc:///sd/capture-card.svg";
+ return QStringLiteral("qrc:///sd/capture-card.svg");
case TYPE_STREAM:
- return "qrc:///sd/stream.svg";
+ return QStringLiteral("qrc:///sd/stream.svg");
case TYPE_PLAYLIST:
- return "qrc:///sd/playlist.svg";
+ return QStringLiteral("qrc:///sd/playlist.svg");
case TYPE_FILE:
- return "qrc:///sd/file.svg";
+ return QStringLiteral("qrc:///sd/file.svg");
default:
- return "qrc:///sd/directory.svg";
+ return QStringLiteral("qrc:///sd/directory.svg");
}
}
QHash<int, QByteArray> NetworkBaseModel::roleNames() const
{
return {
- { NETWORK_BASE_NAME, "name" },
- { NETWORK_BASE_MRL, "mrl" },
- { NETWORK_BASE_TYPE, "type" },
- { NETWORK_BASE_PROTOCOL, "protocol" },
- { NETWORK_BASE_ARTWORK, "artwork" },
- { NETWORK_BASE_ARTWORK_FALLBACK, "artworkFallback" },
+ { NETWORK_BASE_NAME, QByteArrayLiteral("name") },
+ { NETWORK_BASE_MRL, QByteArrayLiteral("mrl") },
+ { NETWORK_BASE_TYPE, QByteArrayLiteral("type") },
+ { NETWORK_BASE_PROTOCOL, QByteArrayLiteral("protocol") },
+ { NETWORK_BASE_ARTWORK, QByteArrayLiteral("artwork") },
+ { NETWORK_BASE_ARTWORK_FALLBACK, QByteArrayLiteral("artworkFallback") },
};
}
=====================================
modules/gui/qt/network/networkdevicemodel.cpp
=====================================
@@ -437,8 +437,8 @@ QVariant NetworkDeviceModel::data( const QModelIndex& index, int role ) const
QHash<int, QByteArray> NetworkDeviceModel::roleNames() const
{
QHash<int, QByteArray> roles = NetworkBaseModel::roleNames();
- roles[NETWORK_SOURCE] = "source";
- roles[NETWORK_TREE] = "tree";
+ roles[NETWORK_SOURCE] = QByteArrayLiteral("source");
+ roles[NETWORK_TREE] = QByteArrayLiteral("tree");
return roles;
}
=====================================
modules/gui/qt/network/networkmediamodel.cpp
=====================================
@@ -594,15 +594,15 @@ QHash<int, QByteArray> NetworkMediaModel::roleNames() const
{
auto roles = NetworkBaseModel::roleNames();
- roles[NETWORK_INDEXED] = "indexed";
- roles[NETWORK_CANINDEX] = "can_index";
- roles[NETWORK_TREE] = "tree";
- roles[NETWORK_FILE_SIZE] = "fileSizeRaw64";
- roles[NETWORK_FILE_MODIFIED] = "fileModified";
- roles[NETWORK_MEDIA] = "media";
- roles[NETWORK_MEDIA_PROGRESS] = "progress";
- roles[NETWORK_MEDIA_DURATION] = "duration";
- roles[URL] = "url";
+ roles[NETWORK_INDEXED] = QByteArrayLiteral("indexed");
+ roles[NETWORK_CANINDEX] = QByteArrayLiteral("can_index");
+ roles[NETWORK_TREE] = QByteArrayLiteral("tree");
+ roles[NETWORK_FILE_SIZE] = QByteArrayLiteral("fileSizeRaw64");
+ roles[NETWORK_FILE_MODIFIED] = QByteArrayLiteral("fileModified");
+ roles[NETWORK_MEDIA] = QByteArrayLiteral("media");
+ roles[NETWORK_MEDIA_PROGRESS] = QByteArrayLiteral("progress");
+ roles[NETWORK_MEDIA_DURATION] = QByteArrayLiteral("duration");
+ roles[URL] = QByteArrayLiteral("url");
return roles;
}
=====================================
modules/gui/qt/network/networksourcesmodel.cpp
=====================================
@@ -220,10 +220,10 @@ QVariant NetworkSourcesModel::data( const QModelIndex& index, int role ) const
QHash<int, QByteArray> NetworkSourcesModel::roleNames() const
{
return {
- { SOURCE_NAME, "name" },
- { SOURCE_LONGNAME, "long_name" },
- { SOURCE_TYPE, "type" },
- { SOURCE_ARTWORK, "artwork" }
+ { SOURCE_NAME, QByteArrayLiteral("name") },
+ { SOURCE_LONGNAME, QByteArrayLiteral("long_name") },
+ { SOURCE_TYPE, QByteArrayLiteral("type") },
+ { SOURCE_ARTWORK, QByteArrayLiteral("artwork") }
};
}
=====================================
modules/gui/qt/network/standardpathmodel.cpp
=====================================
@@ -220,8 +220,8 @@ StandardPathModel::StandardPathModel(QObject * parent)
QHash<int, QByteArray> StandardPathModel::roleNames() const /* override */
{
auto roles = NetworkBaseModel::roleNames();
- roles[PATH_SOURCE] = "source";
- roles[PATH_TREE] = "tree";
+ roles[PATH_SOURCE] = QByteArrayLiteral("source");
+ roles[PATH_TREE] = QByteArrayLiteral("tree");
return roles;
}
=====================================
modules/gui/qt/player/control_list_model.cpp
=====================================
@@ -79,7 +79,7 @@ QHash<int, QByteArray> ControlListModel::roleNames() const
{
return {
{
- ID_ROLE, "id"
+ ID_ROLE, QByteArrayLiteral("id")
}
};
}
=====================================
modules/gui/qt/player/input_models.cpp
=====================================
@@ -152,7 +152,7 @@ void TrackListModel::clear()
QHash<int, QByteArray> TrackListModel::roleNames() const
{
QHash<int, QByteArray> roleNames = this->QAbstractListModel::roleNames();
- roleNames[Qt::CheckStateRole] = "checked";
+ roleNames[Qt::CheckStateRole] = QByteArrayLiteral("checked");
return roleNames;
}
@@ -290,7 +290,7 @@ void TitleListModel::resetTitles(vlc_player_title_list *newTitleList)
QHash<int, QByteArray> TitleListModel::roleNames() const
{
QHash<int, QByteArray> roleNames = this->QAbstractListModel::roleNames();
- roleNames[Qt::CheckStateRole] = "checked";
+ roleNames[Qt::CheckStateRole] = QByteArrayLiteral("checked");
return roleNames;
}
@@ -358,11 +358,11 @@ bool ChapterListModel::setData(const QModelIndex &index, const QVariant &value,
QHash<int, QByteArray> ChapterListModel::roleNames() const
{
return QHash<int, QByteArray>{
- {Qt::DisplayRole, "display"},
- {Qt::CheckStateRole, "checked"},
- {ChapterListRoles::TimeRole, "time"},
- {ChapterListRoles::StartPositionRole, "startPosition"},
- {ChapterListRoles::EndPositionRole, "endPosition"}
+ {Qt::DisplayRole, QByteArrayLiteral("display")},
+ {Qt::CheckStateRole, QByteArrayLiteral("checked")},
+ {ChapterListRoles::TimeRole, QByteArrayLiteral("time")},
+ {ChapterListRoles::StartPositionRole, QByteArrayLiteral("startPosition")},
+ {ChapterListRoles::EndPositionRole, QByteArrayLiteral("endPosition")}
};
}
@@ -583,7 +583,7 @@ void ProgramListModel::clear()
QHash<int, QByteArray> ProgramListModel::roleNames() const
{
QHash<int, QByteArray> roleNames = this->QAbstractListModel::roleNames();
- roleNames[Qt::CheckStateRole] = "checked";
+ roleNames[Qt::CheckStateRole] = QByteArrayLiteral("checked");
return roleNames;
}
=====================================
modules/gui/qt/playlist/playlist_model.cpp
=====================================
@@ -286,14 +286,14 @@ QHash<int, QByteArray>
PlaylistListModel::roleNames() const
{
return {
- { PreparsedRole, "preparsed" },
- { TitleRole, "title" },
- { DurationRole, "duration" },
- { IsCurrentRole, "isCurrent" },
- { ArtistRole , "artist" },
- { AlbumRole , "album" },
- { ArtworkRole, "artwork" },
- { UrlRole, "url" }
+ { PreparsedRole, QByteArrayLiteral("preparsed") },
+ { TitleRole, QByteArrayLiteral("title") },
+ { DurationRole, QByteArrayLiteral("duration") },
+ { IsCurrentRole, QByteArrayLiteral("isCurrent") },
+ { ArtistRole , QByteArrayLiteral("artist") },
+ { AlbumRole , QByteArrayLiteral("album") },
+ { ArtworkRole, QByteArrayLiteral("artwork") },
+ { UrlRole, QByteArrayLiteral("url") }
};
}
=====================================
modules/gui/qt/util/audio_device_model.cpp
=====================================
@@ -149,7 +149,7 @@ void AudioDeviceModel::updateCurrent(QString current)
QHash<int, QByteArray> AudioDeviceModel::roleNames() const
{
return QHash<int, QByteArray>{
- {Qt::DisplayRole, "display"},
- {Qt::CheckStateRole, "checked"}
+ {Qt::DisplayRole, QByteArrayLiteral("display")},
+ {Qt::CheckStateRole, QByteArrayLiteral("checked")}
};
}
=====================================
modules/gui/qt/util/renderer_manager.cpp
=====================================
@@ -318,12 +318,12 @@ bool RendererManager::setData(const QModelIndex &index, const QVariant &value, i
QHash<int,QByteArray> RendererManager::roleNames() const
{
return {
- { NAME, "name" },
- { TYPE, "type" },
- { DEMUX_FILTER, "demuxFilter" },
- { SOUT, "sour" },
- { ICON_URI, "iconUri" },
- { FLAGS, "flags" },
+ { NAME, QByteArrayLiteral("name") },
+ { TYPE, QByteArrayLiteral("type") },
+ { DEMUX_FILTER, QByteArrayLiteral("demuxFilter") },
+ { SOUT, QByteArrayLiteral("sour") },
+ { ICON_URI, QByteArrayLiteral("iconUri") },
+ { FLAGS, QByteArrayLiteral("flags") },
};
}
=====================================
modules/gui/qt/util/varchoicemodel.cpp
=====================================
@@ -48,7 +48,7 @@ Qt::ItemFlags VLCVarChoiceModel::flags(const QModelIndex &) const
QHash<int, QByteArray> VLCVarChoiceModel::roleNames() const
{
QHash<int, QByteArray> roleNames = this->QAbstractListModel::roleNames();
- roleNames[Qt::CheckStateRole] = "checked";
+ roleNames[Qt::CheckStateRole] = QByteArrayLiteral("checked");
return roleNames;
}
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/58b530b76b92d201c1e21d251ef0b3c96efbc84a...fd4be126d77b6e2560126df84175cad3725ac7fc
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/58b530b76b92d201c1e21d251ef0b3c96efbc84a...fd4be126d77b6e2560126df84175cad3725ac7fc
You're receiving this email because of your account on code.videolan.org. Manage all notifications: https://code.videolan.org/-/profile/notifications | Help: https://code.videolan.org/help
More information about the vlc-commits
mailing list