Changeset 6194 for trunk/qt4-gui

Timestamp:

05/15/08 02:13:23 (4 months ago)

Author:

flynd

Message:

Don't pass proxy indexes along to model. This fixes problem with crashes when using floaties and Qt 4.4.

Files:

• trunk/qt4-gui/src/contactlist/singlecontactproxy.cpp (modified) (2 diffs)

trunk/qt4-gui/src/contactlist/singlecontactproxy.cpp

@@ -83 +83 @@
 }
 
-int SingleContactProxy::columnCount(const QModelIndex& parent) const
+int SingleContactProxy::columnCount(const QModelIndex& /* parent */) const
 {
-  return myContactList->columnCount(parent);
+  return myContactList->columnCount(QModelIndex());
 }
 
@@ -98 +98 @@
 Qt::ItemFlags SingleContactProxy::flags(const QModelIndex& index) const
 {
-  return myContactList->flags(index);
+  if (!index.isValid() || index.row() != 0)
+    return Qt::ItemIsEnabled;
+
+  int column = index.column();
+  if (column < 0 || column >= MAX_COLUMNCOUNT)
+    return Qt::ItemIsEnabled;
+
+  return myContactList->flags(mySourceIndex[column]);
 }