Qt: use count() iso size() on Qt Containers

[vlc] / modules / gui / qt4 / components / playlist / playlist_model.cpp

diff --git a/modules/gui/qt4/components/playlist/playlist_model.cpp b/modules/gui/qt4/components/playlist/playlist_model.cpp
index ebec0bb5eff9485e010307a6060df89283c3fa47..54b4fbbe8adaabe544b10c3cc675d7104357bef2 100644 (file)
--- a/modules/gui/qt4/components/playlist/playlist_model.cpp
+++ b/modules/gui/qt4/components/playlist/playlist_model.cpp
@@ -88,6 +88,8 @@ PLModel::PLModel( playlist_t *_p_playlist,  /* THEPL */
     ADD_ICON( NODE, ":/type/node" );
 #undef ADD_ICON
 
+    i_zoom = getSettings()->value( "Playlist/zoom", 0 ).toInt();
+
     rebuild( p_root );
     DCONNECT( THEMIM->getIM(), metaChanged( input_item_t *),
               this, processInputItemUpdate( input_item_t *) );
@@ -101,6 +103,7 @@ PLModel::PLModel( playlist_t *_p_playlist,  /* THEPL */
 
 PLModel::~PLModel()
 {
+    getSettings()->setValue( "Playlist/zoom", i_zoom );
     delete rootItem;
     delete sortingMenu;
 }
@@ -229,7 +232,7 @@ void PLModel::dropMove( const PlMimeData * plMimeData, PLItem *target, int row )
 {
     QList<input_item_t*> inputItems = plMimeData->inputItems();
     QList<PLItem*> model_items;
-    playlist_item_t *pp_items[inputItems.size()];
+    playlist_item_t *pp_items[inputItems.count()];
 
     PL_LOCK;
 
@@ -367,7 +370,7 @@ QVariant PLModel::data( const QModelIndex &index, const int role ) const
     else if( role == Qt::FontRole )
     {
         QFont f;
-        f.setPointSize( f.pointSize() - 1 );
+        f.setPointSize( f.pointSize() - 1 + i_zoom );
         if( isCurrent( index ) )
             f.setBold( true );
         return QVariant( f );
@@ -507,7 +510,7 @@ int PLModel::rowCount( const QModelIndex &parent ) const
 QStringList PLModel::selectedURIs()
 {
     QStringList lst;
-    for( int i = 0; i < current_selection.size(); i++ )
+    for( int i = 0; i < current_selection.count(); i++ )
     {
         const PLItem *item = getItem( current_selection[i] );
         if( item )
@@ -687,7 +690,7 @@ void PLModel::takeItem( PLItem *item )
 void PLModel::insertChildren( PLItem *node, QList<PLItem*>& items, int i_pos )
 {
     assert( node );
-    int count = items.size();
+    int count = items.count();
     if( !count ) return;
     printf( "Here I am\n");
     beginInsertRows( index( node, 0 ), i_pos, i_pos + count - 1 );
@@ -780,7 +783,7 @@ void PLModel::doDelete( QModelIndexList selected )
 
 void PLModel::recurseDelete( QList<PLItem*> children, QModelIndexList *fullList )
 {
-    for( int i = children.size() - 1; i >= 0 ; i-- )
+    for( int i = children.count() - 1; i >= 0 ; i-- )
     {
         PLItem *item = children[i];
         if( item->childCount() )
@@ -854,9 +857,8 @@ void PLModel::search( const QString& search_text, const QModelIndex & idx, bool
         playlist_item_t *p_root = playlist_ItemGetById( p_playlist,
                                                         itemId( idx ) );
         assert( p_root );
-        const char *psz_name = qtu( search_text );
-        playlist_LiveSearchUpdate( p_playlist , p_root, psz_name, b_recursive );
-
+        playlist_LiveSearchUpdate( p_playlist , p_root, qtu( search_text ),
+                                   b_recursive );
         if( idx.isValid() )
         {
             PLItem *searchRoot = getItem( idx );