From e82055986e1d0850915095721175a32656c716c5 Mon Sep 17 00:00:00 2001 From: Quietust Date: Sun, 15 Jan 2012 14:54:14 -0600 Subject: [PATCH] Only use #include <> for system libraries - for everything else, use "" --- library/modules/Job.cpp | 18 +++++----- plugins/autodump.cpp | 32 +++++++++--------- plugins/cleaners.cpp | 8 ++--- plugins/cleanowned.cpp | 16 ++++----- plugins/colonies.cpp | 18 +++++----- plugins/deramp.cpp | 10 +++--- plugins/drybuckets.cpp | 10 +++--- plugins/fastdwarf.cpp | 8 ++--- plugins/filltraffic.cpp | 14 ++++---- plugins/fixwagons.cpp | 10 +++--- plugins/flows.cpp | 8 ++--- plugins/getplants.cpp | 12 +++---- plugins/initflags.cpp | 10 +++--- plugins/jobutils.cpp | 51 ++++++++++++++-------------- plugins/liquids.cpp | 16 ++++----- plugins/mode.cpp | 10 +++--- plugins/plants.cpp | 16 ++++----- plugins/probe.cpp | 21 ++++++------ plugins/prospector.cpp | 8 ++--- plugins/regrass.cpp | 10 +++--- plugins/rename.cpp | 28 ++++++++-------- plugins/reveal.cpp | 16 ++++----- plugins/seedwatch.cpp | 2 +- plugins/stockpiles.cpp | 20 +++++------ plugins/tiletypes.cpp | 16 ++++----- plugins/tubefill.cpp | 14 ++++---- plugins/vdig.cpp | 12 +++---- plugins/versionosd.cpp | 12 +++---- plugins/weather.cpp | 8 ++--- plugins/workflow.cpp | 74 ++++++++++++++++++++--------------------- 30 files changed, 252 insertions(+), 256 deletions(-) diff --git a/library/modules/Job.cpp b/library/modules/Job.cpp index 80c332fc8..be9560890 100644 --- a/library/modules/Job.cpp +++ b/library/modules/Job.cpp @@ -1,4 +1,4 @@ -/* +/* https://github.com/peterix/dfhack Copyright (c) 2009-2011 Petr Mrázek (peterix@gmail.com) @@ -40,14 +40,14 @@ using namespace std; #include "modules/Items.h" #include "DataDefs.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include "df/world.h" +#include "df/ui.h" +#include "df/job.h" +#include "df/job_item.h" +#include "df/job_list_link.h" +#include "df/general_ref.h" +#include "df/general_ref_unit_workerst.h" +#include "df/general_ref_building_holderst.h" using namespace DFHack; using namespace df::enums; diff --git a/plugins/autodump.cpp b/plugins/autodump.cpp index 5fc9adfc2..2e2bb4db4 100644 --- a/plugins/autodump.cpp +++ b/plugins/autodump.cpp @@ -5,27 +5,25 @@ #include #include #include +#include +#include #include using namespace std; #include "Core.h" -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#include -#include -#include -#include +#include "Console.h" +#include "Export.h" +#include "PluginManager.h" +#include "modules/Maps.h" +#include "modules/Gui.h" +#include "modules/Items.h" +#include "modules/Materials.h" +#include "modules/MapCache.h" + +#include "DataDefs.h" +#include "df/item.h" +#include "df/world.h" +#include "df/general_ref.h" using namespace DFHack; using MapExtras::Block; diff --git a/plugins/cleaners.cpp b/plugins/cleaners.cpp index fcfc166ff..1ee4b3406 100644 --- a/plugins/cleaners.cpp +++ b/plugins/cleaners.cpp @@ -1,7 +1,7 @@ #include "Core.h" -#include -#include -#include +#include "Console.h" +#include "Export.h" +#include "PluginManager.h" #include "DataDefs.h" #include "df/world.h" @@ -227,4 +227,4 @@ DFhackCExport command_result plugin_init ( Core * c, std::vector DFhackCExport command_result plugin_shutdown ( Core * c ) { return CR_OK; -} \ No newline at end of file +} diff --git a/plugins/cleanowned.cpp b/plugins/cleanowned.cpp index 1899129c1..966d8e335 100644 --- a/plugins/cleanowned.cpp +++ b/plugins/cleanowned.cpp @@ -9,16 +9,16 @@ using namespace std; #include "Core.h" -#include -#include -#include +#include "Console.h" +#include "Export.h" +#include "PluginManager.h" #include #include -#include -#include -#include -#include -#include +#include "modules/Maps.h" +#include "modules/Items.h" +#include "modules/Units.h" +#include "modules/Materials.h" +#include "modules/Translation.h" using namespace DFHack; DFhackCExport command_result df_cleanowned (Core * c, vector & parameters); diff --git a/plugins/colonies.cpp b/plugins/colonies.cpp index 3089b7ccd..ba1e16cc7 100644 --- a/plugins/colonies.cpp +++ b/plugins/colonies.cpp @@ -1,16 +1,16 @@ #include "Core.h" -#include -#include -#include +#include "Console.h" +#include "Export.h" +#include "PluginManager.h" #include #include -#include +#include "modules/Vermin.h" +#include "modules/Materials.h" using std::vector; using std::string; using namespace DFHack; using namespace DFHack::Simple; -#include DFhackCExport command_result colonies (Core * c, vector & parameters); @@ -34,8 +34,8 @@ DFhackCExport command_result plugin_shutdown ( Core * c ) } void destroyColonies(); -void convertColonies(DFHack::Materials *Materials); -void showColonies(Core *c, DFHack::Materials *Materials); +void convertColonies(Materials *Materials); +void showColonies(Core *c, Materials *Materials); DFhackCExport command_result colonies (Core * c, vector & parameters) { @@ -106,7 +106,7 @@ void destroyColonies() } // Convert all colonies to honey bees. -void convertColonies(DFHack::Materials *Materials) +void convertColonies(Materials *Materials) { int bee_idx = -1; for (size_t i = 0; i < Materials->raceEx.size(); i++) @@ -136,7 +136,7 @@ void convertColonies(DFHack::Materials *Materials) } } -void showColonies(Core *c, DFHack::Materials *Materials) +void showColonies(Core *c, Materials *Materials) { uint32_t numSpawnPoints = Vermin::getNumVermin(); int numColonies = 0; diff --git a/plugins/deramp.cpp b/plugins/deramp.cpp index 72801b77a..a86b61e8e 100644 --- a/plugins/deramp.cpp +++ b/plugins/deramp.cpp @@ -1,15 +1,15 @@ // De-ramp. All ramps marked for removal are replaced with given tile (presently, normal floor). #include "Core.h" -#include -#include -#include +#include "Console.h" +#include "Export.h" +#include "PluginManager.h" #include "DataDefs.h" #include "df/world.h" #include "df/map_block.h" #include "df/tile_dig_designation.h" -#include +#include "TileTypes.h" using std::vector; using std::string; @@ -111,4 +111,4 @@ DFhackCExport command_result plugin_init ( Core * c, std::vector DFhackCExport command_result plugin_shutdown ( Core * c ) { return CR_OK; -} \ No newline at end of file +} diff --git a/plugins/drybuckets.cpp b/plugins/drybuckets.cpp index c824ddfe9..abe692c0a 100644 --- a/plugins/drybuckets.cpp +++ b/plugins/drybuckets.cpp @@ -1,11 +1,11 @@ // Dry Buckets : Remove all "water" objects from buckets scattered around the fortress #include "Core.h" -#include -#include -#include +#include "Console.h" +#include "Export.h" +#include "PluginManager.h" -#include +#include "DataDefs.h" #include "df/world.h" #include "df/item.h" #include "df/builtin_mats.h" @@ -53,4 +53,4 @@ DFhackCExport command_result plugin_init ( Core * c, std::vector DFhackCExport command_result plugin_shutdown ( Core * c ) { return CR_OK; -} \ No newline at end of file +} diff --git a/plugins/fastdwarf.cpp b/plugins/fastdwarf.cpp index c8265be52..23310898c 100644 --- a/plugins/fastdwarf.cpp +++ b/plugins/fastdwarf.cpp @@ -1,9 +1,9 @@ #include "Core.h" -#include -#include -#include +#include "Console.h" +#include "Export.h" +#include "PluginManager.h" -#include +#include "DataDefs.h" #include "df/ui.h" #include "df/world.h" #include "df/unit.h" diff --git a/plugins/filltraffic.cpp b/plugins/filltraffic.cpp index a5c2188fe..b011bce2c 100644 --- a/plugins/filltraffic.cpp +++ b/plugins/filltraffic.cpp @@ -6,12 +6,12 @@ #include #include #include "Core.h" -#include -#include -#include -#include -#include -#include +#include "Console.h" +#include "Export.h" +#include "PluginManager.h" +#include "modules/Maps.h" +#include "modules/MapCache.h" +#include "modules/Gui.h" using std::stack; using MapExtras::MapCache; using namespace DFHack; @@ -377,4 +377,4 @@ void allRestricted(DFHack::DFCoord coord, MapExtras::MapCache * map) DFHack::t_designation des = map->designationAt(coord); des.bits.traffic = traffic_restricted; map->setDesignationAt(coord, des); -} \ No newline at end of file +} diff --git a/plugins/fixwagons.cpp b/plugins/fixwagons.cpp index 3d7c5ff9b..9f9a4732f 100644 --- a/plugins/fixwagons.cpp +++ b/plugins/fixwagons.cpp @@ -1,11 +1,11 @@ // I'll fix his little red wagon... #include "Core.h" -#include -#include -#include +#include "Console.h" +#include "Export.h" +#include "PluginManager.h" -#include +#include "DataDefs.h" #include "df/world.h" #include "df/historical_entity.h" #include "df/entity_raw.h" @@ -103,4 +103,4 @@ DFhackCExport command_result plugin_init ( Core * c, std::vector DFhackCExport command_result plugin_shutdown ( Core * c ) { return CR_OK; -} \ No newline at end of file +} diff --git a/plugins/flows.cpp b/plugins/flows.cpp index fd4c0c579..757bf9710 100644 --- a/plugins/flows.cpp +++ b/plugins/flows.cpp @@ -1,11 +1,11 @@ // This tool counts static tiles and active flows of water and magma. #include "Core.h" -#include -#include -#include +#include "Console.h" +#include "Export.h" +#include "PluginManager.h" -#include +#include "DataDefs.h" #include "df/world.h" #include "df/map_block.h" #include "df/tile_liquid.h" diff --git a/plugins/getplants.cpp b/plugins/getplants.cpp index 5643676aa..c2ddc4992 100644 --- a/plugins/getplants.cpp +++ b/plugins/getplants.cpp @@ -1,12 +1,12 @@ // Designate all matching plants for gathering/cutting #include "Core.h" -#include -#include -#include +#include "Console.h" +#include "Export.h" +#include "PluginManager.h" -#include -#include +#include "DataDefs.h" +#include "TileTypes.h" #include "df/world.h" #include "df/map_block.h" #include "df/tile_dig_designation.h" @@ -152,4 +152,4 @@ DFhackCExport command_result plugin_init ( Core * c, vector &com DFhackCExport command_result plugin_shutdown ( Core * c ) { return CR_OK; -} \ No newline at end of file +} diff --git a/plugins/initflags.cpp b/plugins/initflags.cpp index c7a634b78..d6d03811e 100644 --- a/plugins/initflags.cpp +++ b/plugins/initflags.cpp @@ -1,10 +1,10 @@ #include "Core.h" -#include -#include -#include +#include "Console.h" +#include "Export.h" +#include "PluginManager.h" -#include -#include +#include "DataDefs.h" +#include "df/d_init.h" using std::vector; using std::string; diff --git a/plugins/jobutils.cpp b/plugins/jobutils.cpp index 4b89591a4..e7cca6bf0 100644 --- a/plugins/jobutils.cpp +++ b/plugins/jobutils.cpp @@ -1,30 +1,29 @@ #include "Core.h" -#include -#include -#include -#include - -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "Console.h" +#include "Export.h" +#include "PluginManager.h" +#include "MiscUtils.h" + +#include "modules/Materials.h" +#include "modules/Items.h" +#include "modules/Gui.h" +#include "modules/Job.h" + +#include "DataDefs.h" +#include "df/world.h" +#include "df/ui.h" +#include "df/ui_build_selector.h" +#include "df/ui_build_item_req.h" +#include "df/build_req_choice_genst.h" +#include "df/build_req_choice_specst.h" +#include "df/building_workshopst.h" +#include "df/building_furnacest.h" +#include "df/job.h" +#include "df/job_item.h" +#include "df/job_list_link.h" +#include "df/item.h" +#include "df/tool_uses.h" +#include "df/general_ref.h" using std::vector; using std::string; diff --git a/plugins/liquids.cpp b/plugins/liquids.cpp index 17f4e6309..4b6af8735 100644 --- a/plugins/liquids.cpp +++ b/plugins/liquids.cpp @@ -10,14 +10,14 @@ using std::endl; using std::set; #include "Core.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include "Console.h" +#include "Export.h" +#include "PluginManager.h" +#include "modules/Vegetation.h" +#include "modules/Maps.h" +#include "modules/Gui.h" +#include "TileTypes.h" +#include "modules/MapCache.h" using namespace MapExtras; using namespace DFHack; diff --git a/plugins/mode.cpp b/plugins/mode.cpp index 9c7aefb73..89728a341 100644 --- a/plugins/mode.cpp +++ b/plugins/mode.cpp @@ -2,12 +2,12 @@ using namespace std; #include "Core.h" -#include -#include -#include +#include "Console.h" +#include "Export.h" +#include "PluginManager.h" #include #include -#include +#include "modules/World.h" #include using namespace DFHack; @@ -169,4 +169,4 @@ DFhackCExport command_result mode (Core * c, vector & parameters) c->con << endl; } return CR_OK; -} \ No newline at end of file +} diff --git a/plugins/plants.cpp b/plugins/plants.cpp index 4d8960cee..eb95ce483 100644 --- a/plugins/plants.cpp +++ b/plugins/plants.cpp @@ -6,14 +6,14 @@ #include #include "Core.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include "Console.h" +#include "Export.h" +#include "PluginManager.h" +#include "modules/Vegetation.h" +#include "modules/Maps.h" +#include "modules/Gui.h" +#include "TileTypes.h" +#include "modules/MapCache.h" using std::vector; using std::string; diff --git a/plugins/probe.cpp b/plugins/probe.cpp index cf00fe0dd..a56757dc4 100644 --- a/plugins/probe.cpp +++ b/plugins/probe.cpp @@ -4,23 +4,22 @@ #include #include #include +#include #include #include #include using namespace std; #include "Core.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "Console.h" +#include "Export.h" +#include "PluginManager.h" +#include "modules/Units.h" +#include "modules/Maps.h" +#include "modules/Gui.h" +#include "modules/Materials.h" +#include "modules/MapCache.h" +#include "MiscUtils.h" using std::vector; using std::string; diff --git a/plugins/prospector.cpp b/plugins/prospector.cpp index 6287734c1..6d907a4a4 100644 --- a/plugins/prospector.cpp +++ b/plugins/prospector.cpp @@ -13,11 +13,11 @@ #include using namespace std; -#include -#include #include "Core.h" -#include -#include +#include "Console.h" +#include "Export.h" +#include "PluginManager.h" +#include "modules/MapCache.h" using namespace DFHack; diff --git a/plugins/regrass.cpp b/plugins/regrass.cpp index 99af1de7f..53733fc29 100644 --- a/plugins/regrass.cpp +++ b/plugins/regrass.cpp @@ -2,14 +2,14 @@ // Necessary for worlds generated prior to version 0.31.19 - otherwise, outdoor shrubs and trees no longer grow. #include "Core.h" -#include -#include -#include +#include "Console.h" +#include "Export.h" +#include "PluginManager.h" -#include +#include "DataDefs.h" #include "df/world.h" #include "df/map_block.h" -#include +#include "TileTypes.h" using std::string; using std::vector; diff --git a/plugins/rename.cpp b/plugins/rename.cpp index 9cd864042..379230023 100644 --- a/plugins/rename.cpp +++ b/plugins/rename.cpp @@ -1,18 +1,18 @@ #include "Core.h" -#include -#include -#include - -#include - -#include -#include -#include -#include -#include -#include -#include -#include +#include "Console.h" +#include "Export.h" +#include "PluginManager.h" + +#include "modules/Gui.h" + +#include "DataDefs.h" +#include "df/ui.h" +#include "df/world.h" +#include "df/squad.h" +#include "df/unit.h" +#include "df/unit_soul.h" +#include "df/historical_figure.h" +#include "df/language_name.h" #include diff --git a/plugins/reveal.cpp b/plugins/reveal.cpp index ce37f3f1e..bafb6e40f 100644 --- a/plugins/reveal.cpp +++ b/plugins/reveal.cpp @@ -3,13 +3,13 @@ #include #include #include "Core.h" -#include -#include -#include -#include -#include -#include -#include +#include "Console.h" +#include "Export.h" +#include "PluginManager.h" +#include "modules/Maps.h" +#include "modules/World.h" +#include "modules/MapCache.h" +#include "modules/Gui.h" using MapExtras::MapCache; using namespace DFHack; @@ -504,4 +504,4 @@ DFhackCExport command_result revflood(DFHack::Core * c, std::vector delete MCache; c->Resume(); return CR_OK; -} \ No newline at end of file +} diff --git a/plugins/seedwatch.cpp b/plugins/seedwatch.cpp index 3b83338e2..2d1a23b51 100755 --- a/plugins/seedwatch.cpp +++ b/plugins/seedwatch.cpp @@ -12,7 +12,7 @@ #include "modules/Items.h" #include "modules/World.h" #include "modules/kitchen.h" -#include +#include "VersionInfo.h" using DFHack::t_materialType; using DFHack::t_materialIndex; diff --git a/plugins/stockpiles.cpp b/plugins/stockpiles.cpp index e104ec908..a090b3f58 100644 --- a/plugins/stockpiles.cpp +++ b/plugins/stockpiles.cpp @@ -1,14 +1,14 @@ #include "Core.h" -#include -#include -#include - -#include -#include -#include -#include -#include -#include +#include "Console.h" +#include "Export.h" +#include "PluginManager.h" + +#include "DataDefs.h" +#include "df/world.h" +#include "df/ui.h" +#include "df/building_stockpilest.h" +#include "df/selection_rect.h" +#include "df/viewscreen_dwarfmodest.h" using std::vector; using std::string; diff --git a/plugins/tiletypes.cpp b/plugins/tiletypes.cpp index 57184f013..b20764447 100644 --- a/plugins/tiletypes.cpp +++ b/plugins/tiletypes.cpp @@ -11,14 +11,14 @@ using std::endl; using std::set; #include "Core.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include "Console.h" +#include "Export.h" +#include "PluginManager.h" +#include "modules/Vegetation.h" +#include "modules/Maps.h" +#include "modules/Gui.h" +#include "TileTypes.h" +#include "modules/MapCache.h" using namespace MapExtras; using namespace DFHack; diff --git a/plugins/tubefill.cpp b/plugins/tubefill.cpp index 23e6e992a..b0a371cf1 100644 --- a/plugins/tubefill.cpp +++ b/plugins/tubefill.cpp @@ -5,13 +5,13 @@ #include #include #include "Core.h" -#include -#include -#include -#include -#include -#include -#include +#include "Console.h" +#include "Export.h" +#include "PluginManager.h" +#include "modules/Maps.h" +#include "modules/World.h" +#include "modules/MapCache.h" +#include "modules/Gui.h" using MapExtras::MapCache; using namespace DFHack; diff --git a/plugins/vdig.cpp b/plugins/vdig.cpp index fbbd36e46..2f9daf7d8 100644 --- a/plugins/vdig.cpp +++ b/plugins/vdig.cpp @@ -1,10 +1,10 @@ #include "Core.h" -#include -#include -#include -#include -#include -#include +#include "Console.h" +#include "Export.h" +#include "PluginManager.h" +#include "modules/Maps.h" +#include "modules/Gui.h" +#include "modules/MapCache.h" #include #include #include diff --git a/plugins/versionosd.cpp b/plugins/versionosd.cpp index 5f4ff11a8..f3e63e8c3 100644 --- a/plugins/versionosd.cpp +++ b/plugins/versionosd.cpp @@ -8,11 +8,11 @@ #include using namespace std; #include "Core.h" -#include -#include -#include -#include -#include +#include "Console.h" +#include "Export.h" +#include "PluginManager.h" +#include "modules/Graphic.h" +#include "modules/Gui.h" using namespace DFHack; DFhackCExport command_result df_versionosd (Core * c, vector & parameters); @@ -145,4 +145,4 @@ DFTileSurface* gettile (int x, int y) } return NULL; -} \ No newline at end of file +} diff --git a/plugins/weather.cpp b/plugins/weather.cpp index 0f2325d48..efe4ecaec 100644 --- a/plugins/weather.cpp +++ b/plugins/weather.cpp @@ -1,10 +1,10 @@ #include "Core.h" -#include -#include -#include +#include "Console.h" +#include "Export.h" +#include "PluginManager.h" #include #include -#include +#include "modules/World.h" using std::vector; using std::string; diff --git a/plugins/workflow.cpp b/plugins/workflow.cpp index 104604ce6..4a3564d65 100644 --- a/plugins/workflow.cpp +++ b/plugins/workflow.cpp @@ -1,41 +1,41 @@ #include "Core.h" -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "Console.h" +#include "Export.h" +#include "PluginManager.h" +#include "MiscUtils.h" + +#include "modules/Materials.h" +#include "modules/Items.h" +#include "modules/Gui.h" +#include "modules/Job.h" +#include "modules/World.h" + +#include "DataDefs.h" +#include "df/world.h" +#include "df/ui.h" +#include "df/building_workshopst.h" +#include "df/building_furnacest.h" +#include "df/job.h" +#include "df/job_item.h" +#include "df/job_list_link.h" +#include "df/dfhack_material_category.h" +#include "df/item.h" +#include "df/items_other_id.h" +#include "df/tool_uses.h" +#include "df/general_ref.h" +#include "df/general_ref_unit_workerst.h" +#include "df/general_ref_unit_holderst.h" +#include "df/general_ref_building_holderst.h" +#include "df/general_ref_contains_itemst.h" +#include "df/general_ref_contained_in_itemst.h" +#include "df/general_ref_contains_unitst.h" +#include "df/itemdef_foodst.h" +#include "df/reaction.h" +#include "df/reaction_reagent_itemst.h" +#include "df/reaction_product_itemst.h" +#include "df/plant_raw.h" +#include "df/inorganic_raw.h" +#include "df/builtin_mats.h" using std::vector; using std::string;