Time to get rid of the horrible coding style
This commit is contained in:
pd
parent
534ee610d8
commit
efc594f888
53 changed files with 1137 additions and 1136 deletions
|
|
@ -41,7 +41,7 @@ namespace DBus {
|
|||
|
||||
class Connection;
|
||||
|
||||
typedef Slot<bool, const Message&> MessageSlot;
|
||||
typedef Slot<bool, const Message &> MessageSlot;
|
||||
|
||||
typedef std::list<Connection> ConnectionList;
|
||||
|
||||
|
|
@ -60,31 +60,31 @@ public:
|
|||
|
||||
struct Private;
|
||||
|
||||
typedef std::list<Private*> PrivatePList;
|
||||
typedef std::list<Private *> PrivatePList;
|
||||
|
||||
Connection( Private* );
|
||||
Connection(Private *);
|
||||
|
||||
Connection( const char* address, bool priv = true );
|
||||
Connection(const char *address, bool priv = true);
|
||||
|
||||
Connection( const Connection& c );
|
||||
Connection(const Connection &c);
|
||||
|
||||
virtual ~Connection();
|
||||
|
||||
Dispatcher* setup( Dispatcher* );
|
||||
Dispatcher *setup(Dispatcher *);
|
||||
|
||||
bool operator == ( const Connection& ) const;
|
||||
bool operator == (const Connection &) const;
|
||||
|
||||
void add_match( const char* rule );
|
||||
void add_match(const char *rule);
|
||||
|
||||
void remove_match( const char* rule );
|
||||
void remove_match(const char *rule);
|
||||
|
||||
bool add_filter( MessageSlot& );
|
||||
bool add_filter(MessageSlot &);
|
||||
|
||||
void remove_filter( MessageSlot& );
|
||||
void remove_filter(MessageSlot &);
|
||||
|
||||
bool unique_name( const char* n );
|
||||
bool unique_name(const char *n);
|
||||
|
||||
const char* unique_name() const;
|
||||
const char *unique_name() const;
|
||||
|
||||
bool register_bus();
|
||||
|
||||
|
|
@ -92,21 +92,21 @@ public:
|
|||
|
||||
void disconnect();
|
||||
|
||||
void exit_on_disconnect( bool exit );
|
||||
void exit_on_disconnect(bool exit);
|
||||
|
||||
void flush();
|
||||
|
||||
bool send( const Message&, unsigned int* serial = NULL );
|
||||
bool send(const Message &, unsigned int *serial = NULL);
|
||||
|
||||
Message send_blocking( Message& msg, int timeout = -1);
|
||||
Message send_blocking(Message &msg, int timeout = -1);
|
||||
|
||||
PendingCall send_async( Message& msg, int timeout );
|
||||
PendingCall send_async(Message &msg, int timeout);
|
||||
|
||||
void request_name( const char* name, int flags = 0 );
|
||||
void request_name(const char *name, int flags = 0);
|
||||
|
||||
bool has_name( const char* name );
|
||||
bool has_name(const char *name);
|
||||
|
||||
bool start_service( const char* name, unsigned long flags );
|
||||
bool start_service(const char *name, unsigned long flags);
|
||||
|
||||
const std::vector<std::string>& names();
|
||||
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
|
||||
namespace DBus {
|
||||
|
||||
typedef void (*LogFunction)(const char* format, ...);
|
||||
typedef void (*LogFunction)(const char *format, ...);
|
||||
|
||||
extern DXXAPI LogFunction debug_log;
|
||||
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ public:
|
|||
|
||||
class Internal;
|
||||
|
||||
Timeout( Internal* i );
|
||||
Timeout(Internal *i);
|
||||
|
||||
virtual ~Timeout(){}
|
||||
|
||||
|
|
@ -55,11 +55,11 @@ public:
|
|||
|
||||
private:
|
||||
|
||||
DXXAPILOCAL Timeout( const Timeout& );
|
||||
DXXAPILOCAL Timeout(const Timeout &);
|
||||
|
||||
private:
|
||||
|
||||
Internal* _int;
|
||||
Internal *_int;
|
||||
};
|
||||
|
||||
class DXXAPI Watch
|
||||
|
|
@ -68,7 +68,7 @@ public:
|
|||
|
||||
class Internal;
|
||||
|
||||
Watch( Internal* i );
|
||||
Watch(Internal *i);
|
||||
|
||||
virtual ~Watch(){}
|
||||
|
||||
|
|
@ -78,17 +78,17 @@ public:
|
|||
|
||||
bool enabled() const;
|
||||
|
||||
bool handle( int flags );
|
||||
bool handle(int flags);
|
||||
|
||||
virtual void toggle() = 0;
|
||||
|
||||
private:
|
||||
|
||||
DXXAPILOCAL Watch( const Watch& );
|
||||
DXXAPILOCAL Watch(const Watch &);
|
||||
|
||||
private:
|
||||
|
||||
Internal* _int;
|
||||
Internal *_int;
|
||||
};
|
||||
|
||||
class DXXAPI Dispatcher
|
||||
|
|
@ -98,7 +98,7 @@ public:
|
|||
virtual ~Dispatcher()
|
||||
{}
|
||||
|
||||
void queue_connection( Connection::Private* );
|
||||
void queue_connection(Connection::Private *);
|
||||
|
||||
void dispatch_pending();
|
||||
|
||||
|
|
@ -106,13 +106,13 @@ public:
|
|||
|
||||
virtual void leave() = 0;
|
||||
|
||||
virtual Timeout* add_timeout( Timeout::Internal* ) = 0;
|
||||
virtual Timeout *add_timeout(Timeout::Internal *) = 0;
|
||||
|
||||
virtual void rem_timeout( Timeout* ) = 0;
|
||||
virtual void rem_timeout(Timeout *) = 0;
|
||||
|
||||
virtual Watch* add_watch( Watch::Internal* ) = 0;
|
||||
virtual Watch *add_watch(Watch::Internal *) = 0;
|
||||
|
||||
virtual void rem_watch( Watch* ) = 0;
|
||||
virtual void rem_watch(Watch *) = 0;
|
||||
|
||||
struct Private;
|
||||
|
||||
|
|
@ -122,7 +122,7 @@ private:
|
|||
Connection::PrivatePList _pending_queue;
|
||||
};
|
||||
|
||||
extern DXXAPI Dispatcher* default_dispatcher;
|
||||
extern DXXAPI Dispatcher *default_dispatcher;
|
||||
|
||||
/* classes for multithreading support
|
||||
*/
|
||||
|
|
@ -141,7 +141,7 @@ public:
|
|||
|
||||
protected:
|
||||
|
||||
Internal* _int;
|
||||
Internal *_int;
|
||||
};
|
||||
|
||||
class DXXAPI CondVar
|
||||
|
|
@ -150,9 +150,9 @@ public:
|
|||
|
||||
virtual ~CondVar() {}
|
||||
|
||||
virtual void wait( Mutex* ) = 0;
|
||||
virtual void wait(Mutex *) = 0;
|
||||
|
||||
virtual bool wait_timeout( Mutex*, int timeout ) = 0;
|
||||
virtual bool wait_timeout(Mutex *, int timeout) = 0;
|
||||
|
||||
virtual void wake_one() = 0;
|
||||
|
||||
|
|
@ -162,27 +162,27 @@ public:
|
|||
|
||||
protected:
|
||||
|
||||
Internal* _int;
|
||||
Internal *_int;
|
||||
};
|
||||
|
||||
#ifndef DBUS_HAS_RECURSIVE_MUTEX
|
||||
typedef Mutex* (*MutexNewFn)();
|
||||
typedef bool (*MutexFreeFn)( Mutex* mx );
|
||||
typedef bool (*MutexLockFn)( Mutex* mx );
|
||||
typedef void (*MutexUnlockFn)( Mutex* mx );
|
||||
typedef Mutex *(*MutexNewFn)();
|
||||
typedef bool (*MutexFreeFn)(Mutex *mx);
|
||||
typedef bool (*MutexLockFn)(Mutex *mx);
|
||||
typedef void (*MutexUnlockFn)(Mutex *mx);
|
||||
#else
|
||||
typedef Mutex* (*MutexNewFn)();
|
||||
typedef void (*MutexFreeFn)( Mutex* mx );
|
||||
typedef void (*MutexLockFn)( Mutex* mx );
|
||||
typedef void (*MutexUnlockFn)( Mutex* mx );
|
||||
typedef Mutex *(*MutexNewFn)();
|
||||
typedef void (*MutexFreeFn)(Mutex *mx);
|
||||
typedef void (*MutexLockFn)(Mutex *mx);
|
||||
typedef void (*MutexUnlockFn)(Mutex *mx);
|
||||
#endif//DBUS_HAS_RECURSIVE_MUTEX
|
||||
|
||||
typedef CondVar* (*CondVarNewFn)();
|
||||
typedef void (*CondVarFreeFn)( CondVar* cv );
|
||||
typedef void (*CondVarWaitFn)( CondVar* cv, Mutex* mx );
|
||||
typedef bool (*CondVarWaitTimeoutFn)( CondVar* cv, Mutex* mx, int timeout );
|
||||
typedef void (*CondVarWakeOneFn)( CondVar* cv );
|
||||
typedef void (*CondVarWakeAllFn)( CondVar* cv );
|
||||
typedef CondVar *(*CondVarNewFn)();
|
||||
typedef void (*CondVarFreeFn)(CondVar *cv);
|
||||
typedef void (*CondVarWaitFn)(CondVar *cv, Mutex *mx);
|
||||
typedef bool (*CondVarWaitTimeoutFn)(CondVar *cv, Mutex *mx, int timeout);
|
||||
typedef void (*CondVarWakeOneFn)(CondVar *cv);
|
||||
typedef void (*CondVarWakeAllFn)(CondVar *cv);
|
||||
|
||||
#ifdef DBUS_HAS_THREADS_INIT_DEFAULT
|
||||
void DXXAPI _init_threading();
|
||||
|
|
@ -204,52 +204,52 @@ struct Threading
|
|||
);
|
||||
}
|
||||
|
||||
static Mutex* mutex_new()
|
||||
static Mutex *mutex_new()
|
||||
{
|
||||
return new Mx;
|
||||
}
|
||||
|
||||
static void mutex_free( Mutex* mx )
|
||||
static void mutex_free(Mutex *mx)
|
||||
{
|
||||
delete mx;
|
||||
}
|
||||
|
||||
static void mutex_lock( Mutex* mx )
|
||||
static void mutex_lock(Mutex *mx)
|
||||
{
|
||||
mx->lock();
|
||||
}
|
||||
|
||||
static void mutex_unlock( Mutex* mx )
|
||||
static void mutex_unlock(Mutex *mx)
|
||||
{
|
||||
mx->unlock();
|
||||
}
|
||||
|
||||
static CondVar* condvar_new()
|
||||
static CondVar *condvar_new()
|
||||
{
|
||||
return new Cv;
|
||||
}
|
||||
|
||||
static void condvar_free( CondVar* cv )
|
||||
static void condvar_free(CondVar *cv)
|
||||
{
|
||||
delete cv;
|
||||
}
|
||||
|
||||
static void condvar_wait( CondVar* cv, Mutex* mx )
|
||||
static void condvar_wait(CondVar *cv, Mutex *mx)
|
||||
{
|
||||
cv->wait(mx);
|
||||
}
|
||||
|
||||
static bool condvar_wait_timeout( CondVar* cv, Mutex* mx, int timeout )
|
||||
static bool condvar_wait_timeout(CondVar *cv, Mutex *mx, int timeout)
|
||||
{
|
||||
return cv->wait_timeout(mx, timeout);
|
||||
}
|
||||
|
||||
static void condvar_wake_one( CondVar* cv )
|
||||
static void condvar_wake_one(CondVar *cv)
|
||||
{
|
||||
cv->wake_one();
|
||||
}
|
||||
|
||||
static void condvar_wake_all( CondVar* cv )
|
||||
static void condvar_wake_all(CondVar *cv)
|
||||
{
|
||||
cv->wake_all();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -45,21 +45,21 @@ public:
|
|||
|
||||
Error();
|
||||
|
||||
Error( InternalError& );
|
||||
Error(InternalError &);
|
||||
|
||||
Error( const char* name, const char* message );
|
||||
Error(const char *name, const char *message);
|
||||
|
||||
Error( Message& );
|
||||
Error(Message &);
|
||||
|
||||
~Error() throw();
|
||||
|
||||
const char* what() const throw();
|
||||
const char *what() const throw();
|
||||
|
||||
const char* name() const;
|
||||
const char *name() const;
|
||||
|
||||
const char* message() const;
|
||||
const char *message() const;
|
||||
|
||||
void set( const char* name, const char* message );
|
||||
void set(const char *name, const char *message);
|
||||
// parameters MUST be static strings
|
||||
|
||||
bool is_set() const;
|
||||
|
|
@ -76,210 +76,210 @@ private:
|
|||
|
||||
struct DXXAPI ErrorFailed : public Error
|
||||
{
|
||||
ErrorFailed( const char* message )
|
||||
ErrorFailed(const char *message)
|
||||
: Error("org.freedesktop.DBus.Error.Failed", message)
|
||||
{}
|
||||
};
|
||||
|
||||
struct DXXAPI ErrorNoMemory : public Error
|
||||
{
|
||||
ErrorNoMemory( const char* message )
|
||||
ErrorNoMemory(const char *message)
|
||||
: Error("org.freedesktop.DBus.Error.NoMemory", message)
|
||||
{}
|
||||
};
|
||||
|
||||
struct DXXAPI ErrorServiceUnknown : public Error
|
||||
{
|
||||
ErrorServiceUnknown( const char* message )
|
||||
ErrorServiceUnknown(const char *message)
|
||||
: Error("org.freedesktop.DBus.Error.ServiceUnknown", message)
|
||||
{}
|
||||
};
|
||||
|
||||
struct DXXAPI ErrorNameHasNoOwner : public Error
|
||||
{
|
||||
ErrorNameHasNoOwner( const char* message )
|
||||
ErrorNameHasNoOwner(const char *message)
|
||||
: Error("org.freedesktop.DBus.Error.NameHasNoOwner", message)
|
||||
{}
|
||||
};
|
||||
|
||||
struct DXXAPI ErrorNoReply : public Error
|
||||
{
|
||||
ErrorNoReply( const char* message )
|
||||
ErrorNoReply(const char *message)
|
||||
: Error("org.freedesktop.DBus.Error.NoReply", message)
|
||||
{}
|
||||
};
|
||||
|
||||
struct DXXAPI ErrorIOError : public Error
|
||||
{
|
||||
ErrorIOError( const char* message )
|
||||
ErrorIOError(const char *message)
|
||||
: Error("org.freedesktop.DBus.Error.IOError", message)
|
||||
{}
|
||||
};
|
||||
|
||||
struct DXXAPI ErrorBadAddress : public Error
|
||||
{
|
||||
ErrorBadAddress( const char* message )
|
||||
ErrorBadAddress(const char *message)
|
||||
: Error("org.freedesktop.DBus.Error.BadAddress", message)
|
||||
{}
|
||||
};
|
||||
|
||||
struct DXXAPI ErrorNotSupported : public Error
|
||||
{
|
||||
ErrorNotSupported( const char* message )
|
||||
ErrorNotSupported(const char *message)
|
||||
: Error("org.freedesktop.DBus.Error.NotSupported", message)
|
||||
{}
|
||||
};
|
||||
|
||||
struct DXXAPI ErrorLimitsExceeded : public Error
|
||||
{
|
||||
ErrorLimitsExceeded( const char* message )
|
||||
ErrorLimitsExceeded(const char *message)
|
||||
: Error("org.freedesktop.DBus.Error.LimitsExceeded", message)
|
||||
{}
|
||||
};
|
||||
|
||||
struct DXXAPI ErrorAccessDenied : public Error
|
||||
{
|
||||
ErrorAccessDenied( const char* message )
|
||||
ErrorAccessDenied(const char *message)
|
||||
: Error("org.freedesktop.DBus.Error.AccessDenied", message)
|
||||
{}
|
||||
};
|
||||
|
||||
struct DXXAPI ErrorAuthFailed : public Error
|
||||
{
|
||||
ErrorAuthFailed( const char* message )
|
||||
ErrorAuthFailed(const char *message)
|
||||
: Error("org.freedesktop.DBus.Error.AuthFailed", message)
|
||||
{}
|
||||
};
|
||||
|
||||
struct DXXAPI ErrorNoServer : public Error
|
||||
{
|
||||
ErrorNoServer( const char* message )
|
||||
ErrorNoServer(const char *message)
|
||||
: Error("org.freedesktop.DBus.Error.NoServer", message)
|
||||
{}
|
||||
};
|
||||
|
||||
struct DXXAPI ErrorTimeout : public Error
|
||||
{
|
||||
ErrorTimeout( const char* message )
|
||||
ErrorTimeout(const char *message)
|
||||
: Error("org.freedesktop.DBus.Error.Timeout", message)
|
||||
{}
|
||||
};
|
||||
|
||||
struct DXXAPI ErrorNoNetwork : public Error
|
||||
{
|
||||
ErrorNoNetwork( const char* message )
|
||||
ErrorNoNetwork(const char *message)
|
||||
: Error("org.freedesktop.DBus.Error.NoNetwork", message)
|
||||
{}
|
||||
};
|
||||
|
||||
struct DXXAPI ErrorAddressInUse : public Error
|
||||
{
|
||||
ErrorAddressInUse( const char* message )
|
||||
ErrorAddressInUse(const char *message)
|
||||
: Error("org.freedesktop.DBus.Error.AddressInUse", message)
|
||||
{}
|
||||
};
|
||||
|
||||
struct DXXAPI ErrorDisconnected : public Error
|
||||
{
|
||||
ErrorDisconnected( const char* message )
|
||||
ErrorDisconnected(const char *message)
|
||||
: Error("org.freedesktop.DBus.Error.Disconnected", message)
|
||||
{}
|
||||
};
|
||||
|
||||
struct DXXAPI ErrorInvalidArgs : public Error
|
||||
{
|
||||
ErrorInvalidArgs( const char* message )
|
||||
ErrorInvalidArgs(const char *message)
|
||||
: Error("org.freedesktop.DBus.Error.InvalidArgs", message)
|
||||
{}
|
||||
};
|
||||
|
||||
struct DXXAPI ErrorFileNotFound : public Error
|
||||
{
|
||||
ErrorFileNotFound( const char* message )
|
||||
ErrorFileNotFound(const char *message)
|
||||
: Error("org.freedesktop.DBus.Error.FileNotFound", message)
|
||||
{}
|
||||
};
|
||||
|
||||
struct DXXAPI ErrorUnknownMethod : public Error
|
||||
{
|
||||
ErrorUnknownMethod( const char* message )
|
||||
ErrorUnknownMethod(const char *message)
|
||||
: Error("org.freedesktop.DBus.Error.UnknownMethod", message)
|
||||
{}
|
||||
};
|
||||
|
||||
struct DXXAPI ErrorTimedOut : public Error
|
||||
{
|
||||
ErrorTimedOut( const char* message )
|
||||
ErrorTimedOut(const char *message)
|
||||
: Error("org.freedesktop.DBus.Error.TimedOut", message)
|
||||
{}
|
||||
};
|
||||
|
||||
struct DXXAPI ErrorMatchRuleNotFound : public Error
|
||||
{
|
||||
ErrorMatchRuleNotFound( const char* message )
|
||||
ErrorMatchRuleNotFound(const char *message)
|
||||
: Error("org.freedesktop.DBus.Error.MatchRuleNotFound", message)
|
||||
{}
|
||||
};
|
||||
|
||||
struct DXXAPI ErrorMatchRuleInvalid : public Error
|
||||
{
|
||||
ErrorMatchRuleInvalid( const char* message )
|
||||
ErrorMatchRuleInvalid(const char *message)
|
||||
: Error("org.freedesktop.DBus.Error.MatchRuleInvalid", message)
|
||||
{}
|
||||
};
|
||||
|
||||
struct DXXAPI ErrorSpawnExecFailed : public Error
|
||||
{
|
||||
ErrorSpawnExecFailed( const char* message )
|
||||
ErrorSpawnExecFailed(const char *message)
|
||||
: Error("org.freedesktop.DBus.Error.Spawn.ExecFailed", message)
|
||||
{}
|
||||
};
|
||||
|
||||
struct DXXAPI ErrorSpawnForkFailed : public Error
|
||||
{
|
||||
ErrorSpawnForkFailed( const char* message )
|
||||
ErrorSpawnForkFailed(const char *message)
|
||||
: Error("org.freedesktop.DBus.Error.Spawn.ForkFailed", message)
|
||||
{}
|
||||
};
|
||||
|
||||
struct DXXAPI ErrorSpawnChildExited : public Error
|
||||
{
|
||||
ErrorSpawnChildExited( const char* message )
|
||||
ErrorSpawnChildExited(const char *message)
|
||||
: Error("org.freedesktop.DBus.Error.Spawn.ChildExited", message)
|
||||
{}
|
||||
};
|
||||
|
||||
struct DXXAPI ErrorSpawnChildSignaled : public Error
|
||||
{
|
||||
ErrorSpawnChildSignaled( const char* message )
|
||||
ErrorSpawnChildSignaled(const char *message)
|
||||
: Error("org.freedesktop.DBus.Error.Spawn.ChildSignaled", message)
|
||||
{}
|
||||
};
|
||||
|
||||
struct DXXAPI ErrorSpawnFailed : public Error
|
||||
{
|
||||
ErrorSpawnFailed( const char* message )
|
||||
ErrorSpawnFailed(const char *message)
|
||||
: Error("org.freedesktop.DBus.Error.Spawn.Failed", message)
|
||||
{}
|
||||
};
|
||||
|
||||
struct DXXAPI ErrorInvalidSignature : public Error
|
||||
{
|
||||
ErrorInvalidSignature( const char* message )
|
||||
ErrorInvalidSignature(const char *message)
|
||||
: Error("org.freedesktop.DBus.Error.InvalidSignature", message)
|
||||
{}
|
||||
};
|
||||
|
||||
struct DXXAPI ErrorUnixProcessIdUnknown : public Error
|
||||
{
|
||||
ErrorUnixProcessIdUnknown( const char* message )
|
||||
ErrorUnixProcessIdUnknown(const char *message)
|
||||
: Error("org.freedesktop.DBus.Error.UnixProcessIdUnknown", message)
|
||||
{}
|
||||
};
|
||||
|
||||
struct DXXAPI ErrorSELinuxSecurityContextUnknown : public Error
|
||||
{
|
||||
ErrorSELinuxSecurityContextUnknown( const char* message )
|
||||
ErrorSELinuxSecurityContextUnknown(const char *message)
|
||||
: Error("org.freedesktop.DBus.Error.SELinuxSecurityContextUnknown", message)
|
||||
{}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ class BusDispatcher;
|
|||
|
||||
class DXXAPI BusTimeout : public Timeout, public DefaultTimeout
|
||||
{
|
||||
BusTimeout( Timeout::Internal*, BusDispatcher* );
|
||||
BusTimeout(Timeout::Internal *, BusDispatcher *);
|
||||
|
||||
void toggle();
|
||||
|
||||
|
|
@ -53,7 +53,7 @@ friend class BusDispatcher;
|
|||
|
||||
class DXXAPI BusWatch : public Watch, public DefaultWatch
|
||||
{
|
||||
BusWatch( Watch::Internal*, BusDispatcher* );
|
||||
BusWatch(Watch::Internal *, BusDispatcher *);
|
||||
|
||||
void toggle();
|
||||
|
||||
|
|
@ -76,17 +76,17 @@ public:
|
|||
|
||||
virtual void do_iteration();
|
||||
|
||||
virtual Timeout* add_timeout( Timeout::Internal* );
|
||||
virtual Timeout *add_timeout(Timeout::Internal *);
|
||||
|
||||
virtual void rem_timeout( Timeout* );
|
||||
virtual void rem_timeout(Timeout *);
|
||||
|
||||
virtual Watch* add_watch( Watch::Internal* );
|
||||
virtual Watch *add_watch(Watch::Internal *);
|
||||
|
||||
virtual void rem_watch( Watch* );
|
||||
virtual void rem_watch(Watch *);
|
||||
|
||||
void watch_ready( DefaultWatch& );
|
||||
void watch_ready(DefaultWatch &);
|
||||
|
||||
void timeout_expired( DefaultTimeout& );
|
||||
void timeout_expired(DefaultTimeout &);
|
||||
|
||||
private:
|
||||
|
||||
|
|
|
|||
|
|
@ -41,10 +41,10 @@
|
|||
namespace DBus {
|
||||
|
||||
/*
|
||||
* these Default* classes implement a very simple event loop which
|
||||
* these Default *classes implement a very simple event loop which
|
||||
* is used here as the default main loop, if you want to hook
|
||||
* a different one use the Bus* classes in eventloop-integration.h
|
||||
* or the Glib::Bus* classes as a reference
|
||||
* a different one use the Bus *classes in eventloop-integration.h
|
||||
* or the Glib::Bus *classes as a reference
|
||||
*/
|
||||
|
||||
class DefaultMainLoop;
|
||||
|
|
@ -53,7 +53,7 @@ class DXXAPI DefaultTimeout
|
|||
{
|
||||
public:
|
||||
|
||||
DefaultTimeout( int interval, bool repeat, DefaultMainLoop* );
|
||||
DefaultTimeout(int interval, bool repeat, DefaultMainLoop *);
|
||||
|
||||
virtual ~DefaultTimeout();
|
||||
|
||||
|
|
@ -66,10 +66,10 @@ public:
|
|||
bool repeat(){ return _repeat; }
|
||||
void repeat(bool r){ _repeat = r; }
|
||||
|
||||
void* data(){ return _data; }
|
||||
void data(void* d){ _data = d; }
|
||||
void *data(){ return _data; }
|
||||
void data(void *d){ _data = d; }
|
||||
|
||||
Slot<void, DefaultTimeout&> expired;
|
||||
Slot<void, DefaultTimeout &> expired;
|
||||
|
||||
private:
|
||||
|
||||
|
|
@ -80,20 +80,20 @@ private:
|
|||
|
||||
double _expiration;
|
||||
|
||||
void* _data;
|
||||
void *_data;
|
||||
|
||||
DefaultMainLoop* _disp;
|
||||
DefaultMainLoop *_disp;
|
||||
|
||||
friend class DefaultMainLoop;
|
||||
};
|
||||
|
||||
typedef std::list< DefaultTimeout* > DefaultTimeouts;
|
||||
typedef std::list< DefaultTimeout *> DefaultTimeouts;
|
||||
|
||||
class DXXAPI DefaultWatch
|
||||
{
|
||||
public:
|
||||
|
||||
DefaultWatch( int fd, int flags, DefaultMainLoop* );
|
||||
DefaultWatch(int fd, int flags, DefaultMainLoop *);
|
||||
|
||||
virtual ~DefaultWatch();
|
||||
|
||||
|
|
@ -103,14 +103,14 @@ public:
|
|||
int descriptor(){ return _fd; }
|
||||
|
||||
int flags(){ return _flags; }
|
||||
void flags( int f ){ _flags = f; }
|
||||
void flags(int f){ _flags = f; }
|
||||
|
||||
int state(){ return _state; }
|
||||
|
||||
void* data(){ return _data; }
|
||||
void data(void* d){ _data = d; }
|
||||
void *data(){ return _data; }
|
||||
void data(void *d){ _data = d; }
|
||||
|
||||
Slot<void, DefaultWatch&> ready;
|
||||
Slot<void, DefaultWatch &> ready;
|
||||
|
||||
private:
|
||||
|
||||
|
|
@ -120,14 +120,14 @@ private:
|
|||
int _flags;
|
||||
int _state;
|
||||
|
||||
void* _data;
|
||||
void *_data;
|
||||
|
||||
DefaultMainLoop* _disp;
|
||||
DefaultMainLoop *_disp;
|
||||
|
||||
friend class DefaultMainLoop;
|
||||
};
|
||||
|
||||
typedef std::list< DefaultWatch* > DefaultWatches;
|
||||
typedef std::list< DefaultWatch *> DefaultWatches;
|
||||
|
||||
class DXXAPI DefaultMutex
|
||||
{
|
||||
|
|
|
|||
|
|
@ -44,13 +44,13 @@ class DXXAPI BusTimeout : public Timeout
|
|||
{
|
||||
private:
|
||||
|
||||
BusTimeout( Timeout::Internal*, GMainContext*, int );
|
||||
BusTimeout(Timeout::Internal *, GMainContext *, int);
|
||||
|
||||
~BusTimeout();
|
||||
|
||||
void toggle();
|
||||
|
||||
static gboolean timeout_handler( gpointer );
|
||||
static gboolean timeout_handler(gpointer);
|
||||
|
||||
void _enable();
|
||||
|
||||
|
|
@ -58,8 +58,8 @@ private:
|
|||
|
||||
private:
|
||||
|
||||
GSource* _source;
|
||||
GMainContext* _ctx;
|
||||
GSource *_source;
|
||||
GMainContext *_ctx;
|
||||
int _priority;
|
||||
|
||||
friend class BusDispatcher;
|
||||
|
|
@ -69,13 +69,13 @@ class DXXAPI BusWatch : public Watch
|
|||
{
|
||||
private:
|
||||
|
||||
BusWatch( Watch::Internal*, GMainContext*, int );
|
||||
BusWatch(Watch::Internal *, GMainContext *, int);
|
||||
|
||||
~BusWatch();
|
||||
|
||||
void toggle();
|
||||
|
||||
static gboolean watch_handler( gpointer );
|
||||
static gboolean watch_handler(gpointer);
|
||||
|
||||
void _enable();
|
||||
|
||||
|
|
@ -83,8 +83,8 @@ private:
|
|||
|
||||
private:
|
||||
|
||||
GSource* _source;
|
||||
GMainContext* _ctx;
|
||||
GSource *_source;
|
||||
GMainContext *_ctx;
|
||||
int _priority;
|
||||
|
||||
friend class BusDispatcher;
|
||||
|
|
@ -96,25 +96,25 @@ public:
|
|||
|
||||
BusDispatcher() : _ctx(NULL), _priority(G_PRIORITY_DEFAULT) {}
|
||||
|
||||
void attach( GMainContext* );
|
||||
void attach(GMainContext *);
|
||||
|
||||
void enter() {}
|
||||
|
||||
void leave() {}
|
||||
|
||||
Timeout* add_timeout( Timeout::Internal* );
|
||||
Timeout *add_timeout(Timeout::Internal *);
|
||||
|
||||
void rem_timeout( Timeout* );
|
||||
void rem_timeout(Timeout *);
|
||||
|
||||
Watch* add_watch( Watch::Internal* );
|
||||
Watch *add_watch(Watch::Internal *);
|
||||
|
||||
void rem_watch( Watch* );
|
||||
void rem_watch(Watch *);
|
||||
|
||||
void set_priority( int priority );
|
||||
void set_priority(int priority);
|
||||
|
||||
private:
|
||||
|
||||
GMainContext* _ctx;
|
||||
GMainContext *_ctx;
|
||||
int _priority;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -56,22 +56,22 @@ class ObjectAdaptor;
|
|||
class InterfaceAdaptor;
|
||||
class SignalMessage;
|
||||
|
||||
typedef std::map<std::string, InterfaceAdaptor*> InterfaceAdaptorTable;
|
||||
typedef std::map<std::string, InterfaceAdaptor *> InterfaceAdaptorTable;
|
||||
|
||||
class DXXAPI AdaptorBase
|
||||
{
|
||||
public:
|
||||
|
||||
virtual const ObjectAdaptor* object() const = 0 ;
|
||||
virtual const ObjectAdaptor *object() const = 0 ;
|
||||
|
||||
protected:
|
||||
|
||||
InterfaceAdaptor* find_interface( const std::string& name );
|
||||
InterfaceAdaptor *find_interface(const std::string &name);
|
||||
|
||||
virtual ~AdaptorBase()
|
||||
{}
|
||||
|
||||
virtual void _emit_signal( SignalMessage& ) = 0;
|
||||
virtual void _emit_signal(SignalMessage &) = 0;
|
||||
|
||||
InterfaceAdaptorTable _interfaces;
|
||||
};
|
||||
|
|
@ -83,22 +83,22 @@ class ObjectProxy;
|
|||
class InterfaceProxy;
|
||||
class CallMessage;
|
||||
|
||||
typedef std::map<std::string, InterfaceProxy*> InterfaceProxyTable;
|
||||
typedef std::map<std::string, InterfaceProxy *> InterfaceProxyTable;
|
||||
|
||||
class DXXAPI ProxyBase
|
||||
{
|
||||
public:
|
||||
|
||||
virtual const ObjectProxy* object() const = 0 ;
|
||||
virtual const ObjectProxy *object() const = 0 ;
|
||||
|
||||
protected:
|
||||
|
||||
InterfaceProxy* find_interface( const std::string& name );
|
||||
InterfaceProxy *find_interface(const std::string &name);
|
||||
|
||||
virtual ~ProxyBase()
|
||||
{}
|
||||
|
||||
virtual Message _invoke_method( CallMessage& ) = 0;
|
||||
virtual Message _invoke_method(CallMessage &) = 0;
|
||||
|
||||
InterfaceProxyTable _interfaces;
|
||||
};
|
||||
|
|
@ -107,11 +107,11 @@ class DXXAPI Interface
|
|||
{
|
||||
public:
|
||||
|
||||
Interface( const std::string& name );
|
||||
Interface(const std::string &name);
|
||||
|
||||
virtual ~Interface();
|
||||
|
||||
inline const std::string& name() const;
|
||||
inline const std::string &name() const;
|
||||
|
||||
private:
|
||||
|
||||
|
|
@ -121,7 +121,7 @@ private:
|
|||
/*
|
||||
*/
|
||||
|
||||
const std::string& Interface::name() const
|
||||
const std::string &Interface::name() const
|
||||
{
|
||||
return _name;
|
||||
}
|
||||
|
|
@ -129,23 +129,23 @@ const std::string& Interface::name() const
|
|||
/*
|
||||
*/
|
||||
|
||||
typedef std::map< std::string, Slot<Message, const CallMessage&> > MethodTable;
|
||||
typedef std::map< std::string, Slot<Message, const CallMessage &> > MethodTable;
|
||||
|
||||
class DXXAPI InterfaceAdaptor : public Interface, public virtual AdaptorBase
|
||||
{
|
||||
public:
|
||||
|
||||
InterfaceAdaptor( const std::string& name );
|
||||
InterfaceAdaptor(const std::string &name);
|
||||
|
||||
Message dispatch_method( const CallMessage& );
|
||||
Message dispatch_method(const CallMessage &);
|
||||
|
||||
void emit_signal( const SignalMessage& );
|
||||
void emit_signal(const SignalMessage &);
|
||||
|
||||
Variant* get_property( const std::string& name );
|
||||
Variant *get_property(const std::string &name);
|
||||
|
||||
void set_property( const std::string& name, Variant& value );
|
||||
void set_property(const std::string &name, Variant &value);
|
||||
|
||||
virtual IntrospectedInterface* const introspect() const
|
||||
virtual IntrospectedInterface *const introspect() const
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -159,17 +159,17 @@ protected:
|
|||
/*
|
||||
*/
|
||||
|
||||
typedef std::map< std::string, Slot<void, const SignalMessage&> > SignalTable;
|
||||
typedef std::map< std::string, Slot<void, const SignalMessage &> > SignalTable;
|
||||
|
||||
class DXXAPI InterfaceProxy : public Interface, public virtual ProxyBase
|
||||
{
|
||||
public:
|
||||
|
||||
InterfaceProxy( const std::string& name );
|
||||
InterfaceProxy(const std::string &name);
|
||||
|
||||
Message invoke_method( const CallMessage& );
|
||||
Message invoke_method(const CallMessage &);
|
||||
|
||||
bool dispatch_signal( const SignalMessage& );
|
||||
bool dispatch_signal(const SignalMessage &);
|
||||
|
||||
protected:
|
||||
|
||||
|
|
@ -178,17 +178,17 @@ protected:
|
|||
|
||||
# define register_method(interface, method, callback) \
|
||||
InterfaceAdaptor::_methods[ #method ] = \
|
||||
new ::DBus::Callback< interface, ::DBus::Message, const ::DBus::CallMessage& >(this, & interface :: callback );
|
||||
new ::DBus::Callback< interface, ::DBus::Message, const ::DBus::CallMessage &>(this, & interface :: callback);
|
||||
|
||||
# define bind_property(variable, type, can_read, can_write) \
|
||||
InterfaceAdaptor::_properties[ #variable ].read = can_read; \
|
||||
InterfaceAdaptor::_properties[ #variable ].write = can_write; \
|
||||
InterfaceAdaptor::_properties[ #variable ].sig = type; \
|
||||
variable.bind( InterfaceAdaptor::_properties[ #variable ] );
|
||||
variable.bind(InterfaceAdaptor::_properties[ #variable ]);
|
||||
|
||||
# define connect_signal(interface, signal, callback) \
|
||||
InterfaceProxy::_signals[ #signal ] = \
|
||||
new ::DBus::Callback< interface, void, const ::DBus::SignalMessage& >(this, & interface :: callback );
|
||||
new ::DBus::Callback< interface, void, const ::DBus::SignalMessage &>(this, & interface :: callback);
|
||||
|
||||
} /* namespace DBus */
|
||||
|
||||
|
|
|
|||
|
|
@ -36,31 +36,31 @@ namespace DBus {
|
|||
|
||||
struct DXXAPI IntrospectedArgument
|
||||
{
|
||||
const char* name;
|
||||
const char* type;
|
||||
const char *name;
|
||||
const char *type;
|
||||
const bool in;
|
||||
};
|
||||
|
||||
struct DXXAPI IntrospectedMethod
|
||||
{
|
||||
const char* name;
|
||||
const IntrospectedArgument* args;
|
||||
const char *name;
|
||||
const IntrospectedArgument *args;
|
||||
};
|
||||
|
||||
struct DXXAPI IntrospectedProperty
|
||||
{
|
||||
const char* name;
|
||||
const char* type;
|
||||
const char *name;
|
||||
const char *type;
|
||||
const bool read;
|
||||
const bool write;
|
||||
};
|
||||
|
||||
struct DXXAPI IntrospectedInterface
|
||||
{
|
||||
const char* name;
|
||||
const IntrospectedMethod* methods;
|
||||
const IntrospectedMethod* signals;
|
||||
const IntrospectedProperty* properties;
|
||||
const char *name;
|
||||
const IntrospectedMethod *methods;
|
||||
const IntrospectedMethod *signals;
|
||||
const IntrospectedProperty *properties;
|
||||
};
|
||||
|
||||
class DXXAPI IntrospectableAdaptor : public InterfaceAdaptor
|
||||
|
|
@ -69,11 +69,11 @@ public:
|
|||
|
||||
IntrospectableAdaptor();
|
||||
|
||||
Message Introspect( const CallMessage& );
|
||||
Message Introspect(const CallMessage &);
|
||||
|
||||
protected:
|
||||
|
||||
IntrospectedInterface* const introspect() const;
|
||||
IntrospectedInterface *const introspect() const;
|
||||
};
|
||||
|
||||
class DXXAPI IntrospectableProxy : public InterfaceProxy
|
||||
|
|
|
|||
|
|
@ -56,104 +56,104 @@ public:
|
|||
|
||||
bool has_next();
|
||||
|
||||
MessageIter& operator ++();
|
||||
MessageIter &operator ++();
|
||||
|
||||
MessageIter operator ++(int);
|
||||
|
||||
bool append_byte( unsigned char byte );
|
||||
bool append_byte(unsigned char byte);
|
||||
|
||||
unsigned char get_byte();
|
||||
|
||||
bool append_bool( bool b );
|
||||
bool append_bool(bool b);
|
||||
|
||||
bool get_bool();
|
||||
|
||||
bool append_int16( signed short i );
|
||||
bool append_int16(signed short i);
|
||||
|
||||
signed short get_int16();
|
||||
|
||||
bool append_uint16( unsigned short u );
|
||||
bool append_uint16(unsigned short u);
|
||||
|
||||
unsigned short get_uint16();
|
||||
|
||||
bool append_int32( signed int i );
|
||||
bool append_int32(signed int i);
|
||||
|
||||
signed int get_int32();
|
||||
|
||||
bool append_uint32( unsigned int u );
|
||||
bool append_uint32(unsigned int u);
|
||||
|
||||
unsigned int get_uint32();
|
||||
|
||||
bool append_int64( signed long long i );
|
||||
bool append_int64(signed long long i);
|
||||
|
||||
signed long long get_int64();
|
||||
|
||||
bool append_uint64( unsigned long long i );
|
||||
bool append_uint64(unsigned long long i);
|
||||
|
||||
unsigned long long get_uint64();
|
||||
|
||||
bool append_double( double d );
|
||||
bool append_double(double d);
|
||||
|
||||
double get_double();
|
||||
|
||||
bool append_string( const char* chars );
|
||||
bool append_string(const char *chars);
|
||||
|
||||
const char* get_string();
|
||||
const char *get_string();
|
||||
|
||||
bool append_path( const char* chars );
|
||||
bool append_path(const char *chars);
|
||||
|
||||
const char* get_path();
|
||||
const char *get_path();
|
||||
|
||||
bool append_signature( const char* chars );
|
||||
bool append_signature(const char *chars);
|
||||
|
||||
const char* get_signature();
|
||||
const char *get_signature();
|
||||
|
||||
char* signature() const; //returned string must be manually free()'d
|
||||
char *signature() const; //returned string must be manually free()'d
|
||||
|
||||
MessageIter recurse();
|
||||
|
||||
bool append_array( char type, const void* ptr, size_t length );
|
||||
bool append_array(char type, const void *ptr, size_t length);
|
||||
|
||||
int array_type();
|
||||
|
||||
int get_array( void* ptr );
|
||||
int get_array(void *ptr);
|
||||
|
||||
bool is_array();
|
||||
|
||||
bool is_dict();
|
||||
|
||||
MessageIter new_array( const char* sig );
|
||||
MessageIter new_array(const char *sig);
|
||||
|
||||
MessageIter new_variant( const char* sig );
|
||||
MessageIter new_variant(const char *sig);
|
||||
|
||||
MessageIter new_struct();
|
||||
|
||||
MessageIter new_dict_entry();
|
||||
|
||||
void close_container( MessageIter& container );
|
||||
void close_container(MessageIter &container);
|
||||
|
||||
void copy_data( MessageIter& to );
|
||||
void copy_data(MessageIter &to);
|
||||
|
||||
Message& msg() const
|
||||
Message &msg() const
|
||||
{
|
||||
return *_msg;
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
DXXAPILOCAL MessageIter(Message& msg) : _msg(&msg) {}
|
||||
DXXAPILOCAL MessageIter(Message &msg) : _msg(&msg) {}
|
||||
|
||||
DXXAPILOCAL bool append_basic( int type_id, void* value );
|
||||
DXXAPILOCAL bool append_basic(int type_id, void *value);
|
||||
|
||||
DXXAPILOCAL void get_basic( int type_id, void* ptr );
|
||||
DXXAPILOCAL void get_basic(int type_id, void *ptr);
|
||||
|
||||
private:
|
||||
|
||||
/* I'm sorry, but don't want to include dbus.h in the public api
|
||||
*/
|
||||
unsigned char _iter[sizeof(void*)*3+sizeof(int)*11];
|
||||
unsigned char _iter[sizeof(void *)*3+sizeof(int)*11];
|
||||
|
||||
Message* _msg;
|
||||
Message *_msg;
|
||||
|
||||
friend class Message;
|
||||
};
|
||||
|
|
@ -164,13 +164,13 @@ public:
|
|||
|
||||
struct Private;
|
||||
|
||||
Message( Private*, bool incref = true );
|
||||
Message(Private *, bool incref = true);
|
||||
|
||||
Message( const Message& m );
|
||||
Message(const Message &m);
|
||||
|
||||
~Message();
|
||||
|
||||
Message& operator = ( const Message& m );
|
||||
Message &operator = (const Message &m);
|
||||
|
||||
Message copy();
|
||||
|
||||
|
|
@ -180,25 +180,25 @@ public:
|
|||
|
||||
int reply_serial() const;
|
||||
|
||||
bool reply_serial( int );
|
||||
bool reply_serial(int);
|
||||
|
||||
const char* sender() const;
|
||||
const char *sender() const;
|
||||
|
||||
bool sender( const char* s );
|
||||
bool sender(const char *s);
|
||||
|
||||
const char* destination() const;
|
||||
const char *destination() const;
|
||||
|
||||
bool destination( const char* s );
|
||||
bool destination(const char *s);
|
||||
|
||||
bool is_error() const;
|
||||
|
||||
bool is_signal( const char* interface, const char* member ) const;
|
||||
bool is_signal(const char *interface, const char *member) const;
|
||||
|
||||
MessageIter reader() const;
|
||||
|
||||
MessageIter writer();
|
||||
|
||||
bool append( int first_type, ... );
|
||||
bool append(int first_type, ...);
|
||||
|
||||
void terminate();
|
||||
|
||||
|
|
@ -228,13 +228,13 @@ public:
|
|||
|
||||
ErrorMessage();
|
||||
|
||||
ErrorMessage( const Message&, const char* name, const char* message );
|
||||
ErrorMessage(const Message &, const char *name, const char *message);
|
||||
|
||||
const char* name() const;
|
||||
const char *name() const;
|
||||
|
||||
bool name( const char* n );
|
||||
bool name(const char *n);
|
||||
|
||||
bool operator == ( const ErrorMessage& ) const;
|
||||
bool operator == (const ErrorMessage &) const;
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
@ -244,25 +244,25 @@ class DXXAPI SignalMessage : public Message
|
|||
{
|
||||
public:
|
||||
|
||||
SignalMessage( const char* name );
|
||||
SignalMessage(const char *name);
|
||||
|
||||
SignalMessage( const char* path, const char* interface, const char* name );
|
||||
SignalMessage(const char *path, const char *interface, const char *name);
|
||||
|
||||
const char* interface() const;
|
||||
const char *interface() const;
|
||||
|
||||
bool interface( const char* i );
|
||||
bool interface(const char *i);
|
||||
|
||||
const char* member() const;
|
||||
const char *member() const;
|
||||
|
||||
bool member( const char* m );
|
||||
bool member(const char *m);
|
||||
|
||||
const char* path() const;
|
||||
const char *path() const;
|
||||
|
||||
char** path_split() const;
|
||||
char ** path_split() const;
|
||||
|
||||
bool path( const char* p );
|
||||
bool path(const char *p);
|
||||
|
||||
bool operator == ( const SignalMessage& ) const;
|
||||
bool operator == (const SignalMessage &) const;
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
@ -274,25 +274,25 @@ public:
|
|||
|
||||
CallMessage();
|
||||
|
||||
CallMessage( const char* dest, const char* path, const char* iface, const char* method );
|
||||
CallMessage(const char *dest, const char *path, const char *iface, const char *method);
|
||||
|
||||
const char* interface() const;
|
||||
const char *interface() const;
|
||||
|
||||
bool interface( const char* i );
|
||||
bool interface(const char *i);
|
||||
|
||||
const char* member() const;
|
||||
const char *member() const;
|
||||
|
||||
bool member( const char* m );
|
||||
bool member(const char *m);
|
||||
|
||||
const char* path() const;
|
||||
const char *path() const;
|
||||
|
||||
char** path_split() const;
|
||||
char ** path_split() const;
|
||||
|
||||
bool path( const char* p );
|
||||
bool path(const char *p);
|
||||
|
||||
const char* signature() const;
|
||||
const char *signature() const;
|
||||
|
||||
bool operator == ( const CallMessage& ) const;
|
||||
bool operator == (const CallMessage &) const;
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
@ -302,9 +302,9 @@ class DXXAPI ReturnMessage : public Message
|
|||
{
|
||||
public:
|
||||
|
||||
ReturnMessage( const CallMessage& callee );
|
||||
ReturnMessage(const CallMessage &callee);
|
||||
|
||||
const char* signature() const;
|
||||
const char *signature() const;
|
||||
};
|
||||
|
||||
} /* namespace DBus */
|
||||
|
|
|
|||
|
|
@ -44,21 +44,21 @@ class DXXAPI Object
|
|||
{
|
||||
protected:
|
||||
|
||||
Object( Connection& conn, const Path& path, const char* service );
|
||||
Object(Connection &conn, const Path &path, const char *service);
|
||||
|
||||
public:
|
||||
|
||||
virtual ~Object();
|
||||
|
||||
inline const DBus::Path& path() const;
|
||||
inline const DBus::Path &path() const;
|
||||
|
||||
inline const std::string& service() const;
|
||||
inline const std::string &service() const;
|
||||
|
||||
inline Connection& conn();
|
||||
inline Connection &conn();
|
||||
|
||||
private:
|
||||
|
||||
DXXAPILOCAL virtual bool handle_message( const Message& ) = 0;
|
||||
DXXAPILOCAL virtual bool handle_message(const Message &) = 0;
|
||||
DXXAPILOCAL virtual void register_obj() = 0;
|
||||
DXXAPILOCAL virtual void unregister_obj() = 0;
|
||||
|
||||
|
|
@ -72,17 +72,17 @@ private:
|
|||
/*
|
||||
*/
|
||||
|
||||
Connection& Object::conn()
|
||||
Connection &Object::conn()
|
||||
{
|
||||
return _conn;
|
||||
}
|
||||
|
||||
const DBus::Path& Object::path() const
|
||||
const DBus::Path &Object::path() const
|
||||
{
|
||||
return _path;
|
||||
}
|
||||
|
||||
const std::string& Object::service() const
|
||||
const std::string &Object::service() const
|
||||
{
|
||||
return _service;
|
||||
}
|
||||
|
|
@ -103,26 +103,26 @@ public:
|
|||
|
||||
class ObjectAdaptor;
|
||||
|
||||
typedef std::list<ObjectAdaptor*> ObjectAdaptorPList;
|
||||
typedef std::list<ObjectAdaptor *> ObjectAdaptorPList;
|
||||
typedef std::list<std::string> ObjectPathList;
|
||||
|
||||
class DXXAPI ObjectAdaptor : public Object, public virtual AdaptorBase
|
||||
{
|
||||
public:
|
||||
|
||||
static ObjectAdaptor* from_path( const Path& path );
|
||||
static ObjectAdaptor *from_path(const Path &path);
|
||||
|
||||
static ObjectAdaptorPList from_path_prefix( const std::string& prefix );
|
||||
static ObjectAdaptorPList from_path_prefix(const std::string &prefix);
|
||||
|
||||
static ObjectPathList child_nodes_from_prefix( const std::string& prefix );
|
||||
static ObjectPathList child_nodes_from_prefix(const std::string &prefix);
|
||||
|
||||
struct Private;
|
||||
|
||||
ObjectAdaptor( Connection& conn, const Path& path );
|
||||
ObjectAdaptor(Connection &conn, const Path &path);
|
||||
|
||||
~ObjectAdaptor();
|
||||
|
||||
inline const ObjectAdaptor* object() const;
|
||||
inline const ObjectAdaptor *object() const;
|
||||
|
||||
protected:
|
||||
|
||||
|
|
@ -130,57 +130,57 @@ protected:
|
|||
{
|
||||
public:
|
||||
|
||||
inline MessageIter& writer();
|
||||
inline MessageIter &writer();
|
||||
|
||||
inline Tag* tag();
|
||||
inline Tag *tag();
|
||||
|
||||
private:
|
||||
|
||||
Continuation( Connection& conn, const CallMessage& call, const Tag* tag );
|
||||
Continuation(Connection &conn, const CallMessage &call, const Tag *tag);
|
||||
|
||||
Connection _conn;
|
||||
CallMessage _call;
|
||||
MessageIter _writer;
|
||||
ReturnMessage _return;
|
||||
const Tag* _tag;
|
||||
const Tag *_tag;
|
||||
|
||||
friend class ObjectAdaptor;
|
||||
};
|
||||
|
||||
void return_later( const Tag* tag );
|
||||
void return_later(const Tag *tag);
|
||||
|
||||
void return_now( Continuation* ret );
|
||||
void return_now(Continuation *ret);
|
||||
|
||||
void return_error( Continuation* ret, const Error error );
|
||||
void return_error(Continuation *ret, const Error error);
|
||||
|
||||
Continuation* find_continuation( const Tag* tag );
|
||||
Continuation *find_continuation(const Tag *tag);
|
||||
|
||||
private:
|
||||
|
||||
void _emit_signal( SignalMessage& );
|
||||
void _emit_signal(SignalMessage &);
|
||||
|
||||
bool handle_message( const Message& );
|
||||
bool handle_message(const Message &);
|
||||
|
||||
void register_obj();
|
||||
void unregister_obj();
|
||||
|
||||
typedef std::map<const Tag*, Continuation*> ContinuationMap;
|
||||
typedef std::map<const Tag *, Continuation *> ContinuationMap;
|
||||
ContinuationMap _continuations;
|
||||
|
||||
friend struct Private;
|
||||
};
|
||||
|
||||
const ObjectAdaptor* ObjectAdaptor::object() const
|
||||
const ObjectAdaptor *ObjectAdaptor::object() const
|
||||
{
|
||||
return this;
|
||||
}
|
||||
|
||||
Tag* ObjectAdaptor::Continuation::tag()
|
||||
Tag *ObjectAdaptor::Continuation::tag()
|
||||
{
|
||||
return const_cast<Tag*>(_tag);
|
||||
return const_cast<Tag *>(_tag);
|
||||
}
|
||||
|
||||
MessageIter& ObjectAdaptor::Continuation::writer()
|
||||
MessageIter &ObjectAdaptor::Continuation::writer()
|
||||
{
|
||||
return _writer;
|
||||
}
|
||||
|
|
@ -190,23 +190,23 @@ MessageIter& ObjectAdaptor::Continuation::writer()
|
|||
|
||||
class ObjectProxy;
|
||||
|
||||
typedef std::list<ObjectProxy*> ObjectProxyPList;
|
||||
typedef std::list<ObjectProxy *> ObjectProxyPList;
|
||||
|
||||
class DXXAPI ObjectProxy : public Object, public virtual ProxyBase
|
||||
{
|
||||
public:
|
||||
|
||||
ObjectProxy( Connection& conn, const Path& path, const char* service = "" );
|
||||
ObjectProxy(Connection &conn, const Path &path, const char *service = "");
|
||||
|
||||
~ObjectProxy();
|
||||
|
||||
inline const ObjectProxy* object() const;
|
||||
inline const ObjectProxy *object() const;
|
||||
|
||||
private:
|
||||
|
||||
Message _invoke_method( CallMessage& );
|
||||
Message _invoke_method(CallMessage &);
|
||||
|
||||
bool handle_message( const Message& );
|
||||
bool handle_message(const Message &);
|
||||
|
||||
void register_obj();
|
||||
void unregister_obj();
|
||||
|
|
@ -216,7 +216,7 @@ private:
|
|||
MessageSlot _filtered;
|
||||
};
|
||||
|
||||
const ObjectProxy* ObjectProxy::object() const
|
||||
const ObjectProxy *ObjectProxy::object() const
|
||||
{
|
||||
return this;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,13 +43,13 @@ public:
|
|||
|
||||
struct Private;
|
||||
|
||||
PendingCall( Private* );
|
||||
PendingCall(Private *);
|
||||
|
||||
PendingCall( const PendingCall& );
|
||||
PendingCall(const PendingCall &);
|
||||
|
||||
virtual ~PendingCall();
|
||||
|
||||
PendingCall& operator = ( const PendingCall& );
|
||||
PendingCall &operator = (const PendingCall &);
|
||||
|
||||
bool completed();
|
||||
|
||||
|
|
@ -57,11 +57,11 @@ public:
|
|||
|
||||
void block();
|
||||
|
||||
void data( void* );
|
||||
void data(void *);
|
||||
|
||||
void* data();
|
||||
void *data();
|
||||
|
||||
Slot<void, PendingCall&>& slot();
|
||||
Slot<void, PendingCall &>& slot();
|
||||
|
||||
Message steal_reply();
|
||||
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ public:
|
|||
PropertyAdaptor() : _data(0)
|
||||
{}
|
||||
|
||||
void bind( PropertyData& data )
|
||||
void bind(PropertyData &data)
|
||||
{
|
||||
_data = &data;
|
||||
}
|
||||
|
|
@ -53,7 +53,7 @@ public:
|
|||
return (T)_data->value;
|
||||
}
|
||||
|
||||
PropertyAdaptor& operator = ( const T& t )
|
||||
PropertyAdaptor &operator = (const T &t)
|
||||
{
|
||||
_data->value.clear();
|
||||
MessageIter wi = _data->value.writer();
|
||||
|
|
@ -63,7 +63,7 @@ public:
|
|||
|
||||
private:
|
||||
|
||||
PropertyData* _data;
|
||||
PropertyData *_data;
|
||||
};
|
||||
|
||||
struct IntrospectedInterface;
|
||||
|
|
@ -74,19 +74,19 @@ public:
|
|||
|
||||
PropertiesAdaptor();
|
||||
|
||||
Message Get( const CallMessage& );
|
||||
Message Get(const CallMessage &);
|
||||
|
||||
Message Set( const CallMessage& );
|
||||
Message Set(const CallMessage &);
|
||||
|
||||
protected:
|
||||
|
||||
virtual void on_get_property( InterfaceAdaptor& interface, const String& property, Variant& value )
|
||||
virtual void on_get_property(InterfaceAdaptor &interface, const String &property, Variant &value)
|
||||
{}
|
||||
|
||||
virtual void on_set_property( InterfaceAdaptor& interface, const String& property, const Variant& value )
|
||||
virtual void on_set_property(InterfaceAdaptor &interface, const String &property, const Variant &value)
|
||||
{}
|
||||
|
||||
IntrospectedInterface* const introspect() const;
|
||||
IntrospectedInterface *const introspect() const;
|
||||
};
|
||||
|
||||
class DXXAPI PropertiesProxy : public InterfaceProxy
|
||||
|
|
@ -95,9 +95,9 @@ public:
|
|||
|
||||
PropertiesProxy();
|
||||
|
||||
Variant Get( const String& interface, const String& property );
|
||||
Variant Get(const String &interface, const String &property);
|
||||
|
||||
void Set( const String& interface, const String& property, const Variant& value );
|
||||
void Set(const String &interface, const String &property, const Variant &value);
|
||||
};
|
||||
|
||||
} /* namespace DBus */
|
||||
|
|
|
|||
|
|
@ -35,14 +35,14 @@
|
|||
namespace DBus {
|
||||
|
||||
template <class T>
|
||||
RefPtrI<T>::RefPtrI( T* ptr )
|
||||
RefPtrI<T>::RefPtrI(T *ptr)
|
||||
: __ptr(ptr)
|
||||
{}
|
||||
|
||||
template <class T>
|
||||
RefPtrI<T>::~RefPtrI()
|
||||
{
|
||||
if(__cnt.one()) delete __ptr;
|
||||
if (__cnt.one()) delete __ptr;
|
||||
}
|
||||
|
||||
} /* namespace DBus */
|
||||
|
|
|
|||
|
|
@ -47,15 +47,15 @@ class DXXAPI Server
|
|||
{
|
||||
public:
|
||||
|
||||
Server( const char* address );
|
||||
Server(const char *address);
|
||||
|
||||
Dispatcher* setup( Dispatcher* );
|
||||
Dispatcher *setup(Dispatcher *);
|
||||
|
||||
virtual ~Server();
|
||||
|
||||
bool listening() const;
|
||||
|
||||
bool operator == ( const Server& ) const;
|
||||
bool operator == (const Server &) const;
|
||||
|
||||
void disconnect();
|
||||
|
||||
|
|
@ -63,10 +63,10 @@ public:
|
|||
|
||||
protected:
|
||||
|
||||
Server( const Server& s )
|
||||
Server(const Server &s)
|
||||
{}
|
||||
|
||||
virtual void on_new_connection( Connection& c ) = 0;
|
||||
virtual void on_new_connection(Connection &c) = 0;
|
||||
|
||||
private:
|
||||
|
||||
|
|
|
|||
|
|
@ -54,9 +54,9 @@ typedef std::string String;
|
|||
struct DXXAPI Path : public std::string
|
||||
{
|
||||
Path() {}
|
||||
Path( const std::string& s ) : std::string(s) {}
|
||||
Path( const char* c ) : std::string(c) {}
|
||||
Path& operator = ( std::string& s )
|
||||
Path(const std::string &s) : std::string(s) {}
|
||||
Path(const char *c) : std::string(c) {}
|
||||
Path &operator = (std::string &s)
|
||||
{
|
||||
std::string::operator = (s);
|
||||
return *this;
|
||||
|
|
@ -66,9 +66,9 @@ struct DXXAPI Path : public std::string
|
|||
struct DXXAPI Signature : public std::string
|
||||
{
|
||||
Signature() {}
|
||||
Signature( const std::string& s ) : std::string(s) {}
|
||||
Signature( const char* c ) : std::string(c) {}
|
||||
Signature& operator = ( std::string& s )
|
||||
Signature(const std::string &s) : std::string(s) {}
|
||||
Signature(const char *c) : std::string(c) {}
|
||||
Signature &operator = (std::string &s)
|
||||
{
|
||||
std::string::operator = (s);
|
||||
return *this;
|
||||
|
|
@ -83,9 +83,9 @@ public:
|
|||
|
||||
Variant();
|
||||
|
||||
Variant( MessageIter& it );
|
||||
Variant(MessageIter &it);
|
||||
|
||||
Variant& operator = ( const Variant& v );
|
||||
Variant &operator = (const Variant &v);
|
||||
|
||||
const Signature signature() const;
|
||||
|
||||
|
|
@ -131,7 +131,7 @@ struct Struct
|
|||
};
|
||||
|
||||
template<typename K, typename V>
|
||||
inline bool dict_has_key( const std::map<K,V>& map, const K& key )
|
||||
inline bool dict_has_key(const std::map<K,V>& map, const K &key)
|
||||
{
|
||||
return map.find(key) != map.end();
|
||||
}
|
||||
|
|
@ -198,91 +198,91 @@ struct type< Struct<T1,T2,T3,T4,T5,T6,T7,T8> >
|
|||
|
||||
} /* namespace DBus */
|
||||
|
||||
inline DBus::MessageIter& operator << ( DBus::MessageIter& iter, const DBus::Invalid& )
|
||||
inline DBus::MessageIter &operator << (DBus::MessageIter &iter, const DBus::Invalid &)
|
||||
{
|
||||
return iter;
|
||||
}
|
||||
|
||||
inline DBus::MessageIter& operator << ( DBus::MessageIter& iter, const DBus::Byte& val )
|
||||
inline DBus::MessageIter &operator << (DBus::MessageIter &iter, const DBus::Byte &val)
|
||||
{
|
||||
iter.append_byte(val);
|
||||
return iter;
|
||||
}
|
||||
|
||||
inline DBus::MessageIter& operator << ( DBus::MessageIter& iter, const DBus::Bool& val )
|
||||
inline DBus::MessageIter &operator << (DBus::MessageIter &iter, const DBus::Bool &val)
|
||||
{
|
||||
iter.append_bool(val);
|
||||
return iter;
|
||||
}
|
||||
|
||||
inline DBus::MessageIter& operator << ( DBus::MessageIter& iter, const DBus::Int16& val )
|
||||
inline DBus::MessageIter &operator << (DBus::MessageIter &iter, const DBus::Int16& val)
|
||||
{
|
||||
iter.append_int16(val);
|
||||
return iter;
|
||||
}
|
||||
|
||||
inline DBus::MessageIter& operator << ( DBus::MessageIter& iter, const DBus::UInt16& val )
|
||||
inline DBus::MessageIter &operator << (DBus::MessageIter &iter, const DBus::UInt16& val)
|
||||
{
|
||||
iter.append_uint16(val);
|
||||
return iter;
|
||||
}
|
||||
|
||||
inline DBus::MessageIter& operator << ( DBus::MessageIter& iter, const DBus::Int32& val )
|
||||
inline DBus::MessageIter &operator << (DBus::MessageIter &iter, const DBus::Int32& val)
|
||||
{
|
||||
iter.append_int32(val);
|
||||
return iter;
|
||||
}
|
||||
|
||||
inline DBus::MessageIter& operator << ( DBus::MessageIter& iter, const DBus::UInt32& val )
|
||||
inline DBus::MessageIter &operator << (DBus::MessageIter &iter, const DBus::UInt32& val)
|
||||
{
|
||||
iter.append_uint32(val);
|
||||
return iter;
|
||||
}
|
||||
|
||||
inline DBus::MessageIter& operator << ( DBus::MessageIter& iter, const DBus::Int64& val )
|
||||
inline DBus::MessageIter &operator << (DBus::MessageIter &iter, const DBus::Int64& val)
|
||||
{
|
||||
iter.append_int64(val);
|
||||
return iter;
|
||||
}
|
||||
|
||||
inline DBus::MessageIter& operator << ( DBus::MessageIter& iter, const DBus::UInt64& val )
|
||||
inline DBus::MessageIter &operator << (DBus::MessageIter &iter, const DBus::UInt64& val)
|
||||
{
|
||||
iter.append_uint64(val);
|
||||
return iter;
|
||||
}
|
||||
|
||||
inline DBus::MessageIter& operator << ( DBus::MessageIter& iter, const DBus::Double& val )
|
||||
inline DBus::MessageIter &operator << (DBus::MessageIter &iter, const DBus::Double &val)
|
||||
{
|
||||
iter.append_double(val);
|
||||
return iter;
|
||||
}
|
||||
|
||||
inline DBus::MessageIter& operator << ( DBus::MessageIter& iter, const DBus::String& val )
|
||||
inline DBus::MessageIter &operator << (DBus::MessageIter &iter, const DBus::String &val)
|
||||
{
|
||||
iter.append_string(val.c_str());
|
||||
return iter;
|
||||
}
|
||||
|
||||
inline DBus::MessageIter& operator << ( DBus::MessageIter& iter, const DBus::Path& val )
|
||||
inline DBus::MessageIter &operator << (DBus::MessageIter &iter, const DBus::Path &val)
|
||||
{
|
||||
iter.append_path(val.c_str());
|
||||
return iter;
|
||||
}
|
||||
|
||||
inline DBus::MessageIter& operator << ( DBus::MessageIter& iter, const DBus::Signature& val )
|
||||
inline DBus::MessageIter &operator << (DBus::MessageIter &iter, const DBus::Signature &val)
|
||||
{
|
||||
iter.append_signature(val.c_str());
|
||||
return iter;
|
||||
}
|
||||
|
||||
template<typename E>
|
||||
inline DBus::MessageIter& operator << ( DBus::MessageIter& iter, const std::vector<E>& val )
|
||||
inline DBus::MessageIter &operator << (DBus::MessageIter &iter, const std::vector<E>& val)
|
||||
{
|
||||
const std::string sig = DBus::type<E>::sig();
|
||||
DBus::MessageIter ait = iter.new_array(sig.c_str());
|
||||
|
||||
typename std::vector<E>::const_iterator vit;
|
||||
for(vit = val.begin(); vit != val.end(); ++vit)
|
||||
for (vit = val.begin(); vit != val.end(); ++vit)
|
||||
{
|
||||
ait << *vit;
|
||||
}
|
||||
|
|
@ -292,7 +292,7 @@ inline DBus::MessageIter& operator << ( DBus::MessageIter& iter, const std::vect
|
|||
}
|
||||
|
||||
template<>
|
||||
inline DBus::MessageIter& operator << ( DBus::MessageIter& iter, const std::vector<DBus::Byte>& val )
|
||||
inline DBus::MessageIter &operator << (DBus::MessageIter &iter, const std::vector<DBus::Byte>& val)
|
||||
{
|
||||
DBus::MessageIter ait = iter.new_array("y");
|
||||
ait.append_array('y', &val.front(), val.size());
|
||||
|
|
@ -301,13 +301,13 @@ inline DBus::MessageIter& operator << ( DBus::MessageIter& iter, const std::vect
|
|||
}
|
||||
|
||||
template<typename K, typename V>
|
||||
inline DBus::MessageIter& operator << ( DBus::MessageIter& iter, const std::map<K,V>& val )
|
||||
inline DBus::MessageIter &operator << (DBus::MessageIter &iter, const std::map<K,V>& val)
|
||||
{
|
||||
const std::string sig = "{" + DBus::type<K>::sig() + DBus::type<V>::sig() + "}";
|
||||
DBus::MessageIter ait = iter.new_array(sig.c_str());
|
||||
|
||||
typename std::map<K,V>::const_iterator mit;
|
||||
for(mit = val.begin(); mit != val.end(); ++mit)
|
||||
for (mit = val.begin(); mit != val.end(); ++mit)
|
||||
{
|
||||
DBus::MessageIter eit = ait.new_dict_entry();
|
||||
|
||||
|
|
@ -330,7 +330,7 @@ template <
|
|||
typename T7,
|
||||
typename T8
|
||||
>
|
||||
inline DBus::MessageIter& operator << ( DBus::MessageIter& iter, const DBus::Struct<T1,T2,T3,T4,T5,T6,T7,T8>& val )
|
||||
inline DBus::MessageIter &operator << (DBus::MessageIter &iter, const DBus::Struct<T1,T2,T3,T4,T5,T6,T7,T8>& val)
|
||||
{
|
||||
/* const std::string sig =
|
||||
DBus::type<T1>::sig() + DBus::type<T2>::sig() + DBus::type<T3>::sig() + DBus::type<T4>::sig() +
|
||||
|
|
@ -345,97 +345,97 @@ inline DBus::MessageIter& operator << ( DBus::MessageIter& iter, const DBus::Str
|
|||
return iter;
|
||||
}
|
||||
|
||||
extern DXXAPI DBus::MessageIter& operator << ( DBus::MessageIter& iter, const DBus::Variant& val );
|
||||
extern DXXAPI DBus::MessageIter &operator << (DBus::MessageIter &iter, const DBus::Variant &val);
|
||||
|
||||
/*
|
||||
*/
|
||||
|
||||
inline DBus::MessageIter& operator >> ( DBus::MessageIter& iter, DBus::Invalid& )
|
||||
inline DBus::MessageIter &operator >> (DBus::MessageIter &iter, DBus::Invalid &)
|
||||
{
|
||||
return iter;
|
||||
}
|
||||
|
||||
inline DBus::MessageIter& operator >> ( DBus::MessageIter& iter, DBus::Byte& val )
|
||||
inline DBus::MessageIter &operator >> (DBus::MessageIter &iter, DBus::Byte &val)
|
||||
{
|
||||
val = iter.get_byte();
|
||||
return ++iter;
|
||||
}
|
||||
|
||||
inline DBus::MessageIter& operator >> ( DBus::MessageIter& iter, DBus::Bool& val )
|
||||
inline DBus::MessageIter &operator >> (DBus::MessageIter &iter, DBus::Bool &val)
|
||||
{
|
||||
val = iter.get_bool();
|
||||
return ++iter;
|
||||
}
|
||||
|
||||
inline DBus::MessageIter& operator >> ( DBus::MessageIter& iter, DBus::Int16& val )
|
||||
inline DBus::MessageIter &operator >> (DBus::MessageIter &iter, DBus::Int16& val)
|
||||
{
|
||||
val = iter.get_int16();
|
||||
return ++iter;
|
||||
}
|
||||
|
||||
inline DBus::MessageIter& operator >> ( DBus::MessageIter& iter, DBus::UInt16& val )
|
||||
inline DBus::MessageIter &operator >> (DBus::MessageIter &iter, DBus::UInt16& val)
|
||||
{
|
||||
val = iter.get_uint16();
|
||||
return ++iter;
|
||||
}
|
||||
|
||||
inline DBus::MessageIter& operator >> ( DBus::MessageIter& iter, DBus::Int32& val )
|
||||
inline DBus::MessageIter &operator >> (DBus::MessageIter &iter, DBus::Int32& val)
|
||||
{
|
||||
val = iter.get_int32();
|
||||
return ++iter;
|
||||
}
|
||||
|
||||
inline DBus::MessageIter& operator >> ( DBus::MessageIter& iter, DBus::UInt32& val )
|
||||
inline DBus::MessageIter &operator >> (DBus::MessageIter &iter, DBus::UInt32& val)
|
||||
{
|
||||
val = iter.get_uint32();
|
||||
return ++iter;
|
||||
}
|
||||
|
||||
inline DBus::MessageIter& operator >> ( DBus::MessageIter& iter, DBus::Int64& val )
|
||||
inline DBus::MessageIter &operator >> (DBus::MessageIter &iter, DBus::Int64& val)
|
||||
{
|
||||
val = iter.get_int64();
|
||||
return ++iter;
|
||||
}
|
||||
|
||||
inline DBus::MessageIter& operator >> ( DBus::MessageIter& iter, DBus::UInt64& val )
|
||||
inline DBus::MessageIter &operator >> (DBus::MessageIter &iter, DBus::UInt64& val)
|
||||
{
|
||||
val = iter.get_uint64();
|
||||
return ++iter;
|
||||
}
|
||||
|
||||
inline DBus::MessageIter& operator >> ( DBus::MessageIter& iter, DBus::Double& val )
|
||||
inline DBus::MessageIter &operator >> (DBus::MessageIter &iter, DBus::Double &val)
|
||||
{
|
||||
val = iter.get_double();
|
||||
return ++iter;
|
||||
}
|
||||
|
||||
inline DBus::MessageIter& operator >> ( DBus::MessageIter& iter, DBus::String& val )
|
||||
inline DBus::MessageIter &operator >> (DBus::MessageIter &iter, DBus::String &val)
|
||||
{
|
||||
val = iter.get_string();
|
||||
return ++iter;
|
||||
}
|
||||
|
||||
inline DBus::MessageIter& operator >> ( DBus::MessageIter& iter, DBus::Path& val )
|
||||
inline DBus::MessageIter &operator >> (DBus::MessageIter &iter, DBus::Path &val)
|
||||
{
|
||||
val = iter.get_path();
|
||||
return ++iter;
|
||||
}
|
||||
|
||||
inline DBus::MessageIter& operator >> ( DBus::MessageIter& iter, DBus::Signature& val )
|
||||
inline DBus::MessageIter &operator >> (DBus::MessageIter &iter, DBus::Signature &val)
|
||||
{
|
||||
val = iter.get_signature();
|
||||
return ++iter;
|
||||
}
|
||||
|
||||
template<typename E>
|
||||
inline DBus::MessageIter& operator >> ( DBus::MessageIter& iter, std::vector<E>& val )
|
||||
inline DBus::MessageIter &operator >> (DBus::MessageIter &iter, std::vector<E>& val)
|
||||
{
|
||||
if(!iter.is_array())
|
||||
if (!iter.is_array())
|
||||
throw DBus::ErrorInvalidArgs("array expected");
|
||||
|
||||
DBus::MessageIter ait = iter.recurse();
|
||||
|
||||
while(!ait.at_end())
|
||||
while (!ait.at_end())
|
||||
{
|
||||
E elem;
|
||||
|
||||
|
|
@ -447,17 +447,17 @@ inline DBus::MessageIter& operator >> ( DBus::MessageIter& iter, std::vector<E>&
|
|||
}
|
||||
|
||||
template<>
|
||||
inline DBus::MessageIter& operator >> ( DBus::MessageIter& iter, std::vector<DBus::Byte>& val )
|
||||
inline DBus::MessageIter &operator >> (DBus::MessageIter &iter, std::vector<DBus::Byte>& val)
|
||||
{
|
||||
if(!iter.is_array())
|
||||
if (!iter.is_array())
|
||||
throw DBus::ErrorInvalidArgs("array expected");
|
||||
|
||||
if(iter.array_type() != 'y')
|
||||
if (iter.array_type() != 'y')
|
||||
throw DBus::ErrorInvalidArgs("byte-array expected");
|
||||
|
||||
DBus::MessageIter ait = iter.recurse();
|
||||
|
||||
DBus::Byte* array;
|
||||
DBus::Byte *array;
|
||||
size_t length = ait.get_array(&array);
|
||||
|
||||
val.insert(val.end(), array, array+length);
|
||||
|
|
@ -466,14 +466,14 @@ inline DBus::MessageIter& operator >> ( DBus::MessageIter& iter, std::vector<DBu
|
|||
}
|
||||
|
||||
template<typename K, typename V>
|
||||
inline DBus::MessageIter& operator >> ( DBus::MessageIter& iter, std::map<K,V>& val )
|
||||
inline DBus::MessageIter &operator >> (DBus::MessageIter &iter, std::map<K,V>& val)
|
||||
{
|
||||
if(!iter.is_dict())
|
||||
if (!iter.is_dict())
|
||||
throw DBus::ErrorInvalidArgs("dictionary value expected");
|
||||
|
||||
DBus::MessageIter mit = iter.recurse();
|
||||
|
||||
while(!mit.at_end())
|
||||
while (!mit.at_end())
|
||||
{
|
||||
K key; V value;
|
||||
|
||||
|
|
@ -499,7 +499,7 @@ template <
|
|||
typename T7,
|
||||
typename T8
|
||||
>
|
||||
inline DBus::MessageIter& operator >> ( DBus::MessageIter& iter, DBus::Struct<T1,T2,T3,T4,T5,T6,T7,T8>& val)
|
||||
inline DBus::MessageIter &operator >> (DBus::MessageIter &iter, DBus::Struct<T1,T2,T3,T4,T5,T6,T7,T8>& val)
|
||||
{
|
||||
DBus::MessageIter sit = iter.recurse();
|
||||
|
||||
|
|
@ -508,7 +508,7 @@ inline DBus::MessageIter& operator >> ( DBus::MessageIter& iter, DBus::Struct<T1
|
|||
return ++iter;
|
||||
}
|
||||
|
||||
extern DXXAPI DBus::MessageIter& operator >> ( DBus::MessageIter& iter, DBus::Variant& val );
|
||||
extern DXXAPI DBus::MessageIter &operator >> (DBus::MessageIter &iter, DBus::Variant &val);
|
||||
|
||||
#endif//__DBUSXX_TYPES_H
|
||||
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ public:
|
|||
(*__ref) = 1;
|
||||
}
|
||||
|
||||
RefCnt( const RefCnt& rc )
|
||||
RefCnt(const RefCnt &rc)
|
||||
{
|
||||
__ref = rc.__ref;
|
||||
ref();
|
||||
|
|
@ -59,7 +59,7 @@ public:
|
|||
unref();
|
||||
}
|
||||
|
||||
RefCnt& operator = ( const RefCnt& ref )
|
||||
RefCnt &operator = (const RefCnt &ref)
|
||||
{
|
||||
ref.ref();
|
||||
unref();
|
||||
|
|
@ -87,12 +87,12 @@ private:
|
|||
{
|
||||
-- (*__ref);
|
||||
|
||||
if( (*__ref) < 0 )
|
||||
if ((*__ref) < 0)
|
||||
{
|
||||
debug_log("%p: refcount dropped below zero!", __ref);
|
||||
}
|
||||
|
||||
if( noref() )
|
||||
if (noref())
|
||||
{
|
||||
delete __ref;
|
||||
}
|
||||
|
|
@ -112,15 +112,15 @@ class RefPtrI // RefPtr to incomplete type
|
|||
{
|
||||
public:
|
||||
|
||||
RefPtrI( T* ptr = 0 );
|
||||
RefPtrI(T *ptr = 0);
|
||||
|
||||
~RefPtrI();
|
||||
|
||||
RefPtrI& operator = ( const RefPtrI& ref )
|
||||
RefPtrI &operator = (const RefPtrI &ref)
|
||||
{
|
||||
if( this != &ref )
|
||||
if (this != &ref)
|
||||
{
|
||||
if(__cnt.one()) delete __ptr;
|
||||
if (__cnt.one()) delete __ptr;
|
||||
|
||||
__ptr = ref.__ptr;
|
||||
__cnt = ref.__cnt;
|
||||
|
|
@ -128,28 +128,28 @@ public:
|
|||
return *this;
|
||||
}
|
||||
|
||||
T& operator *() const
|
||||
T &operator *() const
|
||||
{
|
||||
return *__ptr;
|
||||
}
|
||||
|
||||
T* operator ->() const
|
||||
T *operator ->() const
|
||||
{
|
||||
if(__cnt.noref()) return 0;
|
||||
if (__cnt.noref()) return 0;
|
||||
|
||||
return __ptr;
|
||||
}
|
||||
|
||||
T* get() const
|
||||
T *get() const
|
||||
{
|
||||
if(__cnt.noref()) return 0;
|
||||
if (__cnt.noref()) return 0;
|
||||
|
||||
return __ptr;
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
T* __ptr;
|
||||
T *__ptr;
|
||||
RefCnt __cnt;
|
||||
};
|
||||
|
||||
|
|
@ -158,20 +158,20 @@ class RefPtr
|
|||
{
|
||||
public:
|
||||
|
||||
RefPtr( T* ptr = 0)
|
||||
RefPtr(T *ptr = 0)
|
||||
: __ptr(ptr)
|
||||
{}
|
||||
|
||||
~RefPtr()
|
||||
{
|
||||
if(__cnt.one()) delete __ptr;
|
||||
if (__cnt.one()) delete __ptr;
|
||||
}
|
||||
|
||||
RefPtr& operator = ( const RefPtr& ref )
|
||||
RefPtr &operator = (const RefPtr &ref)
|
||||
{
|
||||
if( this != &ref )
|
||||
if (this != &ref)
|
||||
{
|
||||
if(__cnt.one()) delete __ptr;
|
||||
if (__cnt.one()) delete __ptr;
|
||||
|
||||
__ptr = ref.__ptr;
|
||||
__cnt = ref.__cnt;
|
||||
|
|
@ -179,28 +179,28 @@ public:
|
|||
return *this;
|
||||
}
|
||||
|
||||
T& operator *() const
|
||||
T &operator *() const
|
||||
{
|
||||
return *__ptr;
|
||||
}
|
||||
|
||||
T* operator ->() const
|
||||
T *operator ->() const
|
||||
{
|
||||
if(__cnt.noref()) return 0;
|
||||
if (__cnt.noref()) return 0;
|
||||
|
||||
return __ptr;
|
||||
}
|
||||
|
||||
T* get() const
|
||||
T *get() const
|
||||
{
|
||||
if(__cnt.noref()) return 0;
|
||||
if (__cnt.noref()) return 0;
|
||||
|
||||
return __ptr;
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
T* __ptr;
|
||||
T *__ptr;
|
||||
RefCnt __cnt;
|
||||
};
|
||||
|
||||
|
|
@ -213,7 +213,7 @@ class Callback_Base
|
|||
{
|
||||
public:
|
||||
|
||||
virtual R call( P param ) const = 0;
|
||||
virtual R call(P param) const = 0;
|
||||
|
||||
virtual ~Callback_Base()
|
||||
{}
|
||||
|
|
@ -224,21 +224,21 @@ class Slot
|
|||
{
|
||||
public:
|
||||
|
||||
Slot& operator = ( Callback_Base<R,P>* s )
|
||||
Slot &operator = (Callback_Base<R,P>* s)
|
||||
{
|
||||
_cb = s;
|
||||
|
||||
return *this;
|
||||
}
|
||||
|
||||
R operator()( P param ) const
|
||||
R operator()(P param) const
|
||||
{
|
||||
/*if(_cb.get())*/ return _cb->call(param);
|
||||
/*if (_cb.get())*/ return _cb->call(param);
|
||||
}
|
||||
|
||||
R call( P param ) const
|
||||
R call(P param) const
|
||||
{
|
||||
/*if(_cb.get())*/ return _cb->call(param);
|
||||
/*if (_cb.get())*/ return _cb->call(param);
|
||||
}
|
||||
|
||||
bool empty()
|
||||
|
|
@ -258,18 +258,18 @@ public:
|
|||
|
||||
typedef R (C::*M)(P);
|
||||
|
||||
Callback( C* c, M m )
|
||||
Callback(C *c, M m)
|
||||
: _c(c), _m(m)
|
||||
{}
|
||||
|
||||
R call( P param ) const
|
||||
R call(P param) const
|
||||
{
|
||||
/*if(_c)*/ return (_c->*_m)(param);
|
||||
/*if (_c)*/ return (_c->*_m)(param);
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
C* _c; M _m;
|
||||
C *_c; M _m;
|
||||
};
|
||||
|
||||
} /* namespace DBus */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue