visio plugin: manage _line member of Graphic as a value instead of pointer

This member is never set to NULL and the Line class is not involved in any
inheritance hierarchy. So there is no need to heap-allocate it or pass it around
by pointer.

diff --git a/plugin/visio/VisioGraphic.cpp b/plugin/visio/VisioGraphic.cpp
index d20c95ce1601b7ab0536668344b87f7f56e7517a..f3d794aebfdc267d730896af4d3a30412918d5e5 100644 (file)
--- a/plugin/visio/VisioGraphic.cpp
+++ b/plugin/visio/VisioGraphic.cpp
@@ -413,7 +413,7 @@ namespace Visio
                                break;
                }
                return new Graphic(
-                       new Line(
+                       Line(
                                job->obj->penwidth,
                                job->obj->pencolor.u.rgba[0],
                                job->obj->pencolor.u.rgba[1],
@@ -443,7 +443,7 @@ namespace Visio
                                break;
                }
                return new Graphic(
-                       new Line(
+                       Line(
                                job->obj->penwidth,
                                job->obj->pencolor.u.rgba[0],
                                job->obj->pencolor.u.rgba[1],
@@ -478,7 +478,7 @@ namespace Visio
                                break;
                }
                return new Graphic(
-                       new Line(
+                       Line(
                                job->obj->penwidth,
                                job->obj->pencolor.u.rgba[0],
                                job->obj->pencolor.u.rgba[1],
@@ -510,7 +510,7 @@ namespace Visio
                                break;
                }
                return new Graphic(
-                       new Line(
+                       Line(
                                job->obj->penwidth,
                                job->obj->pencolor.u.rgba[0],
                                job->obj->pencolor.u.rgba[1],
@@ -522,7 +522,7 @@ namespace Visio
                                n));
        }
        
-       Graphic::Graphic(Line* line, Fill* fill, Geom* geom):
+       Graphic::Graphic(const Line &line, Fill* fill, Geom* geom):
                _line(line),
                _fill(fill),
                _geom(geom)
@@ -531,8 +531,6 @@ namespace Visio
        
        Graphic::~Graphic()
        {
-               if (_line)
-                       delete _line;
                if (_fill)
                        delete _fill;
                if (_geom)
@@ -551,8 +549,7 @@ namespace Visio
                
        void Graphic::Print(GVJ_t* job, pointf first, pointf last, bool allowCurves) const
        {
-               if (_line)
-                       _line->Print(job);
+               _line.Print(job);
                if (_fill)
                        _fill->Print(job);
                if (_geom)

diff --git a/plugin/visio/VisioGraphic.h b/plugin/visio/VisioGraphic.h
index b83a8227efbf992d9ee9927be31f9e28033c5bb6..1e0313508c693070815300fc523245060b4dc357 100644 (file)
--- a/plugin/visio/VisioGraphic.h
+++ b/plugin/visio/VisioGraphic.h
@@ -162,9 +162,9 @@ namespace Visio
                void Print(GVJ_t* job, pointf first, pointf last, bool allowCurves) const;
                
        private:
-               Graphic(Line* line, Fill* fill, Geom* geom);
+               Graphic(const Line &line, Fill* fill, Geom* geom);
                
-               Line* _line;
+               Line _line;
                Fill* _fill;
                Geom* _geom;
        };