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/pluginlistsortproxy.cpp | 137 ++++++++++++++++++++++++++------------------ 1 file changed, 80 insertions(+), 57 deletions(-) (limited to 'src/pluginlistsortproxy.cpp') diff --git a/src/pluginlistsortproxy.cpp b/src/pluginlistsortproxy.cpp index e6e8f6df..342b3744 100644 --- a/src/pluginlistsortproxy.cpp +++ b/src/pluginlistsortproxy.cpp @@ -19,94 +19,116 @@ along with Mod Organizer. If not, see . #include "pluginlistsortproxy.h" #include "messagedialog.h" -#include -#include #include -#include +#include +#include #include +#include -PluginListSortProxy::PluginListSortProxy(QObject* parent) - : QSortFilterProxyModel(parent), m_SortIndex(0), m_SortOrder(Qt::AscendingOrder) { - m_EnabledColumns.set(PluginList::COL_NAME); - m_EnabledColumns.set(PluginList::COL_PRIORITY); - m_EnabledColumns.set(PluginList::COL_MODINDEX); - this->setDynamicSortFilter(true); + +PluginListSortProxy::PluginListSortProxy(QObject *parent) + : QSortFilterProxyModel(parent), + m_SortIndex(0), m_SortOrder(Qt::AscendingOrder) +{ + m_EnabledColumns.set(PluginList::COL_NAME); + m_EnabledColumns.set(PluginList::COL_PRIORITY); + m_EnabledColumns.set(PluginList::COL_MODINDEX); + this->setDynamicSortFilter(true); } -void PluginListSortProxy::setEnabledColumns(unsigned int columns) { - emit layoutAboutToBeChanged(); - for (int i = 0; i <= PluginList::COL_LASTCOLUMN; ++i) { - m_EnabledColumns.set(i, (columns & (1 << i)) != 0); - } - emit layoutChanged(); + + + + +void PluginListSortProxy::setEnabledColumns(unsigned int columns) +{ + emit layoutAboutToBeChanged(); + for (int i = 0; i <= PluginList::COL_LASTCOLUMN; ++i) { + m_EnabledColumns.set(i, (columns & (1 << i)) != 0); + } + emit layoutChanged(); } -Qt::ItemFlags PluginListSortProxy::flags(const QModelIndex& modelIndex) const { - /* Qt::ItemFlags flags; - QModelIndex index = mapToSource(modelIndex); - if (index.isValid()) { - flags = sourceModel()->flags(index); - } - return flags;*/ - return sourceModel()->flags(mapToSource(modelIndex)); +Qt::ItemFlags PluginListSortProxy::flags(const QModelIndex &modelIndex) const +{ +/* Qt::ItemFlags flags; + QModelIndex index = mapToSource(modelIndex); + if (index.isValid()) { + flags = sourceModel()->flags(index); + } + return flags;*/ + + return sourceModel()->flags(mapToSource(modelIndex)); } -void PluginListSortProxy::updateFilter(const QString& filter) { - m_CurrentFilter = filter; - invalidateFilter(); + +void PluginListSortProxy::updateFilter(const QString &filter) +{ + m_CurrentFilter = filter; + invalidateFilter(); } -bool PluginListSortProxy::filterAcceptsRow(int row, const QModelIndex&) const { - return m_CurrentFilter.isEmpty() || - sourceModel()->data(sourceModel()->index(row, 0)).toString().contains(m_CurrentFilter, Qt::CaseInsensitive); + +bool PluginListSortProxy::filterAcceptsRow(int row, const QModelIndex&) const +{ + return m_CurrentFilter.isEmpty() || + sourceModel()->data(sourceModel()->index(row, 0)).toString().contains(m_CurrentFilter, Qt::CaseInsensitive); } -bool PluginListSortProxy::lessThan(const QModelIndex& left, const QModelIndex& right) const { - PluginList* plugins = qobject_cast(sourceModel()); - switch (left.column()) { + +bool PluginListSortProxy::lessThan(const QModelIndex &left, + const QModelIndex &right) const +{ + PluginList *plugins = qobject_cast(sourceModel()); + switch (left.column()) { case PluginList::COL_NAME: { - return QString::compare(plugins->getName(left.row()), plugins->getName(right.row()), Qt::CaseInsensitive) < 0; + return QString::compare(plugins->getName(left.row()), plugins->getName(right.row()), Qt::CaseInsensitive) < 0; } break; case PluginList::COL_FLAGS: { - QVariantList lhsList = left.data(Qt::UserRole + 1).toList(); - QVariantList rhsList = right.data(Qt::UserRole + 1).toList(); - if (lhsList.size() != rhsList.size()) { - return lhsList.size() < rhsList.size(); - } else { - for (int i = 0; i < lhsList.size(); ++i) { - if (lhsList.at(i) != rhsList.at(i)) { - return lhsList.at(i) < rhsList.at(i); - } - } - return false; + QVariantList lhsList = left.data(Qt::UserRole + 1).toList(); + QVariantList rhsList = right.data(Qt::UserRole + 1).toList(); + if (lhsList.size() != rhsList.size()) { + return lhsList.size() < rhsList.size(); + } else { + for (int i = 0; i < lhsList.size(); ++i) { + if (lhsList.at(i) != rhsList.at(i)) { + return lhsList.at(i) < rhsList.at(i); + } } + return false; + } } break; case PluginList::COL_MODINDEX: { - int leftVal = plugins->isEnabled(left.row()) ? plugins->getPriority(left.row()) : -1; - int rightVal = plugins->isEnabled(right.row()) ? plugins->getPriority(right.row()) : -1; - return leftVal < rightVal; + int leftVal = plugins->isEnabled(left.row()) ? plugins->getPriority(left.row()) : -1; + int rightVal = plugins->isEnabled(right.row()) ? plugins->getPriority(right.row()) : -1; + return leftVal < rightVal; } break; - default: { return plugins->getPriority(left.row()) < plugins->getPriority(right.row()); } break; - } + default: { + return plugins->getPriority(left.row()) < plugins->getPriority(right.row()); + } break; + } } -bool PluginListSortProxy::dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, - const QModelIndex& parent) { - if ((sortColumn() != PluginList::COL_PRIORITY) && (sortColumn() != PluginList::COL_MODINDEX)) { - QWidget* wid = qApp->activeWindow()->findChild("espList"); - MessageDialog::showMessage(tr("Drag&Drop is only supported when sorting by priority or mod index"), wid); - return false; + +bool PluginListSortProxy::dropMimeData(const QMimeData *data, Qt::DropAction action, + int row, int column, const QModelIndex &parent) +{ + if ((sortColumn() != PluginList::COL_PRIORITY) + && (sortColumn() != PluginList::COL_MODINDEX)) { + QWidget *wid = qApp->activeWindow()->findChild("espList"); + MessageDialog::showMessage(tr("Drag&Drop is only supported when sorting by priority or mod index"), wid); + return false; } if ((row == -1) && (column == -1)) { - return this->sourceModel()->dropMimeData(data, action, -1, -1, mapToSource(parent)); + return this->sourceModel()->dropMimeData(data, action, -1, -1, mapToSource(parent)); } // in the regular model, when dropping between rows, the row-value passed to // the sourceModel is inconsistent between ascending and descending ordering. // This should fix that if (sortOrder() == Qt::DescendingOrder) { - --row; + --row; } QModelIndex proxyIndex = index(row, column, parent); @@ -114,3 +136,4 @@ bool PluginListSortProxy::dropMimeData(const QMimeData* data, Qt::DropAction act return this->sourceModel()->dropMimeData(data, action, sourceIndex.row(), sourceIndex.column(), sourceIndex.parent()); } + -- cgit v1.3.1