Revert the rest of 2009-04-10T19:20:49Z!koraq@xs4all.nl.

2009-04-11T02:28:03Z!shadowm@wesnoth.org reverted only a part of the commit. Next time when you
want to revert a commit look what the *entire* commit does. Most of my
patches and all of my cleanups only try to do one thing, so revert
them entirely or not.

src/actions.cpp

@@ -34,9 +34,8 @@
 #include "wml_exception.hpp"
 #include "formula_string_utils.hpp"
 
-#include <boost/scoped_ptr.hpp>
 
-#include <iostream>
+#include <boost/scoped_ptr.hpp>
 
 #define DBG_NG LOG_STREAM(debug, engine)
 #define LOG_NG LOG_STREAM(info, engine)

src/ai_dfool.cpp

@@ -21,8 +21,6 @@
 #include "log.hpp"
 #include "formula_string_utils.hpp"
 
-#include <iostream>
-
 namespace dfool {
   void dfool_ai::play_turn(){
     info& info_ = get_info();

src/ai_village.cpp

@@ -24,7 +24,6 @@
 #include "log.hpp"
 #include "map.hpp"
 
-#include <iostream>
 #include <numeric>
 
 #define DBG_AI LOG_STREAM(debug, ai)

src/campaign_server/campaign_server.cpp

@@ -32,7 +32,6 @@
 #include "server/input_stream.hpp"
 
 #include <csignal>
-#include <iostream>
 
 #include <boost/iostreams/filter/gzip.hpp>
 

src/gui/widgets/debug.cpp

@@ -28,7 +28,6 @@
 #include "serialization/string_utils.hpp"
 
 #include <fstream>
-#include <iostream>
 
 namespace gui2 {
 

src/gui/widgets/generator_private.hpp

@@ -24,8 +24,6 @@
 #include "gui/widgets/toggle_button.hpp"
 #include "gui/widgets/toggle_panel.hpp"
 
-#include <iostream>
-
 namespace gui2 {
 
 /**

src/gui/widgets/menubar.cpp

@@ -18,8 +18,6 @@
 
 #include "gui/widgets/selectable.hpp"
 
-#include <iostream>
-
 namespace gui2 {
 
 static void callback_select_item(twidget* caller)

src/gui/widgets/settings.cpp

@@ -29,7 +29,6 @@
 #include "serialization/preprocessor.hpp"
 #include "formula_string_utils.hpp"
 
-#include <iostream>
 
 namespace gui2 {
 

src/gui/widgets/window_builder.cpp

@@ -36,7 +36,6 @@
 #include "gui/widgets/vertical_scrollbar.hpp"
 #include "gui/widgets/window.hpp"
 
-#include <iostream>
 
 namespace gui2 {
 

src/help.cpp

@@ -32,7 +32,6 @@
 #include "wml_separators.hpp"
 #include "serialization/parser.hpp"
 
-#include <iostream>
 #include <queue>
 
 #define DBG_HELP LOG_STREAM(debug, help)

src/hotkeys.cpp

@@ -28,7 +28,6 @@
 #include "wesconfig.h"
 #include "wml_separators.hpp"
 
-#include <iostream>
 
 #define ERR_G LOG_STREAM(err, general)
 #define LOG_G LOG_STREAM(info, general)

src/language.cpp

@@ -23,11 +23,9 @@
 #include "serialization/parser.hpp"
 #include "serialization/preprocessor.hpp"
 
-#include <boost/scoped_array.hpp>
-
-#include <clocale>
-#include <iostream>
 #include <stdexcept>
+#include <clocale>
+#include <boost/scoped_array.hpp>
 
 #ifdef _WIN32
 #include <windows.h>

src/log.cpp

@@ -25,9 +25,8 @@
 
 #include "log.hpp"
 
-#include <ctime>
-#include <iostream>
 #include <sstream>
+#include <ctime>
 
 namespace {
 

src/menu_events.cpp

@@ -47,8 +47,6 @@
 #include "formula_string_utils.hpp"
 #include "widgets/combo.hpp"
 
-#include <iostream>
-
 #define ERR_NG LOG_STREAM(err, engine)
 #define LOG_NG LOG_STREAM(info, engine)
 #define DBG_NG LOG_STREAM(info, engine)

src/playcampaign.cpp

@@ -34,7 +34,6 @@
 #include "wml_exception.hpp"
 #include "formula_string_utils.hpp"
 
-#include <iostream>
 
 #define LOG_G LOG_STREAM(info, general)
 #define LOG_NG LOG_STREAM(info, engine)

src/playsingle_controller.cpp

@@ -36,8 +36,6 @@
 #include "events.hpp"
 #include "save_blocker.hpp"
 
-#include <iostream>
-
 #define ERR_NG LOG_STREAM(err, engine)
 #define LOG_NG LOG_STREAM(info, engine)
 

src/preferences.cpp

@@ -29,7 +29,6 @@
 #include "video.hpp" // non_interactive()
 #include "serialization/parser.hpp"
 
-#include <iostream>
 #include <sys/stat.h> // for setting the permissions of the preferences file
 
 namespace {

src/preferences_display.cpp

@@ -30,7 +30,6 @@
 #include "construct_dialog.hpp"
 #include "wml_separators.hpp"
 
-#include <iostream>
 
 namespace preferences {
 

src/storyscreen/controller.cpp

@@ -35,8 +35,6 @@
 #include "log.hpp"
 #include "widgets/button.hpp"
 
-#include <iostream>
-
 #define ERR_NG LOG_STREAM(err , engine)
 #define LOG_NG LOG_STREAM(info, engine)
 #define ERR_DI LOG_STREAM(err , display)

src/storyscreen/interface.cpp

@@ -34,8 +34,6 @@
 #include "sound.hpp"
 #include "text.hpp"
 
-#include <iostream>
-
 #define ERR_NG LOG_STREAM(err , engine)
 #define LOG_NG LOG_STREAM(info, engine)
 #define ERR_DI LOG_STREAM(err , display)

src/storyscreen/page.cpp

@@ -32,8 +32,6 @@
 #include "variable.hpp"
 #include "video.hpp"
 
-#include <iostream>
-
 // TODO: remove when completed
 #include "stub.hpp"
 

src/storyscreen/render.cpp

@@ -35,8 +35,6 @@
 #include "text.hpp"
 #include "video.hpp"
 
-#include <iostream>
-
 // TODO: remove when completed
 #include "stub.hpp"
 

src/thread.cpp

@@ -16,7 +16,6 @@
 #include "log.hpp"
 #include "thread.hpp"
 
-#include <iostream>
 
 #define ERR_G LOG_STREAM(err, general)
 

src/unit_id.cpp

@@ -16,7 +16,6 @@
 #include "unit_id.hpp"
 
 #include <cassert>
-#include <iostream>
 
 #define DBG_UT LOG_STREAM(debug, engine)
 

src/unit_types.cpp

@@ -27,7 +27,6 @@
 #include "map.hpp"
 #include "unit_types.hpp"
 
-#include <iostream>
 
 #define ERR_CONFIG LOG_STREAM(err, config)
 #define WRN_CONFIG LOG_STREAM(warn, config)