Browse Source

Don't use hardcoded numbers to refer to columns.

adaptive-webui-19844
sledgehammer999 8 years ago
parent
commit
88b2b26007
No known key found for this signature in database
GPG Key ID: 6E4A2D025B7CC9A2
  1. 2
      src/gui/torrentcontentfiltermodel.cpp
  2. 6
      src/gui/torrentcontentmodel.cpp

2
src/gui/torrentcontentfiltermodel.cpp

@ -83,7 +83,7 @@ bool TorrentContentFilterModel::filterAcceptsRow(int source_row, const QModelInd @@ -83,7 +83,7 @@ bool TorrentContentFilterModel::filterAcceptsRow(int source_row, const QModelInd
bool TorrentContentFilterModel::lessThan(const QModelIndex &left, const QModelIndex &right) const {
switch (sortColumn()) {
case NAME: { // PropColumn::NAME
case TorrentContentModelItem::COL_NAME: {
QString vL = left.data().toString();
QString vR = right.data().toString();
TorrentContentModelItem::ItemType leftType = m_model->itemType(m_model->index(left.row(), 0, left.parent()));

6
src/gui/torrentcontentmodel.cpp

@ -122,7 +122,7 @@ bool TorrentContentModel::setData(const QModelIndex& index, const QVariant& valu @@ -122,7 +122,7 @@ bool TorrentContentModel::setData(const QModelIndex& index, const QVariant& valu
if (!index.isValid())
return false;
if ((index.column() == 0) && (role == Qt::CheckStateRole)) {
if ((index.column() == TorrentContentModelItem::COL_NAME) && (role == Qt::CheckStateRole)) {
TorrentContentModelItem *item = static_cast<TorrentContentModelItem*>(index.internalPointer());
qDebug("setData(%s, %d", qPrintable(item->name()), value.toInt());
if (item->priority() != value.toInt()) {
@ -182,14 +182,14 @@ QVariant TorrentContentModel::data(const QModelIndex& index, int role) const @@ -182,14 +182,14 @@ QVariant TorrentContentModel::data(const QModelIndex& index, int role) const
TorrentContentModelItem* item = static_cast<TorrentContentModelItem*>(index.internalPointer());
if ((index.column() == 0) && (role == Qt::DecorationRole)) {
if ((index.column() == TorrentContentModelItem::COL_NAME) && (role == Qt::DecorationRole)) {
if (item->itemType() == TorrentContentModelItem::FolderType)
return getDirectoryIcon();
else
return getFileIcon();
}
if ((index.column() == 0) && (role == Qt::CheckStateRole)) {
if ((index.column() == TorrentContentModelItem::COL_NAME) && (role == Qt::CheckStateRole)) {
if (item->data(TorrentContentModelItem::COL_PRIO).toInt() == prio::IGNORED)
return Qt::Unchecked;
if (item->data(TorrentContentModelItem::COL_PRIO).toInt() == prio::MIXED)

Loading…
Cancel
Save