Remove <iostream> from a lot of places.

stevecotton · Jul 7, 2022 · 3874fe5 · 3874fe5
1 parent ebd7be3
commit 3874fe5
Show file tree

Hide file tree

Showing 37 changed files with 9 additions and 51 deletions.
diff --git a/src/ai/composite/component.hpp b/src/ai/composite/component.hpp
@@ -22,7 +22,6 @@
 
 class config;
 
-#include <iostream>
 #include <map>
 #include <memory>
 #include <string>

diff --git a/src/attack_prediction.cpp b/src/attack_prediction.cpp
@@ -40,7 +40,6 @@
 #include <array>
 #include <cfloat>
 #include <cmath>
-#include <iostream>
 #include <memory>
 #include <numeric>
 #include <sstream>

diff --git a/src/commandline_options.cpp b/src/commandline_options.cpp
@@ -30,7 +30,6 @@
 #include <boost/program_options/variables_map.hpp>  // for variables_map, etc
 
 #include <array>
-#include <iostream>                     // for operator<<, basic_ostream, etc
 
 namespace po = boost::program_options;
 

diff --git a/src/formula/callable.hpp b/src/formula/callable.hpp
@@ -19,7 +19,6 @@
 #include "formula/variant.hpp"
 #include "log.hpp"
 
-#include <iostream>
 #include <memory>
 #include <set>
 

diff --git a/src/formula/variant.cpp b/src/formula/variant.cpp
@@ -15,8 +15,10 @@
 
 #include <cassert>
 #include <cmath>
-#include <iostream>
 #include <cstring>
+#include <cassert>
+#include <cmath>
+#include <memory>
 #include <stack>
 
 #include "formatter.hpp"
@@ -30,9 +32,6 @@ static lg::log_domain log_scripting_formula("scripting/formula");
 #define WRN_SF LOG_STREAM(warn, log_scripting_formula)
 #define ERR_SF LOG_STREAM(err, log_scripting_formula)
 
