Rename <mesh> to <meshgradient> per SVG 2 CR specificiation.

Note: <mesh> has been repurposed to be a special shape that tightly wraps a mesh gradient.

(bzr r15137)

2 files changed, 14 insertions, 14 deletions

diff --git a/src/widgets/mesh-toolbar.cpp b/src/widgets/mesh-toolbar.cpp
index fb540b5f5..0e689fee0 100644
--- a/src/widgets/mesh-toolbar.cpp
+++ b/src/widgets/mesh-toolbar.cpp
@@ -41,7 +41,7 @@
 #include "ui/tools/gradient-tool.h"
 #include "ui/tools/mesh-tool.h"
 #include "gradient-drag.h"
-#include "sp-mesh.h"
+#include "sp-mesh-gradient.h"
 #include "gradient-chemistry.h"
 #include "ui/icon-names.h"
 
@@ -70,7 +70,7 @@ static bool blocked = false;
  * Get the current selection and dragger status from the desktop
  */
 void ms_read_selection( Inkscape::Selection *selection,
-                        SPMesh *&ms_selected,
+                        SPMeshGradient *&ms_selected,
                         bool &ms_selected_multi,
                         SPMeshType &ms_type,
                         bool &ms_type_multi )
@@ -87,9 +87,9 @@ void ms_read_selection( Inkscape::Selection *selection,
 
         if (style && (style->fill.isPaintserver())) {
             SPPaintServer *server = item->style->getFillPaintServer();
-            if ( SP_IS_MESH(server) ) {
+            if ( SP_IS_MESHGRADIENT(server) ) {
 
-                SPMesh *gradient = SP_MESH(server); // ->getVector();
+                SPMeshGradient *gradient = SP_MESHGRADIENT(server); // ->getVector();
                 SPMeshType type = gradient->type;
 
                 if (gradient != ms_selected) {
@@ -112,9 +112,9 @@ void ms_read_selection( Inkscape::Selection *selection,
 
         if (style && (style->stroke.isPaintserver())) {
             SPPaintServer *server = item->style->getStrokePaintServer();
-            if ( SP_IS_MESH(server) ) {
+            if ( SP_IS_MESHGRADIENT(server) ) {
 
-                SPMesh *gradient = SP_MESH(server); // ->getVector();
+                SPMeshGradient *gradient = SP_MESHGRADIENT(server); // ->getVector();
                 SPMeshType type = gradient->type;
 
                 if (gradient != ms_selected) {
@@ -164,7 +164,7 @@ static void ms_tb_selection_changed(Inkscape::Selection * /*selection*/, gpointe
         //     // Hide/show handles?
         // }
 
-        SPMesh *ms_selected = 0;
+        SPMeshGradient *ms_selected = 0;
         SPMeshType ms_type = SP_MESH_TYPE_COONS;
         bool ms_selected_multi = false;
         bool ms_type_multi = false; 
@@ -203,9 +203,9 @@ static void ms_defs_modified(SPObject * /*defs*/, guint /*flags*/, GObject *widg
     ms_tb_selection_changed(NULL, widget);
 }
 
-void ms_get_dt_selected_gradient(Inkscape::Selection *selection, SPMesh *&ms_selected)
+void ms_get_dt_selected_gradient(Inkscape::Selection *selection, SPMeshGradient *&ms_selected)
 {
-    SPMesh *gradient = 0;
+    SPMeshGradient *gradient = 0;
 
     auto itemlist= selection->items();
     for(auto i=itemlist.begin();i!=itemlist.end();++i){
@@ -220,8 +220,8 @@ void ms_get_dt_selected_gradient(Inkscape::Selection *selection, SPMesh *&ms_sel
              server = item->style->getStrokePaintServer();
          }
 
-         if ( SP_IS_MESH(server) ) {
-             gradient = SP_MESH(server);
+         if ( SP_IS_MESHGRADIENT(server) ) {
+             gradient = SP_MESHGRADIENT(server);
          }
     }
 
@@ -295,7 +295,7 @@ static void ms_type_changed(EgeSelectOneAction *act, GtkWidget *widget)
 
     SPDesktop *desktop = static_cast<SPDesktop *>(g_object_get_data(G_OBJECT(widget), "desktop"));
     Inkscape::Selection *selection = desktop->getSelection();
-    SPMesh *gradient = 0;
+    SPMeshGradient *gradient = 0;
     ms_get_dt_selected_gradient(selection, gradient);
 
     if (gradient) {
diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp
index 01118f337..ddac90730 100644
--- a/src/widgets/paint-selector.cpp
+++ b/src/widgets/paint-selector.cpp
@@ -33,7 +33,7 @@
 
 #include "sp-linear-gradient.h"
 #include "sp-radial-gradient.h"
-#include "sp-mesh.h"
+#include "sp-mesh-gradient.h"
 #include "sp-stop.h"
 /* fixme: Move it from dialogs to here */
 #include "gradient-selector.h"
@@ -1221,7 +1221,7 @@ SPPaintSelector::Mode SPPaintSelector::getModeForStyle(SPStyle const & style, Fi
         } else if (SP_IS_RADIALGRADIENT(server)) {
             mode = MODE_GRADIENT_RADIAL;
 #ifdef WITH_MESH
-        } else if (SP_IS_MESH(server)) {
+        } else if (SP_IS_MESHGRADIENT(server)) {
             mode = MODE_GRADIENT_MESH;
 #endif
         } else if (SP_IS_PATTERN(server)) {