# HG changeset patch # User David Demelier # Date 1465472860 -7200 # Node ID 786559f1937f7db5a27cbbc5d86ffe4019e1ee08 # Parent 75bc436b8b3fb1f1c1bb8fd65632205992ce46a7 Irccd: style diff -r 75bc436b8b3f -r 786559f1937f lib/irccd/cmd-plugin-config.cpp --- a/lib/irccd/cmd-plugin-config.cpp Wed Jun 08 20:58:21 2016 +0200 +++ b/lib/irccd/cmd-plugin-config.cpp Thu Jun 09 13:47:40 2016 +0200 @@ -72,9 +72,9 @@ std::vector PluginConfig::args() const { return { - { "plugin", true }, - { "variable", false }, - { "value", false } + { "plugin", true }, + { "variable", false }, + { "value", false } }; } diff -r 75bc436b8b3f -r 786559f1937f lib/irccd/cmd-server-cmode.cpp --- a/lib/irccd/cmd-server-cmode.cpp Wed Jun 08 20:58:21 2016 +0200 +++ b/lib/irccd/cmd-server-cmode.cpp Thu Jun 09 13:47:40 2016 +0200 @@ -38,9 +38,9 @@ std::vector ServerChannelMode::args() const { return { - { "server", true }, - { "channel", true }, - { "mode", true } + { "server", true }, + { "channel", true }, + { "mode", true } }; } diff -r 75bc436b8b3f -r 786559f1937f lib/irccd/cmd-server-cnotice.cpp --- a/lib/irccd/cmd-server-cnotice.cpp Wed Jun 08 20:58:21 2016 +0200 +++ b/lib/irccd/cmd-server-cnotice.cpp Thu Jun 09 13:47:40 2016 +0200 @@ -38,9 +38,9 @@ std::vector ServerChannelNotice::args() const { return { - { "server", true }, - { "channel", true }, - { "message", true } + { "server", true }, + { "channel", true }, + { "message", true } }; } diff -r 75bc436b8b3f -r 786559f1937f lib/irccd/cmd-server-connect.cpp --- a/lib/irccd/cmd-server-connect.cpp Wed Jun 08 20:58:21 2016 +0200 +++ b/lib/irccd/cmd-server-connect.cpp Thu Jun 09 13:47:40 2016 +0200 @@ -128,21 +128,21 @@ std::vector ServerConnect::options() const { return { - { "command", "c", "command", "char", "command character to use" }, - { "nickname", "n", "nickname", "nickname", "nickname to use" }, - { "realname", "r", "realname", "realname", "realname to use" }, - { "sslverify", "S", "ssl-verify", "", "verify SSL" }, - { "ssl", "s", "ssl", "", "connect with SSL" }, - { "username", "u", "username", "", "username to use" }, + { "command", "c", "command", "char", "command character to use" }, + { "nickname", "n", "nickname", "nickname", "nickname to use" }, + { "realname", "r", "realname", "realname", "realname to use" }, + { "sslverify", "S", "ssl-verify", "", "verify SSL" }, + { "ssl", "s", "ssl", "", "connect with SSL" }, + { "username", "u", "username", "", "username to use" } }; } std::vector ServerConnect::args() const { return { - { "id", true }, - { "host", true }, - { "port", false } + { "id", true }, + { "host", true }, + { "port", false } }; } diff -r 75bc436b8b3f -r 786559f1937f lib/irccd/cmd-server-info.cpp --- a/lib/irccd/cmd-server-info.cpp Wed Jun 08 20:58:21 2016 +0200 +++ b/lib/irccd/cmd-server-info.cpp Thu Jun 09 13:47:40 2016 +0200 @@ -45,9 +45,9 @@ json::Value ServerInfo::request(Irccdctl &, const RemoteCommandRequest &args) const { return json::object({ - { "server", args.args()[0] }, - { "target", args.args()[1] }, - { "channel", args.args()[2] } + { "server", args.args()[0] }, + { "target", args.args()[1] }, + { "channel", args.args()[2] } }); } @@ -72,7 +72,7 @@ if (server->info().flags & irccd::ServerInfo::SslVerify) response.insert("sslVerify", true); - /* Channel list */ + // Channel list. auto channels = json::array({}); for (const auto &c : server->settings().channels) diff -r 75bc436b8b3f -r 786559f1937f lib/irccd/cmd-server-invite.cpp --- a/lib/irccd/cmd-server-invite.cpp Wed Jun 08 20:58:21 2016 +0200 +++ b/lib/irccd/cmd-server-invite.cpp Thu Jun 09 13:47:40 2016 +0200 @@ -38,18 +38,18 @@ std::vector ServerInvite::args() const { return { - { "server", true }, - { "nickname", true }, - { "channel", true } + { "server", true }, + { "nickname", true }, + { "channel", true } }; } json::Value ServerInvite::request(Irccdctl &, const RemoteCommandRequest &args) const { return json::object({ - { "server", args.args()[0] }, - { "target", args.args()[1] }, - { "channel", args.args()[2] } + { "server", args.args()[0] }, + { "target", args.args()[1] }, + { "channel", args.args()[2] } }); } diff -r 75bc436b8b3f -r 786559f1937f lib/irccd/cmd-server-join.cpp --- a/lib/irccd/cmd-server-join.cpp Wed Jun 08 20:58:21 2016 +0200 +++ b/lib/irccd/cmd-server-join.cpp Thu Jun 09 13:47:40 2016 +0200 @@ -38,17 +38,17 @@ std::vector ServerJoin::args() const { return { - { "server", true }, - { "channel", true }, - { "password", false } + { "server", true }, + { "channel", true }, + { "password", false } }; } json::Value ServerJoin::request(Irccdctl &, const RemoteCommandRequest &args) const { auto req = json::object({ - { "server", args.args()[0] }, - { "channel", args.args()[1] } + { "server", args.args()[0] }, + { "channel", args.args()[1] } }); if (args.length() == 3) diff -r 75bc436b8b3f -r 786559f1937f lib/irccd/cmd-server-kick.cpp --- a/lib/irccd/cmd-server-kick.cpp Wed Jun 08 20:58:21 2016 +0200 +++ b/lib/irccd/cmd-server-kick.cpp Thu Jun 09 13:47:40 2016 +0200 @@ -38,19 +38,19 @@ std::vector ServerKick::args() const { return { - { "server", true }, - { "target", true }, - { "channel", true }, - { "reason", false } + { "server", true }, + { "target", true }, + { "channel", true }, + { "reason", false } }; } json::Value ServerKick::request(Irccdctl &, const RemoteCommandRequest &args) const { auto req = json::object({ - { "server", args.arg(0) }, - { "target", args.arg(1) }, - { "channel", args.arg(2) } + { "server", args.arg(0) }, + { "target", args.arg(1) }, + { "channel", args.arg(2) } }); if (args.length() == 4) diff -r 75bc436b8b3f -r 786559f1937f lib/irccd/cmd-server-me.cpp --- a/lib/irccd/cmd-server-me.cpp Wed Jun 08 20:58:21 2016 +0200 +++ b/lib/irccd/cmd-server-me.cpp Thu Jun 09 13:47:40 2016 +0200 @@ -38,18 +38,18 @@ std::vector ServerMe::args() const { return { - { "server", true }, - { "target", true }, - { "message", true } + { "server", true }, + { "target", true }, + { "message", true } }; } json::Value ServerMe::request(Irccdctl &, const RemoteCommandRequest &args) const { return json::object({ - { "server", args.arg(0) }, - { "target", args.arg(1) }, - { "message", args.arg(2) } + { "server", args.arg(0) }, + { "target", args.arg(1) }, + { "message", args.arg(2) } }); } diff -r 75bc436b8b3f -r 786559f1937f lib/irccd/cmd-server-message.cpp --- a/lib/irccd/cmd-server-message.cpp Wed Jun 08 20:58:21 2016 +0200 +++ b/lib/irccd/cmd-server-message.cpp Thu Jun 09 13:47:40 2016 +0200 @@ -38,18 +38,18 @@ std::vector ServerMessage::args() const { return { - { "server", true }, - { "target", true }, - { "message", true } + { "server", true }, + { "target", true }, + { "message", true } }; } json::Value ServerMessage::request(Irccdctl &, const RemoteCommandRequest &args) const { return json::object({ - { "server", args.arg(0) }, - { "target", args.arg(1) }, - { "message", args.arg(2) } + { "server", args.arg(0) }, + { "target", args.arg(1) }, + { "message", args.arg(2) } }); } diff -r 75bc436b8b3f -r 786559f1937f lib/irccd/cmd-server-mode.cpp --- a/lib/irccd/cmd-server-mode.cpp Wed Jun 08 20:58:21 2016 +0200 +++ b/lib/irccd/cmd-server-mode.cpp Thu Jun 09 13:47:40 2016 +0200 @@ -38,16 +38,16 @@ std::vector ServerMode::args() const { return { - { "server", true }, - { "mode", true } + { "server", true }, + { "mode", true } }; } json::Value ServerMode::request(Irccdctl &, const RemoteCommandRequest &args) const { return json::object({ - { "server", args.arg(0) }, - { "mode", args.arg(1) } + { "server", args.arg(0) }, + { "mode", args.arg(1) } }); } diff -r 75bc436b8b3f -r 786559f1937f lib/irccd/cmd-server-nick.cpp --- a/lib/irccd/cmd-server-nick.cpp Wed Jun 08 20:58:21 2016 +0200 +++ b/lib/irccd/cmd-server-nick.cpp Thu Jun 09 13:47:40 2016 +0200 @@ -38,16 +38,16 @@ std::vector ServerNick::args() const { return { - { "server", true }, - { "nickname", true } + { "server", true }, + { "nickname", true } }; } json::Value ServerNick::request(Irccdctl &, const RemoteCommandRequest &args) const { return json::object({ - { "server", args.arg(0) }, - { "nickname", args.arg(1) } + { "server", args.arg(0) }, + { "nickname", args.arg(1) } }); } diff -r 75bc436b8b3f -r 786559f1937f lib/irccd/cmd-server-notice.cpp --- a/lib/irccd/cmd-server-notice.cpp Wed Jun 08 20:58:21 2016 +0200 +++ b/lib/irccd/cmd-server-notice.cpp Thu Jun 09 13:47:40 2016 +0200 @@ -38,18 +38,18 @@ std::vector ServerNotice::args() const { return { - { "server", true }, - { "target", true }, - { "message", true } + { "server", true }, + { "target", true }, + { "message", true } }; } json::Value ServerNotice::request(Irccdctl &, const RemoteCommandRequest &args) const { return json::object({ - { "server", args.arg(0) }, - { "target", args.arg(1) }, - { "message", args.arg(2) } + { "server", args.arg(0) }, + { "target", args.arg(1) }, + { "message", args.arg(2) } }); } diff -r 75bc436b8b3f -r 786559f1937f lib/irccd/cmd-server-part.cpp --- a/lib/irccd/cmd-server-part.cpp Wed Jun 08 20:58:21 2016 +0200 +++ b/lib/irccd/cmd-server-part.cpp Thu Jun 09 13:47:40 2016 +0200 @@ -38,17 +38,17 @@ std::vector ServerPart::args() const { return { - { "server", true }, - { "channel", true }, - { "reason", false } + { "server", true }, + { "channel", true }, + { "reason", false } }; } json::Value ServerPart::request(Irccdctl &, const RemoteCommandRequest &args) const { auto req = json::object({ - { "server", args.arg(0) }, - { "channel", args.arg(1) } + { "server", args.arg(0) }, + { "channel", args.arg(1) } }); if (args.length() == 3) diff -r 75bc436b8b3f -r 786559f1937f lib/irccd/cmd-server-topic.cpp --- a/lib/irccd/cmd-server-topic.cpp Wed Jun 08 20:58:21 2016 +0200 +++ b/lib/irccd/cmd-server-topic.cpp Thu Jun 09 13:47:40 2016 +0200 @@ -38,18 +38,18 @@ std::vector ServerTopic::args() const { return { - { "server", true }, - { "channel", true }, - { "topic", true } + { "server", true }, + { "channel", true }, + { "topic", true } }; } json::Value ServerTopic::request(Irccdctl &, const RemoteCommandRequest &args) const { return json::object({ - { "server", args.arg(0) }, - { "channel", args.arg(1) }, - { "topic", args.arg(2) } + { "server", args.arg(0) }, + { "channel", args.arg(1) }, + { "topic", args.arg(2) } }); }