From ea6292168a6acd4c263913f0ccd7dd64daf4f5cf Mon Sep 17 00:00:00 2001 From: Sandro Jäckel Date: Fri, 23 Feb 2018 01:45:58 +0100 Subject: Revert "Applied clang-format on source" This reverts commit 5e5c9c07291f6b09623d31c92b1fb61c4ede576e. --- src/downloadlistsortproxy.cpp | 71 ++++++++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 31 deletions(-) (limited to 'src/downloadlistsortproxy.cpp') diff --git a/src/downloadlistsortproxy.cpp b/src/downloadlistsortproxy.cpp index bef8ffc2..2780f973 100644 --- a/src/downloadlistsortproxy.cpp +++ b/src/downloadlistsortproxy.cpp @@ -22,43 +22,52 @@ along with Mod Organizer. If not, see . #include "downloadmanager.h" #include "settings.h" -DownloadListSortProxy::DownloadListSortProxy(const DownloadManager* manager, QObject* parent) - : QSortFilterProxyModel(parent), m_Manager(manager), m_CurrentFilter() {} +DownloadListSortProxy::DownloadListSortProxy(const DownloadManager *manager, QObject *parent) + : QSortFilterProxyModel(parent), m_Manager(manager), m_CurrentFilter() +{ +} -void DownloadListSortProxy::updateFilter(const QString& filter) { - m_CurrentFilter = filter; - invalidateFilter(); +void DownloadListSortProxy::updateFilter(const QString &filter) +{ + m_CurrentFilter = filter; + invalidateFilter(); } -bool DownloadListSortProxy::lessThan(const QModelIndex& left, const QModelIndex& right) const { - int leftIndex = left.data().toInt(); - int rightIndex = right.data().toInt(); - if ((leftIndex < m_Manager->numTotalDownloads()) && (rightIndex < m_Manager->numTotalDownloads())) { - if (left.column() == DownloadList::COL_NAME) { - return m_Manager->getFileName(leftIndex).compare(m_Manager->getFileName(rightIndex), Qt::CaseInsensitive) < - 0; - } else if (left.column() == DownloadList::COL_FILETIME) { - return m_Manager->getFileTime(leftIndex) < m_Manager->getFileTime(rightIndex); - } else if (left.column() == DownloadList::COL_STATUS) { - return m_Manager->getState(leftIndex) < m_Manager->getState(rightIndex); - } else { - return leftIndex < rightIndex; - } + +bool DownloadListSortProxy::lessThan(const QModelIndex &left, + const QModelIndex &right) const +{ + int leftIndex = left.data().toInt(); + int rightIndex = right.data().toInt(); + if ((leftIndex < m_Manager->numTotalDownloads()) + && (rightIndex < m_Manager->numTotalDownloads())) { + if (left.column() == DownloadList::COL_NAME) { + return m_Manager->getFileName(leftIndex).compare(m_Manager->getFileName(rightIndex), Qt::CaseInsensitive) < 0; + } else if (left.column() == DownloadList::COL_FILETIME) { + return m_Manager->getFileTime(leftIndex) < m_Manager->getFileTime(rightIndex); + } else if (left.column() == DownloadList::COL_STATUS) { + return m_Manager->getState(leftIndex) < m_Manager->getState(rightIndex); } else { - return leftIndex < rightIndex; + return leftIndex < rightIndex; } + } else { + return leftIndex < rightIndex; + } } -bool DownloadListSortProxy::filterAcceptsRow(int sourceRow, const QModelIndex&) const { - if (m_CurrentFilter.length() == 0) { - return true; - } else if (sourceRow < m_Manager->numTotalDownloads()) { - int downloadIndex = sourceModel()->index(sourceRow, 0).data().toInt(); - QString displayedName = Settings::instance().metaDownloads() ? m_Manager->getDisplayName(downloadIndex) - : m_Manager->getFileName(downloadIndex); - return displayedName.contains(m_CurrentFilter, Qt::CaseInsensitive); - } else { - return false; - } +bool DownloadListSortProxy::filterAcceptsRow(int sourceRow, const QModelIndex&) const +{ + if (m_CurrentFilter.length() == 0) { + return true; + } else if (sourceRow < m_Manager->numTotalDownloads()) { + int downloadIndex = sourceModel()->index(sourceRow, 0).data().toInt(); + + QString displayedName = Settings::instance().metaDownloads() + ? m_Manager->getDisplayName(downloadIndex) + : m_Manager->getFileName(downloadIndex); + return displayedName.contains(m_CurrentFilter, Qt::CaseInsensitive); + } else { + return false; + } } -- cgit v1.3.1