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, 3 insertions, 26 deletions

diff --git a/src/shared/skyriminfo.h b/src/shared/skyriminfo.h
index 732b9261..a13b834e 100644
--- a/src/shared/skyriminfo.h
+++ b/src/shared/skyriminfo.h
@@ -36,37 +36,14 @@ public:
   virtual ~SkyrimInfo() {}

 

   static std::wstring getRegPathStatic();

-  virtual std::wstring getRegPath() { return getRegPathStatic(); }

-  virtual std::wstring getBinaryName() { return L"TESV.exe"; }

-

-  virtual GameInfo::Type getType() { return TYPE_SKYRIM; }

-

-  virtual std::wstring getGameName() const { return L"Skyrim"; }

-  virtual std::wstring getGameShortName() const { return L"Skyrim"; }

-

-  virtual LoadOrderMechanism getLoadOrderMechanism() const;

-

-  virtual std::vector<std::wstring> getDLCPlugins();

-

-  virtual std::vector<std::wstring> getSavegameAttachmentExtensions();

+  virtual std::wstring getRegPath() const { return getRegPathStatic(); }

 

   // file name of this games ini (no path)

-  virtual std::vector<std::wstring> getIniFileNames();

-

-  virtual std::wstring getReferenceDataFile();

-

-  virtual std::wstring getNexusPage(bool nmmScheme = true);

-

-  static std::wstring getNexusInfoUrlStatic();

-  virtual std::wstring getNexusInfoUrl() { return getNexusInfoUrlStatic(); }

-  static int getNexusModIDStatic();

-  virtual int getNexusModID() { return getNexusModIDStatic(); }

-  static int getNexusGameIDStatic() { return 110; }

-  virtual int getNexusGameID() { return getNexusGameIDStatic(); }

+  virtual std::vector<std::wstring> getIniFileNames() const;

 

 private:

 

-  SkyrimInfo(const std::wstring &moDirectory, const std::wstring &moDataDirectory, const std::wstring &gameDirectory);

+  SkyrimInfo(const std::wstring &gameDirectory);

 

   static bool identifyGame(const std::wstring &searchPath);