[vlc-commits] [Git][videolan/vlc][master] 4 commits: networkdevicemodel: fix class/struct mismatch

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
3220c0fc by Alexandre Janniaux at 2024-02-06T10:25:00+00:00
networkdevicemodel: fix class/struct mismatch

Fix the following warning on Clang 16.0.6:

    ../../../../modules/gui/qt/network/networkdevicemodel.cpp:134:1: warning: 'ListenerCb' defined as a struct here but previously declared as a class; this is valid, but may result in linker errors under the Microsoft C++ ABI [-Wmismatched-tags]
    struct NetworkDeviceModel::ListenerCb : public MediaTreeListener::MediaTreeListenerCb {
    ^
    ../../../../modules/gui/qt/network/networkdevicemodel.hpp:135:5: note: did you mean struct here?
        class ListenerCb;
        ^~~~~
        struct

No difference on Clang or GCC but there could be ABI issues when
compiling with MSVC.

- - - - -
a0384902 by Alexandre Janniaux at 2024-02-06T10:25:00+00:00
qt: servicesdiscoverymodel: fix class/struct mismatch

Fix the following warnings on Clang 16.0.6:

    network/../../../../../modules/gui/qt/network/servicesdiscoverymodel.hpp:79:5: warning: class 'ServicesDiscoveryModelPrivate' was previously declared as a struct; this is valid, but may result in linker errors under the Microsoft C++ ABI [-Wmismatched-tags]
        Q_DECLARE_PRIVATE(ServicesDiscoveryModel);
        ^
    /usr/include/qt/QtCore/qglobal.h:1160:12: note: expanded from macro 'Q_DECLARE_PRIVATE'
        friend class Class##Private;
               ^
    network/../../../../../modules/gui/qt/network/servicesdiscoverymodel.hpp:29:8: note: previous use is here
    struct ServicesDiscoveryModelPrivate;
           ^

No difference on Clang or GCC but there could be ABI issues when
compiling with MSVC.

- - - - -
b1e82c16 by Alexandre Janniaux at 2024-02-06T10:25:00+00:00
qt: control_list_filter: hide QSortFilterProxyModel::setSourceModel

Fix the following warnings on Clang 16.0.6:

    player/../../../../../modules/gui/qt/player/control_list_filter.hpp:43:10: warning: 'ControlListFilter::setSourceModel' hides overloaded virtual function [-Woverloaded-virtual]
        void setSourceModel(ControlListModel* sourceModel);
             ^
    /usr/include/qt/QtCore/qsortfilterproxymodel.h:82:10: note: hidden overloaded virtual function 'QSortFilterProxyModel::setSourceModel' declared here: type mismatch at 1st parameter ('QAbstractItemModel *' vs 'ControlListModel *')
        void setSourceModel(QAbstractItemModel *sourceModel) override;
         ^

- - - - -
a731f7e0 by Alexandre Janniaux at 2024-02-06T10:25:00+00:00
gtk_util: remove unused global

Fix unused variable warning.

- - - - -


4 changed files:

- modules/gui/qt/network/networkdevicemodel.hpp
- modules/gui/qt/network/servicesdiscoverymodel.hpp
- modules/gui/qt/player/control_list_filter.hpp
- modules/gui/qt/style/gtkthemeprovider/gtk_util.cpp


Changes:

=====================================
modules/gui/qt/network/networkdevicemodel.hpp
=====================================
@@ -132,7 +132,7 @@ private:
     QString m_sourceName; // '*' -> all sources
     QString m_name; // source long name
 
-    class ListenerCb;
+    struct ListenerCb;
     Q_DECLARE_PRIVATE(NetworkDeviceModel)
 };
 


=====================================
modules/gui/qt/network/servicesdiscoverymodel.hpp
=====================================
@@ -26,7 +26,7 @@
 #include "util/base_model.hpp"
 #include "maininterface/mainctx.hpp"
 
-struct ServicesDiscoveryModelPrivate;
+class ServicesDiscoveryModelPrivate;
 class ServicesDiscoveryModel : public BaseModel
 {
     Q_OBJECT


=====================================
modules/gui/qt/player/control_list_filter.hpp
=====================================
@@ -31,6 +31,8 @@ class ControlListModel;
 
 class ControlListFilter : public QSortFilterProxyModel
 {
+    using QSortFilterProxyModel::setSourceModel;
+
     Q_OBJECT
 
     Q_PROPERTY(ControlListModel* sourceModel READ sourceModel WRITE setSourceModel NOTIFY sourceModelChanged1 FINAL)
@@ -41,6 +43,7 @@ public:
     explicit ControlListFilter(QObject * parent = nullptr);
 
     void setSourceModel(ControlListModel* sourceModel);
+
     ControlListModel* sourceModel() const;
 
 protected: // QSortFilterProxyModel reimplementation


=====================================
modules/gui/qt/style/gtkthemeprovider/gtk_util.cpp
=====================================
@@ -36,10 +36,6 @@ namespace gtk {
 
 namespace {
 
-
-
-const char kAuraTransientParent[] = "aura-transient-parent";
-
 GtkCssContext AppendCssNodeToStyleContextImpl(
         GtkCssContext context,
         GType gtype,



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/685ecc6ba7e653fba619cd22dc0e0fc3d29bd665...a731f7e00b1caf1123014a03a235c1f69d2da6a7

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


VideoLAN code repository instance