Merge with branch1.2

1 files changed, 4 insertions, 4 deletions

diff --git a/src/categories.cpp b/src/categories.cpp
index dca6311d..1d5fdefe 100644
--- a/src/categories.cpp
+++ b/src/categories.cpp
@@ -32,12 +32,12 @@ using namespace MOBase;
 using namespace MOShared;

 

 

-CategoryFactory* CategoryFactory::s_Instance = NULL;

+CategoryFactory* CategoryFactory::s_Instance = nullptr;

 

 

 QString CategoryFactory::categoriesFilePath()

 {

-  return QCoreApplication::applicationDirPath() + "/categories.dat";

+  return qApp->property("dataPath").toString() + "/categories.dat";

 }

 

 

@@ -93,7 +93,7 @@ CategoryFactory::CategoryFactory()
 

 CategoryFactory &CategoryFactory::instance()

 {

-  if (s_Instance == NULL) {

+  if (s_Instance == nullptr) {

     s_Instance = new CategoryFactory;

   }

   return *s_Instance;

@@ -133,7 +133,7 @@ void CategoryFactory::setParents()
 void CategoryFactory::cleanup()

 {

   delete s_Instance;

-  s_Instance = NULL;

+  s_Instance = nullptr;

 }