[vlc-commits] Qt: fix a warning in the playlist models

Jean-Baptiste Kempf git at videolan.org
Sat May 14 13:33:27 CEST 2011


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat May 14 13:32:56 2011 +0200| [14c39b80db95ed92244da1ac9c8b69a1ee6cb696] | committer: Jean-Baptiste Kempf

Qt: fix a warning in the playlist models

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

 modules/gui/qt4/components/playlist/vlc_model.hpp |   52 +++++++++++----------
 1 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/modules/gui/qt4/components/playlist/vlc_model.hpp b/modules/gui/qt4/components/playlist/vlc_model.hpp
index 520a1bd..4506169 100644
--- a/modules/gui/qt4/components/playlist/vlc_model.hpp
+++ b/modules/gui/qt4/components/playlist/vlc_model.hpp
@@ -59,39 +59,41 @@ public:
     static QString getMeta( const QModelIndex & index, int meta );
     static QPixmap getArtPixmap( const QModelIndex & index, const QSize & size );
 
-public slots:
-    virtual void activateItem( const QModelIndex &index ) = 0;
+    static int columnToMeta( int _column )
+    {
+        int meta = 1;
+        int column = 0;
 
-protected:
-    intf_thread_t *p_intf;
-};
+        while( column != _column && meta != COLUMN_END )
+        {
+            meta <<= 1;
+            column++;
+        }
 
-static int columnToMeta( int _column )
-{
-    int meta = 1;
-    int column = 0;
+        return meta;
+    }
 
-    while( column != _column && meta != COLUMN_END )
+    static int columnFromMeta( int meta_col )
     {
-        meta <<= 1;
-        column++;
+        int meta = 1;
+        int column = 0;
+
+        while( meta != meta_col && meta != COLUMN_END )
+        {
+            meta <<= 1;
+            column++;
+        }
+
+        return column;
     }
 
-    return meta;
-}
+public slots:
+    virtual void activateItem( const QModelIndex &index ) = 0;
 
-static int columnFromMeta( int meta_col )
-{
-    int meta = 1;
-    int column = 0;
+protected:
+    intf_thread_t *p_intf;
 
-    while( meta != meta_col && meta != COLUMN_END )
-    {
-        meta <<= 1;
-        column++;
-    }
+};
 
-    return column;
-}
 
 #endif



More information about the vlc-commits mailing list