From 1a0afbe95e16fb1c102add474cb48d2e496f3a77 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@charleskerr.com>
Date: Mon, 25 Jul 2022 21:45:54 -0500
Subject: [PATCH] refactor: iwyu (#3525)

---
 gtk/Dialogs.cc                              | 2 +-
 gtk/FaviconCache.cc                         | 1 +
 gtk/FileList.cc                             | 5 +++--
 gtk/FilterBar.cc                            | 1 +
 gtk/FreeSpaceLabel.cc                       | 1 +
 gtk/IconCache.cc                            | 1 +
 gtk/MakeDialog.cc                           | 3 ++-
 gtk/Notify.cc                               | 1 +
 gtk/OptionsDialog.cc                        | 1 +
 gtk/RelocateDialog.cc                       | 1 -
 gtk/TorrentCellRenderer.cc                  | 2 ++
 gtk/Utils.cc                                | 1 +
 libtransmission/announcer-http.cc           | 1 +
 libtransmission/announcer-udp.cc            | 1 +
 libtransmission/blocklist.cc                | 1 +
 libtransmission/cache.cc                    | 1 +
 libtransmission/cache.h                     | 1 +
 libtransmission/crypto-utils.cc             | 1 +
 libtransmission/open-files.cc               | 1 +
 libtransmission/open-files.h                | 1 +
 libtransmission/peer-mgr-active-requests.cc | 2 --
 libtransmission/peer-mgr-wishlist.cc        | 1 -
 libtransmission/peer-mgr.h                  | 2 --
 libtransmission/peer-mse.h                  | 1 +
 libtransmission/rpc-server.cc               | 1 -
 libtransmission/session.cc                  | 1 -
 libtransmission/torrent-files.cc            | 2 ++
 libtransmission/torrent-files.h             | 1 +
 libtransmission/torrent-metainfo.cc         | 1 -
 libtransmission/tr-assert.cc                | 1 +
 libtransmission/tr-lpd.cc                   | 1 -
 libtransmission/variant-json.cc             | 1 +
 libtransmission/web.cc                      | 1 -
 libtransmission/webseed.cc                  | 1 +
 qt/Application.cc                           | 1 +
 qt/MainWindow.cc                            | 1 -
 qt/Prefs.cc                                 | 1 +
 qt/Torrent.cc                               | 1 -
 qt/TorrentFilter.cc                         | 2 +-
 qt/TorrentModel.cc                          | 1 -
 tests/libtransmission/clients-test.cc       | 1 +
 tests/libtransmission/completion-test.cc    | 1 +
 tests/libtransmission/crypto-test.cc        | 1 +
 tests/libtransmission/handshake-test.cc     | 1 +
 44 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/gtk/Dialogs.cc b/gtk/Dialogs.cc
index 4a8776563..5da077ed6 100644
--- a/gtk/Dialogs.cc
+++ b/gtk/Dialogs.cc
@@ -2,8 +2,8 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#include <algorithm>
 #include <memory>
+#include <vector>
 
 #include <glibmm.h>
 #include <glibmm/i18n.h>
diff --git a/gtk/FaviconCache.cc b/gtk/FaviconCache.cc
index 190ee0c91..d1e9bfc55 100644
--- a/gtk/FaviconCache.cc
+++ b/gtk/FaviconCache.cc
@@ -4,6 +4,7 @@
 // License text can be found in the licenses/ folder.
 
 #include <array>
+#include <functional>
 #include <memory>
 #include <string>
 
diff --git a/gtk/FileList.cc b/gtk/FileList.cc
index 007229195..2e43cf7fd 100644
--- a/gtk/FileList.cc
+++ b/gtk/FileList.cc
@@ -3,13 +3,14 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
+#include <algorithm>
 #include <climits> /* INT_MAX */
 #include <cstddef>
 #include <cstring> // strchr
-#include <functional>
-#include <unordered_map>
+#include <list>
 #include <string>
 #include <string_view>
+#include <unordered_map>
 #include <utility>
 
 #include <glibmm.h>
diff --git a/gtk/FilterBar.cc b/gtk/FilterBar.cc
index 4e99c3be6..4496e3cca 100644
--- a/gtk/FilterBar.cc
+++ b/gtk/FilterBar.cc
@@ -3,6 +3,7 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
+#include <algorithm> // std::transform()
 #include <memory>
 #include <set>
 #include <string>
diff --git a/gtk/FreeSpaceLabel.cc b/gtk/FreeSpaceLabel.cc
index 30f2b5dd6..416777cbd 100644
--- a/gtk/FreeSpaceLabel.cc
+++ b/gtk/FreeSpaceLabel.cc
@@ -5,6 +5,7 @@
 
 #include <memory>
 #include <string>
+#include <string_view>
 
 #include <glibmm/i18n.h>
 
diff --git a/gtk/IconCache.cc b/gtk/IconCache.cc
index dfb380b57..ce64f8dc5 100644
--- a/gtk/IconCache.cc
+++ b/gtk/IconCache.cc
@@ -5,6 +5,7 @@
  *
  */
 
+#include <algorithm>
 #include <array>
 #include <map>
 #include <memory>
diff --git a/gtk/MakeDialog.cc b/gtk/MakeDialog.cc
index 321935345..e66e043ba 100644
--- a/gtk/MakeDialog.cc
+++ b/gtk/MakeDialog.cc
@@ -4,6 +4,7 @@
 // License text can be found in the licenses/ folder.
 
 #include <iostream>
+#include <list>
 #include <memory>
 #include <string>
 
@@ -560,4 +561,4 @@ void MakeDialog::Impl::onPieceSizeUpdated()
         tr_metaInfoBuilderSetPieceSize(builder_.get(), new_size);
         updatePiecesLabel();
     }
