Index: dbus/message.h |
=================================================================== |
--- dbus/message.h (revision 121922) |
+++ dbus/message.h (working copy) |
@@ -11,7 +11,6 @@ |
#include <dbus/dbus.h> |
#include "base/basictypes.h" |
-#include "dbus/object_path.h" |
namespace google { |
namespace protobuf { |
@@ -81,7 +80,7 @@ |
// Sets the destination, the path, the interface, the member, etc. |
void SetDestination(const std::string& destination); |
- void SetPath(const ObjectPath& path); |
+ void SetPath(const std::string& path); |
void SetInterface(const std::string& interface); |
void SetMember(const std::string& member); |
void SetErrorName(const std::string& error_name); |
@@ -93,7 +92,7 @@ |
// Gets the destination, the path, the interface, the member, etc. |
// If not set, an empty string is returned. |
std::string GetDestination(); |
- ObjectPath GetPath(); |
+ std::string GetPath(); |
std::string GetInterface(); |
std::string GetMember(); |
std::string GetErrorName(); |
@@ -266,7 +265,7 @@ |
void AppendUint64(uint64 value); |
void AppendDouble(double value); |
void AppendString(const std::string& value); |
- void AppendObjectPath(const ObjectPath& value); |
+ void AppendObjectPath(const std::string& value); |
// Opens an array. The array contents can be added to the array with |
// |sub_writer|. The client code must close the array with |
@@ -303,7 +302,7 @@ |
// Appends the array of object paths. Arrays of object paths are often |
// used when exchanging object paths, hence it's worth having a |
// specialized function. |
- void AppendArrayOfObjectPaths(const std::vector<ObjectPath>& object_paths); |
+ void AppendArrayOfObjectPaths(const std::vector<std::string>& object_paths); |
// Appends the protocol buffer as an array of bytes. The buffer is serialized |
// into an array of bytes before communication, since protocol buffers are not |
@@ -327,7 +326,7 @@ |
void AppendVariantOfUint64(uint64 value); |
void AppendVariantOfDouble(double value); |
void AppendVariantOfString(const std::string& value); |
- void AppendVariantOfObjectPath(const ObjectPath& value); |
+ void AppendVariantOfObjectPath(const std::string& value); |
private: |
// Helper function used to implement AppendByte etc. |
@@ -375,7 +374,7 @@ |
bool PopUint64(uint64* value); |
bool PopDouble(double* value); |
bool PopString(std::string* value); |
- bool PopObjectPath(ObjectPath* value); |
+ bool PopObjectPath(std::string* value); |
// Sets up the given message reader to read an array at the current |
// iterator position. |
@@ -410,7 +409,7 @@ |
// Arrays of object paths are often used to communicate with D-Bus |
// services like NetworkManager, hence it's worth having a specialized |
// function. |
- bool PopArrayOfObjectPaths(std::vector<ObjectPath>* object_paths); |
+ bool PopArrayOfObjectPaths(std::vector<std::string>* object_paths); |
// Gets the array of bytes at the current iterator position. It then parses |
// this binary blob into the protocol buffer supplied. |
@@ -437,7 +436,7 @@ |
bool PopVariantOfUint64(uint64* value); |
bool PopVariantOfDouble(double* value); |
bool PopVariantOfString(std::string* value); |
- bool PopVariantOfObjectPath(ObjectPath* value); |
+ bool PopVariantOfObjectPath(std::string* value); |
// Get the data type of the value at the current iterator |
// position. INVALID_DATA will be returned if the iterator points to the |