jeena/dbus-cplusplus
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

sync from fd.orf

Browse source
This commit is contained in:
Andreas Volz 2009-11-16 22:14:08 +01:00
parent a2f2b93e36
commit d55e70a385
26 changed files with 186 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

120
include/dbus-c++/error.h
View file

@ -72,211 +72,211 @@ private:
struct DXXAPI ErrorFailed : public Error
{
ErrorFailed(const char *msg)
: Error("org.freedesktop.DBus.Error.Failed", msg)
ErrorFailed(const char *message)
: Error("org.freedesktop.DBus.Error.Failed", message)
{}
};
struct DXXAPI ErrorNoMemory : public Error
{
ErrorNoMemory(const char *msg)
: Error("org.freedesktop.DBus.Error.NoMemory", msg)
ErrorNoMemory(const char *message)
: Error("org.freedesktop.DBus.Error.NoMemory", message)
{}
};
struct DXXAPI ErrorServiceUnknown : public Error
{
ErrorServiceUnknown(const char *msg)
: Error("org.freedesktop.DBus.Error.ServiceUnknown", msg)
ErrorServiceUnknown(const char *message)
: Error("org.freedesktop.DBus.Error.ServiceUnknown", message)
{}
};
struct DXXAPI ErrorNameHasNoOwner : public Error
{
ErrorNameHasNoOwner(const char *msg)
: Error("org.freedesktop.DBus.Error.NameHasNoOwner", msg)
ErrorNameHasNoOwner(const char *message)
: Error("org.freedesktop.DBus.Error.NameHasNoOwner", message)
{}
};
struct DXXAPI ErrorNoReply : public Error
{
ErrorNoReply(const char *msg)
: Error("org.freedesktop.DBus.Error.NoReply", msg)
ErrorNoReply(const char *message)
: Error("org.freedesktop.DBus.Error.NoReply", message)
{}
};
struct DXXAPI ErrorIOError : public Error
{
ErrorIOError(const char *msg)
: Error("org.freedesktop.DBus.Error.IOError", msg)
ErrorIOError(const char *message)
: Error("org.freedesktop.DBus.Error.IOError", message)
{}
};
struct DXXAPI ErrorBadAddress : public Error
{
ErrorBadAddress(const char *msg)
: Error("org.freedesktop.DBus.Error.BadAddress", msg)
ErrorBadAddress(const char *message)
: Error("org.freedesktop.DBus.Error.BadAddress", message)
{}
};
struct DXXAPI ErrorNotSupported : public Error
{
ErrorNotSupported(const char *msg)
: Error("org.freedesktop.DBus.Error.NotSupported", msg)
ErrorNotSupported(const char *message)
: Error("org.freedesktop.DBus.Error.NotSupported", message)
{}
};
struct DXXAPI ErrorLimitsExceeded : public Error
{
ErrorLimitsExceeded(const char *msg)
: Error("org.freedesktop.DBus.Error.LimitsExceeded", msg)
ErrorLimitsExceeded(const char *message)
: Error("org.freedesktop.DBus.Error.LimitsExceeded", message)
{}
};
struct DXXAPI ErrorAccessDenied : public Error
{
ErrorAccessDenied(const char *msg)
: Error("org.freedesktop.DBus.Error.AccessDenied", msg)
ErrorAccessDenied(const char *message)
: Error("org.freedesktop.DBus.Error.AccessDenied", message)
{}
};
struct DXXAPI ErrorAuthFailed : public Error
{
ErrorAuthFailed(const char *msg)
: Error("org.freedesktop.DBus.Error.AuthFailed", msg)
ErrorAuthFailed(const char *message)
: Error("org.freedesktop.DBus.Error.AuthFailed", message)
{}
};
struct DXXAPI ErrorNoServer : public Error
{
ErrorNoServer(const char *msg)
: Error("org.freedesktop.DBus.Error.NoServer", msg)
ErrorNoServer(const char *message)
: Error("org.freedesktop.DBus.Error.NoServer", message)
{}
};
struct DXXAPI ErrorTimeout : public Error
{
ErrorTimeout(const char *msg)
: Error("org.freedesktop.DBus.Error.Timeout", msg)
ErrorTimeout(const char *message)
: Error("org.freedesktop.DBus.Error.Timeout", message)
{}
};
struct DXXAPI ErrorNoNetwork : public Error
{
ErrorNoNetwork(const char *msg)
: Error("org.freedesktop.DBus.Error.NoNetwork", msg)
ErrorNoNetwork(const char *message)
: Error("org.freedesktop.DBus.Error.NoNetwork", message)
{}
};
struct DXXAPI ErrorAddressInUse : public Error
{
ErrorAddressInUse(const char *msg)
: Error("org.freedesktop.DBus.Error.AddressInUse", msg)
ErrorAddressInUse(const char *message)
: Error("org.freedesktop.DBus.Error.AddressInUse", message)
{}
};
struct DXXAPI ErrorDisconnected : public Error
{
ErrorDisconnected(const char *msg)
: Error("org.freedesktop.DBus.Error.Disconnected", msg)
ErrorDisconnected(const char *message)
: Error("org.freedesktop.DBus.Error.Disconnected", message)
{}
};
struct DXXAPI ErrorInvalidArgs : public Error
{
ErrorInvalidArgs(const char *msg)
: Error("org.freedesktop.DBus.Error.InvalidArgs", msg)
ErrorInvalidArgs(const char *message)
: Error("org.freedesktop.DBus.Error.InvalidArgs", message)
{}
};
struct DXXAPI ErrorFileNotFound : public Error
{
ErrorFileNotFound(const char *msg)
: Error("org.freedesktop.DBus.Error.FileNotFound", msg)
ErrorFileNotFound(const char *message)
: Error("org.freedesktop.DBus.Error.FileNotFound", message)
{}
};
struct DXXAPI ErrorUnknownMethod : public Error
{
ErrorUnknownMethod(const char *msg)
: Error("org.freedesktop.DBus.Error.UnknownMethod", msg)
ErrorUnknownMethod(const char *message)
: Error("org.freedesktop.DBus.Error.UnknownMethod", message)
{}
};
struct DXXAPI ErrorTimedOut : public Error
{
ErrorTimedOut(const char *msg)
: Error("org.freedesktop.DBus.Error.TimedOut", msg)
ErrorTimedOut(const char *message)
: Error("org.freedesktop.DBus.Error.TimedOut", message)
{}
};
struct DXXAPI ErrorMatchRuleNotFound : public Error
{
ErrorMatchRuleNotFound(const char *msg)
: Error("org.freedesktop.DBus.Error.MatchRuleNotFound", msg)
ErrorMatchRuleNotFound(const char *message)
: Error("org.freedesktop.DBus.Error.MatchRuleNotFound", message)
{}
};
struct DXXAPI ErrorMatchRuleInvalid : public Error
{
ErrorMatchRuleInvalid(const char *msg)
: Error("org.freedesktop.DBus.Error.MatchRuleInvalid", msg)
ErrorMatchRuleInvalid(const char *message)
: Error("org.freedesktop.DBus.Error.MatchRuleInvalid", message)
{}
};
struct DXXAPI ErrorSpawnExecFailed : public Error
{
ErrorSpawnExecFailed(const char *msg)
: Error("org.freedesktop.DBus.Error.Spawn.ExecFailed", msg)
ErrorSpawnExecFailed(const char *message)
: Error("org.freedesktop.DBus.Error.Spawn.ExecFailed", message)
{}
};
struct DXXAPI ErrorSpawnForkFailed : public Error
{
ErrorSpawnForkFailed(const char *msg)
: Error("org.freedesktop.DBus.Error.Spawn.ForkFailed", msg)
ErrorSpawnForkFailed(const char *message)
: Error("org.freedesktop.DBus.Error.Spawn.ForkFailed", message)
{}
};
struct DXXAPI ErrorSpawnChildExited : public Error
{
ErrorSpawnChildExited(const char *msg)
: Error("org.freedesktop.DBus.Error.Spawn.ChildExited", msg)
ErrorSpawnChildExited(const char *message)
: Error("org.freedesktop.DBus.Error.Spawn.ChildExited", message)
{}
};
struct DXXAPI ErrorSpawnChildSignaled : public Error
{
ErrorSpawnChildSignaled(const char *msg)
: Error("org.freedesktop.DBus.Error.Spawn.ChildSignaled", msg)
ErrorSpawnChildSignaled(const char *message)
: Error("org.freedesktop.DBus.Error.Spawn.ChildSignaled", message)
{}
};
struct DXXAPI ErrorSpawnFailed : public Error
{
ErrorSpawnFailed(const char *msg)
: Error("org.freedesktop.DBus.Error.Spawn.Failed", msg)
ErrorSpawnFailed(const char *message)
: Error("org.freedesktop.DBus.Error.Spawn.Failed", message)
{}
};
struct DXXAPI ErrorInvalidSignature : public Error
{
ErrorInvalidSignature(const char *msg)
: Error("org.freedesktop.DBus.Error.InvalidSignature", msg)
ErrorInvalidSignature(const char *message)
: Error("org.freedesktop.DBus.Error.InvalidSignature", message)
{}
};
struct DXXAPI ErrorUnixProcessIdUnknown : public Error
{
ErrorUnixProcessIdUnknown(const char *msg)
: Error("org.freedesktop.DBus.Error.UnixProcessIdUnknown", msg)
ErrorUnixProcessIdUnknown(const char *message)
: Error("org.freedesktop.DBus.Error.UnixProcessIdUnknown", message)
{}
};
struct DXXAPI ErrorSELinuxSecurityContextUnknown : public Error
{
ErrorSELinuxSecurityContextUnknown(const char *msg)
: Error("org.freedesktop.DBus.Error.SELinuxSecurityContextUnknown", msg)
ErrorSELinuxSecurityContextUnknown(const char *message)
: Error("org.freedesktop.DBus.Error.SELinuxSecurityContextUnknown", message)
{}
};

