Merge pull request #695 from ModOrganizer2/Develop

Stage for Release 2.2.0

1 files changed, 18 insertions, 2 deletions

diff --git a/src/modlist.h b/src/modlist.h
index 42269386..402d662f 100644
--- a/src/modlist.h
+++ b/src/modlist.h
@@ -112,6 +112,9 @@ public:
   void setOverwriteMarkers(const std::set<unsigned int> &overwrite, const std::set<unsigned int> &overwritten);

   void setPluginContainer(PluginContainer *pluginContainer);

 

+  void setArchiveOverwriteMarkers(const std::set<unsigned int> &overwrite, const std::set<unsigned int> &overwritten);

+  void setArchiveLooseOverwriteMarkers(const std::set<unsigned int> &overwrite, const std::set<unsigned int> &overwritten);

+

   bool modInfoAboutToChange(ModInfo::Ptr info);

   void modInfoChanged(ModInfo::Ptr info);

 

@@ -233,9 +236,18 @@ signals:
    * @param role role of the field that changed

    * @note this signal must only be emitted if the row really did change.

    *       Slots handling this signal therefore do not have to verify that a change has happened

-   * @note this signal is currently only used in tutorials

    **/

-  void modlist_changed(const QModelIndex &index, int role);

+  void modlistChanged(const QModelIndex &index, int role);

+

+  /**

+  * @brief emitted whenever multiple row sin the list has changed

+  *

+  * @param indicies the list of indicies of the changed field

+  * @param role role of the field that changed

+  * @note this signal must only be emitted if the row really did change.

+  *       Slots handling this signal therefore do not have to verify that a change has happened

+  **/

+  void modlistChanged(const QModelIndexList &indicies, int role);

 

   /**

    * @brief emitted to have all selected mods deleted

@@ -331,6 +343,10 @@ private:
 

   std::set<unsigned int> m_Overwrite;

   std::set<unsigned int> m_Overwritten;

+  std::set<unsigned int> m_ArchiveOverwrite;

+  std::set<unsigned int> m_ArchiveOverwritten;

+  std::set<unsigned int> m_ArchiveLooseOverwrite;

+  std::set<unsigned int> m_ArchiveLooseOverwritten;

 

   TModInfoChange m_ChangeInfo;