Mercurial > irccd

changeset 215:49efff50d003

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Irccd: rename duk_push_server, duk_require_server with dukx prefix
author David Demelier <markand@malikania.fr>
date Thu, 23 Jun 2016 13:02:55 +0200
parents bf4b72fee6c2
children 9bd1f710c114
files lib/irccd/mod-server.cpp lib/irccd/mod-server.hpp lib/irccd/plugin-js.cpp
diffstat 3 files changed, 25 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/lib/irccd/mod-server.cpp	Thu Jun 23 12:57:52 2016 +0200
+++ b/lib/irccd/mod-server.cpp	Thu Jun 23 13:02:55 2016 +0200
@@ -531,7 +531,7 @@
  */
 duk_ret_t add(duk_context *ctx)
 {
-    duk_get_irccd(ctx).serverService().add(duk_require_server(ctx, 0));
+    duk_get_irccd(ctx).serverService().add(dukx_require_server(ctx, 0));
 
     return 0;
 }
@@ -554,7 +554,7 @@
     if (!server)
         return 0;
 
-    duk_push_server(ctx, server);
+    dukx_push_server(ctx, server);
 
     return 1;
 }
@@ -573,7 +573,7 @@
     duk_push_object(ctx);
 
     for (const auto &server : duk_get_irccd(ctx).serverService().servers()) {
-        duk_push_server(ctx, server);
+        dukx_push_server(ctx, server);
         duk_put_prop_string(ctx, -2, server->name().c_str());
     }
 
@@ -650,7 +650,7 @@
     duk_pop(plugin->context());
 }
 
-void duk_push_server(duk_context *ctx, std::shared_ptr<Server> server)
+void dukx_push_server(duk_context *ctx, std::shared_ptr<Server> server)
 {
     assert(ctx);
     assert(server);
@@ -664,7 +664,7 @@
     duk_set_prototype(ctx, -2);
 }
 
-std::shared_ptr<Server> duk_require_server(duk_context *ctx, duk_idx_t index)
+std::shared_ptr<Server> dukx_require_server(duk_context *ctx, duk_idx_t index)
 {
     if (!duk_is_object(ctx, index) || !duk_has_prop_string(ctx, index, Signature))
         duk_error(ctx, DUK_ERR_TYPE_ERROR, "not a Server object");
--- a/lib/irccd/mod-server.hpp	Thu Jun 23 12:57:52 2016 +0200
+++ b/lib/irccd/mod-server.hpp	Thu Jun 23 13:02:55 2016 +0200
@@ -54,7 +54,7 @@
  * \param ctx the context
  * \param server the server
  */
-IRCCD_EXPORT void duk_push_server(duk_context *ctx, std::shared_ptr<Server> server);
+IRCCD_EXPORT void dukx_push_server(duk_context *ctx, std::shared_ptr<Server> server);
 
 /**
  * Require a server. Raise a JavaScript error if not a Server.
@@ -63,7 +63,7 @@
  * \param index the index
  * \return the server
  */
-IRCCD_EXPORT std::shared_ptr<Server> duk_require_server(duk_context *ctx, duk_idx_t index);
+IRCCD_EXPORT std::shared_ptr<Server> dukx_require_server(duk_context *ctx, duk_idx_t index);
 
 } // !irccd
 
