Merge branch 'master' of ssh://drop.maemo.org/git/vicar

[vicar] / src / vicar-telepathy / cpp / connectioninterfacerequestsadaptor.cpp

diff --git a/src/vicar-telepathy/cpp/connectioninterfacerequestsadaptor.cpp b/src/vicar-telepathy/cpp/connectioninterfacerequestsadaptor.cpp
index e463ad9..a664283 100644 (file)
--- a/src/vicar-telepathy/cpp/connectioninterfacerequestsadaptor.cpp
+++ b/src/vicar-telepathy/cpp/connectioninterfacerequestsadaptor.cpp
@@ -9,8 +9,6 @@
  */
 
 #include "connectioninterfacerequestsadaptor.h"
-#include "connectioninterfacerequeststypes.h"
-#include "connection.h"
 #include <QtCore/QMetaObject>
 #include <QtCore/QByteArray>
 #include <QtCore/QList>
@@ -51,14 +49,22 @@ org::freedesktop::Telepathy::RequestableChannelClassList ConnectionInterfaceRequ
 QDBusObjectPath ConnectionInterfaceRequestsAdaptor::CreateChannel(const QVariantMap &request, QVariantMap &channel_properties)
 {
     // handle method call org.freedesktop.Telepathy.Connection.Interface.Requests.CreateChannel
+<<<<<<< HEAD
     //This method should return a Channel object path
     return static_cast<Connection *>(parent())->CreateChannel(request, channel_properties);
+=======
+    //return static_cast<YourObjectType *>(parent())->CreateChannel(request, channel_properties);
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
 }
 
 bool ConnectionInterfaceRequestsAdaptor::EnsureChannel(const QVariantMap &request, QDBusObjectPath &channel_object, QVariantMap &channel_properties)
 {
     // handle method call org.freedesktop.Telepathy.Connection.Interface.Requests.EnsureChannel
+<<<<<<< HEAD
     //This method should return a Channel object path
     return static_cast<Connection *>(parent())->EnsureChannel(request, channel_object, channel_properties);
+=======
+    //return static_cast<YourObjectType *>(parent())->EnsureChannel(request, channel_object, channel_properties);
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
 }