summaryrefslogtreecommitdiff
path: root/src/configuration.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-11-08 00:44:17 +0300
committerAndrei Karas <akaras@inbox.ru>2011-11-08 00:44:17 +0300
commit4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe (patch)
tree714897eca03fbcb764f5b450a29cc1aef8d33433 /src/configuration.cpp
parent9e83411f7e4147d09af5a5006888dcc187ea0ef8 (diff)
downloadmanaverse-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.tar.gz
manaverse-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.tar.bz2
manaverse-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.tar.xz
manaverse-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.zip
Fix more gcc 4.7 warnings.
Diffstat (limited to 'src/configuration.cpp')
-rw-r--r--src/configuration.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/configuration.cpp b/src/configuration.cpp
index 814b0ce65..b8b742f53 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -152,7 +152,7 @@ ConfigurationObject::~ConfigurationObject()
Configuration::Configuration() :
mConfigPath(""),
- mDefaultsData(0),
+ mDefaultsData(nullptr),
mDirectory("")
{
}
@@ -168,7 +168,7 @@ void Configuration::cleanDefaults()
}
mDefaultsData->clear();
delete mDefaultsData;
- mDefaultsData = 0;
+ mDefaultsData = nullptr;
}
}
@@ -470,7 +470,7 @@ void ConfigurationObject::initFromXML(xmlNodePtr parent_node)
void Configuration::init(const std::string &filename, bool useResManager)
{
- mDefaultsData = 0;
+ mDefaultsData = nullptr;
XML::Document doc(filename, useResManager);
if (useResManager)