summaryrefslogtreecommitdiffstats
path: root/src/debug/simple-event.h
diff options
context:
space:
mode:
authorJan Lingscheid <jan.linscheid@auticon.de>2017-10-18 14:03:34 +0000
committerJan Lingscheid <jan.linscheid@auticon.de>2017-10-18 14:03:34 +0000
commit41b862f1c4eaea48bdd0d546e2bb31907f15857b (patch)
treee667c91439f0f04aa1f2cec1d3eafddf80bc4ecc /src/debug/simple-event.h
parentReplace boost::shared_ptr (diff)
downloadinkscape-41b862f1c4eaea48bdd0d546e2bb31907f15857b.tar.gz
inkscape-41b862f1c4eaea48bdd0d546e2bb31907f15857b.zip
Refactor Util::ptr_shared
Util::ptr_shared<T> was only used in its <char> specialization, so it is now refactored into a non-template class. Using it with arbitary classes was dangerous anyway.
Diffstat (limited to 'src/debug/simple-event.h')
-rw-r--r--src/debug/simple-event.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/debug/simple-event.h b/src/debug/simple-event.h
index 03ce5d326..076b9b4b5 100644
--- a/src/debug/simple-event.h
+++ b/src/debug/simple-event.h
@@ -26,7 +26,7 @@ namespace Debug {
template <Event::Category C=Event::OTHER>
class SimpleEvent : public Event {
public:
- explicit SimpleEvent(Util::ptr_shared<char> name) : _name(name) {}
+ explicit SimpleEvent(Util::ptr_shared name) : _name(name) {}
explicit SimpleEvent(char const *name) : _name(Util::share_string(name)) {}
// default copy
@@ -34,7 +34,7 @@ public:
static Category category() { return C; }
- Util::ptr_shared<char> name() const { return _name; }
+ Util::ptr_shared name() const { return _name; }
unsigned propertyCount() const { return _properties.size(); }
PropertyPair property(unsigned property) const {
return _properties[property];
@@ -43,21 +43,21 @@ public:
void generateChildEvents() const {}
protected:
- void _addProperty(Util::ptr_shared<char> name,
- Util::ptr_shared<char> value)
+ void _addProperty(Util::ptr_shared name,
+ Util::ptr_shared value)
{
_properties.push_back(PropertyPair(name, value));
}
- void _addProperty(Util::ptr_shared<char> name, char const *value) {
+ void _addProperty(Util::ptr_shared name, char const *value) {
_addProperty(name, Util::share_string(value));
}
- void _addProperty(char const *name, Util::ptr_shared<char> value) {
+ void _addProperty(char const *name, Util::ptr_shared value) {
_addProperty(Util::share_string(name), value);
}
void _addProperty(char const *name, char const *value) {
_addProperty(Util::share_string(name), Util::share_string(value));
}
- void _addProperty(Util::ptr_shared<char> name, long value) {
+ void _addProperty(Util::ptr_shared name, long value) {
_addFormattedProperty(name, "%ld", value);
}
void _addProperty(char const *name, long value) {
@@ -65,10 +65,10 @@ protected:
}
private:
- Util::ptr_shared<char> _name;
+ Util::ptr_shared _name;
std::vector<PropertyPair, GC::Alloc<PropertyPair, GC::AUTO> > _properties;
- void _addFormattedProperty(Util::ptr_shared<char> name, char const *format, ...)
+ void _addFormattedProperty(Util::ptr_shared name, char const *format, ...)
{
va_list args;
va_start(args, format);