Avoid repeating the return type

This commit is contained in:
thalieht 2019-02-14 19:16:42 +02:00
parent 9959a901fe
commit 8c944bd4e1
34 changed files with 123 additions and 123 deletions

View file

@ -113,12 +113,12 @@ namespace
const QString ext = info.suffix();
if (!ext.isEmpty()) {
QPixmap cached;
if (QPixmapCache::find(ext, &cached)) return QIcon(cached);
if (QPixmapCache::find(ext, &cached)) return {cached};
const QPixmap pixmap = pixmapForExtension(ext);
if (!pixmap.isNull()) {
QPixmapCache::insert(ext, pixmap);
return QIcon(pixmap);
return {pixmap};
}
}
return UnifiedFileIconProvider::icon(info);
@ -140,7 +140,7 @@ namespace
HRESULT hr = ::SHGetFileInfoW(extWithDot.toStdWString().c_str(),
FILE_ATTRIBUTE_NORMAL, &sfi, sizeof(sfi), SHGFI_ICON | SHGFI_USEFILEATTRIBUTES);
if (FAILED(hr))
return QPixmap();
return {};
QPixmap iconPixmap = QtWin::fromHICON(sfi.hIcon);
::DestroyIcon(sfi.hIcon);
@ -354,7 +354,7 @@ int TorrentContentModel::getFileIndex(const QModelIndex &index)
QVariant TorrentContentModel::data(const QModelIndex &index, int role) const
{
if (!index.isValid())
return QVariant();
return {};
auto *item = static_cast<TorrentContentModelItem*>(index.internalPointer());
@ -376,7 +376,7 @@ QVariant TorrentContentModel::data(const QModelIndex &index, int role) const
if (role == Qt::DisplayRole)
return item->data(index.column());
return QVariant();
return {};
}
Qt::ItemFlags TorrentContentModel::flags(const QModelIndex &index) const
@ -395,16 +395,16 @@ QVariant TorrentContentModel::headerData(int section, Qt::Orientation orientatio
if ((orientation == Qt::Horizontal) && (role == Qt::DisplayRole))
return m_rootItem->data(section);
return QVariant();
return {};
}
QModelIndex TorrentContentModel::index(int row, int column, const QModelIndex &parent) const
{
if (parent.isValid() && (parent.column() != 0))
return QModelIndex();
return {};
if (column >= TorrentContentModelItem::NB_COL)
return QModelIndex();
return {};
TorrentContentModelFolder *parentItem;
if (!parent.isValid())
@ -414,26 +414,26 @@ QModelIndex TorrentContentModel::index(int row, int column, const QModelIndex &p
Q_ASSERT(parentItem);
if (row >= parentItem->childCount())
return QModelIndex();
return {};
TorrentContentModelItem *childItem = parentItem->child(row);
if (childItem)
return createIndex(row, column, childItem);
return QModelIndex();
return {};
}
QModelIndex TorrentContentModel::parent(const QModelIndex &index) const
{
if (!index.isValid())
return QModelIndex();
return {};
auto *childItem = static_cast<TorrentContentModelItem*>(index.internalPointer());
if (!childItem)
return QModelIndex();
return {};
TorrentContentModelItem *parentItem = childItem->parent();
if (parentItem == m_rootItem)
return QModelIndex();
return {};
return createIndex(parentItem->row(), 0, parentItem);
}