-}
\ No newline at end of file
+}
diff --git a/gtk/Notify.cc b/gtk/Notify.cc
index edcfc4b65..0f6c35974 100644
--- a/gtk/Notify.cc
+++ b/gtk/Notify.cc
@@ -4,6 +4,7 @@
 // License text can be found in the licenses/ folder.
 
 #include <map>
+#include <vector>
 
 #include <giomm.h>
 #include <glibmm/i18n.h>
diff --git a/gtk/OptionsDialog.cc b/gtk/OptionsDialog.cc
index 892460049..c6e52c7e2 100644
--- a/gtk/OptionsDialog.cc
+++ b/gtk/OptionsDialog.cc
@@ -3,6 +3,7 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
+#include <list>
 #include <memory>
 
 #include <glibmm.h>
diff --git a/gtk/RelocateDialog.cc b/gtk/RelocateDialog.cc
index 659008a5f..4e5c7f2a0 100644
--- a/gtk/RelocateDialog.cc
+++ b/gtk/RelocateDialog.cc
@@ -3,7 +3,6 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
-#include <algorithm>
 #include <memory>
 #include <string>
 
diff --git a/gtk/TorrentCellRenderer.cc b/gtk/TorrentCellRenderer.cc
index 55a914961..e1cd75256 100644
--- a/gtk/TorrentCellRenderer.cc
+++ b/gtk/TorrentCellRenderer.cc
@@ -3,11 +3,13 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
+#include <algorithm> // std::max()
 #include <climits> /* INT_MAX */
 #include <cstring> // strchr()
 #include <memory>
 #include <optional>
 #include <string>
+#include <string_view>
 
 #include <glibmm.h>
 #include <glibmm/i18n.h>
diff --git a/gtk/Utils.cc b/gtk/Utils.cc
index ebc31f379..11bd228cd 100644
--- a/gtk/Utils.cc
+++ b/gtk/Utils.cc
@@ -6,6 +6,7 @@
 #include <array>
 #include <ctype.h> /* isxdigit() */
 #include <errno.h>
+#include <functional>
 #include <limits.h> /* INT_MAX */
 
 #include <giomm.h> /* g_file_trash() */
diff --git a/libtransmission/announcer-http.cc b/libtransmission/announcer-http.cc
index 6df6b0a4b..e444df21c 100644
--- a/libtransmission/announcer-http.cc
+++ b/libtransmission/announcer-http.cc
@@ -3,6 +3,7 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
+#include <algorithm> // std::copy_n()
 #include <climits> /* USHRT_MAX */
 #include <cstdio> /* fprintf() */
 #include <cstring> /* strchr(), memcmp(), memcpy() */
