diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-22 00:30:31 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-22 00:30:31 +0000 |
commit | 69cac65817d949cda2672ec4f0aa73d5e66a0ba1 (patch) | |
tree | 073fde0496ea90eb5bf5cffe66a8da43a9f55fbc /kopete/protocols/jabber/jingle/libjingle/talk/xmpp | |
parent | 3467e6464beac3a162839bf7078e22e3a74d73e7 (diff) | |
download | tdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.tar.gz tdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.zip |
TQt4 port kdenetwork
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kopete/protocols/jabber/jingle/libjingle/talk/xmpp')
17 files changed, 517 insertions, 517 deletions
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc index b2c833f7..18987e7d 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc @@ -29,7 +29,7 @@ #include "talk/base/basicdefs.h" #include "talk/xmllite/xmlconstants.h" #include "talk/xmllite/xmlelement.h" -#include "talk/xmllite/qname.h" +#include "talk/xmllite/tqname.h" #include "talk/xmpp/jid.h" #include "talk/xmpp/constants.h" namespace buzz { @@ -135,131 +135,131 @@ const std::string STR_GOOGLEMAIL_COM("googlemail.com"); const std::string STR_DEFAULT_DOMAIN("default.talk.google.com"); const std::string STR_X("x"); -const QName QN_STREAM_STREAM(true, NS_STREAM, STR_STREAM); -const QName QN_STREAM_FEATURES(true, NS_STREAM, "features"); -const QName QN_STREAM_ERROR(true, NS_STREAM, "error"); - -const QName QN_XSTREAM_BAD_FORMAT(true, NS_XSTREAM, "bad-format"); -const QName QN_XSTREAM_BAD_NAMESPACE_PREFIX(true, NS_XSTREAM, "bad-namespace-prefix"); -const QName QN_XSTREAM_CONFLICT(true, NS_XSTREAM, "conflict"); -const QName QN_XSTREAM_CONNECTION_TIMEOUT(true, NS_XSTREAM, "connection-timeout"); -const QName QN_XSTREAM_HOST_GONE(true, NS_XSTREAM, "host-gone"); -const QName QN_XSTREAM_HOST_UNKNOWN(true, NS_XSTREAM, "host-unknown"); -const QName QN_XSTREAM_IMPROPER_ADDRESSIING(true, NS_XSTREAM, "improper-addressing"); -const QName QN_XSTREAM_INTERNAL_SERVER_ERROR(true, NS_XSTREAM, "internal-server-error"); -const QName QN_XSTREAM_INVALID_FROM(true, NS_XSTREAM, "invalid-from"); -const QName QN_XSTREAM_INVALID_ID(true, NS_XSTREAM, "invalid-id"); -const QName QN_XSTREAM_INVALID_NAMESPACE(true, NS_XSTREAM, "invalid-namespace"); -const QName QN_XSTREAM_INVALID_XML(true, NS_XSTREAM, "invalid-xml"); -const QName QN_XSTREAM_NOT_AUTHORIZED(true, NS_XSTREAM, "not-authorized"); -const QName QN_XSTREAM_POLICY_VIOLATION(true, NS_XSTREAM, "policy-violation"); -const QName QN_XSTREAM_REMOTE_CONNECTION_FAILED(true, NS_XSTREAM, "remote-connection-failed"); -const QName QN_XSTREAM_RESOURCE_CONSTRAINT(true, NS_XSTREAM, "resource-constraint"); -const QName QN_XSTREAM_RESTRICTED_XML(true, NS_XSTREAM, "restricted-xml"); -const QName QN_XSTREAM_SEE_OTHER_HOST(true, NS_XSTREAM, "see-other-host"); -const QName QN_XSTREAM_SYSTEM_SHUTDOWN(true, NS_XSTREAM, "system-shutdown"); -const QName QN_XSTREAM_UNDEFINED_CONDITION(true, NS_XSTREAM, "undefined-condition"); -const QName QN_XSTREAM_UNSUPPORTED_ENCODING(true, NS_XSTREAM, "unsupported-encoding"); -const QName QN_XSTREAM_UNSUPPORTED_STANZA_TYPE(true, NS_XSTREAM, "unsupported-stanza-type"); -const QName QN_XSTREAM_UNSUPPORTED_VERSION(true, NS_XSTREAM, "unsupported-version"); -const QName QN_XSTREAM_XML_NOT_WELL_FORMED(true, NS_XSTREAM, "xml-not-well-formed"); -const QName QN_XSTREAM_TEXT(true, NS_XSTREAM, "text"); - -const QName QN_TLS_STARTTLS(true, NS_TLS, "starttls"); -const QName QN_TLS_REQUIRED(true, NS_TLS, "required"); -const QName QN_TLS_PROCEED(true, NS_TLS, "proceed"); -const QName QN_TLS_FAILURE(true, NS_TLS, "failure"); - -const QName QN_SASL_MECHANISMS(true, NS_SASL, "mechanisms"); -const QName QN_SASL_MECHANISM(true, NS_SASL, "mechanism"); -const QName QN_SASL_AUTH(true, NS_SASL, "auth"); -const QName QN_SASL_CHALLENGE(true, NS_SASL, "challenge"); -const QName QN_SASL_RESPONSE(true, NS_SASL, "response"); -const QName QN_SASL_ABORT(true, NS_SASL, "abort"); -const QName QN_SASL_SUCCESS(true, NS_SASL, "success"); -const QName QN_SASL_FAILURE(true, NS_SASL, "failure"); -const QName QN_SASL_ABORTED(true, NS_SASL, "aborted"); -const QName QN_SASL_INCORRECT_ENCODING(true, NS_SASL, "incorrect-encoding"); -const QName QN_SASL_INVALID_AUTHZID(true, NS_SASL, "invalid-authzid"); -const QName QN_SASL_INVALID_MECHANISM(true, NS_SASL, "invalid-mechanism"); -const QName QN_SASL_MECHANISM_TOO_WEAK(true, NS_SASL, "mechanism-too-weak"); -const QName QN_SASL_NOT_AUTHORIZED(true, NS_SASL, "not-authorized"); -const QName QN_SASL_TEMPORARY_AUTH_FAILURE(true, NS_SASL, "temporary-auth-failure"); - -const QName QN_DIALBACK_RESULT(true, NS_DIALBACK, "result"); -const QName QN_DIALBACK_VERIFY(true, NS_DIALBACK, "verify"); - -const QName QN_STANZA_BAD_REQUEST(true, NS_STANZA, "bad-request"); -const QName QN_STANZA_CONFLICT(true, NS_STANZA, "conflict"); -const QName QN_STANZA_FEATURE_NOT_IMPLEMENTED(true, NS_STANZA, "feature-not-implemented"); -const QName QN_STANZA_FORBIDDEN(true, NS_STANZA, "forbidden"); -const QName QN_STANZA_GONE(true, NS_STANZA, "gone"); -const QName QN_STANZA_INTERNAL_SERVER_ERROR(true, NS_STANZA, "internal-server-error"); -const QName QN_STANZA_ITEM_NOT_FOUND(true, NS_STANZA, "item-not-found"); -const QName QN_STANZA_JID_MALFORMED(true, NS_STANZA, "jid-malformed"); -const QName QN_STANZA_NOT_ACCEPTABLE(true, NS_STANZA, "not-acceptable"); -const QName QN_STANZA_NOT_ALLOWED(true, NS_STANZA, "not-allowed"); -const QName QN_STANZA_PAYMENT_REQUIRED(true, NS_STANZA, "payment-required"); -const QName QN_STANZA_RECIPIENT_UNAVAILABLE(true, NS_STANZA, "recipient-unavailable"); -const QName QN_STANZA_REDIRECT(true, NS_STANZA, "redirect"); -const QName QN_STANZA_REGISTRATION_REQUIRED(true, NS_STANZA, "registration-required"); -const QName QN_STANZA_REMOTE_SERVER_NOT_FOUND(true, NS_STANZA, "remote-server-not-found"); -const QName QN_STANZA_REMOTE_SERVER_TIMEOUT(true, NS_STANZA, "remote-server-timeout"); -const QName QN_STANZA_RESOURCE_CONSTRAINT(true, NS_STANZA, "resource-constraint"); -const QName QN_STANZA_SERVICE_UNAVAILABLE(true, NS_STANZA, "service-unavailable"); -const QName QN_STANZA_SUBSCRIPTION_REQUIRED(true, NS_STANZA, "subscription-required"); -const QName QN_STANZA_UNDEFINED_CONDITION(true, NS_STANZA, "undefined-condition"); -const QName QN_STANZA_UNEXPECTED_REQUEST(true, NS_STANZA, "unexpected-request"); -const QName QN_STANZA_TEXT(true, NS_STANZA, "text"); - -const QName QN_BIND_BIND(true, NS_BIND, "bind"); -const QName QN_BIND_RESOURCE(true, NS_BIND, "resource"); -const QName QN_BIND_JID(true, NS_BIND, "jid"); - -const QName QN_MESSAGE(true, NS_CLIENT, "message"); -const QName QN_BODY(true, NS_CLIENT, "body"); -const QName QN_SUBJECT(true, NS_CLIENT, "subject"); -const QName QN_THREAD(true, NS_CLIENT, "thread"); -const QName QN_PRESENCE(true, NS_CLIENT, "presence"); -const QName QN_SHOW(true, NS_CLIENT, "show"); -const QName QN_STATUS(true, NS_CLIENT, "status"); -const QName QN_LANG(true, NS_CLIENT, "lang"); -const QName QN_PRIORITY(true, NS_CLIENT, "priority"); -const QName QN_IQ(true, NS_CLIENT, "iq"); -const QName QN_ERROR(true, NS_CLIENT, "error"); - -const QName QN_SERVER_MESSAGE(true, NS_SERVER, "message"); -const QName QN_SERVER_BODY(true, NS_SERVER, "body"); -const QName QN_SERVER_SUBJECT(true, NS_SERVER, "subject"); -const QName QN_SERVER_THREAD(true, NS_SERVER, "thread"); -const QName QN_SERVER_PRESENCE(true, NS_SERVER, "presence"); -const QName QN_SERVER_SHOW(true, NS_SERVER, "show"); -const QName QN_SERVER_STATUS(true, NS_SERVER, "status"); -const QName QN_SERVER_LANG(true, NS_SERVER, "lang"); -const QName QN_SERVER_PRIORITY(true, NS_SERVER, "priority"); -const QName QN_SERVER_IQ(true, NS_SERVER, "iq"); -const QName QN_SERVER_ERROR(true, NS_SERVER, "error"); - -const QName QN_SESSION_SESSION(true, NS_SESSION, "session"); - -const QName QN_PRIVACY_QUERY(true, NS_PRIVACY, "query"); -const QName QN_PRIVACY_ACTIVE(true, NS_PRIVACY, "active"); -const QName QN_PRIVACY_DEFAULT(true, NS_PRIVACY, "default"); -const QName QN_PRIVACY_LIST(true, NS_PRIVACY, "list"); -const QName QN_PRIVACY_ITEM(true, NS_PRIVACY, "item"); -const QName QN_PRIVACY_IQ(true, NS_PRIVACY, "iq"); -const QName QN_PRIVACY_MESSAGE(true, NS_PRIVACY, "message"); -const QName QN_PRIVACY_PRESENCE_IN(true, NS_PRIVACY, "presence-in"); -const QName QN_PRIVACY_PRESENCE_OUT(true, NS_PRIVACY, "presence-out"); - -const QName QN_ROSTER_QUERY(true, NS_ROSTER, "query"); -const QName QN_ROSTER_ITEM(true, NS_ROSTER, "item"); -const QName QN_ROSTER_GROUP(true, NS_ROSTER, "group"); - -const QName QN_VCARD_QUERY(true, NS_VCARD, "vCard"); -const QName QN_VCARD_FN(true, NS_VCARD, "FN"); - -const QName QN_XML_LANG(true, NS_XML, "lang"); +const TQName TQN_STREAM_STREAM(true, NS_STREAM, STR_STREAM); +const TQName TQN_STREAM_FEATURES(true, NS_STREAM, "features"); +const TQName TQN_STREAM_ERROR(true, NS_STREAM, "error"); + +const TQName TQN_XSTREAM_BAD_FORMAT(true, NS_XSTREAM, "bad-format"); +const TQName TQN_XSTREAM_BAD_NAMESPACE_PREFIX(true, NS_XSTREAM, "bad-namespace-prefix"); +const TQName TQN_XSTREAM_CONFLICT(true, NS_XSTREAM, "conflict"); +const TQName TQN_XSTREAM_CONNECTION_TIMEOUT(true, NS_XSTREAM, "connection-timeout"); +const TQName TQN_XSTREAM_HOST_GONE(true, NS_XSTREAM, "host-gone"); +const TQName TQN_XSTREAM_HOST_UNKNOWN(true, NS_XSTREAM, "host-unknown"); +const TQName TQN_XSTREAM_IMPROPER_ADDRESSIING(true, NS_XSTREAM, "improper-addressing"); +const TQName TQN_XSTREAM_INTERNAL_SERVER_ERROR(true, NS_XSTREAM, "internal-server-error"); +const TQName TQN_XSTREAM_INVALID_FROM(true, NS_XSTREAM, "invalid-from"); +const TQName TQN_XSTREAM_INVALID_ID(true, NS_XSTREAM, "invalid-id"); +const TQName TQN_XSTREAM_INVALID_NAMESPACE(true, NS_XSTREAM, "invalid-namespace"); +const TQName TQN_XSTREAM_INVALID_XML(true, NS_XSTREAM, "invalid-xml"); +const TQName TQN_XSTREAM_NOT_AUTHORIZED(true, NS_XSTREAM, "not-authorized"); +const TQName TQN_XSTREAM_POLICY_VIOLATION(true, NS_XSTREAM, "policy-violation"); +const TQName TQN_XSTREAM_REMOTE_CONNECTION_FAILED(true, NS_XSTREAM, "remote-connection-failed"); +const TQName TQN_XSTREAM_RESOURCE_CONSTRAINT(true, NS_XSTREAM, "resource-constraint"); +const TQName TQN_XSTREAM_RESTRICTED_XML(true, NS_XSTREAM, "restricted-xml"); +const TQName TQN_XSTREAM_SEE_OTHER_HOST(true, NS_XSTREAM, "see-other-host"); +const TQName TQN_XSTREAM_SYSTEM_SHUTDOWN(true, NS_XSTREAM, "system-shutdown"); +const TQName TQN_XSTREAM_UNDEFINED_CONDITION(true, NS_XSTREAM, "undefined-condition"); +const TQName TQN_XSTREAM_UNSUPPORTED_ENCODING(true, NS_XSTREAM, "unsupported-encoding"); +const TQName TQN_XSTREAM_UNSUPPORTED_STANZA_TYPE(true, NS_XSTREAM, "unsupported-stanza-type"); +const TQName TQN_XSTREAM_UNSUPPORTED_VERSION(true, NS_XSTREAM, "unsupported-version"); +const TQName TQN_XSTREAM_XML_NOT_WELL_FORMED(true, NS_XSTREAM, "xml-not-well-formed"); +const TQName TQN_XSTREAM_TEXT(true, NS_XSTREAM, "text"); + +const TQName TQN_TLS_STARTTLS(true, NS_TLS, "starttls"); +const TQName TQN_TLS_RETQUIRED(true, NS_TLS, "required"); +const TQName TQN_TLS_PROCEED(true, NS_TLS, "proceed"); +const TQName TQN_TLS_FAILURE(true, NS_TLS, "failure"); + +const TQName TQN_SASL_MECHANISMS(true, NS_SASL, "mechanisms"); +const TQName TQN_SASL_MECHANISM(true, NS_SASL, "mechanism"); +const TQName TQN_SASL_AUTH(true, NS_SASL, "auth"); +const TQName TQN_SASL_CHALLENGE(true, NS_SASL, "challenge"); +const TQName TQN_SASL_RESPONSE(true, NS_SASL, "response"); +const TQName TQN_SASL_ABORT(true, NS_SASL, "abort"); +const TQName TQN_SASL_SUCCESS(true, NS_SASL, "success"); +const TQName TQN_SASL_FAILURE(true, NS_SASL, "failure"); +const TQName TQN_SASL_ABORTED(true, NS_SASL, "aborted"); +const TQName TQN_SASL_INCORRECT_ENCODING(true, NS_SASL, "incorrect-encoding"); +const TQName TQN_SASL_INVALID_AUTHZID(true, NS_SASL, "invalid-authzid"); +const TQName TQN_SASL_INVALID_MECHANISM(true, NS_SASL, "invalid-mechanism"); +const TQName TQN_SASL_MECHANISM_TOO_WEAK(true, NS_SASL, "mechanism-too-weak"); +const TQName TQN_SASL_NOT_AUTHORIZED(true, NS_SASL, "not-authorized"); +const TQName TQN_SASL_TEMPORARY_AUTH_FAILURE(true, NS_SASL, "temporary-auth-failure"); + +const TQName TQN_DIALBACK_RESULT(true, NS_DIALBACK, "result"); +const TQName TQN_DIALBACK_VERIFY(true, NS_DIALBACK, "verify"); + +const TQName TQN_STANZA_BAD_REQUEST(true, NS_STANZA, "bad-request"); +const TQName TQN_STANZA_CONFLICT(true, NS_STANZA, "conflict"); +const TQName TQN_STANZA_FEATURE_NOT_IMPLEMENTED(true, NS_STANZA, "feature-not-implemented"); +const TQName TQN_STANZA_FORBIDDEN(true, NS_STANZA, "forbidden"); +const TQName TQN_STANZA_GONE(true, NS_STANZA, "gone"); +const TQName TQN_STANZA_INTERNAL_SERVER_ERROR(true, NS_STANZA, "internal-server-error"); +const TQName TQN_STANZA_ITEM_NOT_FOUND(true, NS_STANZA, "item-not-found"); +const TQName TQN_STANZA_JID_MALFORMED(true, NS_STANZA, "jid-malformed"); +const TQName TQN_STANZA_NOT_ACCEPTABLE(true, NS_STANZA, "not-acceptable"); +const TQName TQN_STANZA_NOT_ALLOWED(true, NS_STANZA, "not-allowed"); +const TQName TQN_STANZA_PAYMENT_RETQUIRED(true, NS_STANZA, "payment-required"); +const TQName TQN_STANZA_RECIPIENT_UNAVAILABLE(true, NS_STANZA, "recipient-unavailable"); +const TQName TQN_STANZA_REDIRECT(true, NS_STANZA, "redirect"); +const TQName TQN_STANZA_REGISTRATION_RETQUIRED(true, NS_STANZA, "registration-required"); +const TQName TQN_STANZA_REMOTE_SERVER_NOT_FOUND(true, NS_STANZA, "remote-server-not-found"); +const TQName TQN_STANZA_REMOTE_SERVER_TIMEOUT(true, NS_STANZA, "remote-server-timeout"); +const TQName TQN_STANZA_RESOURCE_CONSTRAINT(true, NS_STANZA, "resource-constraint"); +const TQName TQN_STANZA_SERVICE_UNAVAILABLE(true, NS_STANZA, "service-unavailable"); +const TQName TQN_STANZA_SUBSCRIPTION_RETQUIRED(true, NS_STANZA, "subscription-required"); +const TQName TQN_STANZA_UNDEFINED_CONDITION(true, NS_STANZA, "undefined-condition"); +const TQName TQN_STANZA_UNEXPECTED_REQUEST(true, NS_STANZA, "unexpected-request"); +const TQName TQN_STANZA_TEXT(true, NS_STANZA, "text"); + +const TQName TQN_BIND_BIND(true, NS_BIND, "bind"); +const TQName TQN_BIND_RESOURCE(true, NS_BIND, "resource"); +const TQName TQN_BIND_JID(true, NS_BIND, "jid"); + +const TQName TQN_MESSAGE(true, NS_CLIENT, "message"); +const TQName TQN_BODY(true, NS_CLIENT, "body"); +const TQName TQN_SUBJECT(true, NS_CLIENT, "subject"); +const TQName TQN_THREAD(true, NS_CLIENT, "thread"); +const TQName TQN_PRESENCE(true, NS_CLIENT, "presence"); +const TQName TQN_SHOW(true, NS_CLIENT, "show"); +const TQName TQN_STATUS(true, NS_CLIENT, "status"); +const TQName TQN_LANG(true, NS_CLIENT, "lang"); +const TQName TQN_PRIORITY(true, NS_CLIENT, "priority"); +const TQName TQN_IQ(true, NS_CLIENT, "iq"); +const TQName TQN_ERROR(true, NS_CLIENT, "error"); + +const TQName TQN_SERVER_MESSAGE(true, NS_SERVER, "message"); +const TQName TQN_SERVER_BODY(true, NS_SERVER, "body"); +const TQName TQN_SERVER_SUBJECT(true, NS_SERVER, "subject"); +const TQName TQN_SERVER_THREAD(true, NS_SERVER, "thread"); +const TQName TQN_SERVER_PRESENCE(true, NS_SERVER, "presence"); +const TQName TQN_SERVER_SHOW(true, NS_SERVER, "show"); +const TQName TQN_SERVER_STATUS(true, NS_SERVER, "status"); +const TQName TQN_SERVER_LANG(true, NS_SERVER, "lang"); +const TQName TQN_SERVER_PRIORITY(true, NS_SERVER, "priority"); +const TQName TQN_SERVER_IQ(true, NS_SERVER, "iq"); +const TQName TQN_SERVER_ERROR(true, NS_SERVER, "error"); + +const TQName TQN_SESSION_SESSION(true, NS_SESSION, "session"); + +const TQName TQN_PRIVACY_TQUERY(true, NS_PRIVACY, "query"); +const TQName TQN_PRIVACY_ACTIVE(true, NS_PRIVACY, "active"); +const TQName TQN_PRIVACY_DEFAULT(true, NS_PRIVACY, "default"); +const TQName TQN_PRIVACY_LIST(true, NS_PRIVACY, "list"); +const TQName TQN_PRIVACY_ITEM(true, NS_PRIVACY, "item"); +const TQName TQN_PRIVACY_IQ(true, NS_PRIVACY, "iq"); +const TQName TQN_PRIVACY_MESSAGE(true, NS_PRIVACY, "message"); +const TQName TQN_PRIVACY_PRESENCE_IN(true, NS_PRIVACY, "presence-in"); +const TQName TQN_PRIVACY_PRESENCE_OUT(true, NS_PRIVACY, "presence-out"); + +const TQName TQN_ROSTER_TQUERY(true, NS_ROSTER, "query"); +const TQName TQN_ROSTER_ITEM(true, NS_ROSTER, "item"); +const TQName TQN_ROSTER_GROUP(true, NS_ROSTER, "group"); + +const TQName TQN_VCARD_TQUERY(true, NS_VCARD, "vCard"); +const TQName TQN_VCARD_FN(true, NS_VCARD, "FN"); + +const TQName TQN_XML_LANG(true, NS_XML, "lang"); const std::string STR_TYPE("type"); const std::string STR_ID("id"); @@ -268,26 +268,26 @@ const std::string STR_JID("jid"); const std::string STR_SUBSCRIPTION("subscription"); const std::string STR_ASK("ask"); -const QName QN_ENCODING(true, STR_EMPTY, STR_ENCODING); -const QName QN_VERSION(true, STR_EMPTY, STR_VERSION); -const QName QN_TO(true, STR_EMPTY, "to"); -const QName QN_FROM(true, STR_EMPTY, "from"); -const QName QN_TYPE(true, STR_EMPTY, "type"); -const QName QN_ID(true, STR_EMPTY, "id"); -const QName QN_CODE(true, STR_EMPTY, "code"); -const QName QN_NAME(true, STR_EMPTY, "name"); -const QName QN_VALUE(true, STR_EMPTY, "value"); -const QName QN_ACTION(true, STR_EMPTY, "action"); -const QName QN_ORDER(true, STR_EMPTY, "order"); -const QName QN_MECHANISM(true, STR_EMPTY, "mechanism"); -const QName QN_ASK(true, STR_EMPTY, "ask"); -const QName QN_JID(true, STR_EMPTY, "jid"); -const QName QN_SUBSCRIPTION(true, STR_EMPTY, "subscription"); -const QName QN_SOURCE(true, STR_EMPTY, "source"); - -const QName QN_XMLNS_CLIENT(true, NS_XMLNS, STR_CLIENT); -const QName QN_XMLNS_SERVER(true, NS_XMLNS, STR_SERVER); -const QName QN_XMLNS_STREAM(true, NS_XMLNS, STR_STREAM); +const TQName TQN_ENCODING(true, STR_EMPTY, STR_ENCODING); +const TQName TQN_VERSION(true, STR_EMPTY, STR_VERSION); +const TQName TQN_TO(true, STR_EMPTY, "to"); +const TQName TQN_FROM(true, STR_EMPTY, "from"); +const TQName TQN_TYPE(true, STR_EMPTY, "type"); +const TQName TQN_ID(true, STR_EMPTY, "id"); +const TQName TQN_CODE(true, STR_EMPTY, "code"); +const TQName TQN_NAME(true, STR_EMPTY, "name"); +const TQName TQN_VALUE(true, STR_EMPTY, "value"); +const TQName TQN_ACTION(true, STR_EMPTY, "action"); +const TQName TQN_ORDER(true, STR_EMPTY, "order"); +const TQName TQN_MECHANISM(true, STR_EMPTY, "mechanism"); +const TQName TQN_ASK(true, STR_EMPTY, "ask"); +const TQName TQN_JID(true, STR_EMPTY, "jid"); +const TQName TQN_SUBSCRIPTION(true, STR_EMPTY, "subscription"); +const TQName TQN_SOURCE(true, STR_EMPTY, "source"); + +const TQName TQN_XMLNS_CLIENT(true, NS_XMLNS, STR_CLIENT); +const TQName TQN_XMLNS_SERVER(true, NS_XMLNS, STR_SERVER); +const TQName TQN_XMLNS_STREAM(true, NS_XMLNS, STR_STREAM); // Presence const std::string STR_SHOW_AWAY("away"); @@ -303,29 +303,29 @@ const std::string STR_UNSUBSCRIBED("unsubscribed"); // JEP 0030 -const QName QN_NODE(true, STR_EMPTY, "node"); -const QName QN_CATEGORY(true, STR_EMPTY, "category"); -const QName QN_VAR(true, STR_EMPTY, "var"); +const TQName TQN_NODE(true, STR_EMPTY, "node"); +const TQName TQN_CATEGORY(true, STR_EMPTY, "category"); +const TQName TQN_VAR(true, STR_EMPTY, "var"); const std::string NS_DISCO_INFO("http://jabber.org/protocol/disco#info"); const std::string NS_DISCO_ITEMS("http://jabber.org/protocol/disco#items"); -const QName QN_DISCO_INFO_QUERY(true, NS_DISCO_INFO, "query"); -const QName QN_DISCO_IDENTITY(true, NS_DISCO_INFO, "identity"); -const QName QN_DISCO_FEATURE(true, NS_DISCO_INFO, "feature"); +const TQName TQN_DISCO_INFO_TQUERY(true, NS_DISCO_INFO, "query"); +const TQName TQN_DISCO_IDENTITY(true, NS_DISCO_INFO, "identity"); +const TQName TQN_DISCO_FEATURE(true, NS_DISCO_INFO, "feature"); -const QName QN_DISCO_ITEMS_QUERY(true, NS_DISCO_ITEMS, "query"); -const QName QN_DISCO_ITEM(true, NS_DISCO_ITEMS, "item"); +const TQName TQN_DISCO_ITEMS_TQUERY(true, NS_DISCO_ITEMS, "query"); +const TQName TQN_DISCO_ITEM(true, NS_DISCO_ITEMS, "item"); // JEP 0115 const std::string NS_CAPS("http://jabber.org/protocol/caps"); -const QName QN_CAPS_C(true, NS_CAPS, "c"); -const QName QN_VER(true, STR_EMPTY, "ver"); -const QName QN_EXT(true, STR_EMPTY, "ext"); +const TQName TQN_CAPS_C(true, NS_CAPS, "c"); +const TQName TQN_VER(true, STR_EMPTY, "ver"); +const TQName TQN_EXT(true, STR_EMPTY, "ext"); // JEP 0091 Delayed Delivery const std::string kNSDelay("jabber:x:delay"); -const QName kQnDelayX(true, kNSDelay, "x"); -const QName kQnStamp(true, STR_EMPTY, "stamp"); +const TQName kQnDelayX(true, kNSDelay, "x"); +const TQName kQnStamp(true, STR_EMPTY, "stamp"); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h index b05af965..00ff8e8d 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h @@ -29,7 +29,7 @@ #define _CRICKET_XMPP_XMPPLIB_BUZZ_CONSTANTS_H_ #include <string> -#include "talk/xmllite/qname.h" +#include "talk/xmllite/tqname.h" #include "talk/xmpp/jid.h" @@ -108,152 +108,152 @@ extern const std::string STR_DEFAULT_DOMAIN; extern const std::string STR_UNAVAILABLE; extern const std::string STR_INVISIBLE; -extern const QName QN_STREAM_STREAM; -extern const QName QN_STREAM_FEATURES; -extern const QName QN_STREAM_ERROR; - -extern const QName QN_XSTREAM_BAD_FORMAT; -extern const QName QN_XSTREAM_BAD_NAMESPACE_PREFIX; -extern const QName QN_XSTREAM_CONFLICT; -extern const QName QN_XSTREAM_CONNECTION_TIMEOUT; -extern const QName QN_XSTREAM_HOST_GONE; -extern const QName QN_XSTREAM_HOST_UNKNOWN; -extern const QName QN_XSTREAM_IMPROPER_ADDRESSIING; -extern const QName QN_XSTREAM_INTERNAL_SERVER_ERROR; -extern const QName QN_XSTREAM_INVALID_FROM; -extern const QName QN_XSTREAM_INVALID_ID; -extern const QName QN_XSTREAM_INVALID_NAMESPACE; -extern const QName QN_XSTREAM_INVALID_XML; -extern const QName QN_XSTREAM_NOT_AUTHORIZED; -extern const QName QN_XSTREAM_POLICY_VIOLATION; -extern const QName QN_XSTREAM_REMOTE_CONNECTION_FAILED; -extern const QName QN_XSTREAM_RESOURCE_CONSTRAINT; -extern const QName QN_XSTREAM_RESTRICTED_XML; -extern const QName QN_XSTREAM_SEE_OTHER_HOST; -extern const QName QN_XSTREAM_SYSTEM_SHUTDOWN; -extern const QName QN_XSTREAM_UNDEFINED_CONDITION; -extern const QName QN_XSTREAM_UNSUPPORTED_ENCODING; -extern const QName QN_XSTREAM_UNSUPPORTED_STANZA_TYPE; -extern const QName QN_XSTREAM_UNSUPPORTED_VERSION; -extern const QName QN_XSTREAM_XML_NOT_WELL_FORMED; -extern const QName QN_XSTREAM_TEXT; - -extern const QName QN_TLS_STARTTLS; -extern const QName QN_TLS_REQUIRED; -extern const QName QN_TLS_PROCEED; -extern const QName QN_TLS_FAILURE; - -extern const QName QN_SASL_MECHANISMS; -extern const QName QN_SASL_MECHANISM; -extern const QName QN_SASL_AUTH; -extern const QName QN_SASL_CHALLENGE; -extern const QName QN_SASL_RESPONSE; -extern const QName QN_SASL_ABORT; -extern const QName QN_SASL_SUCCESS; -extern const QName QN_SASL_FAILURE; -extern const QName QN_SASL_ABORTED; -extern const QName QN_SASL_INCORRECT_ENCODING; -extern const QName QN_SASL_INVALID_AUTHZID; -extern const QName QN_SASL_INVALID_MECHANISM; -extern const QName QN_SASL_MECHANISM_TOO_WEAK; -extern const QName QN_SASL_NOT_AUTHORIZED; -extern const QName QN_SASL_TEMPORARY_AUTH_FAILURE; - -extern const QName QN_DIALBACK_RESULT; -extern const QName QN_DIALBACK_VERIFY; - -extern const QName QN_STANZA_BAD_REQUEST; -extern const QName QN_STANZA_CONFLICT; -extern const QName QN_STANZA_FEATURE_NOT_IMPLEMENTED; -extern const QName QN_STANZA_FORBIDDEN; -extern const QName QN_STANZA_GONE; -extern const QName QN_STANZA_INTERNAL_SERVER_ERROR; -extern const QName QN_STANZA_ITEM_NOT_FOUND; -extern const QName QN_STANZA_JID_MALFORMED; -extern const QName QN_STANZA_NOT_ACCEPTABLE; -extern const QName QN_STANZA_NOT_ALLOWED; -extern const QName QN_STANZA_PAYMENT_REQUIRED; -extern const QName QN_STANZA_RECIPIENT_UNAVAILABLE; -extern const QName QN_STANZA_REDIRECT; -extern const QName QN_STANZA_REGISTRATION_REQUIRED; -extern const QName QN_STANZA_REMOTE_SERVER_NOT_FOUND; -extern const QName QN_STANZA_REMOTE_SERVER_TIMEOUT; -extern const QName QN_STANZA_RESOURCE_CONSTRAINT; -extern const QName QN_STANZA_SERVICE_UNAVAILABLE; -extern const QName QN_STANZA_SUBSCRIPTION_REQUIRED; -extern const QName QN_STANZA_UNDEFINED_CONDITION; -extern const QName QN_STANZA_UNEXPECTED_REQUEST; -extern const QName QN_STANZA_TEXT; - -extern const QName QN_BIND_BIND; -extern const QName QN_BIND_RESOURCE; -extern const QName QN_BIND_JID; - -extern const QName QN_MESSAGE; -extern const QName QN_BODY; -extern const QName QN_SUBJECT; -extern const QName QN_THREAD; -extern const QName QN_PRESENCE; -extern const QName QN_SHOW; -extern const QName QN_STATUS; -extern const QName QN_LANG; -extern const QName QN_PRIORITY; -extern const QName QN_IQ; -extern const QName QN_ERROR; - -extern const QName QN_SERVER_MESSAGE; -extern const QName QN_SERVER_BODY; -extern const QName QN_SERVER_SUBJECT; -extern const QName QN_SERVER_THREAD; -extern const QName QN_SERVER_PRESENCE; -extern const QName QN_SERVER_SHOW; -extern const QName QN_SERVER_STATUS; -extern const QName QN_SERVER_LANG; -extern const QName QN_SERVER_PRIORITY; -extern const QName QN_SERVER_IQ; -extern const QName QN_SERVER_ERROR; - -extern const QName QN_SESSION_SESSION; - -extern const QName QN_PRIVACY_QUERY; -extern const QName QN_PRIVACY_ACTIVE; -extern const QName QN_PRIVACY_DEFAULT; -extern const QName QN_PRIVACY_LIST; -extern const QName QN_PRIVACY_ITEM; -extern const QName QN_PRIVACY_IQ; -extern const QName QN_PRIVACY_MESSAGE; -extern const QName QN_PRIVACY_PRESENCE_IN; -extern const QName QN_PRIVACY_PRESENCE_OUT; - -extern const QName QN_ROSTER_QUERY; -extern const QName QN_ROSTER_ITEM; -extern const QName QN_ROSTER_GROUP; - -extern const QName QN_VCARD_QUERY; -extern const QName QN_VCARD_FN; - -extern const QName QN_XML_LANG; - -extern const QName QN_ENCODING; -extern const QName QN_VERSION; -extern const QName QN_TO; -extern const QName QN_FROM; -extern const QName QN_TYPE; -extern const QName QN_ID; -extern const QName QN_CODE; -extern const QName QN_NAME; -extern const QName QN_VALUE; -extern const QName QN_ACTION; -extern const QName QN_ORDER; -extern const QName QN_MECHANISM; -extern const QName QN_ASK; -extern const QName QN_JID; -extern const QName QN_SUBSCRIPTION; - - -extern const QName QN_XMLNS_CLIENT; -extern const QName QN_XMLNS_SERVER; -extern const QName QN_XMLNS_STREAM; +extern const TQName TQN_STREAM_STREAM; +extern const TQName TQN_STREAM_FEATURES; +extern const TQName TQN_STREAM_ERROR; + +extern const TQName TQN_XSTREAM_BAD_FORMAT; +extern const TQName TQN_XSTREAM_BAD_NAMESPACE_PREFIX; +extern const TQName TQN_XSTREAM_CONFLICT; +extern const TQName TQN_XSTREAM_CONNECTION_TIMEOUT; +extern const TQName TQN_XSTREAM_HOST_GONE; +extern const TQName TQN_XSTREAM_HOST_UNKNOWN; +extern const TQName TQN_XSTREAM_IMPROPER_ADDRESSIING; +extern const TQName TQN_XSTREAM_INTERNAL_SERVER_ERROR; +extern const TQName TQN_XSTREAM_INVALID_FROM; +extern const TQName TQN_XSTREAM_INVALID_ID; +extern const TQName TQN_XSTREAM_INVALID_NAMESPACE; +extern const TQName TQN_XSTREAM_INVALID_XML; +extern const TQName TQN_XSTREAM_NOT_AUTHORIZED; +extern const TQName TQN_XSTREAM_POLICY_VIOLATION; +extern const TQName TQN_XSTREAM_REMOTE_CONNECTION_FAILED; +extern const TQName TQN_XSTREAM_RESOURCE_CONSTRAINT; +extern const TQName TQN_XSTREAM_RESTRICTED_XML; +extern const TQName TQN_XSTREAM_SEE_OTHER_HOST; +extern const TQName TQN_XSTREAM_SYSTEM_SHUTDOWN; +extern const TQName TQN_XSTREAM_UNDEFINED_CONDITION; +extern const TQName TQN_XSTREAM_UNSUPPORTED_ENCODING; +extern const TQName TQN_XSTREAM_UNSUPPORTED_STANZA_TYPE; +extern const TQName TQN_XSTREAM_UNSUPPORTED_VERSION; +extern const TQName TQN_XSTREAM_XML_NOT_WELL_FORMED; +extern const TQName TQN_XSTREAM_TEXT; + +extern const TQName TQN_TLS_STARTTLS; +extern const TQName TQN_TLS_RETQUIRED; +extern const TQName TQN_TLS_PROCEED; +extern const TQName TQN_TLS_FAILURE; + +extern const TQName TQN_SASL_MECHANISMS; +extern const TQName TQN_SASL_MECHANISM; +extern const TQName TQN_SASL_AUTH; +extern const TQName TQN_SASL_CHALLENGE; +extern const TQName TQN_SASL_RESPONSE; +extern const TQName TQN_SASL_ABORT; +extern const TQName TQN_SASL_SUCCESS; +extern const TQName TQN_SASL_FAILURE; +extern const TQName TQN_SASL_ABORTED; +extern const TQName TQN_SASL_INCORRECT_ENCODING; +extern const TQName TQN_SASL_INVALID_AUTHZID; +extern const TQName TQN_SASL_INVALID_MECHANISM; +extern const TQName TQN_SASL_MECHANISM_TOO_WEAK; +extern const TQName TQN_SASL_NOT_AUTHORIZED; +extern const TQName TQN_SASL_TEMPORARY_AUTH_FAILURE; + +extern const TQName TQN_DIALBACK_RESULT; +extern const TQName TQN_DIALBACK_VERIFY; + +extern const TQName TQN_STANZA_BAD_REQUEST; +extern const TQName TQN_STANZA_CONFLICT; +extern const TQName TQN_STANZA_FEATURE_NOT_IMPLEMENTED; +extern const TQName TQN_STANZA_FORBIDDEN; +extern const TQName TQN_STANZA_GONE; +extern const TQName TQN_STANZA_INTERNAL_SERVER_ERROR; +extern const TQName TQN_STANZA_ITEM_NOT_FOUND; +extern const TQName TQN_STANZA_JID_MALFORMED; +extern const TQName TQN_STANZA_NOT_ACCEPTABLE; +extern const TQName TQN_STANZA_NOT_ALLOWED; +extern const TQName TQN_STANZA_PAYMENT_RETQUIRED; +extern const TQName TQN_STANZA_RECIPIENT_UNAVAILABLE; +extern const TQName TQN_STANZA_REDIRECT; +extern const TQName TQN_STANZA_REGISTRATION_RETQUIRED; +extern const TQName TQN_STANZA_REMOTE_SERVER_NOT_FOUND; +extern const TQName TQN_STANZA_REMOTE_SERVER_TIMEOUT; +extern const TQName TQN_STANZA_RESOURCE_CONSTRAINT; +extern const TQName TQN_STANZA_SERVICE_UNAVAILABLE; +extern const TQName TQN_STANZA_SUBSCRIPTION_RETQUIRED; +extern const TQName TQN_STANZA_UNDEFINED_CONDITION; +extern const TQName TQN_STANZA_UNEXPECTED_REQUEST; +extern const TQName TQN_STANZA_TEXT; + +extern const TQName TQN_BIND_BIND; +extern const TQName TQN_BIND_RESOURCE; +extern const TQName TQN_BIND_JID; + +extern const TQName TQN_MESSAGE; +extern const TQName TQN_BODY; +extern const TQName TQN_SUBJECT; +extern const TQName TQN_THREAD; +extern const TQName TQN_PRESENCE; +extern const TQName TQN_SHOW; +extern const TQName TQN_STATUS; +extern const TQName TQN_LANG; +extern const TQName TQN_PRIORITY; +extern const TQName TQN_IQ; +extern const TQName TQN_ERROR; + +extern const TQName TQN_SERVER_MESSAGE; +extern const TQName TQN_SERVER_BODY; +extern const TQName TQN_SERVER_SUBJECT; +extern const TQName TQN_SERVER_THREAD; +extern const TQName TQN_SERVER_PRESENCE; +extern const TQName TQN_SERVER_SHOW; +extern const TQName TQN_SERVER_STATUS; +extern const TQName TQN_SERVER_LANG; +extern const TQName TQN_SERVER_PRIORITY; +extern const TQName TQN_SERVER_IQ; +extern const TQName TQN_SERVER_ERROR; + +extern const TQName TQN_SESSION_SESSION; + +extern const TQName TQN_PRIVACY_TQUERY; +extern const TQName TQN_PRIVACY_ACTIVE; +extern const TQName TQN_PRIVACY_DEFAULT; +extern const TQName TQN_PRIVACY_LIST; +extern const TQName TQN_PRIVACY_ITEM; +extern const TQName TQN_PRIVACY_IQ; +extern const TQName TQN_PRIVACY_MESSAGE; +extern const TQName TQN_PRIVACY_PRESENCE_IN; +extern const TQName TQN_PRIVACY_PRESENCE_OUT; + +extern const TQName TQN_ROSTER_TQUERY; +extern const TQName TQN_ROSTER_ITEM; +extern const TQName TQN_ROSTER_GROUP; + +extern const TQName TQN_VCARD_TQUERY; +extern const TQName TQN_VCARD_FN; + +extern const TQName TQN_XML_LANG; + +extern const TQName TQN_ENCODING; +extern const TQName TQN_VERSION; +extern const TQName TQN_TO; +extern const TQName TQN_FROM; +extern const TQName TQN_TYPE; +extern const TQName TQN_ID; +extern const TQName TQN_CODE; +extern const TQName TQN_NAME; +extern const TQName TQN_VALUE; +extern const TQName TQN_ACTION; +extern const TQName TQN_ORDER; +extern const TQName TQN_MECHANISM; +extern const TQName TQN_ASK; +extern const TQName TQN_JID; +extern const TQName TQN_SUBSCRIPTION; + + +extern const TQName TQN_XMLNS_CLIENT; +extern const TQName TQN_XMLNS_SERVER; +extern const TQName TQN_XMLNS_STREAM; // Presence extern const std::string STR_SHOW_AWAY; @@ -269,31 +269,31 @@ extern const std::string STR_UNSUBSCRIBED; // JEP 0030 -extern const QName QN_NODE; -extern const QName QN_CATEGORY; -extern const QName QN_VAR; +extern const TQName TQN_NODE; +extern const TQName TQN_CATEGORY; +extern const TQName TQN_VAR; extern const std::string NS_DISCO_INFO; extern const std::string NS_DISCO_ITEMS; -extern const QName QN_DISCO_INFO_QUERY; -extern const QName QN_DISCO_IDENTITY; -extern const QName QN_DISCO_FEATURE; +extern const TQName TQN_DISCO_INFO_TQUERY; +extern const TQName TQN_DISCO_IDENTITY; +extern const TQName TQN_DISCO_FEATURE; -extern const QName QN_DISCO_ITEMS_QUERY; -extern const QName QN_DISCO_ITEM; +extern const TQName TQN_DISCO_ITEMS_TQUERY; +extern const TQName TQN_DISCO_ITEM; // JEP 0115 extern const std::string NS_CAPS; -extern const QName QN_CAPS_C; -extern const QName QN_VER; -extern const QName QN_EXT; +extern const TQName TQN_CAPS_C; +extern const TQName TQN_VER; +extern const TQName TQN_EXT; // JEP 0091 Delayed Delivery extern const std::string kNSDelay; -extern const QName kQnDelayX; -extern const QName kQnStamp; +extern const TQName kQnDelayX; +extern const TQName kQnStamp; } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/jid.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/jid.cc index b742e03a..48a89504 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/jid.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/jid.cc @@ -56,13 +56,13 @@ Jid::Jid(const std::string & jid_string) { } // First find the slash and slice of that part - size_t slash = jid_string.find('/'); + size_t slash = jid_string.tqfind('/'); std::string resource_name = (slash == std::string::npos ? STR_EMPTY : jid_string.substr(slash + 1)); // Now look for the node std::string node_name; - size_t at = jid_string.find('@'); + size_t at = jid_string.tqfind('@'); size_t domain_begin; if (at < slash && at != std::string::npos) { node_name = jid_string.substr(0, at); @@ -80,13 +80,13 @@ Jid::Jid(const std::string & jid_string) { // avoid allocating these constants repeatedly std::string domain_name; - if (domain_length == 9 && jid_string.find("gmail.com", domain_begin) == domain_begin) { + if (domain_length == 9 && jid_string.tqfind("gmail.com", domain_begin) == domain_begin) { domain_name = STR_GMAIL_COM; } - else if (domain_length == 14 && jid_string.find("googlemail.com", domain_begin) == domain_begin) { + else if (domain_length == 14 && jid_string.tqfind("googlemail.com", domain_begin) == domain_begin) { domain_name = STR_GOOGLEMAIL_COM; } - else if (domain_length == 10 && jid_string.find("google.com", domain_begin) == domain_begin) { + else if (domain_length == 10 && jid_string.tqfind("google.com", domain_begin) == domain_begin) { domain_name = STR_GOOGLE_COM; } else { diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/plainsaslhandler.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/plainsaslhandler.h index 659820f5..488dc56e 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/plainsaslhandler.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/plainsaslhandler.h @@ -49,7 +49,7 @@ public: return ""; } - std::vector<std::string>::const_iterator it = std::find(mechanisms.begin(), mechanisms.end(), "PLAIN"); + std::vector<std::string>::const_iterator it = std::tqfind(mechanisms.begin(), mechanisms.end(), "PLAIN"); if (it == mechanisms.end()) { return ""; } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslcookiemechanism.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslcookiemechanism.h index a6630d90..dbd56a24 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslcookiemechanism.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslcookiemechanism.h @@ -44,8 +44,8 @@ public: virtual XmlElement * StartSaslAuth() { // send initial request - XmlElement * el = new XmlElement(QN_SASL_AUTH, true); - el->AddAttr(QN_MECHANISM, mechanism_); + XmlElement * el = new XmlElement(TQN_SASL_AUTH, true); + el->AddAttr(TQN_MECHANISM, mechanism_); std::string credential; credential.append("\0", 1); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslmechanism.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslmechanism.cc index 092df104..4a6d7c24 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslmechanism.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslmechanism.cc @@ -34,12 +34,12 @@ namespace buzz { XmlElement * SaslMechanism::StartSaslAuth() { - return new XmlElement(QN_SASL_AUTH, true); + return new XmlElement(TQN_SASL_AUTH, true); } XmlElement * SaslMechanism::HandleSaslChallenge(const XmlElement * challenge) { - return new XmlElement(QN_SASL_ABORT, true); + return new XmlElement(TQN_SASL_ABORT, true); } void diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslplainmechanism.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslplainmechanism.h index 7e0b0562..2d8c1b76 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslplainmechanism.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslplainmechanism.h @@ -43,8 +43,8 @@ public: virtual XmlElement * StartSaslAuth() { // send initial request - XmlElement * el = new XmlElement(QN_SASL_AUTH, true); - el->AddAttr(QN_MECHANISM, "PLAIN"); + XmlElement * el = new XmlElement(TQN_SASL_AUTH, true); + el->AddAttr(TQN_MECHANISM, "PLAIN"); FormatXmppPassword credential; credential.Append("\0", 1); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc index 959b6f88..f5b9d0b4 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc @@ -86,7 +86,7 @@ public: void OnSocketClosed(); }; -XmppReturnStatus +XmppReturntqStatus XmppClient::Connect(const XmppClientSettings & settings, AsyncSocket * socket, PreXmppAuth * pre_auth) { if (socket == NULL) return XMPP_RETURN_BADARGUMENT; @@ -237,7 +237,7 @@ XmppClient::ProcessResponse() { return STATE_BLOCKED; } -XmppReturnStatus +XmppReturntqStatus XmppClient::Disconnect() { if (d_->socket_.get() == NULL) return XMPP_RETURN_BADSTATE; @@ -245,7 +245,7 @@ XmppClient::Disconnect() { return XMPP_RETURN_OK; } -XmppClient::XmppClient(Task * parent) : Task(parent), +XmppClient::XmppClient(Task * tqparent) : Task(tqparent), delivering_signal_(false) { d_.reset(new Private(this)); } @@ -263,17 +263,17 @@ XmppClient::NextId() { return d_->engine_->NextId(); } -XmppReturnStatus +XmppReturntqStatus XmppClient::SendStanza(const XmlElement * stanza) { return d_->engine_->SendStanza(stanza); } -XmppReturnStatus +XmppReturntqStatus XmppClient::SendStanzaError(const XmlElement * old_stanza, XmppStanzaError xse, const std::string & message) { return d_->engine_->SendStanzaError(old_stanza, xse, message); } -XmppReturnStatus +XmppReturntqStatus XmppClient::SendRaw(const std::string & text) { return d_->engine_->SendRaw(text); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.h index f8b4798c..540d774d 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.h @@ -51,9 +51,9 @@ class CaptchaChallenge; // ///////////////////////////////////////////////////////////////////// // -// See Task first. XmppClient is a parent task for XmppTasks. +// See Task first. XmppClient is a tqparent task for XmppTasks. // -// XmppClient is a task which is designed to be the parent task for +// XmppClient is a task which is designed to be the tqparent task for // all tasks that depend on a single Xmpp connection. If you want to, // for example, listen for subscription requests forever, then your // listener should be a task that is a child of the XmppClient that owns @@ -71,17 +71,17 @@ class CaptchaChallenge; class XmppClient : public Task, public sigslot::has_slots<> { public: - XmppClient(Task * parent); + XmppClient(Task * tqparent); ~XmppClient(); - XmppReturnStatus Connect(const XmppClientSettings & settings, + XmppReturntqStatus Connect(const XmppClientSettings & settings, AsyncSocket * socket, PreXmppAuth * preauth); virtual Task * GetParent(int code); virtual int ProcessStart(); virtual int ProcessResponse(); - XmppReturnStatus Disconnect(); + XmppReturntqStatus Disconnect(); const Jid & jid(); sigslot::signal1<XmppEngine::State> SignalStateChange; @@ -97,9 +97,9 @@ public: std::string GetAuthCookie(); std::string NextId(); - XmppReturnStatus SendStanza(const XmlElement *stanza); - XmppReturnStatus SendRaw(const std::string & text); - XmppReturnStatus SendStanzaError(const XmlElement * pelOriginal, + XmppReturntqStatus SendStanza(const XmlElement *stanza); + XmppReturntqStatus SendRaw(const std::string & text); + XmppReturntqStatus SendStanzaError(const XmlElement * pelOriginal, XmppStanzaError code, const std::string & text); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h index ef8f2ea8..58576328 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h @@ -30,7 +30,7 @@ // also part of the API #include "talk/xmpp/jid.h" -#include "talk/xmllite/qname.h" +#include "talk/xmllite/tqname.h" #include "talk/xmllite/xmlelement.h" @@ -53,22 +53,22 @@ enum XmppStanzaError { XSE_JID_MALFORMED, XSE_NOT_ACCEPTABLE, XSE_NOT_ALLOWED, - XSE_PAYMENT_REQUIRED, + XSE_PAYMENT_RETQUIRED, XSE_RECIPIENT_UNAVAILABLE, XSE_REDIRECT, - XSE_REGISTRATION_REQUIRED, + XSE_REGISTRATION_RETQUIRED, XSE_SERVER_NOT_FOUND, XSE_SERVER_TIMEOUT, XSE_RESOURCE_CONSTRAINT, XSE_SERVICE_UNAVAILABLE, - XSE_SUBSCRIPTION_REQUIRED, + XSE_SUBSCRIPTION_RETQUIRED, XSE_UNDEFINED_CONDITION, XSE_UNEXPECTED_REQUEST, }; -// XmppReturnStatus +// XmppReturntqStatus // This is used by API functions to synchronously return status. -enum XmppReturnStatus { +enum XmppReturntqStatus { XMPP_RETURN_OK, XMPP_RETURN_BADARGUMENT, XMPP_RETURN_BADSTATE, @@ -171,34 +171,34 @@ public: // SOCKET INPUT AND OUTPUT ------------------------------------------------ //! Registers the handler for socket output - virtual XmppReturnStatus SetOutputHandler(XmppOutputHandler *pxoh) = 0; + virtual XmppReturntqStatus SetOutputHandler(XmppOutputHandler *pxoh) = 0; //! Provides socket input to the engine - virtual XmppReturnStatus HandleInput(const char * bytes, size_t len) = 0; + virtual XmppReturntqStatus HandleInput(const char * bytes, size_t len) = 0; //! Advises the engine that the socket has closed - virtual XmppReturnStatus ConnectionClosed() = 0; + virtual XmppReturntqStatus ConnectionClosed() = 0; // SESSION SETUP --------------------------------------------------------- //! Indicates the (bare) JID for the user to use. - virtual XmppReturnStatus SetUser(const Jid & jid)= 0; + virtual XmppReturntqStatus SetUser(const Jid & jid)= 0; //! Get the login (bare) JID. virtual const Jid & GetUser() = 0; //! Provides different methods for credentials for login. //! Takes ownership of this object; deletes when login is done - virtual XmppReturnStatus SetSaslHandler(SaslHandler * h) = 0; + virtual XmppReturntqStatus SetSaslHandler(SaslHandler * h) = 0; //! Sets whether TLS will be used within the connection (default true). - virtual XmppReturnStatus SetUseTls(bool useTls) = 0; + virtual XmppReturntqStatus SetUseTls(bool useTls) = 0; //! Sets an alternate domain from which we allows TLS certificates. //! This is for use in the case where a we want to allow a proxy to //! serve up its own certificate rather than one owned by the underlying //! domain. - virtual XmppReturnStatus SetTlsServerDomain(const std::string & proxy_domain) = 0; + virtual XmppReturntqStatus SetTlsServerDomain(const std::string & proxy_domain) = 0; //! Gets whether TLS will be used within the connection. virtual bool GetUseTls() = 0; @@ -206,7 +206,7 @@ public: //! Sets the request resource name, if any (optional). //! Note that the resource name may be overridden by the server; after //! binding, the actual resource name is available as part of FullJid(). - virtual XmppReturnStatus SetRequestedResource(const std::string& resource) = 0; + virtual XmppReturntqStatus SetRequestedResource(const std::string& resource) = 0; //! Gets the request resource name. virtual const std::string & GetRequestedResource() = 0; @@ -214,12 +214,12 @@ public: // SESSION MANAGEMENT --------------------------------------------------- //! Set callback for state changes. - virtual XmppReturnStatus SetSessionHandler(XmppSessionHandler* handler) = 0; + virtual XmppReturntqStatus SetSessionHandler(XmppSessionHandler* handler) = 0; //! Initiates the XMPP connection. //! After supplying connection settings, call this once to initiate, //! (optionally) encrypt, authenticate, and bind the connection. - virtual XmppReturnStatus Connect() = 0; + virtual XmppReturntqStatus Connect() = 0; //! The current engine state. virtual State GetState() = 0; @@ -240,7 +240,7 @@ public: //! Sends CloseConnection to output, and disconnects and registered //! session handlers. After Disconnect completes, it is guaranteed //! that no further callbacks will be made. - virtual XmppReturnStatus Disconnect() = 0; + virtual XmppReturntqStatus Disconnect() = 0; // APPLICATION USE ------------------------------------------------------- @@ -257,33 +257,33 @@ public: //! Adds a listener for session events. //! Stanza delivery is chained to session handlers; the first to //! return 'true' is the last to get each stanza. - virtual XmppReturnStatus AddStanzaHandler(XmppStanzaHandler* handler, HandlerLevel level = HL_PEEK) = 0; + virtual XmppReturntqStatus AddStanzaHandler(XmppStanzaHandler* handler, HandlerLevel level = HL_PEEK) = 0; //! Removes a listener for session events. - virtual XmppReturnStatus RemoveStanzaHandler(XmppStanzaHandler* handler) = 0; + virtual XmppReturntqStatus RemoveStanzaHandler(XmppStanzaHandler* handler) = 0; //! Sends a stanza to the server. - virtual XmppReturnStatus SendStanza(const XmlElement * pelStanza) = 0; + virtual XmppReturntqStatus SendStanza(const XmlElement * pelStanza) = 0; //! Sends raw text to the server - virtual XmppReturnStatus SendRaw(const std::string & text) = 0; + virtual XmppReturntqStatus SendRaw(const std::string & text) = 0; //! Sends an iq to the server, and registers a callback for the result. //! Returns the cookie passed to the result handler. - virtual XmppReturnStatus SendIq(const XmlElement* pelStanza, + virtual XmppReturntqStatus SendIq(const XmlElement* pelStanza, XmppIqHandler* iq_handler, XmppIqCookie* cookie) = 0; //! Unregisters an iq callback handler given its cookie. //! No callback will come to this handler after it's unregistered. - virtual XmppReturnStatus RemoveIqHandler(XmppIqCookie cookie, + virtual XmppReturntqStatus RemoveIqHandler(XmppIqCookie cookie, XmppIqHandler** iq_handler) = 0; //! Forms and sends an error in response to the given stanza. //! Swaps to and from, sets type to "error", and adds error information //! based on the passed code. Text is optional and may be STR_EMPTY. - virtual XmppReturnStatus SendStanzaError(const XmlElement * pelOriginal, + virtual XmppReturntqStatus SendStanzaError(const XmlElement * pelOriginal, XmppStanzaError code, const std::string & text) = 0; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.cc index 173d711b..c9569524 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.cc @@ -85,7 +85,7 @@ XmppEngineImpl::~XmppEngineImpl() { DeleteIqCookies(); } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::SetOutputHandler(XmppOutputHandler* output_handler) { if (state_ != STATE_START) return XMPP_RETURN_BADSTATE; @@ -95,7 +95,7 @@ XmppEngineImpl::SetOutputHandler(XmppOutputHandler* output_handler) { return XMPP_RETURN_OK; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::SetSessionHandler(XmppSessionHandler* session_handler) { if (state_ != STATE_START) return XMPP_RETURN_BADSTATE; @@ -105,7 +105,7 @@ XmppEngineImpl::SetSessionHandler(XmppSessionHandler* session_handler) { return XMPP_RETURN_OK; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::HandleInput(const char * bytes, size_t len) { if (state_ < STATE_OPENING || state_ > STATE_OPEN) return XMPP_RETURN_BADSTATE; @@ -117,7 +117,7 @@ XmppEngineImpl::HandleInput(const char * bytes, size_t len) { return XMPP_RETURN_OK; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::ConnectionClosed() { if (state_ != STATE_CLOSED) { EnterExit ee(this); @@ -128,7 +128,7 @@ XmppEngineImpl::ConnectionClosed() { return XMPP_RETURN_OK; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::SetUseTls(bool useTls) { if (state_ != STATE_START) return XMPP_RETURN_BADSTATE; @@ -138,7 +138,7 @@ XmppEngineImpl::SetUseTls(bool useTls) { return XMPP_RETURN_OK; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::SetTlsServerDomain(const std::string & tls_server_domain) { if (state_ != STATE_START) return XMPP_RETURN_BADSTATE; @@ -153,7 +153,7 @@ XmppEngineImpl::GetUseTls() { return tls_needed_; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::SetUser(const Jid & jid) { if (state_ != STATE_START) return XMPP_RETURN_BADSTATE; @@ -168,7 +168,7 @@ XmppEngineImpl::GetUser() { return user_jid_; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::SetSaslHandler(SaslHandler * sasl_handler) { if (state_ != STATE_START) return XMPP_RETURN_BADSTATE; @@ -177,7 +177,7 @@ XmppEngineImpl::SetSaslHandler(SaslHandler * sasl_handler) { return XMPP_RETURN_OK; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::SetRequestedResource(const std::string & resource) { if (state_ != STATE_START) return XMPP_RETURN_BADSTATE; @@ -192,7 +192,7 @@ XmppEngineImpl::GetRequestedResource() { return requested_resource_; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::AddStanzaHandler(XmppStanzaHandler * stanza_handler, XmppEngine::HandlerLevel level) { if (state_ == STATE_CLOSED) @@ -203,7 +203,7 @@ XmppEngineImpl::AddStanzaHandler(XmppStanzaHandler * stanza_handler, return XMPP_RETURN_OK; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::RemoveStanzaHandler(XmppStanzaHandler * stanza_handler) { bool found = false; @@ -227,7 +227,7 @@ XmppEngineImpl::RemoveStanzaHandler(XmppStanzaHandler * stanza_handler) { return XMPP_RETURN_OK; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::Connect() { if (state_ != STATE_START) return XMPP_RETURN_BADSTATE; @@ -245,7 +245,7 @@ XmppEngineImpl::Connect() { return XMPP_RETURN_OK; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::SendStanza(const XmlElement * element) { if (state_ == STATE_CLOSED) return XMPP_RETURN_BADSTATE; @@ -263,7 +263,7 @@ XmppEngineImpl::SendStanza(const XmlElement * element) { return XMPP_RETURN_OK; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::SendRaw(const std::string & text) { if (state_ == STATE_CLOSED || login_task_.get()) return XMPP_RETURN_BADSTATE; @@ -282,7 +282,7 @@ XmppEngineImpl::NextId() { return ss.str(); } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::Disconnect() { if (state_ != STATE_CLOSED) { @@ -317,7 +317,7 @@ XmppEngineImpl::IncomingStanza(const XmlElement * stanza) { if (HasError() || raised_reset_) return; - if (stanza->Name() == QN_STREAM_ERROR) { + if (stanza->Name() == TQN_STREAM_ERROR) { // Explicit XMPP stream error SignalStreamError(stanza); } else if (login_task_.get()) { @@ -344,8 +344,8 @@ XmppEngineImpl::IncomingStanza(const XmlElement * stanza) { // If nobody wants to handle a stanza then send back an error. // Only do this for IQ stanzas as messages should probably just be dropped // and presence stanzas should certainly be dropped. - std::string type = stanza->Attr(QN_TYPE); - if (stanza->Name() == QN_IQ && + std::string type = stanza->Attr(TQN_TYPE); + if (stanza->Name() == TQN_IQ && !(type == "error" || type == "result")) { SendStanzaError(stanza, XSE_FEATURE_NOT_IMPLEMENTED, STR_EMPTY); } @@ -377,7 +377,7 @@ XmppEngineImpl::InternalSendStanza(const XmlElement * element) { // It should really never be necessary to set a FROM attribute on a stanza. // It is implied by the bind on the stream and if you get it wrong // (by flipping from/to on a message?) the server will close the stream. - ASSERT(!element->HasAttr(QN_FROM)); + ASSERT(!element->HasAttr(TQN_FROM)); // TODO: consider caching the XmlPrinter XmlPrinter::PrintXml(output_.get(), element, diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.h index c36f168c..6011d9e8 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.h @@ -57,33 +57,33 @@ public: // SOCKET INPUT AND OUTPUT ------------------------------------------------ //! Registers the handler for socket output - virtual XmppReturnStatus SetOutputHandler(XmppOutputHandler *pxoh); + virtual XmppReturntqStatus SetOutputHandler(XmppOutputHandler *pxoh); //! Provides socket input to the engine - virtual XmppReturnStatus HandleInput(const char * bytes, size_t len); + virtual XmppReturntqStatus HandleInput(const char * bytes, size_t len); //! Advises the engine that the socket has closed - virtual XmppReturnStatus ConnectionClosed(); + virtual XmppReturntqStatus ConnectionClosed(); // SESSION SETUP --------------------------------------------------------- //! Indicates the (bare) JID for the user to use. - virtual XmppReturnStatus SetUser(const Jid & jid); + virtual XmppReturntqStatus SetUser(const Jid & jid); //! Get the login (bare) JID. virtual const Jid & GetUser(); //! Indicates the autentication to use. Takes ownership of the object. - virtual XmppReturnStatus SetSaslHandler(SaslHandler * sasl_handler); + virtual XmppReturntqStatus SetSaslHandler(SaslHandler * sasl_handler); //! Sets whether TLS will be used within the connection (default true). - virtual XmppReturnStatus SetUseTls(bool useTls); + virtual XmppReturntqStatus SetUseTls(bool useTls); //! Sets an alternate domain from which we allows TLS certificates. //! This is for use in the case where a we want to allow a proxy to //! serve up its own certificate rather than one owned by the underlying //! domain. - virtual XmppReturnStatus SetTlsServerDomain(const std::string & proxy_domain); + virtual XmppReturntqStatus SetTlsServerDomain(const std::string & proxy_domain); //! Gets whether TLS will be used within the connection. virtual bool GetUseTls(); @@ -91,7 +91,7 @@ public: //! Sets the request resource name, if any (optional). //! Note that the resource name may be overridden by the server; after //! binding, the actual resource name is available as part of FullJid(). - virtual XmppReturnStatus SetRequestedResource(const std::string& resource); + virtual XmppReturntqStatus SetRequestedResource(const std::string& resource); //! Gets the request resource name. virtual const std::string & GetRequestedResource(); @@ -99,12 +99,12 @@ public: // SESSION MANAGEMENT --------------------------------------------------- //! Set callback for state changes. - virtual XmppReturnStatus SetSessionHandler(XmppSessionHandler* handler); + virtual XmppReturntqStatus SetSessionHandler(XmppSessionHandler* handler); //! Initiates the XMPP connection. //! After supplying connection settings, call this once to initiate, //! (optionally) encrypt, authenticate, and bind the connection. - virtual XmppReturnStatus Connect(); + virtual XmppReturntqStatus Connect(); //! The current engine state. virtual State GetState() { return state_; } @@ -125,40 +125,40 @@ public: //! Sends CloseConnection to output, and disconnects and registered //! session handlers. After Disconnect completes, it is guaranteed //! that no further callbacks will be made. - virtual XmppReturnStatus Disconnect(); + virtual XmppReturntqStatus Disconnect(); // APPLICATION USE ------------------------------------------------------- //! Adds a listener for session events. //! Stanza delivery is chained to session handlers; the first to //! return 'true' is the last to get each stanza. - virtual XmppReturnStatus AddStanzaHandler(XmppStanzaHandler* handler, + virtual XmppReturntqStatus AddStanzaHandler(XmppStanzaHandler* handler, XmppEngine::HandlerLevel level); //! Removes a listener for session events. - virtual XmppReturnStatus RemoveStanzaHandler(XmppStanzaHandler* handler); + virtual XmppReturntqStatus RemoveStanzaHandler(XmppStanzaHandler* handler); //! Sends a stanza to the server. - virtual XmppReturnStatus SendStanza(const XmlElement * pelStanza); + virtual XmppReturntqStatus SendStanza(const XmlElement * pelStanza); //! Sends raw text to the server - virtual XmppReturnStatus SendRaw(const std::string & text); + virtual XmppReturntqStatus SendRaw(const std::string & text); //! Sends an iq to the server, and registers a callback for the result. //! Returns the cookie passed to the result handler. - virtual XmppReturnStatus SendIq(const XmlElement* pelStanza, + virtual XmppReturntqStatus SendIq(const XmlElement* pelStanza, XmppIqHandler* iq_handler, XmppIqCookie* cookie); //! Unregisters an iq callback handler given its cookie. //! No callback will come to this handler after it's unregistered. - virtual XmppReturnStatus RemoveIqHandler(XmppIqCookie cookie, + virtual XmppReturntqStatus RemoveIqHandler(XmppIqCookie cookie, XmppIqHandler** iq_handler); //! Forms and sends an error in response to the given stanza. //! Swaps to and from, sets type to "error", and adds error information //! based on the passed code. Text is optional and may be STR_EMPTY. - virtual XmppReturnStatus SendStanzaError(const XmlElement * pelOriginal, + virtual XmppReturntqStatus SendStanzaError(const XmlElement * pelOriginal, XmppStanzaError code, const std::string & text); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc index eb623ed9..50ca23c1 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc @@ -54,26 +54,26 @@ private: }; -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::SendIq(const XmlElement * element, XmppIqHandler * iq_handler, XmppIqCookie* cookie) { if (state_ == STATE_CLOSED) return XMPP_RETURN_BADSTATE; if (NULL == iq_handler) return XMPP_RETURN_BADARGUMENT; - if (!element || element->Name() != QN_IQ) + if (!element || element->Name() != TQN_IQ) return XMPP_RETURN_BADARGUMENT; - const std::string& type = element->Attr(QN_TYPE); + const std::string& type = element->Attr(TQN_TYPE); if (type != "get" && type != "set") return XMPP_RETURN_BADARGUMENT; - if (!element->HasAttr(QN_ID)) + if (!element->HasAttr(TQN_ID)) return XMPP_RETURN_BADARGUMENT; - const std::string& id = element->Attr(QN_ID); + const std::string& id = element->Attr(TQN_ID); XmppIqEntry * iq_entry = new XmppIqEntry(id, - element->Attr(QN_TO), + element->Attr(TQN_TO), this, iq_handler); iq_entries_->push_back(iq_entry); SendStanza(element); @@ -85,13 +85,13 @@ XmppEngineImpl::SendIq(const XmlElement * element, XmppIqHandler * iq_handler, } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::RemoveIqHandler(XmppIqCookie cookie, XmppIqHandler ** iq_handler) { std::vector<XmppIqEntry*, std::allocator<XmppIqEntry*> >::iterator pos; - pos = std::find(iq_entries_->begin(), + pos = std::tqfind(iq_entries_->begin(), iq_entries_->end(), reinterpret_cast<XmppIqEntry*>(cookie)); @@ -118,11 +118,11 @@ XmppEngineImpl::DeleteIqCookies() { } static void -AecImpl(XmlElement * error_element, const QName & name, +AecImpl(XmlElement * error_element, const TQName & name, const char * type, const char * code) { - error_element->AddElement(new XmlElement(QN_ERROR)); - error_element->AddAttr(QN_CODE, code, 1); - error_element->AddAttr(QN_TYPE, type, 1); + error_element->AddElement(new XmlElement(TQN_ERROR)); + error_element->AddAttr(TQN_CODE, code, 1); + error_element->AddAttr(TQN_TYPE, type, 1); error_element->AddElement(new XmlElement(name, true), 1); } @@ -131,75 +131,75 @@ static void AddErrorCode(XmlElement * error_element, XmppStanzaError code) { switch (code) { case XSE_BAD_REQUEST: - AecImpl(error_element, QN_STANZA_BAD_REQUEST, "modify", "400"); + AecImpl(error_element, TQN_STANZA_BAD_REQUEST, "modify", "400"); break; case XSE_CONFLICT: - AecImpl(error_element, QN_STANZA_CONFLICT, "cancel", "409"); + AecImpl(error_element, TQN_STANZA_CONFLICT, "cancel", "409"); break; case XSE_FEATURE_NOT_IMPLEMENTED: - AecImpl(error_element, QN_STANZA_FEATURE_NOT_IMPLEMENTED, + AecImpl(error_element, TQN_STANZA_FEATURE_NOT_IMPLEMENTED, "cancel", "501"); break; case XSE_FORBIDDEN: - AecImpl(error_element, QN_STANZA_FORBIDDEN, "auth", "403"); + AecImpl(error_element, TQN_STANZA_FORBIDDEN, "auth", "403"); break; case XSE_GONE: - AecImpl(error_element, QN_STANZA_GONE, "modify", "302"); + AecImpl(error_element, TQN_STANZA_GONE, "modify", "302"); break; case XSE_INTERNAL_SERVER_ERROR: - AecImpl(error_element, QN_STANZA_INTERNAL_SERVER_ERROR, "wait", "500"); + AecImpl(error_element, TQN_STANZA_INTERNAL_SERVER_ERROR, "wait", "500"); break; case XSE_ITEM_NOT_FOUND: - AecImpl(error_element, QN_STANZA_ITEM_NOT_FOUND, "cancel", "404"); + AecImpl(error_element, TQN_STANZA_ITEM_NOT_FOUND, "cancel", "404"); break; case XSE_JID_MALFORMED: - AecImpl(error_element, QN_STANZA_JID_MALFORMED, "modify", "400"); + AecImpl(error_element, TQN_STANZA_JID_MALFORMED, "modify", "400"); break; case XSE_NOT_ACCEPTABLE: - AecImpl(error_element, QN_STANZA_NOT_ACCEPTABLE, "cancel", "406"); + AecImpl(error_element, TQN_STANZA_NOT_ACCEPTABLE, "cancel", "406"); break; case XSE_NOT_ALLOWED: - AecImpl(error_element, QN_STANZA_NOT_ALLOWED, "cancel", "405"); + AecImpl(error_element, TQN_STANZA_NOT_ALLOWED, "cancel", "405"); break; - case XSE_PAYMENT_REQUIRED: - AecImpl(error_element, QN_STANZA_PAYMENT_REQUIRED, "auth", "402"); + case XSE_PAYMENT_RETQUIRED: + AecImpl(error_element, TQN_STANZA_PAYMENT_RETQUIRED, "auth", "402"); break; case XSE_RECIPIENT_UNAVAILABLE: - AecImpl(error_element, QN_STANZA_RECIPIENT_UNAVAILABLE, "wait", "404"); + AecImpl(error_element, TQN_STANZA_RECIPIENT_UNAVAILABLE, "wait", "404"); break; case XSE_REDIRECT: - AecImpl(error_element, QN_STANZA_REDIRECT, "modify", "302"); + AecImpl(error_element, TQN_STANZA_REDIRECT, "modify", "302"); break; - case XSE_REGISTRATION_REQUIRED: - AecImpl(error_element, QN_STANZA_REGISTRATION_REQUIRED, "auth", "407"); + case XSE_REGISTRATION_RETQUIRED: + AecImpl(error_element, TQN_STANZA_REGISTRATION_RETQUIRED, "auth", "407"); break; case XSE_SERVER_NOT_FOUND: - AecImpl(error_element, QN_STANZA_REMOTE_SERVER_NOT_FOUND, + AecImpl(error_element, TQN_STANZA_REMOTE_SERVER_NOT_FOUND, "cancel", "404"); break; case XSE_SERVER_TIMEOUT: - AecImpl(error_element, QN_STANZA_REMOTE_SERVER_TIMEOUT, "wait", "502"); + AecImpl(error_element, TQN_STANZA_REMOTE_SERVER_TIMEOUT, "wait", "502"); break; case XSE_RESOURCE_CONSTRAINT: - AecImpl(error_element, QN_STANZA_RESOURCE_CONSTRAINT, "wait", "500"); + AecImpl(error_element, TQN_STANZA_RESOURCE_CONSTRAINT, "wait", "500"); break; case XSE_SERVICE_UNAVAILABLE: - AecImpl(error_element, QN_STANZA_SERVICE_UNAVAILABLE, "cancel", "503"); + AecImpl(error_element, TQN_STANZA_SERVICE_UNAVAILABLE, "cancel", "503"); break; - case XSE_SUBSCRIPTION_REQUIRED: - AecImpl(error_element, QN_STANZA_SUBSCRIPTION_REQUIRED, "auth", "407"); + case XSE_SUBSCRIPTION_RETQUIRED: + AecImpl(error_element, TQN_STANZA_SUBSCRIPTION_RETQUIRED, "auth", "407"); break; case XSE_UNDEFINED_CONDITION: - AecImpl(error_element, QN_STANZA_UNDEFINED_CONDITION, "wait", "500"); + AecImpl(error_element, TQN_STANZA_UNDEFINED_CONDITION, "wait", "500"); break; case XSE_UNEXPECTED_REQUEST: - AecImpl(error_element, QN_STANZA_UNEXPECTED_REQUEST, "wait", "400"); + AecImpl(error_element, TQN_STANZA_UNEXPECTED_REQUEST, "wait", "400"); break; } } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::SendStanzaError(const XmlElement * element_original, XmppStanzaError code, const std::string & text) { @@ -208,22 +208,22 @@ XmppEngineImpl::SendStanzaError(const XmlElement * element_original, return XMPP_RETURN_BADSTATE; XmlElement error_element(element_original->Name()); - error_element.AddAttr(QN_TYPE, "error"); + error_element.AddAttr(TQN_TYPE, "error"); // copy attrs, copy 'from' to 'to' and strip 'from' for (const XmlAttr * attribute = element_original->FirstAttr(); attribute; attribute = attribute->NextAttr()) { - QName name = attribute->Name(); - if (name == QN_TO) + TQName name = attribute->Name(); + if (name == TQN_TO) continue; // no need to put a from attr. Server will stamp stanza - else if (name == QN_FROM) - name = QN_TO; - else if (name == QN_TYPE) + else if (name == TQN_FROM) + name = TQN_TO; + else if (name == TQN_TYPE) continue; error_element.AddAttr(name, attribute->Value()); } - // copy children + // copy tqchildren for (const XmlChild * child = element_original->FirstChild(); child; child = child->NextChild()) { @@ -237,7 +237,7 @@ XmppEngineImpl::SendStanzaError(const XmlElement * element_original, // add error information AddErrorCode(&error_element, code); if (text != STR_EMPTY) { - XmlElement * text_element = new XmlElement(QN_STANZA_TEXT, true); + XmlElement * text_element = new XmlElement(TQN_STANZA_TEXT, true); text_element->AddText(text); error_element.AddElement(text_element); } @@ -252,15 +252,15 @@ bool XmppEngineImpl::HandleIqResponse(const XmlElement * element) { if (iq_entries_->empty()) return false; - if (element->Name() != QN_IQ) + if (element->Name() != TQN_IQ) return false; - std::string type = element->Attr(QN_TYPE); + std::string type = element->Attr(TQN_TYPE); if (type != "result" && type != "error") return false; - if (!element->HasAttr(QN_ID)) + if (!element->HasAttr(TQN_ID)) return false; - std::string id = element->Attr(QN_ID); - std::string from = element->Attr(QN_FROM); + std::string id = element->Attr(TQN_ID); + std::string from = element->Attr(TQN_FROM); for (std::vector<XmppIqEntry *>::iterator it = iq_entries_->begin(); it != iq_entries_->end(); it += 1) { diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpplogintask.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpplogintask.cc index 470c2dc2..9b3fe9bc 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpplogintask.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpplogintask.cc @@ -127,11 +127,11 @@ XmppLoginTask::Advance() { } case LOGINSTATE_TLS_INIT: { - const XmlElement * pelTls = GetFeature(QN_TLS_STARTTLS); + const XmlElement * pelTls = GetFeature(TQN_TLS_STARTTLS); if (!pelTls) return Failure(XmppEngine::ERROR_TLS); - XmlElement el(QN_TLS_STARTTLS, true); + XmlElement el(TQN_TLS_STARTTLS, true); pctx_->InternalSendStanza(&el); state_ = LOGINSTATE_TLS_REQUESTED; continue; @@ -140,7 +140,7 @@ XmppLoginTask::Advance() { case LOGINSTATE_TLS_REQUESTED: { if (NULL == (element = NextStanza())) return true; - if (element->Name() != QN_TLS_PROCEED) + if (element->Name() != TQN_TLS_PROCEED) return Failure(XmppEngine::ERROR_TLS); // The proper domain to verify against is the real underlying @@ -155,7 +155,7 @@ XmppLoginTask::Advance() { } case LOGINSTATE_AUTH_INIT: { - const XmlElement * pelSaslAuth = GetFeature(QN_SASL_MECHANISMS); + const XmlElement * pelSaslAuth = GetFeature(TQN_SASL_MECHANISMS); if (!pelSaslAuth) { return Failure(XmppEngine::ERROR_AUTH); } @@ -163,9 +163,9 @@ XmppLoginTask::Advance() { // Collect together the SASL auth mechanisms presented by the server std::vector<std::string> mechanisms; for (const XmlElement * pelMech = - pelSaslAuth->FirstNamed(QN_SASL_MECHANISM); + pelSaslAuth->FirstNamed(TQN_SASL_MECHANISM); pelMech; - pelMech = pelMech->NextNamed(QN_SASL_MECHANISM)) { + pelMech = pelMech->NextNamed(TQN_SASL_MECHANISM)) { mechanisms.push_back(pelMech->BodyText()); } @@ -199,7 +199,7 @@ XmppLoginTask::Advance() { return true; if (element->Name().Namespace() != NS_SASL) return Failure(XmppEngine::ERROR_AUTH); - if (element->Name() == QN_SASL_CHALLENGE) { + if (element->Name() == TQN_SASL_CHALLENGE) { XmlElement * response = sasl_mech_->HandleSaslChallenge(element); if (response == NULL) { return Failure(XmppEngine::ERROR_AUTH); @@ -209,7 +209,7 @@ XmppLoginTask::Advance() { state_ = LOGINSTATE_SASL_RUNNING; continue; } - if (element->Name() != QN_SASL_SUCCESS) { + if (element->Name() != TQN_SASL_SUCCESS) { return Failure(XmppEngine::ERROR_UNAUTHORIZED); } @@ -220,20 +220,20 @@ XmppLoginTask::Advance() { } case LOGINSTATE_BIND_INIT: { - const XmlElement * pelBindFeature = GetFeature(QN_BIND_BIND); - const XmlElement * pelSessionFeature = GetFeature(QN_SESSION_SESSION); + const XmlElement * pelBindFeature = GetFeature(TQN_BIND_BIND); + const XmlElement * pelSessionFeature = GetFeature(TQN_SESSION_SESSION); if (!pelBindFeature || !pelSessionFeature) return Failure(XmppEngine::ERROR_BIND); - XmlElement iq(QN_IQ); - iq.AddAttr(QN_TYPE, "set"); + XmlElement iq(TQN_IQ); + iq.AddAttr(TQN_TYPE, "set"); iqId_ = pctx_->NextId(); - iq.AddAttr(QN_ID, iqId_); - iq.AddElement(new XmlElement(QN_BIND_BIND, true)); + iq.AddAttr(TQN_ID, iqId_); + iq.AddElement(new XmlElement(TQN_BIND_BIND, true)); if (pctx_->requested_resource_ != STR_EMPTY) { - iq.AddElement(new XmlElement(QN_BIND_RESOURCE), 1); + iq.AddElement(new XmlElement(TQN_BIND_RESOURCE), 1); iq.AddText(pctx_->requested_resource_, 2); } pctx_->InternalSendStanza(&iq); @@ -245,15 +245,15 @@ XmppLoginTask::Advance() { if (NULL == (element = NextStanza())) return true; - if (element->Name() != QN_IQ || element->Attr(QN_ID) != iqId_ || - element->Attr(QN_TYPE) == "get" || element->Attr(QN_TYPE) == "set") + if (element->Name() != TQN_IQ || element->Attr(TQN_ID) != iqId_ || + element->Attr(TQN_TYPE) == "get" || element->Attr(TQN_TYPE) == "set") return true; - if (element->Attr(QN_TYPE) != "result" || element->FirstElement() == NULL || - element->FirstElement()->Name() != QN_BIND_BIND) + if (element->Attr(TQN_TYPE) != "result" || element->FirstElement() == NULL || + element->FirstElement()->Name() != TQN_BIND_BIND) return Failure(XmppEngine::ERROR_BIND); - fullJid_ = Jid(element->FirstElement()->TextNamed(QN_BIND_JID)); + fullJid_ = Jid(element->FirstElement()->TextNamed(TQN_BIND_JID)); if (!fullJid_.IsFull()) { return Failure(XmppEngine::ERROR_BIND); } @@ -264,12 +264,12 @@ XmppLoginTask::Advance() { } // now request session - XmlElement iq(QN_IQ); - iq.AddAttr(QN_TYPE, "set"); + XmlElement iq(TQN_IQ); + iq.AddAttr(TQN_TYPE, "set"); iqId_ = pctx_->NextId(); - iq.AddAttr(QN_ID, iqId_); - iq.AddElement(new XmlElement(QN_SESSION_SESSION, true)); + iq.AddAttr(TQN_ID, iqId_); + iq.AddElement(new XmlElement(TQN_SESSION_SESSION, true)); pctx_->InternalSendStanza(&iq); state_ = LOGINSTATE_SESSION_REQUESTED; @@ -279,11 +279,11 @@ XmppLoginTask::Advance() { case LOGINSTATE_SESSION_REQUESTED: { if (NULL == (element = NextStanza())) return true; - if (element->Name() != QN_IQ || element->Attr(QN_ID) != iqId_ || - element->Attr(QN_TYPE) == "get" || element->Attr(QN_TYPE) == "set") + if (element->Name() != TQN_IQ || element->Attr(TQN_ID) != iqId_ || + element->Attr(TQN_TYPE) == "get" || element->Attr(TQN_TYPE) == "set") return false; - if (element->Attr(QN_TYPE) != "result") + if (element->Attr(TQN_TYPE) != "result") return Failure(XmppEngine::ERROR_BIND); pctx_->SignalBound(fullJid_); @@ -301,26 +301,26 @@ XmppLoginTask::Advance() { bool XmppLoginTask::HandleStartStream(const XmlElement *element) { - if (element->Name() != QN_STREAM_STREAM) + if (element->Name() != TQN_STREAM_STREAM) return false; - if (element->Attr(QN_XMLNS) != "jabber:client") + if (element->Attr(TQN_XMLNS) != "jabber:client") return false; - if (element->Attr(QN_VERSION) != "1.0") + if (element->Attr(TQN_VERSION) != "1.0") return false; - if (!element->HasAttr(QN_ID)) + if (!element->HasAttr(TQN_ID)) return false; - streamId_ = element->Attr(QN_ID); + streamId_ = element->Attr(TQN_ID); return true; } bool XmppLoginTask::HandleFeatures(const XmlElement *element) { - if (element->Name() != QN_STREAM_FEATURES) + if (element->Name() != TQN_STREAM_FEATURES) return false; pelFeatures_.reset(new XmlElement(*element)); @@ -328,7 +328,7 @@ XmppLoginTask::HandleFeatures(const XmlElement *element) { } const XmlElement * -XmppLoginTask::GetFeature(const QName & name) { +XmppLoginTask::GetFeature(const TQName & name) { return pelFeatures_->FirstNamed(name); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpplogintask.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpplogintask.h index 7f321a30..18c70312 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpplogintask.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpplogintask.h @@ -71,7 +71,7 @@ private: bool Advance(); bool HandleStartStream(const XmlElement * element); bool HandleFeatures(const XmlElement * element); - const XmlElement * GetFeature(const QName & name); + const XmlElement * GetFeature(const TQName & name); bool Failure(XmppEngine::Error reason); void FlushQueuedStanzas(); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc index 82207f3b..38ed1994 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc @@ -32,9 +32,9 @@ namespace buzz { -XmppTask::XmppTask(Task * parent, XmppEngine::HandlerLevel level) - : Task(parent), client_(NULL) { - XmppClient * client = (XmppClient*)parent->GetParent(XMPP_CLIENT_TASK_CODE); +XmppTask::XmppTask(Task * tqparent, XmppEngine::HandlerLevel level) + : Task(tqparent), client_(NULL) { + XmppClient * client = (XmppClient*)tqparent->GetParent(XMPP_CLIENT_TASK_CODE); client_ = client; id_ = client->NextId(); client->AddXmppTask(this, level); @@ -55,14 +55,14 @@ XmppTask::StopImpl() { } } -XmppReturnStatus +XmppReturntqStatus XmppTask::SendStanza(const XmlElement * stanza) { if (client_ == NULL) return XMPP_RETURN_BADSTATE; return client_->SendStanza(stanza); } -XmppReturnStatus +XmppReturntqStatus XmppTask::SendStanzaError(const XmlElement * element_original, XmppStanzaError code, const std::string & text) { @@ -102,37 +102,37 @@ XmppTask::NextStanza() { XmlElement * XmppTask::MakeIq(const std::string & type, const buzz::Jid & to, const std::string id) { - XmlElement * result = new XmlElement(QN_IQ); + XmlElement * result = new XmlElement(TQN_IQ); if (!type.empty()) - result->AddAttr(QN_TYPE, type); + result->AddAttr(TQN_TYPE, type); if (to != JID_EMPTY) - result->AddAttr(QN_TO, to.Str()); + result->AddAttr(TQN_TO, to.Str()); if (!id.empty()) - result->AddAttr(QN_ID, id); + result->AddAttr(TQN_ID, id); return result; } XmlElement * XmppTask::MakeIqResult(const XmlElement * query) { - XmlElement * result = new XmlElement(QN_IQ); - result->AddAttr(QN_TYPE, STR_RESULT); - if (query->HasAttr(QN_FROM)) { - result->AddAttr(QN_TO, query->Attr(QN_FROM)); + XmlElement * result = new XmlElement(TQN_IQ); + result->AddAttr(TQN_TYPE, STR_RESULT); + if (query->HasAttr(TQN_FROM)) { + result->AddAttr(TQN_TO, query->Attr(TQN_FROM)); } - result->AddAttr(QN_ID, query->Attr(QN_ID)); + result->AddAttr(TQN_ID, query->Attr(TQN_ID)); return result; } bool XmppTask::MatchResponseIq(const XmlElement * stanza, const Jid & to, const std::string & id) { - if (stanza->Name() != QN_IQ) + if (stanza->Name() != TQN_IQ) return false; - if (stanza->Attr(QN_ID) != id) + if (stanza->Attr(TQN_ID) != id) return false; - Jid from(stanza->Attr(QN_FROM)); + Jid from(stanza->Attr(TQN_FROM)); if (from != to) { Jid me = client_->jid(); // we address the server as "", but it is legal for the server @@ -152,11 +152,11 @@ XmppTask::MatchResponseIq(const XmlElement * stanza, bool XmppTask::MatchRequestIq(const XmlElement * stanza, - const std::string & type, const QName & qn) { - if (stanza->Name() != QN_IQ) + const std::string & type, const TQName & qn) { + if (stanza->Name() != TQN_IQ) return false; - if (stanza->Attr(QN_TYPE) != type) + if (stanza->Attr(TQN_TYPE) != type) return false; if (stanza->FirstNamed(qn) == NULL) diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h index 3b56a1c9..d84019a2 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h @@ -45,7 +45,7 @@ namespace buzz { // See Task and XmppClient first. // // XmppTask is a task that is designed to go underneath XmppClient and be -// useful there. It has a way of finding its XmppClient parent so you +// useful there. It has a way of finding its XmppClient tqparent so you // can have it nested arbitrarily deep under an XmppClient and it can // still find the XMPP services. // @@ -69,7 +69,7 @@ class XmppTask : public sigslot::has_slots<> { public: - XmppTask(Task * parent, XmppEngine::HandlerLevel level = XmppEngine::HL_NONE); + XmppTask(Task * tqparent, XmppEngine::HandlerLevel level = XmppEngine::HL_NONE); virtual ~XmppTask(); virtual XmppClient * GetClient() const { return client_; } @@ -78,9 +78,9 @@ public: protected: friend class XmppClient; - XmppReturnStatus SendStanza(const XmlElement * stanza); - XmppReturnStatus SetResult(const std::string & code); - XmppReturnStatus SendStanzaError(const XmlElement * element_original, + XmppReturntqStatus SendStanza(const XmlElement * stanza); + XmppReturntqStatus SetResult(const std::string & code); + XmppReturntqStatus SendStanzaError(const XmlElement * element_original, XmppStanzaError code, const std::string & text); @@ -93,7 +93,7 @@ protected: const XmlElement * NextStanza(); bool MatchResponseIq(const XmlElement * stanza, const Jid & to, const std::string & task_id); - bool MatchRequestIq(const XmlElement * stanza, const std::string & type, const QName & qn); + bool MatchRequestIq(const XmlElement * stanza, const std::string & type, const TQName & qn); XmlElement *MakeIqResult(const XmlElement * query); XmlElement *MakeIq(const std::string & type, const Jid & to, const std::string task_id); |