diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2010-10-19 04:06:41 +0000 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2010-10-19 04:06:41 +0000 |
| commit | b91aca7b0e213552c87ddfa12c16541cfa2142d2 (patch) | |
| tree | db786cf15e18994306ad71b6901384f7be189159 /src | |
| parent | e82faaf04bd11b1860353c0203877a72f13f69b3 (diff) | |
| download | qxmpp-b91aca7b0e213552c87ddfa12c16541cfa2142d2.tar.gz | |
Restore the original prototype for QXmppClient::findExtension(), it is modeled
after QObject::findChild().
Diffstat (limited to 'src')
| -rw-r--r-- | src/QXmppClient.cpp | 2 | ||||
| -rw-r--r-- | src/QXmppClient.h | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/QXmppClient.cpp b/src/QXmppClient.cpp index 66d9a52b..14ec1bec 100644 --- a/src/QXmppClient.cpp +++ b/src/QXmppClient.cpp @@ -80,7 +80,7 @@ QXmppClientPrivate::QXmppClientPrivate(QXmppClient *parentClient) void QXmppClientPrivate::addProperCapability(QXmppPresence& presence) { - QXmppDiscoveryManager* ext = client->findExtension<QXmppDiscoveryManager>(); + QXmppDiscoveryManager* ext = client->findExtension<QXmppDiscoveryManager*>(); if(ext) { presence.setCapabilityHash("sha-1"); diff --git a/src/QXmppClient.h b/src/QXmppClient.h index 5db4136f..382aee50 100644 --- a/src/QXmppClient.h +++ b/src/QXmppClient.h @@ -99,12 +99,12 @@ public: QList<QXmppClientExtension*> extensions(); - /// \return pointer to the desired extension. - /// Returns NULL if extension is not found. + /// \brief Returns the extension which can be cast into type T, or 0 + /// if there is no such extension. /// /// Usage example: /// \code - /// QXmppDiscoveryManager* ext = client->findExtension<QXmppDiscoveryManager>(); + /// QXmppDiscoveryManager* ext = client->findExtension<QXmppDiscoveryManager*>(); /// if(ext) /// { /// //extension found, do stuff... @@ -112,12 +112,12 @@ public: /// \endcode /// template<typename T> - T* findExtension() + T findExtension() { QList<QXmppClientExtension*> list = extensions(); for (int i = 0; i < list.size(); ++i) { - T* extension = qobject_cast<T*>(list.at(i)); + T extension = qobject_cast<T>(list.at(i)); if(extension) return extension; } |
