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

libcamera: bound_method: Rename Bound*Method to BoundMethod*

Browse source 
Most of the bound method classes are named with a BoundMethod prefix,
except for BoundMemberMethod and BoundStaticMethod. Rename them to
BoundMethodMember and BoundMethodStatic respectively to make the code
more coherent.

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 2020-01-04 06:03:47 +02:00
parent 3d1d208171
commit dce6bb0e30
4 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Documentation/Doxyfile.in
View file

@ -870,12 +870,12 @@ EXCLUDE_PATTERNS =
# Note that the wildcards are matched against the file with absolute path, so to # Note that the wildcards are matched against the file with absolute path, so to
# exclude all test directories use the pattern */test/* # exclude all test directories use the pattern */test/*
EXCLUDE_SYMBOLS = libcamera::BoundMemberMethod \ EXCLUDE_SYMBOLS = libcamera::BoundMethodArgs \
libcamera::BoundMethodArgs \
libcamera::BoundMethodBase \ libcamera::BoundMethodBase \
libcamera::BoundMethodMember \
libcamera::BoundMethodPack \ libcamera::BoundMethodPack \
libcamera::BoundMethodPackBase \ libcamera::BoundMethodPackBase \
libcamera::BoundStaticMethod \ libcamera::BoundMethodStatic \
libcamera::SignalBase \ libcamera::SignalBase \
std::* std::*

12
include/libcamera/bound_method.h
View file

@ -156,12 +156,12 @@ public:
}; };
template<typename T, typename R, typename... Args> template<typename T, typename R, typename... Args>
class BoundMemberMethod : public BoundMethodArgs<R, Args...> class BoundMethodMember : public BoundMethodArgs<R, Args...>
{ {
public: public:
using PackType = typename BoundMethodArgs<R, Args...>::PackType; using PackType = typename BoundMethodArgs<R, Args...>::PackType;
BoundMemberMethod(T *obj, Object *object, R (T::*func)(Args...), BoundMethodMember(T *obj, Object *object, R (T::*func)(Args...),
ConnectionType type = ConnectionTypeAuto) ConnectionType type = ConnectionTypeAuto)
: BoundMethodArgs<R, Args...>(obj, object, type), func_(func) : BoundMethodArgs<R, Args...>(obj, object, type), func_(func)
{ {
@ -189,12 +189,12 @@ private:
}; };
template<typename T, typename... Args> template<typename T, typename... Args>
class BoundMemberMethod<T, void, Args...> : public BoundMethodArgs<void, Args...> class BoundMethodMember<T, void, Args...> : public BoundMethodArgs<void, Args...>
{ {
public: public:
using PackType = typename BoundMethodArgs<void *, Args...>::PackType; using PackType = typename BoundMethodArgs<void *, Args...>::PackType;
BoundMemberMethod(T *obj, Object *object, void (T::*func)(Args...), BoundMethodMember(T *obj, Object *object, void (T::*func)(Args...),
ConnectionType type = ConnectionTypeAuto) ConnectionType type = ConnectionTypeAuto)
: BoundMethodArgs<void, Args...>(obj, object, type), func_(func) : BoundMethodArgs<void, Args...>(obj, object, type), func_(func)
{ {
@ -221,10 +221,10 @@ private:
}; };
template<typename R, typename... Args> template<typename R, typename... Args>
class BoundStaticMethod : public BoundMethodArgs<R, Args...> class BoundMethodStatic : public BoundMethodArgs<R, Args...>
{ {
public: public:
BoundStaticMethod(R (*func)(Args...)) BoundMethodStatic(R (*func)(Args...))
: BoundMethodArgs<R, Args...>(nullptr, nullptr, ConnectionTypeAuto), : BoundMethodArgs<R, Args...>(nullptr, nullptr, ConnectionTypeAuto),
func_(func) func_(func)
{ {

2
include/libcamera/object.h
View file

@ -35,7 +35,7 @@ public:
Args... args) Args... args)
{ {
T *obj = static_cast<T *>(this); T *obj = static_cast<T *>(this);
auto *method = new BoundMemberMethod<T, R, FuncArgs...>(obj, this, func, type); auto *method = new BoundMethodMember<T, R, FuncArgs...>(obj, this, func, type);
return method->activate(args..., true); return method->activate(args..., true);
} }

12
include/libcamera/signal.h
View file

@ -60,7 +60,7 @@ public:
{ {
Object *object = static_cast<Object *>(obj); Object *object = static_cast<Object *>(obj);
object->connect(this); object->connect(this);
slots_.push_back(new BoundMemberMethod<T, void, Args...>(obj, object, func, type)); slots_.push_back(new BoundMethodMember<T, void, Args...>(obj, object, func, type));
} }
template<typename T, typename R, typename std::enable_if<!std::is_base_of<Object, T>::value>::type * = nullptr> template<typename T, typename R, typename std::enable_if<!std::is_base_of<Object, T>::value>::type * = nullptr>
@ -69,13 +69,13 @@ public:
#endif #endif
void connect(T *obj, R (T::*func)(Args...)) void connect(T *obj, R (T::*func)(Args...))
{ {
slots_.push_back(new BoundMemberMethod<T, R, Args...>(obj, nullptr, func)); slots_.push_back(new BoundMethodMember<T, R, Args...>(obj, nullptr, func));
} }
template<typename R> template<typename R>
void connect(R (*func)(Args...)) void connect(R (*func)(Args...))
{ {
slots_.push_back(new BoundStaticMethod<R, Args...>(func)); slots_.push_back(new BoundMethodStatic<R, Args...>(func));
} }
void disconnect() void disconnect()
@ -100,11 +100,11 @@ public:
/* /*
* If the object matches the slot, the slot is * If the object matches the slot, the slot is
* guaranteed to be a member slot, so we can safely * guaranteed to be a member slot, so we can safely
* cast it to BoundMemberMethod<T, Args...> to match * cast it to BoundMethodMember<T, Args...> to match
* func. * func.
*/ */
if (slot->match(obj) && if (slot->match(obj) &&
static_cast<BoundMemberMethod<T, R, Args...> *>(slot)->match(func)) { static_cast<BoundMethodMember<T, R, Args...> *>(slot)->match(func)) {
iter = slots_.erase(iter); iter = slots_.erase(iter);
delete slot; delete slot;
} else { } else {
@ -119,7 +119,7 @@ public:
for (auto iter = slots_.begin(); iter != slots_.end(); ) { for (auto iter = slots_.begin(); iter != slots_.end(); ) {
BoundMethodArgs<R, Args...> *slot = *iter; BoundMethodArgs<R, Args...> *slot = *iter;
if (slot->match(nullptr) && if (slot->match(nullptr) &&
static_cast<BoundStaticMethod<R, Args...> *>(slot)->match(func)) { static_cast<BoundMethodStatic<R, Args...> *>(slot)->match(func)) {
iter = slots_.erase(iter); iter = slots_.erase(iter);
delete slot; delete slot;
} else { } else {