[vlc-commits] Qt: rename helper for more clarity

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun May 18 18:00:21 2014 +0200| [2f1adbff408550d843d45ab55d64fc9427503a32] | committer: Jean-Baptiste Kempf

Qt: rename helper for more clarity

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

 modules/gui/qt4/components/playlist/playlist_model.cpp |    2 +-
 modules/gui/qt4/dialogs/open.cpp                       |    2 +-
 modules/gui/qt4/dialogs_provider.cpp                   |    2 +-
 modules/gui/qt4/recents.cpp                            |    2 +-
 modules/gui/qt4/recents.hpp                            |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/gui/qt4/components/playlist/playlist_model.cpp b/modules/gui/qt4/components/playlist/playlist_model.cpp
index 27751e9..f9d7f85 100644
--- a/modules/gui/qt4/components/playlist/playlist_model.cpp
+++ b/modules/gui/qt4/components/playlist/playlist_model.cpp
@@ -950,7 +950,7 @@ bool PLModel::action( QAction *action, const QModelIndexList &indexes )
         foreach( const QString &uri, a.uris )
         {
             QStringList options = a.options.split( " :" );
-            Open::openInput( p_intf, uri, &options, false );
+            Open::openMRLwithOptions( p_intf, uri, &options, false );
         }
         return true;
 
diff --git a/modules/gui/qt4/dialogs/open.cpp b/modules/gui/qt4/dialogs/open.cpp
index ff9aa4b..56ea980 100644
--- a/modules/gui/qt4/dialogs/open.cpp
+++ b/modules/gui/qt4/dialogs/open.cpp
@@ -381,7 +381,7 @@ void OpenDialog::enqueue( bool b_enqueue )
         QStringList optionsList = getOptions().split( " :" );
 
         /* Switch between enqueuing and starting the item */
-        Open::openInput( p_intf, itemsMRL[i], &optionsList, b_start, b_pl );
+        Open::openMRLwithOptions( p_intf, itemsMRL[i], &optionsList, b_start, b_pl );
     }
 }
 
diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp
index 097ce39..6ba7479 100644
--- a/modules/gui/qt4/dialogs_provider.cpp
+++ b/modules/gui/qt4/dialogs_provider.cpp
@@ -700,7 +700,7 @@ void DialogsProvider::streamingDialog( QWidget *parent,
     {
         options += soutoption.split( " :");
 
-        Open::openInput( p_intf, mrl, &options, true, true, _("Streaming") );
+        Open::openMRLwithOptions( p_intf, mrl, &options, true, true, _("Streaming") );
     }
 }
 
diff --git a/modules/gui/qt4/recents.cpp b/modules/gui/qt4/recents.cpp
index 2df3b85..6c5113a 100755
--- a/modules/gui/qt4/recents.cpp
+++ b/modules/gui/qt4/recents.cpp
@@ -182,7 +182,7 @@ void Open::openMRL( intf_thread_t *p_intf,
         RecentsMRL::getInstance( p_intf )->addRecent( mrl );
 }
 
-int Open::openInput( intf_thread_t* p_intf,
+int Open::openMRLwithOptions( intf_thread_t* p_intf,
                      const QString &mrl,
                      const QStringList *options,
                      bool b_start,
diff --git a/modules/gui/qt4/recents.hpp b/modules/gui/qt4/recents.hpp
index 036b164..35daec2 100644
--- a/modules/gui/qt4/recents.hpp
+++ b/modules/gui/qt4/recents.hpp
@@ -43,7 +43,7 @@ public:
                          bool b_start = true,
                          bool b_playlist = true);
 
-    int static openInput( intf_thread_t*,
+    int static openMRLwithOptions( intf_thread_t*,
                           const QString &,
                           const QStringList *options,
                           bool b_start = true,