using std::placeholders::_1;
using std::placeholders::_2;
-#define REGISTER_ASYNC(c, func) RegisterSyncHandler(c, func);
-#define REGISTER_SYNC(c, func) RegisterSyncHandler(c, func);
-
- REGISTER_ASYNC("Push_registerService", std::bind(&PushInstance::registerService, this, _1, _2));
- REGISTER_ASYNC("Push_registerApplication",
- std::bind(&PushInstance::registerApplication, this, _1, _2));
- REGISTER_ASYNC("Push_unregisterService",
- std::bind(&PushInstance::unregisterService, this, _1, _2));
- REGISTER_ASYNC("Push_unregisterApplication",
- std::bind(&PushInstance::unregisterApplication, this, _1, _2));
- REGISTER_SYNC("Push_connectService", std::bind(&PushInstance::connectService, this, _1, _2));
- REGISTER_SYNC("Push_connect", std::bind(&PushInstance::connect, this, _1, _2));
- REGISTER_SYNC("Push_disconnectService",
- std::bind(&PushInstance::disconnectService, this, _1, _2));
- REGISTER_SYNC("Push_disconnect", std::bind(&PushInstance::disconnect, this, _1, _2));
- REGISTER_SYNC("Push_getRegistrationId",
- std::bind(&PushInstance::getRegistrationId, this, _1, _2));
- REGISTER_SYNC("Push_getUnreadNotifications",
- std::bind(&PushInstance::getUnreadNotifications, this, _1, _2));
- REGISTER_SYNC("Push_getPushMessage", std::bind(&PushInstance::getPushMessage, this, _1, _2));
-
-#undef REGISTER_ASYNC
-#undef REGISTER_SYNC
+#define REGISTER_METHOD(M) \
+ RegisterSyncHandler(#M, std::bind(&PushInstance::M, this, _1, _2))
+ REGISTER_METHOD(PushRegisterService);
+ REGISTER_METHOD(PushRegisterApplication);
+ REGISTER_METHOD(PushUnregisterService);
+ REGISTER_METHOD(PushUnregisterApplication);
+ REGISTER_METHOD(PushConnectService);
+ REGISTER_METHOD(PushConnect);
+ REGISTER_METHOD(PushDisconnectService);
+ REGISTER_METHOD(PushDisconnect);
+ REGISTER_METHOD(PushGetRegistrationId);
+ REGISTER_METHOD(PushGetUnreadNotifications);
+ REGISTER_METHOD(PushGetPushMessage);
+#undef REGISTER_METHOD
impl = new PushManager(this);
}
-void PushInstance::registerService(const picojson::value& args, picojson::object& out) {
+void PushInstance::PushRegisterService(const picojson::value& args, picojson::object& out) {
ScopeLogger();
LoggerW(
"DEPRECATION WARNING: registerService() is deprecated and will be removed from next release. "
}
}
-void PushInstance::registerApplication(const picojson::value& args, picojson::object& out) {
+void PushInstance::PushRegisterApplication(const picojson::value& args, picojson::object& out) {
ScopeLogger();
CHECK_PRIVILEGE_ACCESS(kPrivilegePush, &out);
}
}
-void PushInstance::unregisterService(const picojson::value& args, picojson::object& out) {
+void PushInstance::PushUnregisterService(const picojson::value& args, picojson::object& out) {
ScopeLogger();
LoggerW(
"DEPRECATION WARNING: unregisterService() is deprecated and will be removed from next "
}
}
-void PushInstance::unregisterApplication(const picojson::value& args, picojson::object& out) {
+void PushInstance::PushUnregisterApplication(const picojson::value& args, picojson::object& out) {
ScopeLogger();
CHECK_PRIVILEGE_ACCESS(kPrivilegePush, &out);
}
}
-void PushInstance::connectService(const picojson::value& args, picojson::object& out) {
+void PushInstance::PushConnectService(const picojson::value& args, picojson::object& out) {
ScopeLogger();
LoggerW(
"DEPRECATION WARNING: connectService() is deprecated and will be removed from next release. "
}
}
-void PushInstance::connect(const picojson::value& args, picojson::object& out) {
+void PushInstance::PushConnect(const picojson::value& args, picojson::object& out) {
ScopeLogger();
CHECK_PRIVILEGE_ACCESS(kPrivilegePush, &out);
}
}
-void PushInstance::disconnectService(const picojson::value& args, picojson::object& out) {
+void PushInstance::PushDisconnectService(const picojson::value& args, picojson::object& out) {
ScopeLogger();
LoggerW(
"DEPRECATION WARNING: disconnectService() is deprecated and will be removed from next "
}
}
-void PushInstance::disconnect(const picojson::value& args, picojson::object& out) {
+void PushInstance::PushDisconnect(const picojson::value& args, picojson::object& out) {
ScopeLogger();
CHECK_PRIVILEGE_ACCESS(kPrivilegePush, &out);
}
}
-void PushInstance::getRegistrationId(const picojson::value& args, picojson::object& out) {
+void PushInstance::PushGetRegistrationId(const picojson::value& args, picojson::object& out) {
ScopeLogger();
CHECK_PRIVILEGE_ACCESS(kPrivilegePush, &out);
}
}
-void PushInstance::getUnreadNotifications(const picojson::value& args, picojson::object& out) {
+void PushInstance::PushGetUnreadNotifications(const picojson::value& args, picojson::object& out) {
ScopeLogger();
CHECK_PRIVILEGE_ACCESS(kPrivilegePush, &out);
}
}
-void PushInstance::getPushMessage(const picojson::value& args, picojson::object& out) {
+void PushInstance::PushGetPushMessage(const picojson::value& args, picojson::object& out) {
ScopeLogger();
CHECK_PRIVILEGE_ACCESS(kPrivilegePush, &out);