Use braced initializer lists in place of constructors when possible

diff --git a/source/core/algorithm.h b/source/core/algorithm.h
index d295d00ab844c02e943f8795904ee8f35367dfd4..251a81ef1113b7f63cc849d1e78302bf5c941449 100644 (file)
--- a/source/core/algorithm.h
+++ b/source/core/algorithm.h
@@ -108,21 +108,19 @@ struct MemberMatch
        const T &value;
        T C::*mem_ptr;
 
-       MemberMatch(const T &v, T C::*p): value(v), mem_ptr(p) { }
-
        bool operator()(const C &obj) { return obj.*mem_ptr==value; }
 };
 
 template<typename Container, typename T>
 inline typename Container::iterator find_member(Container &cont, const T &value, T Container::value_type::*mp)
 {
-       return find_if(cont, MemberMatch<typename Container::value_type, T>(value, mp));
+       return find_if(cont, MemberMatch<typename Container::value_type, T>{ value, mp });
 }
 
 template<typename Container, typename T>
 inline typename Container::const_iterator find_member(const Container &cont, const T &value, T Container::value_type::*mp)
 {
-       return find_if(cont, MemberMatch<typename Container::value_type, T>(value, mp));
+       return find_if(cont, MemberMatch<typename Container::value_type, T>{ value, mp });
 }
 
 template<typename C, typename T, typename P=std::less<T>>
@@ -131,8 +129,6 @@ struct MemberCompare
        T C::*mem_ptr;
        P pred;
 
-       MemberCompare(T C::*p): mem_ptr(p) { }
-
        bool operator()(const C &obj, const T &v) { return pred(obj.*mem_ptr, v); }
        bool operator()(const T &v, const C &obj) { return pred(v, obj.*mem_ptr); }
        bool operator()(const C &obj1, const C &obj2) { return pred(obj1.*mem_ptr, obj2.*mem_ptr); }
@@ -141,37 +137,37 @@ struct MemberCompare
 template<typename Container, typename T>
 inline typename Container::iterator lower_bound_member(Container &cont, const T &value, T Container::value_type::*mp)
 {
-       return lower_bound(cont, value, MemberCompare<typename Container::value_type, T>(mp));
+       return lower_bound(cont, value, MemberCompare<typename Container::value_type, T>{ mp });
 }
 
 template<typename Container, typename T>
 inline typename Container::const_iterator lower_bound_member(const Container &cont, const T &value, T Container::value_type::*mp)
 {
-       return lower_bound(cont, value, MemberCompare<typename Container::value_type, T>(mp));
+       return lower_bound(cont, value, MemberCompare<typename Container::value_type, T>{ mp });
 }
 
 template<typename Container, typename T>
 inline typename Container::iterator upper_bound_member(Container &cont, const T &value, T Container::value_type::*mp)
 {
-       return upper_bound(cont, value, MemberCompare<typename Container::value_type, T>(mp));
+       return upper_bound(cont, value, MemberCompare<typename Container::value_type, T>{ mp });
 }
 
 template<typename Container, typename T>
 inline typename Container::const_iterator upper_bound_member(const Container &cont, const T &value, T Container::value_type::*mp)
 {
-       return upper_bound(cont, value, MemberCompare<typename Container::value_type, T>(mp));
+       return upper_bound(cont, value, MemberCompare<typename Container::value_type, T>{ mp });
 }
 
 template<typename Container, typename T>
 inline void sort_member(Container &cont, T Container::value_type::*mp)
 {
-       sort(cont, MemberCompare<typename Container::value_type, T>(mp));
+       sort(cont, MemberCompare<typename Container::value_type, T>{ mp });
 }
 
 template<typename Container, typename T>
 inline void stable_sort_member(Container &cont, T Container::value_type::*mp)
 {
-       stable_sort(cont, MemberCompare<typename Container::value_type, T>(mp));
+       stable_sort(cont, MemberCompare<typename Container::value_type, T>{ mp });
 }
 
 template<typename Container, typename Predicate>

diff --git a/source/io/eventdispatcher.cpp b/source/io/eventdispatcher.cpp
index 9c233ee6a2a0cae226b972179d2519a0a51fc794..035a7f286f6284378ee9a9b5795458b2afe91de3 100644 (file)
--- a/source/io/eventdispatcher.cpp
+++ b/source/io/eventdispatcher.cpp
@@ -69,11 +69,6 @@ void EventDispatcher::dispatch()
 }
 
 
