diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-09-25 22:56:32 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2013-09-25 22:56:32 +0000 |
| commit | 86c5f57796d973a949bf784a2a3decd451670f65 (patch) | |
| tree | 67ebaebe16b973bbec7bc3b5501dbfcd63477c8c /src/sp-item.cpp | |
| parent | update to trunk (diff) | |
| parent | C++ify calling a few SPLPEItem functions, much more work than expected... slo... (diff) | |
| download | inkscape-86c5f57796d973a949bf784a2a3decd451670f65.tar.gz inkscape-86c5f57796d973a949bf784a2a3decd451670f65.zip | |
Update to trunk
(bzr r11950.1.148)
Diffstat (limited to 'src/sp-item.cpp')
| -rw-r--r-- | src/sp-item.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sp-item.cpp b/src/sp-item.cpp index b7ef68f7d..a99bf85cc 100644 --- a/src/sp-item.cpp +++ b/src/sp-item.cpp @@ -933,7 +933,7 @@ void SPItem::invoke_print(SPPrintContext *ctx) } } -const char* SPItem::display_name() { +const char* SPItem::displayName() { return _("Object"); } @@ -946,10 +946,10 @@ gchar* SPItem::description() { * * Must be freed by caller. */ -gchar *SPItem::getDetailedDescription() +gchar *SPItem::detailedDescription() { gchar* s = g_strdup_printf("<b>%s</b> %s", - this->display_name(), this->description()); + this->displayName(), this->description()); if (s && clip_ref->getObject()) { gchar *snew = g_strdup_printf (_("%s; <i>clipped</i>"), s); @@ -1287,7 +1287,7 @@ void SPItem::adjust_livepatheffect (Geom::Affine const &postmul, bool set) { if ( SP_IS_LPE_ITEM(this) ) { SPLPEItem *lpeitem = SP_LPE_ITEM (this); - if ( sp_lpe_item_has_path_effect(lpeitem) ) { + if ( lpeitem->hasPathEffect() ) { sp_lpe_item_fork_path_effects_if_necessary(lpeitem); // now that all LPEs are forked_if_necessary, we can apply the transform |
