summaryrefslogtreecommitdiff
path: root/src/categories.cpp
diff options
context:
space:
mode:
authorTannin <devnull@localhost>2015-01-04 10:33:37 +0100
committerTannin <devnull@localhost>2015-01-04 10:33:37 +0100
commitb415db619ed027ec2acd283983624293274b090f (patch)
tree3b09112799f2728229ed98bca7b342f1e8d1232a /src/categories.cpp
parentbd8267993d1ed0292200f3052e3c30d4fc9c84f7 (diff)
parentb2d04d70fc6284797e1bf29f55a375cb59d012be (diff)
Merge
Diffstat (limited to 'src/categories.cpp')
-rw-r--r--src/categories.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/categories.cpp b/src/categories.cpp
index 57e18a28..1d5fdefe 100644
--- a/src/categories.cpp
+++ b/src/categories.cpp
@@ -32,7 +32,7 @@ using namespace MOBase;
using namespace MOShared;
-CategoryFactory* CategoryFactory::s_Instance = NULL;
+CategoryFactory* CategoryFactory::s_Instance = nullptr;
QString CategoryFactory::categoriesFilePath()
@@ -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;
}