widelands-dev team mailing list archive
-
widelands-dev team
-
Mailing list archive
-
Message #02132
[Merge] lp:~widelands-dev/widelands/silence_Wpedantic into lp:widelands
Tino has proposed merging lp:~widelands-dev/widelands/silence_Wpedantic into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/silence_Wpedantic/+merge/224179
Removes all extra ';' to silence -Wpedantic
--
https://code.launchpad.net/~widelands-dev/widelands/silence_Wpedantic/+merge/224179
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/silence_Wpedantic into lp:widelands.
=== modified file 'src/editor/ui_menus/editor_main_menu_load_map.h'
--- src/editor/ui_menus/editor_main_menu_load_map.h 2014-03-01 12:35:59 +0000
+++ src/editor/ui_menus/editor_main_menu_load_map.h 2014-06-23 16:45:24 +0000
@@ -29,7 +29,7 @@
template <typename T> struct Listselect;
struct Textarea;
struct Multiline_Textarea;
-};
+}
/**
* Choose a filename and save your brand new created map
=== modified file 'src/graphic/render/gamerenderer.h'
--- src/graphic/render/gamerenderer.h 2013-09-22 18:01:36 +0000
+++ src/graphic/render/gamerenderer.h 2014-06-23 16:45:24 +0000
@@ -27,7 +27,7 @@
namespace Widelands {
class Player;
class Editor_Game_Base;
-};
+}
class RenderTarget;
=== modified file 'src/graphic/render/minimaprenderer.h'
--- src/graphic/render/minimaprenderer.h 2013-10-13 10:05:51 +0000
+++ src/graphic/render/minimaprenderer.h 2014-06-23 16:45:24 +0000
@@ -27,7 +27,7 @@
namespace Widelands {
class Player;
class Editor_Game_Base;
-};
+}
/**
* This class renders the minimap.
=== modified file 'src/graphic/rendertarget.h'
--- src/graphic/rendertarget.h 2014-06-07 16:29:05 +0000
+++ src/graphic/rendertarget.h 2014-06-23 16:45:24 +0000
@@ -32,7 +32,7 @@
namespace Widelands {
class Player;
-};
+}
/**
* This class represents anything that can be rendered to.
=== modified file 'src/graphic/text/rt_errors.h'
--- src/graphic/text/rt_errors.h 2014-06-18 14:23:22 +0000
+++ src/graphic/text/rt_errors.h 2014-06-23 16:45:24 +0000
@@ -40,18 +40,18 @@
name(std::string msg) : Exception(msg) {} \
};
-DEF_ERR(AttributeNotFound);
-DEF_ERR(BadFont);
-DEF_ERR(BadImage);
-DEF_ERR(EOT);
-DEF_ERR(InvalidColor);
-DEF_ERR(RenderError);
-DEF_ERR(SyntaxError);
-DEF_ERR(WidthTooSmall);
+DEF_ERR(AttributeNotFound)
+DEF_ERR(BadFont)
+DEF_ERR(BadImage)
+DEF_ERR(EOT)
+DEF_ERR(InvalidColor)
+DEF_ERR(RenderError)
+DEF_ERR(SyntaxError)
+DEF_ERR(WidthTooSmall)
#undef DEF_ERR
-};
+}
#endif /* end of include guard: RT_ERRORS_H */
=== modified file 'src/graphic/text/rt_parse.cc'
--- src/graphic/text/rt_parse.cc 2014-06-18 14:23:22 +0000
+++ src/graphic/text/rt_parse.cc 2014-06-23 16:45:24 +0000
@@ -357,6 +357,6 @@
IParser * setup_parser() {
return new Parser();
-};
+}
}
=== modified file 'src/graphic/text/rt_render.cc'
--- src/graphic/text/rt_render.cc 2014-06-18 15:33:04 +0000
+++ src/graphic/text/rt_render.cc 2014-06-23 16:45:24 +0000
@@ -1004,4 +1004,4 @@
return new Renderer(image_cache, surface_cache, fl, setup_parser());
}
-};
+}
=== modified file 'src/graphic/text/rt_render.h'
--- src/graphic/text/rt_render.h 2014-06-18 14:23:22 +0000
+++ src/graphic/text/rt_render.h 2014-06-23 16:45:24 +0000
@@ -102,6 +102,6 @@
// Setup a renderer, takes ownership of fl but of nothing else.
IRenderer* setup_renderer(ImageCache* gr, SurfaceCache*, IFontLoader* fl);
-};
+}
#endif /* end of include guard: RT_RENDER_H */
=== modified file 'src/io/filesystem/disk_filesystem.cc'
--- src/io/filesystem/disk_filesystem.cc 2014-06-18 13:20:33 +0000
+++ src/io/filesystem/disk_filesystem.cc 2014-06-23 16:45:24 +0000
@@ -462,7 +462,7 @@
FILE * m_file;
};
-};
+}
StreamRead * RealFSImpl::OpenStreamRead(const std::string & fname) {
const std::string fullname = FS_CanonicalizeName(fname);
@@ -508,7 +508,7 @@
FILE * m_file;
};
-};
+}
StreamWrite * RealFSImpl::OpenStreamWrite(const std::string & fname) {
const std::string fullname = FS_CanonicalizeName(fname);
=== modified file 'src/machdep.h'
--- src/machdep.h 2013-07-26 19:16:51 +0000
+++ src/machdep.h 2014-06-23 16:45:24 +0000
@@ -29,7 +29,7 @@
#include "compile_diagnostics.h"
// Disable this warning for files where we might use these macros.
-CLANG_DIAG_OFF("-Wself-assign");
+CLANG_DIAG_OFF("-Wself-assign")
#if SDL_BYTEORDER == SDL_LIL_ENDIAN
#define Little16(x) (x)
=== modified file 'src/map_generator.cc'
--- src/map_generator.cc 2014-06-21 10:24:12 +0000
+++ src/map_generator.cc 2014-06-23 16:45:24 +0000
@@ -1168,4 +1168,4 @@
// TODO: MapGen: Check out sample map
// TODO: MapGen: How to handle height profile in make_blah...
-};
+}
=== modified file 'src/map_io/one_world_legacy_lookup_table.cc'
--- src/map_io/one_world_legacy_lookup_table.cc 2014-06-21 10:24:12 +0000
+++ src/map_io/one_world_legacy_lookup_table.cc 2014-06-23 16:45:24 +0000
@@ -352,7 +352,7 @@
return resource;
}
return i->second;
-};
+}
std::string RealOneWorldLegacyLookupTable::lookup_terrain(const std::string& terrain) const {
const std::map<std::string, std::string>& world_terrains = terrains_.at(old_world_name_);
=== modified file 'src/map_io/widelands_map_allowed_building_types_data_packet.h'
--- src/map_io/widelands_map_allowed_building_types_data_packet.h 2013-07-26 20:19:36 +0000
+++ src/map_io/widelands_map_allowed_building_types_data_packet.h 2014-06-23 16:45:24 +0000
@@ -22,6 +22,6 @@
#include "map_io/widelands_map_data_packet.h"
-MAP_DATA_PACKET(Map_Allowed_Building_Types_Data_Packet);
+MAP_DATA_PACKET(Map_Allowed_Building_Types_Data_Packet)
#endif
=== modified file 'src/map_io/widelands_map_allowed_worker_types_data_packet.h'
--- src/map_io/widelands_map_allowed_worker_types_data_packet.h 2013-07-26 20:19:36 +0000
+++ src/map_io/widelands_map_allowed_worker_types_data_packet.h 2014-06-23 16:45:24 +0000
@@ -24,6 +24,6 @@
/// If present, this contains all worker types that are allowed to be build
/// by players. If absent, all worker types are allowed per default.
-MAP_DATA_PACKET(Map_Allowed_Worker_Types_Data_Packet);
+MAP_DATA_PACKET(Map_Allowed_Worker_Types_Data_Packet)
#endif
=== modified file 'src/map_io/widelands_map_exploration_data_packet.h'
--- src/map_io/widelands_map_exploration_data_packet.h 2013-07-26 20:19:36 +0000
+++ src/map_io/widelands_map_exploration_data_packet.h 2014-06-23 16:45:24 +0000
@@ -22,6 +22,6 @@
#include "map_io/widelands_map_data_packet.h"
-MAP_DATA_PACKET(Map_Exploration_Data_Packet);
+MAP_DATA_PACKET(Map_Exploration_Data_Packet)
#endif
=== modified file 'src/map_io/widelands_map_flag_data_packet.h'
--- src/map_io/widelands_map_flag_data_packet.h 2013-07-26 20:19:36 +0000
+++ src/map_io/widelands_map_flag_data_packet.h 2014-06-23 16:45:24 +0000
@@ -22,6 +22,6 @@
#include "map_io/widelands_map_data_packet.h"
-MAP_DATA_PACKET(Map_Flag_Data_Packet);
+MAP_DATA_PACKET(Map_Flag_Data_Packet)
#endif
=== modified file 'src/map_io/widelands_map_flagdata_data_packet.h'
--- src/map_io/widelands_map_flagdata_data_packet.h 2013-07-26 20:19:36 +0000
+++ src/map_io/widelands_map_flagdata_data_packet.h 2014-06-23 16:45:24 +0000
@@ -22,6 +22,6 @@
#include "map_io/widelands_map_data_packet.h"
-MAP_DATA_PACKET(Map_Flagdata_Data_Packet);
+MAP_DATA_PACKET(Map_Flagdata_Data_Packet)
#endif
=== modified file 'src/map_io/widelands_map_heights_data_packet.h'
--- src/map_io/widelands_map_heights_data_packet.h 2013-07-26 20:19:36 +0000
+++ src/map_io/widelands_map_heights_data_packet.h 2014-06-23 16:45:24 +0000
@@ -22,6 +22,6 @@
#include "map_io/widelands_map_data_packet.h"
-MAP_DATA_PACKET(Map_Heights_Data_Packet);
+MAP_DATA_PACKET(Map_Heights_Data_Packet)
#endif
=== modified file 'src/map_io/widelands_map_node_ownership_data_packet.h'
--- src/map_io/widelands_map_node_ownership_data_packet.h 2013-07-26 20:19:36 +0000
+++ src/map_io/widelands_map_node_ownership_data_packet.h 2014-06-23 16:45:24 +0000
@@ -22,6 +22,6 @@
#include "map_io/widelands_map_data_packet.h"
-MAP_DATA_PACKET(Map_Node_Ownership_Data_Packet);
+MAP_DATA_PACKET(Map_Node_Ownership_Data_Packet)
#endif
=== modified file 'src/map_io/widelands_map_objective_data_packet.h'
--- src/map_io/widelands_map_objective_data_packet.h 2013-07-26 20:19:36 +0000
+++ src/map_io/widelands_map_objective_data_packet.h 2014-06-23 16:45:24 +0000
@@ -22,6 +22,6 @@
#include "map_io/widelands_map_data_packet.h"
-MAP_DATA_PACKET(Map_Objective_Data_Packet);
+MAP_DATA_PACKET(Map_Objective_Data_Packet)
#endif
=== modified file 'src/map_io/widelands_map_player_position_data_packet.h'
--- src/map_io/widelands_map_player_position_data_packet.h 2013-07-26 20:19:36 +0000
+++ src/map_io/widelands_map_player_position_data_packet.h 2014-06-23 16:45:24 +0000
@@ -22,6 +22,6 @@
#include "map_io/widelands_map_data_packet.h"
-MAP_DATA_PACKET(Map_Player_Position_Data_Packet);
+MAP_DATA_PACKET(Map_Player_Position_Data_Packet)
#endif
=== modified file 'src/map_io/widelands_map_players_messages_data_packet.h'
--- src/map_io/widelands_map_players_messages_data_packet.h 2013-07-26 20:19:36 +0000
+++ src/map_io/widelands_map_players_messages_data_packet.h 2014-06-23 16:45:24 +0000
@@ -22,6 +22,6 @@
#include "map_io/widelands_map_data_packet.h"
-MAP_DATA_PACKET(Map_Players_Messages_Data_Packet);
+MAP_DATA_PACKET(Map_Players_Messages_Data_Packet)
#endif
=== modified file 'src/map_io/widelands_map_players_view_data_packet.h'
--- src/map_io/widelands_map_players_view_data_packet.h 2013-07-26 20:19:36 +0000
+++ src/map_io/widelands_map_players_view_data_packet.h 2014-06-23 16:45:24 +0000
@@ -31,6 +31,6 @@
/// This information can not be loaded before the terrains, roads, immovables
/// and players' vision maps are loaded. The vision maps are completely loaded
/// after Map_Bobdata_Data_Packet has been loaded.
-MAP_DATA_PACKET(Map_Players_View_Data_Packet);
+MAP_DATA_PACKET(Map_Players_View_Data_Packet)
#endif
=== modified file 'src/map_io/widelands_map_road_data_packet.h'
--- src/map_io/widelands_map_road_data_packet.h 2013-07-26 20:19:36 +0000
+++ src/map_io/widelands_map_road_data_packet.h 2014-06-23 16:45:24 +0000
@@ -22,6 +22,6 @@
#include "map_io/widelands_map_data_packet.h"
-MAP_DATA_PACKET(Map_Road_Data_Packet);
+MAP_DATA_PACKET(Map_Road_Data_Packet)
#endif
=== modified file 'src/map_io/widelands_map_roaddata_data_packet.h'
--- src/map_io/widelands_map_roaddata_data_packet.h 2013-07-26 20:19:36 +0000
+++ src/map_io/widelands_map_roaddata_data_packet.h 2014-06-23 16:45:24 +0000
@@ -26,6 +26,6 @@
* This parses the roads data (where it is, where it belongs to
* and so on)
*/
-MAP_DATA_PACKET(Map_Roaddata_Data_Packet);
+MAP_DATA_PACKET(Map_Roaddata_Data_Packet)
#endif
=== modified file 'src/map_io/widelands_map_scripting_data_packet.h'
--- src/map_io/widelands_map_scripting_data_packet.h 2013-07-26 20:19:36 +0000
+++ src/map_io/widelands_map_scripting_data_packet.h 2014-06-23 16:45:24 +0000
@@ -26,6 +26,6 @@
* This packet loads lua scripts from the scripting sub directory.
* It also safes them there again.
*/
-MAP_DATA_PACKET(Map_Scripting_Data_Packet);
+MAP_DATA_PACKET(Map_Scripting_Data_Packet)
#endif
=== modified file 'src/map_io/widelands_map_version_data_packet.h'
--- src/map_io/widelands_map_version_data_packet.h 2013-09-13 12:46:44 +0000
+++ src/map_io/widelands_map_version_data_packet.h 2014-06-23 16:45:24 +0000
@@ -25,6 +25,6 @@
/*
* This packet contains the version information of the map.
*/
-MAP_DATA_PACKET(Map_Version_Data_Packet);
+MAP_DATA_PACKET(Map_Version_Data_Packet)
#endif
=== modified file 'src/scripting/lua_bases.cc'
--- src/scripting/lua_bases.cc 2014-04-21 09:19:14 +0000
+++ src/scripting/lua_bases.cc 2014-06-23 16:45:24 +0000
@@ -571,4 +571,4 @@
register_class<L_PlayerBase>(L, "bases");
}
-};
+}
=== modified file 'src/scripting/lua_bases.h'
--- src/scripting/lua_bases.h 2014-06-12 07:22:23 +0000
+++ src/scripting/lua_bases.h 2014-06-23 16:45:24 +0000
@@ -113,6 +113,6 @@
void luaopen_wlbases(lua_State *);
-};
+}
#endif
=== modified file 'src/scripting/lua_editor.cc'
--- src/scripting/lua_editor.cc 2014-06-01 18:00:48 +0000
+++ src/scripting/lua_editor.cc 2014-06-23 16:45:24 +0000
@@ -101,4 +101,4 @@
lua_pop(L, 1); // Pop the meta table
}
-};
+}
=== modified file 'src/scripting/lua_editor.h'
--- src/scripting/lua_editor.h 2014-06-12 07:22:23 +0000
+++ src/scripting/lua_editor.h 2014-06-23 16:45:24 +0000
@@ -55,7 +55,7 @@
void luaopen_wleditor(lua_State *);
-};
+}
#endif
=== modified file 'src/scripting/lua_game.cc'
--- src/scripting/lua_game.cc 2014-06-21 10:24:12 +0000
+++ src/scripting/lua_game.cc 2014-06-23 16:45:24 +0000
@@ -1356,4 +1356,4 @@
register_class<L_Message>(L, "game");
}
-};
+}
=== modified file 'src/scripting/lua_game.h'
--- src/scripting/lua_game.h 2014-06-12 07:22:23 +0000
+++ src/scripting/lua_game.h 2014-06-23 16:45:24 +0000
@@ -30,7 +30,7 @@
struct Tribe_Descr;
class Objective;
struct Message;
-};
+}
namespace LuaGame {
@@ -191,4 +191,4 @@
void luaopen_wlgame(lua_State *);
#endif
-};
+}
=== modified file 'src/scripting/lua_globals.h'
--- src/scripting/lua_globals.h 2014-06-12 07:22:23 +0000
+++ src/scripting/lua_globals.h 2014-06-23 16:45:24 +0000
@@ -27,4 +27,4 @@
void luaopen_globals(lua_State *);
#endif /* end of include guard: LUA_GLOBALS_H */
-};
+}
=== modified file 'src/scripting/lua_map.cc'
--- src/scripting/lua_map.cc 2014-06-21 10:24:12 +0000
+++ src/scripting/lua_map.cc 2014-06-23 16:45:24 +0000
@@ -110,8 +110,8 @@
report_error(L, "Invalid " #type ": <%s>", what.c_str()); \
return idx; \
}
-GET_INDEX(ware);
-GET_INDEX(worker);
+GET_INDEX(ware)
+GET_INDEX(worker)
#undef GET_INDEX
#define PARSERS(type, btype) \
@@ -174,8 +174,8 @@
} \
return rv; \
}
-PARSERS(ware, Ware);
-PARSERS(worker, Worker);
+PARSERS(ware, Ware)
+PARSERS(worker, Worker)
#undef PARSERS
WaresMap count_wares_on_flag_(Flag& f, const Tribe_Descr & tribe) {
@@ -1798,9 +1798,9 @@
return 0; \
}
// documented in parent class
-WH_SET(ware, Ware);
+WH_SET(ware, Ware)
// documented in parent class
-WH_SET(worker, Worker);
+WH_SET(worker, Worker)
#undef WH_SET
#define WH_GET(type, btype) \
@@ -1824,9 +1824,9 @@
return 1; \
}
// documented in parent class
-WH_GET(ware, Ware);
+WH_GET(ware, Ware)
// documented in parent class
-WH_GET(worker, Worker);
+WH_GET(worker, Worker)
#undef GET
// documented in parent class
@@ -2773,12 +2773,12 @@
to_lua<L_Field>(L, new L_Field(n.x, n.y)); \
return 1; \
}
-GET_X_NEIGHBOUR(rn);
-GET_X_NEIGHBOUR(ln);
-GET_X_NEIGHBOUR(trn);
-GET_X_NEIGHBOUR(tln);
-GET_X_NEIGHBOUR(bln);
-GET_X_NEIGHBOUR(brn);
+GET_X_NEIGHBOUR(rn)
+GET_X_NEIGHBOUR(ln)
+GET_X_NEIGHBOUR(trn)
+GET_X_NEIGHBOUR(tln)
+GET_X_NEIGHBOUR(bln)
+GET_X_NEIGHBOUR(brn)
/* RST
.. attribute:: owner
@@ -3177,4 +3177,4 @@
lua_pop(L, 1); // Pop the meta table
}
-};
+}
=== modified file 'src/scripting/lua_path.h'
--- src/scripting/lua_path.h 2014-06-18 14:23:22 +0000
+++ src/scripting/lua_path.h 2014-06-23 16:45:24 +0000
@@ -34,6 +34,6 @@
void luaopen_path(lua_State *);
-};
+}
#endif /* end of include guard: LUA_PATH_H */
=== modified file 'src/scripting/lua_root.cc'
--- src/scripting/lua_root.cc 2014-06-18 13:20:33 +0000
+++ src/scripting/lua_root.cc 2014-06-23 16:45:24 +0000
@@ -495,4 +495,4 @@
register_class<L_World>(L, "", false);
}
-};
+}
=== modified file 'src/scripting/lua_root.h'
--- src/scripting/lua_root.h 2014-06-18 13:20:33 +0000
+++ src/scripting/lua_root.h 2014-06-23 16:45:24 +0000
@@ -125,4 +125,4 @@
void luaopen_wlroot(lua_State *, bool in_editor);
#endif
-};
+}
=== modified file 'src/scripting/lua_ui.cc'
--- src/scripting/lua_ui.cc 2014-04-06 14:01:52 +0000
+++ src/scripting/lua_ui.cc 2014-06-23 16:45:24 +0000
@@ -780,4 +780,4 @@
}
-};
+}
=== modified file 'src/scripting/lua_ui.h'
--- src/scripting/lua_ui.h 2014-06-12 07:22:23 +0000
+++ src/scripting/lua_ui.h 2014-06-23 16:45:24 +0000
@@ -212,6 +212,6 @@
void luaopen_wlui(lua_State *);
-};
+}
#endif
=== modified file 'src/ui_basic/tabpanel.h'
--- src/ui_basic/tabpanel.h 2014-02-22 18:04:02 +0000
+++ src/ui_basic/tabpanel.h 2014-06-23 16:45:24 +0000
@@ -109,6 +109,6 @@
const Image* m_pic_background; ///< picture used to draw background
};
-};
+}
#endif
=== modified file 'src/ui_fsmenu/loadgame.h'
--- src/ui_fsmenu/loadgame.h 2014-06-10 20:42:45 +0000
+++ src/ui_fsmenu/loadgame.h 2014-06-23 16:45:24 +0000
@@ -40,7 +40,7 @@
class Game;
class Map;
class Map_Loader;
-};
+}
class Image;
class RenderTarget;
class GameController;
=== modified file 'src/wui/encyclopedia_window.h'
--- src/wui/encyclopedia_window.h 2014-04-20 21:07:45 +0000
+++ src/wui/encyclopedia_window.h 2014-06-23 16:45:24 +0000
@@ -30,7 +30,7 @@
namespace Widelands {
struct WareDescr;
struct Tribe_Descr;
-};
+}
class Interactive_Player;
=== modified file 'src/wui/game_message_menu.h'
--- src/wui/game_message_menu.h 2014-06-08 21:47:45 +0000
+++ src/wui/game_message_menu.h 2014-06-23 16:45:24 +0000
@@ -32,7 +32,7 @@
namespace Widelands {
class Game;
struct Message;
-};
+}
class Interactive_Player;
/// Shows the not already fulfilled objectives.
=== modified file 'src/wui/general_statistics_menu.cc'
--- src/wui/general_statistics_menu.cc 2014-06-21 10:24:12 +0000
+++ src/wui/general_statistics_menu.cc 2014-06-23 16:45:24 +0000
@@ -330,4 +330,4 @@
(i * m_ndatasets + m_selected_information, false);
}
m_selected_information = id;
-};
+}
=== modified file 'src/wui/plot_area.cc'
--- src/wui/plot_area.cc 2014-06-08 21:47:45 +0000
+++ src/wui/plot_area.cc 2014-06-23 16:45:24 +0000
@@ -479,7 +479,7 @@
void WUIPlot_Area::show_plot(uint32_t const id, bool const t) {
assert(id < m_plotdata.size());
m_plotdata[id].showplot = t;
-};
+}
/*
* Set sample rate the data uses
=== modified file 'src/wui/waresqueuedisplay.cc'
--- src/wui/waresqueuedisplay.cc 2014-02-22 18:04:02 +0000
+++ src/wui/waresqueuedisplay.cc 2014-06-23 16:45:24 +0000
@@ -273,7 +273,7 @@
m_igb.game().send_player_set_ware_priority
(m_building, m_ware_type, m_ware_index, priority);
-};
+}
/**
* One of the buttons to increase or decrease the amount of wares
Follow ups