Change `isXFile` to `hasXExtension`

5 files changed, 78 insertions, 75 deletions

diff --git a/src/pluginlist.cpp b/src/pluginlist.cpp
index 2805e04e..9a19fb2c 100644
--- a/src/pluginlist.cpp
+++ b/src/pluginlist.cpp
@@ -326,7 +326,7 @@ void PluginList::fixPluginRelationships()
   // Count the types of plugins

   int masterCount = 0;

   for (auto plugin : m_ESPs) {

-    if (plugin.isLightFile || plugin.isMasterFlagged) {

+    if (plugin.hasLightExtension || plugin.isMasterFlagged) {

       masterCount++;

     }

   }

@@ -334,7 +334,7 @@ void PluginList::fixPluginRelationships()
   // Ensure masters are up top and normal plugins are down below

   for (int i = 0; i < m_ESPs.size(); i++) {

     ESPInfo& plugin = m_ESPs[i];

-    if (plugin.isLightFile || plugin.isMasterFlagged) {

+    if (plugin.hasLightExtension || plugin.isMasterFlagged) {

       if (plugin.priority > masterCount) {

         int newPriority = masterCount + 1;

         setPluginPriority(i, newPriority);

@@ -923,68 +923,71 @@ int PluginList::loadOrder(const QString &name) const
   }

 }

 

-bool PluginList::isMasterFile(const QString &name) const

+QStringList PluginList::masters(const QString &name) const

 {

   auto iter = m_ESPsByName.find(name);

   if (iter == m_ESPsByName.end()) {

-    return false;

+    return QStringList();

   } else {

-    return m_ESPs[iter->second].isMasterFile;

+    QStringList result;

+    for (const QString &master : m_ESPs[iter->second].masters) {

+      result.append(master);

+    }

+    return result;

   }

 }

 

-bool PluginList::isMasterFlagged(const QString& name) const

+QString PluginList::origin(const QString &name) const

 {

   auto iter = m_ESPsByName.find(name);

   if (iter == m_ESPsByName.end()) {

-    return false;

-  }

-  else {

-    return m_ESPs[iter->second].isMasterFlagged;

+    return QString();

+  } else {

+    return m_ESPs[iter->second].originName;

   }

 }

 

-bool PluginList::isLightFile(const QString &name) const

+bool PluginList::hasMasterExtension(const QString& name) const

 {

   auto iter = m_ESPsByName.find(name);

   if (iter == m_ESPsByName.end()) {

     return false;

-  } else {

-    return m_ESPs[iter->second].isLightFile;

+  }

+  else {

+    return m_ESPs[iter->second].hasMasterExtension;

   }

 }

 

-bool PluginList::isLightFlagged(const QString &name) const

+bool PluginList::hasLightExtension(const QString& name) const

 {

   auto iter = m_ESPsByName.find(name);

   if (iter == m_ESPsByName.end()) {

     return false;

-  } else {

-    return m_ESPs[iter->second].isLightFlagged;

+  }

+  else {

+    return m_ESPs[iter->second].hasLightExtension;

   }

 }

 

-QStringList PluginList::masters(const QString &name) const

+bool PluginList::isMasterFlagged(const QString& name) const

 {

   auto iter = m_ESPsByName.find(name);

   if (iter == m_ESPsByName.end()) {

-    return QStringList();

-  } else {

-    QStringList result;

-    for (const QString &master : m_ESPs[iter->second].masters) {

-      result.append(master);

-    }

-    return result;

+    return false;

+  }

+  else {

+    return m_ESPs[iter->second].isMasterFlagged;

   }

 }

 

-QString PluginList::origin(const QString &name) const

+bool PluginList::isLightFlagged(const QString& name) const

 {

   auto iter = m_ESPsByName.find(name);

   if (iter == m_ESPsByName.end()) {

-    return QString();

-  } else {

-    return m_ESPs[iter->second].originName;

+    return false;

+  }

+  else {

+    return m_ESPs[iter->second].isLightFlagged;

   }

 }

 

@@ -1049,7 +1052,7 @@ void PluginList::generatePluginIndexes()
       ++numSkipped;

       continue;

     }

-    if (lightPluginsSupported && (m_ESPs[i].isLightFile || m_ESPs[i].isLightFlagged)) {

+    if (lightPluginsSupported && (m_ESPs[i].hasLightExtension || m_ESPs[i].isLightFlagged)) {

       int ESLpos = 254 + ((numESLs + 1) / 4096);

       m_ESPs[i].index = QString("%1:%2").arg(ESLpos, 2, 16, QChar('0')).arg((numESLs) % 4096, 3, 16, QChar('0')).toUpper();

       ++numESLs;

@@ -1178,10 +1181,10 @@ QVariant PluginList::fontData(const QModelIndex &modelIndex) const
 

   QFont result;

 

-  if (m_ESPs[index].isMasterFile || m_ESPs[index].isMasterFlagged) {

+  if (m_ESPs[index].hasMasterExtension || m_ESPs[index].isMasterFlagged) {

     result.setItalic(true);

     result.setWeight(QFont::Bold);

-  } else if (m_ESPs[index].isLightFile || m_ESPs[index].isLightFlagged) {

+  } else if (m_ESPs[index].hasLightExtension || m_ESPs[index].isLightFlagged) {

     result.setItalic(true);

   }

 

@@ -1263,7 +1266,7 @@ QVariant PluginList::tooltipData(const QModelIndex &modelIndex) const
           "be added to your game settings, overwriting in case of conflicts.");

     }

 

-    if (esp.isLightFlagged && !esp.isLightFile) {

+    if (esp.isLightFlagged && !esp.hasLightExtension) {

       toolTip +=

         "<br><br>" + tr(

           "This ESP is flagged as an ESL. It will adhere to the ESP load "

@@ -1385,7 +1388,7 @@ QVariant PluginList::iconData(const QModelIndex &modelIndex) const
     result.append(":/MO/gui/archive_conflict_neutral");

   }

 

-  if (esp.isLightFlagged && !esp.isLightFile) {

+  if (esp.isLightFlagged && !esp.hasLightExtension) {

     result.append(":/MO/gui/awaiting");

   }

 

@@ -1521,18 +1524,18 @@ void PluginList::setPluginPriority(int row, int &newPriority, bool isForced)
   else if (newPriorityTemp >= static_cast<int>(m_ESPsByPriority.size()))

     newPriorityTemp = static_cast<int>(m_ESPsByPriority.size()) - 1;

 

-  if (!m_ESPs[row].isMasterFlagged && !m_ESPs[row].isLightFile) {

+  if (!m_ESPs[row].isMasterFlagged && !m_ESPs[row].hasLightExtension) {

     // don't allow esps to be moved above esms

     while ((newPriorityTemp < static_cast<int>(m_ESPsByPriority.size() - 1)) &&

             (m_ESPs.at(m_ESPsByPriority.at(newPriorityTemp)).isMasterFlagged ||

-             m_ESPs.at(m_ESPsByPriority.at(newPriorityTemp)).isLightFile)) {

+             m_ESPs.at(m_ESPsByPriority.at(newPriorityTemp)).hasLightExtension)) {

       ++newPriorityTemp;

     }

   } else {

     // don't allow esms to be moved below esps

     while ((newPriorityTemp > 0) &&

            !m_ESPs.at(m_ESPsByPriority.at(newPriorityTemp)).isMasterFlagged &&

-           !m_ESPs.at(m_ESPsByPriority.at(newPriorityTemp)).isLightFile) {

+           !m_ESPs.at(m_ESPsByPriority.at(newPriorityTemp)).hasLightExtension) {

       --newPriorityTemp;

     }

     // also don't allow "regular" esms to be moved above primary plugins

@@ -1705,9 +1708,9 @@ PluginList::ESPInfo::ESPInfo(const QString &name, bool enabled,
   try {

     ESP::File file(ToWString(fullPath));

     auto extension = name.right(3).toLower();

-    isMasterFile = (extension == "esm");

+    hasMasterExtension = (extension == "esm");

+    hasLightExtension = lightPluginsAreSupported && (extension == "esl");

     isMasterFlagged = file.isMaster();

-    isLightFile = lightPluginsAreSupported && (extension == "esl");

     isLightFlagged = lightPluginsAreSupported && file.isLight();

 

     author = QString::fromLatin1(file.author().c_str());

@@ -1718,9 +1721,9 @@ PluginList::ESPInfo::ESPInfo(const QString &name, bool enabled,
     }

   } catch (const std::exception &e) {

     log::error("failed to parse plugin file {}: {}", fullPath, e.what());

-    isMasterFile = false;

+    hasMasterExtension = false;

+    hasLightExtension = false;

     isMasterFlagged = false;

-    isLightFile = false;

     isLightFlagged = false;

   }

 }

diff --git a/src/pluginlist.h b/src/pluginlist.h
index c2f3796c..965f8cfe 100644
--- a/src/pluginlist.h
+++ b/src/pluginlist.h
@@ -232,14 +232,15 @@ public:
   int priority(const QString &name) const;

   int loadOrder(const QString &name) const;

   bool setPriority(const QString& name, int newPriority);

-  bool isMasterFile(const QString &name) const;

-  bool isMasterFlagged(const QString& name) const;

-  bool isLightFile(const QString &name) const;

-  bool isLightFlagged(const QString &name) const;

   QStringList masters(const QString &name) const;

   QString origin(const QString &name) const;

   void setLoadOrder(const QStringList& pluginList);

 

+  bool hasMasterExtension(const QString& name) const;

+  bool hasLightExtension(const QString& name) const;

+  bool isMasterFlagged(const QString& name) const;

+  bool isLightFlagged(const QString& name) const;

+

   boost::signals2::connection onRefreshed(const std::function<void()>& callback);

   boost::signals2::connection onPluginMoved(const std::function<void(const QString&, int, int)>& func);

   boost::signals2::connection onPluginStateChanged(const std::function<void (const std::map<QString, PluginStates>&)> &func);

@@ -320,9 +321,9 @@ private:
     int loadOrder;

     FILETIME time;

     QString originName;

-    bool isMasterFile;

+    bool hasMasterExtension;

+    bool hasLightExtension;

     bool isMasterFlagged;

-    bool isLightFile;

     bool isLightFlagged;

     bool modSelected;

     QString author;

diff --git a/src/pluginlistproxy.cpp b/src/pluginlistproxy.cpp
index 3f8f740d..604aab3e 100644
--- a/src/pluginlistproxy.cpp
+++ b/src/pluginlistproxy.cpp
@@ -63,26 +63,6 @@ void PluginListProxy::setLoadOrder(const QStringList& pluginList)
   return m_Proxied->setLoadOrder(pluginList);
 }
 
-bool PluginListProxy::isMasterFile(const QString& name) const
-{
-  return m_Proxied->isMasterFile(name);
-}
-
-bool PluginListProxy::isMasterFlagged(const QString& name) const
-{
-  return m_Proxied->isMasterFlagged(name);
-}
-
-bool PluginListProxy::isLightFile(const QString& name) const
-{
-  return m_Proxied->isLightFile(name);
-}
-
-bool PluginListProxy::isLightFlagged(const QString& name) const
-{
-  return m_Proxied->isLightFlagged(name);
-}
-
 bool PluginListProxy::isMaster(const QString& name) const
 {
   return m_Proxied->isMasterFlagged(name);
@@ -112,3 +92,23 @@ bool PluginListProxy::onPluginStateChanged(const std::function<void(const std::m
 {
   return m_PluginStateChanged.connect(func).connected();
 }
+
+bool PluginListProxy::hasMasterExtension(const QString& name) const
+{
+  return m_Proxied->hasMasterExtension(name);
+}
+
+bool PluginListProxy::hasLightExtension(const QString& name) const
+{
+  return m_Proxied->hasLightExtension(name);
+}
+
+bool PluginListProxy::isMasterFlagged(const QString& name) const
+{
+  return m_Proxied->isMasterFlagged(name);
+}
+
+bool PluginListProxy::isLightFlagged(const QString& name) const
+{
+  return m_Proxied->isLightFlagged(name);
+}
diff --git a/src/pluginlistproxy.h b/src/pluginlistproxy.h
index 3c53ef36..202b8484 100644
--- a/src/pluginlistproxy.h
+++ b/src/pluginlistproxy.h
@@ -8,7 +8,6 @@ class OrganizerProxy;
 
 class PluginListProxy : public MOBase::IPluginList
 {
-
 public:
 
   PluginListProxy(OrganizerProxy* oproxy, PluginList* pluginlist);
@@ -21,18 +20,18 @@ public:
   bool setPriority(const QString& name, int newPriority) override;
   int loadOrder(const QString& name) const override;
   void setLoadOrder(const QStringList& pluginList) override;
-  bool isMasterFile(const QString& name) const override;
-  bool isMasterFlagged(const QString& name) const override;
-  bool isLightFile(const QString& name) const override;
-  bool isLightFlagged(const QString& name) const override;
+  [[deprecated]] bool isMaster(const QString& name) const override;
   QStringList masters(const QString& name) const override;
   QString origin(const QString& name) const override;
+
   bool onRefreshed(const std::function<void()>& callback) override;
   bool onPluginMoved(const std::function<void(const QString&, int, int)>& func) override;
   bool onPluginStateChanged(const std::function<void(const std::map<QString, PluginStates>&)>& func) override;
 
-  // DEPRECATED
-  [[deprecated]] bool isMaster(const QString& name) const override;
+  bool hasMasterExtension(const QString& name) const override;
+  bool hasLightExtension(const QString& name) const override;
+  bool isMasterFlagged(const QString& name) const override;
+  bool isLightFlagged(const QString& name) const override;
 
 private:
 
diff --git a/src/pluginlistview.cpp b/src/pluginlistview.cpp
index 887f9aec..c7183d0b 100644
--- a/src/pluginlistview.cpp
+++ b/src/pluginlistview.cpp
@@ -71,12 +71,12 @@ void PluginListView::updatePluginCount()
   for (QString plugin : list->pluginNames()) {
     bool active = list->isEnabled(plugin);
     bool visible = m_sortProxy->filterMatchesPlugin(plugin);
-    if (list->isLightFile(plugin) || list->isLightFlagged(plugin)) {
+    if (list->hasLightExtension(plugin) || list->isLightFlagged(plugin)) {
       lightMasterCount++;
       activeLightMasterCount += active;
       activeVisibleCount += visible && active;
     }
-    else if (list->isMasterFile(plugin) || list->isMasterFlagged(plugin)) {
+    else if (list->hasMasterExtension(plugin) || list->isMasterFlagged(plugin)) {
       masterCount++;
       activeMasterCount += active;
       activeVisibleCount += visible && active;