Merge with default

1 files changed, 5 insertions, 7 deletions

diff --git a/src/modlist.cpp b/src/modlist.cpp
index 9b99b488..84e76b75 100644
--- a/src/modlist.cpp
+++ b/src/modlist.cpp
@@ -51,7 +51,6 @@ ModList::ModList(QObject *parent)
   : QAbstractItemModel(parent), m_Profile(NULL), m_Modified(false),
     m_FontMetrics(QFont())
 {
-//  setSupportedDragActions(Qt::MoveAction);
 }
 
 
@@ -297,8 +296,7 @@ bool ModList::renameMod(int index, const QString &newName)
   emit modRenamed(oldName, newName);
 
   // invalidate the currently displayed state of this list
-#pragma message("why is this necessary? It unselects the current selection")
-  notifyChange(-1);
+//  notifyChange(-1);
   return true;
 }
 
@@ -317,7 +315,7 @@ bool ModList::setData(const QModelIndex &index, const QVariant &value, int role)
       m_Profile->setModEnabled(index.row(), enabled);
       m_Modified = true;
 
-      emit modlist_changed(index.row());
+      emit modlist_changed(index, role);
     }
     return true;
   } else if (role == Qt::EditRole) {
@@ -331,7 +329,7 @@ bool ModList::setData(const QModelIndex &index, const QVariant &value, int role)
         if (ok) {
           m_Profile->setModPriority(index.row(), newPriority);
 
-          emit modlist_changed(index.row());
+          emit modlist_changed(index, role);
           return true;
         } else {
           return false;
@@ -343,7 +341,7 @@ bool ModList::setData(const QModelIndex &index, const QVariant &value, int role)
         int newID = value.toInt(&ok);
         if (ok) {
           info->setNexusID(newID);
-          emit modlist_changed(index.row());
+          emit modlist_changed(index, role);
           return true;
         } else {
           return false;
@@ -595,7 +593,7 @@ QString ModList::getColumnName(int column)
 {
   switch (column) {
     case COL_FLAGS:    return tr("Flags");
-    case COL_NAME:     return tr("Name");
+    case COL_NAME:     return tr("Mod Name");
     case COL_VERSION:  return tr("Version");
     case COL_PRIORITY: return tr("Priority");
     case COL_CATEGORY: return tr("Category");