-EventDispatcher::Slot::Slot(EventDispatcher &d, EventObject &o):
-       disp(d),
-       obj(o)
-{ }
-
 void EventDispatcher::Slot::connect_signals() const
 {
        obj.signal_events_changed.connect(sigc::mem_fun(this, &Slot::events_changed));

diff --git a/source/io/eventdispatcher.h b/source/io/eventdispatcher.h
index f95f477daac5199df5995698a217baa64e6e3f99..d9a7afd2a02cfe3809578d89821d9c03541fe804 100644 (file)
--- a/source/io/eventdispatcher.h
+++ b/source/io/eventdispatcher.h
@@ -22,7 +22,7 @@ private:
                EventDispatcher &disp;
                EventObject &obj;
 
-               Slot(EventDispatcher &, EventObject &);
+               Slot(EventDispatcher &d, EventObject &o): disp(d), obj(o) { }
 
                void connect_signals() const;
                void events_changed(PollEvent) const;

diff --git a/source/io/poll.cpp b/source/io/poll.cpp
index 683eabe17a287c67f3ccab63925daf1770274c4c..7aa41e1c330c9ac41ae5ebdf9fa96eb3678a274c 100644 (file)
--- a/source/io/poll.cpp
+++ b/source/io/poll.cpp
@@ -47,7 +47,7 @@ void Poller::set_object(EventObject &obj, PollEvent ev)
                throw invalid_state("too many objects");
 #endif
 
-       objects.push_back(PolledObject(&obj, ev));
+       objects.push_back({ &obj, ev });
        objs_changed = true;
 }
 

diff --git a/source/io/poll.h b/source/io/poll.h
index c8739239d960f4f801d1f1bd22846ddcd3a9989e..4466ca33e17c59772ba97a805c41eef238822248 100644 (file)
--- a/source/io/poll.h
+++ b/source/io/poll.h
@@ -36,10 +36,8 @@ class Poller: private NonCopyable
 public:
        struct PolledObject
        {
-               EventObject *object = nullptr;
-               PollEvent events = P_NONE;
-
-               PolledObject(EventObject *o, PollEvent e): object(o), events(e) { }
+               EventObject *object;
+               PollEvent events;
        };
 
 private:

diff --git a/source/io/unix/poll.cpp b/source/io/unix/poll.cpp
index 28d3aebc5acba72970c0176a2b17581d4cf168ab..e3db10eae1cf215906b70d40456ce89a52d9ab5a 100644 (file)
--- a/source/io/unix/poll.cpp
+++ b/source/io/unix/poll.cpp
@@ -91,7 +91,7 @@ void Poller::platform_poll(int timeout)
        for(unsigned i=0; (i<objects.size() && ret>0); ++i)
                if(priv->pfd[i].revents)
                {
-                       poll_result.push_back(PolledObject(objects[i].object, poll_event_from_sys(priv->pfd[i].revents)));
+                       poll_result.push_back({ objects[i].object, poll_event_from_sys(priv->pfd[i].revents) });
                        --ret;
                }
 }

diff --git a/source/time/timer.cpp b/source/time/timer.cpp
index 04c3074494e921d39f3edb54e53e378c8623e826..eda782e0d92c5bf82c00418584e12917d03fa673 100644 (file)
--- a/source/time/timer.cpp
+++ b/source/time/timer.cpp
@@ -22,7 +22,7 @@ Timer::Slot &Timer::add(const TimeDelta &td)
 {
        Slot *s = new Slot(td);
        MutexLock l(mutex);
-       slots.push_back(s);
+       slots.push_back({ s });
        push_heap(slots.begin(), slots.end());
        if(blocking)
                sem.signal();
@@ -33,7 +33,7 @@ Timer::Slot &Timer::add(const TimeStamp &ts)
 {
        Slot *s = new Slot(ts);
        MutexLock l(mutex);
-       slots.push_back(s);
+       slots.push_back({ s });
        push_heap(slots.begin(), slots.end());
        if(blocking)
                sem.signal();
@@ -113,7 +113,7 @@ void Timer::do_tick(const TimeDelta &timeout)
                if(next->signal_timeout.emit() && next->increment())
                {
                        MutexLock l(mutex);
-                       slots.push_back(next);
+                       slots.push_back({ next });
                        push_heap(slots.begin(), slots.end());
                }
                else
@@ -152,10 +152,6 @@ bool Timer::Slot::increment()
 }
 
 
-Timer::SlotProxy::SlotProxy(Slot *s):
-       slot(s)
-{ }
-
 bool Timer::SlotProxy::operator<(const SlotProxy &sp) const
 {
        return slot->get_timeout()>sp.slot->get_timeout();

diff --git a/source/time/timer.h b/source/time/timer.h
index 33257319eba3466d89f28c650efcd26dde0a996d..04d0be95ba8fe0aa1117acf06f06bc3afc3c594d 100644 (file)
--- a/source/time/timer.h
+++ b/source/time/timer.h
@@ -41,9 +41,8 @@ public:
 private:
        struct SlotProxy
        {
-               Slot *slot = nullptr;
+               Slot *slot;
 
-               SlotProxy(Slot *);
                bool operator<(const SlotProxy &) const;
        };