summaryrefslogtreecommitdiff
path: root/src/resources/colordb.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/resources/colordb.cpp')
-rw-r--r--src/resources/colordb.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp
index 07496ff6..af498297 100644
--- a/src/resources/colordb.cpp
+++ b/src/resources/colordb.cpp
@@ -19,13 +19,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <libxml/tree.h>
+#include "resources/colordb.h"
-#include "colordb.h"
+#include "log.h"
-#include "../log.h"
+#include "utils/xml.h"
-#include "../utils/xml.h"
+#include <libxml/tree.h>
#define HAIR_COLOR_FILE "colors.xml"
#define TMW_COLOR_FILE "hair.xml"
@@ -40,9 +40,7 @@ namespace
void ColorDB::load()
{
if (mLoaded)
- {
return;
- }
XML::Document *doc = new XML::Document(HAIR_COLOR_FILE);
xmlNodePtr root = doc->rootNode();