NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

libcamera: signal: Fix coding style issues

Browse source 
Fix issues reported by checkstyle.py in preparation for further changes.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
This commit is contained in:
Laurent Pinchart 2019-02-08 00:46:25 +02:00
parent dc642f6d0b
commit 73a1bea709
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
include/libcamera/signal.h
View file

@ -20,8 +20,8 @@ class SlotBase
{ {
public: public:
SlotBase(void *obj) SlotBase(void *obj)
: obj_(obj) { } : obj_(obj) {}
virtual ~SlotBase() { } virtual ~SlotBase() {}
virtual void invoke(Args... args) = 0; virtual void invoke(Args... args) = 0;
@ -34,35 +34,35 @@ template<typename T, typename... Args>
class SlotMember : public SlotBase<Args...> class SlotMember : public SlotBase<Args...>
{ {
public: public:
SlotMember(T *obj, void(T::*func)(Args...)) SlotMember(T *obj, void (T::*func)(Args...))
: SlotBase<Args...>(obj), func_(func) { } : SlotBase<Args...>(obj), func_(func) {}
void invoke(Args... args) { (static_cast<T *>(this->obj_)->*func_)(args...); } void invoke(Args... args) { (static_cast<T *>(this->obj_)->*func_)(args...); }
private: private:
friend class Signal<Args...>; friend class Signal<Args...>;
void(T::*func_)(Args...); void (T::*func_)(Args...);
}; };
template<typename... Args> template<typename... Args>
class SlotStatic : public SlotBase<Args...> class SlotStatic : public SlotBase<Args...>
{ {
public: public:
SlotStatic(void(*func)(Args...)) SlotStatic(void (*func)(Args...))
: SlotBase<Args...>(nullptr), func_(func) { } : SlotBase<Args...>(nullptr), func_(func) {}
void invoke(Args... args) { (*func_)(args...); } void invoke(Args... args) { (*func_)(args...); }
private: private:
friend class Signal<Args...>; friend class Signal<Args...>;
void(*func_)(Args...); void (*func_)(Args...);
}; };
template<typename... Args> template<typename... Args>
class Signal class Signal
{ {
public: public:
Signal() { } Signal() {}
~Signal() ~Signal()
{ {
for (SlotBase<Args...> *slot : slots_) for (SlotBase<Args...> *slot : slots_)
@ -70,12 +70,12 @@ public:
} }
template<typename T> template<typename T>
void connect(T *object, void(T::*func)(Args...)) void connect(T *object, void (T::*func)(Args...))
{ {
slots_.push_back(new SlotMember<T, Args...>(object, func)); slots_.push_back(new SlotMember<T, Args...>(object, func));
} }
void connect(void(*func)(Args...)) void connect(void (*func)(Args...))
{ {
slots_.push_back(new SlotStatic<Args...>(func)); slots_.push_back(new SlotStatic<Args...>(func));
} }
@ -102,7 +102,7 @@ public:
} }
template<typename T> template<typename T>
void disconnect(T *object, void(T::*func)(Args...)) void disconnect(T *object, void (T::*func)(Args...))
{ {
for (auto iter = slots_.begin(); iter != slots_.end(); ) { for (auto iter = slots_.begin(); iter != slots_.end(); ) {
SlotBase<Args...> *slot = *iter; SlotBase<Args...> *slot = *iter;
@ -120,7 +120,7 @@ public:
} }
} }
void disconnect(void(*func)(Args...)) void disconnect(void (*func)(Args...))
{ {
for (auto iter = slots_.begin(); iter != slots_.end(); ) { for (auto iter = slots_.begin(); iter != slots_.end(); ) {
SlotBase<Args...> *slot = *iter; SlotBase<Args...> *slot = *iter;