diff -r 52e8c820d0dd -r c679fb30c8f3 Helpviewer/CookieJar/CookieModel.py
--- a/Helpviewer/CookieJar/CookieModel.py Mon Dec 28 18:31:37 2009 +0000
+++ b/Helpviewer/CookieJar/CookieModel.py Wed Dec 30 15:40:33 2009 +0000
@@ -48,17 +48,17 @@
fm = QFontMetrics(QFont())
height = fm.height() + fm.height() / 3
width = \
- fm.width(self.headerData(section, orientation, Qt.DisplayRole).toString())
- return QVariant(QSize(width, height))
+ fm.width(self.headerData(section, orientation, Qt.DisplayRole))
+ return QSize(width, height)
if orientation == Qt.Horizontal:
if role == Qt.DisplayRole:
try:
- return QVariant(self.__headers[section])
+ return self.__headers[section]
except IndexError:
- return QVariant()
+ return None
- return QVariant()
+ return None
return QAbstractTableModel.headerData(self, section, orientation, role)
@@ -68,33 +68,33 @@
@param index index to get data for (QModelIndex)
@param role role of the data to retrieve (integer)
- @return requested data (QVariant)
+ @return requested data
"""
lst = []
if self.__cookieJar is not None:
lst = self.__cookieJar.cookies()
if index.row() < 0 or index.row() >= len(lst):
- return QVariant()
+ return None
if role in (Qt.DisplayRole, Qt.EditRole):
cookie = lst[index.row()]
col = index.column()
if col == 0:
- return QVariant(cookie.domain())
+ return cookie.domain()
elif col == 1:
- return QVariant(cookie.name())
+ return cookie.name()
elif col == 2:
- return QVariant(cookie.path())
+ return cookie.path()
elif col == 3:
- return QVariant(cookie.isSecure())
+ return cookie.isSecure()
elif col == 4:
- return QVariant(cookie.expirationDate())
+ return cookie.expirationDate()
elif col == 5:
- return QVariant(cookie.value())
+ return cookie.value()
else:
- return QVariant()
+ return None
- return QVariant()
+ return None
def columnCount(self, parent = QModelIndex()):
"""
