WebSVN – svn1 – Diff – /Mara/branches/QtMain/qmTableWidgetItem.cpp

 **
 ----------------------------------------------------------------------------*/
 qmTwiString::qmTwiString ( QString value, int usort  ) :  QTableWidgetItem(0)
+{
-    setData(0,value);
+    setData(Qt::DisplayRole,value);
     setFlags(flags() & ~Qt::ItemIsEditable);
     sort = usort;
+}
 bool qmTwiString::operator< ( const QTableWidgetItem & other ) const
         return true;
     const qmTwiString *other_widget = dynamic_cast<const qmTwiString *>(&other);
     if (other_widget)
+    {
-        return this < other_widget;
+        return data(Qt::DisplayRole).toString().toLower() < other_widget->data(Qt::DisplayRole).toString().toLower();
+    }
     return false;
+}
 /*----------------------------------------------------------------------------
 ** FUNCTION           :
 **
 ** DESCRIPTION        :
 ----------------------------------------------------------------------------*/
-qmTwiFlag::qmTwiFlag ( const QString txt, int checked  ) :  QTableWidgetItem(txt)
+qmTwiFlag::qmTwiFlag ( const QString txt, bool checked, int usort  ) :  QTableWidgetItem(txt)
+{
+    sort = usort;
     setCheckState(checked ? Qt::Checked : Qt::Unchecked);
     setFlags(flags() & ~(Qt::ItemIsEditable | Qt::ItemIsUserCheckable));
+}
 bool qmTwiFlag::operator< ( const QTableWidgetItem & other ) const
+{
+    if (sort)
+        return true;
     const qmTwiFlag * other_widget = dynamic_cast<const qmTwiFlag*>(&other);
+    if (other_widget)
+    {
-    return (other_widget->checkState() < checkState() );
+        return (other_widget->checkState() < checkState());
+    }
+    else
+    {
+        return false;
+    }
+}
+/*----------------------------------------------------------------------------
+** FUNCTION           :
+**
+** DESCRIPTION        :
+----------------------------------------------------------------------------*/
+qmTwiEditFlag::qmTwiEditFlag ( const QString txt, bool checked, int usort  ) :  QTableWidgetItem(txt)
+{
+    sort = usort;
+    setCheckState(checked ? Qt::Checked : Qt::Unchecked);
+    setFlags(flags() | (Qt::ItemIsEditable | Qt::ItemIsUserCheckable));
+}
+bool qmTwiEditFlag::operator< ( const QTableWidgetItem & other ) const
+{
+    if (sort)
+        return true;
+    const qmTwiEditFlag * other_widget = dynamic_cast<const qmTwiEditFlag*>(&other);
+    if (other_widget)
+    {
+        return (other_widget->checkState() < checkState());
+    }
+    else
+    {
+        return false;
+    }
+}

Subversion Repositories svn1

(root)/Mara/branches/QtMain/qmTableWidgetItem.cpp – Rev 310 → 313