From 333d343c03481f66a1a75553e2c18f915e8bc984 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sun, 17 Oct 2021 16:29:20 +0100
Subject: Tidy up IWYU

---
 slicer/db/sqlInsertSerializer.cpp     | 1 +
 slicer/db/sqlSelectDeserializer.cpp   | 3 ++-
 slicer/db/sqlTablePatchSerializer.cpp | 1 +
 slicer/db/sqlUpdateSerializer.cpp     | 1 +
 slicer/ice/serializer.cpp             | 2 ++
 slicer/json/serializer.cpp            | 2 ++
 slicer/json/testSpecifics.cpp         | 2 +-
 slicer/xml/serializer.cpp             | 2 ++
 slicer/xml/testSpecifics.cpp          | 9 +++++++++
 9 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/slicer/db/sqlInsertSerializer.cpp b/slicer/db/sqlInsertSerializer.cpp
index 96ba457..ac1f133 100644
--- a/slicer/db/sqlInsertSerializer.cpp
+++ b/slicer/db/sqlInsertSerializer.cpp
@@ -11,6 +11,7 @@
 #include <functional>
 #include <memory>
 #include <modifycommand.h>
+#include <slicer/modelParts.h>
 #include <utility>
 
 namespace Slicer {
diff --git a/slicer/db/sqlSelectDeserializer.cpp b/slicer/db/sqlSelectDeserializer.cpp
index eaf09ac..f3f3c07 100644
--- a/slicer/db/sqlSelectDeserializer.cpp
+++ b/slicer/db/sqlSelectDeserializer.cpp
@@ -1,10 +1,11 @@
 #include "sqlSelectDeserializer.h"
-#include "common.h"
 #include "sqlExceptions.h"
 #include "sqlSource.h"
 #include <column.h>
 #include <memory>
 #include <selectcommand.h>
+#include <slicer/common.h>
+#include <slicer/modelParts.h>
 #include <utility>
 
 namespace Slicer {
diff --git a/slicer/db/sqlTablePatchSerializer.cpp b/slicer/db/sqlTablePatchSerializer.cpp
index b136b15..b95aeff 100644
--- a/slicer/db/sqlTablePatchSerializer.cpp
+++ b/slicer/db/sqlTablePatchSerializer.cpp
@@ -5,6 +5,7 @@
 #include <connection.h>
 #include <memory>
 #include <scopeExit.h>
+#include <slicer/modelParts.h>
 #include <string>
 #include <tablepatch.h>
 
diff --git a/slicer/db/sqlUpdateSerializer.cpp b/slicer/db/sqlUpdateSerializer.cpp
index 9e0e85a..a3c65ee 100644
--- a/slicer/db/sqlUpdateSerializer.cpp
+++ b/slicer/db/sqlUpdateSerializer.cpp
@@ -8,6 +8,7 @@
 #include <functional>
 #include <memory>
 #include <modifycommand.h>
+#include <slicer/modelParts.h>
 #include <sqlExceptions.h>
 #include <utility>
 
diff --git a/slicer/ice/serializer.cpp b/slicer/ice/serializer.cpp
index 102e958..310a5b0 100644
--- a/slicer/ice/serializer.cpp
+++ b/slicer/ice/serializer.cpp
@@ -7,6 +7,8 @@
 #include <istream>
 #include <iterator>
 #include <memory>
+#include <slicer/modelParts.h>
+#include <slicer/serializer.h>
 
 NAMEDFACTORY("application/ice", Slicer::IceStreamSerializer, Slicer::StreamSerializerFactory)
 NAMEDFACTORY("application/ice", Slicer::IceStreamDeserializer, Slicer::StreamDeserializerFactory)
diff --git a/slicer/json/serializer.cpp b/slicer/json/serializer.cpp
index 893b494..a485feb 100644
--- a/slicer/json/serializer.cpp
+++ b/slicer/json/serializer.cpp
@@ -10,6 +10,8 @@
 #include <map>
 #include <memory>
 #include <optional>
+#include <slicer/modelParts.h>
+#include <slicer/serializer.h>
 #include <string_view>
 #include <utility>
 #include <variant>
diff --git a/slicer/json/testSpecifics.cpp b/slicer/json/testSpecifics.cpp
index 19bb47c..dc471e2 100644
--- a/slicer/json/testSpecifics.cpp
+++ b/slicer/json/testSpecifics.cpp
@@ -1,8 +1,8 @@
 #define BOOST_TEST_MODULE json_specifics
 #include <boost/test/unit_test.hpp>
 
-#include "serializer.h"
 #include <iostream>
+#include <slicer/serializer.h>
 
 BOOST_AUTO_TEST_CASE(factories)
 {
diff --git a/slicer/xml/serializer.cpp b/slicer/xml/serializer.cpp
index dcec688..76efa95 100644
--- a/slicer/xml/serializer.cpp
+++ b/slicer/xml/serializer.cpp
@@ -24,6 +24,8 @@
 #include <memory>
 #include <optional>
 #include <slicer/metadata.h>
+#include <slicer/modelParts.h>
+#include <slicer/serializer.h>
 #include <string_view>
 #include <utility>
 #include <xmlExceptions.h>
diff --git a/slicer/xml/testSpecifics.cpp b/slicer/xml/testSpecifics.cpp
index 0b086b1..93d19fe 100644
--- a/slicer/xml/testSpecifics.cpp
+++ b/slicer/xml/testSpecifics.cpp
@@ -4,11 +4,20 @@
 #include "serializer.h"
 #include <Ice/Config.h>
 #include <iostream>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wold-style-cast"
+#pragma GCC diagnostic ignored "-Wsign-conversion"
+#ifndef __clang__
+#	pragma GCC diagnostic ignored "-Wuseless-cast"
+#endif
 #include <libxml++/parsers/domparser.h>
+#pragma GCC diagnostic pop
+#include <slicer/serializer.h>
 #include <slicer/slicer.h>
 #include <typeinfo>
 #include <xmlExceptions.h>
 // IWYU pragma: no_forward_declare Slicer::BadBooleanValue
+// IWYU pragma: no_forward_declare Slicer::XmlDocumentDeserializer
 
 template<typename T, typename... P>
 T
-- 
cgit v1.2.3