telepathy-qt: dbus-tubes: Fix documentation

[Dario Freddi]

Module: telepathy-qt
Branch: master
Commit: 317c86af80dbe1184afd4e22a029c254c4d4b36d
URL:    http://cgit.freedesktop.org/telepathy/telepathy-qt/commit/?id=317c86af80dbe1184afd4e22a029c254c4d4b36d

Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Sat Mar 31 13:50:50 2012 +0200

dbus-tubes: Fix documentation

---

 TelepathyQt/dbus-tube-channel.cpp            |   10 +++-------
 TelepathyQt/pending-dbus-tube-connection.cpp |    2 +-
 TelepathyQt/pending-dbus-tube.cpp            |    2 +-
 TelepathyQt/pending-dbus-tube.h              |    2 +-
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/TelepathyQt/dbus-tube-channel.cpp b/TelepathyQt/dbus-tube-channel.cpp
index 0a17392..86c6eb3 100644
--- a/TelepathyQt/dbus-tube-channel.cpp
+++ b/TelepathyQt/dbus-tube-channel.cpp
@@ -158,12 +158,8 @@ void DBusTubeChannel::Private::introspectDBusTube(DBusTubeChannel::Private *self
 
 /**
  * \class DBusTubeChannel
-<<<<<<< HEAD
- * \headerfile TelepathyQt/stream-tube-channel.h <TelepathyQt/DBusTubeChannel>
-=======
  * \ingroup clientchannel
- * \headerfile TelepathyQt4/dbus-tube-channel.h <TelepathyQt4/DBusTubeChannel>
->>>>>>> 523c3c3... dbus-tubes: Update and improve the API documentation
+ * \headerfile TelepathyQt/stream-tube-channel.h <TelepathyQt/DBusTubeChannel>
  *
  * \brief The DBusTubeChannel class represents a Telepathy channel of type DBusTube.
  *
@@ -268,11 +264,11 @@ QString DBusTubeChannel::serviceName() const
  *
  * This method is useful only if your appliance is really security-sensitive:
  * in general, this restriction is always enabled by default on all tubes offered
- * or accepted from Telepathy-Qt4, falling back to a general connection allowance
+ * or accepted from Telepathy-Qt, falling back to a general connection allowance
  * if this feature is not available.
  *
  * If your application does not have specific needs regarding DBus credentials,
- * you can trust Telepathy-Qt4 to do the right thing - in any case, the most secure
+ * you can trust Telepathy-Qt to do the right thing - in any case, the most secure
  * method available will be used by default.
  *
  * This method requires DBusTubeChannel::FeatureCore to be enabled.
diff --git a/TelepathyQt/pending-dbus-tube-connection.cpp b/TelepathyQt/pending-dbus-tube-connection.cpp
index 4257272..2e9f19e 100644
--- a/TelepathyQt/pending-dbus-tube-connection.cpp
+++ b/TelepathyQt/pending-dbus-tube-connection.cpp
@@ -60,7 +60,7 @@ PendingDBusTubeConnection::Private::~Private()
 /**
  * \class PendingDBusTubeConnection
  * \ingroup clientchannel
- * \headerfile TelepathyQt4/pending-dbus-tube-connection.h <TelepathyQt4/PendingDBusTubeConnection>
+ * \headerfile TelepathyQt/pending-dbus-tube-connection.h <TelepathyQt/PendingDBusTubeConnection>
  *
  * A pending operation for accepting or offering a DBus tube
  *
diff --git a/TelepathyQt/pending-dbus-tube.cpp b/TelepathyQt/pending-dbus-tube.cpp
index e3c85be..1b5e1bf 100644
--- a/TelepathyQt/pending-dbus-tube.cpp
+++ b/TelepathyQt/pending-dbus-tube.cpp
@@ -1,5 +1,5 @@
 /*
- * This file is part of TelepathyQt4
+ * This file is part of TelepathyQt
  *
  * Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/>
  *
diff --git a/TelepathyQt/pending-dbus-tube.h b/TelepathyQt/pending-dbus-tube.h
index bebb2ef..b6f3e3f 100644
--- a/TelepathyQt/pending-dbus-tube.h
+++ b/TelepathyQt/pending-dbus-tube.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of TelepathyQt4
+ * This file is part of TelepathyQt
  *
  * Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/>
  *