change names for displayName and detailedDescription, improve char code and remove const.

(bzr r12584)

38 files changed, 62 insertions, 61 deletions

diff --git a/src/gradient-drag.cpp b/src/gradient-drag.cpp
index 096b2b47b..b3622107b 100644
--- a/src/gradient-drag.cpp
+++ b/src/gradient-drag.cpp
@@ -1417,7 +1417,7 @@ void GrDragger::updateTip()
 
     if (g_slist_length (this->draggables) == 1) {
         GrDraggable *draggable = (GrDraggable *) this->draggables->data;
-        char *item_desc = draggable->item->getDetailedDescription();
+        char *item_desc = draggable->item->detailedDescription();
         switch (draggable->point_type) {
             case POINT_LG_MID:
             case POINT_RG_MID1:
diff --git a/src/selection-describer.cpp b/src/selection-describer.cpp
index 96ef3d0d1..5dddb0832 100644
--- a/src/selection-describer.cpp
+++ b/src/selection-describer.cpp
@@ -39,21 +39,21 @@
 #include "sp-spiral.h"
 
 // Returns a list of terms for the items to be used in the statusbar
-const char* collect_terms (GSList *items)
+char* collect_terms (GSList *items)
 {
     GSList *check = NULL;
     std::stringstream ss;
     bool first = true;
 
     for (GSList *i = (GSList *)items; i != NULL; i = i->next) {
-        const char *term = SP_ITEM(i->data)->display_name();
+        const char *term = SP_ITEM(i->data)->displayName();
         if (term != NULL && g_slist_find (check, term) == NULL) {
             check = g_slist_prepend (check, (void *) term);
             ss << (first ? "" : ", ") << "<b>" << term << "</b>";
             first = false;
         }
     }
-    return ss.str().c_str();
+    return g_strdup(ss.str().c_str());
 }
 
 // Returns the number of filtered items in the list
@@ -150,16 +150,16 @@ void SelectionDescriber::_updateMessageFromSelection(Inkscape::Selection *select
                 else 
                     in_phrase = g_strdup_printf(_(" in group %s (%s)"), parent_name, layer_name);
             } else {
-                    in_phrase = g_strdup_printf(ngettext(" in <b>%i</b> parents (%s)", " in <b>%i</b> parents (%s)", num_parents), num_parents, layer_name);
+                    in_phrase = g_strdup_printf(ngettext(" in <b>%i</b> parent (%s)", " in <b>%i</b> parents (%s)", num_parents), num_parents, layer_name);
             }
         } else {
-            in_phrase = g_strdup_printf(ngettext(" in <b>%i</b> layers", " in <b>%i</b> layers", num_layers), num_layers);
+            in_phrase = g_strdup_printf(ngettext(" in <b>%i</b> layer", " in <b>%i</b> layers", num_layers), num_layers);
         }
         g_free (layer_name);
         g_free (parent_name);
 
         if (!items->next) { // one item
-            char *item_desc = item->getDetailedDescription();
+            char *item_desc = item->detailedDescription();
 
             if (SP_IS_USE(item) && SP_IS_SYMBOL(item->firstChild())) {
                 _context.setF(Inkscape::NORMAL_MESSAGE, "%s%s. %s. %s.",
@@ -187,12 +187,13 @@ void SelectionDescriber::_updateMessageFromSelection(Inkscape::Selection *select
             }
             g_free(item_desc);
         } else { // multiple items
-            int object_count = g_slist_length((GSList *)items);
-            const char *terms = collect_terms ((GSList *)items);
+            int objcount = g_slist_length((GSList *)items);
+            char *terms = collect_terms ((GSList *)items);
 
-            gchar *objects_str = 
-                g_strdup_printf( "<b>%i</b> objects selected of types %s",
-                        object_count, terms );
+            gchar *objects_str = g_strdup_printf(
+                "<b>%i</b> objects selected of types %s", objcount, terms);
+
+            g_free(terms);
 
             // indicate all, some, or none filtered
             gchar *filt_str = NULL;
@@ -201,7 +202,7 @@ void SelectionDescriber::_updateMessageFromSelection(Inkscape::Selection *select
                 filt_str = g_strdup_printf(ngettext("; <i>%d filtered object</i> ",
                                                      "; <i>%d filtered objects</i> ", n_filt), n_filt);
             } else {
-                filt_str = g_strdup_printf("%s", "");
+                filt_str = g_strdup("");
             }
 
             _context.setF(Inkscape::NORMAL_MESSAGE, "%s%s%s. %s.", objects_str, filt_str, in_phrase, _when_selected);
@@ -211,7 +212,7 @@ void SelectionDescriber::_updateMessageFromSelection(Inkscape::Selection *select
             }
             if (filt_str) {
                 g_free(filt_str);
-                objects_str = 0;
+                filt_str = 0;
             }
         }
 
diff --git a/src/sp-anchor.cpp b/src/sp-anchor.cpp
index 3ed2c766c..a6a41bef3 100644
--- a/src/sp-anchor.cpp
+++ b/src/sp-anchor.cpp
@@ -115,7 +115,7 @@ Inkscape::XML::Node* SPAnchor::write(Inkscape::XML::Document *xml_doc, Inkscape:
     return repr;
 }
 
-const char* SPAnchor::display_name() {
+const char* SPAnchor::displayName() {
     return _("Link");
 }
 
diff --git a/src/sp-anchor.h b/src/sp-anchor.h
index a88778132..39f6d0b7a 100644
--- a/src/sp-anchor.h
+++ b/src/sp-anchor.h
@@ -30,7 +30,7 @@ public:
 	virtual void set(unsigned int key, gchar const* value);
 	virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags);
 
-    virtual const char* display_name();
+    virtual const char* displayName();
 	virtual gchar* description();
 	virtual gint event(SPEvent *event);
 };
diff --git a/src/sp-ellipse.cpp b/src/sp-ellipse.cpp
index cb39ef0ec..73628a928 100644
--- a/src/sp-ellipse.cpp
+++ b/src/sp-ellipse.cpp
@@ -480,7 +480,7 @@ void SPEllipse::set(unsigned int key, gchar const* value) {
     }
 }
 
-const char* SPEllipse::display_name() {
+const char* SPEllipse::displayName() {
     return _("Ellipse");
 }
 
@@ -560,7 +560,7 @@ void SPCircle::set(unsigned int key, gchar const* value) {
     }
 }
 
-const char* SPCircle::display_name() {
+const char* SPCircle::displayName() {
 	return _("Circle");
 }
 
@@ -734,7 +734,7 @@ void SPArc::modified(guint flags) {
 }
 
 
-const char* SPArc::display_name() {
+const char* SPArc::displayName() {
     gdouble len = fmod(this->end - this->start, SP_2PI);
 
     if (len < 0.0) {
diff --git a/src/sp-ellipse.h b/src/sp-ellipse.h
index b74beeae0..083f5847d 100644
--- a/src/sp-ellipse.h
+++ b/src/sp-ellipse.h
@@ -59,7 +59,7 @@ public:
 	virtual void build(SPDocument *document, Inkscape::XML::Node *repr);
 	virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags);
 	virtual void set(unsigned int key, gchar const* value);
-    virtual const char* display_name();
+    virtual const char* displayName();
 };
 
 void sp_ellipse_position_set (SPEllipse * ellipse, gdouble x, gdouble y, gdouble rx, gdouble ry);
@@ -76,7 +76,7 @@ public:
 	virtual void build(SPDocument *document, Inkscape::XML::Node *repr);
 	virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags);
 	virtual void set(unsigned int key, gchar const* value);
-    virtual const char* display_name();
+    virtual const char* displayName();
 };
 
 /* <path sodipodi:type="arc"> element */
@@ -91,7 +91,7 @@ public:
 	virtual void build(SPDocument *document, Inkscape::XML::Node *repr);
 	virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags);
 	virtual void set(unsigned int key, gchar const* value);
