[dia/zbrown/test-build: 3/7] enums: move LineCaps into the Dia namespace
- From: Zander Brown <zbrown src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dia/zbrown/test-build: 3/7] enums: move LineCaps into the Dia namespace
- Date: Mon, 27 Sep 2021 08:21:40 +0000 (UTC)
commit ac38cf2ae8d2ea3349467e2fffdbfc24d265ceb9
Author: Zander Brown <zbrown gnome org>
Date: Sun Sep 26 18:49:53 2021 +0100
enums: move LineCaps into the Dia namespace
lib/arrows.c | 38 ++++++++++++++--------------
lib/bezier-common.c | 2 +-
lib/dia-enums.h | 12 ++++-----
lib/dia_svg.c | 10 ++++----
lib/dia_svg.h | 2 +-
lib/diaimportrenderer.c | 7 +++---
lib/diaimportrenderer.h | 2 +-
lib/diapathrenderer.c | 4 ++-
lib/diarenderer.c | 13 +++++-----
lib/diarenderer.h | 4 +--
lib/diasvgrenderer.c | 20 +++++++--------
lib/diatransformrenderer.c | 8 +++---
lib/properties.c | 6 ++---
lib/properties.h | 6 ++---
lib/renderer/diacairo-renderer.c | 13 +++++-----
lib/standard-path.c | 2 +-
objects/Database/reference.c | 2 +-
objects/ER/participation.c | 2 +-
objects/FS/flow-ortho.c | 2 +-
objects/FS/flow.c | 2 +-
objects/GRAFCET/action.c | 2 +-
objects/GRAFCET/condition.c | 2 +-
objects/GRAFCET/transition.c | 2 +-
objects/GRAFCET/vector.c | 2 +-
objects/Istar/link.c | 2 +-
objects/Jackson/phenomenon.c | 2 +-
objects/KAOS/metaandorrel.c | 2 +-
objects/KAOS/metabinrel.c | 2 +-
objects/Misc/measure.c | 2 +-
objects/Misc/n_gon.c | 2 +-
objects/Misc/tree.c | 2 +-
objects/SADT/annotation.c | 2 +-
objects/SADT/arrow.c | 2 +-
objects/UML/association.c | 2 +-
objects/UML/component_feature.c | 2 +-
objects/UML/constraint.c | 2 +-
objects/UML/dependency.c | 2 +-
objects/UML/generalization.c | 2 +-
objects/UML/implements.c | 2 +-
objects/UML/message.c | 2 +-
objects/UML/realizes.c | 2 +-
objects/UML/transition.c | 2 +-
objects/custom/custom_object.c | 16 ++++++------
objects/custom/shape_info.c | 2 +-
objects/network/bus.c | 2 +-
objects/network/radiocell.c | 2 +-
objects/standard/arc.c | 23 +++++++++--------
objects/standard/bezier.c | 19 +++++++-------
objects/standard/beziergon.c | 2 +-
objects/standard/box.c | 2 +-
objects/standard/line.c | 21 +++++++++-------
objects/standard/outline.c | 2 +-
objects/standard/polygon.c | 2 +-
objects/standard/polyline.c | 8 +++---
objects/standard/zigzagline.c | 21 +++++++++-------
plug-ins/cgm/cgm.c | 39 ++++++++++++++--------------
plug-ins/drs/dia-render-script-import.c | 22 +++++++++-------
plug-ins/drs/dia-render-script-renderer.c | 14 +++++------
plug-ins/drs/dia-render-script.c | 2 +-
plug-ins/dxf/dxf-export.c | 3 ++-
plug-ins/hpgl/hpgl.c | 25 +++++++++---------
plug-ins/metapost/render_metapost.c | 42 ++++++++++++++++---------------
plug-ins/metapost/render_metapost.h | 2 +-
plug-ins/pdf/pdf-import.cpp | 21 +++++++++-------
plug-ins/pgf/render_pgf.c | 14 +++++------
plug-ins/postscript/diapsrenderer.c | 33 ++++++++++++------------
plug-ins/pstricks/render_pstricks.c | 37 ++++++++++++++-------------
plug-ins/python/pydia-render.c | 14 +++++------
plug-ins/svg/svg-import.c | 2 +-
plug-ins/vdx/vdx-export.c | 13 +++++-----
plug-ins/wmf/wmf.cpp | 28 +++++++++++----------
plug-ins/wpg/wpg.c | 25 +++++++++---------
plug-ins/xfig/xfig-export.c | 4 +--
73 files changed, 347 insertions(+), 316 deletions(-)
---
diff --git a/lib/arrows.c b/lib/arrows.c
index 9581adc40..475a3e06a 100644
--- a/lib/arrows.c
+++ b/lib/arrows.c
@@ -516,7 +516,7 @@ draw_none_or_many (DiaRenderer *renderer,
dia_renderer_set_linewidth (renderer, linewidth);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
draw_empty_ellipse (renderer,
&second_to,
@@ -620,7 +620,7 @@ draw_one_or_many (DiaRenderer *renderer,
dia_renderer_set_linewidth (renderer, linewidth);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
dia_renderer_draw_line (renderer, &poly[0], &poly[2], fg_color);
}
@@ -738,7 +738,7 @@ draw_lines (DiaRenderer *renderer,
dia_renderer_set_linewidth (renderer, linewidth);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
dia_renderer_draw_polyline (renderer, poly, 3, fg_color);
}
@@ -784,7 +784,7 @@ draw_fill_ellipse (DiaRenderer *renderer,
dia_renderer_set_linewidth (renderer, linewidth);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
if (!bg_color) {
/* no bg_color means filled ellipse ; we then compensate for the line width
@@ -865,7 +865,7 @@ draw_empty_ellipse (DiaRenderer *renderer,
dia_renderer_set_linewidth (renderer, linewidth);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
point_copy (&vl,from);
point_sub (&vl,to);
@@ -975,7 +975,7 @@ draw_fill_box (DiaRenderer *renderer,
dia_renderer_set_linewidth (renderer, linewidth);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
if (fg_color == bg_color) {
/* Filled dot */
@@ -1040,7 +1040,7 @@ draw_fill_dot (DiaRenderer *renderer,
dia_renderer_set_linewidth (renderer, linewidth);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
if (fg_color == bg_color) {
/* Filled dot */
@@ -1134,7 +1134,7 @@ draw_integral (DiaRenderer *renderer,
dia_renderer_set_linewidth (renderer, linewidth);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
point_copy (&vl,from); point_sub (&vl,to);
if (point_len (&vl) > 0)
@@ -1237,7 +1237,7 @@ draw_slashed (DiaRenderer *renderer,
dia_renderer_set_linewidth (renderer, linewidth);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
dia_renderer_draw_line (renderer, &poly[0], &poly[1], fg_color);
dia_renderer_draw_line (renderer, &poly[2], &poly[3], fg_color);
@@ -1326,7 +1326,7 @@ draw_halfhead (DiaRenderer *renderer,
dia_renderer_set_linewidth (renderer, linewidth);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
dia_renderer_draw_polyline (renderer, poly, 3, fg_color);
}
@@ -1449,7 +1449,7 @@ draw_diamond (DiaRenderer *renderer,
dia_renderer_set_linewidth (renderer, linewidth);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
dia_renderer_draw_polygon (renderer, poly, 4, fill, stroke);
}
@@ -1483,7 +1483,7 @@ draw_half_diamond (DiaRenderer *renderer,
dia_renderer_set_linewidth (renderer, linewidth);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
dia_renderer_draw_polyline (renderer, poly+1, 3, fg_color);
}
@@ -1574,7 +1574,7 @@ draw_slashed_cross (DiaRenderer *renderer,
dia_renderer_set_linewidth (renderer, linewidth);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
dia_renderer_draw_line (renderer, &poly[0],&poly[1], fg_color);
dia_renderer_draw_line (renderer, &poly[2],&poly[3], fg_color);
@@ -1651,7 +1651,7 @@ draw_backslash (DiaRenderer *renderer,
dia_renderer_set_linewidth (renderer, linewidth);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
dia_renderer_draw_line (renderer, &poly[0], &poly[1], fg_color);
}
@@ -1685,7 +1685,7 @@ draw_cross (DiaRenderer *renderer,
dia_renderer_set_linewidth (renderer, linewidth);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
dia_renderer_draw_line (renderer, &poly[0],&poly[2], fg_color);
/*dia_renderer_draw_line (renderer, &poly[4],&poly[5], color); */
@@ -1855,7 +1855,7 @@ draw_concave_triangle (DiaRenderer *renderer,
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
if (fg_color == bg_color) {
dia_renderer_draw_polygon (renderer, poly, 4, bg_color, bg_color);
@@ -1896,7 +1896,7 @@ draw_rounded (DiaRenderer *renderer,
dia_renderer_set_linewidth (renderer, linewidth);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
delta = *from;
@@ -1956,7 +1956,7 @@ draw_open_rounded (DiaRenderer *renderer,
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
delta = *from;
@@ -2011,7 +2011,7 @@ draw_filled_dot_n_triangle (DiaRenderer *renderer,
real rapport;
Point poly[3];
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
dia_renderer_set_linewidth (renderer, linewidth);
diff --git a/lib/bezier-common.c b/lib/bezier-common.c
index c1f43a5c9..df5458be9 100644
--- a/lib/bezier-common.c
+++ b/lib/bezier-common.c
@@ -178,7 +178,7 @@ bezier_draw_control_lines (int num_points,
dia_renderer_set_linewidth (renderer, 0);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_DOTTED, 1);
dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
startpoint = points[0].p1;
for (i = 1; i < num_points; i++) {
diff --git a/lib/dia-enums.h b/lib/dia-enums.h
index 5475e97fa..36fa2d475 100644
--- a/lib/dia-enums.h
+++ b/lib/dia-enums.h
@@ -24,12 +24,12 @@
G_BEGIN_DECLS
-typedef enum {
- LINECAPS_DEFAULT = -1, /* default usually butt, this is unset */
- LINECAPS_BUTT = 0,
- LINECAPS_ROUND,
- LINECAPS_PROJECTING
-} LineCaps;
+typedef enum /*< enum >*/ {
+ DIA_LINE_CAPS_DEFAULT = -1, /* default usually butt, this is unset */
+ DIA_LINE_CAPS_BUTT = 0,
+ DIA_LINE_CAPS_ROUND,
+ DIA_LINE_CAPS_PROJECTING,
+} DiaLineCaps;
typedef enum /*< enum >*/ {
DIA_LINE_JOIN_DEFAULT = -1, /* default usually miter, this is unset */
diff --git a/lib/dia_svg.c b/lib/dia_svg.c
index 23e6abef0..bc3633a20 100644
--- a/lib/dia_svg.c
+++ b/lib/dia_svg.c
@@ -68,7 +68,7 @@ dia_svg_style_init(DiaSvgStyle *gs, DiaSvgStyle *parent_style)
*/
gs->fill = parent_style ? parent_style->fill : DIA_SVG_COLOUR_DEFAULT;
gs->fill_opacity = parent_style ? parent_style->fill_opacity : 1.0;
- gs->linecap = parent_style ? parent_style->linecap : LINECAPS_DEFAULT;
+ gs->linecap = parent_style ? parent_style->linecap : DIA_LINE_CAPS_DEFAULT;
gs->linejoin = parent_style ? parent_style->linejoin : DIA_LINE_JOIN_DEFAULT;
gs->linestyle = parent_style ? parent_style->linestyle : DIA_LINE_STYLE_DEFAULT;
gs->font = (parent_style && parent_style->font) ? g_object_ref (parent_style->font) : NULL;
@@ -503,13 +503,13 @@ static void
_parse_linecap (DiaSvgStyle *s, const char *val)
{
if (!strncmp(val, "butt", 4))
- s->linecap = LINECAPS_BUTT;
+ s->linecap = DIA_LINE_CAPS_BUTT;
else if (!strncmp(val, "round", 5))
- s->linecap = LINECAPS_ROUND;
+ s->linecap = DIA_LINE_CAPS_ROUND;
else if (!strncmp(val, "square", 6) || !strncmp(val, "projecting", 10))
- s->linecap = LINECAPS_PROJECTING;
+ s->linecap = DIA_LINE_CAPS_PROJECTING;
else if (!strncmp(val, "default", 7))
- s->linecap = LINECAPS_DEFAULT;
+ s->linecap = DIA_LINE_CAPS_DEFAULT;
}
/*!
diff --git a/lib/dia_svg.h b/lib/dia_svg.h
index bcc5945eb..16cc8ab4b 100644
--- a/lib/dia_svg.h
+++ b/lib/dia_svg.h
@@ -41,7 +41,7 @@ struct _DiaSvgStyle {
gint32 fill;
double fill_opacity;
- LineCaps linecap;
+ DiaLineCaps linecap;
DiaLineJoin linejoin;
DiaLineStyle linestyle;
double dashlength;
diff --git a/lib/diaimportrenderer.c b/lib/diaimportrenderer.c
index 06615ace5..1ed232318 100644
--- a/lib/diaimportrenderer.c
+++ b/lib/diaimportrenderer.c
@@ -34,7 +34,7 @@ static void begin_render (DiaRenderer *, const DiaRectangle *update);
static void end_render (DiaRenderer *);
static void set_linewidth (DiaRenderer *renderer, real linewidth);
-static void set_linecaps (DiaRenderer *renderer, LineCaps mode);
+static void set_linecaps (DiaRenderer *renderer, DiaLineCaps mode);
static void set_linejoin (DiaRenderer *renderer, DiaLineJoin mode);
static void set_linestyle (DiaRenderer *renderer, DiaLineStyle mode, double dash_length);
static void set_fillstyle (DiaRenderer *renderer, FillStyle mode);
@@ -206,7 +206,7 @@ dia_import_renderer_init (DiaImportRenderer *self)
/* set all (non-null) defaults */
self->line_style = DIA_LINE_STYLE_SOLID;
self->dash_length = 1.0;
- self->line_caps = LINECAPS_BUTT;
+ self->line_caps = DIA_LINE_CAPS_BUTT;
self->line_join = DIA_LINE_JOIN_MITER;
self->objects = NULL;
@@ -234,8 +234,9 @@ set_linewidth (DiaRenderer *renderer, real linewidth)
self->line_width = linewidth;
}
+
static void
-set_linecaps (DiaRenderer *renderer, LineCaps mode)
+set_linecaps (DiaRenderer *renderer, DiaLineCaps mode)
{
DiaImportRenderer *self = DIA_IMPORT_RENDERER (renderer);
self->line_caps = mode;
diff --git a/lib/diaimportrenderer.h b/lib/diaimportrenderer.h
index 8fbca0990..a452e3a09 100644
--- a/lib/diaimportrenderer.h
+++ b/lib/diaimportrenderer.h
@@ -35,7 +35,7 @@ struct _DiaImportRenderer {
double dash_length;
double line_width;
- LineCaps line_caps;
+ DiaLineCaps line_caps;
DiaLineJoin line_join;
/*! \private */
diff --git a/lib/diapathrenderer.c b/lib/diapathrenderer.c
index 40f3589de..9f7ce8b20 100644
--- a/lib/diapathrenderer.c
+++ b/lib/diapathrenderer.c
@@ -208,8 +208,10 @@ static void
set_linewidth(DiaRenderer *self, real linewidth)
{ /* 0 == hairline **/
}
+
+
static void
-set_linecaps(DiaRenderer *self, LineCaps mode)
+set_linecaps (DiaRenderer *self, DiaLineCaps mode)
{
}
diff --git a/lib/diarenderer.c b/lib/diarenderer.c
index 58298115f..13aa36806 100644
--- a/lib/diarenderer.c
+++ b/lib/diarenderer.c
@@ -77,7 +77,8 @@ static void begin_render (DiaRenderer *, const DiaRectangle *update);
static void end_render (DiaRenderer *);
static void set_linewidth (DiaRenderer *renderer, real linewidth);
-static void set_linecaps (DiaRenderer *renderer, LineCaps mode);
+static void set_linecaps (DiaRenderer *renderer,
+ DiaLineCaps mode);
static void set_linejoin (DiaRenderer *renderer,
DiaLineJoin mode);
static void set_linestyle (DiaRenderer *renderer,
@@ -467,12 +468,12 @@ set_linewidth (DiaRenderer *object, real linewidth)
G_OBJECT_CLASS_NAME (G_OBJECT_GET_CLASS (object)));
}
-/*!
- * \brief Change the line caps for the strokes to come
- * \memberof _DiaRenderer \pure
+
+/*
+ * Change the line caps for the strokes to come
*/
static void
-set_linecaps (DiaRenderer *object, LineCaps mode)
+set_linecaps (DiaRenderer *object, DiaLineCaps mode)
{
g_warning ("%s::set_line_caps not implemented!",
G_OBJECT_CLASS_NAME (G_OBJECT_GET_CLASS (object)));
@@ -2226,7 +2227,7 @@ dia_renderer_set_linewidth (DiaRenderer *self,
void
dia_renderer_set_linecaps (DiaRenderer *self,
- LineCaps mode)
+ DiaLineCaps mode)
{
g_return_if_fail (DIA_IS_RENDERER (self));
diff --git a/lib/diarenderer.h b/lib/diarenderer.h
index e45350b84..16819f8db 100644
--- a/lib/diarenderer.h
+++ b/lib/diarenderer.h
@@ -133,7 +133,7 @@ struct _DiaRendererClass
void (*set_linewidth) (DiaRenderer *renderer,
real linewidth);
void (*set_linecaps) (DiaRenderer *renderer,
- LineCaps mode);
+ DiaLineCaps mode);
void (*set_linejoin) (DiaRenderer *renderer,
DiaLineJoin mode);
void (*set_linestyle) (DiaRenderer *renderer,
@@ -296,7 +296,7 @@ void dia_renderer_end_render (DiaRenderer *self)
void dia_renderer_set_linewidth (DiaRenderer *self,
real linewidth);
void dia_renderer_set_linecaps (DiaRenderer *self,
- LineCaps mode);
+ DiaLineCaps mode);
void dia_renderer_set_linejoin (DiaRenderer *self,
DiaLineJoin mode);
void dia_renderer_set_linestyle (DiaRenderer *self,
diff --git a/lib/diasvgrenderer.c b/lib/diasvgrenderer.c
index 7a2d99e10..d757e7357 100644
--- a/lib/diasvgrenderer.c
+++ b/lib/diasvgrenderer.c
@@ -228,26 +228,26 @@ set_linewidth(DiaRenderer *self, real linewidth)
renderer->linewidth = linewidth;
}
-/*!
- * \brief Set line caps
- * \memberof _DiaSvgRenderer
+
+/*
+ * Set line caps
*/
static void
-set_linecaps(DiaRenderer *self, LineCaps mode)
+set_linecaps (DiaRenderer *self, DiaLineCaps mode)
{
DiaSvgRenderer *renderer = DIA_SVG_RENDERER (self);
- switch(mode) {
- case LINECAPS_BUTT:
+ switch (mode) {
+ case DIA_LINE_CAPS_BUTT:
renderer->linecap = "butt";
break;
- case LINECAPS_ROUND:
+ case DIA_LINE_CAPS_ROUND:
renderer->linecap = "round";
break;
- case LINECAPS_PROJECTING:
+ case DIA_LINE_CAPS_PROJECTING:
renderer->linecap = "square";
break;
- case LINECAPS_DEFAULT:
+ case DIA_LINE_CAPS_DEFAULT:
default:
renderer->linecap = "butt";
}
@@ -272,7 +272,7 @@ set_linejoin (DiaRenderer *self, DiaLineJoin mode)
case DIA_LINE_JOIN_BEVEL:
renderer->linejoin = "bevel";
break;
- case LINECAPS_DEFAULT:
+ case DIA_LINE_CAPS_DEFAULT:
default:
renderer->linejoin = "miter";
}
diff --git a/lib/diatransformrenderer.c b/lib/diatransformrenderer.c
index 4e8a0775d..b7360e3e0 100644
--- a/lib/diatransformrenderer.c
+++ b/lib/diatransformrenderer.c
@@ -150,12 +150,12 @@ set_linewidth (DiaRenderer *self, real linewidth)
dia_renderer_set_linewidth (renderer->worker, lw);
}
-/*!
- * \brief Pass through line caps
- * \memberof _DiaTransformRenderer
+
+/*
+ * Pass through line caps
*/
static void
-set_linecaps(DiaRenderer *self, LineCaps mode)
+set_linecaps (DiaRenderer *self, DiaLineCaps mode)
{
DiaTransformRenderer *renderer = DIA_TRANSFORM_RENDERER (self);
diff --git a/lib/properties.c b/lib/properties.c
index c280d0f8d..726731c4e 100644
--- a/lib/properties.c
+++ b/lib/properties.c
@@ -76,9 +76,9 @@ PropEnumData prop_std_line_join_data[] = {
{ NULL, 0 }
};
PropEnumData prop_std_line_caps_data[] = {
- { NC_("LineCap", "Butt"), LINECAPS_BUTT },
- { NC_("LineCap", "Round"), LINECAPS_ROUND },
- { NC_("LineCap", "Projecting"), LINECAPS_PROJECTING },
+ { NC_("LineCap", "Butt"), DIA_LINE_CAPS_BUTT },
+ { NC_("LineCap", "Round"), DIA_LINE_CAPS_ROUND },
+ { NC_("LineCap", "Projecting"), DIA_LINE_CAPS_PROJECTING },
{ NULL, 0 }
};
#endif
diff --git a/lib/properties.h b/lib/properties.h
index 49d17c0ca..0cb295b3d 100644
--- a/lib/properties.h
+++ b/lib/properties.h
@@ -627,9 +627,9 @@ static PropEnumData prop_std_line_join_data[] = {
{ NULL, 0 }
};
static PropEnumData prop_std_line_caps_data[] = {
- { NC_("LineCap", "Butt"), LINECAPS_BUTT },
- { NC_("LineCap", "Round"), LINECAPS_ROUND },
- { NC_("LineCap", "Projecting"), LINECAPS_PROJECTING },
+ { NC_("LineCap", "Butt"), DIA_LINE_CAPS_BUTT },
+ { NC_("LineCap", "Round"), DIA_LINE_CAPS_ROUND },
+ { NC_("LineCap", "Projecting"), DIA_LINE_CAPS_PROJECTING },
{ NULL, 0 }
};
#else
diff --git a/lib/renderer/diacairo-renderer.c b/lib/renderer/diacairo-renderer.c
index 88e05e9df..3fd2efea1 100644
--- a/lib/renderer/diacairo-renderer.c
+++ b/lib/renderer/diacairo-renderer.c
@@ -408,22 +408,23 @@ dia_cairo_renderer_set_linewidth (DiaRenderer *self, real linewidth)
DIAG_STATE (renderer->cr)
}
+
static void
-dia_cairo_renderer_set_linecaps (DiaRenderer *self, LineCaps mode)
+dia_cairo_renderer_set_linecaps (DiaRenderer *self, DiaLineCaps mode)
{
DiaCairoRenderer *renderer = DIA_CAIRO_RENDERER (self);
DIAG_NOTE (g_message ("set_linecaps %d", mode));
- switch(mode) {
- case LINECAPS_DEFAULT:
- case LINECAPS_BUTT:
+ switch (mode) {
+ case DIA_LINE_CAPS_DEFAULT:
+ case DIA_LINE_CAPS_BUTT:
cairo_set_line_cap (renderer->cr, CAIRO_LINE_CAP_BUTT);
break;
- case LINECAPS_ROUND:
+ case DIA_LINE_CAPS_ROUND:
cairo_set_line_cap (renderer->cr, CAIRO_LINE_CAP_ROUND);
break;
- case LINECAPS_PROJECTING:
+ case DIA_LINE_CAPS_PROJECTING:
cairo_set_line_cap (renderer->cr, CAIRO_LINE_CAP_SQUARE); /* ?? */
break;
default:
diff --git a/lib/standard-path.c b/lib/standard-path.c
index 12ddba9f9..573c392da 100644
--- a/lib/standard-path.c
+++ b/lib/standard-path.c
@@ -82,7 +82,7 @@ struct _StdPath {
DiaLineStyle line_style;
double dashlength;
DiaLineJoin line_join;
- LineCaps line_caps;
+ DiaLineCaps line_caps;
Color fill_color;
/*! mirroring (stdpath->stroke_or_fill & PDO_FILL) */
diff --git a/objects/Database/reference.c b/objects/Database/reference.c
index 34fa18518..10b4942e4 100644
--- a/objects/Database/reference.c
+++ b/objects/Database/reference.c
@@ -237,7 +237,7 @@ reference_draw (TableReference *ref, DiaRenderer *renderer)
dia_renderer_set_linewidth (renderer, ref->line_width);
dia_renderer_set_linestyle (renderer, ref->line_style, ref->dashlength);
dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
dia_renderer_draw_rounded_polyline_with_arrows (renderer,
points,
diff --git a/objects/ER/participation.c b/objects/ER/participation.c
index 85e778def..1fce8ab77 100644
--- a/objects/ER/participation.c
+++ b/objects/ER/participation.c
@@ -218,7 +218,7 @@ participation_draw (Participation *participation, DiaRenderer *renderer)
dia_renderer_set_linewidth (renderer, PARTICIPATION_WIDTH);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
if (participation->total) {
left_points = g_new0 (Point, n);
diff --git a/objects/FS/flow-ortho.c b/objects/FS/flow-ortho.c
index 3e0010ce6..bf68e56e5 100644
--- a/objects/FS/flow-ortho.c
+++ b/objects/FS/flow-ortho.c
@@ -392,7 +392,7 @@ orthflow_draw (Orthflow *orthflow, DiaRenderer *renderer)
points = &orthflow->orth.points[0];
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
switch (orthflow->type) {
case ORTHFLOW_SIGNAL:
diff --git a/objects/FS/flow.c b/objects/FS/flow.c
index 8cf814f08..152536caf 100644
--- a/objects/FS/flow.c
+++ b/objects/FS/flow.c
@@ -330,7 +330,7 @@ flow_draw (Flow *flow, DiaRenderer *renderer)
dia_renderer_set_linewidth (renderer, FLOW_WIDTH);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
switch (flow->type) {
case FLOW_SIGNAL:
diff --git a/objects/GRAFCET/action.c b/objects/GRAFCET/action.c
index 1841ba67d..2f6963c9b 100644
--- a/objects/GRAFCET/action.c
+++ b/objects/GRAFCET/action.c
@@ -328,7 +328,7 @@ action_draw (Action *action, DiaRenderer *renderer)
dia_renderer_set_linewidth (renderer, ACTION_LINE_WIDTH);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
/* first, draw the line or polyline from the step to the action label */
if (conn->endpoints[0].y == conn->endpoints[1].y) {
diff --git a/objects/GRAFCET/condition.c b/objects/GRAFCET/condition.c
index f065c5864..b1a95b26d 100644
--- a/objects/GRAFCET/condition.c
+++ b/objects/GRAFCET/condition.c
@@ -348,7 +348,7 @@ condition_draw (Condition *condition, DiaRenderer *renderer)
dia_renderer_set_linewidth (renderer, CONDITION_LINE_WIDTH);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
if (CONDITION_ARROW_SIZE > (CONDITION_LINE_WIDTH/2.0)) {
Arrow arrow;
diff --git a/objects/GRAFCET/transition.c b/objects/GRAFCET/transition.c
index 5a54bd97e..00bfcd4e2 100644
--- a/objects/GRAFCET/transition.c
+++ b/objects/GRAFCET/transition.c
@@ -389,7 +389,7 @@ transition_draw (Transition *transition, DiaRenderer *renderer)
Point pts[6];
dia_renderer_set_linewidth (renderer, TRANSITION_LINE_WIDTH);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
pts[0] = transition->north.pos;
pts[1] = transition->NU1;
diff --git a/objects/GRAFCET/vector.c b/objects/GRAFCET/vector.c
index d5ea758fc..65448b689 100644
--- a/objects/GRAFCET/vector.c
+++ b/objects/GRAFCET/vector.c
@@ -218,7 +218,7 @@ arc_draw (Arc *arc, DiaRenderer *renderer)
dia_renderer_set_linewidth (renderer, ARC_LINE_WIDTH);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
dia_renderer_draw_polyline (renderer, points, n, &color_black);
diff --git a/objects/Istar/link.c b/objects/Istar/link.c
index 6030bff8c..8bd77c0d5 100644
--- a/objects/Istar/link.c
+++ b/objects/Istar/link.c
@@ -504,7 +504,7 @@ link_draw (Link *link, DiaRenderer *renderer)
}
/** drawing line **/
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
dia_renderer_set_linewidth (renderer, w);
dia_renderer_draw_bezier_with_arrows (renderer,
diff --git a/objects/Jackson/phenomenon.c b/objects/Jackson/phenomenon.c
index 31a4ea257..54335f538 100644
--- a/objects/Jackson/phenomenon.c
+++ b/objects/Jackson/phenomenon.c
@@ -269,7 +269,7 @@ message_draw (Message *message, DiaRenderer *renderer)
endpoints = &message->connection.endpoints[0];
dia_renderer_set_linewidth (renderer, MESSAGE_WIDTH);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
if (message->type==MSG_REQ) {
dia_renderer_set_linestyle (renderer,
diff --git a/objects/KAOS/metaandorrel.c b/objects/KAOS/metaandorrel.c
index f24ce4724..d8a18d349 100644
--- a/objects/KAOS/metaandorrel.c
+++ b/objects/KAOS/metaandorrel.c
@@ -445,7 +445,7 @@ maor_draw (Maor *maor, DiaRenderer *renderer)
/** drawing directed line **/
dia_renderer_set_linewidth (renderer, MAOR_WIDTH);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0);
dia_renderer_draw_line_with_arrows (renderer,
&p1,
diff --git a/objects/KAOS/metabinrel.c b/objects/KAOS/metabinrel.c
index 0daa782b2..78dc88251 100644
--- a/objects/KAOS/metabinrel.c
+++ b/objects/KAOS/metabinrel.c
@@ -402,7 +402,7 @@ mbr_draw (Mbr *mbr, DiaRenderer *renderer)
/** drawing directed line **/
dia_renderer_set_linewidth (renderer, MBR_WIDTH);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
dx=p1.x-p2.x;
diff --git a/objects/Misc/measure.c b/objects/Misc/measure.c
index eb96e63af..d134dbaa4 100644
--- a/objects/Misc/measure.c
+++ b/objects/Misc/measure.c
@@ -268,7 +268,7 @@ measure_draw (Measure *measure, DiaRenderer *renderer)
dia_renderer_set_linewidth (renderer, measure->line_width);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
- dia_renderer_set_linecaps (renderer, LINECAPS_ROUND);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_ROUND);
dia_renderer_draw_line_with_arrows (renderer,
&measure->connection.endpoints[0],
diff --git a/objects/Misc/n_gon.c b/objects/Misc/n_gon.c
index 3277f09b3..273ebc8da 100644
--- a/objects/Misc/n_gon.c
+++ b/objects/Misc/n_gon.c
@@ -243,7 +243,7 @@ _ngon_draw (Ngon *ng, DiaRenderer *renderer)
dia_renderer_set_linewidth (renderer, ng->line_width);
dia_renderer_set_linestyle (renderer, ng->line_style, ng->dashlength);
dia_renderer_set_linejoin (renderer, ng->line_join);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
if (ng->pattern) {
dia_pattern_get_fallback_color (ng->pattern, &fill);
} else {
diff --git a/objects/Misc/tree.c b/objects/Misc/tree.c
index 0201b7c1c..7542be6bc 100644
--- a/objects/Misc/tree.c
+++ b/objects/Misc/tree.c
@@ -325,7 +325,7 @@ tree_draw (Tree *tree, DiaRenderer *renderer)
dia_renderer_set_linewidth (renderer, LINE_WIDTH);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
dia_renderer_draw_line (renderer,
&endpoints[0],
diff --git a/objects/SADT/annotation.c b/objects/SADT/annotation.c
index 86104e70b..0dcd5b8a6 100644
--- a/objects/SADT/annotation.c
+++ b/objects/SADT/annotation.c
@@ -284,7 +284,7 @@ annotation_draw (Annotation *annotation, DiaRenderer *renderer)
dia_renderer_set_linewidth (renderer, ANNOTATION_LINE_WIDTH);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
vect = annotation->connection.endpoints[1];
point_sub (&vect,&annotation->connection.endpoints[0]);
diff --git a/objects/SADT/arrow.c b/objects/SADT/arrow.c
index 0a228a418..b374d4fa4 100644
--- a/objects/SADT/arrow.c
+++ b/objects/SADT/arrow.c
@@ -260,7 +260,7 @@ sadtarrow_draw (Sadtarrow *sadtarrow, DiaRenderer *renderer)
dia_renderer_set_linewidth (renderer, ARROW_LINE_WIDTH);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
col = sadtarrow->line_color;
if (sadtarrow->autogray &&
diff --git a/objects/UML/association.c b/objects/UML/association.c
index 1dd9345da..c734f9316 100644
--- a/objects/UML/association.c
+++ b/objects/UML/association.c
@@ -432,7 +432,7 @@ association_draw (Association *assoc, DiaRenderer *renderer)
dia_renderer_set_linewidth (renderer, assoc->line_width);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
startarrow.length = ASSOCIATION_TRIANGLESIZE;
startarrow.width = ASSOCIATION_TRIANGLESIZE;
diff --git a/objects/UML/component_feature.c b/objects/UML/component_feature.c
index 2b286ca11..47a266376 100644
--- a/objects/UML/component_feature.c
+++ b/objects/UML/component_feature.c
@@ -343,7 +343,7 @@ compfeat_draw (Compfeat *compfeat, DiaRenderer *renderer)
dia_renderer_set_linewidth (renderer, compfeat->line_width);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
if (compfeat->orth.orientation[orth->numorient - 1] == HORIZONTAL) {
directions = (points[n - 1].x > points[n - 2].x)? DIR_EAST: DIR_WEST;
diff --git a/objects/UML/constraint.c b/objects/UML/constraint.c
index 77d8cfaac..d8ebdc884 100644
--- a/objects/UML/constraint.c
+++ b/objects/UML/constraint.c
@@ -257,7 +257,7 @@ constraint_draw (Constraint *constraint, DiaRenderer *renderer)
dia_renderer_set_linewidth (renderer, constraint->line_width);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_DASHED, CONSTRAINT_DASHLEN);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
arrow.type = ARROW_LINES;
arrow.length = CONSTRAINT_ARROWLEN;
diff --git a/objects/UML/dependency.c b/objects/UML/dependency.c
index 06ae89084..a0869a3ef 100644
--- a/objects/UML/dependency.c
+++ b/objects/UML/dependency.c
@@ -251,7 +251,7 @@ dependency_draw (Dependency *dep, DiaRenderer *renderer)
DIA_LINE_STYLE_DASHED,
DEPENDENCY_DASHLEN);
dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
arrow.type = ARROW_LINES;
arrow.length = DEPENDENCY_ARROWLEN;
diff --git a/objects/UML/generalization.c b/objects/UML/generalization.c
index 57cbec13a..69cf30a8c 100644
--- a/objects/UML/generalization.c
+++ b/objects/UML/generalization.c
@@ -244,7 +244,7 @@ generalization_draw (Generalization *genlz, DiaRenderer *renderer)
dia_renderer_set_linewidth (renderer, genlz->line_width);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
arrow.type = ARROW_HOLLOW_TRIANGLE;
arrow.length = GENERALIZATION_TRIANGLESIZE;
diff --git a/objects/UML/implements.c b/objects/UML/implements.c
index c60a47e87..c5b0233d4 100644
--- a/objects/UML/implements.c
+++ b/objects/UML/implements.c
@@ -268,7 +268,7 @@ implements_draw (Implements *implements, DiaRenderer *renderer)
dia_renderer_set_linewidth (renderer, implements->line_width);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
dia_renderer_draw_line (renderer,
&endpoints[0],
diff --git a/objects/UML/message.c b/objects/UML/message.c
index b2616bf5d..4ffa4da60 100644
--- a/objects/UML/message.c
+++ b/objects/UML/message.c
@@ -299,7 +299,7 @@ message_draw (Message *message, DiaRenderer *renderer)
dia_renderer_set_linewidth (renderer, message->line_width);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
if (message->type==MESSAGE_RECURSIVE) {
n1 = 0;
diff --git a/objects/UML/realizes.c b/objects/UML/realizes.c
index 103595cc7..43906f7ff 100644
--- a/objects/UML/realizes.c
+++ b/objects/UML/realizes.c
@@ -243,7 +243,7 @@ realizes_draw (Realizes *realize, DiaRenderer *renderer)
dia_renderer_set_linewidth (renderer, realize->line_width);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_DASHED, REALIZES_DASHLEN);
dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
arrow.type = ARROW_HOLLOW_TRIANGLE;
arrow.width = REALIZES_TRIANGLESIZE;
diff --git a/objects/UML/transition.c b/objects/UML/transition.c
index 7298171b5..db0805a08 100644
--- a/objects/UML/transition.c
+++ b/objects/UML/transition.c
@@ -369,7 +369,7 @@ transition_draw (Transition *transition, DiaRenderer *renderer)
got a linewidth parameter... */
dia_renderer_set_linewidth (renderer, TRANSITION_WIDTH);
/* TODO, find out about the meaning of this... */
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
if (transition->direction_inverted) {
diff --git a/objects/custom/custom_object.c b/objects/custom/custom_object.c
index 1b4161e53..436ddf99f 100644
--- a/objects/custom/custom_object.c
+++ b/objects/custom/custom_object.c
@@ -134,7 +134,7 @@ static void custom_draw_displaylist (GList *display_li
GArray *barr,
double *cur_line,
double *cur_dash,
- LineCaps *cur_caps,
+ DiaLineCaps *cur_caps,
DiaLineJoin *cur_join,
DiaLineStyle *cur_style);
static void custom_draw_element (GraphicElement *el,
@@ -144,7 +144,7 @@ static void custom_draw_element (GraphicElement *el,
GArray *barr,
double *cur_line,
double *cur_dash,
- LineCaps *cur_caps,
+ DiaLineCaps *cur_caps,
DiaLineJoin *cur_join,
DiaLineStyle *cur_style,
Color *fg,
@@ -925,7 +925,7 @@ custom_draw (Custom *custom, DiaRenderer *renderer)
{
static GArray *arr = NULL, *barr = NULL;
double cur_line = 1.0, cur_dash = 1.0;
- LineCaps cur_caps = LINECAPS_BUTT;
+ DiaLineCaps cur_caps = DIA_LINE_CAPS_BUTT;
DiaLineJoin cur_join = DIA_LINE_JOIN_MITER;
DiaLineStyle cur_style = custom->line_style;
@@ -974,7 +974,7 @@ custom_draw_displaylist (GList *display_list,
GArray *barr,
double *cur_line,
double *cur_dash,
- LineCaps *cur_caps,
+ DiaLineCaps *cur_caps,
DiaLineJoin *cur_join,
DiaLineStyle *cur_style)
{
@@ -1003,7 +1003,7 @@ custom_draw_element (GraphicElement *el,
GArray *barr,
double *cur_line,
double *cur_dash,
- LineCaps *cur_caps,
+ DiaLineCaps *cur_caps,
DiaLineJoin *cur_join,
DiaLineStyle *cur_style,
Color *fg,
@@ -1024,10 +1024,10 @@ custom_draw_element (GraphicElement *el,
dia_renderer_set_linewidth (renderer,
custom->border_width * (*cur_line));
}
- if ((el->any.s.linecap == LINECAPS_DEFAULT && (*cur_caps) != LINECAPS_BUTT) ||
+ if ((el->any.s.linecap == DIA_LINE_CAPS_DEFAULT && (*cur_caps) != DIA_LINE_CAPS_BUTT) ||
el->any.s.linecap != (*cur_caps)) {
- (*cur_caps) = (el->any.s.linecap!=LINECAPS_DEFAULT) ?
- el->any.s.linecap : LINECAPS_BUTT;
+ (*cur_caps) = (el->any.s.linecap!=DIA_LINE_CAPS_DEFAULT) ?
+ el->any.s.linecap : DIA_LINE_CAPS_BUTT;
dia_renderer_set_linecaps (renderer, (*cur_caps));
}
if ((el->any.s.linejoin == DIA_LINE_JOIN_DEFAULT && (*cur_join) != DIA_LINE_JOIN_MITER) ||
diff --git a/objects/custom/shape_info.c b/objects/custom/shape_info.c
index 61eb465f8..dc548e731 100644
--- a/objects/custom/shape_info.c
+++ b/objects/custom/shape_info.c
@@ -936,7 +936,7 @@ load_shape_info (const gchar *filename, ShapeInfo *preload)
1.0,
DIA_SVG_COLOUR_NONE,
1.0,
- LINECAPS_DEFAULT,
+ DIA_LINE_CAPS_DEFAULT,
DIA_LINE_JOIN_DEFAULT,
DIA_LINE_STYLE_DEFAULT,
1.0
diff --git a/objects/network/bus.c b/objects/network/bus.c
index 462e92e00..1cb970de7 100644
--- a/objects/network/bus.c
+++ b/objects/network/bus.c
@@ -326,7 +326,7 @@ bus_draw (Bus *bus, DiaRenderer *renderer)
dia_renderer_set_linewidth (renderer, LINE_WIDTH);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
dia_renderer_draw_line (renderer,
&endpoints[0],
diff --git a/objects/network/radiocell.c b/objects/network/radiocell.c
index 3834e1a28..cab122d71 100644
--- a/objects/network/radiocell.c
+++ b/objects/network/radiocell.c
@@ -258,7 +258,7 @@ radiocell_draw (RadioCell *radiocell, DiaRenderer *renderer)
if (radiocell->show_background) {
dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
}
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_linestyle (renderer, radiocell->line_style, radiocell->dashlength);
dia_renderer_set_linewidth (renderer, radiocell->line_width);
diff --git a/objects/standard/arc.c b/objects/standard/arc.c
index 2a49469c6..88195f510 100644
--- a/objects/standard/arc.c
+++ b/objects/standard/arc.c
@@ -59,7 +59,7 @@ struct _Arc {
double curve_distance; /*!< distance between middle_handle and chord */
double line_width; /*!< line width for the Arc */
DiaLineStyle line_style; /*!< line style for the Arc */
- LineCaps line_caps; /*!< line ends of the Arc */
+ DiaLineCaps line_caps; /*!< line ends of the Arc */
double dashlength; /*!< part of the linestyle if not DIA_LINE_STYLE_SOLID */
Arrow start_arrow, end_arrow; /*!< arrows */
@@ -661,7 +661,7 @@ arc_draw (Arc *arc, DiaRenderer *renderer)
dia_renderer_set_linewidth (renderer, 0);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_DOTTED, 1);
dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
dia_renderer_draw_line (renderer, &endpoints[0], &arc->center, &line_color);
dia_renderer_draw_line (renderer, &endpoints[1], &arc->center, &line_color);
@@ -705,7 +705,7 @@ arc_create(Point *startpoint,
arc->curve_distance = 1.0;
arc->arc_color = attributes_get_foreground();
attributes_get_default_line_style(&arc->line_style, &arc->dashlength);
- arc->line_caps = LINECAPS_BUTT;
+ arc->line_caps = DIA_LINE_CAPS_BUTT;
arc->start_arrow = attributes_get_default_start_arrow();
arc->end_arrow = attributes_get_default_end_arrow();
@@ -965,9 +965,11 @@ arc_save(Arc *arc, ObjectNode obj_node, DiaContext *ctx)
data_add_real(new_attribute(obj_node, "dashlength"),
arc->dashlength, ctx);
- if (arc->line_caps != LINECAPS_BUTT)
- data_add_enum(new_attribute(obj_node, "line_caps"),
- arc->line_caps, ctx);
+ if (arc->line_caps != DIA_LINE_CAPS_BUTT) {
+ data_add_enum (new_attribute (obj_node, "line_caps"),
+ arc->line_caps,
+ ctx);
+ }
if (arc->start_arrow.type != ARROW_NONE) {
dia_arrow_save (&arc->start_arrow,
@@ -1033,10 +1035,11 @@ arc_load(ObjectNode obj_node, int version,DiaContext *ctx)
if (attr != NULL)
arc->dashlength = data_real(attribute_first_data(attr), ctx);
- arc->line_caps = LINECAPS_BUTT;
- attr = object_find_attribute(obj_node, "line_caps");
- if (attr != NULL)
- arc->line_caps = data_enum(attribute_first_data(attr), ctx);
+ arc->line_caps = DIA_LINE_CAPS_BUTT;
+ attr = object_find_attribute (obj_node, "line_caps");
+ if (attr != NULL) {
+ arc->line_caps = data_enum (attribute_first_data (attr), ctx);
+ }
dia_arrow_load (&arc->start_arrow,
obj_node,
diff --git a/objects/standard/bezier.c b/objects/standard/bezier.c
index b921149d3..ab3618b3a 100644
--- a/objects/standard/bezier.c
+++ b/objects/standard/bezier.c
@@ -50,7 +50,7 @@ struct _Bezierline {
Color line_color;
DiaLineStyle line_style;
DiaLineJoin line_join;
- LineCaps line_caps;
+ DiaLineCaps line_caps;
double dashlength;
double line_width;
Arrow start_arrow, end_arrow;
@@ -477,10 +477,10 @@ bezierline_create(Point *startpoint,
bezierline->line_width = attributes_get_default_linewidth();
bezierline->line_color = attributes_get_foreground();
- attributes_get_default_line_style(&bezierline->line_style,
- &bezierline->dashlength);
+ attributes_get_default_line_style (&bezierline->line_style,
+ &bezierline->dashlength);
bezierline->line_join = DIA_LINE_JOIN_MITER;
- bezierline->line_caps = LINECAPS_BUTT;
+ bezierline->line_caps = DIA_LINE_CAPS_BUTT;
bezierline->start_arrow = attributes_get_default_start_arrow();
bezierline->end_arrow = attributes_get_default_end_arrow();
@@ -640,7 +640,7 @@ bezierline_save(Bezierline *bezierline, ObjectNode obj_node,
ctx);
}
- if (bezierline->line_caps != LINECAPS_BUTT) {
+ if (bezierline->line_caps != DIA_LINE_CAPS_BUTT) {
data_add_enum (new_attribute (obj_node, "line_caps"),
bezierline->line_caps,
ctx);
@@ -712,10 +712,11 @@ bezierline_load(ObjectNode obj_node, int version, DiaContext *ctx)
bezierline->line_join = data_enum (attribute_first_data (attr), ctx);
}
- bezierline->line_caps = LINECAPS_BUTT;
- attr = object_find_attribute(obj_node, "line_caps");
- if (attr != NULL)
- bezierline->line_caps = data_enum(attribute_first_data(attr), ctx);
+ bezierline->line_caps = DIA_LINE_CAPS_BUTT;
+ attr = object_find_attribute (obj_node, "line_caps");
+ if (attr != NULL) {
+ bezierline->line_caps = data_enum (attribute_first_data (attr), ctx);
+ }
bezierline->dashlength = DEFAULT_LINESTYLE_DASHLEN;
attr = object_find_attribute(obj_node, "dashlength");
diff --git a/objects/standard/beziergon.c b/objects/standard/beziergon.c
index fa9db9b8b..7ccbe5a75 100644
--- a/objects/standard/beziergon.c
+++ b/objects/standard/beziergon.c
@@ -232,7 +232,7 @@ beziergon_draw (Beziergon *beziergon, DiaRenderer *renderer)
dia_renderer_set_linewidth (renderer, beziergon->line_width);
dia_renderer_set_linestyle (renderer, beziergon->line_style, beziergon->dashlength);
dia_renderer_set_linejoin (renderer, beziergon->line_join);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
if (beziergon->show_background) {
Color fill = beziergon->inner_color;
diff --git a/objects/standard/box.c b/objects/standard/box.c
index 69174bb22..3f23cbd97 100644
--- a/objects/standard/box.c
+++ b/objects/standard/box.c
@@ -382,7 +382,7 @@ box_draw (Box *box, DiaRenderer *renderer)
} else {
dia_renderer_set_linejoin (renderer, box->line_join);
}
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
if (box->show_background) {
Color fill = box->inner_color;
diff --git a/objects/standard/line.c b/objects/standard/line.c
index a3e0b6158..80a3077fd 100644
--- a/objects/standard/line.c
+++ b/objects/standard/line.c
@@ -56,7 +56,7 @@ typedef struct _Line {
Color line_color;
double line_width;
DiaLineStyle line_style;
- LineCaps line_caps;
+ DiaLineCaps line_caps;
Arrow start_arrow, end_arrow;
double dashlength;
double absolute_start_gap, absolute_end_gap;
@@ -524,7 +524,7 @@ line_create(Point *startpoint,
line->cpl = connpointline_create(obj,1);
attributes_get_default_line_style(&line->line_style, &line->dashlength);
- line->line_caps = LINECAPS_BUTT;
+ line->line_caps = DIA_LINE_CAPS_BUTT;
line->start_arrow = attributes_get_default_start_arrow();
line->end_arrow = attributes_get_default_end_arrow();
line_update_data(line);
@@ -665,9 +665,11 @@ line_save(Line *line, ObjectNode obj_node, DiaContext *ctx)
data_add_enum(new_attribute(obj_node, "line_style"),
line->line_style, ctx);
- if (line->line_caps != LINECAPS_BUTT)
- data_add_enum(new_attribute(obj_node, "line_caps"),
- line->line_caps, ctx);
+ if (line->line_caps != DIA_LINE_CAPS_BUTT) {
+ data_add_enum (new_attribute (obj_node, "line_caps"),
+ line->line_caps,
+ ctx);
+ }
if (line->start_arrow.type != ARROW_NONE) {
dia_arrow_save (&line->start_arrow,
@@ -732,10 +734,11 @@ line_load(ObjectNode obj_node, int version, DiaContext *ctx)
if (attr != NULL)
line->line_style = data_enum(attribute_first_data(attr), ctx);
- line->line_caps = LINECAPS_BUTT;
- attr = object_find_attribute(obj_node, "line_caps");
- if (attr != NULL)
- line->line_caps = data_enum(attribute_first_data(attr), ctx);
+ line->line_caps = DIA_LINE_CAPS_BUTT;
+ attr = object_find_attribute (obj_node, "line_caps");
+ if (attr != NULL) {
+ line->line_caps = data_enum (attribute_first_data (attr), ctx);
+ }
dia_arrow_load (&line->start_arrow,
obj_node,
diff --git a/objects/standard/outline.c b/objects/standard/outline.c
index d98d3d0d1..28a3fc9b4 100644
--- a/objects/standard/outline.c
+++ b/objects/standard/outline.c
@@ -346,7 +346,7 @@ outline_draw (Outline *outline, DiaRenderer *renderer)
dia_renderer_set_linewidth (renderer, outline->line_width);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
- dia_renderer_set_linecaps (renderer, LINECAPS_ROUND);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_ROUND);
/* the cairo text path is position independent, Dia's bezier are not */
x = obj->position.x;
diff --git a/objects/standard/polygon.c b/objects/standard/polygon.c
index 7724ac63e..a7125f646 100644
--- a/objects/standard/polygon.c
+++ b/objects/standard/polygon.c
@@ -232,7 +232,7 @@ polygon_draw (Polygon *polygon, DiaRenderer *renderer)
dia_renderer_set_linewidth (renderer, polygon->line_width);
dia_renderer_set_linestyle (renderer, polygon->line_style, polygon->dashlength);
dia_renderer_set_linejoin (renderer, polygon->line_join);
- dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
+ dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
if (polygon->show_background) {
fill = polygon->inner_color;
diff --git a/objects/standard/polyline.c b/objects/standard/polyline.c
index 6c768350b..0f8ba2bca 100644
--- a/objects/standard/polyline.c
+++ b/objects/standard/polyline.c
@@ -44,7 +44,7 @@ typedef struct _Polyline {
Color line_color;
DiaLineStyle line_style;
DiaLineJoin line_join;
- LineCaps line_caps;
+ DiaLineCaps line_caps;
double dashlength;
double line_width;
double corner_radius;
@@ -363,7 +363,7 @@ polyline_create(Point *startpoint,
attributes_get_default_line_style (&polyline->line_style,
&polyline->dashlength);
polyline->line_join = DIA_LINE_JOIN_MITER;
- polyline->line_caps = LINECAPS_BUTT;
+ polyline->line_caps = DIA_LINE_CAPS_BUTT;
polyline->start_arrow = attributes_get_default_start_arrow();
polyline->end_arrow = attributes_get_default_end_arrow();
polyline->corner_radius = 0.0;
@@ -494,7 +494,7 @@ polyline_save(Polyline *polyline, ObjectNode obj_node,
ctx);
}
- if (polyline->line_caps != LINECAPS_BUTT)
+ if (polyline->line_caps != DIA_LINE_CAPS_BUTT)
data_add_enum(new_attribute(obj_node, "line_caps"),
polyline->line_caps, ctx);
@@ -567,7 +567,7 @@ polyline_load(ObjectNode obj_node, int version, DiaContext *ctx)
polyline->line_join = data_enum (attribute_first_data (attr), ctx);
}
- polyline->line_caps = LINECAPS_BUTT;
+ polyline->line_caps = DIA_LINE_CAPS_BUTT;
attr = object_find_attribute(obj_node, "line_caps");
if (attr != NULL)
polyline->line_caps = data_enum(attribute_first_data(attr), ctx);
diff --git a/objects/standard/zigzagline.c b/objects/standard/zigzagline.c
index 457c36ed4..c5dde3c35 100644
--- a/objects/standard/zigzagline.c
+++ b/objects/standard/zigzagline.c
@@ -46,7 +46,7 @@ typedef struct _Zigzagline {
Color line_color;
DiaLineStyle line_style;
DiaLineJoin line_join;
- LineCaps line_caps;
+ DiaLineCaps line_caps;
double dashlength;
double line_width;
double corner_radius;
@@ -270,7 +270,7 @@ zigzagline_create(Point *startpoint,
attributes_get_default_line_style (&zigzagline->line_style,
&zigzagline->dashlength);
zigzagline->line_join = DIA_LINE_JOIN_MITER;
- zigzagline->line_caps = LINECAPS_BUTT;
+ zigzagline->line_caps = DIA_LINE_CAPS_BUTT;
zigzagline->start_arrow = attributes_get_default_start_arrow();
zigzagline->end_arrow = attributes_get_default_end_arrow();
zigzagline->corner_radius = 0.0;
@@ -510,9 +510,11 @@ zigzagline_save(Zigzagline *zigzagline, ObjectNode obj_node,
ctx);
}
- if (zigzagline->line_caps != LINECAPS_BUTT)
- data_add_enum(new_attribute(obj_node, "line_caps"),
- zigzagline->line_caps, ctx);
+ if (zigzagline->line_caps != DIA_LINE_CAPS_BUTT) {
+ data_add_enum (new_attribute (obj_node, "line_caps"),
+ zigzagline->line_caps,
+ ctx);
+ }
if (zigzagline->start_arrow.type != ARROW_NONE) {
dia_arrow_save (&zigzagline->start_arrow,
@@ -581,10 +583,11 @@ zigzagline_load(ObjectNode obj_node, int version, DiaContext *ctx)
zigzagline->line_join = data_enum (attribute_first_data (attr), ctx);
}
- zigzagline->line_caps = LINECAPS_BUTT;
- attr = object_find_attribute(obj_node, "line_caps");
- if (attr != NULL)
- zigzagline->line_caps = data_enum(attribute_first_data(attr), ctx);
+ zigzagline->line_caps = DIA_LINE_CAPS_BUTT;
+ attr = object_find_attribute (obj_node, "line_caps");
+ if (attr != NULL) {
+ zigzagline->line_caps = data_enum (attribute_first_data (attr), ctx);
+ }
dia_arrow_load (&zigzagline->start_arrow,
obj_node,
diff --git a/plug-ins/cgm/cgm.c b/plug-ins/cgm/cgm.c
index f5a77f95a..04a50b51f 100644
--- a/plug-ins/cgm/cgm.c
+++ b/plug-ins/cgm/cgm.c
@@ -581,29 +581,30 @@ set_linewidth(DiaRenderer *self, real linewidth)
renderer->lcurrent.width = renderer->fcurrent.width = linewidth;
}
+
static void
-set_linecaps(DiaRenderer *self, LineCaps mode)
+set_linecaps (DiaRenderer *self, DiaLineCaps mode)
{
- CgmRenderer *renderer = CGM_RENDERER(self);
- int cap;
+ CgmRenderer *renderer = CGM_RENDERER (self);
+ int cap;
- switch(mode)
- {
- case LINECAPS_DEFAULT:
- case LINECAPS_BUTT:
- cap = 2;
- break;
- case LINECAPS_ROUND:
- cap = 3;
- break;
- case LINECAPS_PROJECTING:
- cap = 4;
- break;
+ switch (mode) {
+ case DIA_LINE_CAPS_DEFAULT:
+ case DIA_LINE_CAPS_BUTT:
+ cap = 2;
+ break;
+ case DIA_LINE_CAPS_ROUND:
+ cap = 3;
+ break;
+ case DIA_LINE_CAPS_PROJECTING:
+ cap = 4;
+ break;
default:
- cap = 2;
- break;
- }
- renderer->lcurrent.cap = renderer->fcurrent.cap = cap;
+ cap = 2;
+ break;
+ }
+
+ renderer->lcurrent.cap = renderer->fcurrent.cap = cap;
}
diff --git a/plug-ins/drs/dia-render-script-import.c b/plug-ins/drs/dia-render-script-import.c
index 7348b2e27..0863ee36a 100644
--- a/plug-ins/drs/dia-render-script-import.c
+++ b/plug-ins/drs/dia-render-script-import.c
@@ -178,20 +178,24 @@ _parse_linestyle (xmlNodePtr node, const char *attrib)
}
-static LineCaps
+static DiaLineCaps
_parse_linecaps (xmlNodePtr node, const char *attrib)
{
- xmlChar *str = xmlGetProp(node, (const xmlChar *)attrib);
- LineCaps val = LINECAPS_BUTT;
+ xmlChar *str = xmlGetProp (node, (const xmlChar *) attrib);
+ DiaLineCaps val = DIA_LINE_CAPS_BUTT;
+
if (str) {
- if (strcmp ((const char *)str, "round") == 0)
- val = LINECAPS_ROUND;
- else if (strcmp ((const char *)str, "projecting") == 0)
- val = LINECAPS_PROJECTING;
- else if (strcmp ((const char *)str, "butt") != 0)
+ if (g_strcmp0 ((const char *) str, "round") == 0) {
+ val = DIA_LINE_CAPS_ROUND;
+ } else if (g_strcmp0 ((const char *) str, "projecting") == 0) {
+ val = DIA_LINE_CAPS_PROJECTING;
+ } else if (g_strcmp0 ((const char *) str, "butt") != 0) {
g_warning ("unknown linecaps: %s", str);
- xmlFree(str);
+ }
}
+
+ dia_clear_xml_string (&str);
+
return val;
}
diff --git a/plug-ins/drs/dia-render-script-renderer.c b/plug-ins/drs/dia-render-script-renderer.c
index 3492d60b1..3bfba1637 100644
--- a/plug-ins/drs/dia-render-script-renderer.c
+++ b/plug-ins/drs/dia-render-script-renderer.c
@@ -387,21 +387,21 @@ set_linewidth (DiaRenderer *self, real width)
static void
-set_linecaps (DiaRenderer *self, LineCaps mode)
+set_linecaps (DiaRenderer *self, DiaLineCaps mode)
{
DrsRenderer *renderer = DRS_RENDERER (self);
xmlNodePtr node;
- gchar *value = NULL;
+ char *value = NULL;
- switch(mode) {
- case LINECAPS_DEFAULT:
- case LINECAPS_BUTT:
+ switch (mode) {
+ case DIA_LINE_CAPS_DEFAULT:
+ case DIA_LINE_CAPS_BUTT:
value = "butt";
break;
- case LINECAPS_ROUND:
+ case DIA_LINE_CAPS_ROUND:
value = "round";
break;
- case LINECAPS_PROJECTING:
+ case DIA_LINE_CAPS_PROJECTING:
value = "projecting";
break;
default:
diff --git a/plug-ins/drs/dia-render-script.c b/plug-ins/drs/dia-render-script.c
index d6958ab74..7f2974004 100644
--- a/plug-ins/drs/dia-render-script.c
+++ b/plug-ins/drs/dia-render-script.c
@@ -22,7 +22,7 @@
/* Dia Render File - Serialization of Dia Renderers.
* May also provide some DiaObject implementation which could offer parameters like
* - scale: overall scaling of the 'object diagram' done on the renderer level
- * - tweaking renderer parameters otherwise not in the UI, e.g. LineCaps
+ * - tweaking renderer parameters otherwise not in the UI, e.g. DiaLineCaps
*
* The format is similar to Windows MetaFile.i.e a serialization of function calls together
* with their parameters.
diff --git a/plug-ins/dxf/dxf-export.c b/plug-ins/dxf/dxf-export.c
index 43cfbf2c4..3c80bba56 100644
--- a/plug-ins/dxf/dxf-export.c
+++ b/plug-ins/dxf/dxf-export.c
@@ -253,8 +253,9 @@ set_linewidth(DiaRenderer *self, real linewidth)
renderer->lcurrent.width = renderer->fcurrent.width = linewidth;
}
+
static void
-set_linecaps(DiaRenderer *self, LineCaps mode)
+set_linecaps (DiaRenderer *self, DiaLineCaps mode)
{
}
diff --git a/plug-ins/hpgl/hpgl.c b/plug-ins/hpgl/hpgl.c
index e27620539..36e2ed68f 100644
--- a/plug-ins/hpgl/hpgl.c
+++ b/plug-ins/hpgl/hpgl.c
@@ -206,22 +206,23 @@ set_linewidth(DiaRenderer *object, real linewidth)
hpgl_select_pen(renderer, NULL, linewidth);
}
+
static void
-set_linecaps(DiaRenderer *object, LineCaps mode)
+set_linecaps (DiaRenderer *object, DiaLineCaps mode)
{
- DIAG_NOTE(g_message("set_linecaps %d", mode));
+ DIAG_NOTE (g_message ("set_linecaps %d", mode));
- switch(mode) {
- case LINECAPS_DEFAULT:
- case LINECAPS_BUTT:
- break;
- case LINECAPS_ROUND:
- break;
- case LINECAPS_PROJECTING:
- break;
+ switch (mode) {
+ case DIA_LINE_CAPS_DEFAULT:
+ case DIA_LINE_CAPS_BUTT:
+ break;
+ case DIA_LINE_CAPS_ROUND:
+ break;
+ case DIA_LINE_CAPS_PROJECTING:
+ break;
default:
- g_warning("HpglRenderer: Unsupported fill mode specified!");
- }
+ g_warning ("HpglRenderer: Unsupported fill mode specified!");
+ }
}
diff --git a/plug-ins/metapost/render_metapost.c b/plug-ins/metapost/render_metapost.c
index 9e4630558..9ae6d2050 100644
--- a/plug-ins/metapost/render_metapost.c
+++ b/plug-ins/metapost/render_metapost.c
@@ -164,7 +164,7 @@ end_draw_op(MetapostRenderer *renderer)
gchar d3_buf[DTOSTR_BUF_SIZE];
/* the following pencircle seems not to work well with line caps, but using
- * renderer->saved_line_cap == LINECAPS_ROUND ? "pencircle" : "pensquare",
+ * renderer->saved_line_cap == DIA_LINE_CAPS_ROUND ? "pencircle" : "pensquare",
* doesn't make it anz better
*/
fprintf(renderer->file, "\n withpen pencircle scaled %sx",
@@ -247,31 +247,33 @@ set_linewidth(DiaRenderer *self, real linewidth)
renderer->line_width = linewidth;
}
+
static void
-set_linecaps(DiaRenderer *self, LineCaps mode)
+set_linecaps (DiaRenderer *self, DiaLineCaps mode)
{
- MetapostRenderer *renderer = METAPOST_RENDERER (self);
+ MetapostRenderer *renderer = METAPOST_RENDERER (self);
- if(mode == renderer->saved_line_cap)
- return;
+ if (mode == renderer->saved_line_cap) {
+ return;
+ }
- switch(mode) {
- case LINECAPS_DEFAULT:
- case LINECAPS_BUTT:
- fprintf(renderer->file, "linecap:=butt;\n");
- break;
- case LINECAPS_ROUND:
- fprintf(renderer->file, "linecap:=rounded;\n");
- break;
- case LINECAPS_PROJECTING:
- /* is this right? */
- fprintf(renderer->file, "linecap:=squared;\n");
- break;
+ switch (mode) {
+ case DIA_LINE_CAPS_DEFAULT:
+ case DIA_LINE_CAPS_BUTT:
+ fprintf (renderer->file, "linecap:=butt;\n");
+ break;
+ case DIA_LINE_CAPS_ROUND:
+ fprintf (renderer->file, "linecap:=rounded;\n");
+ break;
+ case DIA_LINE_CAPS_PROJECTING:
+ /* is this right? */
+ fprintf(renderer->file, "linecap:=squared;\n");
+ break;
default:
- fprintf(renderer->file, "linecap:=squared;\n");
- }
+ fprintf (renderer->file, "linecap:=squared;\n");
+ }
- renderer->saved_line_cap = mode;
+ renderer->saved_line_cap = mode;
}
diff --git a/plug-ins/metapost/render_metapost.h b/plug-ins/metapost/render_metapost.h
index 63d014bb1..fff60aeef 100644
--- a/plug-ins/metapost/render_metapost.h
+++ b/plug-ins/metapost/render_metapost.h
@@ -49,7 +49,7 @@ struct _MetapostRenderer {
FILE *file;
DiaLineStyle saved_line_style;
- LineCaps saved_line_cap;
+ DiaLineCaps saved_line_cap;
DiaLineJoin saved_line_join;
Color color;
diff --git a/plug-ins/pdf/pdf-import.cpp b/plug-ins/pdf/pdf-import.cpp
index 3e2f64565..0676348ca 100644
--- a/plug-ins/pdf/pdf-import.cpp
+++ b/plug-ins/pdf/pdf-import.cpp
@@ -185,15 +185,18 @@ public :
}
}
- void updateLineCap(GfxState *state)
+ void
+ updateLineCap (GfxState *state)
{
- if (state->getLineCap() == 0)
- this->line_caps = LINECAPS_BUTT;
- else if (state->getLineCap() == 1)
- this->line_caps = LINECAPS_ROUND;
- else
- this->line_caps = LINECAPS_PROJECTING;
+ if (state->getLineCap() == 0) {
+ this->line_caps = DIA_LINE_CAPS_BUTT;
+ } else if (state->getLineCap() == 1) {
+ this->line_caps = DIA_LINE_CAPS_ROUND;
+ } else {
+ this->line_caps = DIA_LINE_CAPS_PROJECTING;
+ }
}
+
void updateStrokeColor(GfxState *state)
{
GfxRGB color;
@@ -446,7 +449,7 @@ private :
DiaLineStyle line_style;
double dash_length;
DiaLineJoin line_join;
- LineCaps line_caps;
+ DiaLineCaps line_caps;
Color fill_color;
Alignment alignment;
@@ -486,7 +489,7 @@ DiaOutputDev::DiaOutputDev (DiagramData *_dia, int _n) :
line_style(DIA_LINE_STYLE_SOLID),
dash_length(1.0),
line_join(DIA_LINE_JOIN_MITER),
- line_caps(LINECAPS_PROJECTING),
+ line_caps(DIA_LINE_CAPS_PROJECTING),
fill_color(attributes_get_background ()),
alignment(ALIGN_LEFT),
scale(2.54/72.0),
diff --git a/plug-ins/pgf/render_pgf.c b/plug-ins/pgf/render_pgf.c
index e8647f7d6..63130739b 100644
--- a/plug-ins/pgf/render_pgf.c
+++ b/plug-ins/pgf/render_pgf.c
@@ -81,7 +81,7 @@ TODO:
static void begin_render(DiaRenderer *self, const DiaRectangle *update);
static void end_render(DiaRenderer *self);
static void set_linewidth(DiaRenderer *self, real linewidth);
-static void set_linecaps(DiaRenderer *self, LineCaps mode);
+static void set_linecaps (DiaRenderer *self, DiaLineCaps mode);
static void set_linejoin (DiaRenderer *self, DiaLineJoin mode);
static void set_linestyle(DiaRenderer *self, DiaLineStyle mode, double dash_length);
static void set_fillstyle(DiaRenderer *self, FillStyle mode);
@@ -415,21 +415,21 @@ set_linewidth (DiaRenderer *self, real linewidth)
static void
-set_linecaps (DiaRenderer *self, LineCaps mode)
+set_linecaps (DiaRenderer *self, DiaLineCaps mode)
{
- PgfRenderer *renderer = PGF_RENDERER(self);
+ PgfRenderer *renderer = PGF_RENDERER (self);
switch (mode) {
- case LINECAPS_BUTT:
+ case DIA_LINE_CAPS_BUTT:
fprintf (renderer->file, "\\pgfsetbuttcap\n");
break;
- case LINECAPS_ROUND:
+ case DIA_LINE_CAPS_ROUND:
fprintf (renderer->file, "\\pgfsetroundcap\n");
break;
- case LINECAPS_PROJECTING:
+ case DIA_LINE_CAPS_PROJECTING:
fprintf (renderer->file, "\\pgfsetrectcap\n");
break;
- case LINECAPS_DEFAULT:
+ case DIA_LINE_CAPS_DEFAULT:
default:
fprintf (renderer->file, "\\pgfsetbuttcap\n");
}
diff --git a/plug-ins/postscript/diapsrenderer.c b/plug-ins/postscript/diapsrenderer.c
index a0bdfc4cd..87f61094f 100644
--- a/plug-ins/postscript/diapsrenderer.c
+++ b/plug-ins/postscript/diapsrenderer.c
@@ -159,28 +159,29 @@ set_linewidth(DiaRenderer *self, real linewidth)
psrenderer_dtostr(lw_buf, (gdouble) linewidth) );
}
+
static void
-set_linecaps(DiaRenderer *self, LineCaps mode)
+set_linecaps (DiaRenderer *self, DiaLineCaps mode)
{
- DiaPsRenderer *renderer = DIA_PS_RENDERER(self);
+ DiaPsRenderer *renderer = DIA_PS_RENDERER (self);
int ps_mode;
- switch(mode) {
- case LINECAPS_DEFAULT:
- case LINECAPS_BUTT:
- ps_mode = 0;
- break;
- case LINECAPS_ROUND:
- ps_mode = 1;
- break;
- case LINECAPS_PROJECTING:
- ps_mode = 2;
- break;
- default:
- ps_mode = 0;
+ switch (mode) {
+ case DIA_LINE_CAPS_DEFAULT:
+ case DIA_LINE_CAPS_BUTT:
+ ps_mode = 0;
+ break;
+ case DIA_LINE_CAPS_ROUND:
+ ps_mode = 1;
+ break;
+ case DIA_LINE_CAPS_PROJECTING:
+ ps_mode = 2;
+ break;
+ default:
+ ps_mode = 0;
}
- fprintf(renderer->file, "%d slc\n", ps_mode);
+ fprintf (renderer->file, "%d slc\n", ps_mode);
}
diff --git a/plug-ins/pstricks/render_pstricks.c b/plug-ins/pstricks/render_pstricks.c
index 28845661f..5f2da5c6f 100644
--- a/plug-ins/pstricks/render_pstricks.c
+++ b/plug-ins/pstricks/render_pstricks.c
@@ -76,7 +76,7 @@ enum {
static void begin_render(DiaRenderer *self, const DiaRectangle *update);
static void end_render(DiaRenderer *self);
static void set_linewidth(DiaRenderer *self, real linewidth);
-static void set_linecaps(DiaRenderer *self, LineCaps mode);
+static void set_linecaps (DiaRenderer *self, DiaLineCaps mode);
static void set_linejoin (DiaRenderer *self, DiaLineJoin mode);
static void set_linestyle(DiaRenderer *self, DiaLineStyle mode, double dash_length);
static void set_fillstyle(DiaRenderer *self, FillStyle mode);
@@ -331,28 +331,29 @@ set_linewidth(DiaRenderer *self, real linewidth)
pstricks_dtostr(d_buf, (gdouble) linewidth) );
}
+
static void
-set_linecaps(DiaRenderer *self, LineCaps mode)
+set_linecaps (DiaRenderer *self, DiaLineCaps mode)
{
- PstricksRenderer *renderer = PSTRICKS_RENDERER(self);
- int ps_mode;
+ PstricksRenderer *renderer = PSTRICKS_RENDERER (self);
+ int ps_mode;
- switch(mode) {
- case LINECAPS_DEFAULT:
- case LINECAPS_BUTT:
- ps_mode = 0;
- break;
- case LINECAPS_ROUND:
- ps_mode = 1;
- break;
- case LINECAPS_PROJECTING:
- ps_mode = 2;
- break;
+ switch (mode) {
+ case DIA_LINE_CAPS_DEFAULT:
+ case DIA_LINE_CAPS_BUTT:
+ ps_mode = 0;
+ break;
+ case DIA_LINE_CAPS_ROUND:
+ ps_mode = 1;
+ break;
+ case DIA_LINE_CAPS_PROJECTING:
+ ps_mode = 2;
+ break;
default:
- ps_mode = 0;
- }
+ ps_mode = 0;
+ }
- fprintf(renderer->file, "\\setlinecaps{%d}\n", ps_mode);
+ fprintf (renderer->file, "\\setlinecaps{%d}\n", ps_mode);
}
diff --git a/plug-ins/python/pydia-render.c b/plug-ins/python/pydia-render.c
index bbf01c3e4..84ee95d2a 100644
--- a/plug-ins/python/pydia-render.c
+++ b/plug-ins/python/pydia-render.c
@@ -196,25 +196,25 @@ set_linewidth (DiaRenderer *renderer, double linewidth)
/**
* set_linecaps:
* @renderer: the #DiaRenderer
- * @mode: #LineCaps
+ * @mode: #DiaLineCaps
*
* Set linecaps for later use
*
* Optional on the PyDia side.
*/
static void
-set_linecaps (DiaRenderer *renderer, LineCaps mode)
+set_linecaps (DiaRenderer *renderer, DiaLineCaps mode)
{
PyObject *func, *res, *arg, *self = PYDIA_RENDERER (renderer);
- switch(mode) {
- case LINECAPS_BUTT:
+ switch (mode) {
+ case DIA_LINE_CAPS_BUTT:
break;
- case LINECAPS_ROUND:
+ case DIA_LINE_CAPS_ROUND:
break;
- case LINECAPS_PROJECTING:
+ case DIA_LINE_CAPS_PROJECTING:
break;
- case LINECAPS_DEFAULT:
+ case DIA_LINE_CAPS_DEFAULT:
default:
PyErr_Warn (PyExc_RuntimeWarning,
"DiaPyRenderer : Unsupported fill mode specified!\n");
diff --git a/plug-ins/svg/svg-import.c b/plug-ins/svg/svg-import.c
index 647596e94..15cd84949 100644
--- a/plug-ins/svg/svg-import.c
+++ b/plug-ins/svg/svg-import.c
@@ -581,7 +581,7 @@ apply_style (DiaObject *obj,
eprop->common.experience |= PXP_NOTSET;
eprop = g_ptr_array_index(props,6);
- if (gs->linecap != LINECAPS_DEFAULT)
+ if (gs->linecap != DIA_LINE_CAPS_DEFAULT)
eprop->enum_data = gs->linecap;
else
eprop->common.experience |= PXP_NOTSET;
diff --git a/plug-ins/vdx/vdx-export.c b/plug-ins/vdx/vdx-export.c
index 4499500c8..9c562e0cb 100644
--- a/plug-ins/vdx/vdx-export.c
+++ b/plug-ins/vdx/vdx-export.c
@@ -86,7 +86,7 @@ struct _VDXRenderer
int depth;
double linewidth;
- LineCaps capsmode;
+ DiaLineCaps capsmode;
DiaLineJoin joinmode;
DiaLineStyle stylemode;
double dashlength;
@@ -315,13 +315,12 @@ set_linewidth(DiaRenderer *self, real linewidth)
renderer->linewidth = linewidth;
}
-/** Set line caps
- * @param self a renderer
- * @param mode new line caps
- */
+/*
+ * Set line caps
+ */
static void
-set_linecaps(DiaRenderer *self, LineCaps mode)
+set_linecaps (DiaRenderer *self, DiaLineCaps mode)
{
VDXRenderer *renderer = VDX_RENDERER(self);
@@ -458,7 +457,7 @@ create_Line (VDXRenderer *renderer,
Line->LineColorTrans = 1.0 - color->alpha;
Line->LineWeight = renderer->linewidth / vdx_Line_Scale;
/* VDX only has Rounded (0) or Square (1) ends */
- if (renderer->capsmode != LINECAPS_ROUND) {
+ if (renderer->capsmode != DIA_LINE_CAPS_ROUND) {
Line->LineCap = 1; /* Square */
}
diff --git a/plug-ins/wmf/wmf.cpp b/plug-ins/wmf/wmf.cpp
index 3e7e6cb1d..68871509c 100644
--- a/plug-ins/wmf/wmf.cpp
+++ b/plug-ins/wmf/wmf.cpp
@@ -408,31 +408,33 @@ set_linewidth(DiaRenderer *self, real linewidth)
renderer->nLineWidth = SC(linewidth);
}
+
static void
-set_linecaps(DiaRenderer *self, LineCaps mode)
+set_linecaps (DiaRenderer *self, DiaLineCaps mode)
{
- WmfRenderer *renderer = WMF_RENDERER (self);
+ WmfRenderer *renderer = WMF_RENDERER (self);
- DIAG_NOTE(renderer, "set_linecaps %d\n", mode);
+ DIAG_NOTE (renderer, "set_linecaps %d\n", mode);
- // all the advanced line rendering is unsupported on win9x
- if (!renderer->platform_is_nt)
- return;
+ // all the advanced line rendering is unsupported on win9x
+ if (!renderer->platform_is_nt) {
+ return;
+ }
- renderer->fnPenStyle &= ~(PS_ENDCAP_MASK);
- switch(mode) {
- case LINECAPS_BUTT:
+ renderer->fnPenStyle &= ~(PS_ENDCAP_MASK);
+ switch (mode) {
+ case DIA_LINE_CAPS_BUTT:
renderer->fnPenStyle |= PS_ENDCAP_FLAT;
break;
- case LINECAPS_ROUND:
+ case DIA_LINE_CAPS_ROUND:
renderer->fnPenStyle |= PS_ENDCAP_ROUND;
break;
- case LINECAPS_PROJECTING:
+ case DIA_LINE_CAPS_PROJECTING:
renderer->fnPenStyle |= PS_ENDCAP_SQUARE;
break;
default:
- g_warning("WmfRenderer : Unsupported fill mode specified!\n");
- }
+ g_warning ("WmfRenderer : Unsupported fill mode specified!\n");
+ }
}
diff --git a/plug-ins/wpg/wpg.c b/plug-ins/wpg/wpg.c
index ac9b6c42b..65ebfd283 100644
--- a/plug-ins/wpg/wpg.c
+++ b/plug-ins/wpg/wpg.c
@@ -347,21 +347,22 @@ set_linewidth(DiaRenderer *self, real linewidth)
renderer->LineAttr.Width = SC(linewidth);
}
+
static void
-set_linecaps(DiaRenderer *self, LineCaps mode)
+set_linecaps (DiaRenderer *self, DiaLineCaps mode)
{
- DIAG_NOTE(g_message("set_linecaps %d", mode));
+ DIAG_NOTE (g_message("set_linecaps %d", mode));
- switch(mode) {
- case LINECAPS_DEFAULT:
- case LINECAPS_BUTT:
- break;
- case LINECAPS_ROUND:
- break;
- case LINECAPS_PROJECTING:
- break;
- default:
- g_warning("WpgRenderer : Unsupported line-caps mode specified!\n");
+ switch (mode) {
+ case DIA_LINE_CAPS_DEFAULT:
+ case DIA_LINE_CAPS_BUTT:
+ break;
+ case DIA_LINE_CAPS_ROUND:
+ break;
+ case DIA_LINE_CAPS_PROJECTING:
+ break;
+ default:
+ g_warning("WpgRenderer : Unsupported line-caps mode specified!\n");
}
}
diff --git a/plug-ins/xfig/xfig-export.c b/plug-ins/xfig/xfig-export.c
index 32c4e13f6..f64ed9550 100644
--- a/plug-ins/xfig/xfig-export.c
+++ b/plug-ins/xfig/xfig-export.c
@@ -69,7 +69,7 @@ struct _DiaXfigRenderer {
int depth;
double linewidth;
- LineCaps capsmode;
+ DiaLineCaps capsmode;
DiaLineJoin joinmode;
DiaLineStyle stylemode;
double dashlength;
@@ -490,7 +490,7 @@ set_linewidth (DiaRenderer *self, double linewidth)
static void
-set_linecaps (DiaRenderer *self, LineCaps mode)
+set_linecaps (DiaRenderer *self, DiaLineCaps mode)
{
DiaXfigRenderer *renderer = DIA_XFIG_RENDERER (self);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
