diff options
| author | Johannes Schanda <schanda@itestra.de> | 2013-05-06 12:09:13 +0200 |
|---|---|---|
| committer | Gerrit Code Review <qqmthk1@lpmodthk02.bmwgroup.net> | 2013-05-06 12:09:13 +0200 |
| commit | c3591ae0ec83dda28b38a9a750e9599647431ebf (patch) | |
| tree | 596ff90835b61a23197e713b71e22247dbf91823 | |
| parent | c3996fe7181c6b16154fe8cc8fb441a911154794 (diff) | |
| parent | ccadba77bb9e091ee7534880a81b7407a0eb4c54 (diff) | |
| download | genivi-common-api-dbus-runtime-c3591ae0ec83dda28b38a9a750e9599647431ebf.tar.gz | |
Merge "D-Bus Mainloop Context now only requires a DBusConnection, no longer a DBusProxyConnection."
| -rw-r--r-- | src/CommonAPI/DBus/DBusMainLoopContext.cpp | 2 | ||||
| -rw-r--r-- | src/CommonAPI/DBus/DBusMainLoopContext.h | 6 | ||||
| -rw-r--r-- | src/CommonAPI/DBus/DBusProxyConnection.h | 3 |
3 files changed, 4 insertions, 7 deletions
diff --git a/src/CommonAPI/DBus/DBusMainLoopContext.cpp b/src/CommonAPI/DBus/DBusMainLoopContext.cpp index 0a0908c..9b9c57c 100644 --- a/src/CommonAPI/DBus/DBusMainLoopContext.cpp +++ b/src/CommonAPI/DBus/DBusMainLoopContext.cpp @@ -17,7 +17,7 @@ namespace CommonAPI { namespace DBus { -DBusDispatchSource::DBusDispatchSource(DBusProxyConnection* dbusConnection): +DBusDispatchSource::DBusDispatchSource(DBusConnection* dbusConnection): dbusConnection_(dbusConnection) { } diff --git a/src/CommonAPI/DBus/DBusMainLoopContext.h b/src/CommonAPI/DBus/DBusMainLoopContext.h index f158758..8558527 100644 --- a/src/CommonAPI/DBus/DBusMainLoopContext.h +++ b/src/CommonAPI/DBus/DBusMainLoopContext.h @@ -20,13 +20,13 @@ namespace CommonAPI { namespace DBus { -class DBusProxyConnection; +class DBusConnection; class DBusDispatchSource: public DispatchSource { public: - DBusDispatchSource(DBusProxyConnection* dbusConnection); + DBusDispatchSource(DBusConnection* dbusConnection); ~DBusDispatchSource(); bool prepare(int64_t& timeout); @@ -34,7 +34,7 @@ class DBusDispatchSource: public DispatchSource { bool dispatch(); private: - DBusProxyConnection* dbusConnection_; + DBusConnection* dbusConnection_; }; class DBusWatch: public Watch { diff --git a/src/CommonAPI/DBus/DBusProxyConnection.h b/src/CommonAPI/DBus/DBusProxyConnection.h index f47c700..19140f2 100644 --- a/src/CommonAPI/DBus/DBusProxyConnection.h +++ b/src/CommonAPI/DBus/DBusProxyConnection.h @@ -92,9 +92,6 @@ class DBusProxyConnection { virtual const std::shared_ptr<DBusServiceRegistry> getDBusServiceRegistry() = 0; virtual const std::shared_ptr<DBusObjectManager> getDBusObjectManager() = 0; - virtual bool isDispatchReady() = 0; - virtual bool singleDispatch() = 0; - virtual void registerObjectPath(const std::string& objectPath) = 0; virtual void unregisterObjectPath(const std::string& objectPath) = 0; |