Update MO2 beta 12 integration

5 files changed, 11 insertions, 7 deletions

diff --git a/libs/installer_bsplugins/src/BSPluginInfo/RecordFilterProxyModel.cpp b/libs/installer_bsplugins/src/BSPluginInfo/RecordFilterProxyModel.cpp
index 919e8c9..7c8bc95 100644
--- a/libs/installer_bsplugins/src/BSPluginInfo/RecordFilterProxyModel.cpp
+++ b/libs/installer_bsplugins/src/BSPluginInfo/RecordFilterProxyModel.cpp
@@ -22,7 +22,8 @@ void RecordFilterProxyModel::setFile(const QString& pluginName)
 void RecordFilterProxyModel::setFilterFlags(FilterFlags filterFlags)
 {
   m_FilterFlags = filterFlags;
-  invalidateRowsFilter();
+  beginFilterChange();
+  endFilterChange(QSortFilterProxyModel::Direction::Rows);
 }
 
 void RecordFilterProxyModel::setSourceModel(QAbstractItemModel* sourceModel)
@@ -46,7 +47,8 @@ void RecordFilterProxyModel::setSourceModel(QAbstractItemModel* sourceModel)
 void RecordFilterProxyModel::onSourceDataChanged()
 {
   if (dynamicSortFilter()) {
-    invalidateRowsFilter();
+    beginFilterChange();
+    endFilterChange(QSortFilterProxyModel::Direction::Rows);
   }
 }
 
diff --git a/libs/installer_bsplugins/src/BSPluginList/PluginSortFilterProxyModel.cpp b/libs/installer_bsplugins/src/BSPluginList/PluginSortFilterProxyModel.cpp
index 29de392..d3cf8e3 100644
--- a/libs/installer_bsplugins/src/BSPluginList/PluginSortFilterProxyModel.cpp
+++ b/libs/installer_bsplugins/src/BSPluginList/PluginSortFilterProxyModel.cpp
@@ -9,7 +9,8 @@ namespace BSPluginList
 void PluginSortFilterProxyModel::hideForceEnabledFiles(bool doHide)
 {
   m_HideForceEnabledFiles = doHide;
-  invalidateRowsFilter();
+  beginFilterChange();
+  endFilterChange(QSortFilterProxyModel::Direction::Rows);
 }
 
 bool PluginSortFilterProxyModel::filterMatchesPlugin(const QString& plugin) const
@@ -116,7 +117,8 @@ bool PluginSortFilterProxyModel::lessThan(const QModelIndex& source_left,
 void PluginSortFilterProxyModel::updateFilter(const QString& filter)
 {
   m_CurrentFilter = filter;
-  invalidateRowsFilter();
+  beginFilterChange();
+  endFilterChange(QSortFilterProxyModel::Direction::Rows);
 }
 
 }  // namespace BSPluginList
diff --git a/libs/installer_bsplugins/src/GUI/IconDelegate.cpp b/libs/installer_bsplugins/src/GUI/IconDelegate.cpp
index ff99405..84184cc 100644
--- a/libs/installer_bsplugins/src/GUI/IconDelegate.cpp
+++ b/libs/installer_bsplugins/src/GUI/IconDelegate.cpp
@@ -23,7 +23,7 @@ IconDelegate::IconDelegate(QTreeView* view, int column, int compactSize)
 {
   if (view) {
     connect(view->header(), &QHeaderView::sectionResized,
-            [=](int logicalIndex, [[maybe_unused]] int oldSize, int newSize) {
+            [this](int logicalIndex, [[maybe_unused]] int oldSize, int newSize) {
               if (logicalIndex == m_Column) {
                 m_Compact = newSize < m_CompactSize;
               }
diff --git a/libs/installer_bsplugins/src/TESData/PluginList.cpp b/libs/installer_bsplugins/src/TESData/PluginList.cpp
index 805261c..28a6a40 100644
--- a/libs/installer_bsplugins/src/TESData/PluginList.cpp
+++ b/libs/installer_bsplugins/src/TESData/PluginList.cpp
@@ -1052,7 +1052,7 @@ void PluginList::scanDataFiles(bool invalidate)
         std::make_shared<FileInfo>(this, filename, forceLoaded, forceEnabled,
                                    forceDisabled, lightPluginsAreSupported));
 
-    auto assocTask = std::async(std::launch::async, [=, &smph] {
+    auto assocTask = std::async(std::launch::async, [this, info, tree, &smph] {
       smph.acquire();
       checkBsa(*info, tree);
       checkIni(*info, tree);
diff --git a/libs/installer_bsplugins/src/TESFile/Type.h b/libs/installer_bsplugins/src/TESFile/Type.h
index 3b93b20..a2867ae 100644
--- a/libs/installer_bsplugins/src/TESFile/Type.h
+++ b/libs/installer_bsplugins/src/TESFile/Type.h
@@ -68,7 +68,7 @@ namespace literals
   {
     return T;
   }
-  static_assert("TES4"_ts.value == '4SET');
+  static_assert("TES4"_ts.value == 0x34534554);
   static_assert("AMMO"_ts < "BOOK"_ts);
 }  // namespace literals
 }  // namespace TESFile