--- a/lib/irccd/plugin-js.cpp	Thu Jun 23 12:57:52 2016 +0200
+++ b/lib/irccd/plugin-js.cpp	Thu Jun 23 13:02:55 2016 +0200
@@ -154,7 +154,7 @@
 {
     StackAssert sa(m_context);
 
-    duk_push_server(m_context, std::move(event.server));
+    dukx_push_server(m_context, std::move(event.server));
     dukx_push_std_string(m_context, event.origin);
     dukx_push_std_string(m_context, event.channel);
     dukx_push_std_string(m_context, event.mode);
@@ -166,7 +166,7 @@
 {
     StackAssert sa(m_context);
 
-    duk_push_server(m_context, std::move(event.server));
+    dukx_push_server(m_context, std::move(event.server));
     dukx_push_std_string(m_context, event.origin);
     dukx_push_std_string(m_context, event.channel);
     dukx_push_std_string(m_context, event.message);
@@ -177,7 +177,7 @@
 {
     StackAssert sa(m_context);
 
-    duk_push_server(m_context, std::move(event.server));
+    dukx_push_server(m_context, std::move(event.server));
     dukx_push_std_string(m_context, event.origin);
     dukx_push_std_string(m_context, event.channel);
     dukx_push_std_string(m_context, event.message);
@@ -188,7 +188,7 @@
 {
     StackAssert sa(m_context);
 
-    duk_push_server(m_context, std::move(event.server));
+    dukx_push_server(m_context, std::move(event.server));
     call("onConnect", 1);
 }
 
@@ -196,7 +196,7 @@
 {
     StackAssert sa(m_context);
 
-    duk_push_server(m_context, std::move(event.server));
+    dukx_push_server(m_context, std::move(event.server));
     dukx_push_std_string(m_context, event.origin);
     dukx_push_std_string(m_context, event.channel);
     call("onInvite", 3);
@@ -206,7 +206,7 @@
 {
     StackAssert sa(m_context);
 
-    duk_push_server(m_context, std::move(event.server));
+    dukx_push_server(m_context, std::move(event.server));
     dukx_push_std_string(m_context, event.origin);
     dukx_push_std_string(m_context, event.channel);
     call("onJoin", 3);
@@ -216,7 +216,7 @@
 {
     StackAssert sa(m_context);
 
-    duk_push_server(m_context, std::move(event.server));
+    dukx_push_server(m_context, std::move(event.server));
     dukx_push_std_string(m_context, event.origin);
     dukx_push_std_string(m_context, event.channel);
     dukx_push_std_string(m_context, event.target);
@@ -295,7 +295,7 @@
 {
     StackAssert sa(m_context);
 
-    duk_push_server(m_context, std::move(event.server));
+    dukx_push_server(m_context, std::move(event.server));
     dukx_push_std_string(m_context, event.origin);
     dukx_push_std_string(m_context, event.channel);
     dukx_push_std_string(m_context, event.message);
@@ -306,7 +306,7 @@
 {
     StackAssert sa(m_context);
 
-    duk_push_server(m_context, std::move(event.server));
+    dukx_push_server(m_context, std::move(event.server));
     dukx_push_std_string(m_context, event.origin);
     dukx_push_std_string(m_context, event.channel);
     dukx_push_std_string(m_context, event.message);
@@ -317,7 +317,7 @@
 {
     StackAssert sa(m_context);
 
-    duk_push_server(m_context, std::move(event.server));
+    dukx_push_server(m_context, std::move(event.server));
     dukx_push_std_string(m_context, event.origin);
     dukx_push_std_string(m_context, event.mode);
     call("onMode", 3);
@@ -327,7 +327,7 @@
 {
     StackAssert sa(m_context);
 
-    duk_push_server(m_context, std::move(event.server));
+    dukx_push_server(m_context, std::move(event.server));
     dukx_push_std_string(m_context, event.channel);
     dukx_push_array(m_context, event.names, dukx_push_std_string);
     call("onNames", 3);
@@ -337,7 +337,7 @@
 {
     StackAssert sa(m_context);
 
-    duk_push_server(m_context, std::move(event.server));
+    dukx_push_server(m_context, std::move(event.server));
     dukx_push_std_string(m_context, event.origin);
     dukx_push_std_string(m_context, event.nickname);
     call("onNick", 3);
@@ -347,7 +347,7 @@
 {
     StackAssert sa(m_context);
 
-    duk_push_server(m_context, std::move(event.server));
+    dukx_push_server(m_context, std::move(event.server));
     dukx_push_std_string(m_context, event.origin);
     dukx_push_std_string(m_context, event.message);
     call("onNotice", 3);
@@ -357,7 +357,7 @@
 {
     StackAssert sa(m_context);
 
-    duk_push_server(m_context, std::move(event.server));
+    dukx_push_server(m_context, std::move(event.server));
     dukx_push_std_string(m_context, event.origin);
     dukx_push_std_string(m_context, event.channel);
     dukx_push_std_string(m_context, event.reason);
@@ -368,7 +368,7 @@
 {
     StackAssert sa(m_context);
 
-    duk_push_server(m_context, std::move(event.server));
+    dukx_push_server(m_context, std::move(event.server));
     dukx_push_std_string(m_context, event.origin);
     dukx_push_std_string(m_context, event.message);
     call("onQuery", 3);
@@ -378,7 +378,7 @@
 {
     StackAssert sa(m_context);
 
-    duk_push_server(m_context, std::move(event.server));
+    dukx_push_server(m_context, std::move(event.server));
     dukx_push_std_string(m_context, event.origin);
     dukx_push_std_string(m_context, event.message);
     call("onQueryCommand", 3);
@@ -395,7 +395,7 @@
 {
     StackAssert sa(m_context);
 
-    duk_push_server(m_context, std::move(event.server));
+    dukx_push_server(m_context, std::move(event.server));
     dukx_push_std_string(m_context, event.origin);
     dukx_push_std_string(m_context, event.channel);
     dukx_push_std_string(m_context, event.topic);
@@ -416,7 +416,7 @@
 {
     StackAssert sa(m_context);
 
-    duk_push_server(m_context, std::move(event.server));
+    dukx_push_server(m_context, std::move(event.server));
     duk_push_object(m_context);
     dukx_push_std_string(m_context, event.whois.nick);
     duk_put_prop_string(m_context, -2, "nickname");