More thorough fix for wrong rowCount() functions

Author: jlindgren90

src/amidiplug/i_configure-fluidsynth.cc

@@ -311,7 +311,11 @@ class SoundFontListModel : public QAbstractListModel
     ~SoundFontListModel ();
 
 protected:
-    int rowCount (const QModelIndex &) const { return m_file_names.len (); }
+    int rowCount (const QModelIndex & parent) const
+    {
+        return parent.isValid() ? 0 : m_file_names.len();
+    }
+
     int columnCount (const QModelIndex &) const { return NColumns; }
     QVariant data (const QModelIndex & index, int role) const;
     QVariant headerData (int section, Qt::Orientation, int role) const;

src/playlist-manager-qt/playlist-manager-qt.cc

@@ -80,7 +80,11 @@ class PlaylistsModel : public QAbstractListModel
     void update (Playlist::UpdateLevel level);
 
 protected:
-    int rowCount (const QModelIndex & parent) const { return m_rows; }
+    int rowCount (const QModelIndex & parent) const
+    {
+        return parent.isValid() ? 0 : m_rows;
+    }
+
     int columnCount (const QModelIndex & parent) const { return NColumns; }
 
     Qt::DropActions supportedDropActions () const { return Qt::MoveAction; }

src/qtui/playlist_model.cc

@@ -56,7 +56,7 @@ PlaylistModel::PlaylistModel(QObject * parent, Playlist playlist)
 
 int PlaylistModel::rowCount(const QModelIndex & parent) const
 {
-    return (parent == QModelIndex()) ? m_rows : 0;
+    return parent.isValid() ? 0 : m_rows;
 }
 
 int PlaylistModel::columnCount(const QModelIndex & parent) const

src/search-tool-qt/search-model.h

@@ -76,7 +76,11 @@ class SearchModel : public QAbstractListModel
     void do_search (const Index<String> & terms, int max_results);
 
 protected:
-    int rowCount (const QModelIndex & parent) const { return m_rows; }
+    int rowCount (const QModelIndex & parent) const
+    {
+        return parent.isValid() ? 0 : m_rows;
+    }
+
     int columnCount (const QModelIndex & parent) const { return 1; }
     QVariant data (const QModelIndex & index, int role) const;