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, 11 deletions

diff --git a/src/organizerproxy.cpp b/src/organizerproxy.cpp
index 665b15d1..79ff50e5 100644
--- a/src/organizerproxy.cpp
+++ b/src/organizerproxy.cpp
@@ -1,7 +1,8 @@
 #include "organizerproxy.h"

-#include <gameinfo.h>

+

 #include <appconfig.h>

 

+#include <QApplication>

 

 using namespace MOBase;

 using namespace MOShared;

@@ -13,11 +14,6 @@ OrganizerProxy::OrganizerProxy(OrganizerCore *organizer, const QString &pluginNa
 {

 }

 

-IGameInfo &OrganizerProxy::gameInfo() const

-{

-  return m_Proxied->gameInfo();

-}

-

 IModRepositoryBridge *OrganizerProxy::createNexusBridge() const

 {

   return new NexusBridge(m_PluginName);

@@ -40,7 +36,7 @@ QString OrganizerProxy::downloadsPath() const
 

 QString OrganizerProxy::overwritePath() const

 {

-  return QDir::fromNativeSeparators(ToQString(GameInfo::instance().getOrganizerDirectory()))

+  return QDir::fromNativeSeparators(qApp->property("dataPath").toString())

          + "/"

          + ToQString(AppConfig::overwritePath());

 }

@@ -50,7 +46,7 @@ VersionInfo OrganizerProxy::appVersion() const
   return m_Proxied->appVersion();

 }

 

-IModInterface *OrganizerProxy::getMod(const QString &name)

+IModInterface *OrganizerProxy::getMod(const QString &name) const

 {

   return m_Proxied->getMod(name);

 }

@@ -160,17 +156,22 @@ MOBase::IProfile *OrganizerProxy::profile()
   return m_Proxied->currentProfile();

 }

 

-MOBase::IDownloadManager *OrganizerProxy::downloadManager()

+MOBase::IDownloadManager *OrganizerProxy::downloadManager() const

 {

   return m_Proxied->downloadManager();

 }

 

-MOBase::IPluginList *OrganizerProxy::pluginList()

+MOBase::IPluginList *OrganizerProxy::pluginList() const

 {

   return m_Proxied->pluginList();

 }

 

-MOBase::IModList *OrganizerProxy::modList()

+MOBase::IModList *OrganizerProxy::modList() const

 {

   return m_Proxied->modList();

 }

+

+MOBase::IPluginGame const *OrganizerProxy::managedGame() const

+{

+  return m_Proxied->managedGame();

+}