Merge remote-tracking branch 'remotes/TanninOne/master' into issue/356

Conflicts:
	src/downloadmanager.cpp
	src/mainwindow.cpp
	src/modinfo.cpp
	src/modinfo.h
	src/selfupdater.cpp
	src/shared/fallout3info.cpp
	src/shared/fallout3info.h
	src/shared/falloutnvinfo.cpp
	src/shared/falloutnvinfo.h
	src/shared/gameinfo.h
	src/shared/oblivioninfo.cpp
	src/shared/oblivioninfo.h
	src/shared/skyriminfo.cpp
	src/shared/skyriminfo.h

1 files changed, 4 insertions, 5 deletions

diff --git a/src/shared/skyriminfo.cpp b/src/shared/skyriminfo.cpp
index 869ac47d..d255e60f 100644
--- a/src/shared/skyriminfo.cpp
+++ b/src/shared/skyriminfo.cpp
@@ -73,22 +73,22 @@ std::wstring SkyrimInfo::getRegPathStatic()
   }

 }

 

-std::vector<std::wstring> SkyrimInfo::getSavegameAttachmentExtensions()

+std::vector<std::wstring> SkyrimInfo::getSavegameAttachmentExtensions() const

 {

   return boost::assign::list_of(L"skse");

 }

 

-std::vector<std::wstring> SkyrimInfo::getIniFileNames()

+std::vector<std::wstring> SkyrimInfo::getIniFileNames() const

 {

   return boost::assign::list_of(L"skyrim.ini")(L"skyrimprefs.ini");

 }

 

-std::wstring SkyrimInfo::getReferenceDataFile()

+std::wstring SkyrimInfo::getReferenceDataFile() const

 {

   return L"Skyrim - Meshes.bsa";

 }

 

-bool SkyrimInfo::rerouteToProfile(const wchar_t *fileName, const wchar_t *fullPath)

+bool SkyrimInfo::rerouteToProfile(const wchar_t *fileName, const wchar_t *fullPath) const

 {

   static LPCWSTR profileFiles[] = { L"skyrim.ini", L"skyrimprefs.ini", L"loadorder.txt", nullptr };

 

@@ -106,5 +106,4 @@ bool SkyrimInfo::rerouteToProfile(const wchar_t *fileName, const wchar_t *fullPa
   return false;

 }

 

-

 } // namespace MOShared