diff --git a/libtransmission/announcer-udp.cc b/libtransmission/announcer-udp.cc
index c99cc3fed..7990f39c5 100644
--- a/libtransmission/announcer-udp.cc
+++ b/libtransmission/announcer-udp.cc
@@ -3,6 +3,7 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
+#include <algorithm> // std::find_if()
 #include <cerrno> /* errno, EAFNOSUPPORT */
 #include <cstring> /* memset() */
 #include <ctime>
diff --git a/libtransmission/blocklist.cc b/libtransmission/blocklist.cc
index 1a3993c0f..f623ee1bc 100644
--- a/libtransmission/blocklist.cc
+++ b/libtransmission/blocklist.cc
@@ -8,6 +8,7 @@
 #include <cstdio>
 #include <cstring>
 #include <string_view>
+#include <vector>
 
 #include <fmt/core.h>
 
diff --git a/libtransmission/cache.cc b/libtransmission/cache.cc
index 6d51d7d2b..b906c201c 100644
--- a/libtransmission/cache.cc
+++ b/libtransmission/cache.cc
@@ -8,6 +8,7 @@
 #include <limits> // std::numeric_limits<size_t>::max()
 #include <numeric> // std::accumulate()
 #include <utility> // std::make_pair()
+#include <vector>
 
 #include <event2/buffer.h>
 
diff --git a/libtransmission/cache.h b/libtransmission/cache.h
index 378ed15e0..012af8186 100644
--- a/libtransmission/cache.h
+++ b/libtransmission/cache.h
@@ -10,6 +10,7 @@
 #endif
 
 #include <cstdint> // intX_t, uintX_t
+#include <ctime>
 #include <memory> // std::unique_ptr
 #include <utility> // std::pair
 #include <vector>
diff --git a/libtransmission/crypto-utils.cc b/libtransmission/crypto-utils.cc
index 253a3015b..642b18329 100644
--- a/libtransmission/crypto-utils.cc
+++ b/libtransmission/crypto-utils.cc
@@ -11,6 +11,7 @@
 #include <random>
 #include <string>
 #include <string_view>
+#include <vector>
 
 #include <arc4.h>
 
diff --git a/libtransmission/open-files.cc b/libtransmission/open-files.cc
index d369804eb..3f7f74c95 100644
--- a/libtransmission/open-files.cc
+++ b/libtransmission/open-files.cc
@@ -7,6 +7,7 @@
 #include <array>
 #include <cerrno>
 #include <cstdint> // uint8_t, uint64_t
+#include <string_view>
 
 #include <fmt/core.h>
 
diff --git a/libtransmission/open-files.h b/libtransmission/open-files.h
index 4a7ebe456..1f4c6f060 100644
--- a/libtransmission/open-files.h
+++ b/libtransmission/open-files.h
@@ -11,6 +11,7 @@
 
 #include <cstdint>
 #include <optional>
+#include <string_view>
 #include <utility>
 
 #include "transmission.h"
diff --git a/libtransmission/peer-mgr-active-requests.cc b/libtransmission/peer-mgr-active-requests.cc
index dd7a32332..7cd635114 100644
--- a/libtransmission/peer-mgr-active-requests.cc
+++ b/libtransmission/peer-mgr-active-requests.cc
@@ -5,9 +5,7 @@
 
 #include <algorithm>
 #include <ctime>
-#include <functional>
 #include <memory>
-#include <numeric>
 #include <utility>
 #include <unordered_map>
 #include <unordered_set>
diff --git a/libtransmission/peer-mgr-wishlist.cc b/libtransmission/peer-mgr-wishlist.cc
index 93fff00a9..0bc404101 100644
--- a/libtransmission/peer-mgr-wishlist.cc
+++ b/libtransmission/peer-mgr-wishlist.cc
@@ -6,7 +6,6 @@
 #include <algorithm>
 #include <cstddef>
 #include <iterator>
-#include <numeric>
 #include <set>
 #include <utility>
 #include <vector>
diff --git a/libtransmission/peer-mgr.h b/libtransmission/peer-mgr.h
index 08650651d..62e4d0c3b 100644
--- a/libtransmission/peer-mgr.h
+++ b/libtransmission/peer-mgr.h
@@ -9,11 +9,9 @@
 #error only libtransmission should #include this header.
 #endif
 
-#include <array>
 #include <cstddef> // size_t
 #include <cstdint> // uint8_t, uint64_t
 #include <string>
