diff options
| -rw-r--r-- | TelepathyQt/dbus-tube-channel.cpp | 12 | ||||
| -rw-r--r-- | TelepathyQt/dbus-tube-channel.h | 2 | ||||
| -rw-r--r-- | TelepathyQt/outgoing-dbus-tube-channel.cpp | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/TelepathyQt/dbus-tube-channel.cpp b/TelepathyQt/dbus-tube-channel.cpp index 78ee9a5a..a1ce5c42 100644 --- a/TelepathyQt/dbus-tube-channel.cpp +++ b/TelepathyQt/dbus-tube-channel.cpp @@ -53,7 +53,7 @@ DBusTubeChannel::Private::Private(DBusTubeChannel *parent) QStringList(), // dependsOnInterfaces (ReadinessHelper::IntrospectFunc) &Private::introspectBusNamesMonitoring, this); - introspectables[DBusTubeChannel::FeatureBusNamesMonitoring] = introspectableBusNamesMonitoring; + introspectables[DBusTubeChannel::FeatureBusNameMonitoring] = introspectableBusNamesMonitoring; readinessHelper->addIntrospectables(introspectables); } @@ -95,10 +95,10 @@ void DBusTubeChannel::Private::introspectBusNamesMonitoring(DBusTubeChannel::Pri parent->connect(dbusTubeInterface, SIGNAL(DBusNamesChanged(Tp::DBusTubeParticipants,Tp::UIntList)), parent, SLOT(onDBusNamesChanged(Tp::DBusTubeParticipants,Tp::UIntList))); } else { - warning() << "FeatureBusNamesMonitoring does not make sense in a P2P context"; + warning() << "FeatureBusNameMonitoring does not make sense in a P2P context"; } - self->readinessHelper->setIntrospectCompleted(DBusTubeChannel::FeatureBusNamesMonitoring, true); + self->readinessHelper->setIntrospectCompleted(DBusTubeChannel::FeatureBusNameMonitoring, true); } void DBusTubeChannel::Private::introspectDBusTube(DBusTubeChannel::Private *self) @@ -157,7 +157,7 @@ const Feature DBusTubeChannel::FeatureDBusTube = Feature(QLatin1String(DBusTubeC * * %busNamesChanged will be emitted when the participants of this tube change */ -const Feature DBusTubeChannel::FeatureBusNamesMonitoring = Feature(QLatin1String(DBusTubeChannel::staticMetaObject.className()), 1); +const Feature DBusTubeChannel::FeatureBusNameMonitoring = Feature(QLatin1String(DBusTubeChannel::staticMetaObject.className()), 1); /** * Create a new DBusTubeChannel channel. @@ -288,9 +288,9 @@ QString DBusTubeChannel::address() const */ QHash<ContactPtr, QString> DBusTubeChannel::busNames() const { - if (!isReady(FeatureBusNamesMonitoring)) { + if (!isReady(FeatureBusNameMonitoring)) { warning() << "DBusTubeChannel::busNames() used with " - "FeatureBusNamesMonitoring not ready"; + "FeatureBusNameMonitoring not ready"; return QHash<ContactPtr, QString>(); } diff --git a/TelepathyQt/dbus-tube-channel.h b/TelepathyQt/dbus-tube-channel.h index ecb235f4..699670ab 100644 --- a/TelepathyQt/dbus-tube-channel.h +++ b/TelepathyQt/dbus-tube-channel.h @@ -39,7 +39,7 @@ class TP_QT_EXPORT DBusTubeChannel : public TubeChannel public: static const Feature FeatureDBusTube; - static const Feature FeatureBusNamesMonitoring; + static const Feature FeatureBusNameMonitoring; static DBusTubeChannelPtr create(const ConnectionPtr &connection, const QString &objectPath, const QVariantMap &immutableProperties); diff --git a/TelepathyQt/outgoing-dbus-tube-channel.cpp b/TelepathyQt/outgoing-dbus-tube-channel.cpp index 9707496c..1911fa87 100644 --- a/TelepathyQt/outgoing-dbus-tube-channel.cpp +++ b/TelepathyQt/outgoing-dbus-tube-channel.cpp @@ -100,7 +100,7 @@ OutgoingDBusTubeChannel::Private::~Private() * * To learn more on how to use introspectable and features, please see \ref account_ready_sec. * - * You can also enable DBusTubeChannel::FeatureBusNamesMonitoring to monitor connections + * You can also enable DBusTubeChannel::FeatureBusNameMonitoring to monitor connections * to the tube. * * Once your object is ready, you can use offerTube to create a brand new DBus connection and offer |