-    virtual const char* display_name();
+    virtual const char* displayName();
 	virtual void modified(unsigned int flags);
 };
 
diff --git a/src/sp-flowregion.cpp b/src/sp-flowregion.cpp
index caa6aef76..ed17f1948 100644
--- a/src/sp-flowregion.cpp
+++ b/src/sp-flowregion.cpp
@@ -188,7 +188,7 @@ Inkscape::XML::Node *SPFlowregion::write(Inkscape::XML::Document *xml_doc, Inksc
     return repr;
 }
 
-const char* SPFlowregion::display_name() {
+const char* SPFlowregion::displayName() {
 	// TRANSLATORS: "Flow region" is an area where text is allowed to flow
 	return _("Flow Region");
 }
@@ -335,7 +335,7 @@ Inkscape::XML::Node *SPFlowregionExclude::write(Inkscape::XML::Document *xml_doc
     return repr;
 }
 
-const char* SPFlowregionExclude::display_name() {
+const char* SPFlowregionExclude::displayName() {
 	/* TRANSLATORS: A region "cut out of" a flow region; text is not allowed to flow inside the
 	 * flow excluded region.  flowRegionExclude in SVG 1.2: see
 	 * http://www.w3.org/TR/2004/WD-SVG12-20041027/flow.html#flowRegion-elem and
diff --git a/src/sp-flowregion.h b/src/sp-flowregion.h
index 600b2aa6e..111a32c6c 100644
--- a/src/sp-flowregion.h
+++ b/src/sp-flowregion.h
@@ -31,7 +31,7 @@ public:
 	virtual void update(SPCtx *ctx, unsigned int flags);
 	virtual void modified(guint flags);
 	virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags);
-	virtual const char* display_name();
+	virtual const char* displayName();
 };
 
 class SPFlowregionExclude : public SPItem {
@@ -48,7 +48,7 @@ public:
 	virtual void update(SPCtx *ctx, unsigned int flags);
 	virtual void modified(guint flags);
 	virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags);
-	virtual const char* display_name();
+	virtual const char* displayName();
 };
 
 #endif
diff --git a/src/sp-flowtext.cpp b/src/sp-flowtext.cpp
index d46a644cf..23eba73b1 100644
--- a/src/sp-flowtext.cpp
+++ b/src/sp-flowtext.cpp
@@ -281,7 +281,7 @@ void SPFlowtext::print(SPPrintContext *ctx) {
     this->layout.print(ctx, pbox, dbox, bbox, ctm);
 }
 
-const char* SPFlowtext::display_name() {
+const char* SPFlowtext::displayName() {
     if (SP_FLOWTEXT(this)->has_internal_frame()) {
         return _("Flowed Text");
     } else {
diff --git a/src/sp-flowtext.h b/src/sp-flowtext.h
index de328608f..f56cba3cd 100644
--- a/src/sp-flowtext.h
+++ b/src/sp-flowtext.h
@@ -73,7 +73,7 @@ public:
 
 	virtual Geom::OptRect bbox(Geom::Affine const &transform, SPItem::BBoxType type);
 	virtual void print(SPPrintContext *ctx);
-        virtual const char* display_name();
+        virtual const char* displayName();
 	virtual gchar* description();
 	virtual Inkscape::DrawingItem* show(Inkscape::Drawing &drawing, unsigned int key, unsigned int flags);
 	virtual void hide(unsigned int key);
diff --git a/src/sp-image.cpp b/src/sp-image.cpp
index 38c749dd3..05dfb5f48 100644
--- a/src/sp-image.cpp
+++ b/src/sp-image.cpp
@@ -610,7 +610,7 @@ void SPImage::print(SPPrintContext *ctx) {
     }
 }
 
-const char* SPImage::display_name() {
+const char* SPImage::displayName() {
     return _("Image");
 }
 
diff --git a/src/sp-image.h b/src/sp-image.h
index 85eceac20..b5834c988 100644
--- a/src/sp-image.h
+++ b/src/sp-image.h
@@ -64,7 +64,7 @@ public:
 
     virtual Geom::OptRect bbox(Geom::Affine const &transform, SPItem::BBoxType type);
     virtual void print(SPPrintContext *ctx);
-    virtual const char* display_name();
+    virtual const char* displayName();
     virtual gchar* description();
     virtual Inkscape::DrawingItem* show(Inkscape::Drawing &drawing, unsigned int key, unsigned int flags);
     virtual void snappoints(std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs);
diff --git a/src/sp-item-group.cpp b/src/sp-item-group.cpp
index 720f6857a..ca5ca1615 100644
--- a/src/sp-item-group.cpp
+++ b/src/sp-item-group.cpp
@@ -328,7 +328,7 @@ void SPGroup::print(SPPrintContext *ctx) {
     }
 }
 
-const char *SPGroup::display_name() {
+const char *SPGroup::displayName() {
     return _("Group");
 }
 
diff --git a/src/sp-item-group.h b/src/sp-item-group.h
index 24c24abbd..3954a5d21 100644
--- a/src/sp-item-group.h
+++ b/src/sp-item-group.h
@@ -76,7 +76,7 @@ public:
 
     virtual Geom::OptRect bbox(Geom::Affine const &transform, SPItem::BBoxType bboxtype);
     virtual void print(SPPrintContext *ctx);
-    virtual const char* display_name();
+    virtual const char* displayName();
     virtual gchar *description();
     virtual Inkscape::DrawingItem *show (Inkscape::Drawing &drawing, unsigned int key, unsigned int flags);
     virtual void hide (unsigned int key);
diff --git a/src/sp-item.cpp b/src/sp-item.cpp
index b7ef68f7d..bdcbefbba 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);
diff --git a/src/sp-item.h b/src/sp-item.h
index 769af229e..ce5400e66 100644
--- a/src/sp-item.h
+++ b/src/sp-item.h
@@ -188,7 +188,7 @@ public:
     Geom::OptRect desktopBounds(BBoxType type) const;
 
     unsigned pos_in_parent();
-    gchar *getDetailedDescription();
+    gchar *detailedDescription();
     int ifilt();
     void invoke_print(SPPrintContext *ctx);
     static unsigned int display_key_new(unsigned int numkeys);
@@ -236,7 +236,7 @@ public:
 
 	virtual Geom::OptRect bbox(Geom::Affine const &transform, SPItem::BBoxType type);
 	virtual void print(SPPrintContext *ctx);
-    virtual const char* display_name();
+    virtual const char* displayName();
 	virtual gchar* description();
 	virtual Inkscape::DrawingItem* show(Inkscape::Drawing &drawing, unsigned int key, unsigned int flags);
 	virtual void hide(unsigned int key);
diff --git a/src/sp-line.cpp b/src/sp-line.cpp
index c3a0b13db..6b7df84f6 100644
--- a/src/sp-line.cpp
+++ b/src/sp-line.cpp
@@ -122,7 +122,7 @@ Inkscape::XML::Node* SPLine::write(Inkscape::XML::Document *xml_doc, Inkscape::X
     return repr;
 }
 
-const char* SPLine::display_name() {
+const char* SPLine::displayName() {
 	return _("Line");
 }
 
diff --git a/src/sp-line.h b/src/sp-line.h
index 7184b9401..f76c3449b 100644
--- a/src/sp-line.h
+++ b/src/sp-line.h
@@ -34,7 +34,7 @@ public:
 	virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags);
 	virtual void set(unsigned int key, gchar const* value);
 
-	virtual const char* display_name();
+	virtual const char* displayName();
 	virtual Geom::Affine set_transform(Geom::Affine const &transform);
 	virtual void convert_to_guides();
 	virtual void update(SPCtx* ctx, guint flags);
diff --git a/src/sp-offset.cpp b/src/sp-offset.cpp
index f9759cac1..f0b152d0e 100644
--- a/src/sp-offset.cpp
+++ b/src/sp-offset.cpp
@@ -339,7 +339,7 @@ void SPOffset::update(SPCtx *ctx, guint flags) {
     SPShape::update(ctx, flags);
 }
 
-const char* SPOffset::display_name() {
+const char* SPOffset::displayName() {
     if ( this->sourceHref ) {
         return _("Linked Offset");
     } else {
diff --git a/src/sp-offset.h b/src/sp-offset.h
index 360bfbf94..b93a6846b 100644
--- a/src/sp-offset.h
+++ b/src/sp-offset.h
@@ -82,7 +82,7 @@ public:
 	virtual void release();
 
 	virtual void snappoints(std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs);
-        virtual const char* display_name();
+        virtual const char* displayName();
 	virtual gchar* description();
 
 	virtual void set_shape();
diff --git a/src/sp-path.cpp b/src/sp-path.cpp
index 49e40fd24..6a503c6b2 100644
--- a/src/sp-path.cpp
+++ b/src/sp-path.cpp
@@ -66,7 +66,7 @@ gint SPPath::nodesInPath() const
     return _curve ? _curve->nodes_in_path() : 0;
 }
 
-const char* SPPath::display_name() {
+const char* SPPath::displayName() {
     return _("Path");
 }
 
diff --git a/src/sp-path.h b/src/sp-path.h
index ca25de33b..77c64a2cc 100644
--- a/src/sp-path.h
+++ b/src/sp-path.h
@@ -54,7 +54,7 @@ public:
 	virtual void set(unsigned int key, gchar const* value);
 	virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags);
 
-        virtual const char* display_name();
+        virtual const char* displayName();
 	virtual gchar* description();
 	virtual Geom::Affine set_transform(Geom::Affine const &transform);
     virtual void convert_to_guides();
diff --git a/src/sp-rect.cpp b/src/sp-rect.cpp
index 6d5119e4c..ff5e81f95 100644
--- a/src/sp-rect.cpp
+++ b/src/sp-rect.cpp
@@ -159,7 +159,7 @@ Inkscape::XML::Node * SPRect::write(Inkscape::XML::Document *xml_doc, Inkscape::
     return repr;
 }
 
-const char* SPRect::display_name() {
+const char* SPRect::displayName() {
     return _("Rectangle");
 }
 
diff --git a/src/sp-rect.h b/src/sp-rect.h
index e06833916..3219a3ace 100644
--- a/src/sp-rect.h
+++ b/src/sp-rect.h
@@ -55,7 +55,7 @@ public:
 	virtual void update(SPCtx* ctx, unsigned int flags);
 
 	virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags);
-        virtual const char* display_name();
+        virtual const char* displayName();
 
 	virtual void set_shape();
 	virtual Geom::Affine set_transform(Geom::Affine const& xform);
diff --git a/src/sp-spiral.cpp b/src/sp-spiral.cpp
index e4bfb8c76..0c5ef253f 100644
--- a/src/sp-spiral.cpp
+++ b/src/sp-spiral.cpp
@@ -226,7 +226,7 @@ void SPSpiral::update_patheffect(bool write) {
     shape->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
 }
 
-const char* SPSpiral::display_name() {
+const char* SPSpiral::displayName() {
     return _("Spiral");
 }
 
diff --git a/src/sp-spiral.h b/src/sp-spiral.h
index a140d48f9..a81b4a3dd 100644
--- a/src/sp-spiral.h
+++ b/src/sp-spiral.h
@@ -72,7 +72,7 @@ public:
 	virtual void set(unsigned int key, gchar const* value);
 
 	virtual void snappoints(std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs);
-    virtual const char* display_name();
+    virtual const char* displayName();
 	virtual gchar* description();
 
 	virtual void set_shape();
diff --git a/src/sp-star.cpp b/src/sp-star.cpp
index bc3155caf..10c3267b2 100644
--- a/src/sp-star.cpp
+++ b/src/sp-star.cpp
@@ -251,7 +251,7 @@ void SPStar::update_patheffect(bool write) {
     this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
 }
 
-const char* SPStar::display_name() {
+const char* SPStar::displayName() {
     if (this->flatsided == false)
         return _("Star");
     return _("Polygon");
diff --git a/src/sp-star.h b/src/sp-star.h
index 3096862cd..799880c42 100644
--- a/src/sp-star.h
+++ b/src/sp-star.h
@@ -50,7 +50,7 @@ public:
 	virtual void set(unsigned int key, gchar const* value);
 	virtual void update(SPCtx* ctx, guint flags);
 
-    virtual const char* display_name();
+    virtual const char* displayName();
 	virtual gchar* description();
 	virtual void snappoints(std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs);
 
diff --git a/src/sp-switch.cpp b/src/sp-switch.cpp
index c6dcf17e3..fa97cde91 100644
--- a/src/sp-switch.cpp
+++ b/src/sp-switch.cpp
@@ -71,7 +71,7 @@ GSList *SPSwitch::_childList(bool add_ref, SPObject::Action action) {
     return g_slist_prepend (NULL, child);
 }
 
-const char *SPSwitch::display_name() {
+const char *SPSwitch::displayName() {
     return _("Conditional Group");
 }
 
diff --git a/src/sp-switch.h b/src/sp-switch.h
index 5627784cf..e6dc6f01f 100644
--- a/src/sp-switch.h
+++ b/src/sp-switch.h
@@ -41,7 +41,7 @@ public:
     virtual void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref);
     virtual void remove_child(Inkscape::XML::Node *child);
     virtual void order_changed(Inkscape::XML::Node *child, Inkscape::XML::Node *old_ref, Inkscape::XML::Node *new_ref);
-    virtual const char* display_name();
+    virtual const char* displayName();
     virtual gchar *description();
 };
 
diff --git a/src/sp-text.cpp b/src/sp-text.cpp
index 927536dde..72a5996d1 100644
--- a/src/sp-text.cpp
+++ b/src/sp-text.cpp
@@ -321,7 +321,7 @@ void SPText::hide(unsigned int key) {
 //	SPItem::onHide(key);
 }
 
-const char* SPText::display_name() {
+const char* SPText::displayName() {
     return _("Text");
 }
 
diff --git a/src/sp-text.h b/src/sp-text.h
index 9b8afea6d..a7149159a 100644
--- a/src/sp-text.h
+++ b/src/sp-text.h
@@ -84,7 +84,7 @@ public:
 
 	virtual Geom::OptRect bbox(Geom::Affine const &transform, SPItem::BBoxType type);
 	virtual void print(SPPrintContext *ctx);
-        virtual const char* display_name();
+        virtual const char* displayName();
 	virtual gchar* description();
 	virtual Inkscape::DrawingItem* show(Inkscape::Drawing &drawing, unsigned int key, unsigned int flags);
 	virtual void hide(unsigned int key);
diff --git a/src/sp-tref.cpp b/src/sp-tref.cpp
index f0a4af667..4f9947a04 100644
--- a/src/sp-tref.cpp
+++ b/src/sp-tref.cpp
@@ -233,7 +233,7 @@ Geom::OptRect SPTRef::bbox(Geom::Affine const &transform, SPItem::BBoxType type)
     return bbox;
 }
 
-const char* SPTRef::display_name() {
+const char* SPTRef::displayName() {
     return _("Cloned Character Data");
 }
 
@@ -244,7 +244,7 @@ gchar* SPTRef::description() {
 	char *child_desc;
 
 	if (SP_IS_ITEM(referred)) {
-	    child_desc = SP_ITEM(referred)->getDetailedDescription();
+	    child_desc = SP_ITEM(referred)->detailedDescription();
 	} else {
 	    child_desc = g_strdup("");
 	}
diff --git a/src/sp-tref.h b/src/sp-tref.h
index c82970a7f..6d43d679d 100644
--- a/src/sp-tref.h
+++ b/src/sp-tref.h
@@ -58,7 +58,7 @@ public:
 	virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
 
 	virtual Geom::OptRect bbox(Geom::Affine const &transform, SPItem::BBoxType type);
-        virtual const char* display_name();
+        virtual const char* displayName();
 	virtual gchar* description();
 };
 
diff --git a/src/sp-tspan.cpp b/src/sp-tspan.cpp
index 43a9faa5e..21c5ee11f 100644
--- a/src/sp-tspan.cpp
+++ b/src/sp-tspan.cpp
@@ -216,7 +216,7 @@ Inkscape::XML::Node* SPTSpan::write(Inkscape::XML::Document *xml_doc, Inkscape::
     return repr;
 }
 
-const char* SPTSpan::display_name() {
+const char* SPTSpan::displayName() {
     return _("Text Span");
 }
 
diff --git a/src/sp-tspan.h b/src/sp-tspan.h
index ee05073cd..a7ae563bb 100644
--- a/src/sp-tspan.h
+++ b/src/sp-tspan.h
@@ -34,7 +34,7 @@ public:
 	virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
 
 	virtual Geom::OptRect bbox(Geom::Affine const &transform, SPItem::BBoxType type);
-        virtual const char* display_name();
+        virtual const char* displayName();
 };
 
 #endif /* !INKSCAPE_SP_TSPAN_H */
diff --git a/src/sp-use.cpp b/src/sp-use.cpp
index 05e1f0e66..56cac1981 100644
--- a/src/sp-use.cpp
+++ b/src/sp-use.cpp
@@ -226,7 +226,7 @@ void SPUse::print(SPPrintContext* ctx) {
     }
 }
 
-const char* SPUse::display_name() {
+const char* SPUse::displayName() {
     if(this->child && SP_IS_SYMBOL( this->child )) {
         return _("Symbol");
     }
@@ -250,7 +250,7 @@ gchar* SPUse::description() {
         }
 
         ++recursion_depth;
-        char *child_desc = SP_ITEM(this->child)->getDetailedDescription();
+        char *child_desc = SP_ITEM(this->child)->detailedDescription();
         --recursion_depth;
 
         char *ret = g_strdup_printf(_("of: %s"), child_desc);
diff --git a/src/sp-use.h b/src/sp-use.h
index 568b8f7da..0c53fd486 100644
--- a/src/sp-use.h
+++ b/src/sp-use.h
@@ -57,7 +57,7 @@ public:
 	virtual void modified(unsigned int flags);
 
 	virtual Geom::OptRect bbox(Geom::Affine const &transform, SPItem::BBoxType bboxtype);
-    virtual const char* display_name();
+    virtual const char* displayName();
 	virtual gchar* description();
 	virtual void print(SPPrintContext *ctx);
 	virtual Inkscape::DrawingItem* show(Inkscape::Drawing &drawing, unsigned int key, unsigned int flags);