[vlc-commits] qt: actions_manager: compareRenderers -> getMatchingRenderer

Hugo Beauzée-Luyssen git at videolan.org
Fri Jan 19 13:37:17 CET 2018


vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Fri Jan 19 11:49:30 2018 +0100| [597984decde3db153dc213aa1b51e34d66239b39] | committer: Hugo Beauzée-Luyssen

qt: actions_manager: compareRenderers -> getMatchingRenderer

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=597984decde3db153dc213aa1b51e34d66239b39
---

 modules/gui/qt/actions_manager.cpp | 6 +++---
 modules/gui/qt/actions_manager.hpp | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/gui/qt/actions_manager.cpp b/modules/gui/qt/actions_manager.cpp
index 89ce44c5fa..b219eb0759 100644
--- a/modules/gui/qt/actions_manager.cpp
+++ b/modules/gui/qt/actions_manager.cpp
@@ -216,7 +216,7 @@ void ActionsManager::skipBackward()
         THEMIM->getIM()->jumpBwd();
 }
 
-vlc_renderer_item_t* ActionsManager::compareRenderers( const QVariant &obj, vlc_renderer_item_t* p_item )
+vlc_renderer_item_t* ActionsManager::getMatchingRenderer( const QVariant &obj, vlc_renderer_item_t* p_item )
 {
     if (!obj.canConvert<QVariantHash>())
         return NULL;
@@ -242,7 +242,7 @@ void ActionsManager::onRendererItemAdded(vlc_renderer_item_t* p_item)
             firstSeparator = action;
             break;
         }
-        if (compareRenderers( action->data(), p_item ))
+        if (getMatchingRenderer( action->data(), p_item ))
         {
             vlc_renderer_item_release( p_item );
             return; /* we already have this item */
@@ -274,7 +274,7 @@ void ActionsManager::onRendererItemRemoved( vlc_renderer_item_t* p_item )
     {
         if (action->isSeparator())
             continue;
-        vlc_renderer_item_t *p_existing = compareRenderers( action->data(), p_item );
+        vlc_renderer_item_t *p_existing = getMatchingRenderer( action->data(), p_item );
         if (p_existing)
         {
             VLCMenuBar::rendererMenu->removeAction( action );
diff --git a/modules/gui/qt/actions_manager.hpp b/modules/gui/qt/actions_manager.hpp
index 5592429aaf..f82f6ee0aa 100644
--- a/modules/gui/qt/actions_manager.hpp
+++ b/modules/gui/qt/actions_manager.hpp
@@ -84,8 +84,8 @@ private:
                                            vlc_renderer_item_t * );
     static void renderer_event_item_removed( vlc_renderer_discovery_t *,
                                              vlc_renderer_item_t * );
-    static vlc_renderer_item_t* compareRenderers( const QVariant &m_obj,
-                                                  vlc_renderer_item_t* p_item );
+    static vlc_renderer_item_t* getMatchingRenderer( const QVariant &m_obj,
+                                                     vlc_renderer_item_t* p_item );
 
 public slots:
     void toggleMuteAudio();



More information about the vlc-commits mailing list