-#include <cassert>
-#include <cmath>
-#include <memory>
 
 namespace wfl
 {

diff --git a/src/formula/variant_value.hpp b/src/formula/variant_value.hpp
@@ -21,7 +21,6 @@
 #include "utils/general.hpp"
 
 #include <functional>
-#include <iostream>
 #include <iterator>
 #include <map>
 #include <sstream>

diff --git a/src/game_events/handlers.cpp b/src/game_events/handlers.cpp
@@ -27,8 +27,6 @@
 #include "sound.hpp"
 #include "variable.hpp"
 
-#include <iostream>
-
 static lg::log_domain log_engine("engine");
 #define DBG_NG LOG_STREAM(debug, log_engine)
 #define LOG_NG LOG_STREAM(info, log_engine)

diff --git a/src/game_events/manager.cpp b/src/game_events/manager.cpp
@@ -26,8 +26,6 @@
 #include "resources.hpp"
 #include "serialization/string_utils.hpp"
 
-#include <iostream>
-
 static lg::log_domain log_engine("engine");
 #define DBG_NG LOG_STREAM(debug, log_engine)
 #define LOG_NG LOG_STREAM(info, log_engine)

diff --git a/src/game_events/manager_impl.cpp b/src/game_events/manager_impl.cpp
@@ -22,8 +22,6 @@
 
 #include <boost/algorithm/string.hpp>
 
-#include <iostream>
-
 static lg::log_domain log_engine("engine");
 #define DBG_NG LOG_STREAM(debug, log_engine)
 #define LOG_NG LOG_STREAM(info, log_engine)

diff --git a/src/game_events/pump.cpp b/src/game_events/pump.cpp
@@ -37,7 +37,6 @@
 #include "whiteboard/manager.hpp"
 
 #include <iomanip>
-#include <iostream>
 
 static lg::log_domain log_engine("engine");
 #define DBG_NG LOG_STREAM(debug, log_engine)

diff --git a/src/game_initialization/configure_engine.cpp b/src/game_initialization/configure_engine.cpp
@@ -22,7 +22,6 @@
 #include "tod_manager.hpp"
 
 #include <cassert>
-#include <iostream>
 #include <sstream>
 
 namespace ng

diff --git a/src/game_launcher.cpp b/src/game_launcher.cpp
@@ -60,7 +60,6 @@
 
 #include <algorithm> // for copy, max, min, stable_sort
 #include <cstdlib>   // for system
-#include <iostream>  // for operator<<, basic_ostream, etc
 #include <new>
 #include <utility> // for pair
 

diff --git a/src/gettext.cpp b/src/gettext.cpp
@@ -18,7 +18,6 @@
 
 #include <algorithm>
 #include <iomanip>
-#include <iostream>
 #include <iterator>
 #include <fstream>
 #include <locale>

diff --git a/src/gui/auxiliary/iterator/policy_order.hpp b/src/gui/auxiliary/iterator/policy_order.hpp
@@ -20,7 +20,6 @@
 #include "gui/core/log.hpp"
 #include "gui/widgets/widget.hpp"
 
-#include <iostream>
 #include <cassert>
 
 namespace gui2::iteration::policy::order

diff --git a/src/gui/dialogs/statistics_dialog.cpp b/src/gui/dialogs/statistics_dialog.cpp
@@ -30,10 +30,9 @@
 #include "gui/widgets/window.hpp"
 #include "team.hpp"
 #include "units/types.hpp"
-#include <functional>
 
+#include <functional>
 #include <iomanip>
-#include <iostream>
 #include <memory>
 
 // TODO duplicated from attack_predictions.cpp

diff --git a/src/gui/widgets/debug.cpp b/src/gui/widgets/debug.cpp
@@ -28,9 +28,7 @@
 #include "gui/widgets/window.hpp"
 #include "serialization/string_utils.hpp"
 
-#include <fstream>
 #include <iomanip>
-#include <iostream>
 
 namespace gui2
 {

diff --git a/src/halo.cpp b/src/halo.cpp
@@ -28,8 +28,6 @@
 #include "serialization/string_utils.hpp"
 #include "sdl/texture.hpp"
 
-#include <iostream>
-
 static lg::log_domain log_display("display");
 #define ERR_DP LOG_STREAM(err, log_display)
 

diff --git a/src/hash.cpp b/src/hash.cpp
@@ -17,7 +17,6 @@
 
 #include "serialization/base64.hpp"
 
-#include <iostream>
 #include <string>
 #include <sstream>
 #include <string.h>

diff --git a/src/help/help_browser.cpp b/src/help/help_browser.cpp
@@ -14,7 +14,6 @@
 */
 
 #include "help/help_browser.hpp"
-#include <iostream>                     // for operator<<, basic_ostream, etc
 #include "cursor.hpp"                   // for set, CURSOR_TYPE::HYPERLINK, etc
 #include "font/constants.hpp"           // for relative_size
 #include "gettext.hpp"                  // for _

diff --git a/src/help/help_impl.cpp b/src/help/help_impl.cpp
@@ -49,7 +49,6 @@
 
 #include <cassert>                     // for assert
 #include <algorithm>                    // for sort, find, transform, etc
-#include <iostream>                     // for operator<<, basic_ostream, etc
 #include <iterator>                     // for back_insert_iterator, etc
 #include <map>                          // for map, etc
 #include <set>

diff --git a/src/help/help_menu.cpp b/src/help/help_menu.cpp
@@ -22,7 +22,6 @@
 #include "sdl/input.hpp"                // for get_mouse_state
 
 #include <algorithm>                    // for find
-#include <iostream>                     // for basic_ostream, operator<<, etc
 #include <list>                         // for _List_const_iterator, etc
 #include <utility>                      // for pair
 #include <SDL2/SDL.h>

diff --git a/src/help/help_topic_generators.cpp b/src/help/help_topic_generators.cpp
@@ -32,11 +32,10 @@
 #include "tstring.hpp"                  // for t_string, operator<<
 #include "units/helper.hpp"             // for resistance_color
 #include "units/types.hpp"              // for unit_type, unit_type_data, etc
-#include <optional>
 #include "video.hpp"                    // fore current_resolution
 
-#include <iostream>                     // for operator<<, basic_ostream, etc
 #include <map>                          // for map, etc
+#include <optional>
 #include <set>
 
 static lg::log_domain log_help("help");

diff --git a/src/pathfind/pathfind.cpp b/src/pathfind/pathfind.cpp
@@ -33,7 +33,6 @@
 #include "units/map.hpp"
 #include "wml_exception.hpp"
 
-#include <iostream>
 #include <vector>
 #include <algorithm>
 

diff --git a/src/playturn_network_adapter.cpp b/src/playturn_network_adapter.cpp
@@ -16,7 +16,6 @@
 #include "log.hpp"
 
 #include <functional>
-#include <iostream>
 #include <cassert>
 
 

diff --git a/src/save_blocker.cpp b/src/save_blocker.cpp
@@ -15,8 +15,8 @@
 
 #include "log.hpp"
 #include "save_blocker.hpp"
+
 #include <exception>
-#include <iostream>
 
 play_controller* save_blocker::controller_ = nullptr;
 void (play_controller::*save_blocker::callback_)() = nullptr;

diff --git a/src/sdl/point.cpp b/src/sdl/point.cpp
@@ -17,7 +17,7 @@
 
 #include "sdl/point.hpp"
 
-#include <iostream>
+#include <ostream>
 
 std::ostream& operator<<(std::ostream& stream, const point& point)
 {

diff --git a/src/sdl/rect.cpp b/src/sdl/rect.cpp
@@ -18,7 +18,7 @@
 #include "sdl/window.hpp"
 #include "video.hpp"
 
-#include <iostream>
+#include <ostream>
 
 bool operator==(const SDL_Rect& a, const SDL_Rect& b)
 {

diff --git a/src/sdl/utils.cpp b/src/sdl/utils.cpp
@@ -27,7 +27,6 @@
 #include <algorithm>
 #include <cassert>
 #include <cstring>
-#include <iostream>
 
 #include <boost/circular_buffer.hpp>
 #include <boost/math/constants/constants.hpp>

diff --git a/src/serialization/schema_validator.hpp b/src/serialization/schema_validator.hpp
@@ -22,7 +22,6 @@
 #include "serialization/schema/key.hpp"
 #include "serialization/validator.hpp"
 
-#include <iostream>
 #include <queue>
 #include <stack>
 #include <string>

diff --git a/src/server/wesnothd/metrics.cpp b/src/server/wesnothd/metrics.cpp
@@ -21,7 +21,7 @@
 #include "server/wesnothd/metrics.hpp"
 
 #include <algorithm>
-#include <iostream>
+#include <ostream>
 
 struct compare_samples_to_stringspan {
 	bool operator()(const simple_wml::string_span& a, const simple_wml::string_span& b) const

diff --git a/src/server/wesnothd/server.cpp b/src/server/wesnothd/server.cpp
@@ -55,7 +55,6 @@
 #include <cstdlib>
 #include <functional>
 #include <iomanip>
-#include <iostream>
 #include <map>
 #include <queue>
 #include <set>

diff --git a/src/tests/gui/iterator.cpp b/src/tests/gui/iterator.cpp
@@ -23,7 +23,6 @@
 #include "gui/widgets/label.hpp"
 #include "gui/widgets/grid.hpp"
 
-#include <iostream>
 #include <sstream>
 #include <typeinfo>
 

diff --git a/src/tests/gui/visitor.cpp b/src/tests/gui/visitor.cpp
@@ -22,7 +22,6 @@
 #include "gui/widgets/label.hpp"
 #include "gui/widgets/grid.hpp"
 
-#include <iostream>
 #include <typeinfo>
 
 static void add_widget(gui2::grid& grid

diff --git a/src/tests/test_lexical_cast.cpp b/src/tests/test_lexical_cast.cpp
@@ -25,8 +25,6 @@
 #include <boost/mpl/back_inserter.hpp>
 #include <boost/mpl/contains.hpp>
 
-#include <iostream>
-
 namespace test_throw {
 
 #ifdef _MSC_VER

diff --git a/src/time_of_day.cpp b/src/time_of_day.cpp
@@ -18,8 +18,6 @@
 #include "config.hpp"
 #include "gettext.hpp"
 
-#include <iostream>
-
 std::ostream& operator<<(std::ostream& s, const tod_color& c)
 {
 	s << c.r << "," << c.g << "," << c.b;

diff --git a/src/wesnoth.cpp b/src/wesnoth.cpp
@@ -98,8 +98,6 @@
 #include <cstdlib>   // for srand, exit
 #include <ctime>     // for time, ctime, std::time_t
 #include <exception> // for exception
-#include <fstream>   // for operator<<, basic_ostream, etc
-#include <iostream>  // for cerr, cout
 #include <vector>
 
 //#define NO_CATCH_AT_GAME_END

diff --git a/src/widgets/scrollbar.cpp b/src/widgets/scrollbar.cpp
@@ -26,8 +26,6 @@
 #include "sdl/utils.hpp"
 #include "video.hpp"
 
-#include <iostream>
-
 namespace {
 
 const std::string scrollbar_top = "buttons/scrollbars/scrolltop.png";