[dia] [symmetry] data_remove_layer.c() not data_delete_layer.c()

[Hans Breuer <hans src gnome org>]

commit 8713fc79d15773d30e6ba80d4732435c5454e31a
Author: Hans Breuer <hans breuer org>
Date:   Sat Oct 6 20:54:32 2012 +0200

    [symmetry] data_remove_layer.c() not data_delete_layer.c()
    
    it's also layer_remove_object() and g_ptr_array_remove() ;)

 app/layer_dialog.c                  |    6 +++---
 lib/diagramdata.c                   |    8 ++++----
 lib/diagramdata.h                   |    2 +-
 lib/libdia.def                      |    2 +-
 plug-ins/python/pydia-diagramdata.c |    2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/app/layer_dialog.c b/app/layer_dialog.c
index 4ffa4b9..d0f92f6 100644
--- a/app/layer_dialog.c
+++ b/app/layer_dialog.c
@@ -558,7 +558,7 @@ layer_dialog_delete_callback(GtkWidget *widget, gpointer gdata)
 
     layer = dia->data->active_layer;
 
-    data_delete_layer(dia->data, layer);
+    data_remove_layer(dia->data, layer);
     diagram_add_update_all(dia);
     diagram_flush(dia);
     
@@ -1287,7 +1287,7 @@ layer_change_apply(struct LayerChange *change, Diagram *dia)
 
   switch (change->type) {
   case TYPE_DELETE_LAYER:
-    data_delete_layer(dia->data, change->layer);
+    data_remove_layer(dia->data, change->layer);
     break;
   case TYPE_ADD_LAYER:
     data_add_layer_at(dia->data, change->layer, change->index);
@@ -1315,7 +1315,7 @@ layer_change_revert(struct LayerChange *change, Diagram *dia)
     data_add_layer_at(dia->data, change->layer, change->index);
     break;
   case TYPE_ADD_LAYER:
-    data_delete_layer(dia->data, change->layer);
+    data_remove_layer(dia->data, change->layer);
     break;
   case TYPE_RAISE_LAYER:
     data_lower_layer(dia->data, change->layer);
diff --git a/lib/diagramdata.c b/lib/diagramdata.c
index 0fa70a4..a384f05 100644
--- a/lib/diagramdata.c
+++ b/lib/diagramdata.c
@@ -452,13 +452,13 @@ data_set_active_layer(DiagramData *data, Layer *layer)
 }
 
 /*!
- * \brief Delete a layer from a diagram.
- * @param data The diagram to delete the layer from.
- * @param layer The layer to delete.
+ * \brief Remove a layer from a diagram.
+ * @param data The diagram to remove the layer from.
+ * @param layer The layer to remove.
  * \memberof _DiagramData
  */
 void
-data_delete_layer(DiagramData *data, Layer *layer)
+data_remove_layer(DiagramData *data, Layer *layer)
 {
   if (data->layers->len<=1)
     return;
diff --git a/lib/diagramdata.h b/lib/diagramdata.h
index a512b18..c2376b1 100644
--- a/lib/diagramdata.h
+++ b/lib/diagramdata.h
@@ -144,7 +144,7 @@ void data_lower_layer(DiagramData *data, Layer *layer);
 void data_add_layer(DiagramData *data, Layer *layer);
 void data_add_layer_at(DiagramData *data, Layer *layer, int pos);
 void data_set_active_layer(DiagramData *data, Layer *layer);
-void data_delete_layer(DiagramData *data, Layer *layer);
+void data_remove_layer(DiagramData *data, Layer *layer);
 int  data_layer_get_index (const DiagramData *data, const Layer *layer);
 int data_layer_count(const DiagramData *data);
 Layer *data_layer_get_nth (const DiagramData *data, guint index);
diff --git a/lib/libdia.def b/lib/libdia.def
index 808dcd8..3fe1568 100644
--- a/lib/libdia.def
+++ b/lib/libdia.def
@@ -151,7 +151,7 @@ EXPORTS
  data_add_text
  data_boolean
  data_color
- data_delete_layer
+ data_remove_layer
  data_dict
  data_emit
  data_enum
diff --git a/plug-ins/python/pydia-diagramdata.c b/plug-ins/python/pydia-diagramdata.c
index 5ee698f..ffa63cc 100644
--- a/plug-ins/python/pydia-diagramdata.c
+++ b/plug-ins/python/pydia-diagramdata.c
@@ -173,7 +173,7 @@ PyDiaDiagramData_DeleteLayer(PyDiaDiagramData *self, PyObject *args)
     if (!PyArg_ParseTuple(args, "O!:DiagramData.delete_layer",
 			  &PyDiaLayer_Type, &layer))
 	return NULL;
-    data_delete_layer(self->data, layer->layer);
+    data_remove_layer(self->data, layer->layer);
     layer_destroy(layer->layer);
     layer->layer = NULL;
     Py_INCREF(Py_None);