Rename branch

(bzr r13645.1.145)

4 files changed, 19 insertions, 20 deletions

diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt
index aa99934b6..92709e4e9 100644
--- a/src/helper/CMakeLists.txt
+++ b/src/helper/CMakeLists.txt
@@ -14,7 +14,7 @@ set(helper_SRC
 	geom.cpp
 	geom-nodetype.cpp
 	geom-pathstroke.cpp
-	geom-pointwise.cpp
+	geom-pathvectorsatellites.cpp
 	geom-satellite.cpp
 	gnome-utils.cpp
 	pixbuf-ops.cpp
@@ -34,7 +34,7 @@ set(helper_SRC
 	geom-curves.h
 	geom-nodetype.h
 	geom-pathstroke.h
-	geom-pointwise.h
+	geom-pathvectorsatellites.h
 	geom-satellite.h
 	geom.h
 	gnome-utils.h
diff --git a/src/helper/Makefile_insert b/src/helper/Makefile_insert
index 54588d0ce..6ba0efbfa 100644
--- a/src/helper/Makefile_insert
+++ b/src/helper/Makefile_insert
@@ -14,8 +14,8 @@ ink_common_sources +=	\
 	helper/geom-nodetype.h	\
 	helper/geom-pathstroke.cpp      \
 	helper/geom-pathstroke.h        \
-	helper/geom-pointwise.cpp	\
-	helper/geom-pointwise.h	\
+	helper/geom-pathvectorsatellites.cpp	\
+	helper/geom-pathvectorsatellites.h	\
 	helper/geom-satellite.cpp	\
 	helper/geom-satellite.h	\
 	helper/gnome-utils.cpp	\
diff --git a/src/helper/geom-pointwise.cpp b/src/helper/geom-pathvectorsatellites.cpp
index 5531bb849..a5207ab00 100644
--- a/src/helper/geom-pointwise.cpp
+++ b/src/helper/geom-pathvectorsatellites.cpp
@@ -1,6 +1,6 @@
 /**
  * \file
- * \brief Pointwise a class to manage a vector of satellites per piecewise node
+ * \brief PathVectorSatellites a class to manage a vector of satellites per piecewise node
  */ /*
     * Authors:
     * Jabiertxof
@@ -14,28 +14,28 @@
     * This code is in public domain
     */
 
-#include <helper/geom-pointwise.h>
-Geom::PathVector Pointwise::getPathVector() const
+#include <helper/geom-pathvectorsatellites.h>
+Geom::PathVector PathVectorSatellites::getPathVector() const
 {
     return _pathvector;
 }
 
-void Pointwise::setPathVector(Geom::PathVector pathv)
+void PathVectorSatellites::setPathVector(Geom::PathVector pathv)
 {
     _pathvector = pathv;
 }
 
-Satellites Pointwise::getSatellites()
+Satellites PathVectorSatellites::getSatellites()
 {
     return _satellites;
 }
 
-void Pointwise::setSatellites(Satellites satellites)
+void PathVectorSatellites::setSatellites(Satellites satellites)
 {
     _satellites = satellites;
 }
 
-size_t Pointwise::getTotalSatellites()
+size_t PathVectorSatellites::getTotalSatellites()
 {
     size_t counter = 0;
     for (size_t i = 0; i < _satellites.size(); ++i) {
@@ -46,7 +46,7 @@ size_t Pointwise::getTotalSatellites()
     return counter;
 }
 
-void Pointwise::recalculateForNewPathVector(Geom::PathVector const pathv, Satellite const S)
+void PathVectorSatellites::recalculateForNewPathVector(Geom::PathVector const pathv, Satellite const S)
 {
     Satellites satellites;
     for (size_t i = 0; i < pathv.size(); i++) {
diff --git a/src/helper/geom-pointwise.h b/src/helper/geom-pathvectorsatellites.h
index 599234473..72ecef38f 100644
--- a/src/helper/geom-pointwise.h
+++ b/src/helper/geom-pathvectorsatellites.h
@@ -1,6 +1,6 @@
 /**
  * \file
- * \brief Pointwise a class to manage a vector of satellites per piecewise node
+ * \brief PathVectorSatellites a class to manage a vector of satellites per piecewise node
  */ /*
     * Authors:
     * Jabiertxof
@@ -14,32 +14,31 @@
     * This code is in public domain
     */
 
-#ifndef SEEN_POINTWISE_H
-#define SEEN_POINTWISE_H
+#ifndef SEEN_PATHVECTORSATELLITES_H
+#define SEEN_PATHVECTORSATELLITES_H
 
 #include <helper/geom-satellite.h>
 #include <2geom/path.h>
 #include <2geom/pathvector.h>
-#include <boost/optional.hpp>
 
 /**
- * @brief Pointwise a class to manage a vector of satellites per curve
+ * @brief PathVectorSatellites a class to manage a vector of satellites per curve
  */
 typedef std::vector<std::vector<Satellite> > Satellites;
-class Pointwise {
+class PathVectorSatellites {
 public:
     Geom::PathVector getPathVector() const;
     void setPathVector(Geom::PathVector pathv);
     Satellites getSatellites();
-    size_t getTotalSatellites();
     void setSatellites(Satellites satellites);
+    size_t getTotalSatellites();
     void recalculateForNewPathVector(Geom::PathVector const pathv, Satellite const S);
 private:
     Geom::PathVector _pathvector;
     Satellites _satellites;
 };
 
-#endif //SEEN_POINTWISE_H
+#endif //SEEN_PATHVECTORSATELLITES_H
 /*
   Local Variables:
   mode:c++