From c536126d1650c8110eeb37603e73a9a84b96aa28 Mon Sep 17 00:00:00 2001
From: Benjamin Arnaud <benjamin.arnaud@videolabs.io>
Date: Wed, 16 Feb 2022 09:58:00 +0100
Subject: [PATCH] qt: Rename MLGroupListModel to MLVideoGroupsModel
---
modules/gui/qt/Makefile.am | 6 ++--
modules/gui/qt/maininterface/mainui.cpp | 4 +--
...uplistmodel.cpp => mlvideogroupsmodel.cpp} | 35 ++++++++++---------
...uplistmodel.hpp => mlvideogroupsmodel.hpp} | 12 +++----
.../medialibrary/qml/VideoAllSubDisplay.qml | 2 +-
modules/gui/qt/menus/qml_menu_wrapper.cpp | 4 +--
modules/gui/qt/menus/qml_menu_wrapper.hpp | 4 +--
po/POTFILES.in | 4 +--
8 files changed, 36 insertions(+), 35 deletions(-)
rename modules/gui/qt/medialibrary/{mlgrouplistmodel.cpp => mlvideogroupsmodel.cpp} (82%)
rename modules/gui/qt/medialibrary/{mlgrouplistmodel.hpp => mlvideogroupsmodel.hpp} (89%)
diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
index 57d5af820140..222517bbb530 100644
--- a/modules/gui/qt/Makefile.am
+++ b/modules/gui/qt/Makefile.am
@@ -170,8 +170,6 @@ libqt_plugin_la_SOURCES = \
gui/qt/medialibrary/mlgenremodel.hpp \
gui/qt/medialibrary/mlgroup.cpp \
gui/qt/medialibrary/mlgroup.hpp \
- gui/qt/medialibrary/mlgrouplistmodel.cpp \
- gui/qt/medialibrary/mlgrouplistmodel.hpp \
gui/qt/medialibrary/mlhelper.cpp \
gui/qt/medialibrary/mlhelper.hpp \
gui/qt/medialibrary/mlitemcover.cpp \
@@ -191,6 +189,8 @@ libqt_plugin_la_SOURCES = \
gui/qt/medialibrary/mlurlmodel.hpp \
gui/qt/medialibrary/mlvideo.cpp \
gui/qt/medialibrary/mlvideo.hpp \
+ gui/qt/medialibrary/mlvideogroupsmodel.cpp \
+ gui/qt/medialibrary/mlvideogroupsmodel.hpp \
gui/qt/medialibrary/mlvideomodel.cpp \
gui/qt/medialibrary/mlvideomodel.hpp \
gui/qt/medialibrary/mlplaylist.cpp \
@@ -391,7 +391,6 @@ nodist_libqt_plugin_la_SOURCES = \
gui/qt/medialibrary/mlbasemodel.moc.cpp \
gui/qt/medialibrary/mlfoldersmodel.moc.cpp \
gui/qt/medialibrary/mlgenremodel.moc.cpp \
- gui/qt/medialibrary/mlgrouplistmodel.moc.cpp \
gui/qt/medialibrary/mllistcache.moc.cpp \
gui/qt/medialibrary/mlthreadpool.moc.cpp \
gui/qt/medialibrary/mlqmltypes.moc.cpp \
@@ -402,6 +401,7 @@ nodist_libqt_plugin_la_SOURCES = \
gui/qt/medialibrary/mlvideomodel.moc.cpp \
gui/qt/medialibrary/mlplaylistlistmodel.moc.cpp \
gui/qt/medialibrary/mlplaylistmodel.moc.cpp \
+ gui/qt/medialibrary/mlvideogroupsmodel.moc.cpp \
gui/qt/menus/custom_menus.moc.cpp \
gui/qt/menus/qml_menu_wrapper.moc.cpp \
gui/qt/menus/menus.moc.cpp \
diff --git a/modules/gui/qt/maininterface/mainui.cpp b/modules/gui/qt/maininterface/mainui.cpp
index 384acbd635ce..874f25a254fd 100644
--- a/modules/gui/qt/maininterface/mainui.cpp
+++ b/modules/gui/qt/maininterface/mainui.cpp
@@ -13,7 +13,7 @@
#include "medialibrary/mlrecentsmodel.hpp"
#include "medialibrary/mlrecentsvideomodel.hpp"
#include "medialibrary/mlfoldersmodel.hpp"
-#include "medialibrary/mlgrouplistmodel.hpp"
+#include "medialibrary/mlvideogroupsmodel.hpp"
#include "medialibrary/mlplaylistlistmodel.hpp"
#include "medialibrary/mlplaylistmodel.hpp"
#include "medialibrary/mlplaylist.hpp"
@@ -324,7 +324,7 @@ void MainUI::registerQMLTypes()
qmlRegisterType<MLUrlModel>( uri, versionMajor, versionMinor, "MLUrlModel" );
qmlRegisterType<MLVideoModel>( uri, versionMajor, versionMinor, "MLVideoModel" );
qmlRegisterType<MLRecentsVideoModel>( uri, versionMajor, versionMinor, "MLRecentsVideoModel" );
- qmlRegisterType<MLGroupListModel>( uri, versionMajor, versionMinor, "MLGroupListModel" );
+ qmlRegisterType<MLVideoGroupsModel>( uri, versionMajor, versionMinor, "MLVideoGroupsModel" );
qmlRegisterType<MLPlaylistListModel>( uri, versionMajor, versionMinor, "MLPlaylistListModel" );
qmlRegisterType<MLPlaylistModel>( uri, versionMajor, versionMinor, "MLPlaylistModel" );
diff --git a/modules/gui/qt/medialibrary/mlgrouplistmodel.cpp b/modules/gui/qt/medialibrary/mlvideogroupsmodel.cpp
similarity index 82%
rename from modules/gui/qt/medialibrary/mlgrouplistmodel.cpp
rename to modules/gui/qt/medialibrary/mlvideogroupsmodel.cpp
index 666cdec03c51..4a8a6765e214 100644
--- a/modules/gui/qt/medialibrary/mlgrouplistmodel.cpp
+++ b/modules/gui/qt/medialibrary/mlvideogroupsmodel.cpp
@@ -22,7 +22,7 @@
# include "config.h"
#endif
-#include "mlgrouplistmodel.hpp"
+#include "mlvideogroupsmodel.hpp"
// VLC includes
#include <vlc_media_library.h>
@@ -39,8 +39,8 @@
// Static variables
// NOTE: We multiply by 2 to cover most dpi settings.
-static const int MLGROUPLISTMODEL_COVER_WIDTH = 512 * 2; // 16 / 10 ratio
-static const int MLGROUPLISTMODEL_COVER_HEIGHT = 320 * 2;
+static const int MLVIDEOGROUPSMODEL_COVER_WIDTH = 512 * 2; // 16 / 10 ratio
+static const int MLVIDEOGROUPSMODEL_COVER_HEIGHT = 320 * 2;
static const QHash<QByteArray, vlc_ml_sorting_criteria_t> criterias =
{
@@ -50,16 +50,16 @@ static const QHash<QByteArray, vlc_ml_sorting_criteria_t> criterias =
};
//=================================================================================================
-// MLGroupListModel
+// MLVideoGroupsModel
//=================================================================================================
-/* explicit */ MLGroupListModel::MLGroupListModel(QObject * parent) : MLVideoModel(parent) {}
+/* explicit */ MLVideoGroupsModel::MLVideoGroupsModel(QObject * parent) : MLVideoModel(parent) {}
//-------------------------------------------------------------------------------------------------
// MLVideoModel reimplementation
//-------------------------------------------------------------------------------------------------
-QHash<int, QByteArray> MLGroupListModel::roleNames() const /* override */
+QHash<int, QByteArray> MLVideoGroupsModel::roleNames() const /* override */
{
QHash<int, QByteArray> hash = MLVideoModel::roleNames();
@@ -72,7 +72,7 @@ QHash<int, QByteArray> MLGroupListModel::roleNames() const /* override */
// Protected MLVideoModel implementation
-QVariant MLGroupListModel::itemRoleData(MLItem * item, const int role) const /* override */
+QVariant MLVideoGroupsModel::itemRoleData(MLItem * item, const int role) const /* override */
{
if (item == nullptr)
return QVariant();
@@ -92,8 +92,8 @@ QVariant MLGroupListModel::itemRoleData(MLItem * item, const int role) const /*
case VIDEO_TITLE:
return QVariant::fromValue(group->getTitle());
case VIDEO_THUMBNAIL:
- return getVideoListCover(this, group, MLGROUPLISTMODEL_COVER_WIDTH,
- MLGROUPLISTMODEL_COVER_HEIGHT, VIDEO_THUMBNAIL);
+ return getVideoListCover(this, group, MLVIDEOGROUPSMODEL_COVER_WIDTH,
+ MLVIDEOGROUPSMODEL_COVER_HEIGHT, VIDEO_THUMBNAIL);
case VIDEO_DURATION:
return QVariant::fromValue(group->getDuration());
case GROUP_IS_VIDEO:
@@ -127,7 +127,7 @@ QVariant MLGroupListModel::itemRoleData(MLItem * item, const int role) const /*
}
}
-vlc_ml_sorting_criteria_t MLGroupListModel::roleToCriteria(int role) const /* override */
+vlc_ml_sorting_criteria_t MLVideoGroupsModel::roleToCriteria(int role) const /* override */
{
switch (role)
{
@@ -142,23 +142,23 @@ vlc_ml_sorting_criteria_t MLGroupListModel::roleToCriteria(int role) const /* ov
}
}
-vlc_ml_sorting_criteria_t MLGroupListModel::nameToCriteria(QByteArray name) const /* override */
+vlc_ml_sorting_criteria_t MLVideoGroupsModel::nameToCriteria(QByteArray name) const /* override */
{
return criterias.value(name, VLC_ML_SORTING_DEFAULT);
}
-QByteArray MLGroupListModel::criteriaToName(vlc_ml_sorting_criteria_t criteria) const
+QByteArray MLVideoGroupsModel::criteriaToName(vlc_ml_sorting_criteria_t criteria) const
/* override */
{
return criterias.key(criteria, "");
}
-ListCacheLoader<std::unique_ptr<MLItem>> * MLGroupListModel::createLoader() const /* override */
+ListCacheLoader<std::unique_ptr<MLItem>> * MLVideoGroupsModel::createLoader() const /* override */
{
return new Loader(*this);
}
-void MLGroupListModel::onVlcMlEvent(const MLEvent & event) /* override */
+void MLVideoGroupsModel::onVlcMlEvent(const MLEvent & event) /* override */
{
int type = event.i_type;
@@ -185,10 +185,10 @@ void MLGroupListModel::onVlcMlEvent(const MLEvent & event) /* override */
// Loader
//=================================================================================================
-MLGroupListModel::Loader::Loader(const MLGroupListModel & model)
+MLVideoGroupsModel::Loader::Loader(const MLVideoGroupsModel & model)
: MLBaseModel::BaseLoader(model) {}
-size_t MLGroupListModel::Loader::count(vlc_medialibrary_t* ml) const /* override */
+size_t MLVideoGroupsModel::Loader::count(vlc_medialibrary_t* ml) const /* override */
{
vlc_ml_query_params_t params = getParams().toCQueryParams();
@@ -196,7 +196,8 @@ size_t MLGroupListModel::Loader::count(vlc_medialibrary_t* ml) const /* override
}
std::vector<std::unique_ptr<MLItem>>
-MLGroupListModel::Loader::load(vlc_medialibrary_t* ml, size_t index, size_t count) const /* override */
+MLVideoGroupsModel::Loader::load(vlc_medialibrary_t* ml,
+ size_t index, size_t count) const /* override */
{
vlc_ml_query_params_t params = getParams(index, count).toCQueryParams();
diff --git a/modules/gui/qt/medialibrary/mlgrouplistmodel.hpp b/modules/gui/qt/medialibrary/mlvideogroupsmodel.hpp
similarity index 89%
rename from modules/gui/qt/medialibrary/mlgrouplistmodel.hpp
rename to modules/gui/qt/medialibrary/mlvideogroupsmodel.hpp
index f40691ee2f7c..b3c02f3e25a9 100644
--- a/modules/gui/qt/medialibrary/mlgrouplistmodel.hpp
+++ b/modules/gui/qt/medialibrary/mlvideogroupsmodel.hpp
@@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#ifndef MLGROUPLISTMODEL_HPP
-#define MLGROUPLISTMODEL_HPP
+#ifndef MLVIDEOGROUPSMODEL_HPP
+#define MLVIDEOGROUPSMODEL_HPP
// MediaLibrary includes
#include "mlvideomodel.hpp"
@@ -27,7 +27,7 @@
// Forward declarations
class MLGroup;
-class MLGroupListModel : public MLVideoModel
+class MLVideoGroupsModel : public MLVideoModel
{
Q_OBJECT
@@ -41,7 +41,7 @@ public:
};
public:
- explicit MLGroupListModel(QObject * parent = nullptr);
+ explicit MLVideoGroupsModel(QObject * parent = nullptr);
public: // MLVideoModel reimplementation
QHash<int, QByteArray> roleNames() const override;
@@ -62,7 +62,7 @@ protected: // MLVideoModel reimplementation
private:
struct Loader : public BaseLoader
{
- Loader(const MLGroupListModel & model);
+ Loader(const MLVideoGroupsModel & model);
size_t count(vlc_medialibrary_t* ml) const override;
@@ -70,4 +70,4 @@ private:
};
};
-#endif // MLGROUPLISTMODEL_HPP
+#endif // MLVIDEOGROUPSMODEL_HPP
diff --git a/modules/gui/qt/medialibrary/qml/VideoAllSubDisplay.qml b/modules/gui/qt/medialibrary/qml/VideoAllSubDisplay.qml
index 1984dda15255..2b90e36f201a 100644
--- a/modules/gui/qt/medialibrary/qml/VideoAllSubDisplay.qml
+++ b/modules/gui/qt/medialibrary/qml/VideoAllSubDisplay.qml
@@ -114,7 +114,7 @@ VideoAll {
QtObject {
id: metaGroup
- property var model: MLGroupListModel { ml: MediaLib }
+ property var model: MLVideoGroupsModel { ml: MediaLib }
property var contextMenu: GroupListContextMenu { model: metaGroup.model }
diff --git a/modules/gui/qt/menus/qml_menu_wrapper.cpp b/modules/gui/qt/menus/qml_menu_wrapper.cpp
index 830bc9b9428c..d2ce88cf308d 100644
--- a/modules/gui/qt/menus/qml_menu_wrapper.cpp
+++ b/modules/gui/qt/menus/qml_menu_wrapper.cpp
@@ -19,7 +19,7 @@
#include "menus.hpp"
#include "medialibrary/medialib.hpp"
#include "medialibrary/mlvideomodel.hpp"
-#include "medialibrary/mlgrouplistmodel.hpp"
+#include "medialibrary/mlvideogroupsmodel.hpp"
#include "medialibrary/mlplaylistlistmodel.hpp"
#include "medialibrary/mlplaylistmodel.hpp"
#include "medialibrary/mlalbummodel.hpp"
@@ -605,7 +605,7 @@ void GroupListContextMenu::popup(const QModelIndexList & selected, QPoint pos, Q
// NOTE: At the moment informations are only available for single video(s).
if (selected.count() == 1
&&
- m_model->data(selected.first(), MLGroupListModel::GROUP_IS_VIDEO) == true
+ m_model->data(selected.first(), MLVideoGroupsModel::GROUP_IS_VIDEO) == true
&&
options.contains("information") && options["information"].type() == QVariant::Int)
{
diff --git a/modules/gui/qt/menus/qml_menu_wrapper.hpp b/modules/gui/qt/menus/qml_menu_wrapper.hpp
index 3f2efad28bb4..cd561b9fac42 100644
--- a/modules/gui/qt/menus/qml_menu_wrapper.hpp
+++ b/modules/gui/qt/menus/qml_menu_wrapper.hpp
@@ -33,7 +33,7 @@ class MLArtistModel;
class MLAlbumTrackModel;
class MLUrlModel;
class MLVideoModel;
-class MLGroupListModel;
+class MLVideoGroupsModel;
class MLGroupModel;
class MLPlaylistListModel;
class MLPlaylistModel;
@@ -281,7 +281,7 @@ private:
class GroupListContextMenu : public QObject {
Q_OBJECT
- SIMPLE_MENU_PROPERTY(MLGroupListModel *, model, nullptr)
+ SIMPLE_MENU_PROPERTY(MLVideoGroupsModel *, model, nullptr)
public:
GroupListContextMenu(QObject * parent = nullptr);
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 01c34b037364..2671f259c4f5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -774,8 +774,6 @@ modules/gui/qt/medialibrary/mlfoldersmodel.cpp
modules/gui/qt/medialibrary/mlfoldersmodel.hpp
modules/gui/qt/medialibrary/mlgroup.cpp
modules/gui/qt/medialibrary/mlgroup.hpp
-modules/gui/qt/medialibrary/mlgrouplistmodel.cpp
-modules/gui/qt/medialibrary/mlgrouplistmodel.hpp
modules/gui/qt/medialibrary/mlitemcover.cpp
modules/gui/qt/medialibrary/mlitemcover.hpp
modules/gui/qt/medialibrary/mlplaylistlistmodel.cpp
@@ -784,6 +782,8 @@ modules/gui/qt/medialibrary/mlplaylistmedia.cpp
modules/gui/qt/medialibrary/mlplaylistmedia.hpp
modules/gui/qt/medialibrary/mlplaylistmodel.cpp
modules/gui/qt/medialibrary/mlplaylistmodel.hpp
+modules/gui/qt/medialibrary/mlvideogroupsmodel.cpp
+modules/gui/qt/medialibrary/mlvideogroupsmodel.hpp
modules/gui/qt/menus/menus.cpp
modules/gui/qt/menus/menus.hpp
modules/gui/qt/qt.cpp
--
GitLab