From: <geo...@us...> - 2013-06-13 15:11:08
|
Revision: 6145 http://sourceforge.net/p/freeorion/code/6145 Author: geoffthemedio Date: 2013-06-13 15:11:05 +0000 (Thu, 13 Jun 2013) Log Message: ----------- Patch by adrian_broher moving dump indent stuff into the logger header and source files. Modified Paths: -------------- trunk/FreeOrion/universe/Building.cpp trunk/FreeOrion/universe/Field.cpp trunk/FreeOrion/universe/ShipDesign.cpp trunk/FreeOrion/universe/Special.cpp trunk/FreeOrion/universe/Species.cpp trunk/FreeOrion/universe/Tech.cpp trunk/FreeOrion/universe/ValueRef.cpp trunk/FreeOrion/universe/ValueRef.h trunk/FreeOrion/util/Logger.cpp trunk/FreeOrion/util/Logger.h Modified: trunk/FreeOrion/universe/Building.cpp =================================================================== --- trunk/FreeOrion/universe/Building.cpp 2013-06-13 14:46:17 UTC (rev 6144) +++ trunk/FreeOrion/universe/Building.cpp 2013-06-13 15:11:05 UTC (rev 6145) @@ -16,10 +16,6 @@ #include <boost/filesystem/fstream.hpp> -std::string DumpIndent(); - -extern int g_indent; - namespace { const bool CHEAP_AND_FAST_BUILDING_PRODUCTION = false; // makes all buildings cost 1 PP and take 1 turn to build } Modified: trunk/FreeOrion/universe/Field.cpp =================================================================== --- trunk/FreeOrion/universe/Field.cpp 2013-06-13 14:46:17 UTC (rev 6144) +++ trunk/FreeOrion/universe/Field.cpp 2013-06-13 15:11:05 UTC (rev 6145) @@ -15,10 +15,6 @@ #include <boost/filesystem/fstream.hpp> -std::string DumpIndent(); - -extern int g_indent; - namespace { boost::shared_ptr<const Effect::EffectsGroup> IncreaseMeter(MeterType meter_type, double increase) { Modified: trunk/FreeOrion/universe/ShipDesign.cpp =================================================================== --- trunk/FreeOrion/universe/ShipDesign.cpp 2013-06-13 14:46:17 UTC (rev 6144) +++ trunk/FreeOrion/universe/ShipDesign.cpp 2013-06-13 15:11:05 UTC (rev 6145) @@ -16,10 +16,6 @@ #include <cfloat> #include <boost/filesystem/fstream.hpp> -std::string DumpIndent(); - -extern int g_indent; - namespace { const bool CHEAP_AND_FAST_SHIP_PRODUCTION = false; // makes all ships cost 1 PP and take 1 turn to build } Modified: trunk/FreeOrion/universe/Special.cpp =================================================================== --- trunk/FreeOrion/universe/Special.cpp 2013-06-13 14:46:17 UTC (rev 6144) +++ trunk/FreeOrion/universe/Special.cpp 2013-06-13 15:11:05 UTC (rev 6145) @@ -9,10 +9,6 @@ #include <boost/filesystem/fstream.hpp> -std::string DumpIndent(); - -extern int g_indent; - namespace { class SpecialManager { public: Modified: trunk/FreeOrion/universe/Species.cpp =================================================================== --- trunk/FreeOrion/universe/Species.cpp 2013-06-13 14:46:17 UTC (rev 6144) +++ trunk/FreeOrion/universe/Species.cpp 2013-06-13 15:11:05 UTC (rev 6145) @@ -10,11 +10,6 @@ #include <boost/filesystem/fstream.hpp> -std::string DumpIndent(); - -extern int g_indent; - - ///////////////////////////////////////////////// // FocusType // ///////////////////////////////////////////////// Modified: trunk/FreeOrion/universe/Tech.cpp =================================================================== --- trunk/FreeOrion/universe/Tech.cpp 2013-06-13 14:46:17 UTC (rev 6144) +++ trunk/FreeOrion/universe/Tech.cpp 2013-06-13 15:11:05 UTC (rev 6145) @@ -14,10 +14,6 @@ #include <boost/lexical_cast.hpp> #include <boost/filesystem/fstream.hpp> -std::string DumpIndent(); - -extern int g_indent; - namespace { const bool CHEAP_AND_FAST_TECH_RESEARCH = false; // makes all techs cost 1 RP and take 1 turn to research } Modified: trunk/FreeOrion/universe/ValueRef.cpp =================================================================== --- trunk/FreeOrion/universe/ValueRef.cpp 2013-06-13 14:46:17 UTC (rev 6144) +++ trunk/FreeOrion/universe/ValueRef.cpp 2013-06-13 15:11:05 UTC (rev 6145) @@ -20,8 +20,6 @@ #include <boost/algorithm/string/classification.hpp> #include <boost/algorithm/string/split.hpp> -int g_indent = 0; - namespace { const UniverseObject* FollowReference(std::vector<adobe::name_t>::const_iterator first, std::vector<adobe::name_t>::const_iterator last, @@ -906,6 +904,3 @@ } } } - -std::string DumpIndent() -{ return std::string(g_indent * 4, ' '); } Modified: trunk/FreeOrion/universe/ValueRef.h =================================================================== --- trunk/FreeOrion/universe/ValueRef.h 2013-06-13 14:46:17 UTC (rev 6144) +++ trunk/FreeOrion/universe/ValueRef.h 2013-06-13 15:11:05 UTC (rev 6145) @@ -321,11 +321,6 @@ void serialize(Archive& ar, const unsigned int version); }; -/** A function that returns the correct amount of spacing for the current - * indentation level during a dump. Note that this function is used by - * several units (Condition.cpp, Effect.cpp, etc.), not just this one. */ -std::string DumpIndent(); - namespace ValueRef { std::string ReconstructName(const std::vector<adobe::name_t>& property_name, ReferenceType ref_type); Modified: trunk/FreeOrion/util/Logger.cpp =================================================================== --- trunk/FreeOrion/util/Logger.cpp 2013-06-13 14:46:17 UTC (rev 6144) +++ trunk/FreeOrion/util/Logger.cpp 2013-06-13 15:11:05 UTC (rev 6145) @@ -7,6 +7,11 @@ #include <log4cpp/PatternLayout.hh> #include <log4cpp/FileAppender.hh> +int g_indent = 0; + +std::string DumpIndent() +{ return std::string(g_indent * 4, ' '); } + void InitLogger(const std::string& logFile, const std::string& pattern) { // a platform-independent way to erase the old log Modified: trunk/FreeOrion/util/Logger.h =================================================================== --- trunk/FreeOrion/util/Logger.h 2013-06-13 14:46:17 UTC (rev 6144) +++ trunk/FreeOrion/util/Logger.h 2013-06-13 15:11:05 UTC (rev 6145) @@ -11,6 +11,12 @@ /** Accessor for the App's logger */ log4cpp::Category& Logger(); +extern int g_indent; + +/** A function that returns the correct amount of spacing for the current + * indentation level during a dump. */ +std::string DumpIndent(); + /** Returns the integer priority level that should be passed to log4cpp for a given priority name string. */ int PriorityValue(const std::string& name); |