From 1715d0afe44a282a356ca88e47c92ec556f094dd Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Fri, 27 Mar 2009 01:42:53 +0100 Subject: Fixed include structure in resource/ directory There is also a new rule that trivial constructors and destructors should no longer be trivially "documented", since this just takes up space with no gain. --- src/resources/colordb.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/resources/colordb.cpp') 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 +#include "resources/colordb.h" -#include "colordb.h" +#include "log.h" -#include "../log.h" +#include "utils/xml.h" -#include "../utils/xml.h" +#include #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(); -- cgit v1.2.3-70-g09d2