minor cleanup

2 files changed, 8 insertions, 3 deletions

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<QAbstractItemView*>(obj);

 

     if (itemView == nullptr) {

-      return QObject::eventFilter(obj, event);

+      return QAbstractItemModel::eventFilter(obj, event);

     }

 

     QKeyEvent *keyEvent = static_cast<QKeyEvent*>(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 <http://www.gnu.org/licenses/>.
 #include <QListWidget>

 #include <QTimer>

 #include <QTemporaryFile>

+#pragma warning(push)

+#pragma warning(disable: 4100)

 #ifndef Q_MOC_RUN

 #include <boost/signals2.hpp>

 #include <boost/ptr_container/ptr_vector.hpp>

@@ -338,4 +340,6 @@ private:
 

 };

 

+#pragma warning(pop)

+

 #endif // PLUGINLIST_H