diff options
Diffstat (limited to 'dbus/message.h')
| -rw-r--r-- | dbus/message.h | 74 |
1 files changed, 38 insertions, 36 deletions
diff --git a/dbus/message.h b/dbus/message.h index 780e6c5b46..7dffe0e0f6 100644 --- a/dbus/message.h +++ b/dbus/message.h @@ -5,11 +5,13 @@ #ifndef DBUS_MESSAGE_H_ #define DBUS_MESSAGE_H_ +#include <dbus/dbus.h> +#include <stddef.h> +#include <stdint.h> #include <string> #include <vector> -#include <dbus/dbus.h> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "dbus/dbus_export.h" #include "dbus/file_descriptor.h" @@ -99,8 +101,8 @@ class CHROME_DBUS_EXPORT Message { bool SetMember(const std::string& member); bool SetErrorName(const std::string& error_name); bool SetSender(const std::string& sender); - void SetSerial(uint32 serial); - void SetReplySerial(uint32 reply_serial); + void SetSerial(uint32_t serial); + void SetReplySerial(uint32_t reply_serial); // SetSignature() does not exist as we cannot do it. // Gets the destination, the path, the interface, the member, etc. @@ -113,8 +115,8 @@ class CHROME_DBUS_EXPORT Message { std::string GetSender(); std::string GetSignature(); // Gets the serial and reply serial numbers. Returns 0 if not set. - uint32 GetSerial(); - uint32 GetReplySerial(); + uint32_t GetSerial(); + uint32_t GetReplySerial(); // Returns the string representation of this message. Useful for // debugging. The output is truncated as needed (ex. strings are truncated @@ -270,14 +272,14 @@ class CHROME_DBUS_EXPORT MessageWriter { ~MessageWriter(); // Appends a byte to the message. - void AppendByte(uint8 value); + void AppendByte(uint8_t value); void AppendBool(bool value); - void AppendInt16(int16 value); - void AppendUint16(uint16 value); - void AppendInt32(int32 value); - void AppendUint32(uint32 value); - void AppendInt64(int64 value); - void AppendUint64(uint64 value); + void AppendInt16(int16_t value); + void AppendUint16(uint16_t value); + void AppendInt32(int32_t value); + void AppendUint32(uint32_t value); + void AppendInt64(int64_t value); + void AppendUint64(uint64_t value); void AppendDouble(double value); void AppendString(const std::string& value); void AppendObjectPath(const ObjectPath& value); @@ -308,7 +310,7 @@ class CHROME_DBUS_EXPORT MessageWriter { // Appends the array of bytes. Arrays of bytes are often used for // exchanging binary blobs hence it's worth having a specialized // function. - void AppendArrayOfBytes(const uint8* values, size_t length); + void AppendArrayOfBytes(const uint8_t* values, size_t length); // Appends the array of strings. Arrays of strings are often used for // exchanging lists of names hence it's worth having a specialized @@ -332,14 +334,14 @@ class CHROME_DBUS_EXPORT MessageWriter { // widely used in D-Bus services so it's worth having a specialized // function. For instance, The third parameter of // "org.freedesktop.DBus.Properties.Set" is a variant. - void AppendVariantOfByte(uint8 value); + void AppendVariantOfByte(uint8_t value); void AppendVariantOfBool(bool value); - void AppendVariantOfInt16(int16 value); - void AppendVariantOfUint16(uint16 value); - void AppendVariantOfInt32(int32 value); - void AppendVariantOfUint32(uint32 value); - void AppendVariantOfInt64(int64 value); - void AppendVariantOfUint64(uint64 value); + void AppendVariantOfInt16(int16_t value); + void AppendVariantOfUint16(uint16_t value); + void AppendVariantOfInt32(int32_t value); + void AppendVariantOfUint32(uint32_t value); + void AppendVariantOfInt64(int64_t value); + void AppendVariantOfUint64(uint64_t value); void AppendVariantOfDouble(double value); void AppendVariantOfString(const std::string& value); void AppendVariantOfObjectPath(const ObjectPath& value); @@ -380,14 +382,14 @@ class CHROME_DBUS_EXPORT MessageReader { // Gets the byte at the current iterator position. // Returns true and advances the iterator on success. // Returns false if the data type is not a byte. - bool PopByte(uint8* value); + bool PopByte(uint8_t* value); bool PopBool(bool* value); - bool PopInt16(int16* value); - bool PopUint16(uint16* value); - bool PopInt32(int32* value); - bool PopUint32(uint32* value); - bool PopInt64(int64* value); - bool PopUint64(uint64* value); + bool PopInt16(int16_t* value); + bool PopUint16(uint16_t* value); + bool PopInt32(int32_t* value); + bool PopUint32(uint32_t* value); + bool PopInt64(int64_t* value); + bool PopUint64(uint64_t* value); bool PopDouble(double* value); bool PopString(std::string* value); bool PopObjectPath(ObjectPath* value); @@ -411,7 +413,7 @@ class CHROME_DBUS_EXPORT MessageReader { // Ownership of the memory pointed to by |bytes| remains with the // MessageReader; |bytes| must be copied if the contents will be referenced // after the MessageReader is destroyed. - bool PopArrayOfBytes(const uint8** bytes, size_t* length); + bool PopArrayOfBytes(const uint8_t** bytes, size_t* length); // Gets the array of strings at the current iterator position. |strings| is // cleared before being modified. Returns true and advances the iterator on @@ -446,14 +448,14 @@ class CHROME_DBUS_EXPORT MessageReader { // Variants are widely used in D-Bus services so it's worth having a // specialized function. For instance, The return value type of // "org.freedesktop.DBus.Properties.Get" is a variant. - bool PopVariantOfByte(uint8* value); + bool PopVariantOfByte(uint8_t* value); bool PopVariantOfBool(bool* value); - bool PopVariantOfInt16(int16* value); - bool PopVariantOfUint16(uint16* value); - bool PopVariantOfInt32(int32* value); - bool PopVariantOfUint32(uint32* value); - bool PopVariantOfInt64(int64* value); - bool PopVariantOfUint64(uint64* value); + bool PopVariantOfInt16(int16_t* value); + bool PopVariantOfUint16(uint16_t* value); + bool PopVariantOfInt32(int32_t* value); + bool PopVariantOfUint32(uint32_t* value); + bool PopVariantOfInt64(int64_t* value); + bool PopVariantOfUint64(uint64_t* value); bool PopVariantOfDouble(double* value); bool PopVariantOfString(std::string* value); bool PopVariantOfObjectPath(ObjectPath* value); |