[vlc-commits] [Git][videolan/vlc][master] 6 commits: qt: Fix mismatching forward declaration
Hugo Beauzée-Luyssen (@chouquette)
gitlab at videolan.org
Thu Nov 18 10:21:48 UTC 2021
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC
Commits:
04b00c6f by Hugo Beauzée-Luyssen at 2021-11-18T10:00:07+00:00
qt: Fix mismatching forward declaration
vlc_medialibrary_t is declared as a struct
- - - - -
11c91456 by Hugo Beauzée-Luyssen at 2021-11-18T10:00:07+00:00
qt: Remove unused variable
- - - - -
bab92711 by Hugo Beauzée-Luyssen at 2021-11-18T10:00:07+00:00
qt: qml_menu_wrapper: Remove unused capture
- - - - -
e00c32de by Hugo Beauzée-Luyssen at 2021-11-18T10:00:07+00:00
qt: qml_menu_wrapper: Remove unused function
- - - - -
280035b7 by Hugo Beauzée-Luyssen at 2021-11-18T10:00:07+00:00
qt: menus: Remove unused function
- - - - -
c793c22b by Hugo Beauzée-Luyssen at 2021-11-18T10:00:07+00:00
qt: Remove unused variables
- - - - -
8 changed files:
- modules/gui/qt/dialogs/mediainfo/info_widgets.cpp
- modules/gui/qt/medialibrary/mlgrouplistmodel.hpp
- modules/gui/qt/medialibrary/mlplaylistlistmodel.hpp
- modules/gui/qt/medialibrary/mlplaylistmedia.hpp
- modules/gui/qt/menus/menus.cpp
- modules/gui/qt/menus/qml_menu_wrapper.cpp
- modules/gui/qt/qt.cpp
- modules/gui/qt/util/covergenerator.hpp
Changes:
=====================================
modules/gui/qt/dialogs/mediainfo/info_widgets.cpp
=====================================
@@ -41,8 +41,7 @@ layout->addWidget( label, row, 0, 1, 1, 0 );
VLCStatsView::VLCStatsView( QWidget *parent ) : QGraphicsView( parent )
{
QColor history(0, 0, 0, 255),
- total(237, 109, 0, 160),
- content(109, 237, 0, 160);
+ total(237, 109, 0, 160);
scale( 1.0, -1.0 ); /* invert our Y axis */
setOptimizationFlags( QGraphicsView::DontAdjustForAntialiasing );
=====================================
modules/gui/qt/medialibrary/mlgrouplistmodel.hpp
=====================================
@@ -25,7 +25,7 @@
#include "mlbasemodel.hpp"
// Forward declarations
-class vlc_medialibrary_t;
+struct vlc_medialibrary_t;
class MLGroup;
class MLGroupListModel : public MLBaseModel
=====================================
modules/gui/qt/medialibrary/mlplaylistlistmodel.hpp
=====================================
@@ -23,7 +23,7 @@
#include "mlbasemodel.hpp"
// Forward declarations
-class vlc_medialibrary_t;
+struct vlc_medialibrary_t;
class MLPlaylist;
class MLPlaylistListModel : public MLBaseModel
=====================================
modules/gui/qt/medialibrary/mlplaylistmedia.hpp
=====================================
@@ -31,7 +31,7 @@
#include <QUrl>
// Forward declarations
-class vlc_medialibrary_t;
+struct vlc_medialibrary_t;
class MLPlaylistMedia : public MLItem
{
=====================================
modules/gui/qt/menus/menus.cpp
=====================================
@@ -159,11 +159,6 @@ static QAction* addMPLStaticEntry( qt_intf_t *p_intf,
* Simple Code
*****************************************************************************/
-// Static menu
-static inline void addMenuToMainbar( QMenu *func, QString title, QMenuBar *bar ) {
- func->setTitle( title );
- bar->addMenu( func);
-}
/**
* Main Menu Bar Creation
**/
=====================================
modules/gui/qt/menus/qml_menu_wrapper.cpp
=====================================
@@ -68,12 +68,6 @@ namespace
}
}
-static inline void addSubMenu( QMenu *func, QString title, QMenu *bar ) {
- func->setTitle( title );
- bar->addMenu( func);
-}
-
-
void StringListMenu::popup(const QPoint &point, const QVariantList &stringList)
{
QMenu *m = new QMenu;
@@ -631,7 +625,7 @@ void PlaylistMediaContextMenu::popup(const QModelIndexList & selected, QPoint po
action = m_menu->addAction(qtr("Add to playlist"));
- connect(action, &QAction::triggered, [ml, ids]() {
+ connect(action, &QAction::triggered, [ids]() {
DialogsProvider::getInstance()->playlistsDialog(ids);
});
=====================================
modules/gui/qt/qt.cpp
=====================================
@@ -937,9 +937,8 @@ static void ShowDialog( intf_thread_t *p_intf, int i_dialog_event, int i_arg,
QApplication::postEvent( THEDP, event );
}
-static void WindowCloseCb( vout_window_t *p_wnd )
+static void WindowCloseCb( vout_window_t * )
{
- libvlc_int_t *libvlc = vlc_object_instance( p_wnd );
qt_intf_t *p_intf = nullptr;
bool shutdown = false;
//mutex scope
=====================================
modules/gui/qt/util/covergenerator.hpp
=====================================
@@ -35,7 +35,7 @@
#include <QPainter>
// Forward declarations
-class vlc_medialibrary_t;
+struct vlc_medialibrary_t;
class MLItemId;
class CoverGenerator : public AsyncTask<QString>
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/5b7d875cdde8ef65475e6a4fdcd2c8523ee3538e...c793c22b0153c5400ffc90eb38e74122d086417c
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/5b7d875cdde8ef65475e6a4fdcd2c8523ee3538e...c793c22b0153c5400ffc90eb38e74122d086417c
You're receiving this email because of your account on code.videolan.org.
More information about the vlc-commits
mailing list