From b8d27474eb1dbf54977364377c138f5a3fce4020 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Tue, 21 Sep 2021 20:18:20 +0100
Subject: Tidy up IWYU

---
 libmysqlpp/my-column.cpp           | 10 +++-------
 libmysqlpp/my-column.h             |  2 --
 libmysqlpp/my-command.cpp          |  6 ------
 libmysqlpp/my-command.h            |  7 +------
 libmysqlpp/my-selectcommand.cpp    |  2 --
 libmysqlpp/unittests/testmysql.cpp |  4 +---
 6 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/libmysqlpp/my-column.cpp b/libmysqlpp/my-column.cpp
index fdbd7d8..d83348d 100644
--- a/libmysqlpp/my-column.cpp
+++ b/libmysqlpp/my-column.cpp
@@ -1,14 +1,10 @@
 #include "my-column.h"
 #include "column.h"
-#include <boost/date_time/gregorian/greg_date.hpp>
-#include <boost/date_time/posix_time/posix_time_duration.hpp>
-#include <boost/date_time/posix_time/posix_time_types.hpp>
-#include <boost/date_time/posix_time/ptime.hpp>
-#include <boost/date_time/time_duration.hpp>
+#include <boost/date_time/gregorian_calendar.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
+#include <boost/date_time/time.hpp>
 #include <cstdint>
-#include <field_types.h>
 #include <mysql.h>
-#include <mysql_time.h>
 
 MySQL::ColumnBase::ColumnBase(const char * name, unsigned int i) : DB::Column(name, i), is_null(false), length(0) { }
 
diff --git a/libmysqlpp/my-column.h b/libmysqlpp/my-column.h
index d41e310..d937e5a 100644
--- a/libmysqlpp/my-column.h
+++ b/libmysqlpp/my-column.h
@@ -6,8 +6,6 @@
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 #include <mysql.h>
 #pragma GCC diagnostic pop
-#include <field_types.h>
-#include <mysql_time.h>
 #include <vector>
 
 namespace MySQL {
diff --git a/libmysqlpp/my-command.cpp b/libmysqlpp/my-command.cpp
index ac3f235..ca6dc59 100644
--- a/libmysqlpp/my-command.cpp
+++ b/libmysqlpp/my-command.cpp
@@ -5,21 +5,15 @@
 #include <boost/date_time/date.hpp>
 #include <boost/date_time/gregorian_calendar.hpp>
 #include <boost/date_time/time.hpp>
-#include <boost/date_time/time_system_counted.hpp>
 #include <boost/numeric/conversion/cast.hpp>
 #include <cstdlib>
 #include <cstring>
-#include <field_types.h>
 #include <mysql.h>
-#include <mysql_time.h>
 #include <type_traits>
 
 namespace Glib {
 	class ustring;
 }
-namespace boost::posix_time {
-	class time_duration;
-}
 
 MySQL::Command::Command(const Connection * conn, const std::string & sql) :
 	DB::Command(sql), c(conn), stmt(mysql_stmt_init(&conn->conn), &mysql_stmt_close), paramsNeedBinding(false)
diff --git a/libmysqlpp/my-command.h b/libmysqlpp/my-command.h
index 812d263..5fbf2ef 100644
--- a/libmysqlpp/my-command.h
+++ b/libmysqlpp/my-command.h
@@ -6,8 +6,7 @@
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 #include <mysql.h>
 #pragma GCC diagnostic pop
-#include <boost/date_time/posix_time/posix_time_types.hpp>
-#include <boost/date_time/posix_time/ptime.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
 #include <cstddef>
 #include <glibmm/ustring.h>
 #include <memory>
@@ -15,10 +14,6 @@
 #include <string_view>
 #include <vector>
 
-namespace boost::posix_time {
-	class time_duration;
-}
-
 namespace MySQL {
 	class Connection;
 	class Command : public virtual DB::Command {
diff --git a/libmysqlpp/my-selectcommand.cpp b/libmysqlpp/my-selectcommand.cpp
index 7f1eaf8..dbfc5c8 100644
--- a/libmysqlpp/my-selectcommand.cpp
+++ b/libmysqlpp/my-selectcommand.cpp
@@ -6,10 +6,8 @@
 #include "selectcommand.h"
 #include <cstdint>
 #include <cstring>
-#include <field_types.h>
 #include <memory>
 #include <mysql.h>
-#include <mysql_time.h>
 #include <vector>
 
 MySQL::SelectCommand::SelectCommand(const Connection * conn, const std::string & sql) :
diff --git a/libmysqlpp/unittests/testmysql.cpp b/libmysqlpp/unittests/testmysql.cpp
index 8c75abd..cb25092 100644
--- a/libmysqlpp/unittests/testmysql.cpp
+++ b/libmysqlpp/unittests/testmysql.cpp
@@ -3,9 +3,7 @@
 
 #include "mockDatabase.h"
 #include <array>
-#include <boost/date_time/posix_time/conversion.hpp>
-#include <boost/date_time/posix_time/posix_time_types.hpp>
-#include <boost/date_time/posix_time/ptime.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
 #include <connection.h>
 #include <cstdint>
 #include <cstdio>
-- 
cgit v1.2.3