Merge remote-tracking branch 'remotes/origin/Develop' into archive_conflicts_2

1 files changed, 3 insertions, 0 deletions

diff --git a/src/organizercore.h b/src/organizercore.h
index cde77f92..68d4e7e4 100644
--- a/src/organizercore.h
+++ b/src/organizercore.h
@@ -136,6 +136,7 @@ public:
 

   void refreshDirectoryStructure();

   void updateModInDirectoryStructure(unsigned int index, ModInfo::Ptr modInfo);

+  void updateModsInDirectoryStructure(QMap<unsigned int, ModInfo::Ptr> modInfos);

 

   void doAfterLogin(const std::function<void()> &function) { m_PostLoginTasks.append(function); }

 

@@ -240,6 +241,7 @@ public slots:
   void installDownload(int downloadIndex);

 

   void modStatusChanged(unsigned int index);

+  void modStatusChanged(QList<unsigned int> index);

   void requestDownload(const QUrl &url, QNetworkReply *reply);

   void downloadRequestedNXM(const QString &url);

 

@@ -268,6 +270,7 @@ private:
   bool queryLogin(QString &username, QString &password);

 

   void updateModActiveState(int index, bool active);

+  void updateModsActiveState(const QList<unsigned int> &modIndices, bool active);

 

   bool testForSteam();