QTfrontend/model/playerslistmodel.cpp
changeset 7727 bd252cacabe8
parent 7725 4ad05a478c6c
child 7728 664738870325
--- a/QTfrontend/model/playerslistmodel.cpp	Sun Oct 07 11:59:42 2012 -0400
+++ b/QTfrontend/model/playerslistmodel.cpp	Sun Oct 07 23:33:09 2012 +0400
@@ -1,6 +1,7 @@
 #include <QModelIndexList>
 #include <QModelIndex>
 #include <QPainter>
+#include <QDebug>
 
 #include "playerslistmodel.h"
 
@@ -22,7 +23,7 @@
 
 QVariant PlayersListModel::data(const QModelIndex &index, int role) const
 {
-    if(!index.isValid())
+    if(!index.isValid() || index.row() < 0 || index.row() >= rowCount() || index.column() != 0)
         return QVariant(QVariant::Invalid);
 
     return m_data.at(index.row()).value(role);
@@ -92,7 +93,7 @@
 
 void PlayersListModel::removePlayer(const QString & nickname)
 {
-    QModelIndexList mil = match(index(0, 0), Qt::DisplayRole, nickname);
+    QModelIndexList mil = match(index(0), Qt::DisplayRole, nickname);
 
     if(mil.size())
         removeRow(mil[0].row());
@@ -105,7 +106,7 @@
 
     if(mil.size())
     {
-        setData(mil[0], flagType, isSet);
+        setData(mil[0], isSet, flagType);
         updateIcon(mil[0]);
     }
 }
@@ -132,7 +133,6 @@
     if(m_icons().contains(iconNum))
     {
         setData(index, m_icons().value(iconNum), Qt::DecorationRole);
-        qDebug("cached");
     }
     else
     {