11
include/dbus-c++/eventloop-integration.h
View file

@ -60,8 +60,17 @@ class DXXAPI BusDispatcher : public Dispatcher, public DefaultMainLoop
{
public:
int _pipe[2];
BusDispatcher() : _running(false)
{}
{
//pipe to create a new fd used to unlock a dispatcher at any
// moment (used by leave function)
pipe(_pipe);
_fdunlock[0] = _pipe[0];
_fdunlock[1] = _pipe[1];
}
~BusDispatcher()
{}

1
include/dbus-c++/eventloop.h
View file

@ -149,6 +149,7 @@ public:
virtual void dispatch();
int _fdunlock[2];
private:
DefaultMutex _mutex_t;

2
include/dbus-c++/interface.h
View file

@ -143,7 +143,7 @@ public:
void set_property(const std::string &name, Variant &value);
virtual const IntrospectedInterface * introspect() const
virtual IntrospectedInterface *const introspect() const
{
return NULL;
}

2
include/dbus-c++/introspection.h
View file

@ -69,7 +69,7 @@ public:
protected:
const IntrospectedInterface * introspect() const;
IntrospectedInterface *const introspect() const;
};
class DXXAPI IntrospectableProxy : public InterfaceProxy

2
include/dbus-c++/message.h
View file

@ -137,7 +137,7 @@ public:
private:
DXXAPILOCAL MessageIter(Message &m) : _msg(&m) {}
DXXAPILOCAL MessageIter(Message &msg) : _msg(&msg) {}
DXXAPILOCAL bool append_basic(int type_id, void *value);

2
include/dbus-c++/property.h
View file

@ -82,7 +82,7 @@ protected:
virtual void on_set_property(InterfaceAdaptor &/*interface*/, const std::string &/*property*/, const Variant &/*value*/)
{}
const IntrospectedInterface *introspect() const;
IntrospectedInterface *const introspect() const;
};
class DXXAPI PropertiesProxy : public InterfaceProxy

2
include/dbus-c++/server.h
View file

@ -59,7 +59,7 @@ public:
protected:
Server(const Server &)
Server(const Server &s)
{}
virtual void on_new_connection(Connection &c) = 0;

6
include/dbus-c++/util.h
View file

@ -55,11 +55,11 @@ public:
unref();
}
RefCnt &operator = (const RefCnt &rc)
RefCnt &operator = (const RefCnt &ref)
{
rc.ref();
ref.ref();
unref();
__ref = rc.__ref;
__ref = ref.__ref;
return *this;
}