[vlc-commits] [Git][videolan/vlc][master] 5 commits: qt: fix typo

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
a791a7ad by Steve Lhomme at 2025-11-25T14:51:17+01:00
qt: fix typo

- - - - -
80965a58 by Steve Lhomme at 2025-11-25T14:51:17+01:00
qt: don't moc mlmedia.hpp

- - - - -
c6431fc7 by Steve Lhomme at 2025-11-25T14:51:17+01:00
qt: medialib: avoid including QQmlEngine all the time

- - - - -
3e607b82 by Steve Lhomme at 2025-11-25T14:51:17+01:00
qt: medialib: avoid including unused QVariant

- - - - -
ba4c434b by Steve Lhomme at 2025-11-25T15:11:15+01:00
qt: threadrunner: constify internal variables of RunOnThreadRunner

- - - - -


6 changed files:

- modules/gui/qt/Makefile.am
- modules/gui/qt/medialibrary/medialib.cpp
- modules/gui/qt/medialibrary/medialib.hpp
- modules/gui/qt/medialibrary/mlbasemodel.cpp
- modules/gui/qt/medialibrary/mlthreadpool.hpp
- modules/gui/qt/meson.build


Changes:

=====================================
modules/gui/qt/Makefile.am
=====================================
@@ -439,7 +439,6 @@ nodist_libqt_plugin_la_SOURCES = \
 	medialibrary/mlgenremodel.moc.cpp \
 	medialibrary/mlthreadpool.moc.cpp \
 	medialibrary/mlqmltypes.moc.cpp \
-	medialibrary/mlmedia.moc.cpp \
 	medialibrary/mlrecentmediamodel.moc.cpp \
 	medialibrary/mlrecentvideomodel.moc.cpp \
 	medialibrary/mlurlmodel.moc.cpp \


=====================================
modules/gui/qt/medialibrary/medialib.cpp
=====================================
@@ -23,6 +23,8 @@
 
 #include <utility>
 
+#include <QQmlEngine>
+
 MediaLib::MediaLib(qt_intf_t *_intf, vlc::playlist::PlaylistController* playlistController, QObject *_parent)
     : QObject( _parent )
     , m_intf( _intf )


=====================================
modules/gui/qt/medialibrary/medialib.hpp
=====================================
@@ -16,10 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #pragma once
-
-#include <QVariant>
 #include <QQuickItem>
-#include <QQmlEngine>
 
 #include <memory>
 
@@ -91,7 +88,7 @@ public:
      * @param uiCB, this callback is executed on the Qt thread, it takes as first argument the
      *     id of the tasks, and as second argument the context that was created for the ML callback
      *
-     * @param queue, this allows to specify if the task must be exectuted on a specific queue, if nullptr
+     * @param queue, this allows to specify if the task must be executed on a specific queue, if nullptr
      * task may be run by any thread in the threadpool. this is useful if you want to ensure that tasks must
      * be executed in order.
      *


=====================================
modules/gui/qt/medialibrary/mlbasemodel.cpp
=====================================
@@ -29,6 +29,7 @@
 #include "util/base_model_p.hpp"
 #include "util/asynctask.hpp"
 
+#include <QQmlEngine>
 
 
 /// MLListCache


=====================================
modules/gui/qt/medialibrary/mlthreadpool.hpp
=====================================
@@ -145,8 +145,8 @@ private:
     quint64 m_taskId;
     Ctx m_ctx; //default constructed
     const QObject* m_obj = nullptr;
-    std::function<void (Ctx&)> m_mlFun;
-    std::function<void (quint64, Ctx&)> m_uiFun;
+    const std::function<void (Ctx&)> m_mlFun;
+    const std::function<void (quint64, Ctx&)> m_uiFun;
 };
 
 template<typename Ctx>


=====================================
modules/gui/qt/meson.build
=====================================
@@ -86,7 +86,6 @@ moc_headers = files(
     'medialibrary/mlgenremodel.hpp',
     'medialibrary/mlthreadpool.hpp',
     'medialibrary/mlqmltypes.hpp',
-    'medialibrary/mlmedia.hpp',
     'medialibrary/mlrecentmediamodel.hpp',
     'medialibrary/mlrecentvideomodel.hpp',
     'medialibrary/mlurlmodel.hpp',



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/05f437f98ec2b830315fe11e837049c227bf3662...ba4c434b280a8949a770e5b886c74365d6ae7e10

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/05f437f98ec2b830315fe11e837049c227bf3662...ba4c434b280a8949a770e5b886c74365d6ae7e10
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance