cleanup und bugfixes after refactoring

1 files changed, 4 insertions, 16 deletions

diff --git a/src/shared/gameinfo.cpp b/src/shared/gameinfo.cpp
index 5439efff..1a815701 100644
--- a/src/shared/gameinfo.cpp
+++ b/src/shared/gameinfo.cpp
@@ -27,12 +27,12 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "skyriminfo.h"

 #include "util.h"

 

+#include <boost/assign.hpp>

+#include <boost/format.hpp>

 

 #include <shlobj.h>

 #include <sstream>

 #include <cassert>

-#include <boost/assign.hpp>

-#include <boost/format.hpp>

 

 namespace MOShared {

 

@@ -49,7 +49,7 @@ GameInfo::GameInfo(const std::wstring &moDirectory, const std::wstring &moDataDi
 

 void GameInfo::cleanup() {

   delete GameInfo::s_Instance;

-  GameInfo::s_Instance = NULL;

+  GameInfo::s_Instance = nullptr;

 }

 

 

@@ -126,7 +126,7 @@ bool GameInfo::init(const std::wstring &moDirectory, const std::wstring &moDataD
 

 GameInfo &GameInfo::instance()

 {

-  assert(s_Instance != NULL);

+  assert(s_Instance != nullptr && "gameinfo not yet initialized");

   return *s_Instance;

 }

 

@@ -151,18 +151,6 @@ std::wstring GameInfo::getIniFilename() const
 }

 

 

-std::wstring GameInfo::getDownloadDir() const

-{

-  return m_OrganizerDirectory + L"\\downloads";

-}

-

-

-std::wstring GameInfo::getCacheDir() const

-{

-  return m_OrganizerDirectory + L"\\webcache";

-}

-

-

 std::wstring GameInfo::getOverwriteDir() const

 {

   return m_OrganizerDirectory + L"\\overwrite";