Mercurial > irccd

changeset 778:3ff081c72250

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Irccd: fix build
author David Demelier <markand@malikania.fr>
date Wed, 31 Oct 2018 20:14:00 +0100
parents 1b17b2af5a6b
children 317c66a131be
files irccd-test/CMakeLists.txt libirccd-js/irccd/js/plugin_js_api.cpp libirccd-js/irccd/js/server_js_api.cpp libirccd/irccd/daemon/command.cpp libirccd/irccd/daemon/server_service.cpp
diffstat 5 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/irccd-test/CMakeLists.txt	Wed Oct 31 13:43:25 2018 +0100
+++ b/irccd-test/CMakeLists.txt	Wed Oct 31 20:14:00 2018 +0100
@@ -18,7 +18,7 @@
 
 if (IRCCD_HAVE_LIBEDIT)
 	list(APPEND LIBRARIES ${Editline_LIBRARIES})
-	list(APPEND INCLUDES ${Editline_LIBRARIES})
+	list(APPEND INCLUDES ${Editline_INCLUDE_DIRS})
 endif ()
 
 if (IRCCD_HAVE_JS)
--- a/libirccd-js/irccd/js/plugin_js_api.cpp	Wed Oct 31 13:43:25 2018 +0100
+++ b/libirccd-js/irccd/js/plugin_js_api.cpp	Wed Oct 31 20:14:00 2018 +0100
@@ -251,7 +251,7 @@
 
 	duk_push_array(ctx);
 
-	for (const auto& plg : duk::type_traits<irccd>::self(ctx).plugins().all()) {
+	for (const auto& plg : duk::type_traits<irccd>::self(ctx).plugins().list()) {
 		duk::push(ctx, plg->get_id());
 		duk_put_prop_index(ctx, -2, i++);
 	}
--- a/libirccd-js/irccd/js/server_js_api.cpp	Wed Oct 31 13:43:25 2018 +0100
+++ b/libirccd-js/irccd/js/server_js_api.cpp	Wed Oct 31 20:14:00 2018 +0100
@@ -727,7 +727,7 @@
 {
 	duk_push_object(ctx);
 
-	for (const auto& server : duk::type_traits<irccd>::self(ctx).servers().all()) {
+	for (const auto& server : duk::type_traits<irccd>::self(ctx).servers().list()) {
 		duk::push(ctx, server);
 		duk_put_prop_string(ctx, -2, server->get_id().c_str());
 	}
--- a/libirccd/irccd/daemon/command.cpp	Wed Oct 31 13:43:25 2018 +0100
+++ b/libirccd/irccd/daemon/command.cpp	Wed Oct 31 20:14:00 2018 +0100
@@ -67,8 +67,8 @@
 			variables[pair.first] = pair.second;
 
 	/*
-	 * Don't put all variables into the response, put them into a sub property
-	 * 'variables' instead.
+	 * Don't put all variables into the response, put them into a sub
+         * property 'variables' instead.
 	 *
 	 * It's easier for the client to iterate over all.
 	 */
@@ -181,12 +181,12 @@
 {
 	auto list = nlohmann::json::array();
 
-	for (const auto& plg : irccd.plugins().all())
+	for (const auto& plg : irccd.plugins().list())
 		list += plg->get_id();
 
 	client.write({
-		{ "command",	"plugin-list"   },
-		{ "list",	   list			}
+		{ "command",    "plugin-list"   },
+		{ "list",       list            }
 	});
 }
 
@@ -636,7 +636,7 @@
 	auto json = nlohmann::json::object();
 	auto list = nlohmann::json::array();
 
-	for (const auto& server : irccd.servers().all())
+	for (const auto& server : irccd.servers().list())
 		list.push_back(server->get_id());
 
 	client.write({
--- a/libirccd/irccd/daemon/server_service.cpp	Wed Oct 31 13:43:25 2018 +0100
+++ b/libirccd/irccd/daemon/server_service.cpp	Wed Oct 31 20:14:00 2018 +0100
@@ -65,7 +65,7 @@
                           EventNameFunc&& name_func,
                           ExecFunc exec_func)
 {
-	for (const auto& plugin : irccd_.plugins().all()) {
+	for (const auto& plugin : irccd_.plugins().list()) {
 		const auto eventname = name_func(*plugin);
 		const auto allowed = irccd_.rules().solve(server, target, origin, plugin->get_name(), eventname);