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

Merge branch 'master' of git://anongit.freedesktop.org/git/dbus/dbus-c++

Browse source 
Merge branch 'master' of git://anongit.freedesktop.org/git/dbus/dbus-c++

Conflicts:

	include/dbus-c++/connection.h
	include/dbus-c++/dispatcher.h
	include/dbus-c++/pendingcall.h
	src/dispatcher.cpp
This commit is contained in:
Andreas Volz 2008-08-14 23:59:23 +02:00
commit c1970e2352
57 changed files with 1642 additions and 1638 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/error.cpp
View file

@ -43,17 +43,17 @@ Error::Error()
: _int(new InternalError)
{}
Error::Error(InternalError& i)
Error::Error(InternalError &i)
: _int(new InternalError(i))
{}
Error::Error( const char* name, const char* message )
Error::Error(const char *name, const char *message)
: _int(new InternalError)
{
set(name, message);
}
Error::Error( Message& m )
Error::Error(Message &m)
: _int(new InternalError)
{
dbus_set_error_from_message(&(_int->error), m._pvt->msg);
@ -63,12 +63,12 @@ Error::~Error() throw()
{
}
const char* Error::name() const
const char *Error::name() const
{
return _int->error.name;
}
const char* Error::message() const
const char *Error::message() const
{
return _int->error.message;
}
@ -78,12 +78,12 @@ bool Error::is_set() const
return *(_int);
}
void Error::set( const char* name, const char* message )
void Error::set(const char *name, const char *message)
{
dbus_set_error_const(&(_int->error), name, message);
}
const char* Error::what() const throw()
const char *Error::what() const throw()
{
return _int->error.message;
}