[Libreoffice-commits] core.git: Branch 'private/kohei/chart-controller-study' - chart2/Library_chartcore.mk chart2/source

[Kohei Yoshida]

 chart2/Library_chartcore.mk                    |    2 
 chart2/source/view/charttypes/3DBarChart.cxx   |   77 -------------------------
 chart2/source/view/charttypes/GL3DBarChart.cxx |   77 +++++++++++++++++++++++++
 chart2/source/view/inc/3DBarChart.hxx          |   48 ---------------
 chart2/source/view/inc/GL3DBarChart.hxx        |   53 +++++++++++++++++
 chart2/source/view/main/ChartView.cxx          |    4 -
 6 files changed, 133 insertions(+), 128 deletions(-)

New commits:
commit 492715e32ce37e1d4b54f6643cc2dfdb803babcb
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Thu Apr 10 11:45:20 2014 -0400

    Rename 3DBarChart and Bar3DChart to GL3DBarChart.
    
    Change-Id: If0449e00549d8e2f4a8cfac325a5f8c5e4ea3dcd

diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
index 7851bd5..af3b6f3 100644
--- a/chart2/Library_chartcore.mk
+++ b/chart2/Library_chartcore.mk
@@ -86,7 +86,7 @@ $(eval $(call gb_Library_add_exception_objects,chartcore,\
     chart2/source/view/axes/VPolarCoordinateSystem \
     chart2/source/view/axes/VPolarGrid \
     chart2/source/view/axes/VPolarRadiusAxis \
-    chart2/source/view/charttypes/3DBarChart \
+    chart2/source/view/charttypes/GL3DBarChart \
     chart2/source/view/charttypes/AreaChart \
     chart2/source/view/charttypes/BarChart \
     chart2/source/view/charttypes/BarPositionHelper \
diff --git a/chart2/source/view/charttypes/3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx
similarity index 90%
rename from chart2/source/view/charttypes/3DBarChart.cxx
rename to chart2/source/view/charttypes/GL3DBarChart.cxx
index 68f612c..160f40e 100644
--- a/chart2/source/view/charttypes/3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -7,9 +7,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <GL/glew.h>
+#include <GL3DBarChart.hxx>
 
-#include "3DBarChart.hxx"
+#include <GL/glew.h>
 
 #include <glm/glm.hpp>
 #include <glm/gtx/transform.hpp>
@@ -18,17 +18,17 @@
 
 namespace chart {
 
-Bar3DChart::Bar3DChart(const std::vector<VDataSeries*>& rDataSeries):
+GL3DBarChart::GL3DBarChart(const std::vector<VDataSeries*>& rDataSeries):
     maDataSeries(rDataSeries),
     mxContext(new opengl3D::temporary::TemporaryContext())
 {
 }
 
-Bar3DChart::~Bar3DChart()
+GL3DBarChart::~GL3DBarChart()
 {
 }
 
-void Bar3DChart::create3DShapes()
+void GL3DBarChart::create3DShapes()
 {
     const float nBarSizeX = 10;
     const float nBarSizeY = 10;
@@ -61,7 +61,7 @@ void Bar3DChart::create3DShapes()
     }
 }
 
-void Bar3DChart::render()
+void GL3DBarChart::render()
 {
     mxContext->init();
     for(boost::ptr_vector<opengl3D::Renderable3DObject>::iterator itr = maShapes.begin(),
diff --git a/chart2/source/view/inc/3DBarChart.hxx b/chart2/source/view/inc/GL3DBarChart.hxx
similarity index 83%
rename from chart2/source/view/inc/3DBarChart.hxx
rename to chart2/source/view/inc/GL3DBarChart.hxx
index 2f10ce2..6191fc1 100644
--- a/chart2/source/view/inc/3DBarChart.hxx
+++ b/chart2/source/view/inc/GL3DBarChart.hxx
@@ -7,6 +7,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#ifndef CHART2_GL3DBARCHART_HXX
+#define CHART2_GL3DBARCHART_HXX
+
 #include <vector>
 #include <boost/ptr_container/ptr_vector.hpp>
 #include "VDataSeries.hxx"
@@ -25,11 +28,11 @@ class TemporaryContext;
 
 } }
 
-class Bar3DChart
+class GL3DBarChart
 {
 public:
-    Bar3DChart(const std::vector<VDataSeries*>& rDataSeries);
-    ~Bar3DChart();
+    GL3DBarChart(const std::vector<VDataSeries*>& rDataSeries);
+    ~GL3DBarChart();
 
     void create3DShapes();
 
@@ -45,4 +48,6 @@ private:
 
 }
 
+#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index cd60243..da0e30a 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -48,7 +48,7 @@
 #include "DateHelper.hxx"
 #include "defines.hxx"
 #include <unonames.hxx>
-#include "3DBarChart.hxx"
+#include <GL3DBarChart.hxx>
 
 #include <rtl/uuid.h>
 #include <comphelper/scopeguard.hxx>
@@ -3149,7 +3149,7 @@ void ChartView::createShapes3D()
         }
     }
 
-    Bar3DChart aBarChart(aDataSeries);
+    GL3DBarChart aBarChart(aDataSeries);
     aBarChart.create3DShapes();
     aBarChart.render();
 }