From 2cdb481d0d449bed3a914883d0b84a9481a5f6f2 Mon Sep 17 00:00:00 2001 From: "Liam P. White" Date: Sun, 14 Sep 2014 13:29:48 -0400 Subject: Small cleanup (bzr r13341.1.205) --- src/live_effects/lpe-attach-path.cpp | 2 +- src/live_effects/lpe-jointype.cpp | 40 ++++++++++++++---------- src/live_effects/lpe-jointype.h | 12 +++++++ src/live_effects/lpe-taperstroke.cpp | 5 +-- src/live_effects/lpe-taperstroke.h | 2 +- src/live_effects/parameter/originalpatharray.cpp | 7 +---- src/live_effects/parameter/originalpatharray.h | 2 +- src/live_effects/parameter/transformedpoint.h | 5 --- 8 files changed, 40 insertions(+), 35 deletions(-) (limited to 'src') diff --git a/src/live_effects/lpe-attach-path.cpp b/src/live_effects/lpe-attach-path.cpp index 96372892e..2880cbc37 100644 --- a/src/live_effects/lpe-attach-path.cpp +++ b/src/live_effects/lpe-attach-path.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) Johan Engelen 2012 + * Copyright (C) Theodore Janeczko 2012 * * Released under GNU GPL, read the file 'COPYING' for more information */ diff --git a/src/live_effects/lpe-jointype.cpp b/src/live_effects/lpe-jointype.cpp index b0a6e845b..7c7581d9e 100644 --- a/src/live_effects/lpe-jointype.cpp +++ b/src/live_effects/lpe-jointype.cpp @@ -1,6 +1,3 @@ -/** \file - * LPE "Join Type" implementation - */ /* Authors: * * Liam P White @@ -10,8 +7,6 @@ * Released under GNU GPL v2, read the file 'COPYING' for more information */ -#include - #include "live_effects/parameter/enum.h" #include "live_effects/pathoutlineprovider.h" @@ -62,13 +57,13 @@ LPEJoinType::LPEJoinType(LivePathEffectObject *lpeobject) : attempt_force_join(_("Force miter"), _("Overrides the miter limit and forces a join."), "attempt_force_join", &wr, this, true) { show_orig_path = true; - registerParameter( dynamic_cast(&linecap_type) ); - registerParameter( dynamic_cast(&line_width) ); - registerParameter( dynamic_cast(&linejoin_type) ); - registerParameter( dynamic_cast(&start_lean) ); - registerParameter( dynamic_cast(&end_lean) ); - registerParameter( dynamic_cast(&miter_limit) ); - registerParameter( dynamic_cast(&attempt_force_join) ); + registerParameter(&linecap_type); + registerParameter(&line_width); + registerParameter(&linejoin_type); + registerParameter(&start_lean); + registerParameter(&end_lean); + registerParameter(&miter_limit); + registerParameter(&attempt_force_join); was_initialized = false; start_lean.param_set_range(-1,1); start_lean.param_set_increments(0.1, 0.1); @@ -169,9 +164,9 @@ void LPEJoinType::doOnRemove(SPLPEItem const* lpeitem) } } -//NOTE: I originally had all the outliner functions defined in here, but they were actually useful -//enough for other LPEs so I moved them all into pathoutlineprovider.cpp. The code here is just a -//wrapper around it. +// NOTE: I originally had all the outliner functions defined in here, but they were actually useful +// enough for other LPEs so I moved them all into pathoutlineprovider.cpp. The code here is just a +// wrapper around it. std::vector LPEJoinType::doEffect_path(std::vector const & path_in) { return Outline::PathVectorOutline(path_in, line_width, static_cast(linecap_type.get_value()), @@ -180,5 +175,16 @@ std::vector LPEJoinType::doEffect_path(std::vector const start_lean/2 ,end_lean/2); } -} //namespace LivePathEffect -} //namespace Inkscape +} // namespace LivePathEffect +} // namespace Inkscape + +/* + Local Variables: + mode:c++ + c-file-style:"stroustrup" + c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) + indent-tabs-mode:nil + fill-column:99 + End: +*/ +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8 : diff --git a/src/live_effects/lpe-jointype.h b/src/live_effects/lpe-jointype.h index 7ebce1c7e..d20640b74 100644 --- a/src/live_effects/lpe-jointype.h +++ b/src/live_effects/lpe-jointype.h @@ -5,6 +5,7 @@ * * Released under GNU GPL v2, read the file COPYING for more information */ + #ifndef INKSCAPE_LPE_JOINTYPE_H #define INKSCAPE_LPE_JOINTYPE_H @@ -43,3 +44,14 @@ private: } //namespace Inkscape #endif + +/* + Local Variables: + mode:c++ + c-file-style:"stroustrup" + c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) + indent-tabs-mode:nil + fill-column:99 + End: +*/ +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8 : diff --git a/src/live_effects/lpe-taperstroke.cpp b/src/live_effects/lpe-taperstroke.cpp index 5564a3b2c..db7e47f2b 100644 --- a/src/live_effects/lpe-taperstroke.cpp +++ b/src/live_effects/lpe-taperstroke.cpp @@ -612,9 +612,6 @@ Geom::Point KnotHolderEntityAttachEnd::knot_get() const } } - -/* ######################## */ - } //namespace LivePathEffect } /* namespace Inkscape */ @@ -627,4 +624,4 @@ Geom::Point KnotHolderEntityAttachEnd::knot_get() const fill-column:99 End: */ -// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 : +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8 : diff --git a/src/live_effects/lpe-taperstroke.h b/src/live_effects/lpe-taperstroke.h index 997209543..4719d1a46 100644 --- a/src/live_effects/lpe-taperstroke.h +++ b/src/live_effects/lpe-taperstroke.h @@ -69,4 +69,4 @@ private: fill-column:99 End: */ -// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 : +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8 : diff --git a/src/live_effects/parameter/originalpatharray.cpp b/src/live_effects/parameter/originalpatharray.cpp index 514c9e23e..7b0b073ee 100644 --- a/src/live_effects/parameter/originalpatharray.cpp +++ b/src/live_effects/parameter/originalpatharray.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) Johan Engelen 2008 + * Copyright (C) Theodore Janeczko 2012 * * Released under GNU GPL, read the file 'COPYING' for more information */ @@ -420,11 +420,6 @@ void OriginalPathArrayParam::linked_modified(SPObject *linked_obj, guint flags, _store->foreach_iter(sigc::bind(sigc::mem_fun(*this, &OriginalPathArrayParam::_updateLink), to)); } -//void PathParam::linked_transformed(Geom::Affine const *rel_transf, SPItem *moved_item) -//{ -// linked_transformed_callback(rel_transf, moved_item); -//} - bool OriginalPathArrayParam::param_readSVGValue(const gchar* strvalue) { if (strvalue) { diff --git a/src/live_effects/parameter/originalpatharray.h b/src/live_effects/parameter/originalpatharray.h index 865a3f8e5..1c60da409 100644 --- a/src/live_effects/parameter/originalpatharray.h +++ b/src/live_effects/parameter/originalpatharray.h @@ -4,7 +4,7 @@ /* * Inkscape::LivePathEffectParameters * -* Copyright (C) Johan Engelen 2008 + * Copyright (C) Theodore Janeczko 2012 * * Released under GNU GPL, read the file 'COPYING' for more information */ diff --git a/src/live_effects/parameter/transformedpoint.h b/src/live_effects/parameter/transformedpoint.h index 37af8b98f..c96bedb53 100644 --- a/src/live_effects/parameter/transformedpoint.h +++ b/src/live_effects/parameter/transformedpoint.h @@ -50,7 +50,6 @@ public: virtual void param_transform_multiply(Geom::Affine const &postmul, bool set); void set_vector_oncanvas_looks(SPKnotShapeType shape, SPKnotModeType mode, guint32 color); - //void set_origin_oncanvas_looks(SPKnotShapeType shape, SPKnotModeType mode, guint32 color); void set_oncanvas_color(guint32 color); virtual bool providesKnotHolderEntities() const { return true; } @@ -71,11 +70,7 @@ private: SPKnotShapeType vec_knot_shape; SPKnotModeType vec_knot_mode; guint32 vec_knot_color; -// SPKnotShapeType ori_knot_shape; -// SPKnotModeType ori_knot_mode; -// guint32 ori_knot_color; -// friend class VectorParamKnotHolderEntity_Origin; friend class TransformedPointParamKnotHolderEntity_Vector; }; -- cgit v1.2.3