report: that gear weights header was a bit overkill... be more

consistent.
yuyuyzl · Dec 17, 2015 · 0d8a20f · 0d8a20f
1 parent badb987
commit 0d8a20f
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 35 deletions.
diff --git a/engine/report/sc_gear_weights.cpp b/engine/report/sc_gear_weights.cpp
@@ -3,7 +3,7 @@
 // Send questions to [email protected]
 // ==========================================================================
 
-#include "sc_gear_weights.hpp"
+#include "sc_report.hpp"
 #include "simulationcraft.hpp"
 
 

diff --git a/engine/report/sc_gear_weights.hpp b/engine/report/sc_gear_weights.hpp
diff --git a/engine/report/sc_report.cpp b/engine/report/sc_report.cpp
@@ -5,7 +5,6 @@
 
 #include "simulationcraft.hpp"
 #include "sc_report.hpp"
-#include "sc_gear_weights.hpp"
 
 // ==========================================================================
 // Report

diff --git a/engine/report/sc_report.hpp b/engine/report/sc_report.hpp
@@ -141,7 +141,7 @@ const rgb EPIC      = "A335EE";
 const rgb LEGENDARY = "FF8000";
 const rgb HEIRLOOM  = "E6CC80";
 
-} /* namespace color */
+}  // color
 
 namespace chart
 {
@@ -177,7 +177,20 @@ bool generate_scaling_plot( highchart::chart_t& bc, const player_t& p,
                             scale_metric_e metric );
 bool generate_reforge_plot( highchart::chart_t& bc, const player_t& p );
 
-}  // end namespace sc_chart
+}  // chart
+
+namespace gear_weights
+{
+/**
+ * The website works, but the link we send out is not usable. If anyone ever
+ * fixes it, just set this to 1.
+ */
+static const bool LOOTRANK_ENABLED = false;
+std::array<std::string, SCALE_METRIC_MAX> lootrank( const player_t& );
+std::array<std::string, SCALE_METRIC_MAX> wowhead( const player_t& );
+std::array<std::string, SCALE_METRIC_MAX> pawn( const player_t& );
+std::array<std::string, SCALE_METRIC_MAX> askmrrobot( const player_t& );
+}  // gear_weights
 
 // Report
 namespace report

diff --git a/engine/report/sc_report_html_player.cpp b/engine/report/sc_report_html_player.cpp
@@ -6,7 +6,6 @@
 #include "simulationcraft.hpp"
 #include "sc_report.hpp"
 #include "sc_highchart.hpp"
-#include "sc_gear_weights.hpp"
 
 namespace
 {  // UNNAMED NAMESPACE ==========================================

diff --git a/engine/report/sc_report_html_sim.cpp b/engine/report/sc_report_html_sim.cpp
@@ -5,7 +5,6 @@
 
 #include "simulationcraft.hpp"
 #include "sc_report.hpp"
-#include "sc_gear_weights.hpp"
 #include "data/report_data.inc"
 #include "interfaces/sc_js.hpp"
 

diff --git a/engine/report/sc_report_text.cpp b/engine/report/sc_report_text.cpp
@@ -5,7 +5,6 @@
 
 #include "simulationcraft.hpp"
 #include "sc_report.hpp"
-#include "sc_gear_weights.hpp"
 
 namespace
 {  // UNNAMED NAMESPACE ==========================================

diff --git a/source_files/QT_engine.pri b/source_files/QT_engine.pri
@@ -15,7 +15,6 @@
  HEADERS += engine/util/cache.hpp
  HEADERS += engine/sim/sc_option.hpp
  HEADERS += engine/report/sc_report.hpp
- HEADERS += engine/report/sc_gear_weights.hpp
  HEADERS += engine/dbc/specialization.hpp
  HEADERS += engine/dbc/dbc.hpp
  PRECOMPILED_HEADER += engine/simulationcraft.hpp

diff --git a/source_files/VS_engine.props b/source_files/VS_engine.props
@@ -18,7 +18,6 @@ To change the list of source files, update the QT_ files and run synchronize.py
 		<ClInclude Include="..\engine\util\cache.hpp" />
 		<ClInclude Include="..\engine\sim\sc_option.hpp" />
 		<ClInclude Include="..\engine\report\sc_report.hpp" />
-		<ClInclude Include="..\engine\report\sc_gear_weights.hpp" />
 		<ClInclude Include="..\engine\dbc\specialization.hpp" />
 		<ClInclude Include="..\engine\dbc\dbc.hpp" />
 		<ClInclude Include="..\engine\simulationcraft.hpp" />

diff --git a/source_files/engine_make b/source_files/engine_make
@@ -15,7 +15,6 @@ SRC += \
     util$(PATHSEP)cache.hpp \
     sim$(PATHSEP)sc_option.hpp \
     report$(PATHSEP)sc_report.hpp \
-    report$(PATHSEP)sc_gear_weights.hpp \
     dbc$(PATHSEP)specialization.hpp \
     dbc$(PATHSEP)dbc.hpp \
     simulationcraft.hpp \