diff options
| author | Kris De Gussem <kris.degussem@gmail.com> | 2012-02-08 20:32:09 +0000 |
|---|---|---|
| committer | Kris <Kris.De.Gussem@hotmail.com> | 2012-02-08 20:32:09 +0000 |
| commit | d659a2076f730e5bbfc5b191d6502d0fb90c320d (patch) | |
| tree | 12cfb814c53796af0850e6b70239ccb851ea5a4d /src/extension/param | |
| parent | Patch from lp 819209 to fix python extensions on OSX Lion (diff) | |
| download | inkscape-d659a2076f730e5bbfc5b191d6502d0fb90c320d.tar.gz inkscape-d659a2076f730e5bbfc5b191d6502d0fb90c320d.zip | |
(cppcheck and janitorial tasks:) C-style casting to C++-style casting
(bzr r10952)
Diffstat (limited to 'src/extension/param')
| -rw-r--r-- | src/extension/param/color.cpp | 4 | ||||
| -rw-r--r-- | src/extension/param/radiobutton.cpp | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/extension/param/color.cpp b/src/extension/param/color.cpp index 8f4f8c0fa..d8c78c97d 100644 --- a/src/extension/param/color.cpp +++ b/src/extension/param/color.cpp @@ -35,7 +35,6 @@ namespace Extension { void sp_color_param_changed(SPColorSelector *csel, GObject *cp); -/** \brief Free the allocated data. */ ParamColor::~ParamColor(void) { @@ -56,7 +55,6 @@ guint32 ParamColor::set( guint32 in, SPDocument * /*doc*/, Inkscape::XML::Node * return _value; } -/** \brief Initialize the object, to do that, copy the data. */ ParamColor::ParamColor (const gchar * name, const gchar * guitext, const gchar * desc, const Parameter::_scope_t scope, bool gui_hidden, const gchar * gui_tip, Inkscape::Extension::Extension * ext, Inkscape::XML::Node * xml) : Parameter(name, guitext, desc, scope, gui_hidden, gui_tip, ext), _changeSignal(0) @@ -113,7 +111,7 @@ void sp_color_param_changed(SPColorSelector *csel, GObject *obj) const SPColor color = csel->base->getColor(); float alpha = csel->base->getAlpha(); - ParamColor* ptr = (ParamColor*)obj; + ParamColor* ptr = reinterpret_cast<ParamColor*>(obj); ptr->set(color.toRGBA32( alpha ), NULL, NULL); ptr->_changeSignal->emit(); diff --git a/src/extension/param/radiobutton.cpp b/src/extension/param/radiobutton.cpp index d6cac6541..90b380643 100644 --- a/src/extension/param/radiobutton.cpp +++ b/src/extension/param/radiobutton.cpp @@ -113,7 +113,7 @@ ParamRadioButton::ParamRadioButton (const gchar * name, // for simplicity : default to the contents of the first xml-child const char * defaultval = NULL; if (choices) { - defaultval = ((optionentry*) choices->data)->value->c_str(); + defaultval = (static_cast<optionentry*> (choices->data))->value->c_str(); } const char * indent = xml->attribute("indent"); |
