From 6a15bd8529f7c08dabca2ec348e9a06452737656 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 9 Aug 2022 01:59:25 +0300 Subject: [PATCH 45/45] AI: Rename ailog.[ch] as dailog.[ch] Drop dailog.h includes where they are not needed See osdn #45333 Signed-off-by: Marko Lindqvist --- ai/classic/classicai.c | 2 +- ai/default/Makefile.am | 4 ++-- ai/default/aiair.c | 1 - ai/default/aidiplomat.c | 2 +- ai/default/aiferry.c | 1 - ai/default/aiguard.c | 2 +- ai/default/aihand.c | 2 +- ai/default/aihunt.c | 1 - ai/default/aiparatrooper.c | 1 - ai/default/aitech.c | 2 +- ai/default/aitools.c | 2 +- ai/default/aiunit.c | 2 +- ai/default/daicity.c | 1 - ai/default/daidiplomacy.c | 2 +- ai/default/daidomestic.c | 1 - ai/default/{ailog.c => dailog.c} | 2 +- ai/default/{ailog.h => dailog.h} | 6 +++--- ai/default/daimilitary.c | 2 +- ai/default/daisettler.c | 2 +- ai/tex/texai.c | 2 +- meson.build | 2 +- 21 files changed, 18 insertions(+), 24 deletions(-) rename ai/default/{ailog.c => dailog.c} (99%) rename ai/default/{ailog.h => dailog.h} (98%) diff --git a/ai/classic/classicai.c b/ai/classic/classicai.c index ea72caa76c..06eb4905f5 100644 --- a/ai/classic/classicai.c +++ b/ai/classic/classicai.c @@ -26,13 +26,13 @@ /* ai/default */ #include "aiferry.h" #include "aihand.h" -#include "ailog.h" #include "aitools.h" #include "aiunit.h" #include "daicity.h" #include "daidata.h" #include "daidiplomacy.h" #include "daidomestic.h" +#include "dailog.h" #include "daimilitary.h" #include "daiplayer.h" #include "daisettler.h" diff --git a/ai/default/Makefile.am b/ai/default/Makefile.am index fb26920163..7fdc878e0b 100644 --- a/ai/default/Makefile.am +++ b/ai/default/Makefile.am @@ -24,8 +24,6 @@ libdefaultai_la_SOURCES = \ aihand.h \ aihunt.c \ aihunt.h \ - ailog.c \ - ailog.h \ aiparatrooper.c \ aiparatrooper.h \ aitech.c \ @@ -48,6 +46,8 @@ libdefaultai_la_SOURCES = \ daidomestic.h \ daieffects.c \ daieffects.h \ + dailog.c \ + dailog.h \ daimilitary.c \ daimilitary.h \ daiplayer.c \ diff --git a/ai/default/aiair.c b/ai/default/aiair.c index f3fabd9d53..f6d24ed29b 100644 --- a/ai/default/aiair.c +++ b/ai/default/aiair.c @@ -42,7 +42,6 @@ #include "handicaps.h" /* ai/default */ -#include "ailog.h" #include "aitools.h" #include "aiunit.h" #include "daicity.h" diff --git a/ai/default/aidiplomat.c b/ai/default/aidiplomat.c index 744335c5b7..e8a4361799 100644 --- a/ai/default/aidiplomat.c +++ b/ai/default/aidiplomat.c @@ -62,12 +62,12 @@ /* ai/default */ #include "aiguard.h" #include "aihand.h" -#include "ailog.h" #include "aitools.h" #include "aiunit.h" #include "daiactions.h" #include "daicity.h" #include "daidata.h" +#include "dailog.h" #include "daimilitary.h" #include "daiplayer.h" diff --git a/ai/default/aiferry.c b/ai/default/aiferry.c index 39232b4cbc..30687baa1b 100644 --- a/ai/default/aiferry.c +++ b/ai/default/aiferry.c @@ -47,7 +47,6 @@ /* ai/default */ #include "aiguard.h" -#include "ailog.h" #include "aitools.h" #include "aiunit.h" #include "daidata.h" diff --git a/ai/default/aiguard.c b/ai/default/aiguard.c index 21d74432d3..9744d76740 100644 --- a/ai/default/aiguard.c +++ b/ai/default/aiguard.c @@ -26,9 +26,9 @@ #include "srv_log.h" /* ai */ -#include "ailog.h" #include "aitools.h" #include "aiunit.h" +#include "dailog.h" #include "daiplayer.h" #include "aiguard.h" diff --git a/ai/default/aihand.c b/ai/default/aihand.c index da09d4c15e..d26bd3b54a 100644 --- a/ai/default/aihand.c +++ b/ai/default/aihand.c @@ -54,13 +54,13 @@ #include "handicaps.h" /* ai/default */ -#include "ailog.h" #include "aitech.h" #include "aitools.h" #include "aiunit.h" #include "daicity.h" #include "daidata.h" #include "daidiplomacy.h" +#include "dailog.h" #include "daimilitary.h" #include "daiplayer.h" diff --git a/ai/default/aihunt.c b/ai/default/aihunt.c index a6fbe48c96..d45fed8ed9 100644 --- a/ai/default/aihunt.c +++ b/ai/default/aihunt.c @@ -48,7 +48,6 @@ #include "handicaps.h" /* ai/default */ -#include "ailog.h" #include "aitools.h" #include "aiunit.h" #include "daicity.h" diff --git a/ai/default/aiparatrooper.c b/ai/default/aiparatrooper.c index bed07d569e..32a5c700db 100644 --- a/ai/default/aiparatrooper.c +++ b/ai/default/aiparatrooper.c @@ -46,7 +46,6 @@ #include "handicaps.h" /* ai/default */ -#include "ailog.h" #include "aiunit.h" #include "aitools.h" #include "daicity.h" diff --git a/ai/default/aitech.c b/ai/default/aitech.c index ab6d6fa4ee..701c087019 100644 --- a/ai/default/aitech.c +++ b/ai/default/aitech.c @@ -36,10 +36,10 @@ #include "advdata.h" /* ai/default */ -#include "ailog.h" #include "aitools.h" #include "daidata.h" #include "daieffects.h" +#include "dailog.h" #include "daiplayer.h" #include "aitech.h" diff --git a/ai/default/aitools.c b/ai/default/aitools.c index ff98edf2e2..f1b6fe2965 100644 --- a/ai/default/aitools.c +++ b/ai/default/aitools.c @@ -61,10 +61,10 @@ /* ai/default */ #include "aiferry.h" #include "aiguard.h" -#include "ailog.h" #include "aitech.h" #include "aiunit.h" #include "daidata.h" +#include "dailog.h" #include "daimilitary.h" #include "daiplayer.h" diff --git a/ai/default/aiunit.c b/ai/default/aiunit.c index 5389f59bf6..391ebd0b0a 100644 --- a/ai/default/aiunit.c +++ b/ai/default/aiunit.c @@ -71,12 +71,12 @@ #include "aiguard.h" #include "aihand.h" #include "aihunt.h" -#include "ailog.h" #include "aiparatrooper.h" #include "aitools.h" #include "daicity.h" #include "daidata.h" #include "daieffects.h" +#include "dailog.h" #include "daimilitary.h" #include "daiplayer.h" diff --git a/ai/default/daicity.c b/ai/default/daicity.c index f1359ca5cd..1098c118d8 100644 --- a/ai/default/daicity.c +++ b/ai/default/daicity.c @@ -53,7 +53,6 @@ /* ai/default */ #include "aihand.h" -#include "ailog.h" #include "aitools.h" #include "aiunit.h" #include "daidata.h" diff --git a/ai/default/daidiplomacy.c b/ai/default/daidiplomacy.c index cc8b3e70ce..0375a65725 100644 --- a/ai/default/daidiplomacy.c +++ b/ai/default/daidiplomacy.c @@ -56,11 +56,11 @@ #include "handicaps.h" /* ai/default */ -#include "ailog.h" #include "aiunit.h" #include "aitools.h" #include "daicity.h" #include "daidata.h" +#include "dailog.h" #include "daimilitary.h" #include "daiplayer.h" diff --git a/ai/default/daidomestic.c b/ai/default/daidomestic.c index 22e576541a..a975f1d953 100644 --- a/ai/default/daidomestic.c +++ b/ai/default/daidomestic.c @@ -53,7 +53,6 @@ #include "handicaps.h" /* ai/default */ -#include "ailog.h" #include "aitech.h" #include "aitools.h" #include "aiunit.h" diff --git a/ai/default/ailog.c b/ai/default/dailog.c similarity index 99% rename from ai/default/ailog.c rename to ai/default/dailog.c index 60170addd4..5f313e7973 100644 --- a/ai/default/ailog.c +++ b/ai/default/dailog.c @@ -31,7 +31,7 @@ #include "daidata.h" #include "daiplayer.h" -#include "ailog.h" +#include "dailog.h" /**********************************************************************//** diff --git a/ai/default/ailog.h b/ai/default/dailog.h similarity index 98% rename from ai/default/ailog.h rename to ai/default/dailog.h index a5fbb85cae..ef64c935c3 100644 --- a/ai/default/ailog.h +++ b/ai/default/dailog.h @@ -10,8 +10,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. ***********************************************************************/ -#ifndef FC__AILOG_H -#define FC__AILOG_H +#ifndef FC__DAILOG_H +#define FC__DAILOG_H /* utility */ #include "log.h" @@ -78,4 +78,4 @@ void real_bodyguard_log(struct ai_type *ait, const char *file, } \ } -#endif /* FC__AILOG_H */ +#endif /* FC__DAILOG_H */ diff --git a/ai/default/daimilitary.c b/ai/default/daimilitary.c index 9f5402e3d3..00f5797e44 100644 --- a/ai/default/daimilitary.c +++ b/ai/default/daimilitary.c @@ -58,7 +58,6 @@ #include "aiferry.h" #include "aihand.h" #include "aihunt.h" -#include "ailog.h" #include "aiparatrooper.h" #include "aitech.h" #include "aitools.h" @@ -66,6 +65,7 @@ #include "daicity.h" #include "daidata.h" #include "daieffects.h" +#include "dailog.h" #include "daiplayer.h" #include "daimilitary.h" diff --git a/ai/default/daisettler.c b/ai/default/daisettler.c index 6f1b7c781c..979c3feb10 100644 --- a/ai/default/daisettler.c +++ b/ai/default/daisettler.c @@ -56,11 +56,11 @@ /* ai/default */ #include "aiferry.h" -#include "ailog.h" #include "aitools.h" #include "aiunit.h" #include "daicity.h" #include "daidata.h" +#include "dailog.h" #include "daiplayer.h" #include "daisettler.h" diff --git a/ai/tex/texai.c b/ai/tex/texai.c index a91c959883..f78c7ac694 100644 --- a/ai/tex/texai.c +++ b/ai/tex/texai.c @@ -21,11 +21,11 @@ /* ai/default */ #include "aiferry.h" #include "aihand.h" -#include "ailog.h" #include "aitools.h" #include "daicity.h" #include "daidiplomacy.h" #include "daidomestic.h" +#include "dailog.h" #include "daimilitary.h" #include "daiplayer.h" #include "daisettler.h" diff --git a/meson.build b/meson.build index 6a800217ff..f1a2c3c273 100644 --- a/meson.build +++ b/meson.build @@ -877,7 +877,6 @@ ais = static_library('fc_ai', 'ai/default/aiguard.c', 'ai/default/aihand.c', 'ai/default/aihunt.c', - 'ai/default/ailog.c', 'ai/default/aiparatrooper.c', 'ai/default/aitech.c', 'ai/default/aitools.c', @@ -888,6 +887,7 @@ ais = static_library('fc_ai', 'ai/default/daidiplomacy.c', 'ai/default/daidomestic.c', 'ai/default/daieffects.c', + 'ai/default/dailog.c', 'ai/default/daimilitary.c', 'ai/default/daiplayer.c', 'ai/default/daisettler.c', -- 2.35.1