Merge branch 'master' into new_vfs_library

Conflicts:
	src/gameinfoimpl.cpp
	src/installationmanager.cpp
	src/mainwindow.cpp
	src/organizercore.cpp
	src/organizercore.h
	src/organizerproxy.cpp
	src/organizerproxy.h
	src/savegamegamebryo.cpp
	src/savegamegamebyro.h
	src/selfupdater.h
	src/shared/fallout3info.cpp
	src/shared/fallout3info.h
	src/shared/falloutnvinfo.cpp
	src/shared/falloutnvinfo.h
	src/shared/gameinfo.cpp
	src/shared/gameinfo.h
	src/shared/oblivioninfo.cpp
	src/shared/oblivioninfo.h
	src/shared/skyriminfo.cpp
	src/shared/skyriminfo.h
	src/spawn.cpp
	src/transfersavesdialog.cpp

1 files changed, 12 insertions, 0 deletions

diff --git a/src/pluginlist.h b/src/pluginlist.h
index f8972f05..9fe6eeac 100644
--- a/src/pluginlist.h
+++ b/src/pluginlist.h
@@ -22,16 +22,20 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 

 #include <directoryentry.h>

 #include <ipluginlist.h>

+namespace MOBase { class IPluginGame; }

+

 #include <QString>

 #include <QListWidget>

 #include <QTimer>

 #include <QTemporaryFile>

+

 #pragma warning(push)

 #pragma warning(disable: 4100)

 #ifndef Q_MOC_RUN

 #include <boost/signals2.hpp>

 #include <boost/ptr_container/ptr_vector.hpp>

 #endif

+

 #include <vector>

 #include <map>

 

@@ -253,6 +257,12 @@ public slots:
    **/

   void disableAll();

 

+  /**

+   * @brief The currently managed game has changed

+   * @param gamePlugin

+   */

+  void managedGameChanged(MOBase::IPluginGame const *gamePlugin);

+

 signals:

 

  /**

@@ -337,6 +347,8 @@ private:
 

   QTemporaryFile m_TempFile;

 

+  MOBase::IPluginGame const *m_GamePlugin;

+

 };

 

 #pragma warning(pop)