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

diff --git a/src/shared/oblivioninfo.cpp b/src/shared/oblivioninfo.cpp
index a3dc3986..8f1f1843 100644
--- a/src/shared/oblivioninfo.cpp
+++ b/src/shared/oblivioninfo.cpp
@@ -66,18 +66,18 @@ std::wstring OblivionInfo::getRegPathStatic()
 

 

 

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

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

 {

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

 }

 

 

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

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

 {

   return boost::assign::list_of(L"oblivion.ini")(L"oblivionprefs.ini");

 }

 

-bool OblivionInfo::rerouteToProfile(const wchar_t *fileName, const wchar_t*)

+bool OblivionInfo::rerouteToProfile(const wchar_t *fileName, const wchar_t*) const

 {

   static LPCWSTR profileFiles[] = { L"oblivion.ini", L"oblivionprefs.ini", L"plugins.txt", nullptr };

 

@@ -89,7 +89,7 @@ bool OblivionInfo::rerouteToProfile(const wchar_t *fileName, const wchar_t*)
   return false;

 }

 

-std::wstring OblivionInfo::getReferenceDataFile()

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

 {

   return L"Oblivion - Meshes.bsa";

 }