diff options
| author | Jonah Brüchert <jbb@kaidan.im> | 2023-03-18 19:36:22 +0100 |
|---|---|---|
| committer | Linus Jahn <lnj@kaidan.im> | 2023-03-18 19:47:28 +0100 |
| commit | c935a3d0b1b45a4be57b8b6c5f4867f2516b0409 (patch) | |
| tree | 23a9c647af1cd7fdff3ee30b0f563359e5c8ba15 /src | |
| parent | d1a95888d6c868cdb4a064dfe4581ccf33bd92fa (diff) | |
| download | qxmpp-c935a3d0b1b45a4be57b8b6c5f4867f2516b0409.tar.gz | |
QXmppOmemo: Fix ODR violation
I wrote the problematic code, so yay
Diffstat (limited to 'src')
| -rw-r--r-- | src/omemo/QXmppOmemoData.cpp | 2 | ||||
| -rw-r--r-- | src/omemo/QXmppOmemoManager_p.cpp | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/omemo/QXmppOmemoData.cpp b/src/omemo/QXmppOmemoData.cpp index 43e00c35..220e628f 100644 --- a/src/omemo/QXmppOmemoData.cpp +++ b/src/omemo/QXmppOmemoData.cpp @@ -13,7 +13,7 @@ #include <QDomElement> #include <QHash> -const char *ns_omemo_2 = "urn:xmpp:omemo:2"; +constexpr auto ns_omemo_2 = "urn:xmpp:omemo:2"; /// \cond /// diff --git a/src/omemo/QXmppOmemoManager_p.cpp b/src/omemo/QXmppOmemoManager_p.cpp index c4d82e78..c0f9c093 100644 --- a/src/omemo/QXmppOmemoManager_p.cpp +++ b/src/omemo/QXmppOmemoManager_p.cpp @@ -38,14 +38,14 @@ using Error = QXmppStanza::Error; using Manager = QXmppOmemoManager; using ManagerPrivate = QXmppOmemoManagerPrivate; -const char *ns_client = "jabber:client"; -const char *ns_pubsub_auto_create = "http://jabber.org/protocol/pubsub#auto-create"; -const char *ns_pubsub_config_node = "http://jabber.org/protocol/pubsub#config-node"; -const char *ns_pubsub_config_node_max = "http://jabber.org/protocol/pubsub#config-node-max"; -const char *ns_pubsub_create_and_configure = "http://jabber.org/protocol/pubsub#create-and-configure"; -const char *ns_pubsub_create_nodes = "http://jabber.org/protocol/pubsub#create-nodes"; -const char *ns_pubsub_publish = "http://jabber.org/protocol/pubsub#publish"; -const char *ns_pubsub_publish_options = "http://jabber.org/protocol/pubsub#publish-options"; +constexpr auto ns_client = "jabber:client"; +constexpr auto ns_pubsub_auto_create = "http://jabber.org/protocol/pubsub#auto-create"; +constexpr auto ns_pubsub_config_node = "http://jabber.org/protocol/pubsub#config-node"; +constexpr auto ns_pubsub_config_node_max = "http://jabber.org/protocol/pubsub#config-node-max"; +constexpr auto ns_pubsub_create_and_configure = "http://jabber.org/protocol/pubsub#create-and-configure"; +constexpr auto ns_pubsub_create_nodes = "http://jabber.org/protocol/pubsub#create-nodes"; +constexpr auto ns_pubsub_publish = "http://jabber.org/protocol/pubsub#publish"; +constexpr auto ns_pubsub_publish_options = "http://jabber.org/protocol/pubsub#publish-options"; namespace QXmpp::Omemo::Private { |