From db2954e8eb41da715b9e7d79a72e225797401413 Mon Sep 17 00:00:00 2001 From: Tannin Date: Mon, 9 Mar 2015 12:22:13 +0100 Subject: minor cleanup --- .hgignore | 4 ++++ src/pluginlist.cpp | 7 ++++--- src/pluginlist.h | 4 ++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.hgignore b/.hgignore index acba45c6..58598840 100644 --- a/.hgignore +++ b/.hgignore @@ -34,6 +34,10 @@ html source/organizer/resources/contents/icons source/plugins/build-* */GeneratedFiles/* +translations/* +source/*/Win32/Debug/* +source/plugins/*/Win32/Debug/* +*~ syntax: regexp Makefile\.(Debug|Release) source/.*/debug/.* diff --git a/src/pluginlist.cpp b/src/pluginlist.cpp index f8a27ef4..cccb7d12 100644 --- a/src/pluginlist.cpp +++ b/src/pluginlist.cpp @@ -935,6 +935,7 @@ Qt::ItemFlags PluginList::flags(const QModelIndex &modelIndex) const if (modelIndex.column() == COL_PRIORITY) { result |= Qt::ItemIsEditable; } + result &= ~Qt::ItemIsDropEnabled; } else { result |= Qt::ItemIsDropEnabled; } @@ -1082,7 +1083,7 @@ bool PluginList::eventFilter(QObject *obj, QEvent *event) QAbstractItemView *itemView = qobject_cast(obj); if (itemView == nullptr) { - return QObject::eventFilter(obj, event); + return QAbstractItemModel::eventFilter(obj, event); } QKeyEvent *keyEvent = static_cast(event); @@ -1110,7 +1111,7 @@ bool PluginList::eventFilter(QObject *obj, QEvent *event) rows.swap(i, rows.size() - i - 1); } } - foreach (QModelIndex idx, rows) { + for (QModelIndex idx : rows) { idx = proxyModel->mapToSource(idx); int newPriority = m_ESPs[idx.row()].m_Priority + diff; if ((newPriority >= 0) && (newPriority < rowCount())) { @@ -1143,7 +1144,7 @@ bool PluginList::eventFilter(QObject *obj, QEvent *event) return true; } } - return QObject::eventFilter(obj, event); + return QAbstractItemModel::eventFilter(obj, event); } diff --git a/src/pluginlist.h b/src/pluginlist.h index 80fcc25b..7be2df28 100644 --- a/src/pluginlist.h +++ b/src/pluginlist.h @@ -26,6 +26,8 @@ along with Mod Organizer. If not, see . #include #include #include +#pragma warning(push) +#pragma warning(disable: 4100) #ifndef Q_MOC_RUN #include #include @@ -338,4 +340,6 @@ private: }; +#pragma warning(pop) + #endif // PLUGINLIST_H -- cgit v1.3.1