[Freeorion-programmers] SF.net SVN: freeorion:[4547] trunk/FreeOrion

[<geo...@us...>]

Revision: 4547
          http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=4547&view=rev
Author:   geoffthemedio
Date:     2011-12-28 23:40:53 +0000 (Wed, 28 Dec 2011)
Log Message:
-----------
-Moved some trivial function definitions into header.
-Updated Version.cpp.

Modified Paths:
--------------
    trunk/FreeOrion/msvc2010/src/Version.cpp
    trunk/FreeOrion/util/MultiplayerCommon.cpp
    trunk/FreeOrion/util/MultiplayerCommon.h

Modified: trunk/FreeOrion/msvc2010/src/Version.cpp
===================================================================
--- trunk/FreeOrion/msvc2010/src/Version.cpp	2011-12-28 23:39:56 UTC (rev 4546)
+++ trunk/FreeOrion/msvc2010/src/Version.cpp	2011-12-28 23:40:53 UTC (rev 4547)
@@ -1,7 +1,7 @@
 #include "../../util/Version.h"
 
 namespace {
-    static const std::string retval = "v0.3.17+ [SVN 4539] MSVC 2010";
+    static const std::string retval = "v0.3.17+ [SVN 4547] MSVC 2010";
 }
 
 const std::string& FreeOrionVersionString()

Modified: trunk/FreeOrion/util/MultiplayerCommon.cpp
===================================================================
--- trunk/FreeOrion/util/MultiplayerCommon.cpp	2011-12-28 23:39:56 UTC (rev 4546)
+++ trunk/FreeOrion/util/MultiplayerCommon.cpp	2011-12-28 23:40:53 UTC (rev 4547)
@@ -254,8 +254,7 @@
 /////////////////////////////////////////////////////
 // Free Function(s)
 /////////////////////////////////////////////////////
