Disable header maps in Xcode 12

src/scenedit/scen.actions.cpp

@@ -6,8 +6,8 @@
 #include <string>
 #include <stack>
 #include "scen.global.hpp"
-#include "scenario.hpp"
-#include "render_shapes.hpp"
+#include "scenario/scenario.hpp"
+#include "gfx/render_shapes.hpp"
 #include "scen.graphics.hpp"
 #include "scen.actions.hpp"
 #include "sounds.hpp"
@@ -17,13 +17,13 @@
 #include "scen.townout.hpp"
 #include "scen.menus.hpp"
 #include "mathutil.hpp"
-#include "fileio.hpp"
-#include "winutil.hpp"
-#include "cursors.hpp"
-#include "scrollbar.hpp"
-#include "strdlog.hpp"
-#include "choicedlog.hpp"
-#include "gitrev.hpp"
+#include "fileio/fileio.hpp"
+#include "tools/winutil.hpp"
+#include "tools/cursors.hpp"
+#include "dialogxml/widgets/scrollbar.hpp"
+#include "dialogxml/dialogs/strdlog.hpp"
+#include "dialogxml/dialogs/choicedlog.hpp"
+#include "tools/gitrev.hpp"
 
 #include "scen.btnmg.hpp"
 

src/scenedit/scen.actions.hpp

@@ -1,6 +1,6 @@
 
 #include "scen.global.hpp"
-#include "undo.hpp"
+#include "tools/undo.hpp"
 
 void init_screen_locs();
 void handle_action(location the_point,sf::Event event);

src/scenedit/scen.appleevents.mm

@@ -6,12 +6,12 @@
 //
 //
 
-#include "scenario.hpp" // Include before Cocoa because the Cocoa header defines things that cause compilation errors in here
+#include "scenario/scenario.hpp" // Include before Cocoa because the Cocoa header defines things that cause compilation errors in here
 #include <Cocoa/Cocoa.h>
 #include <memory>
 #include <algorithm>
 #include <iostream>
-#include "fileio.hpp"
+#include "fileio/fileio.hpp"
 #include "scen.actions.hpp"
 #include "scen.townout.hpp"
 

src/scenedit/scen.btnmg.cpp

@@ -9,7 +9,7 @@
 #include "scen.graphics.hpp"
 #include <cmath>
 #include "scen.btnmg.hpp"
-#include "scrollbar.hpp"
+#include "dialogxml/widgets/scrollbar.hpp"
 
 extern rectangle right_sbar_rect;
 

src/scenedit/scen.core.cpp

@@ -7,9 +7,9 @@
 #include <unordered_map>
 #include <boost/lexical_cast.hpp>
 #include "scen.global.hpp"
-#include "scenario.hpp"
-#include "town.hpp"
-#include "gfxsheets.hpp"
+#include "scenario/scenario.hpp"
+#include "scenario/town.hpp"
+#include "gfx/gfxsheets.hpp"
 #include "utility.hpp"
 #include "scen.graphics.hpp"
 #include "scen.core.hpp"
@@ -18,22 +18,22 @@
 #include "scen.fileio.hpp"
 #include "scen.actions.hpp"
 #include "scen.menus.hpp"
-#include "dialog.hpp"
-#include "control.hpp"
-#include "button.hpp"
-#include "strdlog.hpp"
-#include "3choice.hpp"
-#include "strchoice.hpp"
-#include "fileio.hpp"
-#include "field.hpp"
-#include "res_strings.hpp"
-#include "res_image.hpp"
-#include "res_sound.hpp"
-#include "cursors.hpp"
-#include "stack.hpp"
+#include "dialogxml/dialogs/dialog.hpp"
+#include "dialogxml/widgets/control.hpp"
+#include "dialogxml/widgets/button.hpp"
+#include "dialogxml/dialogs/strdlog.hpp"
+#include "dialogxml/dialogs/3choice.hpp"
+#include "dialogxml/dialogs/strchoice.hpp"
+#include "fileio/fileio.hpp"
+#include "dialogxml/widgets/field.hpp"
+#include "fileio/resmgr/res_strings.hpp"
+#include "fileio/resmgr/res_image.hpp"
+#include "fileio/resmgr/res_sound.hpp"
+#include "tools/cursors.hpp"
+#include "dialogxml/widgets/stack.hpp"
 #include "spell.hpp"
 #include "mathutil.hpp"
