From 909cd8b60babbbe5fdeccf92b85ac62feae8d7fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Tue, 17 May 2011 08:36:38 +0200 Subject: [PATCH] Move termutil to a globally accessible area. --- .../supported => library/include/dfhack/extra}/termutil.h | 0 tools/supported/attachtest.cpp | 2 +- tools/supported/autodump.cpp | 2 +- tools/supported/cleanmap.cpp | 2 +- tools/supported/cleanowned.cpp | 2 +- tools/supported/cleartask.cpp | 2 +- tools/supported/deramp.cpp | 2 +- tools/supported/dftubefill.cpp | 2 +- tools/supported/dumpoffsets.cpp | 2 +- tools/supported/expbench.cpp | 2 +- tools/supported/flows.cpp | 2 +- tools/supported/forcepause.cpp | 2 +- tools/supported/grow.cpp | 2 +- tools/supported/immolate.cpp | 3 ++- tools/supported/lair.cpp | 2 +- tools/supported/liquids.cpp | 7 +++++-- tools/supported/position.cpp | 2 +- tools/supported/probe.cpp | 2 +- tools/supported/prospector.cpp | 2 +- tools/supported/reveal.cpp | 2 +- tools/supported/suspendtest.cpp | 2 +- tools/supported/tiletypes.cpp | 2 +- tools/supported/unreveal.cpp | 2 +- tools/supported/unstuck.cpp | 2 +- tools/supported/vdig.cpp | 2 +- 25 files changed, 29 insertions(+), 25 deletions(-) rename {tools/supported => library/include/dfhack/extra}/termutil.h (100%) diff --git a/tools/supported/termutil.h b/library/include/dfhack/extra/termutil.h similarity index 100% rename from tools/supported/termutil.h rename to library/include/dfhack/extra/termutil.h diff --git a/tools/supported/attachtest.cpp b/tools/supported/attachtest.cpp index e1b1bc639..0dc509fa7 100644 --- a/tools/supported/attachtest.cpp +++ b/tools/supported/attachtest.cpp @@ -7,7 +7,7 @@ #include using namespace std; #include -#include "termutil.h" +#include int main (void) { diff --git a/tools/supported/autodump.cpp b/tools/supported/autodump.cpp index bc8d6e16c..bc85967ab 100644 --- a/tools/supported/autodump.cpp +++ b/tools/supported/autodump.cpp @@ -11,7 +11,7 @@ using namespace std; #include #include #include // map cache for the win. -#include "termutil.h" +#include using namespace DFHack; using MapExtras::Block; using MapExtras::MapCache; diff --git a/tools/supported/cleanmap.cpp b/tools/supported/cleanmap.cpp index 0c095afa0..fb689dc1b 100644 --- a/tools/supported/cleanmap.cpp +++ b/tools/supported/cleanmap.cpp @@ -7,7 +7,7 @@ using namespace std; #include -#include "termutil.h" +#include int main (int argc, char** argv) { diff --git a/tools/supported/cleanowned.cpp b/tools/supported/cleanowned.cpp index 2ef6b1007..d2742af5c 100644 --- a/tools/supported/cleanowned.cpp +++ b/tools/supported/cleanowned.cpp @@ -13,7 +13,7 @@ using namespace std; #include #include #include -#include "termutil.h" +#include int main (int argc, char *argv[]) { diff --git a/tools/supported/cleartask.cpp b/tools/supported/cleartask.cpp index d6ef80f37..0a9e521bf 100644 --- a/tools/supported/cleartask.cpp +++ b/tools/supported/cleartask.cpp @@ -11,7 +11,7 @@ using namespace std; #include #include #include -#include "termutil.h" +#include int main () { diff --git a/tools/supported/deramp.cpp b/tools/supported/deramp.cpp index e112ac90c..d660c9ed2 100644 --- a/tools/supported/deramp.cpp +++ b/tools/supported/deramp.cpp @@ -10,7 +10,7 @@ using namespace std; #include #include -#include "termutil.h" +#include int main (void) { diff --git a/tools/supported/dftubefill.cpp b/tools/supported/dftubefill.cpp index 14a39e736..510b6c21e 100644 --- a/tools/supported/dftubefill.cpp +++ b/tools/supported/dftubefill.cpp @@ -10,7 +10,7 @@ using namespace std; #include #include -#include "termutil.h" +#include int main (void) { diff --git a/tools/supported/dumpoffsets.cpp b/tools/supported/dumpoffsets.cpp index bcd4be91a..805c9230a 100644 --- a/tools/supported/dumpoffsets.cpp +++ b/tools/supported/dumpoffsets.cpp @@ -10,7 +10,7 @@ using namespace std; #include #include using namespace DFHack; -#include "termutil.h" +#include int main (int numargs, const char ** args) { diff --git a/tools/supported/expbench.cpp b/tools/supported/expbench.cpp index bc7644fd4..80da929b0 100644 --- a/tools/supported/expbench.cpp +++ b/tools/supported/expbench.cpp @@ -9,7 +9,7 @@ using namespace std; #include -#include "termutil.h" +#include void print_progress (int current, int total) { if(total < 100) diff --git a/tools/supported/flows.cpp b/tools/supported/flows.cpp index f07496b55..7368cf6d6 100644 --- a/tools/supported/flows.cpp +++ b/tools/supported/flows.cpp @@ -5,7 +5,7 @@ using namespace std; #include -#include "termutil.h" +#include int main (void) { bool temporary_terminal = TemporaryTerminal(); diff --git a/tools/supported/forcepause.cpp b/tools/supported/forcepause.cpp index b2dcf62ce..98b9b8a6c 100644 --- a/tools/supported/forcepause.cpp +++ b/tools/supported/forcepause.cpp @@ -7,7 +7,7 @@ using namespace std; #include #include -#include "termutil.h" +#include int main (int argc, char** argv) { diff --git a/tools/supported/grow.cpp b/tools/supported/grow.cpp index afa15a14d..a5d0deb1c 100644 --- a/tools/supported/grow.cpp +++ b/tools/supported/grow.cpp @@ -10,7 +10,7 @@ using namespace std; #include #include #include -#include "termutil.h" +#include int main(int argc, char *argv[]) { diff --git a/tools/supported/immolate.cpp b/tools/supported/immolate.cpp index 87e0d990a..99f68a900 100644 --- a/tools/supported/immolate.cpp +++ b/tools/supported/immolate.cpp @@ -7,10 +7,11 @@ using namespace std; #include #include +#include #include #include #include -#include "termutil.h" + bool parseOptions(int argc, char **argv, bool &trees, bool &shrubs, bool &immolate) diff --git a/tools/supported/lair.cpp b/tools/supported/lair.cpp index ae4974321..a0427f7c2 100644 --- a/tools/supported/lair.cpp +++ b/tools/supported/lair.cpp @@ -5,7 +5,7 @@ #include using namespace std; #include -#include "termutil.h" +#include int main (void) { diff --git a/tools/supported/liquids.cpp b/tools/supported/liquids.cpp index 67ed9a9ed..dfdc7d96d 100644 --- a/tools/supported/liquids.cpp +++ b/tools/supported/liquids.cpp @@ -1,15 +1,18 @@ #include #include #include +#include #include using namespace std; #include #include -#include using namespace MapExtras; +#include + + + -#include "termutil.h" typedef vector coord_vec; diff --git a/tools/supported/position.cpp b/tools/supported/position.cpp index 5b0367e7b..ca90b2532 100644 --- a/tools/supported/position.cpp +++ b/tools/supported/position.cpp @@ -7,7 +7,7 @@ using namespace std; #include -#include "termutil.h" +#include std::ostream &operator<<(std::ostream &stream, DFHack::t_gamemodes funzies) { const char * gm[]= diff --git a/tools/supported/probe.cpp b/tools/supported/probe.cpp index a4483fbe5..1da2618a0 100644 --- a/tools/supported/probe.cpp +++ b/tools/supported/probe.cpp @@ -13,7 +13,7 @@ using namespace std; #define DFHACK_WANT_TILETYPES 1 #include #include -#include "termutil.h" +#include using namespace DFHack; int main (int numargs, const char ** args) diff --git a/tools/supported/prospector.cpp b/tools/supported/prospector.cpp index 1cdf6064d..6242d9c97 100644 --- a/tools/supported/prospector.cpp +++ b/tools/supported/prospector.cpp @@ -16,7 +16,7 @@ using namespace std; #include #include #include -#include "termutil.h" +#include typedef std::map MatMap; typedef std::vector< pair > MatSorter; diff --git a/tools/supported/reveal.cpp b/tools/supported/reveal.cpp index 125cb1522..9c64dde13 100644 --- a/tools/supported/reveal.cpp +++ b/tools/supported/reveal.cpp @@ -21,7 +21,7 @@ void waitmsec (int delay) Sleep(delay); } #endif -#include "termutil.h" +#include struct hideblock { diff --git a/tools/supported/suspendtest.cpp b/tools/supported/suspendtest.cpp index 5dd58fa9f..2493fcf68 100644 --- a/tools/supported/suspendtest.cpp +++ b/tools/supported/suspendtest.cpp @@ -8,7 +8,7 @@ using namespace std; #include -#include "termutil.h" +#include int main (void) { diff --git a/tools/supported/tiletypes.cpp b/tools/supported/tiletypes.cpp index c3fa87c67..4a46f60b2 100644 --- a/tools/supported/tiletypes.cpp +++ b/tools/supported/tiletypes.cpp @@ -9,7 +9,7 @@ using namespace std; #include #include -#include "termutil.h" +#include void tolower(std::string &str) { diff --git a/tools/supported/unreveal.cpp b/tools/supported/unreveal.cpp index 33e20a2cd..d58d4fec1 100644 --- a/tools/supported/unreveal.cpp +++ b/tools/supported/unreveal.cpp @@ -12,7 +12,7 @@ using namespace std; #include using namespace MapExtras; using namespace DFHack; -#include "termutil.h" +#include int main (int argc, char* argv[]) { diff --git a/tools/supported/unstuck.cpp b/tools/supported/unstuck.cpp index 93d6f3efc..01a4e4c21 100644 --- a/tools/supported/unstuck.cpp +++ b/tools/supported/unstuck.cpp @@ -8,7 +8,7 @@ using namespace std; #include -#include "termutil.h" +#include int main (void) { bool temporary_terminal = TemporaryTerminal(); diff --git a/tools/supported/vdig.cpp b/tools/supported/vdig.cpp index f415508e2..c17f0d1ef 100644 --- a/tools/supported/vdig.cpp +++ b/tools/supported/vdig.cpp @@ -10,7 +10,7 @@ using namespace std; #include #include -#include "termutil.h" +#include using namespace MapExtras; int main (int argc, char* argv[])