d4708
/
qBittorrent
mirror of https://github.com/d47081/qBittorrent.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Don't use hardcoded numbers to refer to columns.

adaptive-webui-19844
sledgehammer999 8 years ago
parent
2d37a39e43
commit
88b2b26007
No known key found for this signature in database
GPG Key ID: 6E4A2D025B7CC9A2
2 changed files with 4 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/gui/torrentcontentfiltermodel.cpp
  2. 6
      src/gui/torrentcontentmodel.cpp

2
src/gui/torrentcontentfiltermodel.cpp
Unescape View File

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

6
src/gui/torrentcontentmodel.cpp
Unescape View File

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

Write Preview
Loading…
Cancel
Save