-#include <string_view>
 #include <vector>
 
 #ifdef _WIN32
diff --git a/libtransmission/peer-mse.h b/libtransmission/peer-mse.h
index a041277d7..fee04f5b5 100644
--- a/libtransmission/peer-mse.h
+++ b/libtransmission/peer-mse.h
@@ -11,6 +11,7 @@
 #error only libtransmission should #include this header.
 #endif
 
+#include <array>
 #include <cstddef> // size_t, std::byte
 #include <memory>
 
diff --git a/libtransmission/rpc-server.cc b/libtransmission/rpc-server.cc
index 3a3ba1269..d55577f77 100644
--- a/libtransmission/rpc-server.cc
+++ b/libtransmission/rpc-server.cc
@@ -8,7 +8,6 @@
 #include <cerrno>
 #include <cstring> /* memcpy */
 #include <ctime>
-#include <list>
 #include <string>
 #include <string_view>
 #include <vector>
diff --git a/libtransmission/session.cc b/libtransmission/session.cc
index f9dd63dba..49b5ffc52 100644
--- a/libtransmission/session.cc
+++ b/libtransmission/session.cc
@@ -16,7 +16,6 @@
 #include <numeric> // std::accumulate()
 #include <string>
 #include <string_view>
-#include <tuple>
 #include <unordered_set>
 #include <vector>
 
diff --git a/libtransmission/torrent-files.cc b/libtransmission/torrent-files.cc
index 4548bec57..0f5dc0e32 100644
--- a/libtransmission/torrent-files.cc
+++ b/libtransmission/torrent-files.cc
@@ -3,6 +3,8 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
+#include <algorithm> // std::find()
+#include <functional>
 #include <iterator>
 #include <optional>
 #include <set>
diff --git a/libtransmission/torrent-files.h b/libtransmission/torrent-files.h
index 7fe09b67f..15f418df7 100644
--- a/libtransmission/torrent-files.h
+++ b/libtransmission/torrent-files.h
@@ -13,6 +13,7 @@
 #include <optional>
 #include <string>
 #include <string_view>
+#include <utility>
 #include <vector>
 
 #include "transmission.h"
diff --git a/libtransmission/torrent-metainfo.cc b/libtransmission/torrent-metainfo.cc
index facac3929..bdf60ada9 100644
--- a/libtransmission/torrent-metainfo.cc
+++ b/libtransmission/torrent-metainfo.cc
@@ -6,7 +6,6 @@
 #include <algorithm>
 #include <array>
 #include <cctype>
-#include <numeric>
 #include <string>
 #include <string_view>
 #include <vector>
diff --git a/libtransmission/tr-assert.cc b/libtransmission/tr-assert.cc
index 43da2d93b..19b1aed71 100644
--- a/libtransmission/tr-assert.cc
+++ b/libtransmission/tr-assert.cc
@@ -6,6 +6,7 @@
 #include <cstdio>
 #include <cstdlib>
 #include <iostream>
+#include <string_view>
 
 #include "tr-assert.h"
 
diff --git a/libtransmission/tr-lpd.cc b/libtransmission/tr-lpd.cc
index 678e469e1..af45733f8 100644
--- a/libtransmission/tr-lpd.cc
+++ b/libtransmission/tr-lpd.cc
@@ -6,7 +6,6 @@
 #include <cerrno>
 #include <csignal> /* sig_atomic_t */
 #include <cstring> /* strlen(), strncpy(), strstr(), memset() */
-#include <string_view>
 #include <type_traits>
 
 #ifdef _WIN32
diff --git a/libtransmission/variant-json.cc b/libtransmission/variant-json.cc
index 938986333..9d5b108ff 100644
--- a/libtransmission/variant-json.cc
+++ b/libtransmission/variant-json.cc
@@ -10,6 +10,7 @@
 #include <cstring>
 #include <deque>
 #include <string_view>
+#include <utility>
 
 #define UTF_CPP_CPLUSPLUS 201703L
 #include <utf8.h>
diff --git a/libtransmission/web.cc b/libtransmission/web.cc
index c2a1823b3..77f7ff319 100644
--- a/libtransmission/web.cc
+++ b/libtransmission/web.cc
@@ -10,7 +10,6 @@
 #include <memory>
 #include <mutex>
 #include <string>
