diff irccdctl/cli.cpp @ 498:fbd80bfcf58d

Irccd: import new options, closes #713
author David Demelier <markand@malikania.fr>
date Sat, 30 Sep 2017 10:31:08 +0200
parents 349fe29d86d5
children e03521cf207b
line wrap: on
line diff
--- a/irccdctl/cli.cpp	Fri Sep 29 17:04:03 2017 +0200
+++ b/irccdctl/cli.cpp	Sat Sep 30 10:31:08 2017 +0200
@@ -352,9 +352,9 @@
 
 namespace {
 
-option::Result parse(std::vector<std::string> &args)
+option::result parse(std::vector<std::string> &args)
 {
-    option::Options options{
+    option::options options{
         { "-c",             true    },
         { "--command",      true    },
         { "-n",             true    },
@@ -396,8 +396,8 @@
 {
     std::vector<std::string> copy(args);
 
-    option::Result result = parse(copy);
-    option::Result::const_iterator it;
+    option::result result = parse(copy);
+    option::result::const_iterator it;
 
     if (copy.size() < 2)
         throw std::invalid_argument("server-connect requires at least 2 arguments");
@@ -869,7 +869,7 @@
 
 void RuleAddCli::exec(Irccdctl &irccdctl, const std::vector<std::string> &args)
 {
-    static const option::Options options{
+    static const option::options options{
         { "-c",             true },
         { "--add-channel",  true },
         { "-e",             true },
@@ -952,7 +952,7 @@
 
 void RuleEditCli::exec(Irccdctl &irccdctl, const std::vector<std::string> &args)
 {
-    static const option::Options options{
+    static const option::options options{
         { "-a",                 true },
         { "--action",           true },
         { "-c",                 true },