TimestampRole == 33 for timestamp data in myTableWidgetItem

Author: g1itch

src/bitmessageqt/__init__.py

@@ -62,6 +62,8 @@
 except ImportError:
     get_plugins = False
 
+TimestampRole = 33
+
 
 def change_translation(newlocale):
     global qmytranslator, qsystranslator
@@ -1086,7 +1088,7 @@ def addMessageListItemSent(
         newItem = myTableWidgetItem(statusText)
         newItem.setToolTip(statusText)
         newItem.setData(QtCore.Qt.UserRole, ackdata)
-        newItem.setData(33, int(lastactiontime))
+        newItem.setData(TimestampRole, lastactiontime)
         newItem.setFlags(
             QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
         items.append(newItem)
@@ -1118,7 +1120,7 @@ def addMessageListItemInbox(
         time_item = myTableWidgetItem(l10n.formatTimestamp(received))
         time_item.setToolTip(l10n.formatTimestamp(received))
         time_item.setData(QtCore.Qt.UserRole, msgid)
-        time_item.setData(33, int(received))
+        time_item.setData(TimestampRole, received)
         time_item.setFlags(
             QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
         if not read:
@@ -4666,16 +4668,25 @@ def click_pushButtonNamecoinTest(self):
 # correctly (rather than alphabetically), we need to overload the <
 # operator and use this class instead of QTableWidgetItem.
 class myTableWidgetItem(QtWidgets.QTableWidgetItem):
+    """
+    A subclass of QTableWidgetItem for received field.
+    '<' operator is overloaded to sort by TimestampRole == 33
+    msgid is stored in instance variable _data
+    """
+    _data = None
 
     def __lt__(self, other):
-        return self.data(33) < other.data(33)
+        return self.data(TimestampRole) < other.data(TimestampRole)
 
     def setData(self, role, value):
+        """Stores data for QtCore.Qt.UserRole in _data"""
         if role == QtCore.Qt.UserRole:
             self._data = value
-        return super(myTableWidgetItem, self).setData(role, value)
+        else:
+            super(myTableWidgetItem, self).setData(role, value)
 
     def data(self, role):
+        """Returns raw msgid string for QtCore.Qt.UserRole stored in _data"""
         if role == QtCore.Qt.UserRole:
             return self._data
         return super(myTableWidgetItem, self).data(role)