diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2020-01-04 06:03:47 +0200 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2020-01-07 22:29:38 +0200 |
| commit | dce6bb0e301a7985b302143ff4405b5526ab5dd6 (patch) | |
| tree | 12b20bc13a73ee5dc34114e538ec54dadbc01ca2 /include/libcamera/bound_method.h | |
| parent | 3d1d2081714f316483dddf573105682910b026bc (diff) | |
libcamera: bound_method: Rename Bound*Method to BoundMethod*
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>
Diffstat (limited to 'include/libcamera/bound_method.h')
| -rw-r--r-- | include/libcamera/bound_method.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/libcamera/bound_method.h b/include/libcamera/bound_method.h index 0a91f44a..ca501493 100644 --- a/include/libcamera/bound_method.h +++ b/include/libcamera/bound_method.h @@ -156,12 +156,12 @@ public: }; template<typename T, typename R, typename... Args> -class BoundMemberMethod : public BoundMethodArgs<R, Args...> +class BoundMethodMember : public BoundMethodArgs<R, Args...> { public: 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) : BoundMethodArgs<R, Args...>(obj, object, type), func_(func) { @@ -189,12 +189,12 @@ private: }; template<typename T, typename... Args> -class BoundMemberMethod<T, void, Args...> : public BoundMethodArgs<void, Args...> +class BoundMethodMember<T, void, Args...> : public BoundMethodArgs<void, Args...> { public: 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) : BoundMethodArgs<void, Args...>(obj, object, type), func_(func) { @@ -221,10 +221,10 @@ private: }; template<typename R, typename... Args> -class BoundStaticMethod : public BoundMethodArgs<R, Args...> +class BoundMethodStatic : public BoundMethodArgs<R, Args...> { public: - BoundStaticMethod(R (*func)(Args...)) + BoundMethodStatic(R (*func)(Args...)) : BoundMethodArgs<R, Args...>(nullptr, nullptr, ConnectionTypeAuto), func_(func) { |