diff --git a/Doxyfile.cmake b/Doxyfile.cmake
index 9171c8a..f1b69c7 100644
--- a/Doxyfile.cmake
+++ b/Doxyfile.cmake
@@ -1,7 +1,6 @@
PROJECT_NAME = "${PROJECT_NAME}"
PROJECT_NUMBER = ${PROJECT_VERSION}
HTML_OUTPUT = docs
-GENERATE_HTML = YES
GENERATE_LATEX = NO
GENERATE_MAN = NO
GENERATE_RTF = NO
diff --git a/Doxyfile.cmake.doxygen b/Doxyfile.cmake.doxygen
deleted file mode 100644
index f1b69c7..0000000
--- a/Doxyfile.cmake.doxygen
+++ /dev/null
@@ -1,20 +0,0 @@
-PROJECT_NAME = "${PROJECT_NAME}"
-PROJECT_NUMBER = ${PROJECT_VERSION}
-HTML_OUTPUT = docs
-GENERATE_LATEX = NO
-GENERATE_MAN = NO
-GENERATE_RTF = NO
-CASE_SENSE_NAMES = NO
-INPUT = include/musicbrainz5
-EXCLUDE = include/musicbrainz5/xmlParser.h
-JAVADOC_AUTOBRIEF = YES
-EXTRACT_ALL = YES
-EXTRACT_STATIC = YES
-SHOW_USED_FILES = NO
-GENERATE_TREEVIEW = YES
-SHOW_INCLUDE_FILES = NO
-FULL_PATH_NAMES = NO
-MACRO_EXPANSION = YES
-EXPAND_ONLY_PREDEF = YES
-PREDEFINED = LIBMB5_DEPRECATED(f)=
-REPEAT_BRIEF = NO
diff --git a/include/musicbrainz5/Entity.h b/include/musicbrainz5/Entity.h
index 0f92d55..fca7a14 100644
--- a/include/musicbrainz5/Entity.h
+++ b/include/musicbrainz5/Entity.h
@@ -76,12 +76,10 @@ namespace MusicBrainz5
os >> RetVal;
if (os.fail())
{
-#ifdef _MB5_DEBUG_
std::cerr << "Error parsing value '";
if (Node.getText())
std::cerr << Node.getText();
std::cerr << "'" << std::endl;
-#endif
}
}
@@ -94,9 +92,7 @@ namespace MusicBrainz5
os >> RetVal;
if (os.fail())
{
-#ifdef _MB5_DEBUG_
std::cerr << "Error parsing value '" << Text << "'" << std::endl;
-#endif
}
}
diff --git a/include/musicbrainz5/Entity.h.silence-warnings b/include/musicbrainz5/Entity.h.silence-warnings
deleted file mode 100644
index fca7a14..0000000
--- a/include/musicbrainz5/Entity.h.silence-warnings
+++ /dev/null
@@ -1,117 +0,0 @@
-/* --------------------------------------------------------------------------
-
- libmusicbrainz5 - Client library to access MusicBrainz
-
- Copyright (C) 2012 Andrew Hawkins
-
- This file is part of libmusicbrainz5.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- libmusicbrainz5 is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this library. If not, see .
-
- $Id$
-
-----------------------------------------------------------------------------*/
-
-#ifndef _MUSICBRAINZ5_ENTITY_H
-#define _MUSICBRAINZ5_ENTITY_H
-
-#include
-#include
-#include
-#include