[dia] [warningectomy] passing argument from incompatible pointer type
- From: Hans Breuer <hans src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dia] [warningectomy] passing argument from incompatible pointer type
- Date: Sat, 4 May 2013 19:00:40 +0000 (UTC)
commit 1707d4d23e6aebf9f3ed3ddf75ff3224dc55f963
Author: Hans Breuer <hans breuer org>
Date: Sat May 4 18:33:49 2013 +0200
[warningectomy] passing argument from incompatible pointer type
- make all xpm static const
- adapt SheetObject and DiaObjectType pixmap constness
also for all in objects/ to match
gdk_pixbuf_new_from_xpm_data(const gchar**)
- cast for gdk_pixmap_colormap_create_from_xpm_d(gchar **)
app/pixmaps/landscape.xpm | 2 +-
app/pixmaps/missing.xpm | 2 +-
app/pixmaps/portrait.xpm | 2 +-
app/sheets.c | 6 +++---
app/toolbox.c | 18 +++++++++---------
app/toolbox.h | 2 +-
lib/object.h | 6 +++---
lib/sheet.h | 2 +-
lib/standard-path.c | 2 +-
objects/AADL/aadlbox.c | 8 ++++----
objects/AADL/aadlbus.c | 11 +++++------
objects/AADL/aadldata.c | 11 +++++------
objects/AADL/aadldevice.c | 11 +++++------
objects/AADL/aadlmemory.c | 11 +++++------
objects/AADL/aadlpackage.c | 8 ++++----
objects/AADL/aadlprocess.c | 9 ++++-----
objects/AADL/aadlprocessor.c | 11 +++++------
objects/AADL/aadlsubprogram.c | 11 +++++------
objects/AADL/aadlsystem.c | 10 +++++-----
objects/AADL/aadlthread.c | 10 +++++-----
objects/AADL/aadlthreadgroup.c | 10 +++++-----
objects/AADL/pixmaps/aadlbus.xpm | 2 +-
objects/AADL/pixmaps/aadldata.xpm | 2 +-
objects/AADL/pixmaps/aadldevice.xpm | 2 +-
objects/AADL/pixmaps/aadlmemory.xpm | 2 +-
objects/AADL/pixmaps/aadlpackage.xpm | 2 +-
objects/AADL/pixmaps/aadlprocess.xpm | 2 +-
objects/AADL/pixmaps/aadlprocessor.xpm | 2 +-
objects/AADL/pixmaps/aadlsubprogram.xpm | 2 +-
objects/AADL/pixmaps/aadlsystem.xpm | 2 +-
objects/AADL/pixmaps/aadlthread.xpm | 2 +-
objects/AADL/pixmaps/aadlthreadgroup.xpm | 2 +-
objects/Database/compound.c | 10 ++++------
objects/Database/pixmaps/compound.xpm | 2 +-
objects/Database/pixmaps/reference.xpm | 2 +-
objects/Database/pixmaps/table.xpm | 2 +-
objects/Database/reference.c | 12 ++++++------
objects/Database/table.c | 8 +++-----
objects/ER/attribute.c | 9 ++++-----
objects/ER/entity.c | 7 +++----
objects/ER/participation.c | 9 ++++-----
objects/ER/pixmaps/attribute.xpm | 2 +-
objects/ER/pixmaps/entity.xpm | 2 +-
objects/ER/pixmaps/participation.xpm | 2 +-
objects/ER/pixmaps/relationship.xpm | 2 +-
objects/ER/relationship.c | 5 ++---
objects/FS/flow-ortho.c | 8 ++++----
objects/FS/flow.c | 8 ++++----
objects/FS/function.c | 9 ++++-----
objects/FS/pixmaps/flow.xpm | 2 +-
objects/FS/pixmaps/function.xpm | 2 +-
objects/FS/pixmaps/orthflow.xpm | 2 +-
objects/GRAFCET/action.c | 9 ++++-----
objects/GRAFCET/condition.c | 9 ++++-----
objects/GRAFCET/pixmaps/action.xpm | 2 +-
objects/GRAFCET/pixmaps/condition.xpm | 2 +-
objects/GRAFCET/pixmaps/etape.xpm | 2 +-
objects/GRAFCET/pixmaps/transition.xpm | 2 +-
objects/GRAFCET/pixmaps/vector.xpm | 2 +-
objects/GRAFCET/pixmaps/vergent.xpm | 2 +-
objects/GRAFCET/step.c | 9 ++++-----
objects/GRAFCET/transition.c | 9 ++++-----
objects/GRAFCET/vector.c | 14 ++++++--------
objects/GRAFCET/vergent.c | 9 ++++-----
objects/Istar/actor.c | 9 ++++-----
objects/Istar/goal.c | 8 ++++----
objects/Istar/link.c | 8 ++++----
objects/Istar/other.c | 8 ++++----
objects/Istar/pixmaps/actor.xpm | 2 +-
objects/Istar/pixmaps/link.xpm | 4 ++--
objects/Istar/pixmaps/resource.xpm | 2 +-
objects/Istar/pixmaps/softgoal.xpm | 4 ++--
objects/Jackson/domain.c | 8 ++++----
objects/Jackson/phenomenon.c | 6 +++---
objects/Jackson/pixmaps/given_domain.xpm | 2 +-
objects/Jackson/pixmaps/requirement.xpm | 4 ++--
objects/Jackson/pixmaps/shared_phen.xpm | 2 +-
objects/Jackson/requirement.c | 5 ++---
objects/KAOS/goal.c | 8 ++++----
objects/KAOS/metaandorrel.c | 8 ++++----
objects/KAOS/metabinrel.c | 8 ++++----
objects/KAOS/other.c | 8 ++++----
objects/KAOS/pixmaps/agent.xpm | 4 ++--
objects/KAOS/pixmaps/broken.xpm | 2 +-
objects/KAOS/pixmaps/contributes.xpm | 4 ++--
objects/KAOS/pixmaps/goal.xpm | 4 ++--
objects/KAOS/pixmaps/mid_conflicts.xpm | 4 ++--
objects/KAOS/pixmaps/mid_controls.xpm | 4 ++--
objects/KAOS/pixmaps/mid_monitors.xpm | 4 ++--
objects/KAOS/pixmaps/mid_obstructs.xpm | 4 ++--
objects/Misc/analog_clock.c | 9 ++++-----
objects/Misc/diagram_as_object.c | 10 +++++-----
objects/Misc/grid_object.c | 9 ++++-----
objects/Misc/measure.c | 13 ++++++-------
objects/Misc/pixmaps/analog_clock.xpm | 2 +-
objects/Misc/pixmaps/diagram_as_element.xpm | 2 +-
objects/Misc/pixmaps/grid_object.xpm | 2 +-
objects/Misc/pixmaps/measure.xpm | 2 +-
objects/Misc/pixmaps/newgroup.xpm | 2 +-
objects/Misc/pixmaps/tree.xpm | 2 +-
objects/Misc/tree.c | 8 ++++----
objects/SADT/annotation.c | 8 ++++----
objects/SADT/arrow.c | 9 ++++-----
objects/SADT/box.c | 9 ++++-----
objects/SADT/pixmaps/annotation.xpm | 2 +-
objects/SADT/pixmaps/arrow.xpm | 2 +-
objects/SADT/pixmaps/sadtbox.xpm | 2 +-
objects/UML/activity.c | 2 +-
objects/UML/actor.c | 9 ++++-----
objects/UML/association.c | 3 +--
objects/UML/branch.c | 9 ++++-----
objects/UML/class.c | 6 +++---
objects/UML/classicon.c | 9 ++++-----
objects/UML/component.c | 9 ++++-----
objects/UML/component_feature.c | 12 ++++++------
objects/UML/constraint.c | 8 ++++----
objects/UML/dependency.c | 7 +++----
objects/UML/fork.c | 9 ++++-----
objects/UML/generalization.c | 13 ++++++-------
objects/UML/implements.c | 8 ++++----
objects/UML/large_package.c | 9 ++++-----
objects/UML/lifeline.c | 8 ++++----
objects/UML/message.c | 8 ++++----
objects/UML/node.c | 9 ++++-----
objects/UML/note.c | 9 ++++-----
objects/UML/object.c | 18 ++++++++----------
objects/UML/pixmaps/activity.xpm | 2 +-
objects/UML/pixmaps/actor.xpm | 2 +-
objects/UML/pixmaps/association.xpm | 2 +-
objects/UML/pixmaps/branch.xpm | 2 +-
objects/UML/pixmaps/case.xpm | 2 +-
objects/UML/pixmaps/classicon.xpm | 2 +-
objects/UML/pixmaps/component.xpm | 2 +-
objects/UML/pixmaps/constraint.xpm | 2 +-
objects/UML/pixmaps/dependency.xpm | 2 +-
objects/UML/pixmaps/facet.xpm | 2 +-
objects/UML/pixmaps/fork.xpm | 2 +-
objects/UML/pixmaps/generalization.xpm | 2 +-
objects/UML/pixmaps/implements.xpm | 2 +-
objects/UML/pixmaps/largepackage.xpm | 2 +-
objects/UML/pixmaps/lifeline.xpm | 2 +-
objects/UML/pixmaps/message.xpm | 2 +-
objects/UML/pixmaps/node.xpm | 2 +-
objects/UML/pixmaps/note.xpm | 2 +-
objects/UML/pixmaps/object.xpm | 2 +-
objects/UML/pixmaps/realizes.xpm | 2 +-
objects/UML/pixmaps/smallpackage.xpm | 2 +-
objects/UML/pixmaps/state.xpm | 2 +-
objects/UML/pixmaps/state_term.xpm | 2 +-
objects/UML/pixmaps/transition.xpm | 2 +-
objects/UML/pixmaps/umlclass.xpm | 2 +-
objects/UML/realizes.c | 11 +++++------
objects/UML/small_package.c | 9 ++++-----
objects/UML/state.c | 9 ++++-----
objects/UML/state_term.c | 9 ++++-----
objects/UML/transition.c | 2 +-
objects/UML/usecase.c | 9 ++++-----
objects/chronogram/chronoline.c | 9 ++++-----
objects/chronogram/chronoref.c | 9 ++++-----
objects/chronogram/pixmaps/chronoline.xpm | 2 +-
objects/chronogram/pixmaps/chronoref.xpm | 2 +-
objects/custom/custom_object.c | 8 ++++----
objects/custom/pixmaps/custom.xpm | 2 +-
objects/custom_lines/pixmaps/default.xpm | 2 +-
objects/flowchart/box.c | 9 ++++-----
objects/flowchart/diamond.c | 9 ++++-----
objects/flowchart/ellipse.c | 9 ++++-----
objects/flowchart/parallelogram.c | 9 ++++-----
objects/flowchart/pixmaps/box.xpm | 2 +-
objects/flowchart/pixmaps/diamond.xpm | 2 +-
objects/flowchart/pixmaps/ellipse.xpm | 2 +-
objects/flowchart/pixmaps/pgram.xpm | 2 +-
objects/network/basestation.c | 2 +-
objects/network/bus.c | 4 ++--
objects/network/radiocell.c | 2 +-
objects/network/wanlink.c | 2 +-
objects/standard/arc.c | 2 +-
objects/standard/bezier.c | 2 +-
objects/standard/beziergon.c | 2 +-
objects/standard/box.c | 2 +-
objects/standard/ellipse.c | 2 +-
objects/standard/image.c | 2 +-
objects/standard/line.c | 2 +-
objects/standard/outline.c | 2 +-
objects/standard/polygon.c | 2 +-
objects/standard/polyline.c | 2 +-
objects/standard/textobj.c | 2 +-
objects/standard/zigzagline.c | 2 +-
188 files changed, 455 insertions(+), 509 deletions(-)
---
diff --git a/app/pixmaps/landscape.xpm b/app/pixmaps/landscape.xpm
index f31d529..08338eb 100644
--- a/app/pixmaps/landscape.xpm
+++ b/app/pixmaps/landscape.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * landscape_xpm[] = {
+static const char * landscape_xpm[] = {
"40 30 3 1",
" c None",
". c #000000",
diff --git a/app/pixmaps/missing.xpm b/app/pixmaps/missing.xpm
index 4b9919c..741b9ca 100644
--- a/app/pixmaps/missing.xpm
+++ b/app/pixmaps/missing.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *missing[] = {
+static const char *missing[] = {
/* columns rows colors chars-per-pixel */
"24 24 142 2",
" c black",
diff --git a/app/pixmaps/portrait.xpm b/app/pixmaps/portrait.xpm
index cc3a6b9..2e45c6b 100644
--- a/app/pixmaps/portrait.xpm
+++ b/app/pixmaps/portrait.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * portrait_xpm[] = {
+static const char * portrait_xpm[] = {
"30 40 3 1",
" c None",
". c #000000",
diff --git a/app/sheets.c b/app/sheets.c
index 102175d..d5d6965 100644
--- a/app/sheets.c
+++ b/app/sheets.c
@@ -107,7 +107,7 @@ static gint
menu_item_compare_labels(gconstpointer a, gconstpointer b)
{
GList *a_list;
- gchar *label;
+ const gchar *label;
a_list = gtk_container_get_children(GTK_CONTAINER(GTK_MENU_ITEM(a)));
g_assert(g_list_length(a_list) == 1);
@@ -338,7 +338,7 @@ create_object_pixmap(SheetObject *so, GtkWidget *parent,
gtk_widget_get_colormap(parent),
mask,
&style->bg[GTK_STATE_NORMAL],
- so->pixmap);
+ (gchar **)so->pixmap);
}
else
{
@@ -372,7 +372,7 @@ create_object_pixmap(SheetObject *so, GtkWidget *parent,
gtk_widget_get_colormap(parent),
mask,
&style->bg[GTK_STATE_NORMAL],
- missing);
+ (gchar **)missing);
}
}
else
diff --git a/app/toolbox.c b/app/toolbox.c
index b7130a8..cb9c03c 100644
--- a/app/toolbox.c
+++ b/app/toolbox.c
@@ -70,25 +70,25 @@ static GSList *tool_group = NULL;
ToolButton tool_data[] =
{
- { (char **) dia_modify_tool_icon,
+ { (const gchar **) dia_modify_tool_icon,
N_("Modify object(s)\nUse <Space> to toggle between this and other tools"),
NULL,
"ToolsModify",
{ MODIFY_TOOL, NULL, NULL}
},
- { (char **) dia_textedit_tool_icon,
+ { (const gchar **) dia_textedit_tool_icon,
N_("Text edit(s)\nUse <Esc> to leave this tool"),
"F2",
"ToolsTextedit",
{ TEXTEDIT_TOOL, NULL, NULL}
},
- { (char **) dia_zoom_tool_icon,
+ { (const gchar **) dia_zoom_tool_icon,
N_("Magnify"),
"M",
"ToolsMagnify",
{ MAGNIFY_TOOL, NULL, NULL}
},
- { (char **) dia_scroll_tool_icon,
+ { (const gchar **) dia_scroll_tool_icon,
N_("Scroll around the diagram"),
"S",
"ToolsScroll",
@@ -598,7 +598,7 @@ GdkPixbuf *
tool_get_pixbuf (ToolButton *tb)
{
GdkPixbuf *pixbuf;
- gchar **icon_data;
+ const gchar **icon_data;
if (tb->icon_data==NULL) {
DiaObjectType *type;
@@ -615,7 +615,7 @@ tool_get_pixbuf (ToolButton *tb)
if (strncmp((char*)icon_data, "GdkP", 4) == 0) {
pixbuf = gdk_pixbuf_new_from_inline(-1, (guint8*)icon_data, TRUE, NULL);
} else {
- char **pixmap_data = icon_data;
+ const char **pixmap_data = icon_data;
pixbuf = gdk_pixbuf_new_from_xpm_data (pixmap_data);
}
return pixbuf;
@@ -627,7 +627,7 @@ tool_get_pixbuf (ToolButton *tb)
* the difference between char* and char** - most of the time ;)
*/
static GtkWidget *
-create_widget_from_xpm_or_gdkp(gchar **icon_data, GtkWidget *button, GdkPixbuf **pb_out)
+create_widget_from_xpm_or_gdkp(const char **icon_data, GtkWidget *button, GdkPixbuf **pb_out)
{
GtkWidget *pixmapwidget;
@@ -636,7 +636,7 @@ create_widget_from_xpm_or_gdkp(gchar **icon_data, GtkWidget *button, GdkPixbuf *
*pb_out = p = gdk_pixbuf_new_from_inline(-1, (guint8*)icon_data, TRUE, NULL);
pixmapwidget = gtk_image_new_from_pixbuf(p);
} else {
- char **pixmap_data = icon_data;
+ const char **pixmap_data = icon_data;
*pb_out = gdk_pixbuf_new_from_xpm_data (pixmap_data);
pixmapwidget = gtk_image_new_from_pixbuf (*pb_out);
}
@@ -650,7 +650,7 @@ create_tools(GtkWidget *parent)
GdkPixbuf *pixbuf = NULL;
GtkWidget *image;
/* GtkStyle *style; */
- char **pixmap_data;
+ const char **pixmap_data;
int i;
for (i = 0; i < NUM_TOOLS; i++) {
diff --git a/app/toolbox.h b/app/toolbox.h
index a916bb5..014771a 100644
--- a/app/toolbox.h
+++ b/app/toolbox.h
@@ -14,7 +14,7 @@ struct _ToolButtonData
struct _ToolButton
{
- gchar **icon_data;
+ const gchar **icon_data;
char *tool_desc;
char *tool_accelerator;
char *action_name;
diff --git a/lib/object.h b/lib/object.h
index 0c2b104..b577e04 100644
--- a/lib/object.h
+++ b/lib/object.h
@@ -538,9 +538,9 @@ struct _DiaObjectType {
char *name; /*!< The type name should follow a pattern of '\<module\> - \<class\>' like "UML - Class" */
int version; /*!< DiaObjects must be backward compatible, i.e. support possibly older versions formats */
- char **pixmap; /*!< Also put a pixmap in the sheet_object.
- This one is used if not in sheet but in toolbar.
- Stored in xpm format */
+ const char **pixmap; /*!< Also put a pixmap in the sheet_object.
+ This one is used if not in sheet but in toolbar.
+ Stored in xpm format */
ObjectTypeOps *ops; /* pointer to the vtable */
diff --git a/lib/sheet.h b/lib/sheet.h
index 5b7dfa9..2c47aed 100644
--- a/lib/sheet.h
+++ b/lib/sheet.h
@@ -25,7 +25,7 @@
struct _SheetObject {
char *object_type;
char *description;
- char **pixmap; /* in xpm format */
+ const char **pixmap; /* in xpm format */
void *user_data;
enum { USER_DATA_IS_INTDATA, USER_DATA_IS_OTHER } user_data_type;
diff --git a/lib/standard-path.c b/lib/standard-path.c
index 51cbe1b..26efbff 100644
--- a/lib/standard-path.c
+++ b/lib/standard-path.c
@@ -161,7 +161,7 @@ DiaObjectType stdpath_type =
{
"Standard - Path", /* name */
0, /* version */
- (char **) stdpath_icon, /* pixmap */
+ (const char **) stdpath_icon, /* pixmap */
&stdpath_type_ops, /* ops */
NULL, /* pixmap_file */
diff --git a/objects/AADL/aadlbox.c b/objects/AADL/aadlbox.c
index f63ffcd..583ac25 100755
--- a/objects/AADL/aadlbox.c
+++ b/objects/AADL/aadlbox.c
@@ -113,11 +113,11 @@ static int aadlbox_point_near_connection(Aadlbox *aadlbox, Point *p);
DiaObjectType aadlbox_type =
{
- "AADL - Box", // name
- 0, // version
- (char **) aadlbox_xpm, // pixmap
+ "AADL - Box", // name
+ 0, // version
+ aadlbox_xpm, // pixmap
- &aadlbox_type_ops // ops
+ &aadlbox_type_ops // ops
};
DiaMenu *aadlbox_get_object_menu(Aadlbox *aadlbox, Point *clickedpoint);
diff --git a/objects/AADL/aadlbus.c b/objects/AADL/aadlbus.c
index 1e178d5..0ab5e69 100755
--- a/objects/AADL/aadlbus.c
+++ b/objects/AADL/aadlbus.c
@@ -186,13 +186,12 @@ extern ObjectTypeOps aadlbus_type_ops;
DiaObjectType aadlbus_type =
{
- "AADL - Bus", /* name */
- 0, /* version */
- (char **) aadlbus_xpm, /* pixmap */
-
- &aadlbus_type_ops, /* ops */
+ "AADL - Bus", /* name */
+ 0, /* version */
+ aadlbus_xpm, /* pixmap */
+ &aadlbus_type_ops, /* ops */
NULL,
- &aadlbus_specific /* user data */
+ &aadlbus_specific /* user data */
};
static ObjectOps aadlbus_ops =
diff --git a/objects/AADL/aadldata.c b/objects/AADL/aadldata.c
index 91bfc0c..76019b3 100755
--- a/objects/AADL/aadldata.c
+++ b/objects/AADL/aadldata.c
@@ -138,13 +138,12 @@ ObjectTypeOps aadldata_type_ops;
DiaObjectType aadldata_type =
{
- "AADL - Data", /* name */
- 0, /* version */
- (char **) aadldata_xpm, /* pixmap */
-
- &aadldata_type_ops, /* ops */
+ "AADL - Data", /* name */
+ 0, /* version */
+ aadldata_xpm, /* pixmap */
+ &aadldata_type_ops, /* ops */
NULL,
- &aadldata_specific /* user data */
+ &aadldata_specific /* user data */
};
diff --git a/objects/AADL/aadldevice.c b/objects/AADL/aadldevice.c
index 2dba17d..7e2496d 100755
--- a/objects/AADL/aadldevice.c
+++ b/objects/AADL/aadldevice.c
@@ -122,13 +122,12 @@ ObjectTypeOps aadldevice_type_ops;
DiaObjectType aadldevice_type =
{
- "AADL - Device", /* name */
- 0, /* version */
- (char **) aadldevice_xpm, /* pixmap */
-
- &aadldevice_type_ops, /* ops */
+ "AADL - Device", /* name */
+ 0, /* version */
+ aadldevice_xpm, /* pixmap */
+ &aadldevice_type_ops, /* ops */
NULL,
- &aadldevice_specific /* user data */
+ &aadldevice_specific /* user data */
};
diff --git a/objects/AADL/aadlmemory.c b/objects/AADL/aadlmemory.c
index 1d540f5..ae2c308 100755
--- a/objects/AADL/aadlmemory.c
+++ b/objects/AADL/aadlmemory.c
@@ -107,13 +107,12 @@ ObjectTypeOps aadlmemory_type_ops;
DiaObjectType aadlmemory_type =
{
- "AADL - Memory", /* name */
- 0, /* version */
- (char **) aadlmemory_xpm, /* pixmap */
-
- &aadlmemory_type_ops, /* ops */
+ "AADL - Memory", /* name */
+ 0, /* version */
+ aadlmemory_xpm, /* pixmap */
+ &aadlmemory_type_ops, /* ops */
NULL,
- &aadlmemory_specific /* user data */
+ &aadlmemory_specific /* user data */
};
diff --git a/objects/AADL/aadlpackage.c b/objects/AADL/aadlpackage.c
index 3c0c5db..bdca818 100755
--- a/objects/AADL/aadlpackage.c
+++ b/objects/AADL/aadlpackage.c
@@ -85,13 +85,13 @@ ObjectTypeOps aadlpackage_type_ops;
DiaObjectType aadlpackage_type =
{
- "AADL - Package", /* name */
+ "AADL - Package", /* name */
0, /* version */
- (char **) aadlpackage_xpm, /* pixmap */
+ aadlpackage_xpm, /* pixmap */
- &aadlpackage_type_ops, /* ops */
+ &aadlpackage_type_ops, /* ops */
NULL,
- &aadlpackage_specific /* user data */
+ &aadlpackage_specific /* user data */
};
diff --git a/objects/AADL/aadlprocess.c b/objects/AADL/aadlprocess.c
index c04c53f..3111368 100755
--- a/objects/AADL/aadlprocess.c
+++ b/objects/AADL/aadlprocess.c
@@ -126,13 +126,12 @@ ObjectTypeOps aadlprocess_type_ops;
DiaObjectType aadlprocess_type =
{
- "AADL - Process", /* name */
+ "AADL - Process", /* name */
0, /* version */
- (char **) aadlprocess_xpm, /* pixmap */
-
- &aadlprocess_type_ops, /* ops */
+ aadlprocess_xpm, /* pixmap */
+ &aadlprocess_type_ops, /* ops */
NULL,
- &aadlprocess_specific /* user data */
+ &aadlprocess_specific /* user data */
};
diff --git a/objects/AADL/aadlprocessor.c b/objects/AADL/aadlprocessor.c
index ddb9730..4b9499b 100755
--- a/objects/AADL/aadlprocessor.c
+++ b/objects/AADL/aadlprocessor.c
@@ -96,13 +96,12 @@ ObjectTypeOps aadlprocessor_type_ops;
DiaObjectType aadlprocessor_type =
{
- "AADL - Processor", /* name */
- 0, /* version */
- (char **) aadlprocessor_xpm, /* pixmap */
-
- &aadlprocessor_type_ops, /* ops */
+ "AADL - Processor", /* name */
+ 0, /* version */
+ aadlprocessor_xpm, /* pixmap */
+ &aadlprocessor_type_ops, /* ops */
NULL,
- &aadlprocessor_specific /* user data */
+ &aadlprocessor_specific /* user data */
};
diff --git a/objects/AADL/aadlsubprogram.c b/objects/AADL/aadlsubprogram.c
index dc74ed7..5d4962e 100755
--- a/objects/AADL/aadlsubprogram.c
+++ b/objects/AADL/aadlsubprogram.c
@@ -108,13 +108,12 @@ ObjectTypeOps aadlsubprogram_type_ops;
DiaObjectType aadlsubprogram_type =
{
- "AADL - Subprogram", /* name */
- 0, /* version */
- (char **) aadlsubprogram_xpm, /* pixmap */
-
- &aadlsubprogram_type_ops, /* ops */
+ "AADL - Subprogram", /* name */
+ 0, /* version */
+ aadlsubprogram_xpm, /* pixmap */
+ &aadlsubprogram_type_ops, /* ops */
NULL,
- &aadlsubprogram_specific /* user data */
+ &aadlsubprogram_specific /* user data */
};
diff --git a/objects/AADL/aadlsystem.c b/objects/AADL/aadlsystem.c
index cbe8c9f..d243ced 100755
--- a/objects/AADL/aadlsystem.c
+++ b/objects/AADL/aadlsystem.c
@@ -118,13 +118,13 @@ ObjectTypeOps aadlsystem_type_ops;
DiaObjectType aadlsystem_type =
{
- "AADL - System", /* name */
- 0, /* version */
- (char **) aadlsystem_xpm, /* pixmap */
+ "AADL - System", /* name */
+ 0, /* version */
+ aadlsystem_xpm, /* pixmap */
- &aadlsystem_type_ops, /* ops */
+ &aadlsystem_type_ops, /* ops */
NULL,
- &aadlsystem_specific /* user data */
+ &aadlsystem_specific /* user data */
};
diff --git a/objects/AADL/aadlthread.c b/objects/AADL/aadlthread.c
index cec348c..ff7d411 100755
--- a/objects/AADL/aadlthread.c
+++ b/objects/AADL/aadlthread.c
@@ -50,13 +50,13 @@ ObjectTypeOps aadlthread_type_ops;
DiaObjectType aadlthread_type =
{
- "AADL - Thread", /* name */
- 0, /* version */
- (char **) aadlthread_xpm, /* pixmap */
+ "AADL - Thread", /* name */
+ 0, /* version */
+ aadlthread_xpm, /* pixmap */
- &aadlthread_type_ops, /* ops */
+ &aadlthread_type_ops, /* ops */
NULL,
- &aadlthread_specific /* user data */
+ &aadlthread_specific /* user data */
};
diff --git a/objects/AADL/aadlthreadgroup.c b/objects/AADL/aadlthreadgroup.c
index e4e6e2f..72ba861 100755
--- a/objects/AADL/aadlthreadgroup.c
+++ b/objects/AADL/aadlthreadgroup.c
@@ -54,12 +54,12 @@ ObjectTypeOps aadlthreadgroup_type_ops;
DiaObjectType aadlthreadgroup_type =
{
- "AADL - Thread Group", /* name */
- 0, /* version */
- (char **) aadlthreadgroup_xpm, /* pixmap */
- &aadlthreadgroup_type_ops, /* ops */
+ "AADL - Thread Group", /* name */
+ 0, /* version */
+ aadlthreadgroup_xpm, /* pixmap */
+ &aadlthreadgroup_type_ops, /* ops */
NULL,
- &aadlthreadgroup_specific /* user data */
+ &aadlthreadgroup_specific /* user data */
};
diff --git a/objects/AADL/pixmaps/aadlbus.xpm b/objects/AADL/pixmaps/aadlbus.xpm
index e8e0512..7d84531 100755
--- a/objects/AADL/pixmaps/aadlbus.xpm
+++ b/objects/AADL/pixmaps/aadlbus.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *aadlbus_xpm[] = {
+static const char *aadlbus_xpm[] = {
"22 22 3 1",
" c None",
". c #000000",
diff --git a/objects/AADL/pixmaps/aadldata.xpm b/objects/AADL/pixmaps/aadldata.xpm
index 9ad28a6..b77fd28 100755
--- a/objects/AADL/pixmaps/aadldata.xpm
+++ b/objects/AADL/pixmaps/aadldata.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *aadldata_xpm[] = {
+static const char *aadldata_xpm[] = {
"22 22 3 1",
" c None",
". c #000000",
diff --git a/objects/AADL/pixmaps/aadldevice.xpm b/objects/AADL/pixmaps/aadldevice.xpm
index e46b33c..bb5c0d7 100755
--- a/objects/AADL/pixmaps/aadldevice.xpm
+++ b/objects/AADL/pixmaps/aadldevice.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *aadldevice_xpm[] = {
+static const char *aadldevice_xpm[] = {
"22 22 3 1",
" c None",
". c #000000",
diff --git a/objects/AADL/pixmaps/aadlmemory.xpm b/objects/AADL/pixmaps/aadlmemory.xpm
index b8599c6..b5b1c6a 100755
--- a/objects/AADL/pixmaps/aadlmemory.xpm
+++ b/objects/AADL/pixmaps/aadlmemory.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *aadlmemory_xpm[] = {
+static const char *aadlmemory_xpm[] = {
"22 22 3 1",
" c None",
". c #000000",
diff --git a/objects/AADL/pixmaps/aadlpackage.xpm b/objects/AADL/pixmaps/aadlpackage.xpm
index a5b0f7b..fe4e4ef 100755
--- a/objects/AADL/pixmaps/aadlpackage.xpm
+++ b/objects/AADL/pixmaps/aadlpackage.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *aadlpackage_xpm[] = {
+static const char *aadlpackage_xpm[] = {
"22 22 3 1",
" c None",
". c #000000",
diff --git a/objects/AADL/pixmaps/aadlprocess.xpm b/objects/AADL/pixmaps/aadlprocess.xpm
index 33a7e4f..a127d46 100755
--- a/objects/AADL/pixmaps/aadlprocess.xpm
+++ b/objects/AADL/pixmaps/aadlprocess.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *aadlprocess_xpm[] = {
+static const char *aadlprocess_xpm[] = {
"22 22 3 1",
" c None",
". c #000000",
diff --git a/objects/AADL/pixmaps/aadlprocessor.xpm b/objects/AADL/pixmaps/aadlprocessor.xpm
index 7c67c2e..69f5d76 100755
--- a/objects/AADL/pixmaps/aadlprocessor.xpm
+++ b/objects/AADL/pixmaps/aadlprocessor.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *aadlprocessor_xpm[] = {
+static const char *aadlprocessor_xpm[] = {
"22 22 3 1",
" c None",
". c #000000",
diff --git a/objects/AADL/pixmaps/aadlsubprogram.xpm b/objects/AADL/pixmaps/aadlsubprogram.xpm
index 549de89..5275a08 100755
--- a/objects/AADL/pixmaps/aadlsubprogram.xpm
+++ b/objects/AADL/pixmaps/aadlsubprogram.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *aadlsubprogram_xpm[] = {
+static const char *aadlsubprogram_xpm[] = {
"22 22 3 1",
" c None",
". c #000000",
diff --git a/objects/AADL/pixmaps/aadlsystem.xpm b/objects/AADL/pixmaps/aadlsystem.xpm
index efa5f82..5edef11 100755
--- a/objects/AADL/pixmaps/aadlsystem.xpm
+++ b/objects/AADL/pixmaps/aadlsystem.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *aadlsystem_xpm[] = {
+static const char *aadlsystem_xpm[] = {
"22 22 3 1",
" c None",
". c #000000",
diff --git a/objects/AADL/pixmaps/aadlthread.xpm b/objects/AADL/pixmaps/aadlthread.xpm
index 8207c50..3795f32 100755
--- a/objects/AADL/pixmaps/aadlthread.xpm
+++ b/objects/AADL/pixmaps/aadlthread.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *aadlthread_xpm[] = {
+static const char *aadlthread_xpm[] = {
"22 22 3 1",
" c None",
". c #000000",
diff --git a/objects/AADL/pixmaps/aadlthreadgroup.xpm b/objects/AADL/pixmaps/aadlthreadgroup.xpm
index 14a7409..390884e 100755
--- a/objects/AADL/pixmaps/aadlthreadgroup.xpm
+++ b/objects/AADL/pixmaps/aadlthreadgroup.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *aadlthreadgroup_xpm[] = {
+static const char *aadlthreadgroup_xpm[] = {
"22 22 3 1",
" c None",
". c #000000",
diff --git a/objects/Database/compound.c b/objects/Database/compound.c
index becaa6f..82838ab 100644
--- a/objects/Database/compound.c
+++ b/objects/Database/compound.c
@@ -159,12 +159,10 @@ static ObjectTypeOps compound_type_ops =
DiaObjectType compound_type =
{
- "Database - Compound", /* name */
- 0, /* version */
- (char **) compound_xpm, /* pixmap */
- &compound_type_ops, /* operations */
- NULL,
- NULL
+ "Database - Compound", /* name */
+ 0, /* version */
+ compound_xpm, /* pixmap */
+ &compound_type_ops /* operations */
};
static ObjectOps compound_ops =
diff --git a/objects/Database/pixmaps/compound.xpm b/objects/Database/pixmaps/compound.xpm
index 3762b0b..bf90593 100644
--- a/objects/Database/pixmaps/compound.xpm
+++ b/objects/Database/pixmaps/compound.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * compound_xpm[] = {
+static const char * compound_xpm[] = {
"22 22 2 1",
" c None",
". c #000000",
diff --git a/objects/Database/pixmaps/reference.xpm b/objects/Database/pixmaps/reference.xpm
index 0bad71c..6363d4d 100644
--- a/objects/Database/pixmaps/reference.xpm
+++ b/objects/Database/pixmaps/reference.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * reference_xpm[] = {
+static const char * reference_xpm[] = {
"22 22 2 1",
" c None",
". c #000000",
diff --git a/objects/Database/pixmaps/table.xpm b/objects/Database/pixmaps/table.xpm
index 9dfd395..f3c1935 100644
--- a/objects/Database/pixmaps/table.xpm
+++ b/objects/Database/pixmaps/table.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * table_xpm[] = {
+static const char * table_xpm[] = {
"22 22 3 1",
" c None",
". c #000000",
diff --git a/objects/Database/reference.c b/objects/Database/reference.c
index df947d0..15da9d7 100644
--- a/objects/Database/reference.c
+++ b/objects/Database/reference.c
@@ -70,12 +70,12 @@ static ObjectTypeOps reference_type_ops =
DiaObjectType reference_type =
{
- "Database - Reference", /* name */
- 0, /* version */
- (char **) reference_xpm, /* pixmap */
- &reference_type_ops, /* ops */
- NULL, /* pixmap_file */
- NULL /* default_user_data */
+ "Database - Reference", /* name */
+ 0, /* version */
+ reference_xpm, /* pixmap */
+ &reference_type_ops, /* ops */
+ NULL, /* pixmap_file */
+ NULL /* default_user_data */
};
static ObjectOps reference_ops = {
diff --git a/objects/Database/table.c b/objects/Database/table.c
index 1e49b16..d4c7998 100644
--- a/objects/Database/table.c
+++ b/objects/Database/table.c
@@ -105,12 +105,10 @@ static ObjectTypeOps table_type_ops =
DiaObjectType table_type =
{
- "Database - Table", /* name */
+ "Database - Table", /* name */
0, /* version */
- (char **) table_xpm, /* pixmap */
- &table_type_ops, /* operations */
- NULL,
- NULL
+ table_xpm, /* pixmap */
+ &table_type_ops /* ops */
};
static ObjectOps table_ops =
diff --git a/objects/ER/attribute.c b/objects/ER/attribute.c
index 72c0484..330e314 100644
--- a/objects/ER/attribute.c
+++ b/objects/ER/attribute.c
@@ -120,11 +120,10 @@ static ObjectTypeOps attribute_type_ops =
DiaObjectType attribute_type =
{
- "ER - Attribute", /* name */
- 0, /* version */
- (char **) attribute_xpm, /* pixmap */
-
- &attribute_type_ops /* ops */
+ "ER - Attribute", /* name */
+ 0, /* version */
+ attribute_xpm, /* pixmap */
+ &attribute_type_ops /* ops */
};
DiaObjectType *_attribute_type = (DiaObjectType *) &attribute_type;
diff --git a/objects/ER/entity.c b/objects/ER/entity.c
index 084fbbb..d21c936 100644
--- a/objects/ER/entity.c
+++ b/objects/ER/entity.c
@@ -103,10 +103,9 @@ static ObjectTypeOps entity_type_ops =
DiaObjectType entity_type =
{
"ER - Entity", /* name */
- 0, /* version */
- (char **) entity_xpm, /* pixmap */
-
- &entity_type_ops /* ops */
+ 0, /* version */
+ entity_xpm, /* pixmap */
+ &entity_type_ops /* ops */
};
DiaObjectType *_entity_type = (DiaObjectType *) &entity_type;
diff --git a/objects/ER/participation.c b/objects/ER/participation.c
index f52d21a..39a4e80 100644
--- a/objects/ER/participation.c
+++ b/objects/ER/participation.c
@@ -85,12 +85,11 @@ static ObjectTypeOps participation_type_ops =
DiaObjectType participation_type =
{
- "ER - Participation", /* name */
+ "ER - Participation", /* name */
/* Version 0 had no autorouting and so shouldn't have it set by default. */
- 1, /* version */
- (char **) participation_xpm, /* pixmap */
-
- &participation_type_ops /* ops */
+ 1, /* version */
+ participation_xpm, /* pixmap */
+ &participation_type_ops /* ops */
};
static ObjectOps participation_ops = {
diff --git a/objects/ER/pixmaps/attribute.xpm b/objects/ER/pixmaps/attribute.xpm
index 72523e5..54a8be0 100644
--- a/objects/ER/pixmaps/attribute.xpm
+++ b/objects/ER/pixmaps/attribute.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * attribute_xpm[] = {
+static const char * attribute_xpm[] = {
"22 22 3 1",
" c None",
". c #000000",
diff --git a/objects/ER/pixmaps/entity.xpm b/objects/ER/pixmaps/entity.xpm
index 6c2f5a0..79af740 100644
--- a/objects/ER/pixmaps/entity.xpm
+++ b/objects/ER/pixmaps/entity.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * entity_xpm[] = {
+static const char * entity_xpm[] = {
"22 22 3 1",
" c None",
". c #000000",
diff --git a/objects/ER/pixmaps/participation.xpm b/objects/ER/pixmaps/participation.xpm
index 0ad3b65..49020b3 100644
--- a/objects/ER/pixmaps/participation.xpm
+++ b/objects/ER/pixmaps/participation.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * participation_xpm[] = {
+static const char * participation_xpm[] = {
"22 22 2 1",
" c None",
". c #000000",
diff --git a/objects/ER/pixmaps/relationship.xpm b/objects/ER/pixmaps/relationship.xpm
index 4bda5e8..d6a7cc9 100644
--- a/objects/ER/pixmaps/relationship.xpm
+++ b/objects/ER/pixmaps/relationship.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * relationship_xpm[] = {
+static const char * relationship_xpm[] = {
"22 22 3 1",
" c None",
". c #000000",
diff --git a/objects/ER/relationship.c b/objects/ER/relationship.c
index 3f01fe7..b63bd46 100644
--- a/objects/ER/relationship.c
+++ b/objects/ER/relationship.c
@@ -109,9 +109,8 @@ DiaObjectType relationship_type =
{
"ER - Relationship", /* name */
0, /* version */
- (char **) relationship_xpm, /* pixmap */
-
- &relationship_type_ops /* ops */
+ relationship_xpm, /* pixmap */
+ &relationship_type_ops /* ops */
};
DiaObjectType *_relationship_type = (DiaObjectType *) &relationship_type;
diff --git a/objects/FS/flow-ortho.c b/objects/FS/flow-ortho.c
index 32caed5..fbc45f4 100644
--- a/objects/FS/flow-ortho.c
+++ b/objects/FS/flow-ortho.c
@@ -129,11 +129,11 @@ static ObjectTypeOps orthflow_type_ops =
DiaObjectType orthflow_type =
{
- "FS - Orthflow", /* name */
+ "FS - Orthflow", /* name */
/* Version 0 had no autorouting and so shouldn't have it set by default. */
- 1, /* version */
- (char **) orthflow_xpm, /* pixmap */
- &orthflow_type_ops /* ops */
+ 1, /* version */
+ orthflow_xpm, /* pixmap */
+ &orthflow_type_ops /* ops */
};
static ObjectOps orthflow_ops = {
diff --git a/objects/FS/flow.c b/objects/FS/flow.c
index 3935219..a20bbb5 100644
--- a/objects/FS/flow.c
+++ b/objects/FS/flow.c
@@ -107,10 +107,10 @@ static ObjectTypeOps flow_type_ops =
DiaObjectType flow_type =
{
- "FS - Flow", /* name */
- 0, /* version */
- (char **) flow_xpm, /* pixmap */
- &flow_type_ops /* ops */
+ "FS - Flow", /* name */
+ 0, /* version */
+ flow_xpm, /* pixmap */
+ &flow_type_ops /* ops */
};
static ObjectOps flow_ops = {
diff --git a/objects/FS/function.c b/objects/FS/function.c
index bae5578..45a9d6b 100644
--- a/objects/FS/function.c
+++ b/objects/FS/function.c
@@ -111,11 +111,10 @@ static ObjectTypeOps function_type_ops =
DiaObjectType function_type =
{
- "FS - Function", /* name */
- 0, /* version */
- (char **) function_xpm, /* pixmap */
-
- &function_type_ops /* ops */
+ "FS - Function", /* name */
+ 0, /* version */
+ function_xpm, /* pixmap */
+ &function_type_ops /* ops */
};
static ObjectOps function_ops = {
diff --git a/objects/FS/pixmaps/flow.xpm b/objects/FS/pixmaps/flow.xpm
index f2eee7a..22c6a84 100644
--- a/objects/FS/pixmaps/flow.xpm
+++ b/objects/FS/pixmaps/flow.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * flow_xpm[] = {
+static const char * flow_xpm[] = {
"22 22 3 1",
" c None",
". c white",
diff --git a/objects/FS/pixmaps/function.xpm b/objects/FS/pixmaps/function.xpm
index 7a2e9c1..63422a8 100644
--- a/objects/FS/pixmaps/function.xpm
+++ b/objects/FS/pixmaps/function.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * function_xpm[] = {
+static const char * function_xpm[] = {
"22 22 2 1",
" c None",
". c black",
diff --git a/objects/FS/pixmaps/orthflow.xpm b/objects/FS/pixmaps/orthflow.xpm
index 19f6eaa..9586959 100644
--- a/objects/FS/pixmaps/orthflow.xpm
+++ b/objects/FS/pixmaps/orthflow.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * orthflow_xpm[] = {
+static const char * orthflow_xpm[] = {
"22 22 3 1",
" c None",
". c white",
diff --git a/objects/GRAFCET/action.c b/objects/GRAFCET/action.c
index ab18f9a..ed4acaf 100644
--- a/objects/GRAFCET/action.c
+++ b/objects/GRAFCET/action.c
@@ -97,11 +97,10 @@ static ObjectTypeOps action_type_ops =
DiaObjectType action_type =
{
- "GRAFCET - Action", /* name */
- 0, /* version */
- (char **) action_xpm, /* pixmap */
-
- &action_type_ops /* ops */
+ "GRAFCET - Action", /* name */
+ 0, /* version */
+ action_xpm, /* pixmap */
+ &action_type_ops /* ops */
};
static ObjectOps action_ops = {
diff --git a/objects/GRAFCET/condition.c b/objects/GRAFCET/condition.c
index 341b5a9..9984106 100644
--- a/objects/GRAFCET/condition.c
+++ b/objects/GRAFCET/condition.c
@@ -97,11 +97,10 @@ static ObjectTypeOps condition_type_ops =
DiaObjectType condition_type =
{
- "GRAFCET - Condition", /* name */
- 0, /* version */
- (char **) condition_xpm, /* pixmap */
-
- &condition_type_ops /* ops */
+ "GRAFCET - Condition", /* name */
+ 0, /* version */
+ condition_xpm, /* pixmap */
+ &condition_type_ops /* ops */
};
diff --git a/objects/GRAFCET/pixmaps/action.xpm b/objects/GRAFCET/pixmaps/action.xpm
index 14d9c0c..dc16cc1 100644
--- a/objects/GRAFCET/pixmaps/action.xpm
+++ b/objects/GRAFCET/pixmaps/action.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * action_xpm[] = {
+static const char * action_xpm[] = {
"22 22 2 1",
" c None",
". c #000000",
diff --git a/objects/GRAFCET/pixmaps/condition.xpm b/objects/GRAFCET/pixmaps/condition.xpm
index 9c2ab78..555b05a 100644
--- a/objects/GRAFCET/pixmaps/condition.xpm
+++ b/objects/GRAFCET/pixmaps/condition.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * condition_xpm[] = {
+static const char * condition_xpm[] = {
"22 22 3 1",
" c None",
". c #000000",
diff --git a/objects/GRAFCET/pixmaps/etape.xpm b/objects/GRAFCET/pixmaps/etape.xpm
index c8ee02d..080b02c 100644
--- a/objects/GRAFCET/pixmaps/etape.xpm
+++ b/objects/GRAFCET/pixmaps/etape.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * etape_xpm[] = {
+static const char * etape_xpm[] = {
"22 22 2 1",
" c None",
". c #000000",
diff --git a/objects/GRAFCET/pixmaps/transition.xpm b/objects/GRAFCET/pixmaps/transition.xpm
index 69966e8..a18c14f 100644
--- a/objects/GRAFCET/pixmaps/transition.xpm
+++ b/objects/GRAFCET/pixmaps/transition.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * transition_xpm[] = {
+static const char * transition_xpm[] = {
"22 22 2 1",
" c None",
". c #000000",
diff --git a/objects/GRAFCET/pixmaps/vector.xpm b/objects/GRAFCET/pixmaps/vector.xpm
index ed1a506..396ed8f 100644
--- a/objects/GRAFCET/pixmaps/vector.xpm
+++ b/objects/GRAFCET/pixmaps/vector.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * vector_xpm[] = {
+static const char * vector_xpm[] = {
"22 22 2 1",
" c None",
". c #000000",
diff --git a/objects/GRAFCET/pixmaps/vergent.xpm b/objects/GRAFCET/pixmaps/vergent.xpm
index 08ce650..4e260fd 100644
--- a/objects/GRAFCET/pixmaps/vergent.xpm
+++ b/objects/GRAFCET/pixmaps/vergent.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * vergent_xpm[] = {
+static const char * vergent_xpm[] = {
"22 22 2 1",
" c None",
". c #000000",
diff --git a/objects/GRAFCET/step.c b/objects/GRAFCET/step.c
index b27d201..cccfec0 100644
--- a/objects/GRAFCET/step.c
+++ b/objects/GRAFCET/step.c
@@ -118,11 +118,10 @@ static ObjectTypeOps step_type_ops =
DiaObjectType step_type =
{
- "GRAFCET - Step", /* name */
- 0, /* version */
- (char **) etape_xpm, /* pixmap */
-
- &step_type_ops /* ops */
+ "GRAFCET - Step", /* name */
+ 0, /* version */
+ etape_xpm, /* pixmap */
+ &step_type_ops /* ops */
};
static ObjectOps step_ops = {
diff --git a/objects/GRAFCET/transition.c b/objects/GRAFCET/transition.c
index faf4cf3..870ceb1 100644
--- a/objects/GRAFCET/transition.c
+++ b/objects/GRAFCET/transition.c
@@ -108,11 +108,10 @@ static ObjectTypeOps transition_type_ops =
DiaObjectType transition_type =
{
- "GRAFCET - Transition", /* name */
- 0, /* version */
- (char **) transition_xpm, /* pixmap */
-
- &transition_type_ops /* ops */
+ "GRAFCET - Transition", /* name */
+ 0, /* version */
+ transition_xpm, /* pixmap */
+ &transition_type_ops /* ops */
};
diff --git a/objects/GRAFCET/vector.c b/objects/GRAFCET/vector.c
index 2cb1712..32806d7 100644
--- a/objects/GRAFCET/vector.c
+++ b/objects/GRAFCET/vector.c
@@ -87,20 +87,18 @@ static ObjectTypeOps arc_type_ops =
DiaObjectType old_arc_type =
{
- "GRAFCET - Vector", /* name */
+ "GRAFCET - Vector", /* name */
/* Version 0 had no autorouting and so shouldn't have it set by default. */
- 1, /* version */
- (char **) vector_xpm, /* pixmap */
-
- &arc_type_ops /* ops */
+ 1, /* version */
+ vector_xpm, /* pixmap */
+ &arc_type_ops /* ops */
};
DiaObjectType grafcet_arc_type =
{
"GRAFCET - Arc", /* name */
- 0, /* version */
- (char **) vector_xpm, /* pixmap */
-
+ 0, /* version */
+ vector_xpm, /* pixmap */
&arc_type_ops /* ops */
};
diff --git a/objects/GRAFCET/vergent.c b/objects/GRAFCET/vergent.c
index dddf99d..7e206b0 100644
--- a/objects/GRAFCET/vergent.c
+++ b/objects/GRAFCET/vergent.c
@@ -90,11 +90,10 @@ static ObjectTypeOps vergent_type_ops =
DiaObjectType vergent_type =
{
- "GRAFCET - Vergent", /* name */
- 0, /* version */
- (char **) vergent_xpm, /* pixmap */
-
- &vergent_type_ops /* ops */
+ "GRAFCET - Vergent", /* name */
+ 0, /* version */
+ vergent_xpm, /* pixmap */
+ &vergent_type_ops /* ops */
};
diff --git a/objects/Istar/actor.c b/objects/Istar/actor.c
index a3e88fe..31754da 100644
--- a/objects/Istar/actor.c
+++ b/objects/Istar/actor.c
@@ -112,11 +112,10 @@ static ObjectTypeOps actor_type_ops =
DiaObjectType istar_actor_type =
{
- "Istar - actor", /* name */
- 0, /* version */
- (char **) istar_actor_xpm, /* pixmap */
-
- &actor_type_ops /* ops */
+ "Istar - actor", /* name */
+ 0, /* version */
+ istar_actor_xpm, /* pixmap */
+ &actor_type_ops /* ops */
};
static ObjectOps actor_ops = {
diff --git a/objects/Istar/goal.c b/objects/Istar/goal.c
index b2cd5d3..13e0c67 100644
--- a/objects/Istar/goal.c
+++ b/objects/Istar/goal.c
@@ -123,10 +123,10 @@ static ObjectTypeOps istar_goal_type_ops =
DiaObjectType istar_goal_type =
{
- "Istar - goal", /* name */
- 0, /* version */
- (char **) istar_softgoal_xpm, /* pixmap */
- &istar_goal_type_ops /* ops */
+ "Istar - goal", /* name */
+ 0, /* version */
+ istar_softgoal_xpm, /* pixmap */
+ &istar_goal_type_ops /* ops */
};
static ObjectOps goal_ops = {
diff --git a/objects/Istar/link.c b/objects/Istar/link.c
index d520a00..44174b9 100644
--- a/objects/Istar/link.c
+++ b/objects/Istar/link.c
@@ -120,10 +120,10 @@ static ObjectTypeOps link_type_ops =
DiaObjectType istar_link_type =
{
- "Istar - link", /* name */
- 0, /* version */
- (char **) istar_link_xpm, /* pixmap */
- &link_type_ops /* ops */
+ "Istar - link", /* name */
+ 0, /* version */
+ istar_link_xpm, /* pixmap */
+ &link_type_ops /* ops */
};
diff --git a/objects/Istar/other.c b/objects/Istar/other.c
index 9588bda..662ff1d 100644
--- a/objects/Istar/other.c
+++ b/objects/Istar/other.c
@@ -117,10 +117,10 @@ static ObjectTypeOps istar_other_type_ops =
DiaObjectType istar_other_type =
{
- "Istar - other", /* name */
- 0, /* version */
- (char **) istar_resource_xpm, /* pixmap */
- &istar_other_type_ops /* ops */
+ "Istar - other", /* name */
+ 0, /* version */
+ istar_resource_xpm, /* pixmap */
+ &istar_other_type_ops /* ops */
};
static ObjectOps other_ops = {
diff --git a/objects/Istar/pixmaps/actor.xpm b/objects/Istar/pixmaps/actor.xpm
index f55d2cf..82a7bff 100644
--- a/objects/Istar/pixmaps/actor.xpm
+++ b/objects/Istar/pixmaps/actor.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * istar_actor_xpm[] = {
+static const char * istar_actor_xpm[] = {
"22 22 3 1",
" c None",
". c #000000",
diff --git a/objects/Istar/pixmaps/link.xpm b/objects/Istar/pixmaps/link.xpm
index 6db10c7..c09241b 100644
--- a/objects/Istar/pixmaps/link.xpm
+++ b/objects/Istar/pixmaps/link.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *istar_link_xpm[] = {
+static const char *istar_link_xpm[] = {
/* width height ncolors chars_per_pixel */
"22 22 2 1",
/* colors */
@@ -29,4 +29,4 @@ static char *istar_link_xpm[] = {
"aaaaaaaaaaaaaaaaaaaaaa",
"aaaaaaaaaaaaaaaaaaaaaa"
};
-
+
diff --git a/objects/Istar/pixmaps/resource.xpm b/objects/Istar/pixmaps/resource.xpm
index b74005c..ced2d2f 100644
--- a/objects/Istar/pixmaps/resource.xpm
+++ b/objects/Istar/pixmaps/resource.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * istar_resource_xpm[] = {
+static const char * istar_resource_xpm[] = {
"22 22 3 1",
" c None",
". c #000000",
diff --git a/objects/Istar/pixmaps/softgoal.xpm b/objects/Istar/pixmaps/softgoal.xpm
index 4ff8ee1..ee47e88 100644
--- a/objects/Istar/pixmaps/softgoal.xpm
+++ b/objects/Istar/pixmaps/softgoal.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *istar_softgoal_xpm[] = {
+static const char *istar_softgoal_xpm[] = {
/* width height ncolors chars_per_pixel */
"22 22 3 1",
/* colors */
@@ -30,4 +30,4 @@ static char *istar_softgoal_xpm[] = {
"aaaaaaaaaaaaaaaaaaaaaa",
"aaaaaaaaaaaaaaaaaaaaaa"
};
-
+
diff --git a/objects/Jackson/domain.c b/objects/Jackson/domain.c
index 6d57de1..4d69a03 100644
--- a/objects/Jackson/domain.c
+++ b/objects/Jackson/domain.c
@@ -144,10 +144,10 @@ static ObjectTypeOps jackson_domain_type_ops =
DiaObjectType jackson_domain_type =
{
- "Jackson - domain", /* name */
- 0, /* version */
- (char **) jackson_given_domain_xpm, /* this is the default pixmap */
- &jackson_domain_type_ops /* ops */
+ "Jackson - domain", /* name */
+ 0, /* version */
+ jackson_given_domain_xpm, /* this is the default pixmap */
+ &jackson_domain_type_ops /* ops */
};
static ObjectOps jackson_box_ops = {
diff --git a/objects/Jackson/phenomenon.c b/objects/Jackson/phenomenon.c
index 631cfda..df644dc 100644
--- a/objects/Jackson/phenomenon.c
+++ b/objects/Jackson/phenomenon.c
@@ -107,10 +107,10 @@ static ObjectTypeOps message_type_ops =
DiaObjectType jackson_phenomenon_type =
{
- "Jackson - phenomenon", /* name */
+ "Jackson - phenomenon", /* name */
0, /* version */
- (char **)jackson_shared_phen_xpm, /* pixmap */
- &message_type_ops /* ops */
+ jackson_shared_phen_xpm, /* pixmap */
+ &message_type_ops /* ops */
};
static ObjectOps message_ops = {
diff --git a/objects/Jackson/pixmaps/given_domain.xpm b/objects/Jackson/pixmaps/given_domain.xpm
index 4ede7f7..03196f0 100644
--- a/objects/Jackson/pixmaps/given_domain.xpm
+++ b/objects/Jackson/pixmaps/given_domain.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * jackson_given_domain_xpm[] = {
+static const char * jackson_given_domain_xpm[] = {
"22 22 3 1",
" c None",
". c #000000",
diff --git a/objects/Jackson/pixmaps/requirement.xpm b/objects/Jackson/pixmaps/requirement.xpm
index 24005a1..95d6105 100644
--- a/objects/Jackson/pixmaps/requirement.xpm
+++ b/objects/Jackson/pixmaps/requirement.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *jackson_requirement_xpm[] = {
+static const char *jackson_requirement_xpm[] = {
/* width height ncolors chars_per_pixel */
"22 22 3 1",
/* colors */
@@ -30,4 +30,4 @@ static char *jackson_requirement_xpm[] = {
"aaaaaaaaaaaaaaaaaaaaaa",
"aaaaaaaaaaaaaaaaaaaaaa"
};
-
+
diff --git a/objects/Jackson/pixmaps/shared_phen.xpm b/objects/Jackson/pixmaps/shared_phen.xpm
index 000aac0..64cac8b 100644
--- a/objects/Jackson/pixmaps/shared_phen.xpm
+++ b/objects/Jackson/pixmaps/shared_phen.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * jackson_shared_phen_xpm[] = {
+static const char * jackson_shared_phen_xpm[] = {
"22 22 3 1",
" c None",
". c white",
diff --git a/objects/Jackson/requirement.c b/objects/Jackson/requirement.c
index 38f9003..c8afce7 100644
--- a/objects/Jackson/requirement.c
+++ b/objects/Jackson/requirement.c
@@ -102,9 +102,8 @@ DiaObjectType jackson_requirement_type =
{
"Jackson - requirement", /* name */
0, /* version */
- (char **)jackson_requirement_xpm, /* pixmap */
-
- &req_type_ops /* ops */
+ jackson_requirement_xpm, /* pixmap */
+ &req_type_ops /* ops */
};
static ObjectOps req_ops = {
diff --git a/objects/KAOS/goal.c b/objects/KAOS/goal.c
index 2570f0c..c3612c5 100644
--- a/objects/KAOS/goal.c
+++ b/objects/KAOS/goal.c
@@ -126,10 +126,10 @@ static ObjectTypeOps kaos_goal_type_ops =
DiaObjectType kaos_goal_type =
{
- "KAOS - goal", /* name */
- 0, /* version */
- (char **) kaos_goal_xpm, /* pixmap */
- &kaos_goal_type_ops /* ops */
+ "KAOS - goal", /* name */
+ 0, /* version */
+ kaos_goal_xpm, /* pixmap */
+ &kaos_goal_type_ops /* ops */
};
static ObjectOps goal_ops = {
diff --git a/objects/KAOS/metaandorrel.c b/objects/KAOS/metaandorrel.c
index 2216428..9ecb18a 100644
--- a/objects/KAOS/metaandorrel.c
+++ b/objects/KAOS/metaandorrel.c
@@ -124,10 +124,10 @@ static ObjectTypeOps maor_type_ops =
DiaObjectType kaos_maor_type =
{
- "KAOS - maor", /* name */
- 0, /* version */
- (char **)contributes_xpm, /* pixmap */
- &maor_type_ops /* ops */
+ "KAOS - maor", /* name */
+ 0, /* version */
+ contributes_xpm, /* pixmap */
+ &maor_type_ops /* ops */
};
static ObjectOps maor_ops = {
diff --git a/objects/KAOS/metabinrel.c b/objects/KAOS/metabinrel.c
index 2733396..637da8d 100644
--- a/objects/KAOS/metabinrel.c
+++ b/objects/KAOS/metabinrel.c
@@ -128,10 +128,10 @@ static ObjectTypeOps mbr_type_ops =
DiaObjectType kaos_mbr_type =
{
- "KAOS - mbr", /* name */
- 0, /* version */
- (char **)contributes_xpm, /* pixmap */
- &mbr_type_ops /* ops */
+ "KAOS - mbr", /* name */
+ 0, /* version */
+ contributes_xpm, /* pixmap */
+ &mbr_type_ops /* ops */
};
static ObjectOps mbr_ops = {
diff --git a/objects/KAOS/other.c b/objects/KAOS/other.c
index 044642b..c12c314 100644
--- a/objects/KAOS/other.c
+++ b/objects/KAOS/other.c
@@ -120,10 +120,10 @@ static ObjectTypeOps kaos_other_type_ops =
DiaObjectType kaos_other_type =
{
- "KAOS - other", /* name */
- 0, /* version */
- (char **) kaos_agent_xpm, /* pixmap */
- &kaos_other_type_ops /* ops */
+ "KAOS - other", /* name */
+ 0, /* version */
+ kaos_agent_xpm, /* pixmap */
+ &kaos_other_type_ops /* ops */
};
static ObjectOps other_ops = {
diff --git a/objects/KAOS/pixmaps/agent.xpm b/objects/KAOS/pixmaps/agent.xpm
index dee1c48..f0009d9 100644
--- a/objects/KAOS/pixmaps/agent.xpm
+++ b/objects/KAOS/pixmaps/agent.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *kaos_agent_xpm[] = {
+static const char *kaos_agent_xpm[] = {
/* width height ncolors chars_per_pixel */
"22 22 3 1",
/* colors */
@@ -30,4 +30,4 @@ static char *kaos_agent_xpm[] = {
"aaaaaaaaaaaaaaaaaaaaaa",
"aaaaaaaaaaaaaaaaaaaaaa"
};
-
+
diff --git a/objects/KAOS/pixmaps/broken.xpm b/objects/KAOS/pixmaps/broken.xpm
index 150812c..854ffc3 100644
--- a/objects/KAOS/pixmaps/broken.xpm
+++ b/objects/KAOS/pixmaps/broken.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * mid_obstructs_xpm[] = {
+static const char * mid_obstructs_xpm[] = {
"64 64 21 1",
" c None",
". c #110609",
diff --git a/objects/KAOS/pixmaps/contributes.xpm b/objects/KAOS/pixmaps/contributes.xpm
index ec925e8..fcd8b0f 100644
--- a/objects/KAOS/pixmaps/contributes.xpm
+++ b/objects/KAOS/pixmaps/contributes.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *contributes_xpm[] = {
+static const char *contributes_xpm[] = {
/* width height ncolors chars_per_pixel */
"22 22 2 1",
/* colors */
@@ -29,4 +29,4 @@ static char *contributes_xpm[] = {
"aaaaaaaaaaaaaaaaaaaaaa",
"aaaaaaaaaaaaaaaaaaaaaa"
};
-
+
diff --git a/objects/KAOS/pixmaps/goal.xpm b/objects/KAOS/pixmaps/goal.xpm
index 46b4bf3..5c21b97 100644
--- a/objects/KAOS/pixmaps/goal.xpm
+++ b/objects/KAOS/pixmaps/goal.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *kaos_goal_xpm[] = {
+static const char *kaos_goal_xpm[] = {
/* width height ncolors chars_per_pixel */
"22 22 3 1",
/* colors */
@@ -30,4 +30,4 @@ static char *kaos_goal_xpm[] = {
"aaaaaaaaaaaaaaaaaaaaaa",
"aaaaaaaaaaaaaaaaaaaaaa"
};
-
+
diff --git a/objects/KAOS/pixmaps/mid_conflicts.xpm b/objects/KAOS/pixmaps/mid_conflicts.xpm
index ad24143..60eefdb 100644
--- a/objects/KAOS/pixmaps/mid_conflicts.xpm
+++ b/objects/KAOS/pixmaps/mid_conflicts.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *iconforge_xpm[] = {
+static const char *iconforge_xpm[] = {
/* width height ncolors chars_per_pixel */
"16 16 3 1",
/* colors */
@@ -24,4 +24,4 @@ static char *iconforge_xpm[] = {
"aaaaaaaaaaaabaaa",
"aaaaaaaaaaaaaaaa"
};
-
+
diff --git a/objects/KAOS/pixmaps/mid_controls.xpm b/objects/KAOS/pixmaps/mid_controls.xpm
index efd7f78..6ecbf36 100644
--- a/objects/KAOS/pixmaps/mid_controls.xpm
+++ b/objects/KAOS/pixmaps/mid_controls.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *mid_controls_xpm[] = {
+static const char *mid_controls_xpm[] = {
/* width height ncolors chars_per_pixel */
"32 32 10 1",
/* colors */
@@ -47,4 +47,4 @@ static char *mid_controls_xpm[] = {
"aaaaaaaafigigc`ccccccgghaaaaaaaa",
"aaaaaaaafiiigccccc``ccgaaaaaaaaa"
};
-
+
diff --git a/objects/KAOS/pixmaps/mid_monitors.xpm b/objects/KAOS/pixmaps/mid_monitors.xpm
index 3a2e907..0b1cfb8 100644
--- a/objects/KAOS/pixmaps/mid_monitors.xpm
+++ b/objects/KAOS/pixmaps/mid_monitors.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *mid_monitors_xpm[] = {
+static const char *mid_monitors_xpm[] = {
/* width height ncolors chars_per_pixel */
"32 32 11 1",
/* colors */
@@ -48,4 +48,4 @@ static char *mid_monitors_xpm[] = {
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
};
-
+
diff --git a/objects/KAOS/pixmaps/mid_obstructs.xpm b/objects/KAOS/pixmaps/mid_obstructs.xpm
index 07b68c2..414322f 100644
--- a/objects/KAOS/pixmaps/mid_obstructs.xpm
+++ b/objects/KAOS/pixmaps/mid_obstructs.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *mid_obstructs_xpm[] = {
+static const char *mid_obstructs_xpm[] = {
/* width height ncolors chars_per_pixel */
"16 16 3 1",
/* colors */
@@ -24,4 +24,4 @@ static char *mid_obstructs_xpm[] = {
"aaaaaaaaaaaabaaa",
"aaaaaaaaaaaaaaaa"
};
-
+
diff --git a/objects/Misc/analog_clock.c b/objects/Misc/analog_clock.c
index 9fc7e85..ae09384 100644
--- a/objects/Misc/analog_clock.c
+++ b/objects/Misc/analog_clock.c
@@ -101,11 +101,10 @@ static ObjectTypeOps analog_clock_type_ops =
DiaObjectType analog_clock_type =
{
- "Misc - Analog Clock", /* name */
- 0, /* version */
- (char **) analog_clock_xpm, /* pixmap */
-
- &analog_clock_type_ops /* ops */
+ "Misc - Analog Clock", /* name */
+ 0, /* version */
+ analog_clock_xpm, /* pixmap */
+ &analog_clock_type_ops /* ops */
};
static ObjectOps analog_clock_ops = {
diff --git a/objects/Misc/diagram_as_object.c b/objects/Misc/diagram_as_object.c
index 3569239..e4efa58 100644
--- a/objects/Misc/diagram_as_object.c
+++ b/objects/Misc/diagram_as_object.c
@@ -90,12 +90,12 @@ static ObjectTypeOps _dae_type_ops =
DiaObjectType diagram_as_element_type =
{
- "Misc - Diagram", /* name */
- 0, /* version */
- (char **) diagram_as_element_xpm, /* pixmap */
- &_dae_type_ops, /* ops */
+ "Misc - Diagram", /* name */
+ 0, /* version */
+ diagram_as_element_xpm, /* pixmap */
+ &_dae_type_ops, /* ops */
NULL, /* pixmap_file */
- 0 /* default_uder_data */
+ 0 /* default_uder_data */
};
static void _dae_update_data (DiagramAsElement *dae);
diff --git a/objects/Misc/grid_object.c b/objects/Misc/grid_object.c
index a278f36..efb52a2 100644
--- a/objects/Misc/grid_object.c
+++ b/objects/Misc/grid_object.c
@@ -100,11 +100,10 @@ static ObjectTypeOps grid_object_type_ops =
DiaObjectType grid_object_type =
{
- "Misc - Grid", /* name */
- 0, /* version */
- (char **) grid_object_xpm, /* pixmap */
-
- &grid_object_type_ops /* ops */
+ "Misc - Grid", /* name */
+ 0, /* version */
+ grid_object_xpm, /* pixmap */
+ &grid_object_type_ops /* ops */
};
static ObjectOps grid_object_ops = {
diff --git a/objects/Misc/measure.c b/objects/Misc/measure.c
index b74f81c..20eac97 100644
--- a/objects/Misc/measure.c
+++ b/objects/Misc/measure.c
@@ -68,13 +68,12 @@ static ObjectTypeOps measure_type_ops =
DiaObjectType measure_type =
{
- "Misc - Measure", /* name */
- 0, /* version */
- (char **) measure_xpm, /* pixmap */
-
- &measure_type_ops, /* ops */
- NULL, /* pixmap_file */
- 0 /* default_user_data */
+ "Misc - Measure", /* name */
+ 0, /* version */
+ measure_xpm, /* pixmap */
+ &measure_type_ops, /* ops */
+ NULL, /* pixmap_file */
+ 0 /* default_user_data */
};
/* make accesible from the outside for type regristation */
diff --git a/objects/Misc/pixmaps/analog_clock.xpm b/objects/Misc/pixmaps/analog_clock.xpm
index 6f0e856..e39be98 100644
--- a/objects/Misc/pixmaps/analog_clock.xpm
+++ b/objects/Misc/pixmaps/analog_clock.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * analog_clock_xpm[] = {
+static const char * analog_clock_xpm[] = {
"22 22 10 1",
" c None",
". c #000000",
diff --git a/objects/Misc/pixmaps/diagram_as_element.xpm b/objects/Misc/pixmaps/diagram_as_element.xpm
index 11a8545..5f25782 100644
--- a/objects/Misc/pixmaps/diagram_as_element.xpm
+++ b/objects/Misc/pixmaps/diagram_as_element.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * diagram_as_element_xpm[] = {
+static const char * diagram_as_element_xpm[] = {
"22 22 206 2",
" c None",
". c #4E4E4E",
diff --git a/objects/Misc/pixmaps/grid_object.xpm b/objects/Misc/pixmaps/grid_object.xpm
index 9031bcf..dfe2ab6 100644
--- a/objects/Misc/pixmaps/grid_object.xpm
+++ b/objects/Misc/pixmaps/grid_object.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * grid_object_xpm[] = {
+static const char * grid_object_xpm[] = {
"22 22 3 1",
" c None",
". c #000000",
diff --git a/objects/Misc/pixmaps/measure.xpm b/objects/Misc/pixmaps/measure.xpm
index dd2bdd3..78b717a 100644
--- a/objects/Misc/pixmaps/measure.xpm
+++ b/objects/Misc/pixmaps/measure.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * measure_xpm[] = {
+static const char * measure_xpm[] = {
"22 22 4 1",
" c None",
". c #AAAAAA",
diff --git a/objects/Misc/pixmaps/newgroup.xpm b/objects/Misc/pixmaps/newgroup.xpm
index 3444cdb..dfd9d59 100644
--- a/objects/Misc/pixmaps/newgroup.xpm
+++ b/objects/Misc/pixmaps/newgroup.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * newgroup_icon[] = {
+static const char * newgroup_icon[] = {
"22 22 4 1",
" c None",
". c #00FC00",
diff --git a/objects/Misc/pixmaps/tree.xpm b/objects/Misc/pixmaps/tree.xpm
index 9be95d0..b5168eb 100644
--- a/objects/Misc/pixmaps/tree.xpm
+++ b/objects/Misc/pixmaps/tree.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * tree_xpm[] = {
+static const char * tree_xpm[] = {
/*
#
# (c)2007, Thomas Harding <thomas harding laposte net>
diff --git a/objects/Misc/tree.c b/objects/Misc/tree.c
index b244488..99a6b45 100644
--- a/objects/Misc/tree.c
+++ b/objects/Misc/tree.c
@@ -107,10 +107,10 @@ static ObjectTypeOps tree_type_ops =
DiaObjectType tree_type =
{
- "Misc - Tree", /* name */
- 0, /* version */
- (char **) tree_xpm, /* pixmap */
- &tree_type_ops /* ops */
+ "Misc - Tree", /* name */
+ 0, /* version */
+ tree_xpm, /* pixmap */
+ &tree_type_ops /* ops */
};
static ObjectOps tree_ops = {
diff --git a/objects/SADT/annotation.c b/objects/SADT/annotation.c
index 0ecda57..c274939 100644
--- a/objects/SADT/annotation.c
+++ b/objects/SADT/annotation.c
@@ -91,10 +91,10 @@ static ObjectTypeOps annotation_type_ops =
DiaObjectType sadtannotation_type =
{
- "SADT - annotation", /* name */
- 0, /* version */
- (char **) annotation_xpm, /* pixmap */
- &annotation_type_ops /* ops */
+ "SADT - annotation", /* name */
+ 0, /* version */
+ annotation_xpm, /* pixmap */
+ &annotation_type_ops /* ops */
};
static ObjectOps annotation_ops = {
diff --git a/objects/SADT/arrow.c b/objects/SADT/arrow.c
index 21c064e..f03af29 100644
--- a/objects/SADT/arrow.c
+++ b/objects/SADT/arrow.c
@@ -105,12 +105,11 @@ static ObjectTypeOps sadtarrow_type_ops =
DiaObjectType sadtarrow_type =
{
- "SADT - arrow", /* name */
+ "SADT - arrow", /* name */
/* Version 0 had no autorouting and so shouldn't have it set by default. */
- 1, /* version */
- (char **) arrow_xpm, /* pixmap */
-
- &sadtarrow_type_ops /* ops */
+ 1, /* version */
+ arrow_xpm, /* pixmap */
+ &sadtarrow_type_ops /* ops */
};
diff --git a/objects/SADT/box.c b/objects/SADT/box.c
index e2300b6..c099f3b 100644
--- a/objects/SADT/box.c
+++ b/objects/SADT/box.c
@@ -103,11 +103,10 @@ static ObjectTypeOps sadtbox_type_ops =
DiaObjectType sadtbox_type =
{
- "SADT - box", /* name */
- 0, /* version */
- (char **) sadtbox_xpm, /* pixmap */
-
- &sadtbox_type_ops /* ops */
+ "SADT - box", /* name */
+ 0, /* version */
+ sadtbox_xpm, /* pixmap */
+ &sadtbox_type_ops /* ops */
};
static ObjectOps sadtbox_ops = {
diff --git a/objects/SADT/pixmaps/annotation.xpm b/objects/SADT/pixmaps/annotation.xpm
index 791c7bb..16d268b 100644
--- a/objects/SADT/pixmaps/annotation.xpm
+++ b/objects/SADT/pixmaps/annotation.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * annotation_xpm[] = {
+static const char * annotation_xpm[] = {
"22 22 2 1",
" c None",
". c #000000",
diff --git a/objects/SADT/pixmaps/arrow.xpm b/objects/SADT/pixmaps/arrow.xpm
index a2978e8..e484074 100644
--- a/objects/SADT/pixmaps/arrow.xpm
+++ b/objects/SADT/pixmaps/arrow.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * arrow_xpm[] = {
+static const char * arrow_xpm[] = {
"22 22 4 1",
" c None",
". c #00FC00",
diff --git a/objects/SADT/pixmaps/sadtbox.xpm b/objects/SADT/pixmaps/sadtbox.xpm
index eb4d4c4..d227e8c 100644
--- a/objects/SADT/pixmaps/sadtbox.xpm
+++ b/objects/SADT/pixmaps/sadtbox.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * sadtbox_xpm[] = {
+static const char * sadtbox_xpm[] = {
"22 22 3 1",
" c None",
". c #000000",
diff --git a/objects/UML/activity.c b/objects/UML/activity.c
index 172a0ff..ddf3f4a 100644
--- a/objects/UML/activity.c
+++ b/objects/UML/activity.c
@@ -91,7 +91,7 @@ DiaObjectType activity_type =
{
"UML - Activity", /* name */
0, /* version */
- (char **) activity_xpm, /* pixmap */
+ activity_xpm, /* pixmap */
&activity_type_ops /* ops */
};
diff --git a/objects/UML/actor.c b/objects/UML/actor.c
index 858cf68..cdb59ad 100644
--- a/objects/UML/actor.c
+++ b/objects/UML/actor.c
@@ -88,11 +88,10 @@ static ObjectTypeOps actor_type_ops =
DiaObjectType actor_type =
{
- "UML - Actor", /* name */
- 0, /* version */
- (char **) actor_xpm, /* pixmap */
-
- &actor_type_ops /* ops */
+ "UML - Actor", /* name */
+ 0, /* version */
+ actor_xpm, /* pixmap */
+ &actor_type_ops /* ops */
};
static ObjectOps actor_ops = {
diff --git a/objects/UML/association.c b/objects/UML/association.c
index cda96fe..c0814cd 100644
--- a/objects/UML/association.c
+++ b/objects/UML/association.c
@@ -192,8 +192,7 @@ DiaObjectType association_type =
/* Version 0 had no autorouting and so shouldn't have it set by default. */
/* Version 1 was saving both ends separately without using StdProps */
2, /* version */
- (char **) association_xpm, /* pixmap */
-
+ association_xpm, /* pixmap */
&association_type_ops, /* ops */
NULL, /* pixmap_file */
0 /* default_user_data */
diff --git a/objects/UML/branch.c b/objects/UML/branch.c
index dd4a969..39b81c1 100644
--- a/objects/UML/branch.c
+++ b/objects/UML/branch.c
@@ -84,11 +84,10 @@ static ObjectTypeOps branch_type_ops =
DiaObjectType branch_type =
{
- "UML - Branch", /* name */
- 0, /* version */
- (char **) branch_xpm, /* pixmap */
-
- &branch_type_ops /* ops */
+ "UML - Branch", /* name */
+ 0, /* version */
+ branch_xpm, /* pixmap */
+ &branch_type_ops /* ops */
};
static ObjectOps branch_ops =
diff --git a/objects/UML/class.c b/objects/UML/class.c
index a27259f..79db445 100644
--- a/objects/UML/class.c
+++ b/objects/UML/class.c
@@ -97,10 +97,10 @@ static ObjectTypeOps umlclass_type_ops =
DiaObjectType umlclass_type =
{
"UML - Class", /* name */
- 0, /* version */
- (char **) umlclass_xpm, /* pixmap */
+ 0, /* version */
+ umlclass_xpm, /* pixmap */
- ¨class_type_ops, /* ops */
+ ¨class_type_ops, /* ops */
NULL,
(void*)0
};
diff --git a/objects/UML/classicon.c b/objects/UML/classicon.c
index 6bd627d..26730d3 100644
--- a/objects/UML/classicon.c
+++ b/objects/UML/classicon.c
@@ -99,11 +99,10 @@ static ObjectTypeOps classicon_type_ops =
DiaObjectType classicon_type =
{
- "UML - Classicon", /* name */
- 0, /* version */
- (char **) classicon_xpm, /* pixmap */
-
- &classicon_type_ops /* ops */
+ "UML - Classicon", /* name */
+ 0, /* version */
+ classicon_xpm, /* pixmap */
+ &classicon_type_ops /* ops */
};
static ObjectOps classicon_ops = {
diff --git a/objects/UML/component.c b/objects/UML/component.c
index 0e283fd..ce47943 100644
--- a/objects/UML/component.c
+++ b/objects/UML/component.c
@@ -91,11 +91,10 @@ static ObjectTypeOps component_type_ops =
DiaObjectType component_type =
{
- "UML - Component", /* name */
- 0, /* version */
- (char **) component_xpm, /* pixmap */
-
- &component_type_ops /* ops */
+ "UML - Component", /* name */
+ 0, /* version */
+ component_xpm, /* pixmap */
+ &component_type_ops /* ops */
};
static ObjectOps component_ops = {
diff --git a/objects/UML/component_feature.c b/objects/UML/component_feature.c
index 3552e21..4b04c32 100644
--- a/objects/UML/component_feature.c
+++ b/objects/UML/component_feature.c
@@ -117,13 +117,13 @@ static ObjectTypeOps compfeat_type_ops =
DiaObjectType compfeat_type =
{
- "UML - Component Feature", /* name */
+ "UML - Component Feature", /* name */
/* Version 0 had no autorouting and so shouldn't have it set by default. */
- 1, /* version */
- (char **) facet_xpm, /* pixmap */
- &compfeat_type_ops, /* ops */
- NULL, /* pixmap file */
- 0 /* default user data */
+ 1, /* version */
+ facet_xpm, /* pixmap */
+ &compfeat_type_ops, /* ops */
+ NULL, /* pixmap file */
+ 0 /* default user data */
};
static ObjectOps compfeat_ops = {
diff --git a/objects/UML/constraint.c b/objects/UML/constraint.c
index 59eddbe..35baf3b 100644
--- a/objects/UML/constraint.c
+++ b/objects/UML/constraint.c
@@ -96,10 +96,10 @@ static ObjectTypeOps constraint_type_ops =
DiaObjectType constraint_type =
{
- "UML - Constraint", /* name */
- 0, /* version */
- (char **) constraint_xpm, /* pixmap */
- &constraint_type_ops /* ops */
+ "UML - Constraint", /* name */
+ 0, /* version */
+ constraint_xpm, /* pixmap */
+ &constraint_type_ops /* ops */
};
static ObjectOps constraint_ops = {
diff --git a/objects/UML/dependency.c b/objects/UML/dependency.c
index 9db853e..2ca6957 100644
--- a/objects/UML/dependency.c
+++ b/objects/UML/dependency.c
@@ -101,10 +101,9 @@ DiaObjectType dependency_type =
{
"UML - Dependency", /* name */
/* Version 0 had no autorouting and so shouldn't have it set by default. */
- 1, /* version */
- (char **) dependency_xpm, /* pixmap */
-
- &dependency_type_ops, /* ops */
+ 1, /* version */
+ dependency_xpm, /* pixmap */
+ &dependency_type_ops, /* ops */
NULL, /* pixmap_file */
0 /* default_user_data */
};
diff --git a/objects/UML/fork.c b/objects/UML/fork.c
index ce6693e..4f8f0f7 100644
--- a/objects/UML/fork.c
+++ b/objects/UML/fork.c
@@ -84,11 +84,10 @@ static ObjectTypeOps fork_type_ops =
DiaObjectType fork_type =
{
- "UML - Fork", /* name */
- 0, /* version */
- (char **) fork_xpm, /* pixmap */
-
- &fork_type_ops /* ops */
+ "UML - Fork", /* name */
+ 0, /* version */
+ fork_xpm, /* pixmap */
+ &fork_type_ops /* ops */
};
static ObjectOps fork_ops =
diff --git a/objects/UML/generalization.c b/objects/UML/generalization.c
index 3214932..c4a9b01 100644
--- a/objects/UML/generalization.c
+++ b/objects/UML/generalization.c
@@ -96,14 +96,13 @@ static ObjectTypeOps generalization_type_ops =
DiaObjectType generalization_type =
{
- "UML - Generalization", /* name */
+ "UML - Generalization", /* name */
/* Version 0 had no autorouting and so shouldn't have it set by default. */
- 1, /* version */
- (char **) generalization_xpm, /* pixmap */
-
- &generalization_type_ops, /* ops */
- NULL, /* pixmap_file */
- 0 /* default_user_data */
+ 1, /* version */
+ generalization_xpm, /* pixmap */
+ &generalization_type_ops, /* ops */
+ NULL, /* pixmap_file */
+ 0 /* default_user_data */
};
static ObjectOps generalization_ops = {
diff --git a/objects/UML/implements.c b/objects/UML/implements.c
index 3e0e0e8..cce4fac 100644
--- a/objects/UML/implements.c
+++ b/objects/UML/implements.c
@@ -97,10 +97,10 @@ static ObjectTypeOps implements_type_ops =
DiaObjectType implements_type =
{
- "UML - Implements", /* name */
- 0, /* version */
- (char **) implements_xpm, /* pixmap */
- &implements_type_ops /* ops */
+ "UML - Implements", /* name */
+ 0, /* version */
+ implements_xpm, /* pixmap */
+ &implements_type_ops /* ops */
};
static ObjectOps implements_ops = {
diff --git a/objects/UML/large_package.c b/objects/UML/large_package.c
index 6228d6f..2530551 100644
--- a/objects/UML/large_package.c
+++ b/objects/UML/large_package.c
@@ -101,11 +101,10 @@ static ObjectTypeOps largepackage_type_ops =
DiaObjectType largepackage_type =
{
- "UML - LargePackage", /* name */
- 0, /* version */
- (char **) largepackage_xpm, /* pixmap */
-
- &largepackage_type_ops /* ops */
+ "UML - LargePackage", /* name */
+ 0, /* version */
+ largepackage_xpm, /* pixmap */
+ &largepackage_type_ops /* ops */
};
static ObjectOps largepackage_ops = {
diff --git a/objects/UML/lifeline.c b/objects/UML/lifeline.c
index f3c5a29..351eff2 100644
--- a/objects/UML/lifeline.c
+++ b/objects/UML/lifeline.c
@@ -130,10 +130,10 @@ static ObjectTypeOps lifeline_type_ops =
DiaObjectType lifeline_type =
{
- "UML - Lifeline", /* name */
- 0, /* version */
- (char **) lifeline_xpm, /* pixmap */
- &lifeline_type_ops /* ops */
+ "UML - Lifeline", /* name */
+ 0, /* version */
+ lifeline_xpm, /* pixmap */
+ &lifeline_type_ops /* ops */
};
static ObjectOps lifeline_ops = {
diff --git a/objects/UML/message.c b/objects/UML/message.c
index 5e90f27..0160383 100644
--- a/objects/UML/message.c
+++ b/objects/UML/message.c
@@ -108,10 +108,10 @@ static ObjectTypeOps message_type_ops =
DiaObjectType message_type =
{
- "UML - Message", /* name */
- 0, /* version */
- (char **) message_xpm, /* pixmap */
- &message_type_ops /* ops */
+ "UML - Message", /* name */
+ 0, /* version */
+ message_xpm, /* pixmap */
+ &message_type_ops /* ops */
};
static ObjectOps message_ops = {
diff --git a/objects/UML/node.c b/objects/UML/node.c
index 0a87267..89379ba 100644
--- a/objects/UML/node.c
+++ b/objects/UML/node.c
@@ -93,11 +93,10 @@ static ObjectTypeOps node_type_ops =
DiaObjectType node_type =
{
- "UML - Node", /* name */
- 0, /* version */
- (char **) node_xpm, /* pixmap */
-
- &node_type_ops /* ops */
+ "UML - Node", /* name */
+ 0, /* version */
+ node_xpm, /* pixmap */
+ &node_type_ops /* ops */
};
static ObjectOps node_ops =
diff --git a/objects/UML/note.c b/objects/UML/note.c
index 67d5a41..35c7940 100644
--- a/objects/UML/note.c
+++ b/objects/UML/note.c
@@ -86,11 +86,10 @@ static ObjectTypeOps note_type_ops =
DiaObjectType note_type =
{
- "UML - Note", /* name */
- 0, /* version */
- (char **) note_xpm, /* pixmap */
-
- ¬e_type_ops /* ops */
+ "UML - Note", /* name */
+ 0, /* version */
+ note_xpm, /* pixmap */
+ ¬e_type_ops /* ops */
};
static ObjectOps note_ops = {
diff --git a/objects/UML/object.c b/objects/UML/object.c
index d8f90bb..437bb0e 100644
--- a/objects/UML/object.c
+++ b/objects/UML/object.c
@@ -105,20 +105,18 @@ static ObjectTypeOps objet_type_ops =
/* Non-nice typo, needed for backwards compatibility. */
DiaObjectType objet_type =
{
- "UML - Objet", /* name */
- 0, /* version */
- (char **) object_xpm, /* pixmap */
-
- &objet_type_ops /* ops */
+ "UML - Objet", /* name */
+ 0, /* version */
+ object_xpm, /* pixmap */
+ &objet_type_ops /* ops */
};
DiaObjectType umlobject_type =
{
- "UML - Object", /* name */
- 0, /* version */
- (char **) object_xpm, /* pixmap */
-
- &objet_type_ops /* ops */
+ "UML - Object", /* name */
+ 0, /* version */
+ object_xpm, /* pixmap */
+ &objet_type_ops /* ops */
};
static ObjectOps objet_ops = {
diff --git a/objects/UML/pixmaps/activity.xpm b/objects/UML/pixmaps/activity.xpm
index 12bafe1..4c2ab2f 100644
--- a/objects/UML/pixmaps/activity.xpm
+++ b/objects/UML/pixmaps/activity.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * activity_xpm[] = {
+static const char * activity_xpm[] = {
/* width height num_colors chars_per_pixel */
"22 22 3 1",
/* colors */
diff --git a/objects/UML/pixmaps/actor.xpm b/objects/UML/pixmaps/actor.xpm
index c9cbae0..bbf07c2 100644
--- a/objects/UML/pixmaps/actor.xpm
+++ b/objects/UML/pixmaps/actor.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * actor_xpm[] = {
+static const char * actor_xpm[] = {
"22 22 2 1",
" c none",
". c black",
diff --git a/objects/UML/pixmaps/association.xpm b/objects/UML/pixmaps/association.xpm
index c9be41e..9481b69 100644
--- a/objects/UML/pixmaps/association.xpm
+++ b/objects/UML/pixmaps/association.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * association_xpm[] = {
+static const char * association_xpm[] = {
"22 22 2 1",
" c None",
". c #000000",
diff --git a/objects/UML/pixmaps/branch.xpm b/objects/UML/pixmaps/branch.xpm
index b24fabb..6b504df 100644
--- a/objects/UML/pixmaps/branch.xpm
+++ b/objects/UML/pixmaps/branch.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * branch_xpm[] = {
+static const char * branch_xpm[] = {
"22 22 4 1",
" c None",
". c #000000",
diff --git a/objects/UML/pixmaps/case.xpm b/objects/UML/pixmaps/case.xpm
index d4502e9..53ae562 100644
--- a/objects/UML/pixmaps/case.xpm
+++ b/objects/UML/pixmaps/case.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * case_xpm[] = {
+static const char * case_xpm[] = {
"22 22 2 1",
" c none",
". c black",
diff --git a/objects/UML/pixmaps/classicon.xpm b/objects/UML/pixmaps/classicon.xpm
index 70b0d0f..8446dee 100644
--- a/objects/UML/pixmaps/classicon.xpm
+++ b/objects/UML/pixmaps/classicon.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * classicon_xpm[] = {
+static const char * classicon_xpm[] = {
"22 22 3 1",
" c none",
". c black",
diff --git a/objects/UML/pixmaps/component.xpm b/objects/UML/pixmaps/component.xpm
index 6df9181..a093fb3 100644
--- a/objects/UML/pixmaps/component.xpm
+++ b/objects/UML/pixmaps/component.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * component_xpm[] = {
+static const char * component_xpm[] = {
"22 22 3 1",
" c None",
". c black",
diff --git a/objects/UML/pixmaps/constraint.xpm b/objects/UML/pixmaps/constraint.xpm
index 3f9508e..81f1e0e 100644
--- a/objects/UML/pixmaps/constraint.xpm
+++ b/objects/UML/pixmaps/constraint.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * constraint_xpm[] = {
+static const char * constraint_xpm[] = {
"22 22 2 1",
" c None",
". c #000000",
diff --git a/objects/UML/pixmaps/dependency.xpm b/objects/UML/pixmaps/dependency.xpm
index 1ab3a25..c425aae 100644
--- a/objects/UML/pixmaps/dependency.xpm
+++ b/objects/UML/pixmaps/dependency.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * dependency_xpm[] = {
+static const char * dependency_xpm[] = {
"22 22 2 1",
" c None",
". c #000000",
diff --git a/objects/UML/pixmaps/facet.xpm b/objects/UML/pixmaps/facet.xpm
index ce44c04..d2cc9ae 100644
--- a/objects/UML/pixmaps/facet.xpm
+++ b/objects/UML/pixmaps/facet.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * facet_xpm[] = {
+static const char * facet_xpm[] = {
"22 22 3 1",
" c None",
". c #000000",
diff --git a/objects/UML/pixmaps/fork.xpm b/objects/UML/pixmaps/fork.xpm
index 745e26c..0fb7a3a 100644
--- a/objects/UML/pixmaps/fork.xpm
+++ b/objects/UML/pixmaps/fork.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * fork_xpm[] = {
+static const char * fork_xpm[] = {
"22 22 2 1",
" c None",
". c black",
diff --git a/objects/UML/pixmaps/generalization.xpm b/objects/UML/pixmaps/generalization.xpm
index 9589681..b8ef8a8 100644
--- a/objects/UML/pixmaps/generalization.xpm
+++ b/objects/UML/pixmaps/generalization.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * generalization_xpm[] = {
+static const char * generalization_xpm[] = {
"22 22 3 1",
" c None",
". c #000000",
diff --git a/objects/UML/pixmaps/implements.xpm b/objects/UML/pixmaps/implements.xpm
index 563c5e1..700d818 100644
--- a/objects/UML/pixmaps/implements.xpm
+++ b/objects/UML/pixmaps/implements.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * implements_xpm[] = {
+static const char * implements_xpm[] = {
"22 22 3 1",
" c None",
". c #000000",
diff --git a/objects/UML/pixmaps/largepackage.xpm b/objects/UML/pixmaps/largepackage.xpm
index f409f03..2ff4323 100644
--- a/objects/UML/pixmaps/largepackage.xpm
+++ b/objects/UML/pixmaps/largepackage.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * largepackage_xpm[] = {
+static const char * largepackage_xpm[] = {
"22 22 3 1",
" c None",
". c #000000",
diff --git a/objects/UML/pixmaps/lifeline.xpm b/objects/UML/pixmaps/lifeline.xpm
index c2ae1f5..75ed4df 100644
--- a/objects/UML/pixmaps/lifeline.xpm
+++ b/objects/UML/pixmaps/lifeline.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * lifeline_xpm[] = {
+static const char * lifeline_xpm[] = {
"22 22 3 1",
" c None",
". c black",
diff --git a/objects/UML/pixmaps/message.xpm b/objects/UML/pixmaps/message.xpm
index ca982a4..7e386a8 100644
--- a/objects/UML/pixmaps/message.xpm
+++ b/objects/UML/pixmaps/message.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * message_xpm[] = {
+static const char * message_xpm[] = {
"22 22 3 1",
" c None",
". c white",
diff --git a/objects/UML/pixmaps/node.xpm b/objects/UML/pixmaps/node.xpm
index 8663134..a65239e 100644
--- a/objects/UML/pixmaps/node.xpm
+++ b/objects/UML/pixmaps/node.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * node_xpm[] = {
+static const char * node_xpm[] = {
"22 22 3 1",
" c None",
". c #000000",
diff --git a/objects/UML/pixmaps/note.xpm b/objects/UML/pixmaps/note.xpm
index 130d43a..cbaf0eb 100644
--- a/objects/UML/pixmaps/note.xpm
+++ b/objects/UML/pixmaps/note.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * note_xpm[] = {
+static const char * note_xpm[] = {
"22 22 3 1",
" c None",
". c #000000",
diff --git a/objects/UML/pixmaps/object.xpm b/objects/UML/pixmaps/object.xpm
index 0d58252..a99cc7f 100644
--- a/objects/UML/pixmaps/object.xpm
+++ b/objects/UML/pixmaps/object.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * object_xpm[] = {
+static const char * object_xpm[] = {
"22 22 2 1",
" c None",
". c black",
diff --git a/objects/UML/pixmaps/realizes.xpm b/objects/UML/pixmaps/realizes.xpm
index 15b3358..ef7e5ad 100644
--- a/objects/UML/pixmaps/realizes.xpm
+++ b/objects/UML/pixmaps/realizes.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * realizes_xpm[] = {
+static const char * realizes_xpm[] = {
"22 22 3 1",
" c None",
". c #000000",
diff --git a/objects/UML/pixmaps/smallpackage.xpm b/objects/UML/pixmaps/smallpackage.xpm
index 38252b5..44c8e24 100644
--- a/objects/UML/pixmaps/smallpackage.xpm
+++ b/objects/UML/pixmaps/smallpackage.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * smallpackage_xpm[] = {
+static const char * smallpackage_xpm[] = {
"22 22 3 1",
" c None",
". c #000000",
diff --git a/objects/UML/pixmaps/state.xpm b/objects/UML/pixmaps/state.xpm
index 8d0fe52..7c670e9 100644
--- a/objects/UML/pixmaps/state.xpm
+++ b/objects/UML/pixmaps/state.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * state_xpm[] = {
+static const char * state_xpm[] = {
/* width height num_colors chars_per_pixel */
"22 22 3 1",
/* colors */
diff --git a/objects/UML/pixmaps/state_term.xpm b/objects/UML/pixmaps/state_term.xpm
index a4ffd93..cb67db3 100644
--- a/objects/UML/pixmaps/state_term.xpm
+++ b/objects/UML/pixmaps/state_term.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * state_term_xpm[] = {
+static const char * state_term_xpm[] = {
"22 22 3 1",
" c none",
". c black",
diff --git a/objects/UML/pixmaps/transition.xpm b/objects/UML/pixmaps/transition.xpm
index b0f1283..3dbdf66 100644
--- a/objects/UML/pixmaps/transition.xpm
+++ b/objects/UML/pixmaps/transition.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * transition_xpm[] = {
+static const char * transition_xpm[] = {
"22 22 3 1",
" c None",
". c #000000",
diff --git a/objects/UML/pixmaps/umlclass.xpm b/objects/UML/pixmaps/umlclass.xpm
index 293a134..9656623 100644
--- a/objects/UML/pixmaps/umlclass.xpm
+++ b/objects/UML/pixmaps/umlclass.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * umlclass_xpm[] = {
+static const char * umlclass_xpm[] = {
"22 22 3 1",
" c None",
". c #000000",
diff --git a/objects/UML/realizes.c b/objects/UML/realizes.c
index 4194cb0..30c7c41 100644
--- a/objects/UML/realizes.c
+++ b/objects/UML/realizes.c
@@ -98,12 +98,11 @@ DiaObjectType realizes_type =
{
"UML - Realizes", /* name */
/* Version 0 had no autorouting and so shouldn't have it set by default. */
- 1, /* version */
- (char **) realizes_xpm, /* pixmap */
-
- &realizes_type_ops, /* ops */
- NULL, /* pixmap_file */
- 0 /* default_user_data */
+ 1, /* version */
+ realizes_xpm, /* pixmap */
+ &realizes_type_ops, /* ops */
+ NULL, /* pixmap_file */
+ 0 /* default_user_data */
};
static ObjectOps realizes_ops = {
diff --git a/objects/UML/small_package.c b/objects/UML/small_package.c
index 43955dc..72bbc31 100644
--- a/objects/UML/small_package.c
+++ b/objects/UML/small_package.c
@@ -95,11 +95,10 @@ static ObjectTypeOps smallpackage_type_ops =
DiaObjectType smallpackage_type =
{
- "UML - SmallPackage", /* name */
- 0, /* version */
- (char **) smallpackage_xpm, /* pixmap */
-
- &smallpackage_type_ops /* ops */
+ "UML - SmallPackage", /* name */
+ 0, /* version */
+ smallpackage_xpm, /* pixmap */
+ &smallpackage_type_ops /* ops */
};
static ObjectOps smallpackage_ops = {
diff --git a/objects/UML/state.c b/objects/UML/state.c
index 193ddf6..07017b1 100644
--- a/objects/UML/state.c
+++ b/objects/UML/state.c
@@ -112,11 +112,10 @@ static ObjectTypeOps state_type_ops =
DiaObjectType state_type =
{
- "UML - State", /* name */
- 0, /* version */
- (char **) state_xpm, /* pixmap */
-
- &state_type_ops /* ops */
+ "UML - State", /* name */
+ 0, /* version */
+ state_xpm, /* pixmap */
+ &state_type_ops /* ops */
};
static ObjectOps state_ops = {
diff --git a/objects/UML/state_term.c b/objects/UML/state_term.c
index 46aa7ab..9d2dde8 100644
--- a/objects/UML/state_term.c
+++ b/objects/UML/state_term.c
@@ -93,11 +93,10 @@ static ObjectTypeOps state_type_ops =
DiaObjectType state_term_type =
{
- "UML - State Term", /* name */
- 0, /* version */
- (char **) state_term_xpm, /* pixmap */
-
- &state_type_ops /* ops */
+ "UML - State Term", /* name */
+ 0, /* version */
+ state_term_xpm, /* pixmap */
+ &state_type_ops /* ops */
};
static ObjectOps state_ops = {
diff --git a/objects/UML/transition.c b/objects/UML/transition.c
index 0180a65..04636f0 100644
--- a/objects/UML/transition.c
+++ b/objects/UML/transition.c
@@ -109,7 +109,7 @@ DiaObjectType uml_transition_type = {
/* Version 0 had no autorouting and so shouldn't have it set by default. */
/* version 0 and 1 expects the arrow to be drawn on the wrong end */
2, /* version */
- (char **) transition_xpm, /* Pixmap */
+ transition_xpm, /* Pixmap */
¨_transition_type_ops
};
diff --git a/objects/UML/usecase.c b/objects/UML/usecase.c
index 2ea2f7e..3159940 100644
--- a/objects/UML/usecase.c
+++ b/objects/UML/usecase.c
@@ -100,11 +100,10 @@ static ObjectTypeOps usecase_type_ops =
DiaObjectType usecase_type =
{
- "UML - Usecase", /* name */
- 0, /* version */
- (char **) case_xpm, /* pixmap */
-
- &usecase_type_ops /* ops */
+ "UML - Usecase", /* name */
+ 0, /* version */
+ case_xpm, /* pixmap */
+ &usecase_type_ops /* ops */
};
static ObjectOps usecase_ops = {
diff --git a/objects/chronogram/chronoline.c b/objects/chronogram/chronoline.c
index fd515e8..7013226 100644
--- a/objects/chronogram/chronoline.c
+++ b/objects/chronogram/chronoline.c
@@ -114,11 +114,10 @@ static ObjectTypeOps chronoline_type_ops =
DiaObjectType chronoline_type =
{
- "chronogram - line", /* name */
- 0, /* version */
- (char **) chronoline_xpm, /* pixmap */
-
- &chronoline_type_ops /* ops */
+ "chronogram - line", /* name */
+ 0, /* version */
+ chronoline_xpm, /* pixmap */
+ &chronoline_type_ops /* ops */
};
static ObjectOps chronoline_ops = {
diff --git a/objects/chronogram/chronoref.c b/objects/chronogram/chronoref.c
index 1e607bc..aa207bc 100644
--- a/objects/chronogram/chronoref.c
+++ b/objects/chronogram/chronoref.c
@@ -107,11 +107,10 @@ static ObjectTypeOps chronoref_type_ops =
DiaObjectType chronoref_type =
{
- "chronogram - reference", /* name */
- 0, /* version */
- (char **) chronoref_xpm, /* pixmap */
-
- &chronoref_type_ops /* ops */
+ "chronogram - reference", /* name */
+ 0, /* version */
+ chronoref_xpm, /* pixmap */
+ &chronoref_type_ops /* ops */
};
diff --git a/objects/chronogram/pixmaps/chronoline.xpm b/objects/chronogram/pixmaps/chronoline.xpm
index 6f01f90..094a657 100644
--- a/objects/chronogram/pixmaps/chronoline.xpm
+++ b/objects/chronogram/pixmaps/chronoline.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * chronoline_xpm[] = {
+static const char * chronoline_xpm[] = {
"22 22 4 1",
" c None",
". c #FF0000",
diff --git a/objects/chronogram/pixmaps/chronoref.xpm b/objects/chronogram/pixmaps/chronoref.xpm
index f98de40..c2ff709 100644
--- a/objects/chronogram/pixmaps/chronoref.xpm
+++ b/objects/chronogram/pixmaps/chronoref.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * chronoref_xpm[] = {
+static const char * chronoref_xpm[] = {
"22 22 2 1",
" c None",
". c #000000",
diff --git a/objects/custom/custom_object.c b/objects/custom/custom_object.c
index 4eec912..ea5433e 100644
--- a/objects/custom/custom_object.c
+++ b/objects/custom/custom_object.c
@@ -164,10 +164,10 @@ G_MODULE_EXPORT
DiaObjectType custom_type =
{
"Custom - Generic", /* name */
- 1, /* version 0 had no configurable (text-)padding */
- (char **) custom_xpm, /* pixmap */
-
- &custom_type_ops /* ops */
+ /* version 0 had no configurable (text-)padding */
+ 1, /* version */
+ custom_xpm, /* pixmap */
+ &custom_type_ops /* ops */
};
static ObjectOps custom_ops = {
diff --git a/objects/custom/pixmaps/custom.xpm b/objects/custom/pixmaps/custom.xpm
index 87a9042..79eca7f 100644
--- a/objects/custom/pixmaps/custom.xpm
+++ b/objects/custom/pixmaps/custom.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * custom_xpm[] = {
+static const char * custom_xpm[] = {
"22 22 3 1",
" c None",
". c #7F0000",
diff --git a/objects/custom_lines/pixmaps/default.xpm b/objects/custom_lines/pixmaps/default.xpm
index 456b0d9..e16304d 100644
--- a/objects/custom_lines/pixmaps/default.xpm
+++ b/objects/custom_lines/pixmaps/default.xpm
@@ -23,7 +23,7 @@
*/
/* XPM */
-static char * default_xpm[] = {
+static const char * default_xpm[] = {
"23 23 3 1",
" c None",
". c white",
diff --git a/objects/flowchart/box.c b/objects/flowchart/box.c
index 90bae4d..f4b25dd 100644
--- a/objects/flowchart/box.c
+++ b/objects/flowchart/box.c
@@ -112,11 +112,10 @@ static ObjectTypeOps box_type_ops =
DiaObjectType fc_box_type =
{
- "Flowchart - Box", /* name */
- 0, /* version */
- (char **) box_xpm, /* pixmap */
-
- &box_type_ops /* ops */
+ "Flowchart - Box", /* name */
+ 0, /* version */
+ box_xpm, /* pixmap */
+ &box_type_ops /* ops */
};
static ObjectOps box_ops = {
diff --git a/objects/flowchart/diamond.c b/objects/flowchart/diamond.c
index fd7c26b..5b3f342 100644
--- a/objects/flowchart/diamond.c
+++ b/objects/flowchart/diamond.c
@@ -113,11 +113,10 @@ static ObjectTypeOps diamond_type_ops =
DiaObjectType diamond_type =
{
- "Flowchart - Diamond", /* name */
- 0, /* version */
- (char **) diamond_xpm, /* pixmap */
-
- &diamond_type_ops /* ops */
+ "Flowchart - Diamond", /* name */
+ 0, /* version */
+ diamond_xpm, /* pixmap */
+ &diamond_type_ops /* ops */
};
static ObjectOps diamond_ops = {
diff --git a/objects/flowchart/ellipse.c b/objects/flowchart/ellipse.c
index 3d7fe7c..b786e26 100644
--- a/objects/flowchart/ellipse.c
+++ b/objects/flowchart/ellipse.c
@@ -112,11 +112,10 @@ static ObjectTypeOps ellipse_type_ops =
DiaObjectType fc_ellipse_type =
{
- "Flowchart - Ellipse", /* name */
- 0, /* version */
- (char **) ellipse_xpm, /* pixmap */
-
- &ellipse_type_ops /* ops */
+ "Flowchart - Ellipse", /* name */
+ 0, /* version */
+ ellipse_xpm, /* pixmap */
+ &ellipse_type_ops /* ops */
};
static ObjectOps ellipse_ops = {
diff --git a/objects/flowchart/parallelogram.c b/objects/flowchart/parallelogram.c
index 2a201af..be7b528 100644
--- a/objects/flowchart/parallelogram.c
+++ b/objects/flowchart/parallelogram.c
@@ -114,11 +114,10 @@ static ObjectTypeOps pgram_type_ops =
DiaObjectType pgram_type =
{
- "Flowchart - Parallelogram", /* name */
- 0, /* version */
- (char **) pgram_xpm, /* pixmap */
-
- &pgram_type_ops /* ops */
+ "Flowchart - Parallelogram", /* name */
+ 0, /* version */
+ pgram_xpm, /* pixmap */
+ &pgram_type_ops /* ops */
};
static ObjectOps pgram_ops = {
diff --git a/objects/flowchart/pixmaps/box.xpm b/objects/flowchart/pixmaps/box.xpm
index 398905d..62b7762 100644
--- a/objects/flowchart/pixmaps/box.xpm
+++ b/objects/flowchart/pixmaps/box.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * box_xpm[] = {
+static const char * box_xpm[] = {
"22 22 3 1",
" c None",
". c #000000",
diff --git a/objects/flowchart/pixmaps/diamond.xpm b/objects/flowchart/pixmaps/diamond.xpm
index 06d1c18..698db08 100644
--- a/objects/flowchart/pixmaps/diamond.xpm
+++ b/objects/flowchart/pixmaps/diamond.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * diamond_xpm[] = {
+static const char * diamond_xpm[] = {
"22 22 3 1",
" c None",
". c #000000",
diff --git a/objects/flowchart/pixmaps/ellipse.xpm b/objects/flowchart/pixmaps/ellipse.xpm
index a194739..1ac502b 100644
--- a/objects/flowchart/pixmaps/ellipse.xpm
+++ b/objects/flowchart/pixmaps/ellipse.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * ellipse_xpm[] = {
+static const char * ellipse_xpm[] = {
"22 22 3 1",
" c None",
". c #000000",
diff --git a/objects/flowchart/pixmaps/pgram.xpm b/objects/flowchart/pixmaps/pgram.xpm
index bd6b7d0..37367a6 100644
--- a/objects/flowchart/pixmaps/pgram.xpm
+++ b/objects/flowchart/pixmaps/pgram.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * pgram_xpm[] = {
+static const char * pgram_xpm[] = {
"22 22 3 1",
" c None",
". c #000000",
diff --git a/objects/network/basestation.c b/objects/network/basestation.c
index a4d02d3..7dd2728 100644
--- a/objects/network/basestation.c
+++ b/objects/network/basestation.c
@@ -98,7 +98,7 @@ DiaObjectType basestation_type =
{
"Network - Base Station", /* name */
0, /* version */
- (char **) basestation_xpm, /* pixmap */
+ (const char **) basestation_xpm, /* pixmap */
&basestation_type_ops /* ops */
};
diff --git a/objects/network/bus.c b/objects/network/bus.c
index 2a7cc60..fc1b42a 100644
--- a/objects/network/bus.c
+++ b/objects/network/bus.c
@@ -109,7 +109,7 @@ DiaObjectType bus_type =
{
"Network - Bus", /* name */
0, /* version */
- (char **) bus_xpm, /* pixmap */
+ (const char **) bus_xpm, /* pixmap */
&bus_type_ops /* ops */
};
@@ -117,7 +117,7 @@ DiaObjectType bus_type_std = /* Old mistake, left for backwards compatibility */
{
"Standard - Bus", /* name */
0, /* version */
- (char **) bus_xpm, /* pixmap */
+ (const char **) bus_xpm, /* pixmap */
&bus_type_ops /* ops */
};
diff --git a/objects/network/radiocell.c b/objects/network/radiocell.c
index 657ad4b..636156d 100644
--- a/objects/network/radiocell.c
+++ b/objects/network/radiocell.c
@@ -91,7 +91,7 @@ DiaObjectType radiocell_type =
{
"Network - Radio Cell", /* name */
0, /* version */
- (char **) radiocell_xpm, /* pixmap */
+ (const char **) radiocell_xpm, /* pixmap */
&radiocell_type_ops /* ops */
};
diff --git a/objects/network/wanlink.c b/objects/network/wanlink.c
index 91825e6..143c315 100644
--- a/objects/network/wanlink.c
+++ b/objects/network/wanlink.c
@@ -108,7 +108,7 @@ DiaObjectType wanlink_type =
{
"Network - WAN Link", /* name */
1, /* version */
- (char **) wanlink_xpm, /* pixmap */
+ (const char **) wanlink_xpm, /* pixmap */
&wanlink_type_ops /* ops */
};
diff --git a/objects/standard/arc.c b/objects/standard/arc.c
index d72d981..1e8bce6 100644
--- a/objects/standard/arc.c
+++ b/objects/standard/arc.c
@@ -140,7 +140,7 @@ DiaObjectType arc_type =
{
"Standard - Arc", /* name */
0, /* version */
- (char **) arc_icon, /* pixmap */
+ (const gchar **) arc_icon, /* pixmap */
&arc_type_ops, /* ops */
NULL, /* pixmap_file */
diff --git a/objects/standard/bezier.c b/objects/standard/bezier.c
index 9a75749..41e85af 100644
--- a/objects/standard/bezier.c
+++ b/objects/standard/bezier.c
@@ -103,7 +103,7 @@ static DiaObjectType bezierline_type =
{
"Standard - BezierLine", /* name */
0, /* version */
- (char **) bezierline_icon, /* pixmap */
+ (const char **) bezierline_icon, /* pixmap */
&bezierline_type_ops, /* ops */
NULL, /* pixmap_file */
diff --git a/objects/standard/beziergon.c b/objects/standard/beziergon.c
index db43886..7fde315 100644
--- a/objects/standard/beziergon.c
+++ b/objects/standard/beziergon.c
@@ -123,7 +123,7 @@ static DiaObjectType beziergon_type =
{
"Standard - Beziergon", /* name */
0, /* version */
- (char **) beziergon_icon, /* pixmap */
+ (const char **) beziergon_icon, /* pixmap */
&beziergon_type_ops, /* ops */
NULL, /* pixmap_file */
diff --git a/objects/standard/box.c b/objects/standard/box.c
index 207be66..890113c 100644
--- a/objects/standard/box.c
+++ b/objects/standard/box.c
@@ -145,7 +145,7 @@ DiaObjectType box_type =
{
"Standard - Box", /* name */
0, /* version */
- (char **) box_icon, /* pixmap */
+ (const char **) box_icon, /* pixmap */
&box_type_ops, /* ops */
NULL, /* pixmap_file */
diff --git a/objects/standard/ellipse.c b/objects/standard/ellipse.c
index 34fe66b..a08664a 100644
--- a/objects/standard/ellipse.c
+++ b/objects/standard/ellipse.c
@@ -135,7 +135,7 @@ DiaObjectType ellipse_type =
{
"Standard - Ellipse", /* name */
0, /* version */
- (char **) ellipse_icon, /* pixmap */
+ (const char **) ellipse_icon, /* pixmap */
&ellipse_type_ops, /* ops */
NULL,
diff --git a/objects/standard/image.c b/objects/standard/image.c
index 661b586..b1c2d8c 100644
--- a/objects/standard/image.c
+++ b/objects/standard/image.c
@@ -134,7 +134,7 @@ DiaObjectType image_type =
{
"Standard - Image", /* name */
0, /* version */
- (char **) image_icon, /* pixmap */
+ (const char **) image_icon, /* pixmap */
&image_type_ops, /* ops */
NULL,
diff --git a/objects/standard/line.c b/objects/standard/line.c
index 1403a2a..480dcaa 100644
--- a/objects/standard/line.c
+++ b/objects/standard/line.c
@@ -155,7 +155,7 @@ DiaObjectType line_type =
{
"Standard - Line", /* name */
0, /* version */
- (char **) line_icon, /* pixmap */
+ (const char **) line_icon, /* pixmap */
&line_type_ops, /* ops */
NULL,
0,
diff --git a/objects/standard/outline.c b/objects/standard/outline.c
index a01a0f7..b5a1112 100644
--- a/objects/standard/outline.c
+++ b/objects/standard/outline.c
@@ -129,7 +129,7 @@ static DiaObjectType outline_type =
{
"Standard - Outline", /* name */
0, /* version */
- (char **) outline_icon, /* pixmap */
+ (const char **) outline_icon, /* pixmap */
&outline_type_ops, /* ops */
NULL, /* pixmap_file */
diff --git a/objects/standard/polygon.c b/objects/standard/polygon.c
index 09017f4..73d803b 100644
--- a/objects/standard/polygon.c
+++ b/objects/standard/polygon.c
@@ -125,7 +125,7 @@ static DiaObjectType polygon_type =
{
"Standard - Polygon", /* name */
0, /* version */
- (char **) polygon_icon, /* pixmap */
+ (const char **) polygon_icon, /* pixmap */
&polygon_type_ops, /* ops */
NULL, /* pixmap_file */
diff --git a/objects/standard/polyline.c b/objects/standard/polyline.c
index 9ca19ca..f759366 100644
--- a/objects/standard/polyline.c
+++ b/objects/standard/polyline.c
@@ -136,7 +136,7 @@ static DiaObjectType polyline_type =
{
"Standard - PolyLine", /* name */
0, /* version */
- (char **) polyline_icon, /* pixmap */
+ (const char **) polyline_icon, /* pixmap */
&polyline_type_ops, /* ops */
NULL, /* pixmap_file */
diff --git a/objects/standard/textobj.c b/objects/standard/textobj.c
index 1656c47..be428ab 100644
--- a/objects/standard/textobj.c
+++ b/objects/standard/textobj.c
@@ -147,7 +147,7 @@ DiaObjectType textobj_type =
{
"Standard - Text", /* name */
1, /* version */
- (char **) text_icon, /* pixmap */
+ (const char **) text_icon, /* pixmap */
&textobj_type_ops, /* ops */
NULL,
0,
diff --git a/objects/standard/zigzagline.c b/objects/standard/zigzagline.c
index dff38a1..e46866c 100644
--- a/objects/standard/zigzagline.c
+++ b/objects/standard/zigzagline.c
@@ -126,7 +126,7 @@ static DiaObjectType zigzagline_type =
"Standard - ZigZagLine", /* name */
/* Version 0 had no autorouting and so shouldn't have it set by default. */
1, /* version */
- (char **) zigzagline_icon, /* pixmap */
+ (const char **) zigzagline_icon, /* pixmap */
&zigzagline_type_ops, /* ops */
NULL,
0,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
