From ccadba77bb9e091ee7534880a81b7407a0eb4c54 Mon Sep 17 00:00:00 2001
From: Philip Rauwolf <rauwolf@itestra.de>
Date: Thu, 18 Apr 2013 16:26:49 +0200
Subject: D-Bus Mainloop Context now only requires a DBusConnection, no longer
 a DBusProxyConnection.

Change-Id: Ic93aa97117cbb29ef0fcf467e7df6a0bbf818140
---
 src/CommonAPI/DBus/DBusMainLoopContext.cpp | 2 +-
 src/CommonAPI/DBus/DBusMainLoopContext.h   | 6 +++---
 src/CommonAPI/DBus/DBusProxyConnection.h   | 3 ---
 3 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'src')

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;
 
-- 
cgit v1.2.1