Tidying up headers include

rism-digital · Aug 25, 2014 · c86d03c · c86d03c
1 parent 2c98e76
commit c86d03c
Show file tree

Hide file tree

Showing 42 changed files with 105 additions and 65 deletions.
diff --git a/include/vrv/att.h b/include/vrv/att.h
@@ -10,6 +10,8 @@
 
 #include <string>
 
+//----------------------------------------------------------------------------
+
 #include "attdef.h"
 
 namespace vrv {

diff --git a/include/vrv/barline.h b/include/vrv/barline.h
@@ -9,8 +9,8 @@
 #ifndef __VRV_BARLINE_H__
 #define __VRV_BARLINE_H__
 
-#include "layerelement.h"
 #include "atts_shared.h"
+#include "layerelement.h"
 
 namespace vrv {
 

diff --git a/include/vrv/clef.h b/include/vrv/clef.h
@@ -9,9 +9,9 @@
 #ifndef __VRV_CLEF_H__
 #define __VRV_CLEF_H__
 
-#include "vrvdef.h"
-#include "layerelement.h"
 #include "atts_shared.h"
+#include "layerelement.h"
+#include "vrvdef.h"
 
 namespace vrv {
 

diff --git a/include/vrv/interfacecontroller.h b/include/vrv/interfacecontroller.h
@@ -9,11 +9,13 @@
 #ifndef __VRV_CONTROLLER_H__
 #define __VRV_CONTROLLER_H__
 
+#include <string>
+
+//----------------------------------------------------------------------------
+
 #include "doc.h"
 #include "view.h"
 
-#include <string>
-
 namespace vrv {
 
 typedef enum _file_formats {

diff --git a/include/vrv/iodarms.h b/include/vrv/iodarms.h
@@ -12,6 +12,8 @@
 #include <string>
 #include <vector>
 
+//----------------------------------------------------------------------------
+
 #include "io.h"
 
 namespace vrv {

diff --git a/include/vrv/iomei.h b/include/vrv/iomei.h
@@ -9,7 +9,6 @@
 #define __VRV_IOMEI_H__
 
 #include "doc.h"
-
 #include "pugixml.hpp"
 
 namespace vrv {

diff --git a/include/vrv/iomusxml.h b/include/vrv/iomusxml.h
@@ -11,9 +11,8 @@
 
 #include "doc.h"
 #include "layer.h"
-#include "tie.h"
-
 #include "pugixml.hpp"
+#include "tie.h"
 
 namespace vrv {
 

diff --git a/include/vrv/iopae.h b/include/vrv/iopae.h
@@ -12,6 +12,8 @@
 #include <string>
 #include <vector>
 
+//----------------------------------------------------------------------------
+
 #include "io.h"
 #include "vrvdef.h"
 

diff --git a/include/vrv/keysig.h b/include/vrv/keysig.h
@@ -10,9 +10,9 @@
 #ifndef __VRV_KEYSIG_H__
 #define __VRV_KEYSIG_H__
 
-#include "vrvdef.h"
-#include "layerelement.h"
 #include "atts_shared.h"
+#include "layerelement.h"
+#include "vrvdef.h"
 
 namespace vrv {
 

diff --git a/include/vrv/layer.h b/include/vrv/layer.h
@@ -9,13 +9,15 @@
 #ifndef __VRV_LAYER_H__
 #define __VRV_LAYER_H__
 
+#include <typeinfo>
+
+//----------------------------------------------------------------------------
+
 #include "atts_shared.h"
 #include "clef.h"
 #include "object.h"
 #include "scoredef.h"
 
-#include <typeinfo>
-
 namespace vrv {
 
 class DeviceContext;

diff --git a/include/vrv/layerelement.h b/include/vrv/layerelement.h
@@ -10,8 +10,8 @@
 #define __VRV_LAYER_ELEMENT_H__
 
 #include "devicecontext.h" // for MusPoint
-#include "vrvdef.h"
 #include "object.h"
+#include "vrvdef.h"
 
 namespace vrv {
 

diff --git a/include/vrv/measure.h b/include/vrv/measure.h
@@ -9,12 +9,10 @@
 #ifndef __VRV_MEASURE_H__
 #define __VRV_MEASURE_H__
 
-#include "object.h"
-
 #include "aligner.h"
-#include "barline.h"
-
 #include "atts_shared.h"
+#include "barline.h"
+#include "object.h"
 
 namespace vrv {
 

diff --git a/include/vrv/mensur.h b/include/vrv/mensur.h
@@ -9,9 +9,9 @@
 #ifndef __VRV_MENSUR_H__
 #define __VRV_MENSUR_H__
 
-#include "layerelement.h"
-#include "atts_shared.h"
 #include "atts_mensural.h"
+#include "atts_shared.h"
+#include "layerelement.h"
 
 namespace vrv {
 

diff --git a/include/vrv/metersig.h b/include/vrv/metersig.h
@@ -9,8 +9,8 @@
 #ifndef __VRV_METERSIG_H__
 #define __VRV_METERSIG_H__
 
-#include "layerelement.h"
 #include "atts_shared.h"
+#include "layerelement.h"
 
 namespace vrv {
 

diff --git a/include/vrv/mrest.h b/include/vrv/mrest.h
@@ -9,7 +9,6 @@
 #ifndef __VRV_MREST_H__
 #define __VRV_MREST_H__
 
-#include "vrvdef.h"
 #include "layerelement.h"
 
 namespace vrv {

diff --git a/include/vrv/multirest.h b/include/vrv/multirest.h
@@ -9,7 +9,6 @@
 #ifndef __VRV_MULTIREST_H__
 #define __VRV_MULTIREST_H__
 
-#include "vrvdef.h"
 #include "layerelement.h"
 
 namespace vrv {

diff --git a/include/vrv/object.h b/include/vrv/object.h
@@ -15,6 +15,8 @@
 #include <typeinfo>
 #include <vector>
 
+//----------------------------------------------------------------------------
+
 #include "vrvdef.h"
 
 namespace vrv {

diff --git a/include/vrv/svgdevicecontext.h b/include/vrv/svgdevicecontext.h
@@ -9,14 +9,16 @@
 #ifndef __VRV_SVG_DC_H__
 #define __VRV_SVG_DC_H__
 
-#include "devicecontext.h"
-
 #include <iostream>
 #include <fstream>
 #include <sstream>
 #include <string>
 #include <vector>
 
+//----------------------------------------------------------------------------
+
+#include "devicecontext.h"
+
 namespace vrv {
 
 //----------------------------------------------------------------------------

diff --git a/include/vrv/symbol.h b/include/vrv/symbol.h
@@ -9,9 +9,9 @@
 #ifndef __VRV_SYMBOL_H__
 #define __VRV_SYMBOL_H__
 
-#include "vrvdef.h"
 #include "layerelement.h"
 #include "positioninterface.h"
+#include "vrvdef.h"
 
 namespace vrv {
 

diff --git a/include/vrv/view.h b/include/vrv/view.h
@@ -11,6 +11,8 @@
 
 #include <typeinfo>
 
+//----------------------------------------------------------------------------
+
 #include "devicecontext.h"
 #include "scoredef.h"
 #include "vrvdef.h"

diff --git a/include/vrv/vrvdef.h b/include/vrv/vrvdef.h
@@ -9,10 +9,12 @@
 #ifndef __VRV_DEF_H__
 #define __VRV_DEF_H__
 
-#include "attdef.h"
-
 #include <algorithm>
 
+//----------------------------------------------------------------------------
+
+#include "attdef.h"
+
 namespace vrv {
 
 //----------------------------------------------------------------------------

diff --git a/src/aligner.cpp b/src/aligner.cpp
@@ -16,7 +16,6 @@
 //----------------------------------------------------------------------------
 
 #include "vrv.h"
-#include "layerelement.h"
 
 namespace vrv {
 

diff --git a/src/bboxdevicecontext.cpp b/src/bboxdevicecontext.cpp
@@ -15,7 +15,6 @@
 
 //----------------------------------------------------------------------------
 
-#include "vrvdef.h"
 #include "leipzigbbox.h"
 #include "view.h"
 
@@ -461,4 +460,4 @@ void BBoxDeviceContext::FindPointsForBounds(MusPoint P0, MusPoint P1, MusPoint P
     ret[3] = (int)yMax;
 }
 
-} // namespace vrv
+} // namespace vrv
diff --git a/src/beam.cpp b/src/beam.cpp
@@ -5,9 +5,13 @@
 // Copyright (c) Authors and others. All rights reserved.
 /////////////////////////////////////////////////////////////////////////////
 
-#include "vrv.h"
+
 #include "beam.h"
 
+//----------------------------------------------------------------------------
+
+#include "vrv.h"
+
 namespace vrv {
 
 //----------------------------------------------------------------------------

diff --git a/src/doc.cpp b/src/doc.cpp
@@ -10,25 +10,25 @@
 
 //----------------------------------------------------------------------------
 
-#include "vrv.h"
+#include <assert.h>
+#include <math.h>
+
+//----------------------------------------------------------------------------
+
 #include "layer.h"
 #include "layerelement.h"
 #include "page.h"
 #include "staff.h"
 #include "system.h"
 #include "verse.h"
+#include "vrv.h"
 
-//----------------------------------------------------------------------------
-
-#include <assert.h>
-#include <math.h>
+namespace vrv {
 
 //----------------------------------------------------------------------------
 // Doc
 //----------------------------------------------------------------------------
 
-namespace vrv {
-
 Doc::Doc() :
     Object("doc-")
 {

diff --git a/src/durationinterface.cpp b/src/durationinterface.cpp
@@ -16,9 +16,9 @@
 
 //----------------------------------------------------------------------------
 
+#include "beam.h"
 #include "vrv.h"
 #include "vrvdef.h"
-#include "beam.h"
 
 namespace vrv {
 

diff --git a/src/interfacecontroller.cpp b/src/interfacecontroller.cpp
@@ -20,8 +20,8 @@
 #include "iomusxml.h"
 #include "iopae.h"
 #include "page.h"
-#include "view.h"
 #include "svgdevicecontext.h"
+#include "view.h"
 
 #ifdef USE_EMSCRIPTEN
 #include "jsonxx.h"

diff --git a/src/iomei.cpp b/src/iomei.cpp
@@ -17,7 +17,6 @@
 
 //----------------------------------------------------------------------------
 
-#include "vrv.h"
 #include "app.h"
 #include "barline.h"
 #include "beam.h"
@@ -40,6 +39,7 @@
 #include "system.h"
 #include "tuplet.h"
 #include "verse.h"
+#include "vrv.h"
 
 namespace vrv {
 

diff --git a/src/iopae.cpp b/src/iopae.cpp
@@ -10,6 +10,7 @@
 
 //----------------------------------------------------------------------------
 
+#include <assert.h>
 #include <cstring>
 #include <iostream>
 #include <fstream>
@@ -18,10 +19,6 @@
 
 //----------------------------------------------------------------------------
 
-#include <assert.h>
-
-//----------------------------------------------------------------------------
-
 #include "barline.h"
 #include "clef.h"
 #include "doc.h"

diff --git a/src/layer.cpp b/src/layer.cpp
@@ -15,7 +15,6 @@
 //----------------------------------------------------------------------------
 
 #include "clef.h"
-#include "vrvdef.h"
 #include "doc.h"
 #include "keysig.h"
 #include "io.h"
@@ -24,6 +23,7 @@
 #include "metersig.h"
 #include "note.h"
 #include "symbol.h"
+#include "vrvdef.h"
 
 namespace vrv {