-#include "winutil.hpp"
+#include "tools/winutil.hpp"
 #include "view_dialogs.hpp"
 
 extern short cen_x, cen_y,cur_town;

src/scenedit/scen.fileio.cpp

@@ -1,26 +1,26 @@
 
 #include <cstring>
 #include "scen.global.hpp"
-#include "scenario.hpp"
+#include "scenario/scenario.hpp"
 #include <iostream>
 #include <fstream>
 #include <iomanip>
 #include <boost/filesystem/operations.hpp>
 #include "scen.fileio.hpp"
 #include "scen.keydlgs.hpp"
-#include "gfxsheets.hpp"
+#include "gfx/gfxsheets.hpp"
 #include "scen.core.hpp"
 #include "sounds.hpp"
 #include "mathutil.hpp"
 #include "oldstructs.hpp"
-#include "fileio.hpp"
-#include "tarball.hpp"
+#include "fileio/fileio.hpp"
+#include "fileio/tarball.hpp"
 #include "gzstream.h"
 #include "tinyprint.h"
-#include "map_parse.hpp"
-#include "winutil.hpp"
-#include "choicedlog.hpp"
-#include "undo.hpp"
+#include "fileio/map_parse.hpp"
+#include "tools/winutil.hpp"
+#include "dialogxml/dialogs/choicedlog.hpp"
+#include "tools/undo.hpp"
 
 extern cScenario scenario;
 

src/scenedit/scen.graphics.cpp

@@ -3,27 +3,27 @@
 #include <sstream>
 #include <cstring>
 #include "scen.global.hpp"
-#include "scenario.hpp"
-#include "gfxsheets.hpp"
-#include "render_image.hpp"
-#include "render_shapes.hpp"
-#include "render_text.hpp"
-#include "tiling.hpp" // for bg
+#include "scenario/scenario.hpp"
+#include "gfx/gfxsheets.hpp"
+#include "gfx/render_image.hpp"
+#include "gfx/render_shapes.hpp"
+#include "gfx/render_text.hpp"
+#include "gfx/tiling.hpp" // for bg
 #include "scen.graphics.hpp"
 #include <cmath>
 #include "scen.keydlgs.hpp"
 #include "sounds.hpp"
 #include "mathutil.hpp"
-#include "drawable_manager.hpp"
-#include "cursors.hpp"
+#include "tools/drawable_manager.hpp"
+#include "tools/cursors.hpp"
 
-#include "dialog.hpp"
+#include "dialogxml/dialogs/dialog.hpp"
 
 #include "scen.core.hpp"
 #include "scen.menus.hpp"
 #include "scen.townout.hpp"
-#include "scrollbar.hpp"
-#include "res_image.hpp"
+#include "dialogxml/widgets/scrollbar.hpp"
+#include "fileio/resmgr/res_image.hpp"
 
 #include "scen.btnmg.hpp"
 

src/scenedit/scen.keydlgs.cpp

@@ -5,22 +5,22 @@
 #include <numeric>
 #include <boost/lexical_cast.hpp>
 #include "scen.global.hpp"
-#include "scenario.hpp"
-#include "gfxsheets.hpp"
+#include "scenario/scenario.hpp"
+#include "gfx/gfxsheets.hpp"
 #include "utility.hpp"
 #include "scen.graphics.hpp"
 #include "scen.keydlgs.hpp"
 #include "scen.core.hpp"
-#include "dialog.hpp"
-#include "control.hpp"
-#include "button.hpp"
-#include "strdlog.hpp"
-#include "3choice.hpp"
-#include "strchoice.hpp"
-#include "pictchoice.hpp"
-#include "res_strings.hpp"
+#include "dialogxml/dialogs/dialog.hpp"
+#include "dialogxml/widgets/control.hpp"
+#include "dialogxml/widgets/button.hpp"
+#include "dialogxml/dialogs/strdlog.hpp"
+#include "dialogxml/dialogs/3choice.hpp"
+#include "dialogxml/dialogs/strchoice.hpp"
+#include "dialogxml/dialogs/pictchoice.hpp"
+#include "fileio/resmgr/res_strings.hpp"
 #include "spell.hpp"
