summaryrefslogtreecommitdiff
path: root/src/xmpp/biboumi_adhoc_commands.cpp
diff options
context:
space:
mode:
authorFlorent Le Coz <louiz@louiz.org>2015-09-01 04:42:12 +0200
committerFlorent Le Coz <louiz@louiz.org>2015-09-01 04:42:12 +0200
commite8f22efe34415db0e1e5cb94635b089b18efe055 (patch)
tree64088065cd97cb941b9d35016c0dcf3aaf355c5e /src/xmpp/biboumi_adhoc_commands.cpp
parentdf006a191603c4a9f0bb364affa3731c2944fef5 (diff)
downloadbiboumi-e8f22efe34415db0e1e5cb94635b089b18efe055.tar.gz
biboumi-e8f22efe34415db0e1e5cb94635b089b18efe055.tar.bz2
biboumi-e8f22efe34415db0e1e5cb94635b089b18efe055.tar.xz
biboumi-e8f22efe34415db0e1e5cb94635b089b18efe055.zip
XmlNodes are now always closed
Remove the close() method and closed attribute. Remove all the calls to close(). (Save one bool per XmlNode, yay, and save a few ifs and some useless function calls. At best it should be unnoticeably faster and lighter and save a few keystrokes in the future)
Diffstat (limited to 'src/xmpp/biboumi_adhoc_commands.cpp')
-rw-r--r--src/xmpp/biboumi_adhoc_commands.cpp12
1 files changed, 0 insertions, 12 deletions
diff --git a/src/xmpp/biboumi_adhoc_commands.cpp b/src/xmpp/biboumi_adhoc_commands.cpp
index 089eebf..0dcaf0c 100644
--- a/src/xmpp/biboumi_adhoc_commands.cpp
+++ b/src/xmpp/biboumi_adhoc_commands.cpp
@@ -10,18 +10,15 @@ void DisconnectUserStep1(XmppComponent* xmpp_component, AdhocSession&, XmlNode&
x["type"] = "form";
XmlNode title("title");
title.set_inner("Disconnect a user from the gateway");
- title.close();
x.add_child(std::move(title));
XmlNode instructions("instructions");
instructions.set_inner("Choose a user JID and a quit message");
- instructions.close();
x.add_child(std::move(instructions));
XmlNode jids_field("field");
jids_field["var"] = "jids";
jids_field["type"] = "list-multi";
jids_field["label"] = "The JIDs to disconnect";
XmlNode required("required");
- required.close();
jids_field.add_child(std::move(required));
for (Bridge* bridge: biboumi_component->get_bridges())
{
@@ -29,12 +26,9 @@ void DisconnectUserStep1(XmppComponent* xmpp_component, AdhocSession&, XmlNode&
option["label"] = bridge->get_jid();
XmlNode value("value");
value.set_inner(bridge->get_jid());
- value.close();
option.add_child(std::move(value));
- option.close();
jids_field.add_child(std::move(option));
}
- jids_field.close();
x.add_child(std::move(jids_field));
XmlNode message_field("field");
@@ -43,11 +37,8 @@ void DisconnectUserStep1(XmppComponent* xmpp_component, AdhocSession&, XmlNode&
message_field["label"] = "Quit message";
XmlNode message_value("value");
message_value.set_inner("Disconnected by admin");
- message_value.close();
message_field.add_child(std::move(message_value));
- message_field.close();
x.add_child(std::move(message_field));
- x.close();
command_node.add_child(std::move(x));
}
@@ -95,7 +86,6 @@ void DisconnectUserStep2(XmppComponent* xmpp_component, AdhocSession& session, X
note.set_inner("1 user has been disconnected.");
else
note.set_inner(std::to_string(num) + " users have been disconnected.");
- note.close();
command_node.add_child(std::move(note));
return;
}
@@ -103,9 +93,7 @@ void DisconnectUserStep2(XmppComponent* xmpp_component, AdhocSession& session, X
XmlNode error(ADHOC_NS":error");
error["type"] = "modify";
XmlNode condition(STANZA_NS":bad-request");
- condition.close();
error.add_child(std::move(condition));
- error.close();
command_node.add_child(std::move(error));
session.terminate();
}