[vlc-commits] Qt: cosmetics on RecentsMRL and Open classes

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun May 18 23:46:37 2014 +0200| [7d14a7c7f96371c6954a486f899540d5248c189e] | committer: Jean-Baptiste Kempf

Qt: cosmetics on RecentsMRL and Open classes

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

 modules/gui/qt4/recents.cpp |    7 +++++--
 modules/gui/qt4/recents.hpp |   20 ++++++++++----------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/modules/gui/qt4/recents.cpp b/modules/gui/qt4/recents.cpp
index 23266ca..f878c99 100755
--- a/modules/gui/qt4/recents.cpp
+++ b/modules/gui/qt4/recents.cpp
@@ -172,16 +172,17 @@ int Open::openMRL( intf_thread_t *p_intf,
                     bool b_start,
                     bool b_playlist)
 {
-    return openMRLwithOptions( p_intf, mrl, NULL, b_start, b_playlist, NULL );
+    return openMRLwithOptions( p_intf, mrl, NULL, b_start, b_playlist );
 }
 
 int Open::openMRLwithOptions( intf_thread_t* p_intf,
                      const QString &mrl,
-                     const QStringList *options,
+                     QStringList *options,
                      bool b_start,
                      bool b_playlist,
                      const char *title)
 {
+    /* Options */
     const char **ppsz_options = NULL;
     int i_options = 0;
 
@@ -199,6 +200,7 @@ int Open::openMRLwithOptions( intf_thread_t* p_intf,
         }
     }
 
+    /* Add to playlist */
     int i_ret = playlist_AddExt( THEPL,
                   qtu(mrl), title,
                   PLAYLIST_APPEND | (b_start ? PLAYLIST_GO : PLAYLIST_PREPARSE),
@@ -208,6 +210,7 @@ int Open::openMRLwithOptions( intf_thread_t* p_intf,
                   b_playlist,
                   pl_Unlocked );
 
+    /* Add to recent items, only if played */
     if( i_ret == VLC_SUCCESS && b_start && b_playlist )
         RecentsMRL::getInstance( p_intf )->addRecent( mrl );
 
diff --git a/modules/gui/qt4/recents.hpp b/modules/gui/qt4/recents.hpp
index 6a45834..96dcf2a 100644
--- a/modules/gui/qt4/recents.hpp
+++ b/modules/gui/qt4/recents.hpp
@@ -38,17 +38,17 @@ class QSignalMapper;
 class Open
 {
 public:
-    int static openMRL( intf_thread_t*,
-                         const QString &,
-                         bool b_start = true,
-                         bool b_playlist = true);
+    static int openMRL( intf_thread_t*,
+                        const QString &,
+                        bool b_start = true,
+                        bool b_playlist = true);
 
-    int static openMRLwithOptions( intf_thread_t*,
-                          const QString &,
-                          const QStringList *options,
-                          bool b_start = true,
-                          bool b_playlist = true,
-                          const char* title = NULL);
+    static int openMRLwithOptions( intf_thread_t*,
+                                   const QString &,
+                                   QStringList *options,
+                                   bool b_start = true,
+                                   bool b_playlist = true,
+                                   const char* title = NULL);
 };
 
 class RecentsMRL : public QObject, public Singleton<RecentsMRL>