refactor: Update CMake build system and streamline Core object serialization and property handling.
This commit is contained in:
@@ -23,21 +23,19 @@
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////*/
|
||||
|
||||
|
||||
|
||||
#ifndef U_CORE_SIGNAL_H
|
||||
#define U_CORE_SIGNAL_H
|
||||
|
||||
#include <boost/typeof/typeof.hpp>
|
||||
|
||||
#include <boost/signals2/signal.hpp>
|
||||
#include <boost/signals2/slot.hpp>
|
||||
#include <boost/signals2/signal_type.hpp>
|
||||
#include <boost/signals2/slot.hpp>
|
||||
|
||||
#include "Function.h"
|
||||
#include <boost/bind/bind.hpp>
|
||||
|
||||
|
||||
|
||||
using namespace boost::placeholders;
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
@@ -48,12 +46,12 @@
|
||||
#define slots
|
||||
#define signals /*virtual void init_signals();*/ public
|
||||
#define emit
|
||||
#define SLOT(a) BOOST_STRINGIZE(a)
|
||||
#define SIGNAL(a) BOOST_STRINGIZE(a)
|
||||
#define SLOT(a) BOOST_STRINGIZE(a)
|
||||
#define SIGNAL(a) BOOST_STRINGIZE(a)
|
||||
|
||||
#define _ULIB_DETAIL_SIGNAL_EMIT(_name,...) \
|
||||
static BOOST_AUTO(sig,this->findOrAddSignal(&_name)); \
|
||||
sig->operator()(__VA_ARGS__);
|
||||
#define _ULIB_DETAIL_SIGNAL_EMIT(_name, ...) \
|
||||
static BOOST_AUTO(sig, this->findOrAddSignal(&_name)); \
|
||||
sig->operator()(__VA_ARGS__);
|
||||
|
||||
/**
|
||||
* Utility macro to implement signal emission implementa una delle seguenti:
|
||||
@@ -66,103 +64,105 @@
|
||||
* // cast automatico //
|
||||
* static BOOST_AUTO(sig,this->findOrAddSignal(&Ob1::V0));
|
||||
* sig->operator()();
|
||||
*/
|
||||
#define ULIB_SIGNAL_EMIT(_name,...) _ULIB_DETAIL_SIGNAL_EMIT(_name,__VA_ARGS__)
|
||||
|
||||
*/
|
||||
#define ULIB_SIGNAL_EMIT(_name, ...) \
|
||||
_ULIB_DETAIL_SIGNAL_EMIT(_name, __VA_ARGS__)
|
||||
|
||||
namespace uLib {
|
||||
|
||||
|
||||
// A boost::signal wrapper structure ///////////////////////////////////////////
|
||||
|
||||
// TODO ...
|
||||
|
||||
typedef boost::signals2::signal_base SignalBase;
|
||||
|
||||
template <typename T>
|
||||
struct Signal {
|
||||
typedef boost::signals2::signal<T> type;
|
||||
template <typename T> struct Signal {
|
||||
typedef boost::signals2::signal<T> type;
|
||||
};
|
||||
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
namespace detail {
|
||||
|
||||
template <typename FuncT, int arity> struct ConnectSignal {};
|
||||
|
||||
template <typename FuncT, int arity>
|
||||
struct ConnectSignal {};
|
||||
|
||||
template <typename FuncT>
|
||||
struct ConnectSignal< FuncT, 0 > {
|
||||
static void connect(SignalBase *sigb, FuncT slof, typename FunctionPointer<FuncT>::Object *receiver) {
|
||||
typedef typename Signal<typename FunctionPointer<FuncT>::SignalSignature>::type SigT;
|
||||
reinterpret_cast<SigT*>(sigb)->connect(slof);
|
||||
}
|
||||
template <typename FuncT> struct ConnectSignal<FuncT, 0> {
|
||||
static void connect(SignalBase *sigb, FuncT slof,
|
||||
typename FunctionPointer<FuncT>::Object *receiver) {
|
||||
typedef
|
||||
typename Signal<typename FunctionPointer<FuncT>::SignalSignature>::type
|
||||
SigT;
|
||||
reinterpret_cast<SigT *>(sigb)->connect(slof);
|
||||
}
|
||||
};
|
||||
|
||||
template <typename FuncT>
|
||||
struct ConnectSignal< FuncT, 1 > {
|
||||
static void connect(SignalBase *sigb, FuncT slof, typename FunctionPointer<FuncT>::Object *receiver) {
|
||||
typedef typename Signal<typename FunctionPointer<FuncT>::SignalSignature>::type SigT;
|
||||
reinterpret_cast<SigT*>(sigb)->connect(boost::bind(slof,receiver));
|
||||
}
|
||||
template <typename FuncT> struct ConnectSignal<FuncT, 1> {
|
||||
static void connect(SignalBase *sigb, FuncT slof,
|
||||
typename FunctionPointer<FuncT>::Object *receiver) {
|
||||
typedef
|
||||
typename Signal<typename FunctionPointer<FuncT>::SignalSignature>::type
|
||||
SigT;
|
||||
reinterpret_cast<SigT *>(sigb)->connect(boost::bind(slof, receiver));
|
||||
}
|
||||
};
|
||||
|
||||
template <typename FuncT>
|
||||
struct ConnectSignal< FuncT, 2 > {
|
||||
static void connect(SignalBase *sigb, FuncT slof, typename FunctionPointer<FuncT>::Object *receiver) {
|
||||
typedef typename Signal<typename FunctionPointer<FuncT>::SignalSignature>::type SigT;
|
||||
reinterpret_cast<SigT*>(sigb)->connect(boost::bind(slof,receiver,_1));
|
||||
}
|
||||
template <typename FuncT> struct ConnectSignal<FuncT, 2> {
|
||||
static void connect(SignalBase *sigb, FuncT slof,
|
||||
typename FunctionPointer<FuncT>::Object *receiver) {
|
||||
typedef
|
||||
typename Signal<typename FunctionPointer<FuncT>::SignalSignature>::type
|
||||
SigT;
|
||||
reinterpret_cast<SigT *>(sigb)->connect(boost::bind(slof, receiver, _1));
|
||||
}
|
||||
};
|
||||
|
||||
template <typename FuncT>
|
||||
struct ConnectSignal< FuncT, 3 > {
|
||||
static void connect(SignalBase *sigb, FuncT slof, typename FunctionPointer<FuncT>::Object *receiver) {
|
||||
typedef typename Signal<typename FunctionPointer<FuncT>::SignalSignature>::type SigT;
|
||||
reinterpret_cast<SigT*>(sigb)->connect(boost::bind(slof,receiver,_1,_2));
|
||||
}
|
||||
template <typename FuncT> struct ConnectSignal<FuncT, 3> {
|
||||
static void connect(SignalBase *sigb, FuncT slof,
|
||||
typename FunctionPointer<FuncT>::Object *receiver) {
|
||||
typedef
|
||||
typename Signal<typename FunctionPointer<FuncT>::SignalSignature>::type
|
||||
SigT;
|
||||
reinterpret_cast<SigT *>(sigb)->connect(
|
||||
boost::bind(slof, receiver, _1, _2));
|
||||
}
|
||||
};
|
||||
|
||||
template <typename FuncT>
|
||||
struct ConnectSignal< FuncT, 4 > {
|
||||
static void connect(SignalBase *sigb, FuncT slof, typename FunctionPointer<FuncT>::Object *receiver) {
|
||||
typedef typename Signal<typename FunctionPointer<FuncT>::SignalSignature>::type SigT;
|
||||
reinterpret_cast<SigT*>(sigb)->connect(boost::bind(slof,receiver,_1,_2,_3));
|
||||
}
|
||||
template <typename FuncT> struct ConnectSignal<FuncT, 4> {
|
||||
static void connect(SignalBase *sigb, FuncT slof,
|
||||
typename FunctionPointer<FuncT>::Object *receiver) {
|
||||
typedef
|
||||
typename Signal<typename FunctionPointer<FuncT>::SignalSignature>::type
|
||||
SigT;
|
||||
reinterpret_cast<SigT *>(sigb)->connect(
|
||||
boost::bind(slof, receiver, _1, _2, _3));
|
||||
}
|
||||
};
|
||||
|
||||
template <typename FuncT>
|
||||
struct ConnectSignal< FuncT, 5 > {
|
||||
static void connect(SignalBase *sigb, FuncT slof, typename FunctionPointer<FuncT>::Object *receiver) {
|
||||
typedef typename Signal<typename FunctionPointer<FuncT>::SignalSignature>::type SigT;
|
||||
reinterpret_cast<SigT*>(sigb)->connect(boost::bind(slof,receiver,_1,_2,_3,_4));
|
||||
}
|
||||
template <typename FuncT> struct ConnectSignal<FuncT, 5> {
|
||||
static void connect(SignalBase *sigb, FuncT slof,
|
||||
typename FunctionPointer<FuncT>::Object *receiver) {
|
||||
typedef
|
||||
typename Signal<typename FunctionPointer<FuncT>::SignalSignature>::type
|
||||
SigT;
|
||||
reinterpret_cast<SigT *>(sigb)->connect(
|
||||
boost::bind(slof, receiver, _1, _2, _3, _4));
|
||||
}
|
||||
};
|
||||
|
||||
} // namespace detail
|
||||
|
||||
} // detail
|
||||
|
||||
|
||||
|
||||
template <typename FuncT>
|
||||
SignalBase *NewSignal(FuncT f) {
|
||||
// seems to work wow !
|
||||
return new Signal<void()>::type;
|
||||
template <typename FuncT> SignalBase *NewSignal(FuncT f) {
|
||||
// seems to work wow !
|
||||
return new Signal<void()>::type;
|
||||
}
|
||||
|
||||
template <typename FuncT>
|
||||
void ConnectSignal(SignalBase *sigb, FuncT slof, typename FunctionPointer<FuncT>::Object *receiver)
|
||||
{
|
||||
detail::ConnectSignal< FuncT, FunctionPointer<FuncT>::arity >::connect(sigb,slof,receiver);
|
||||
void ConnectSignal(SignalBase *sigb, FuncT slof,
|
||||
typename FunctionPointer<FuncT>::Object *receiver) {
|
||||
detail::ConnectSignal<FuncT, FunctionPointer<FuncT>::arity>::connect(
|
||||
sigb, slof, receiver);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
} // uLib
|
||||
} // namespace uLib
|
||||
|
||||
#endif // SIGNAL_H
|
||||
|
||||
Reference in New Issue
Block a user