-#include "render_shapes.hpp" // for colour constants
+#include "gfx/render_shapes.hpp" // for colour constants
 
 extern short cen_x, cen_y;
 extern bool mouse_button_held;

src/scenedit/scen.keydlgs.hpp

@@ -1,6 +1,6 @@
 
 #include <string>
-#include "pict.hpp" // for ePicType
+#include "dialogxml/widgets/pict.hpp" // for ePicType
 #include "location.hpp" // for info_rect_t
 class cDialog;
 

src/scenedit/scen.main.cpp

@@ -5,9 +5,9 @@
 #include <boost/filesystem/operations.hpp>
 
 #include "scen.global.hpp"
-#include "scenario.hpp"
-#include "render_image.hpp"
-#include "tiling.hpp"
+#include "scenario/scenario.hpp"
+#include "gfx/render_image.hpp"
+#include "gfx/tiling.hpp"
 #include "scen.graphics.hpp"
 #include "scen.actions.hpp"
 #include "scen.fileio.hpp"
@@ -17,18 +17,18 @@
 #include "scen.core.hpp"
 #include "scen.keydlgs.hpp"
 #include "mathutil.hpp"
-#include "fileio.hpp"
-#include "scrollbar.hpp"
-#include "winutil.hpp"
-#include "cursors.hpp"
-#include "strdlog.hpp"
-#include "choicedlog.hpp"
+#include "fileio/fileio.hpp"
+#include "dialogxml/widgets/scrollbar.hpp"
+#include "tools/winutil.hpp"
+#include "tools/cursors.hpp"
+#include "dialogxml/dialogs/strdlog.hpp"
+#include "dialogxml/dialogs/choicedlog.hpp"
 #include "scen.menus.hpp"
-#include "res_image.hpp"
-#include "prefs.hpp"
-#include "framerate_limiter.hpp"
-#include "event_listener.hpp"
-#include "drawable_manager.hpp"
+#include "fileio/resmgr/res_image.hpp"
+#include "tools/prefs.hpp"
+#include "tools/framerate_limiter.hpp"
+#include "tools/event_listener.hpp"
+#include "tools/drawable_manager.hpp"
 
 /* Globals */
 bool  All_Done = false;

src/scenedit/scen.menus.mac.mm

@@ -7,10 +7,10 @@
 //
 
 #include "scen.menus.hpp"
-#include "scenario.hpp" // Include before Cocoa because the Cocoa header defines things that cause compilation errors in here
+#include "scenario/scenario.hpp" // Include before Cocoa because the Cocoa header defines things that cause compilation errors in here
 #include <Cocoa/Cocoa.h>
-#include "winutil.hpp"
-#include "undo.hpp"
+#include "tools/winutil.hpp"
+#include "tools/undo.hpp"
 
 using MenuHandle = NSMenu*;
 MenuHandle menu_bar_handle;

src/scenedit/scen.townout.cpp

@@ -4,8 +4,8 @@
 #include <stack>
 #include <boost/lexical_cast.hpp>
 #include "scen.global.hpp"
-#include "scenario.hpp"
-#include "town.hpp"
+#include "scenario/scenario.hpp"
+#include "scenario/town.hpp"
 #include "utility.hpp"
 #include "scen.actions.hpp"
 #include "scen.graphics.hpp"
@@ -14,15 +14,15 @@
 #include "scen.fileio.hpp"
 #include "scen.core.hpp"
 #include "mathutil.hpp"
-#include "button.hpp"
-#include "field.hpp"
-#include "strdlog.hpp"
-#include "choicedlog.hpp"
-#include "winutil.hpp"
-#include "ledgroup.hpp"
-#include "stack.hpp"
-#include "scrollpane.hpp"
-#include "fileio.hpp"
+#include "dialogxml/widgets/button.hpp"
+#include "dialogxml/widgets/field.hpp"
+#include "dialogxml/dialogs/strdlog.hpp"
+#include "dialogxml/dialogs/choicedlog.hpp"
+#include "tools/winutil.hpp"
+#include "dialogxml/widgets/ledgroup.hpp"
+#include "dialogxml/widgets/stack.hpp"
+#include "dialogxml/widgets/scrollpane.hpp"
+#include "fileio/fileio.hpp"
 
 extern short cen_x, cen_y, overall_mode;
 extern bool mouse_button_held,editing_town,change_made;