GUI2: use more nested namespaces

src/gui/dialogs/editor/custom_tod.hpp

@@ -21,12 +21,8 @@
 #include <vector>
 #include <functional>
 
-namespace gui2
+namespace gui2::dialogs
 {
-
-namespace dialogs
-{
-
 class custom_tod : public modal_dialog
 {
 public:
@@ -107,5 +103,4 @@ private:
 	field_integer* color_field_b_;
 };
 
-} // namespace dialogs
-} // namespace gui2
+} // namespace gui2::dialogs

src/gui/dialogs/editor/edit_pbl.hpp

@@ -16,12 +16,8 @@
 
 #include "gui/dialogs/modal_dialog.hpp"
 
-namespace gui2
+namespace gui2::dialogs
 {
-
-namespace dialogs
-{
-
 class editor_edit_pbl : public modal_dialog
 {
 public:
@@ -50,5 +46,4 @@ private:
 	std::vector<std::string> dirs_;
 };
 
-} // namespace dialogs
-} // namespace gui2
+} // namespace gui2::dialogs

src/gui/dialogs/editor/edit_pbl_translation.hpp

@@ -16,12 +16,8 @@
 
 #include "gui/dialogs/modal_dialog.hpp"
 
-namespace gui2
+namespace gui2::dialogs
 {
-
-namespace dialogs
-{
-
 class editor_edit_pbl_translation : public modal_dialog
 {
 public:
@@ -41,5 +37,4 @@ private:
 	std::string& description_;
 };
 
-} // namespace dialogs
-} // namespace gui2
+} // namespace gui2::dialogs

src/gui/dialogs/editor/edit_side.hpp

@@ -20,12 +20,8 @@
 #include "gui/widgets/group.hpp"
 #include "side_controller.hpp"
 
-namespace gui2
+namespace gui2::dialogs
 {
-
-namespace dialogs
-{
-
 class editor_edit_side : public modal_dialog
 {
 public:
@@ -46,5 +42,5 @@ private:
 
 	virtual const std::string& window_id() const override;
 };
-} // namespace dialogs
-} // namespace gui2
+
+} // namespace gui2::dialogs

src/gui/dialogs/editor/edit_unit.hpp

@@ -24,12 +24,8 @@
 
 #include <boost/dynamic_bitset.hpp>
 
-namespace gui2
+namespace gui2::dialogs
 {
-
-namespace dialogs
-{
-
 /**
  * Dialog that allows user to create custom unit types.
  */
@@ -161,6 +157,4 @@ private:
 		SDL_Keymod modifier);
 };
 
-
-} // namespace dialogs
-} // namespace gui2
+} // namespace gui2::dialogs

src/gui/dialogs/editor/generate_map.hpp

@@ -23,12 +23,8 @@
 
 class map_generator;
 
-namespace gui2
+namespace gui2::dialogs
 {
-
-namespace dialogs
-{
-
 class editor_generate_map : public modal_dialog
 {
 public:
@@ -69,5 +65,4 @@ private:
 	std::string random_seed_;
 };
 
-} // namespace dialogs
-} // namespace gui2
+} // namespace gui2::dialogs

src/gui/dialogs/editor/tod_new_schedule.hpp

@@ -17,12 +17,8 @@
 
 #include "gui/dialogs/modal_dialog.hpp"
 
-namespace gui2
+namespace gui2::dialogs
 {
-
-namespace dialogs
-{
-
 /**
  * Dialog that takes new schedule ID and name from the player.
  * custom_tod.cpp is the main editor window for time schedules.
@@ -49,6 +45,4 @@ private:
 	void button_state_change();
 };
 
-
-} // namespace dialogs
-} // namespace gui2
+} // namespace gui2::dialogs

src/gui/dialogs/game_load.hpp

@@ -23,12 +23,8 @@
 
 #include <SDL2/SDL_keycode.h>
 
-namespace gui2
+namespace gui2::dialogs
 {
-
-namespace dialogs
-{
-
 class game_load : public modal_dialog
 {
 public:
@@ -76,5 +72,5 @@ private:
 	std::vector<savegame::save_info> games_;
 	const game_config_view& cache_config_;
 };
-} // namespace dialogs
-} // namespace gui2
+
+} // namespace gui2::dialogs

src/gui/dialogs/game_version_dialog.hpp

@@ -22,12 +22,8 @@
 #include <map>
 #include <array>
 
-namespace gui2
+namespace gui2::dialogs
 {
-
-namespace dialogs
-{
-
 class game_version : public modal_dialog
 {
 public:
@@ -121,5 +117,5 @@ private:
 	 */
 	void show_manual();
 };
-} // namespace dialogs
-} // namespace gui2
+
+} // namespace gui2::dialogs