-const std::vector<GG::Clr>& EmpireColors()
-{
+const std::vector<GG::Clr>& EmpireColors() {
     static std::vector<GG::Clr> colors;
     if (colors.empty()) {
         XMLDoc doc;
@@ -286,8 +285,7 @@
     return colors;
 }
 
-XMLElement ClrToXML(const GG::Clr& clr)
-{
+XMLElement ClrToXML(const GG::Clr& clr) {
     XMLElement retval("GG::Clr");
     retval.AppendChild(XMLElement("red", boost::lexical_cast<std::string>(static_cast<int>(clr.r))));
     retval.AppendChild(XMLElement("green", boost::lexical_cast<std::string>(static_cast<int>(clr.g))));
@@ -296,8 +294,7 @@
     return retval;
 }
 
-GG::Clr XMLToClr(const XMLElement& clr)
-{
+GG::Clr XMLToClr(const XMLElement& clr) {
     GG::Clr retval = GG::Clr(0, 0, 0, 255);
     if (clr.ContainsAttribute("hex")) {
         // get colour components as a single string representing three pairs of hex digits
@@ -336,8 +333,7 @@
     return retval;
 }
 
-int PriorityValue(const std::string& name)
-{
+int PriorityValue(const std::string& name) {
     static std::map<std::string, int> priority_map;
     static bool init = false;
     if (!init) {
@@ -356,8 +352,7 @@
     return priority_map[name];
 }
 
-const std::string& UserString(const std::string& str)
-{
+const std::string& UserString(const std::string& str) {
     const StringTable_& string_table = GetStringTable();
     if (string_table.StringExists(str))
         return GetStringTable().String(str);
@@ -371,8 +366,7 @@
     return retval;
 }
 
-std::string RomanNumber(unsigned int n)
-{
+std::string RomanNumber(unsigned int n) {
     //letter pattern (N) and the associated values (V)
     static const std::string  N[] = { "M", "CM", "D", "CD", "C", "XC", "L", "XL", "X", "IX", "V", "IV", "I"};
     static const unsigned int V[] = {1000,  900, 500,  400, 100,   90,  50,   40,  10,    9,   5,    4,   1};
@@ -403,10 +397,8 @@
     return retval;
 }
 
-const std::string& Language() 
-{
-    return GetStringTable().Language();
-}
+const std::string& Language()
+{ return GetStringTable().Language(); }
 
 #ifndef FREEORION_WIN32
 void Sleep(int ms)
@@ -425,87 +417,24 @@
 
 
 /////////////////////////////////////////////////////
-// GalaxySetupData
-/////////////////////////////////////////////////////
-GalaxySetupData::GalaxySetupData():
-    m_size(100),
-    m_shape(SPIRAL_2),
-    m_age(GALAXY_SETUP_MEDIUM),
-    m_starlane_freq(GALAXY_SETUP_MEDIUM),
-    m_planet_density(GALAXY_SETUP_MEDIUM),
-    m_specials_freq(GALAXY_SETUP_MEDIUM),
-    m_monster_freq(GALAXY_SETUP_MEDIUM),
-    m_native_freq(GALAXY_SETUP_MEDIUM)
-{}
-
-
-/////////////////////////////////////////////////////
-// SaveGameEmpireData
-/////////////////////////////////////////////////////
-SaveGameEmpireData::SaveGameEmpireData() :
-    m_empire_id(ALL_EMPIRES),
-    m_empire_name(),
-    m_player_name(),
-    m_color()
-{}
-
-SaveGameEmpireData::SaveGameEmpireData(int empire_id, const std::string& empire_name,
-                                       const std::string& player_name, const GG::Clr& colour) :
-    m_empire_id(empire_id),
-    m_empire_name(empire_name),
-    m_player_name(player_name),
-    m_color(colour)
-{}
-
-
-/////////////////////////////////////////////////////
 // PlayerSetupData
 /////////////////////////////////////////////////////
-PlayerSetupData::PlayerSetupData() :
-    m_player_name(),
-    m_empire_name(),
-    m_empire_color(GG::Clr(0, 0, 0, 0)),
-    m_starting_species_name(),
-    m_save_game_empire_id(ALL_EMPIRES),
-    m_client_type(Networking::INVALID_CLIENT_TYPE)
-{}
-
-bool operator==(const PlayerSetupData& lhs, const PlayerSetupData& rhs)
-{
-    return
-        lhs.m_client_type == rhs.m_client_type &&
-        lhs.m_empire_color == rhs.m_empire_color &&
-        lhs.m_empire_name == rhs.m_empire_name &&
-        lhs.m_player_name == rhs.m_player_name &&
-        lhs.m_save_game_empire_id == rhs.m_save_game_empire_id &&
-        lhs.m_starting_species_name == rhs.m_starting_species_name;
+bool operator==(const PlayerSetupData& lhs, const PlayerSetupData& rhs) {
+    return  lhs.m_client_type == rhs.m_client_type &&
+            lhs.m_empire_color == rhs.m_empire_color &&
+            lhs.m_empire_name == rhs.m_empire_name &&
+            lhs.m_player_name == rhs.m_player_name &&
+            lhs.m_save_game_empire_id == rhs.m_save_game_empire_id &&
+            lhs.m_starting_species_name == rhs.m_starting_species_name;
 }
 
 bool operator!=(const PlayerSetupData& lhs, const PlayerSetupData& rhs)
 { return !(lhs == rhs); }
 
 
-/////////////////////////////////////////////////////
-// SinglePlayerSetupData
-/////////////////////////////////////////////////////
-SinglePlayerSetupData::SinglePlayerSetupData():
-    m_new_game(true),
-    m_filename(),
-    m_players()
-{}
-
-
 ////////////////////////////////////////////////////
 // MultiplayerLobbyData
 /////////////////////////////////////////////////////
-MultiplayerLobbyData::MultiplayerLobbyData() :
-    m_new_game(true),
-    m_save_file_index(-1),
-    m_players(),
-    m_save_games(),
-    m_save_game_empire_data()
-{}
-
 MultiplayerLobbyData::MultiplayerLobbyData(bool build_save_game_list) :
     m_new_game(true),
     m_save_file_index(-1),
@@ -547,31 +476,8 @@
 
 
 ////////////////////////////////////////////////
-// PlayerInfo
-////////////////////////////////////////////////
-PlayerInfo::PlayerInfo() :
-    name(""),
-    empire_id(ALL_EMPIRES),
-    client_type(Networking::INVALID_CLIENT_TYPE),
-    host(false)
-{}
-
-PlayerInfo::PlayerInfo(const std::string& player_name_, int empire_id_, Networking::ClientType client_type_, bool host_) :
-    name(player_name_),
-    empire_id(empire_id_),
-    client_type(client_type_),
-    host(host_)
-{}
-
-
-////////////////////////////////////////////////
 // CombatData
 ////////////////////////////////////////////////
-CombatData::CombatData() :
-    m_combat_turn_number(0),
-    m_system(0)
-{}
-
 CombatData::CombatData(System* system, std::map<int, std::vector<CombatSetupGroup> >& setup_groups) :
     m_combat_turn_number(0),
     m_system(system)
@@ -659,28 +565,6 @@
 ////////////////////////////////////////////////
 // CombatSetupRegion
 ////////////////////////////////////////////////
-CombatSetupRegion::CombatSetupRegion() :
-    m_type(RING),
-    m_radius_begin(),
-    m_radius_end(),
-    m_centroid(),
-    m_radial_axis(),
-    m_tangent_axis(),
-    m_theta_begin(),
-    m_theta_end()
-{}
-
-CombatSetupRegion::CombatSetupRegion(float radius_begin, float radius_end) :
-    m_type(RING),
-    m_radius_begin(radius_begin),
-    m_radius_end(radius_end),
-    m_centroid(),
-    m_radial_axis(),
-    m_tangent_axis(),
-    m_theta_begin(),
-    m_theta_end()
-{}
-
 CombatSetupRegion::CombatSetupRegion(float centroid_x, float centroid_y, float radius) :
     m_type(ELLIPSE),
     m_radius_begin(),
@@ -759,10 +643,3 @@
     }
     return retval;
 }
-
-////////////////////////////////////////////////
-// CombatSetupGroup
-////////////////////////////////////////////////
-CombatSetupGroup::CombatSetupGroup() :
-    m_allow(false)
-{}

Modified: trunk/FreeOrion/util/MultiplayerCommon.h
===================================================================
--- trunk/FreeOrion/util/MultiplayerCommon.h	2011-12-28 23:39:56 UTC (rev 4546)
+++ trunk/FreeOrion/util/MultiplayerCommon.h	2011-12-28 23:40:53 UTC (rev 4547)
@@ -57,7 +57,16 @@
 struct GalaxySetupData
 {
     /** \name Structors */ //@{
-    GalaxySetupData(); ///< default ctor.
+    GalaxySetupData() :
+        m_size(100),
+        m_shape(SPIRAL_2),
+        m_age(GALAXY_SETUP_MEDIUM),
+        m_starlane_freq(GALAXY_SETUP_MEDIUM),
+        m_planet_density(GALAXY_SETUP_MEDIUM),
+        m_specials_freq(GALAXY_SETUP_MEDIUM),
+        m_monster_freq(GALAXY_SETUP_MEDIUM),
+        m_native_freq(GALAXY_SETUP_MEDIUM)
+    {}
     //@}
 
     int                 m_size;
@@ -93,8 +102,19 @@
 struct SaveGameEmpireData
 {
     /** \name Structors */ //@{
-    SaveGameEmpireData(); ///< default ctor.
-    SaveGameEmpireData(int empire_id, const std::string& empire_name, const std::string& player_name, const GG::Clr& colour);
+    SaveGameEmpireData() :
+        m_empire_id(ALL_EMPIRES),
+        m_empire_name(),
+        m_player_name(),
+        m_color()
+    {}
+    SaveGameEmpireData(int empire_id, const std::string& empire_name,
+                       const std::string& player_name, const GG::Clr& colour) :
+        m_empire_id(empire_id),
+        m_empire_name(empire_name),
+        m_player_name(player_name),
+        m_color(colour)
+    {}
     //@}
 
     int         m_empire_id;
@@ -113,7 +133,14 @@
 struct PlayerSetupData
 {
     /** \name Structors */ //@{
-    PlayerSetupData(); ///< default ctor.
+    PlayerSetupData() :
+        m_player_name(),
+        m_empire_name(),
+        m_empire_color(GG::Clr(0, 0, 0, 0)),
+        m_starting_species_name(),
+        m_save_game_empire_id(ALL_EMPIRES),
+        m_client_type(Networking::INVALID_CLIENT_TYPE)
+    {}
     //@}
 
     std::string             m_player_name;          ///< the player's name
@@ -142,7 +169,11 @@
 struct SinglePlayerSetupData : public GalaxySetupData
 {
     /** \name Structors */ //@{
-    SinglePlayerSetupData(); ///< default ctor.
+    SinglePlayerSetupData():
+        m_new_game(true),
+        m_filename(),
+        m_players()
+    {}
     //@}
 
     bool                                m_new_game;
@@ -159,7 +190,13 @@
 struct MultiplayerLobbyData : public GalaxySetupData
 {
     /** \name Structors */ //@{
-    MultiplayerLobbyData(); ///< Default ctor.
+    MultiplayerLobbyData() :
+        m_new_game(true),
+        m_save_file_index(-1),
+        m_players(),
+        m_save_games(),
+        m_save_game_empire_data()
+    {}
     explicit MultiplayerLobbyData(bool build_save_game_list); ///< Basic ctor.
     //@}
 
@@ -179,8 +216,19 @@
 /** Information about one player that other players are informed of.  Assembled by server and sent to players. */
 struct PlayerInfo
 {
-    PlayerInfo();   ///< default ctor
-    PlayerInfo(const std::string& player_name_, int empire_id_, Networking::ClientType client_type_, bool host_);
+    PlayerInfo() :
+        name(""),
+        empire_id(ALL_EMPIRES),
+        client_type(Networking::INVALID_CLIENT_TYPE),
+        host(false)
+    {}
+    PlayerInfo(const std::string& player_name_, int empire_id_,
+               Networking::ClientType client_type_, bool host_) :
+        name(player_name_),
+        empire_id(empire_id_),
+        client_type(client_type_),
+        host(host_)
+    {}
 
     std::string             name;           ///< name of this player (not the same as the empire name)
     int                     empire_id;      ///< id of the player's empire
@@ -198,7 +246,10 @@
     round of combat. */
 struct CombatData
 {
-    CombatData();
+    CombatData() :
+        m_combat_turn_number(0),
+        m_system(0)
+    {}
     CombatData(System* system, std::map<int, std::vector<CombatSetupGroup> >& setup_groups);
 
     unsigned int m_combat_turn_number;
@@ -225,8 +276,26 @@
         PARTIAL_ELLIPSE ///< An angular portion of an ellipse.
     };
 
-    CombatSetupRegion();
-    CombatSetupRegion(float radius_begin, float radius_end);
+    CombatSetupRegion() :
+        m_type(RING),
+        m_radius_begin(),
+        m_radius_end(),
+        m_centroid(),
+        m_radial_axis(),
+        m_tangent_axis(),
+        m_theta_begin(),
+        m_theta_end()
+    {}
+    CombatSetupRegion(float radius_begin, float radius_end) :
+        m_type(RING),
+        m_radius_begin(radius_begin),
+        m_radius_end(radius_end),
+        m_centroid(),
+        m_radial_axis(),
+        m_tangent_axis(),
+        m_theta_begin(),
+        m_theta_end()
+    {}
     CombatSetupRegion(float centroid_x, float centroid_y, float radius);
     CombatSetupRegion(float centroid_x, float centroid_y, float radial_axis, float tangent_axis);
     CombatSetupRegion(float centroid_x, float centroid_y, float radial_axis, float tangent_axis,
@@ -252,7 +321,9 @@
 /** A group of ships and a description of where they may be placed. */
 struct CombatSetupGroup
 {
-    CombatSetupGroup();
+    CombatSetupGroup() :
+        m_allow(false)
+    {}
 
     std::set<int> m_ships;                    ///< The ships in this group.
     std::vector<CombatSetupRegion> m_regions; ///< The regions the ships are/are not allowed in.