Clean up code

This commit is contained in:
Chocobo1 2022-11-05 02:44:44 +08:00
parent 529c1ec9f4
commit e7ece66717
No known key found for this signature in database
GPG key ID: 210D9C873253A68C
2 changed files with 7 additions and 13 deletions

View file

@ -79,25 +79,19 @@ void TorrentContentTreeView::keyPressEvent(QKeyEvent *event)
event->accept(); event->accept();
QModelIndex current = currentNameCell(); const QVariant value = currentNameCell().data(Qt::CheckStateRole);
QVariant value = current.data(Qt::CheckStateRole);
if (!value.isValid()) if (!value.isValid())
{ {
Q_ASSERT(false); Q_ASSERT(false);
return; return;
} }
Qt::CheckState state = (static_cast<Qt::CheckState>(value.toInt()) == Qt::Checked const Qt::CheckState state = (static_cast<Qt::CheckState>(value.toInt()) == Qt::Checked)
? Qt::Unchecked : Qt::Checked); ? Qt::Unchecked : Qt::Checked;
const QModelIndexList selection = selectionModel()->selectedRows(TorrentContentModelItem::COL_NAME); const QModelIndexList selection = selectionModel()->selectedRows(TorrentContentModelItem::COL_NAME);
for (const QModelIndex &index : selection) for (const QModelIndex &index : selection)
{
Q_ASSERT(index.column() == TorrentContentModelItem::COL_NAME);
model()->setData(index, state, Qt::CheckStateRole); model()->setData(index, state, Qt::CheckStateRole);
}
} }
void TorrentContentTreeView::renameSelectedFile(BitTorrent::AbstractFileStorage &fileStorage) void TorrentContentTreeView::renameSelectedFile(BitTorrent::AbstractFileStorage &fileStorage)
@ -142,16 +136,16 @@ void TorrentContentTreeView::renameSelectedFile(BitTorrent::AbstractFileStorage
} }
} }
QModelIndex TorrentContentTreeView::currentNameCell() QModelIndex TorrentContentTreeView::currentNameCell() const
{ {
QModelIndex current = currentIndex(); const QModelIndex current = currentIndex();
if (!current.isValid()) if (!current.isValid())
{ {
Q_ASSERT(false); Q_ASSERT(false);
return {}; return {};
} }
return model()->index(current.row(), TorrentContentModelItem::COL_NAME, current.parent()); return current.siblingAtColumn(TorrentContentModelItem::COL_NAME);
} }
void TorrentContentTreeView::wheelEvent(QWheelEvent *event) void TorrentContentTreeView::wheelEvent(QWheelEvent *event)

View file

@ -49,6 +49,6 @@ public:
void renameSelectedFile(BitTorrent::AbstractFileStorage &fileStorage); void renameSelectedFile(BitTorrent::AbstractFileStorage &fileStorage);
private: private:
QModelIndex currentNameCell(); QModelIndex currentNameCell() const;
void wheelEvent(QWheelEvent *event) override; void wheelEvent(QWheelEvent *event) override;
}; };