sort includes

Change-Id: I3059e2d765e49744322f3774aa31821189745e37

25 files changed, 96 insertions, 73 deletions

diff --git a/src/lib/BorderArtInfo.h b/src/lib/BorderArtInfo.h
index f09a163..e015401 100644
--- a/src/lib/BorderArtInfo.h
+++ b/src/lib/BorderArtInfo.h
@@ -11,7 +11,9 @@
 #define INCLUDED_BORDERARTINFO_H
 
 #include <vector>
+
 #include <librevenge/librevenge.h>
+
 #include "MSPUBTypes.h"
 
 namespace libmspub
diff --git a/src/lib/Coordinate.h b/src/lib/Coordinate.h
index ac790ec..bec3fe2 100644
--- a/src/lib/Coordinate.h
+++ b/src/lib/Coordinate.h
@@ -9,7 +9,9 @@
 
 #ifndef INCLUDED_COORDINATE_H
 #define INCLUDED_COORDINATE_H
+
 #include "MSPUBConstants.h"
+
 namespace libmspub
 {
 struct Coordinate
diff --git a/src/lib/Dash.h b/src/lib/Dash.h
index d48e68a..6079c59 100644
--- a/src/lib/Dash.h
+++ b/src/lib/Dash.h
@@ -10,9 +10,10 @@
 #ifndef INCLUDED_DASH_H
 #define INCLUDED_DASH_H
 
-#include <boost/optional.hpp>
 #include <vector>
 
+#include <boost/optional.hpp>
+
 namespace libmspub
 {
 enum DotStyle
diff --git a/src/lib/Fill.cpp b/src/lib/Fill.cpp
index 9cf379f..eca9633 100644
--- a/src/lib/Fill.cpp
+++ b/src/lib/Fill.cpp
@@ -8,9 +8,10 @@
  */
 
 #include "Fill.h"
+
 #include "FillType.h"
-#include "libmspub_utils.h"
 #include "MSPUBCollector.h"
+#include "libmspub_utils.h"
 
 namespace libmspub
 {
diff --git a/src/lib/Fill.h b/src/lib/Fill.h
index c9c8b78..d8250bf 100644
--- a/src/lib/Fill.h
+++ b/src/lib/Fill.h
@@ -11,7 +11,6 @@
 #define INCLUDED_FILL_H
 
 #include <cstddef>
-
 #include <vector>
 
 #include <librevenge/librevenge.h>
diff --git a/src/lib/Line.h b/src/lib/Line.h
index d528d38..030ffe7 100644
--- a/src/lib/Line.h
+++ b/src/lib/Line.h
@@ -9,9 +9,11 @@
 
 #ifndef INCLUDED_LINE_H
 #define INCLUDED_LINE_H
-#include "Dash.h"
+
 #include <boost/optional.hpp>
+
 #include "ColorReference.h"
+#include "Dash.h"
 
 namespace libmspub
 {
diff --git a/src/lib/ListInfo.h b/src/lib/ListInfo.h
index b6f839f..02d1732 100644
--- a/src/lib/ListInfo.h
+++ b/src/lib/ListInfo.h
@@ -12,8 +12,8 @@
 
 #include <boost/optional.hpp>
 
-#include "NumberingType.h"
 #include "NumberingDelimiter.h"
+#include "NumberingType.h"
 
 namespace libmspub
 {
diff --git a/src/lib/MSPUBCollector.cpp b/src/lib/MSPUBCollector.cpp
index c66fc0e..8493cec 100644
--- a/src/lib/MSPUBCollector.cpp
+++ b/src/lib/MSPUBCollector.cpp
@@ -7,18 +7,19 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include "MSPUBCollector.h"
+
 #include <math.h>
 
 #include <boost/multi_array.hpp>
 
 #include <unicode/ucsdet.h>
 
-#include "MSPUBCollector.h"
-#include "libmspub_utils.h"
+#include "Coordinate.h"
 #include "MSPUBConstants.h"
 #include "MSPUBTypes.h"
 #include "PolygonUtils.h"
-#include "Coordinate.h"
+#include "libmspub_utils.h"
 
 namespace libmspub
 {
diff --git a/src/lib/MSPUBCollector.h b/src/lib/MSPUBCollector.h
index 61bfbdb..62a40fb 100644
--- a/src/lib/MSPUBCollector.h
+++ b/src/lib/MSPUBCollector.h
@@ -10,34 +10,33 @@
 #ifndef INCLUDED_MSPUBCOLLECTOR_H
 #define INCLUDED_MSPUBCOLLECTOR_H
 
+#include <algorithm>
 #include <functional>
 #include <list>
-#include <vector>
 #include <map>
 #include <memory>
 #include <set>
 #include <string>
-#include <algorithm>
+#include <vector>
 
 #include <librevenge/librevenge.h>
-#include <librevenge/librevenge.h>
 
-#include "MSPUBTypes.h"
-#include "libmspub_utils.h"
-#include "MSPUBContentChunkType.h"
-#include "ShapeType.h"
+#include "Arrow.h"
+#include "BorderArtInfo.h"
+#include "ColorReference.h"
 #include "Coordinate.h"
-#include "ShapeGroupElement.h"
+#include "Dash.h"
+#include "EmbeddedFontInfo.h"
 #include "Fill.h"
-#include "ColorReference.h"
+#include "MSPUBContentChunkType.h"
+#include "MSPUBTypes.h"
 #include "PolygonUtils.h"
+#include "Shadow.h"
+#include "ShapeGroupElement.h"
 #include "ShapeInfo.h"
-#include "BorderArtInfo.h"
-#include "Dash.h"
-#include "Arrow.h"
+#include "ShapeType.h"
 #include "VerticalAlign.h"
-#include "EmbeddedFontInfo.h"
-#include "Shadow.h"
+#include "libmspub_utils.h"
 
 namespace libmspub
 {
diff --git a/src/lib/MSPUBDocument.cpp b/src/lib/MSPUBDocument.cpp
index c67639b..0f178fe 100644
--- a/src/lib/MSPUBDocument.cpp
+++ b/src/lib/MSPUBDocument.cpp
@@ -9,8 +9,8 @@
 
 #include <memory>
 #include <sstream>
-#include <string>
 #include <string.h>
+#include <string>
 
 #include <libmspub/libmspub.h>
 
diff --git a/src/lib/MSPUBMetaData.cpp b/src/lib/MSPUBMetaData.cpp
index 779233a..ad12b7e 100644
--- a/src/lib/MSPUBMetaData.cpp
+++ b/src/lib/MSPUBMetaData.cpp
@@ -7,13 +7,14 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include "MSPUBMetaData.h"
+
 #include <cmath>
 #include <cstdio>
 #include <cstring>
 #include <ctime>
 
 #include "libmspub_utils.h"
-#include "MSPUBMetaData.h"
 
 libmspub::MSPUBMetaData::MSPUBMetaData()
   : m_idsAndOffsets(), m_typedPropertyValues(), m_metaData()
diff --git a/src/lib/MSPUBMetaData.h b/src/lib/MSPUBMetaData.h
index f8136a1..cb70e1c 100644
--- a/src/lib/MSPUBMetaData.h
+++ b/src/lib/MSPUBMetaData.h
@@ -10,11 +10,14 @@
 #ifndef INCLUDED_MSPUBMETADATA_H
 #define INCLUDED_MSPUBMETADATA_H
 
-#include <vector>
-#include <utility>
 #include <map>
-#include <librevenge-stream/librevenge-stream.h>
+#include <utility>
+#include <vector>
+
 #include <librevenge/librevenge.h>
+
+#include <librevenge-stream/librevenge-stream.h>
+
 #include "libmspub_utils.h"
 
 namespace libmspub
diff --git a/src/lib/MSPUBParser.cpp b/src/lib/MSPUBParser.cpp
index 1e94115..1a66f4e 100644
--- a/src/lib/MSPUBParser.cpp
+++ b/src/lib/MSPUBParser.cpp
@@ -7,38 +7,40 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include "MSPUBParser.h"
+
+#include <algorithm>
 #include <cassert>
 #include <memory>
 #include <set>
 #include <sstream>
+#include <string.h>
 #include <string>
 #include <utility>
-#include <algorithm>
-#include <string.h>
 
 #include <boost/numeric/conversion/cast.hpp>
 
 #include <librevenge-stream/librevenge-stream.h>
+
 #include <zlib.h>
 
-#include "MSPUBMetaData.h"
-#include "MSPUBParser.h"
-#include "MSPUBCollector.h"
-#include "MSPUBBlockID.h"
-#include "MSPUBBlockType.h"
-#include "MSPUBContentChunkType.h"
-#include "MSPUBConstants.h"
+#include "Dash.h"
 #include "EscherContainerType.h"
 #include "EscherFieldIds.h"
-#include "libmspub_utils.h"
-#include "ShapeType.h"
-#include "ShapeFlags.h"
 #include "Fill.h"
 #include "FillType.h"
 #include "ListInfo.h"
-#include "Dash.h"
+#include "MSPUBBlockID.h"
+#include "MSPUBBlockType.h"
+#include "MSPUBCollector.h"
+#include "MSPUBConstants.h"
+#include "MSPUBContentChunkType.h"
+#include "MSPUBMetaData.h"
+#include "ShapeFlags.h"
+#include "ShapeType.h"
 #include "TableInfo.h"
 #include "VerticalAlign.h"
+#include "libmspub_utils.h"
 
 namespace libmspub
 {
diff --git a/src/lib/MSPUBParser.h b/src/lib/MSPUBParser.h
index 9426536..0dfe017 100644
--- a/src/lib/MSPUBParser.h
+++ b/src/lib/MSPUBParser.h
@@ -12,18 +12,17 @@
 
 #include <map>
 #include <memory>
+#include <memory>
 #include <set>
 #include <vector>
-#include <memory>
 
 #include <boost/optional.hpp>
 
 #include <librevenge/librevenge.h>
-#include <librevenge/librevenge.h>
 
-#include "MSPUBTypes.h"
-#include "Fill.h"
 #include "Coordinate.h"
+#include "Fill.h"
+#include "MSPUBTypes.h"
 #include "PolygonUtils.h"
 
 namespace libmspub
diff --git a/src/lib/MSPUBParser2k.cpp b/src/lib/MSPUBParser2k.cpp
index 95f8c8b..9b3a7c4 100644
--- a/src/lib/MSPUBParser2k.cpp
+++ b/src/lib/MSPUBParser2k.cpp
@@ -7,16 +7,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include "MSPUBParser2k.h"
+
 #include <algorithm>
 #include <memory>
 
 #include <librevenge-stream/librevenge-stream.h>
 
-#include "MSPUBParser2k.h"
 #include "ColorReference.h"
+#include "MSPUBCollector.h"
 #include "ShapeType.h"
 #include "libmspub_utils.h"
-#include "MSPUBCollector.h"
 
 namespace libmspub
 {
diff --git a/src/lib/MSPUBParser97.cpp b/src/lib/MSPUBParser97.cpp
index 50ef91f..17ea81a 100644
--- a/src/lib/MSPUBParser97.cpp
+++ b/src/lib/MSPUBParser97.cpp
@@ -14,8 +14,8 @@
 #include <utility>
 
 #include "MSPUBCollector.h"
-#include "libmspub_utils.h"
 #include "MSPUBTypes.h"
+#include "libmspub_utils.h"
 
 namespace libmspub
 {
diff --git a/src/lib/MSPUBTypes.h b/src/lib/MSPUBTypes.h
index 7fae7e9..2cf98d1 100644
--- a/src/lib/MSPUBTypes.h
+++ b/src/lib/MSPUBTypes.h
@@ -10,14 +10,16 @@
 #ifndef INCLUDED_MSPUBTYPES_H
 #define INCLUDED_MSPUBTYPES_H
 
-#include <vector>
 #include <string>
+#include <vector>
+
 #include <boost/optional.hpp>
-#include "MSPUBBlockType.h"
+
+#include "ListInfo.h"
 #include "MSPUBBlockID.h"
-#include "MSPUBContentChunkType.h"
+#include "MSPUBBlockType.h"
 #include "MSPUBConstants.h"
-#include "ListInfo.h"
+#include "MSPUBContentChunkType.h"
 
 namespace libmspub
 {
diff --git a/src/lib/PolygonUtils.cpp b/src/lib/PolygonUtils.cpp
index 109b3e4..7452c36 100644
--- a/src/lib/PolygonUtils.cpp
+++ b/src/lib/PolygonUtils.cpp
@@ -7,15 +7,15 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <stddef.h> // for NULL
+#include "PolygonUtils.h"
+
 #include <math.h>
 
 #include <librevenge/librevenge.h>
 
+#include "MSPUBCollector.h"
 #include "ShapeType.h"
-#include "PolygonUtils.h"
 #include "libmspub_utils.h"
-#include "MSPUBCollector.h"
 
 #define CALCULATED_VALUE(val) (int(unsigned(val) | 0x80000000))
 
diff --git a/src/lib/PolygonUtils.h b/src/lib/PolygonUtils.h
index 37d9b7b..be3eadc 100644
--- a/src/lib/PolygonUtils.h
+++ b/src/lib/PolygonUtils.h
@@ -16,10 +16,10 @@
 
 #include <librevenge/librevenge.h>
 
-#include "ShapeType.h"
-#include "VectorTransformation2D.h"
 #include "Coordinate.h"
 #include "Line.h"
+#include "ShapeType.h"
+#include "VectorTransformation2D.h"
 
 namespace libmspub
 {
diff --git a/src/lib/ShapeGroupElement.h b/src/lib/ShapeGroupElement.h
index c95b6cc..34f5dd7 100644
--- a/src/lib/ShapeGroupElement.h
+++ b/src/lib/ShapeGroupElement.h
@@ -9,11 +9,13 @@
 
 #ifndef INCLUDED_SHAPEGROUPELEMENT_H
 #define INCLUDED_SHAPEGROUPELEMENT_H
-#include <boost/optional.hpp>
+
 #include <functional>
 #include <memory>
 #include <vector>
 
+#include <boost/optional.hpp>
+
 #include "ShapeInfo.h"
 #include "VectorTransformation2D.h"
 
diff --git a/src/lib/ShapeInfo.h b/src/lib/ShapeInfo.h
index ec8050f..ff50787 100644
--- a/src/lib/ShapeInfo.h
+++ b/src/lib/ShapeInfo.h
@@ -9,24 +9,27 @@
 
 #ifndef INCLUDED_SHAPEINFO_H
 #define INCLUDED_SHAPEINFO_H
-#include <boost/optional.hpp>
+
 #include <functional>
 #include <map>
 #include <memory>
 #include <vector>
-#include "ShapeType.h"
+
+#include <boost/optional.hpp>
+
+#include "Arrow.h"
+#include "ColorReference.h"
 #include "Coordinate.h"
+#include "Dash.h"
+#include "Fill.h"
 #include "Line.h"
-#include "Margins.h"
 #include "MSPUBTypes.h"
-#include "Fill.h"
+#include "Margins.h"
 #include "PolygonUtils.h"
-#include "Dash.h"
+#include "Shadow.h"
+#include "ShapeType.h"
 #include "TableInfo.h"
-#include "Arrow.h"
 #include "VerticalAlign.h"
-#include "ColorReference.h"
-#include "Shadow.h"
 
 namespace libmspub
 {
diff --git a/src/lib/Shapes.h b/src/lib/Shapes.h
index 1fed488..3a258ec 100644
--- a/src/lib/Shapes.h
+++ b/src/lib/Shapes.h
@@ -10,8 +10,8 @@
 #ifndef INCLUDED_SHAPES_H
 #define INCLUDED_SHAPES_H
 
-#include <vector>
 #include <map>
+#include <vector>
 
 #include "Coordinate.h"
 #include "MSPUBConstants.h"
diff --git a/src/lib/VectorTransformation2D.cpp b/src/lib/VectorTransformation2D.cpp
index 1b80e3a..c66c60e 100644
--- a/src/lib/VectorTransformation2D.cpp
+++ b/src/lib/VectorTransformation2D.cpp
@@ -10,6 +10,7 @@
 //TODO : Adjust handles, glue points
 
 #include "VectorTransformation2D.h"
+
 #include <math.h>
 
 namespace libmspub
diff --git a/src/lib/libmspub_utils.cpp b/src/lib/libmspub_utils.cpp
index 9706060..066ee2f 100644
--- a/src/lib/libmspub_utils.cpp
+++ b/src/lib/libmspub_utils.cpp
@@ -7,16 +7,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <unicode/ucnv.h>
-#include <unicode/utypes.h>
+#include "libmspub_utils.h"
 
 #include <cstdarg>
-#include <string.h> // for memcpy
-#include <math.h>
-#include <zlib.h>
 #include <cstring>
+#include <math.h>
+#include <string.h> // for memcpy
 
-#include "libmspub_utils.h"
+#include <unicode/ucnv.h>
+#include <unicode/utypes.h>
+
+#include <zlib.h>
 
 #ifndef M_PI
 #define M_PI 3.14159265358979323846
diff --git a/src/lib/libmspub_utils.h b/src/lib/libmspub_utils.h
index dc58265..deae5a6 100644
--- a/src/lib/libmspub_utils.h
+++ b/src/lib/libmspub_utils.h
@@ -14,12 +14,13 @@
 #include "config.h"
 #endif
 
-#include <vector>
 #include <map>
+#include <vector>
 
 #include <boost/cstdint.hpp>
 
 #include <librevenge/librevenge.h>
+
 #include <librevenge-stream/librevenge-stream.h>
 
 #include "MSPUBTypes.h"