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, 4 insertions, 7 deletions

diff --git a/src/shared/fallout4info.h b/src/shared/fallout4info.h
index 4a28e867..70c9b7d3 100644
--- a/src/shared/fallout4info.h
+++ b/src/shared/fallout4info.h
@@ -36,11 +36,9 @@ public:
   virtual ~Fallout4Info() {}
 
   static std::wstring getRegPathStatic();
-  virtual std::wstring getRegPath() { return getRegPathStatic(); }
+  virtual std::wstring getRegPath() const { return getRegPathStatic(); }
   virtual std::wstring getBinaryName() { return L"Fallout4.exe"; }
 
-  virtual GameInfo::Type getType() { return TYPE_FALLOUT4; }
-
   virtual std::wstring getGameName() const { return L"Fallout 4"; }
   virtual std::wstring getGameShortName() const { return L"Fallout4"; }
 
@@ -48,9 +46,7 @@ public:
   virtual std::vector<std::wstring> getSavegameAttachmentExtensions();
 
   // file name of this games ini (no path)
-  virtual std::vector<std::wstring> getIniFileNames();
-
-  virtual std::wstring getReferenceDataFile();
+  virtual std::vector<std::wstring> getIniFileNames() const;
 
   virtual std::wstring getNexusPage(bool nmmScheme = true);
   static std::wstring getNexusInfoUrlStatic();
@@ -67,10 +63,11 @@ public:
 
 private:
 
-  Fallout4Info(const std::wstring &moDirectory, const std::wstring &moDataDirectory, const std::wstring &gameDirectory);
+  Fallout4Info(const std::wstring &gameDirectory);
 
   static bool identifyGame(const std::wstring &searchPath);
 
+
 };
 
 } // namespace MOShared