telepathy-qt: dbus-tubes: Naming conventions: remove __k__
Dario Freddi
drf at kemper.freedesktop.org
Tue Jul 3 15:08:38 PDT 2012
Module: telepathy-qt
Branch: master
Commit: d064d2c2b31334c965c513b15551e3d0ef451f3e
URL: http://cgit.freedesktop.org/telepathy/telepathy-qt/commit/?id=d064d2c2b31334c965c513b15551e3d0ef451f3e
Author: Dario Freddi <dario.freddi at collabora.co.uk>
Date: Fri Jun 11 12:44:45 2010 +0200
dbus-tubes: Naming conventions: remove __k__
---
TelepathyQt/dbus-tube-channel-internal.h | 4 ++--
TelepathyQt/dbus-tube-channel.cpp | 8 ++++----
TelepathyQt/dbus-tube-channel.h | 4 ++--
TelepathyQt/incoming-dbus-tube-channel.cpp | 16 ++++++++--------
TelepathyQt/incoming-dbus-tube-channel.h | 4 ++--
TelepathyQt/outgoing-dbus-tube-channel.cpp | 16 ++++++++--------
TelepathyQt/outgoing-dbus-tube-channel.h | 4 ++--
7 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/TelepathyQt/dbus-tube-channel-internal.h b/TelepathyQt/dbus-tube-channel-internal.h
index 57b8fc8..4c7e2a7 100644
--- a/TelepathyQt/dbus-tube-channel-internal.h
+++ b/TelepathyQt/dbus-tube-channel-internal.h
@@ -52,8 +52,8 @@ public:
QString address;
// Private slots
- void __k__gotDBusTubeProperties(QDBusPendingCallWatcher *watcher);
- void __k__onDBusNamesChanged(const Tp::DBusTubeParticipants &added, const Tp::UIntList &removed);
+ void gotDBusTubeProperties(QDBusPendingCallWatcher *watcher);
+ void onDBusNamesChanged(const Tp::DBusTubeParticipants &added, const Tp::UIntList &removed);
};
diff --git a/TelepathyQt/dbus-tube-channel.cpp b/TelepathyQt/dbus-tube-channel.cpp
index d982844..619c48f 100644
--- a/TelepathyQt/dbus-tube-channel.cpp
+++ b/TelepathyQt/dbus-tube-channel.cpp
@@ -85,7 +85,7 @@ void DBusTubeChannelPrivate::extractParticipants(const Tp::DBusTubeParticipants&
}
-void DBusTubeChannelPrivate::__k__gotDBusTubeProperties(QDBusPendingCallWatcher* watcher)
+void DBusTubeChannelPrivate::gotDBusTubeProperties(QDBusPendingCallWatcher* watcher)
{
QDBusPendingReply<QVariantMap> reply = *watcher;
@@ -102,7 +102,7 @@ void DBusTubeChannelPrivate::__k__gotDBusTubeProperties(QDBusPendingCallWatcher*
}
}
-void DBusTubeChannelPrivate::__k__onDBusNamesChanged(
+void DBusTubeChannelPrivate::onDBusNamesChanged(
const Tp::DBusTubeParticipants& added,
const Tp::UIntList& removed)
{
@@ -145,7 +145,7 @@ void DBusTubeChannelPrivate::introspectBusNamesMonitoring(
// It makes sense only if this is a room, if that's not the case just spit a warning
if (parent->targetHandleType() == static_cast<uint>(Tp::HandleTypeRoom)) {
parent->connect(dbusTubeInterface, SIGNAL(DBusNamesChanged(Tp::DBusTubeParticipants,Tp::UIntList)),
- parent, SLOT(__k__onDBusNamesChanged(Tp::DBusTubeParticipants,Tp::UIntList)));
+ parent, SLOT(onDBusNamesChanged(Tp::DBusTubeParticipants,Tp::UIntList)));
} else {
warning() << "FeatureBusNamesMonitoring does not make sense in a P2P context";
}
@@ -171,7 +171,7 @@ void DBusTubeChannelPrivate::introspectDBusTube(
parent->connect(watcher,
SIGNAL(finished(QDBusPendingCallWatcher *)),
parent,
- SLOT(__k__gotDBusTubeProperties(QDBusPendingCallWatcher *)));
+ SLOT(gotDBusTubeProperties(QDBusPendingCallWatcher *)));
}
/**
diff --git a/TelepathyQt/dbus-tube-channel.h b/TelepathyQt/dbus-tube-channel.h
index e98f028..379cfe3 100644
--- a/TelepathyQt/dbus-tube-channel.h
+++ b/TelepathyQt/dbus-tube-channel.h
@@ -39,8 +39,8 @@ class TP_QT_EXPORT DBusTubeChannel : public TubeChannel
Q_DECLARE_PRIVATE(DBusTubeChannel)
// private slots:
- Q_PRIVATE_SLOT(d_func(), void __k__gotDBusTubeProperties(QDBusPendingCallWatcher*))
- Q_PRIVATE_SLOT(d_func(), void __k__onDBusNamesChanged(Tp::DBusTubeParticipants,Tp::UIntList))
+ Q_PRIVATE_SLOT(d_func(), void gotDBusTubeProperties(QDBusPendingCallWatcher*))
+ Q_PRIVATE_SLOT(d_func(), void onDBusNamesChanged(Tp::DBusTubeParticipants,Tp::UIntList))
public:
static const Feature FeatureDBusTube;
diff --git a/TelepathyQt/incoming-dbus-tube-channel.cpp b/TelepathyQt/incoming-dbus-tube-channel.cpp
index 2bd4b88..36b1de6 100644
--- a/TelepathyQt/incoming-dbus-tube-channel.cpp
+++ b/TelepathyQt/incoming-dbus-tube-channel.cpp
@@ -64,8 +64,8 @@ struct TP_QT_NO_EXPORT PendingDBusTubeAcceptPrivate
IncomingDBusTubeChannelPtr tube;
// Private slots
- void __k__onAcceptFinished(Tp::PendingOperation* op);
- void __k__onTubeStateChanged(Tp::TubeChannelState state);
+ void onAcceptFinished(Tp::PendingOperation* op);
+ void onStateChanged(Tp::TubeChannelState state);
};
PendingDBusTubeAcceptPrivate::PendingDBusTubeAcceptPrivate(PendingDBusTubeAccept* parent)
@@ -77,7 +77,7 @@ PendingDBusTubeAcceptPrivate::~PendingDBusTubeAcceptPrivate()
{
}
-void PendingDBusTubeAcceptPrivate::__k__onAcceptFinished(PendingOperation* op)
+void PendingDBusTubeAcceptPrivate::onAcceptFinished(PendingOperation* op)
{
if (op->isError()) {
// Fail
@@ -93,15 +93,15 @@ void PendingDBusTubeAcceptPrivate::__k__onAcceptFinished(PendingOperation* op)
// It might have been already opened - check
if (tube->state() == TubeChannelStateOpen) {
- __k__onTubeStateChanged(tube->state());
+ onStateChanged(tube->state());
} else {
// Wait until the tube gets opened on the other side
parent->connect(tube.data(), SIGNAL(stateChanged(Tp::TubeChannelState)),
- parent, SLOT(__k__onTubeStateChanged(Tp::TubeChannelState)));
+ parent, SLOT(onStateChanged(Tp::TubeChannelState)));
}
}
-void PendingDBusTubeAcceptPrivate::__k__onTubeStateChanged(TubeChannelState state)
+void PendingDBusTubeAcceptPrivate::onStateChanged(TubeChannelState state)
{
debug() << "Tube state changed to " << state;
if (state == TubeChannelStateOpen) {
@@ -135,11 +135,11 @@ PendingDBusTubeAccept::PendingDBusTubeAccept(
mPriv->tube = object;
if (string->isFinished()) {
- mPriv->__k__onAcceptFinished(string);
+ mPriv->onAcceptFinished(string);
} else {
// Connect the pending void
connect(string, SIGNAL(finished(Tp::PendingOperation*)),
- this, SLOT(__k__onAcceptFinished(Tp::PendingOperation*)));
+ this, SLOT(onAcceptFinished(Tp::PendingOperation*)));
}
}
diff --git a/TelepathyQt/incoming-dbus-tube-channel.h b/TelepathyQt/incoming-dbus-tube-channel.h
index 6e69ca7..ea6ea7f 100644
--- a/TelepathyQt/incoming-dbus-tube-channel.h
+++ b/TelepathyQt/incoming-dbus-tube-channel.h
@@ -54,8 +54,8 @@ private:
friend class IncomingDBusTubeChannel;
// private slots:
- Q_PRIVATE_SLOT(mPriv, void __k__onAcceptFinished(Tp::PendingOperation*))
- Q_PRIVATE_SLOT(mPriv, void __k__onTubeStateChanged(Tp::TubeChannelState))
+ Q_PRIVATE_SLOT(mPriv, void onAcceptFinished(Tp::PendingOperation*))
+ Q_PRIVATE_SLOT(mPriv, void onStateChanged(Tp::TubeChannelState))
};
diff --git a/TelepathyQt/outgoing-dbus-tube-channel.cpp b/TelepathyQt/outgoing-dbus-tube-channel.cpp
index 3a405ec..04c5cf8 100644
--- a/TelepathyQt/outgoing-dbus-tube-channel.cpp
+++ b/TelepathyQt/outgoing-dbus-tube-channel.cpp
@@ -64,8 +64,8 @@ struct TP_QT_NO_EXPORT PendingDBusTubeOfferPrivate
OutgoingDBusTubeChannelPtr tube;
// Private slots
- void __k__onOfferFinished(Tp::PendingOperation* op);
- void __k__onTubeStateChanged(Tp::TubeChannelState state);
+ void onOfferFinished(Tp::PendingOperation* op);
+ void onStateChanged(Tp::TubeChannelState state);
};
PendingDBusTubeOfferPrivate::PendingDBusTubeOfferPrivate(PendingDBusTubeOffer* parent)
@@ -77,7 +77,7 @@ PendingDBusTubeOfferPrivate::~PendingDBusTubeOfferPrivate()
{
}
-void PendingDBusTubeOfferPrivate::__k__onOfferFinished(PendingOperation* op)
+void PendingDBusTubeOfferPrivate::onOfferFinished(PendingOperation* op)
{
if (op->isError()) {
// Fail
@@ -93,15 +93,15 @@ void PendingDBusTubeOfferPrivate::__k__onOfferFinished(PendingOperation* op)
// It might have been already opened - check
if (tube->state() == TubeChannelStateOpen) {
- __k__onTubeStateChanged(tube->state());
+ onStateChanged(tube->state());
} else {
// Wait until the tube gets opened on the other side
parent->connect(tube.data(), SIGNAL(stateChanged(Tp::TubeChannelState)),
- parent, SLOT(__k__onTubeStateChanged(Tp::TubeChannelState)));
+ parent, SLOT(onStateChanged(Tp::TubeChannelState)));
}
}
-void PendingDBusTubeOfferPrivate::__k__onTubeStateChanged(TubeChannelState state)
+void PendingDBusTubeOfferPrivate::onStateChanged(TubeChannelState state)
{
debug() << "Tube state changed to " << state;
if (state == TubeChannelStateOpen) {
@@ -133,11 +133,11 @@ PendingDBusTubeOffer::PendingDBusTubeOffer(
mPriv->tube = object;
if (string->isFinished()) {
- mPriv->__k__onOfferFinished(string);
+ mPriv->onOfferFinished(string);
} else {
// Connect the pending void
connect(string, SIGNAL(finished(Tp::PendingOperation*)),
- this, SLOT(__k__onOfferFinished(Tp::PendingOperation*)));
+ this, SLOT(onOfferFinished(Tp::PendingOperation*)));
}
}
diff --git a/TelepathyQt/outgoing-dbus-tube-channel.h b/TelepathyQt/outgoing-dbus-tube-channel.h
index 774ef83..adf0f37 100644
--- a/TelepathyQt/outgoing-dbus-tube-channel.h
+++ b/TelepathyQt/outgoing-dbus-tube-channel.h
@@ -55,8 +55,8 @@ private:
friend class OutgoingDBusTubeChannel;
// private slots:
- Q_PRIVATE_SLOT(mPriv, void __k__onOfferFinished(Tp::PendingOperation*))
- Q_PRIVATE_SLOT(mPriv, void __k__onTubeStateChanged(Tp::TubeChannelState))
+ Q_PRIVATE_SLOT(mPriv, void onOfferFinished(Tp::PendingOperation*))
+ Q_PRIVATE_SLOT(mPriv, void onStateChanged(Tp::TubeChannelState))
};
class OutgoingDBusTubeChannelPrivate;
More information about the telepathy-commits
mailing list