summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2014-01-24 21:18:25 (GMT)
committerRemko Tronçon <git@el-tramo.be>2014-01-24 21:18:25 (GMT)
commit3c2225d42cc6b20618246f4b6de6fd6335c6b474 (patch)
treeef942b718747d1943dc1b456244c37287bd76735
parentfe460ca46bff4f9e735db86ca072eafb3a5c8f2d (diff)
downloadswift-contrib-3c2225d42cc6b20618246f4b6de6fd6335c6b474.zip
swift-contrib-3c2225d42cc6b20618246f4b6de6fd6335c6b474.tar.bz2
Sluift: 'subscriptionid' -> 'subscription_id'
Change-Id: I1e02c4b96be4e8da711f4b3bed06b318061dd116
-rw-r--r--Sluift/ElementConvertors/PubSubEventSubscriptionConvertor.cpp6
-rw-r--r--Sluift/ElementConvertors/PubSubItemsConvertor.cpp6
-rw-r--r--Sluift/ElementConvertors/PubSubOptionsConvertor.cpp6
-rw-r--r--Sluift/ElementConvertors/PubSubSubscriptionConvertor.cpp6
-rw-r--r--Sluift/ElementConvertors/PubSubUnsubscribeConvertor.cpp6
5 files changed, 15 insertions, 15 deletions
diff --git a/Sluift/ElementConvertors/PubSubEventSubscriptionConvertor.cpp b/Sluift/ElementConvertors/PubSubEventSubscriptionConvertor.cpp
index 463ebea..971d693 100644
--- a/Sluift/ElementConvertors/PubSubEventSubscriptionConvertor.cpp
+++ b/Sluift/ElementConvertors/PubSubEventSubscriptionConvertor.cpp
@@ -53,5 +53,5 @@ boost::shared_ptr<PubSubEventSubscription> PubSubEventSubscriptionConvertor::doC
}
lua_pop(L, 1);
- lua_getfield(L, -1, "subscriptionid");
+ lua_getfield(L, -1, "subscription_id");
if (lua_isstring(L, -1)) {
result->setSubscriptionID(std::string(lua_tostring(L, -1)));
@@ -89,5 +89,5 @@ void PubSubEventSubscriptionConvertor::doConvertToLua(lua_State* L, boost::share
if (payload->getSubscriptionID()) {
lua_pushstring(L, (*payload->getSubscriptionID()).c_str());
- lua_setfield(L, -2, "subscriptionid");
+ lua_setfield(L, -2, "subscription_id");
}
lua_pushstring(L, dateTimeToString(payload->getExpiry()).c_str());
@@ -102,5 +102,5 @@ boost::optional<LuaElementConvertor::Documentation> PubSubEventSubscriptionConve
"- `jid`: jid (string)\n"
"- `subscription`: `\"none\"`, `\"pending\"`, `\"subscribed\"`, or `\"unconfigured\"`\n"
- "- `subscriptionid`: string (Optional)\n"
+ "- `subscription_id`: string (Optional)\n"
"- `expiry`: datetime (string)\n"
);
diff --git a/Sluift/ElementConvertors/PubSubItemsConvertor.cpp b/Sluift/ElementConvertors/PubSubItemsConvertor.cpp
index 24ad6c8..03df694 100644
--- a/Sluift/ElementConvertors/PubSubItemsConvertor.cpp
+++ b/Sluift/ElementConvertors/PubSubItemsConvertor.cpp
@@ -53,5 +53,5 @@ boost::shared_ptr<PubSubItems> PubSubItemsConvertor::doConvertFromLua(lua_State*
}
lua_pop(L, 1);
- lua_getfield(L, -1, "subscriptionid");
+ lua_getfield(L, -1, "subscription_id");
if (lua_isstring(L, -1)) {
result->setSubscriptionID(std::string(lua_tostring(L, -1)));
@@ -82,5 +82,5 @@ void PubSubItemsConvertor::doConvertToLua(lua_State* L, boost::shared_ptr<PubSub
if (payload->getSubscriptionID()) {
lua_pushstring(L, (*payload->getSubscriptionID()).c_str());
- lua_setfield(L, -2, "subscriptionid");
+ lua_setfield(L, -2, "subscription_id");
}
}
@@ -93,5 +93,5 @@ boost::optional<LuaElementConvertor::Documentation> PubSubItemsConvertor::getDoc
"- `items`: array<@{PubSubItem}>\n"
"- `maximum_items`: number (Optional)\n"
- "- `subscriptionid`: string (Optional)\n"
+ "- `subscription_id`: string (Optional)\n"
);
}
diff --git a/Sluift/ElementConvertors/PubSubOptionsConvertor.cpp b/Sluift/ElementConvertors/PubSubOptionsConvertor.cpp
index 874bb05..589f983 100644
--- a/Sluift/ElementConvertors/PubSubOptionsConvertor.cpp
+++ b/Sluift/ElementConvertors/PubSubOptionsConvertor.cpp
@@ -44,5 +44,5 @@ boost::shared_ptr<PubSubOptions> PubSubOptionsConvertor::doConvertFromLua(lua_St
}
lua_pop(L, 1);
- lua_getfield(L, -1, "subscriptionid");
+ lua_getfield(L, -1, "subscription_id");
if (lua_isstring(L, -1)) {
result->setSubscriptionID(std::string(lua_tostring(L, -1)));
@@ -63,5 +63,5 @@ void PubSubOptionsConvertor::doConvertToLua(lua_State* L, boost::shared_ptr<PubS
if (payload->getSubscriptionID()) {
lua_pushstring(L, (*payload->getSubscriptionID()).c_str());
- lua_setfield(L, -2, "subscriptionid");
+ lua_setfield(L, -2, "subscription_id");
}
}
@@ -74,5 +74,5 @@ boost::optional<LuaElementConvertor::Documentation> PubSubOptionsConvertor::getD
"- `jid`: jid (string)\n"
"- `data`: @{Form}\n"
- "- `subscriptionid`: string (Optional)\n"
+ "- `subscription_id`: string (Optional)\n"
);
}
diff --git a/Sluift/ElementConvertors/PubSubSubscriptionConvertor.cpp b/Sluift/ElementConvertors/PubSubSubscriptionConvertor.cpp
index 9be9572..53b573f 100644
--- a/Sluift/ElementConvertors/PubSubSubscriptionConvertor.cpp
+++ b/Sluift/ElementConvertors/PubSubSubscriptionConvertor.cpp
@@ -32,5 +32,5 @@ boost::shared_ptr<PubSubSubscription> PubSubSubscriptionConvertor::doConvertFrom
}
lua_pop(L, 1);
- lua_getfield(L, -1, "subscriptionid");
+ lua_getfield(L, -1, "subscription_id");
if (lua_isstring(L, -1)) {
result->setSubscriptionID(std::string(lua_tostring(L, -1)));
@@ -76,5 +76,5 @@ void PubSubSubscriptionConvertor::doConvertToLua(lua_State* L, boost::shared_ptr
if (payload->getSubscriptionID()) {
lua_pushstring(L, (*payload->getSubscriptionID()).c_str());
- lua_setfield(L, -2, "subscriptionid");
+ lua_setfield(L, -2, "subscription_id");
}
lua_pushstring(L, payload->getJID().toString().c_str());
@@ -105,5 +105,5 @@ boost::optional<LuaElementConvertor::Documentation> PubSubSubscriptionConvertor:
"This table has the following fields:\n\n"
"- `node`: string (Optional)\n"
- "- `subscriptionid`: string (Optional)\n"
+ "- `subscription_id`: string (Optional)\n"
"- `jid`: jid (string)\n"
"- `options`: @{PubSubSubscribeOptions}\n"
diff --git a/Sluift/ElementConvertors/PubSubUnsubscribeConvertor.cpp b/Sluift/ElementConvertors/PubSubUnsubscribeConvertor.cpp
index 362dd58..9305353 100644
--- a/Sluift/ElementConvertors/PubSubUnsubscribeConvertor.cpp
+++ b/Sluift/ElementConvertors/PubSubUnsubscribeConvertor.cpp
@@ -37,5 +37,5 @@ boost::shared_ptr<PubSubUnsubscribe> PubSubUnsubscribeConvertor::doConvertFromLu
}
lua_pop(L, 1);
- lua_getfield(L, -1, "subscriptionid");
+ lua_getfield(L, -1, "subscription_id");
if (lua_isstring(L, -1)) {
result->setSubscriptionID(std::string(lua_tostring(L, -1)));
@@ -55,5 +55,5 @@ void PubSubUnsubscribeConvertor::doConvertToLua(lua_State* L, boost::shared_ptr<
if (payload->getSubscriptionID()) {
lua_pushstring(L, (*payload->getSubscriptionID()).c_str());
- lua_setfield(L, -2, "subscriptionid");
+ lua_setfield(L, -2, "subscription_id");
}
}
@@ -65,5 +65,5 @@ boost::optional<LuaElementConvertor::Documentation> PubSubUnsubscribeConvertor::
"- `node`: string (Optional)\n"
"- `jid`: jid (string)\n"
- "- `subscriptionid`: string (Optional)\n"
+ "- `subscription_id`: string (Optional)\n"
);
}