diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-27 01:42:53 +0100 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-27 01:43:55 +0100 |
commit | 1715d0afe44a282a356ca88e47c92ec556f094dd (patch) | |
tree | 36dcaa69dcf0165c33d7da1c1cc1a9f5fb7e228f /src/resources/colordb.cpp | |
parent | 511d9ac780e094767e806c9a448ac973279dd4c8 (diff) | |
download | mana-client-1715d0afe44a282a356ca88e47c92ec556f094dd.tar.gz mana-client-1715d0afe44a282a356ca88e47c92ec556f094dd.tar.bz2 mana-client-1715d0afe44a282a356ca88e47c92ec556f094dd.tar.xz mana-client-1715d0afe44a282a356ca88e47c92ec556f094dd.zip |
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.
Diffstat (limited to 'src/resources/colordb.cpp')
-rw-r--r-- | src/resources/colordb.cpp | 10 |
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(); |