From 6f949ebf18ffda605abbb60937b00018a2b80f46 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 2 Aug 2019 15:03:01 +0200 Subject: [PATCH] Android: Simplify AndroidExtraLibraryListModel::data() This was triggered by a warning on a empty expression statement, but it turns out that QDir::cleanPath calls can be avoided, too. Change-Id: I930cbb1272294f57794c29e0cd48e3c0ba8c6fdf Reviewed-by: BogDan Vatra --- src/plugins/android/androidextralibrarylistmodel.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/plugins/android/androidextralibrarylistmodel.cpp b/src/plugins/android/androidextralibrarylistmodel.cpp index b6309aa9c17..0890cbefb30 100644 --- a/src/plugins/android/androidextralibrarylistmodel.cpp +++ b/src/plugins/android/androidextralibrarylistmodel.cpp @@ -76,11 +76,9 @@ int AndroidExtraLibraryListModel::columnCount(const QModelIndex &) const QVariant AndroidExtraLibraryListModel::data(const QModelIndex &index, int role) const { Q_ASSERT(index.row() >= 0 && index.row() < m_entries.size()); - const QString &entry = QDir::cleanPath(m_entries.at(index.row())); - switch (role) { - case Qt::DisplayRole: return entry; - default: return QVariant(); - }; + if (role == Qt::DisplayRole) + return QDir::cleanPath(m_entries.at(index.row())); + return {}; } void AndroidExtraLibraryListModel::updateModel()