-#include <string_view>
 #include <thread>
 
 #ifdef _WIN32
diff --git a/libtransmission/webseed.cc b/libtransmission/webseed.cc
index 45363c587..4d8951beb 100644
--- a/libtransmission/webseed.cc
+++ b/libtransmission/webseed.cc
@@ -10,6 +10,7 @@
 #include <set>
 #include <string>
 #include <string_view>
+#include <vector>
 
 #include <event2/buffer.h>
 #include <event2/event.h>
diff --git a/qt/Application.cc b/qt/Application.cc
index b2e76f7ca..b22fd73f9 100644
--- a/qt/Application.cc
+++ b/qt/Application.cc
@@ -9,6 +9,7 @@
 #include <array>
 #include <ctime>
 #include <memory>
+#include <utility>
 
 #include <QIcon>
 #include <QLibraryInfo>
diff --git a/qt/MainWindow.cc b/qt/MainWindow.cc
index 66819ff36..27bd5db20 100644
--- a/qt/MainWindow.cc
+++ b/qt/MainWindow.cc
@@ -5,7 +5,6 @@
 
 #include <array>
 #include <cassert>
-#include <functional>
 #include <memory>
 #include <utility>
 
diff --git a/qt/Prefs.cc b/qt/Prefs.cc
index 40c3d285a..46e1fb838 100644
--- a/qt/Prefs.cc
+++ b/qt/Prefs.cc
@@ -3,6 +3,7 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
+#include <algorithm>
 #include <array>
 #include <cassert>
 #include <cstdlib>
diff --git a/qt/Torrent.cc b/qt/Torrent.cc
index 0895ea0c3..f9bd9d73e 100644
--- a/qt/Torrent.cc
+++ b/qt/Torrent.cc
@@ -4,7 +4,6 @@
 // License text can be found in the licenses/ folder.
 
 #include <algorithm>
-#include <cassert>
 #include <iterator>
 #include <set>
 
diff --git a/qt/TorrentFilter.cc b/qt/TorrentFilter.cc
index b48ce3d28..c76103d3a 100644
--- a/qt/TorrentFilter.cc
+++ b/qt/TorrentFilter.cc
@@ -3,7 +3,7 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
-#include <algorithm>
+#include <array>
 #include <optional>
 
 #include "Filters.h"
diff --git a/qt/TorrentModel.cc b/qt/TorrentModel.cc
index f975b1bac..947326221 100644
--- a/qt/TorrentModel.cc
+++ b/qt/TorrentModel.cc
@@ -6,7 +6,6 @@
 #include <algorithm>
 #include <cassert>
 #include <string_view>
-#include <utility>
 
 #include <libtransmission/transmission.h>
 #include <libtransmission/variant.h>
diff --git a/tests/libtransmission/clients-test.cc b/tests/libtransmission/clients-test.cc
index 00ef2bf9f..00ad56155 100644
--- a/tests/libtransmission/clients-test.cc
+++ b/tests/libtransmission/clients-test.cc
@@ -3,6 +3,7 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
+#include <algorithm>
 #include <array>
 #include <string_view>
 
diff --git a/tests/libtransmission/completion-test.cc b/tests/libtransmission/completion-test.cc
index dbd5181fe..83873448f 100644
--- a/tests/libtransmission/completion-test.cc
+++ b/tests/libtransmission/completion-test.cc
@@ -3,6 +3,7 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
+#include <algorithm>
 #include <array>
 #include <cstdint>
 #include <set>
diff --git a/tests/libtransmission/crypto-test.cc b/tests/libtransmission/crypto-test.cc
index 15b387b74..1a9d6e777 100644
--- a/tests/libtransmission/crypto-test.cc
+++ b/tests/libtransmission/crypto-test.cc
@@ -3,6 +3,7 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
+#include <algorithm>
 #include <array>
 #include <cstring>
 #include <iostream>
diff --git a/tests/libtransmission/handshake-test.cc b/tests/libtransmission/handshake-test.cc
index 2aa89862b..4236ec436 100644
--- a/tests/libtransmission/handshake-test.cc
+++ b/tests/libtransmission/handshake-test.cc
@@ -3,6 +3,7 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
+#include <algorithm>
 #include <array>
 #include <cassert>
 #include <cstring>