Merge branch 'master' into issue/344

# Conflicts:
#	src/gameinfoimpl.cpp
#	src/gameinfoimpl.h
#	src/shared/fallout3info.h
#	src/shared/falloutnvinfo.h
#	src/shared/gameinfo.h
#	src/shared/oblivioninfo.h
#	src/shared/skyriminfo.h

1 files changed, 6 insertions, 1 deletions

diff --git a/src/modinfo.h b/src/modinfo.h
index 7d305c11..ae22ccd8 100644
--- a/src/modinfo.h
+++ b/src/modinfo.h
@@ -22,6 +22,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 

 #include "imodinterface.h"

 #include "versioninfo.h"

+//#include <directoryentry.h>

 

 class QDateTime;

 class QDir;

@@ -36,6 +37,7 @@ class QDir;
 #include <set>

 #include <vector>

 

+namespace MOBase { class IPluginGame; }

 namespace MOShared { class DirectoryEntry; }

 

 /**

@@ -104,7 +106,10 @@ public:
   /**

    * @brief read the mod directory and Mod ModInfo objects for all subdirectories

    **/

-  static void updateFromDisc(const QString &modDirectory, MOShared::DirectoryEntry **directoryStructure, bool displayForeign);

+  static void updateFromDisc(const QString &modDirectory,

+                             MOShared::DirectoryEntry **directoryStructure,

+                             bool displayForeign,

+                             MOBase::IPluginGame const *game);

 

   static void clear() { s_Collection.clear(); s_ModsByName.clear(); s_ModsByModID.clear(); }