src/gui/dialogs/gui_test_dialog.hpp

@@ -16,12 +16,8 @@
 
 #include "gui/dialogs/modal_dialog.hpp"
 
-namespace gui2
+namespace gui2::dialogs
 {
-
-namespace dialogs
-{
-
 /**
  * @ingroup GUIWindowDefinitionWML
  *
@@ -42,5 +38,4 @@ private:
 	virtual const std::string& window_id() const override;
 };
 
-} // namespace dialogs
-} // namespace gui2
+} // namespace gui2::dialogs

src/gui/dialogs/log_settings.hpp

@@ -18,12 +18,8 @@
 #include "gui/widgets/group.hpp"
 #include <map>
 
-namespace gui2
+namespace gui2::dialogs
 {
-
-namespace dialogs
-{
-
 class log_settings : public modal_dialog
 {
 public:
@@ -52,5 +48,4 @@ private:
 	void filter_text_changed(const std::string& text);
 };
 
-} // namespace dialogs
-} // end namespace gui2
+} // namespace gui2::dialogs

src/gui/dialogs/modeless_dialog.hpp

@@ -19,11 +19,8 @@
 
 #include <string>
 
-namespace gui2
+namespace gui2::dialogs
 {
-namespace dialogs
-{
-
 /**
  * The popup class shows windows that are shown non-modal.
  *
@@ -69,5 +66,4 @@ private:
 	virtual const std::string& window_id() const { return widget::id(); }
 };
 
-} // namespace dialogs
-} // namespace gui2
+} // namespace gui2::dialogs

src/gui/dialogs/prompt.hpp

@@ -16,12 +16,8 @@
 
 #include "gui/dialogs/modal_dialog.hpp"
 
-namespace gui2
+namespace gui2::dialogs
 {
-
-namespace dialogs
-{
-
 class prompt : public modal_dialog
 {
 public:
@@ -39,5 +35,4 @@ private:
 	std::string& value_;
 };
 
-} // namespace dialogs
-} // namespace gui2
+} // namespace gui2::dialogs

src/gui/dialogs/server_info_dialog.hpp

@@ -16,10 +16,7 @@
 
 #include "gui/dialogs/modal_dialog.hpp"
 
-namespace gui2
-{
-
-namespace dialogs
+namespace gui2::dialogs
 {
 class server_info : public modal_dialog
 {
@@ -49,5 +46,5 @@ private:
 	const std::string& server_information_;
 	const std::string& announcements_;
 };
-}
-}
+
+} // namespace gui2::dialogs

src/gui/dialogs/statistics_dialog.hpp

@@ -19,12 +19,8 @@
 
 class team;
 
-namespace gui2
+namespace gui2::dialogs
 {
-
-namespace dialogs
-{
-
 class statistics_dialog : public modal_dialog
 {
 public:
@@ -83,5 +79,4 @@ private:
 	std::vector<const statistics_t::stats::str_int_map*> main_stat_table_;
 };
 
-} // namespace dialogs
-} // namespace gui2
+} // namespace gui2::dialogs

src/gui/dialogs/tooltip.hpp

@@ -21,15 +21,8 @@
 class t_string;
 struct point;
 
-namespace gui2
+namespace gui2::dialogs::tip
 {
-
-namespace dialogs
-{
-
-namespace tip
-{
-
 /**
  * Shows a tip.
  *
@@ -53,6 +46,4 @@ void show(const std::string& window_id,
  * */
 void remove();
 
-} // namespace tip
-} // namespace dialogs
-} // namespace gui2
+} // namespace gui2::dialogs::tip