Author: mordante
Date: Sat Apr 11 12:00:20 2009
New Revision: 34711
URL: http://svn.gna.org/viewcvs/wesnoth?rev=34711&view=rev
Log:
Revert the rest of r34702.
r34707 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.
Modified:
trunk/src/actions.cpp
trunk/src/ai_dfool.cpp
trunk/src/ai_village.cpp
trunk/src/campaign_server/campaign_server.cpp
trunk/src/gui/widgets/debug.cpp
trunk/src/gui/widgets/generator_private.hpp
trunk/src/gui/widgets/menubar.cpp
trunk/src/gui/widgets/settings.cpp
trunk/src/gui/widgets/window_builder.cpp
trunk/src/help.cpp
trunk/src/hotkeys.cpp
trunk/src/language.cpp
trunk/src/log.cpp
trunk/src/menu_events.cpp
trunk/src/playcampaign.cpp
trunk/src/playsingle_controller.cpp
trunk/src/preferences.cpp
trunk/src/preferences_display.cpp
trunk/src/storyscreen/controller.cpp
trunk/src/storyscreen/interface.cpp
trunk/src/storyscreen/page.cpp
trunk/src/storyscreen/render.cpp
trunk/src/thread.cpp
trunk/src/unit_id.cpp
trunk/src/unit_types.cpp
Modified: trunk/src/actions.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/actions.cpp?rev=34711&r1=34710&r2=34711&view=diff
==============================================================================
--- trunk/src/actions.cpp (original)
+++ trunk/src/actions.cpp Sat Apr 11 12:00:20 2009
@@ -34,9 +34,8 @@
#include "wml_exception.hpp"
#include "formula_string_utils.hpp"
+
#include <boost/scoped_ptr.hpp>
-
-#include <iostream>
#define DBG_NG LOG_STREAM(debug, engine)
#define LOG_NG LOG_STREAM(info, engine)
Modified: trunk/src/ai_dfool.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai_dfool.cpp?rev=34711&r1=34710&r2=34711&view=diff
==============================================================================
--- trunk/src/ai_dfool.cpp (original)
+++ trunk/src/ai_dfool.cpp Sat Apr 11 12:00:20 2009
@@ -20,8 +20,6 @@
#include "foreach.hpp"
#include "log.hpp"
#include "formula_string_utils.hpp"
-
-#include <iostream>
namespace dfool {
void dfool_ai::play_turn(){
Modified: trunk/src/ai_village.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai_village.cpp?rev=34711&r1=34710&r2=34711&view=diff
==============================================================================
--- trunk/src/ai_village.cpp (original)
+++ trunk/src/ai_village.cpp Sat Apr 11 12:00:20 2009
@@ -24,7 +24,6 @@
#include "log.hpp"
#include "map.hpp"
-#include <iostream>
#include <numeric>
#define DBG_AI LOG_STREAM(debug, ai)
Modified: trunk/src/campaign_server/campaign_server.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/campaign_server/campaign_server.cpp?rev=34711&r1=34710&r2=34711&view=diff
==============================================================================
--- trunk/src/campaign_server/campaign_server.cpp (original)
+++ trunk/src/campaign_server/campaign_server.cpp Sat Apr 11 12:00:20 2009
@@ -32,7 +32,6 @@
#include "server/input_stream.hpp"
#include <csignal>
-#include <iostream>
#include <boost/iostreams/filter/gzip.hpp>
Modified: trunk/src/gui/widgets/debug.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/debug.cpp?rev=34711&r1=34710&r2=34711&view=diff
==============================================================================
--- trunk/src/gui/widgets/debug.cpp (original)
+++ trunk/src/gui/widgets/debug.cpp Sat Apr 11 12:00:20 2009
@@ -28,7 +28,6 @@
#include "serialization/string_utils.hpp"
#include <fstream>
-#include <iostream>
namespace gui2 {
Modified: trunk/src/gui/widgets/generator_private.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/generator_private.hpp?rev=34711&r1=34710&r2=34711&view=diff
==============================================================================
--- trunk/src/gui/widgets/generator_private.hpp (original)
+++ trunk/src/gui/widgets/generator_private.hpp Sat Apr 11 12:00:20 2009
@@ -23,8 +23,6 @@
#include "gui/widgets/selectable.hpp"
#include "gui/widgets/toggle_button.hpp"
#include "gui/widgets/toggle_panel.hpp"
-
-#include <iostream>
namespace gui2 {
Modified: trunk/src/gui/widgets/menubar.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/menubar.cpp?rev=34711&r1=34710&r2=34711&view=diff
==============================================================================
--- trunk/src/gui/widgets/menubar.cpp (original)
+++ trunk/src/gui/widgets/menubar.cpp Sat Apr 11 12:00:20 2009
@@ -17,8 +17,6 @@
#include "gui/widgets/menubar.hpp"
#include "gui/widgets/selectable.hpp"
-
-#include <iostream>
namespace gui2 {
Modified: trunk/src/gui/widgets/settings.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/settings.cpp?rev=34711&r1=34710&r2=34711&view=diff
==============================================================================
--- trunk/src/gui/widgets/settings.cpp (original)
+++ trunk/src/gui/widgets/settings.cpp Sat Apr 11 12:00:20 2009
@@ -29,7 +29,6 @@
#include "serialization/preprocessor.hpp"
#include "formula_string_utils.hpp"
-#include <iostream>
namespace gui2 {
Modified: trunk/src/gui/widgets/window_builder.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/window_builder.cpp?rev=34711&r1=34710&r2=34711&view=diff
==============================================================================
--- trunk/src/gui/widgets/window_builder.cpp (original)
+++ trunk/src/gui/widgets/window_builder.cpp Sat Apr 11 12:00:20 2009
@@ -36,7 +36,6 @@
#include "gui/widgets/vertical_scrollbar.hpp"
#include "gui/widgets/window.hpp"
-#include <iostream>
namespace gui2 {
Modified: trunk/src/help.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/help.cpp?rev=34711&r1=34710&r2=34711&view=diff
==============================================================================
--- trunk/src/help.cpp (original)
+++ trunk/src/help.cpp Sat Apr 11 12:00:20 2009
@@ -32,7 +32,6 @@
#include "wml_separators.hpp"
#include "serialization/parser.hpp"
-#include <iostream>
#include <queue>
#define DBG_HELP LOG_STREAM(debug, help)
Modified: trunk/src/hotkeys.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/hotkeys.cpp?rev=34711&r1=34710&r2=34711&view=diff
==============================================================================
--- trunk/src/hotkeys.cpp (original)
+++ trunk/src/hotkeys.cpp Sat Apr 11 12:00:20 2009
@@ -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)
Modified: trunk/src/language.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/language.cpp?rev=34711&r1=34710&r2=34711&view=diff
==============================================================================
--- trunk/src/language.cpp (original)
+++ trunk/src/language.cpp Sat Apr 11 12:00:20 2009
@@ -23,11 +23,9 @@
#include "serialization/parser.hpp"
#include "serialization/preprocessor.hpp"
+#include <stdexcept>
+#include <clocale>
#include <boost/scoped_array.hpp>
-
-#include <clocale>
-#include <iostream>
-#include <stdexcept>
#ifdef _WIN32
#include <windows.h>
Modified: trunk/src/log.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/log.cpp?rev=34711&r1=34710&r2=34711&view=diff
==============================================================================
--- trunk/src/log.cpp (original)
+++ trunk/src/log.cpp Sat Apr 11 12:00:20 2009
@@ -25,9 +25,8 @@
#include "log.hpp"
+#include <sstream>
#include <ctime>
-#include <iostream>
-#include <sstream>
namespace {
Modified: trunk/src/menu_events.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/menu_events.cpp?rev=34711&r1=34710&r2=34711&view=diff
==============================================================================
--- trunk/src/menu_events.cpp (original)
+++ trunk/src/menu_events.cpp Sat Apr 11 12:00:20 2009
@@ -46,8 +46,6 @@
#include "wml_separators.hpp"
#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)
Modified: trunk/src/playcampaign.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/playcampaign.cpp?rev=34711&r1=34710&r2=34711&view=diff
==============================================================================
--- trunk/src/playcampaign.cpp (original)
+++ trunk/src/playcampaign.cpp Sat Apr 11 12:00:20 2009
@@ -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)
Modified: trunk/src/playsingle_controller.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/playsingle_controller.cpp?rev=34711&r1=34710&r2=34711&view=diff
==============================================================================
--- trunk/src/playsingle_controller.cpp (original)
+++ trunk/src/playsingle_controller.cpp Sat Apr 11 12:00:20 2009
@@ -35,8 +35,6 @@
#include "formula_string_utils.hpp"
#include "events.hpp"
#include "save_blocker.hpp"
-
-#include <iostream>
#define ERR_NG LOG_STREAM(err, engine)
#define LOG_NG LOG_STREAM(info, engine)
Modified: trunk/src/preferences.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/preferences.cpp?rev=34711&r1=34710&r2=34711&view=diff
==============================================================================
--- trunk/src/preferences.cpp (original)
+++ trunk/src/preferences.cpp Sat Apr 11 12:00:20 2009
@@ -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 {
Modified: trunk/src/preferences_display.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/preferences_display.cpp?rev=34711&r1=34710&r2=34711&view=diff
==============================================================================
--- trunk/src/preferences_display.cpp (original)
+++ trunk/src/preferences_display.cpp Sat Apr 11 12:00:20 2009
@@ -30,7 +30,6 @@
#include "construct_dialog.hpp"
#include "wml_separators.hpp"
-#include <iostream>
namespace preferences {
Modified: trunk/src/storyscreen/controller.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/storyscreen/controller.cpp?rev=34711&r1=34710&r2=34711&view=diff
==============================================================================
--- trunk/src/storyscreen/controller.cpp (original)
+++ trunk/src/storyscreen/controller.cpp Sat Apr 11 12:00:20 2009
@@ -34,8 +34,6 @@
#include "intro.hpp"
#include "log.hpp"
#include "widgets/button.hpp"
-
-#include <iostream>
#define ERR_NG LOG_STREAM(err , engine)
#define LOG_NG LOG_STREAM(info, engine)
Modified: trunk/src/storyscreen/interface.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/storyscreen/interface.cpp?rev=34711&r1=34710&r2=34711&view=diff
==============================================================================
--- trunk/src/storyscreen/interface.cpp (original)
+++ trunk/src/storyscreen/interface.cpp Sat Apr 11 12:00:20 2009
@@ -33,8 +33,6 @@
#include "log.hpp"
#include "sound.hpp"
#include "text.hpp"
-
-#include <iostream>
#define ERR_NG LOG_STREAM(err , engine)
#define LOG_NG LOG_STREAM(info, engine)
Modified: trunk/src/storyscreen/page.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/storyscreen/page.cpp?rev=34711&r1=34710&r2=34711&view=diff
==============================================================================
--- trunk/src/storyscreen/page.cpp (original)
+++ trunk/src/storyscreen/page.cpp Sat Apr 11 12:00:20 2009
@@ -31,8 +31,6 @@
#include "util.hpp"
#include "variable.hpp"
#include "video.hpp"
-
-#include <iostream>
// TODO: remove when completed
#include "stub.hpp"
Modified: trunk/src/storyscreen/render.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/storyscreen/render.cpp?rev=34711&r1=34710&r2=34711&view=diff
==============================================================================
--- trunk/src/storyscreen/render.cpp (original)
+++ trunk/src/storyscreen/render.cpp Sat Apr 11 12:00:20 2009
@@ -34,8 +34,6 @@
#include "sound.hpp"
#include "text.hpp"
#include "video.hpp"
-
-#include <iostream>
// TODO: remove when completed
#include "stub.hpp"
Modified: trunk/src/thread.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/thread.cpp?rev=34711&r1=34710&r2=34711&view=diff
==============================================================================
--- trunk/src/thread.cpp (original)
+++ trunk/src/thread.cpp Sat Apr 11 12:00:20 2009
@@ -16,7 +16,6 @@
#include "log.hpp"
#include "thread.hpp"
-#include <iostream>
#define ERR_G LOG_STREAM(err, general)
Modified: trunk/src/unit_id.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit_id.cpp?rev=34711&r1=34710&r2=34711&view=diff
==============================================================================
--- trunk/src/unit_id.cpp (original)
+++ trunk/src/unit_id.cpp Sat Apr 11 12:00:20 2009
@@ -16,7 +16,6 @@
#include "unit_id.hpp"
#include <cassert>
-#include <iostream>
#define DBG_UT LOG_STREAM(debug, engine)
Modified: trunk/src/unit_types.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit_types.cpp?rev=34711&r1=34710&r2=34711&view=diff
==============================================================================
--- trunk/src/unit_types.cpp (original)
+++ trunk/src/unit_types.cpp Sat Apr 11 12:00:20 2009
@@ -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)
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
