Rename macro RequireNotNull to REQUIRE_NOT_NULL

diff --git a/lib/base/array-script.cpp b/lib/base/array-script.cpp
index b9535ef983198bc102e962e26c6f05c3fccadb5d..d97873819b88ea3e7fff4b3fb7df25ffaeb3ef52 100644 (file)
--- a/lib/base/array-script.cpp
+++ b/lib/base/array-script.cpp
@@ -30,7 +30,7 @@ static double ArrayLen(void)
 {
        ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
        Array::Ptr self = static_cast<Array::Ptr>(vframe->Self);
-       RequireNotNull(self);
+       REQUIRE_NOT_NULL(self);
        return self->GetLength();
 }
 
@@ -38,7 +38,7 @@ static void ArraySet(int index, const Value& value)
 {
        ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
        Array::Ptr self = static_cast<Array::Ptr>(vframe->Self);
-       RequireNotNull(self);
+       REQUIRE_NOT_NULL(self);
        self->Set(index, value);
 }
 
@@ -46,7 +46,7 @@ static Value ArrayGet(int index)
 {
        ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
        Array::Ptr self = static_cast<Array::Ptr>(vframe->Self);
-       RequireNotNull(self);
+       REQUIRE_NOT_NULL(self);
        return self->Get(index);
 }
 
@@ -54,7 +54,7 @@ static void ArrayAdd(const Value& value)
 {
        ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
        Array::Ptr self = static_cast<Array::Ptr>(vframe->Self);
-       RequireNotNull(self);
+       REQUIRE_NOT_NULL(self);
        self->Add(value);
 }
 
@@ -62,7 +62,7 @@ static void ArrayRemove(int index)
 {
        ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
        Array::Ptr self = static_cast<Array::Ptr>(vframe->Self);
-       RequireNotNull(self);
+       REQUIRE_NOT_NULL(self);
        self->Remove(index);
 }
 
@@ -70,7 +70,7 @@ static bool ArrayContains(const Value& value)
 {
        ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
        Array::Ptr self = static_cast<Array::Ptr>(vframe->Self);
-       RequireNotNull(self);
+       REQUIRE_NOT_NULL(self);
        return self->Contains(value);
 }
 
@@ -78,7 +78,7 @@ static void ArrayClear(void)
 {
        ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
        Array::Ptr self = static_cast<Array::Ptr>(vframe->Self);
-       RequireNotNull(self);
+       REQUIRE_NOT_NULL(self);
        self->Clear();
 }
 
@@ -94,7 +94,7 @@ static Array::Ptr ArraySort(const std::vector<Value>& args)
 {
        ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
        Array::Ptr self = static_cast<Array::Ptr>(vframe->Self);
-       RequireNotNull(self);
+       REQUIRE_NOT_NULL(self);
 
        Array::Ptr arr = self->ShallowClone();
 
@@ -118,7 +118,7 @@ static Array::Ptr ArrayShallowClone(void)
 {
        ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
        Array::Ptr self = static_cast<Array::Ptr>(vframe->Self);
-       RequireNotNull(self);
+       REQUIRE_NOT_NULL(self);
        return self->ShallowClone();
 }
 
@@ -126,7 +126,7 @@ static Value ArrayJoin(const Value& separator)
 {
        ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
        Array::Ptr self = static_cast<Array::Ptr>(vframe->Self);
-       RequireNotNull(self);
+       REQUIRE_NOT_NULL(self);
 
        Value result;
        bool first = true;
@@ -149,7 +149,7 @@ static Array::Ptr ArrayReverse(void)
 {
        ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
        Array::Ptr self = static_cast<Array::Ptr>(vframe->Self);
-       RequireNotNull(self);
+       REQUIRE_NOT_NULL(self);
        return self->Reverse();
 }
 
@@ -157,7 +157,7 @@ static Array::Ptr ArrayMap(const Function::Ptr& function)
 {
        ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
        Array::Ptr self = static_cast<Array::Ptr>(vframe->Self);
-       RequireNotNull(self);
+       REQUIRE_NOT_NULL(self);
 
        if (vframe->Sandboxed && !function->IsSideEffectFree())
                BOOST_THROW_EXCEPTION(ScriptError("Map function must be side-effect free."));
@@ -178,7 +178,7 @@ static Value ArrayReduce(const Function::Ptr& function)
 {
        ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
        Array::Ptr self = static_cast<Array::Ptr>(vframe->Self);
-       RequireNotNull(self);
+       REQUIRE_NOT_NULL(self);
 
        if (vframe->Sandboxed && !function->IsSideEffectFree())
                BOOST_THROW_EXCEPTION(ScriptError("Reduce function must be side-effect free."));
@@ -203,7 +203,7 @@ static Array::Ptr ArrayFilter(const Function::Ptr& function)
 {
        ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
        Array::Ptr self = static_cast<Array::Ptr>(vframe->Self);
-       RequireNotNull(self);
+       REQUIRE_NOT_NULL(self);
 
        if (vframe->Sandboxed && !function->IsSideEffectFree())
                BOOST_THROW_EXCEPTION(ScriptError("Filter function must be side-effect free."));
@@ -225,7 +225,7 @@ static bool ArrayAny(const Function::Ptr& function)
 {
        ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
        Array::Ptr self = static_cast<Array::Ptr>(vframe->Self);
-       RequireNotNull(self);
+       REQUIRE_NOT_NULL(self);
 
        if (vframe->Sandboxed && !function->IsSideEffectFree())
                BOOST_THROW_EXCEPTION(ScriptError("Filter function must be side-effect free."));
@@ -245,7 +245,7 @@ static bool ArrayAll(const Function::Ptr& function)
 {
        ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
        Array::Ptr self = static_cast<Array::Ptr>(vframe->Self);
-       RequireNotNull(self);
+       REQUIRE_NOT_NULL(self);
 
        if (vframe->Sandboxed && !function->IsSideEffectFree())
                BOOST_THROW_EXCEPTION(ScriptError("Filter function must be side-effect free."));
@@ -264,7 +264,7 @@ static Array::Ptr ArrayUnique(void)
 {
        ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
        Array::Ptr self = static_cast<Array::Ptr>(vframe->Self);
-       RequireNotNull(self);
+       REQUIRE_NOT_NULL(self);
 
        std::set<Value> result;
 

diff --git a/lib/base/configobject-script.cpp b/lib/base/configobject-script.cpp
index 30d22ceff16921303b0fe4c28ba49d0ef13281ac..a9de57d405e4cb31e1dbdca7af790e3e9f485654 100644 (file)
--- a/lib/base/configobject-script.cpp
+++ b/lib/base/configobject-script.cpp
@@ -29,7 +29,7 @@ static void ConfigObjectModifyAttribute(const String& attr, const Value& value)
 {
        ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
        ConfigObject::Ptr self = vframe->Self;
-       RequireNotNull(self);
+       REQUIRE_NOT_NULL(self);
        return self->ModifyAttribute(attr, value);
 }
 
@@ -37,7 +37,7 @@ static void ConfigObjectRestoreAttribute(const String& attr)
 {
        ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
        ConfigObject::Ptr self = vframe->Self;
-       RequireNotNull(self);
+       REQUIRE_NOT_NULL(self);
        return self->RestoreAttribute(attr);
 }
 

diff --git a/lib/base/datetime-script.cpp b/lib/base/datetime-script.cpp
index 2e2f2f10b9c583e7dd4b72843384efb9d0e0aa3f..dd8207d63f0a8aa814cdc69cbe24bc628c3df494 100644 (file)
--- a/lib/base/datetime-script.cpp
+++ b/lib/base/datetime-script.cpp
@@ -29,7 +29,7 @@ static String DateTimeFormat(const String& format)
 {
        ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
        DateTime::Ptr self = static_cast<DateTime::Ptr>(vframe->Self);
-       RequireNotNull(self);
+       REQUIRE_NOT_NULL(self);
 
        return self->Format(format);
 }

diff --git a/lib/base/dictionary-script.cpp b/lib/base/dictionary-script.cpp
index 9059a0a514cb502821e7e2414308eea659ceb5ac..04e90aa69a7739bdf0e07553e49b7bd21c92c587 100644 (file)
--- a/lib/base/dictionary-script.cpp
+++ b/lib/base/dictionary-script.cpp
@@ -29,7 +29,7 @@ static double DictionaryLen(void)
 {
        ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
        Dictionary::Ptr self = static_cast<Dictionary::Ptr>(vframe->Self);
-       RequireNotNull(self);
+       REQUIRE_NOT_NULL(self);
        return self->GetLength();
 }
 
@@ -37,7 +37,7 @@ static void DictionarySet(const String& key, const Value& value)
 {
        ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
        Dictionary::Ptr self = static_cast<Dictionary::Ptr>(vframe->Self);
-       RequireNotNull(self);
+       REQUIRE_NOT_NULL(self);
        self->Set(key, value);
 }
 
@@ -45,7 +45,7 @@ static Value DictionaryGet(const String& key)
 {
        ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
        Dictionary::Ptr self = static_cast<Dictionary::Ptr>(vframe->Self);
-       RequireNotNull(self);
+       REQUIRE_NOT_NULL(self);
        return self->Get(key);
 }
 
@@ -53,7 +53,7 @@ static void DictionaryRemove(const String& key)
 {
        ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
        Dictionary::Ptr self = static_cast<Dictionary::Ptr>(vframe->Self);
-       RequireNotNull(self);
+       REQUIRE_NOT_NULL(self);
        self->Remove(key);
 }
 
@@ -61,7 +61,7 @@ static bool DictionaryContains(const String& key)
 {
        ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
        Dictionary::Ptr self = static_cast<Dictionary::Ptr>(vframe->Self);
-       RequireNotNull(self);
+       REQUIRE_NOT_NULL(self);
        return self->Contains(key);
 }
 
@@ -69,7 +69,7 @@ static Dictionary::Ptr DictionaryShallowClone(void)
 {
        ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
        Dictionary::Ptr self = static_cast<Dictionary::Ptr>(vframe->Self);
-       RequireNotNull(self);
+       REQUIRE_NOT_NULL(self);
        return self->ShallowClone();
 }
 
@@ -78,7 +78,7 @@ static Array::Ptr DictionaryKeys(void)
        ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
        Dictionary::Ptr self = static_cast<Dictionary::Ptr>(vframe->Self);
        Array::Ptr keys = new Array();
-       RequireNotNull(self);
+       REQUIRE_NOT_NULL(self);
 
        ObjectLock olock(self);
        for (const Dictionary::Pair& kv : self) {
@@ -92,7 +92,7 @@ static Array::Ptr DictionaryValues(void)
        ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
        Dictionary::Ptr self = static_cast<Dictionary::Ptr>(vframe->Self);
        Array::Ptr keys = new Array();
-       RequireNotNull(self);
+       REQUIRE_NOT_NULL(self);
 
        ObjectLock olock(self);
        for (const Dictionary::Pair& kv : self) {

diff --git a/lib/base/function-script.cpp b/lib/base/function-script.cpp
index cd40feacba7a730233deaa4d9ba5d3921d690643..ac7fed4ba69c16d40a7b47597744c9d6d086ba66 100644 (file)
--- a/lib/base/function-script.cpp
+++ b/lib/base/function-script.cpp
@@ -32,7 +32,7 @@ static Value FunctionCall(const std::vector<Value>& args)
 
        ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
        Function::Ptr self = static_cast<Function::Ptr>(vframe->Self);
-       RequireNotNull(self);
+       REQUIRE_NOT_NULL(self);
 
        std::vector<Value> uargs(args.begin() + 1, args.end());
        return self->Invoke(args[0], uargs);
@@ -42,7 +42,7 @@ static Value FunctionCallV(const Value& thisArg, const Array::Ptr& args)
 {
        ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
        Function::Ptr self = static_cast<Function::Ptr>(vframe->Self);
-       RequireNotNull(self);
+       REQUIRE_NOT_NULL(self);
 
        std::vector<Value> uargs;
 

diff --git a/lib/base/object-script.cpp b/lib/base/object-script.cpp
index 27bc487da2a01b029e68627a10484606901c4005..df136b4965c3be31847699f507040bf78d859a44 100644 (file)
--- a/lib/base/object-script.cpp
+++ b/lib/base/object-script.cpp
@@ -29,7 +29,7 @@ static String ObjectToString(void)
 {
        ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
        Object::Ptr self = static_cast<Object::Ptr>(vframe->Self);
-       RequireNotNull(self);
+       REQUIRE_NOT_NULL(self);
        return self->ToString();
 }
 
@@ -37,7 +37,7 @@ static void ObjectNotifyAttribute(const String& attribute)
 {
        ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
        Object::Ptr self = static_cast<Object::Ptr>(vframe->Self);
-       RequireNotNull(self);
+       REQUIRE_NOT_NULL(self);
        self->NotifyField(self->GetReflectionType()->GetFieldId(attribute));
 }
 
@@ -45,7 +45,7 @@ static Object::Ptr ObjectClone(void)
 {
        ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
        Object::Ptr self = static_cast<Object::Ptr>(vframe->Self);
-       RequireNotNull(self);
+       REQUIRE_NOT_NULL(self);
        return self->Clone();
 }
 

diff --git a/lib/base/object.hpp b/lib/base/object.hpp
index 6159c5b5eab224df4e1ee990e606350c27fdecff..dc585665b427059e5a313401b4882d553a5d3ec9 100644 (file)
--- a/lib/base/object.hpp
+++ b/lib/base/object.hpp
@@ -62,7 +62,7 @@ extern I2_BASE_API Value Empty;
        DECLARE_PTR_TYPEDEFS(klass); \
        IMPL_TYPE_LOOKUP();
 
-#define RequireNotNull(ptr) RequireNotNullInternal(ptr, #ptr)
+#define REQUIRE_NOT_NULL(ptr) RequireNotNullInternal(ptr, #ptr)
 
 I2_BASE_API void RequireNotNullInternal(const intrusive_ptr<Object>& object, const char *description);
 

diff --git a/lib/base/typetype-script.cpp b/lib/base/typetype-script.cpp
index 591de4667d517c1657c0831d00bbbf79dc3e09eb..c9d42f731a2f0edefa59d97d2352d3066ac3d946 100644 (file)
--- a/lib/base/typetype-script.cpp
+++ b/lib/base/typetype-script.cpp
@@ -37,7 +37,7 @@ static void TypeRegisterAttributeHandler(const String& fieldName, const Function
 {
        ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
        Type::Ptr self = static_cast<Type::Ptr>(vframe->Self);
-       RequireNotNull(self);
+       REQUIRE_NOT_NULL(self);
 
        int fid = self->GetFieldId(fieldName);
        self->RegisterAttributeHandler(fid, boost::bind(&InvokeAttributeHandlerHelper, callback, _1, _2));

diff --git a/lib/icinga/checkable-script.cpp b/lib/icinga/checkable-script.cpp
index f7ba56e80224dfc5967d875acea7da8d8511ae5c..89b98d3c82e28c354add77dbf97f2b81e7183b74 100644 (file)
--- a/lib/icinga/checkable-script.cpp
+++ b/lib/icinga/checkable-script.cpp
@@ -30,7 +30,7 @@ static void CheckableProcessCheckResult(const CheckResult::Ptr& cr)
 {
        ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
        Checkable::Ptr self = vframe->Self;
-       RequireNotNull(self);
+       REQUIRE_NOT_NULL(self);
        self->ProcessCheckResult(cr);
 }
 

diff --git a/lib/icinga/macroprocessor.cpp b/lib/icinga/macroprocessor.cpp
index ac45f1c9014c95a4406d881cda826da788ccc9b5..a295156f711f9e9b15aca1fa46359cd5c74cd0c4 100644 (file)
--- a/lib/icinga/macroprocessor.cpp
+++ b/lib/icinga/macroprocessor.cpp
@@ -41,7 +41,7 @@ Value MacroProcessor::ResolveMacros(const Value& str, const ResolverList& resolv
     bool useResolvedMacros, int recursionLevel)
 {
        if (useResolvedMacros)
-               RequireNotNull(resolvedMacros);
+               REQUIRE_NOT_NULL(resolvedMacros);
 
        Value result;
 
@@ -458,7 +458,7 @@ Value MacroProcessor::ResolveArguments(const Value& command, const Dictionary::P
     const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros, int recursionLevel)
 {
        if (useResolvedMacros)
-               RequireNotNull(resolvedMacros);
+               REQUIRE_NOT_NULL(resolvedMacros);
 
        Value resolvedCommand;
        if (!arguments || command.IsObjectType<Array>() || command.IsObjectType<Function>())

diff --git a/lib/methods/clusterchecktask.cpp b/lib/methods/clusterchecktask.cpp
index 513a5a4753f9efe5c98a240c2eb24f316d6f0028..0f3935181f42cb56659d990d5a36fbe01961029b 100644 (file)
--- a/lib/methods/clusterchecktask.cpp
+++ b/lib/methods/clusterchecktask.cpp
@@ -38,8 +38,8 @@ REGISTER_SCRIPTFUNCTION_NS(Internal, ClusterCheck, &ClusterCheckTask::ScriptFunc
 void ClusterCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr,
     const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros)
 {
-       RequireNotNull(checkable);
-       RequireNotNull(cr);
+       REQUIRE_NOT_NULL(checkable);
+       REQUIRE_NOT_NULL(cr);
 
        if (resolvedMacros && !useResolvedMacros)
                return;

diff --git a/lib/methods/clusterzonechecktask.cpp b/lib/methods/clusterzonechecktask.cpp
index 699ef9bf3db336fa73436f58eaff120436d8648e..593b927d74c4234d5f431677b38216fdd8d57de6 100644 (file)
--- a/lib/methods/clusterzonechecktask.cpp
+++ b/lib/methods/clusterzonechecktask.cpp
@@ -34,8 +34,8 @@ REGISTER_SCRIPTFUNCTION_NS(Internal, ClusterZoneCheck, &ClusterZoneCheckTask::Sc
 void ClusterZoneCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr,
     const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros)
 {
-       RequireNotNull(checkable);
-       RequireNotNull(cr);
+       REQUIRE_NOT_NULL(checkable);
+       REQUIRE_NOT_NULL(cr);
 
        ApiListener::Ptr listener = ApiListener::GetInstance();
 

diff --git a/lib/methods/exceptionchecktask.cpp b/lib/methods/exceptionchecktask.cpp
index 12026432784ca42885ad6b4660fa077f754a98c6..9045155e83e468e3da31d5e8f16344fd114c4426 100644 (file)
--- a/lib/methods/exceptionchecktask.cpp
+++ b/lib/methods/exceptionchecktask.cpp
@@ -31,11 +31,11 @@ using namespace icinga;
 
 REGISTER_SCRIPTFUNCTION_NS(Internal, ExceptionCheck, &ExceptionCheckTask::ScriptFunc, "checkable:cr:resolvedMacros:useResolvedMacros");
 
-void ExceptionCheckTask::ScriptFunc(const Checkable::Ptr& service, const CheckResult::Ptr& cr,
+void ExceptionCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr,
     const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros)
 {
-       RequireNotNull(service);
-       RequireNotNull(cr);
+       REQUIRE_NOT_NULL(checkable);
+       REQUIRE_NOT_NULL(cr);
 
        if (resolvedMacros && !useResolvedMacros)
                return;

diff --git a/lib/methods/icingachecktask.cpp b/lib/methods/icingachecktask.cpp
index d96dfedd1c1b28ade193c078242067f934e75e08..b288b6be2ee698b01410f9304ed279de0f4a7dfb 100644 (file)
--- a/lib/methods/icingachecktask.cpp
+++ b/lib/methods/icingachecktask.cpp
@@ -32,11 +32,11 @@ using namespace icinga;
 
 REGISTER_SCRIPTFUNCTION_NS(Internal, IcingaCheck, &IcingaCheckTask::ScriptFunc, "checkable:cr:resolvedMacros:useResolvedMacros");
 
-void IcingaCheckTask::ScriptFunc(const Checkable::Ptr& service, const CheckResult::Ptr& cr,
+void IcingaCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr,
     const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros)
 {
-       RequireNotNull(service);
-       RequireNotNull(cr);
+       REQUIRE_NOT_NULL(checkable);
+       REQUIRE_NOT_NULL(cr);
 
        if (resolvedMacros && !useResolvedMacros)
                return;
@@ -115,5 +115,5 @@ void IcingaCheckTask::ScriptFunc(const Checkable::Ptr& service, const CheckResul
        } else
                cr->SetState(ServiceOK);
 
-       service->ProcessCheckResult(cr);
+       checkable->ProcessCheckResult(cr);
 }

diff --git a/lib/methods/nullchecktask.cpp b/lib/methods/nullchecktask.cpp
index 50d2409a1bce952613768399dcb90c9598e7abde..d9b1a9e5f9d1994a1f893cc9f881b6e661d68eff 100644 (file)
--- a/lib/methods/nullchecktask.cpp
+++ b/lib/methods/nullchecktask.cpp
@@ -35,8 +35,8 @@ REGISTER_SCRIPTFUNCTION_NS(Internal, NullCheck, &NullCheckTask::ScriptFunc, "che
 void NullCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr,
     const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros)
 {
-       RequireNotNull(checkable);
-       RequireNotNull(cr);
+       REQUIRE_NOT_NULL(checkable);
+       REQUIRE_NOT_NULL(cr);
 
        if (resolvedMacros && !useResolvedMacros)
                return;

diff --git a/lib/methods/nulleventtask.cpp b/lib/methods/nulleventtask.cpp
index f80edd4e0b5fa6aabb7faf3894f0947d5356e617..21a96c2305f9e2f14be841e41f8b930349819fc3 100644 (file)
--- a/lib/methods/nulleventtask.cpp
+++ b/lib/methods/nulleventtask.cpp
@@ -27,5 +27,5 @@ REGISTER_SCRIPTFUNCTION_NS(Internal, NullEvent, &NullEventTask::ScriptFunc, "che
 
 void NullEventTask::ScriptFunc(const Checkable::Ptr& checkable, const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros)
 {
-       RequireNotNull(checkable);
+       REQUIRE_NOT_NULL(checkable);
 }

diff --git a/lib/methods/pluginchecktask.cpp b/lib/methods/pluginchecktask.cpp
index ddd8dba38144b710133836e9d5eddc56c86f3c6c..bb1c25d2f7cdd8ffd46a4a5e3fd4fd855abf5702 100644 (file)
--- a/lib/methods/pluginchecktask.cpp
+++ b/lib/methods/pluginchecktask.cpp
@@ -38,8 +38,8 @@ REGISTER_SCRIPTFUNCTION_NS(Internal, PluginCheck,  &PluginCheckTask::ScriptFunc,
 void PluginCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr,
     const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros)
 {
-       RequireNotNull(checkable);
-       RequireNotNull(cr);
+       REQUIRE_NOT_NULL(checkable);
+       REQUIRE_NOT_NULL(cr);
 
        CheckCommand::Ptr commandObj = checkable->GetCheckCommand();
 

diff --git a/lib/methods/plugineventtask.cpp b/lib/methods/plugineventtask.cpp
index a1a49f0661068c4ebfdff0b2812f111b68600d9e..5c0dc79ee35fb2c2eec55459b80e6293243b4d56 100644 (file)
--- a/lib/methods/plugineventtask.cpp
+++ b/lib/methods/plugineventtask.cpp
@@ -36,7 +36,7 @@ REGISTER_SCRIPTFUNCTION_NS(Internal, PluginEvent, &PluginEventTask::ScriptFunc,
 void PluginEventTask::ScriptFunc(const Checkable::Ptr& checkable,
     const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros)
 {
-       RequireNotNull(checkable);
+       REQUIRE_NOT_NULL(checkable);
 
        EventCommand::Ptr commandObj = checkable->GetEventCommand();
 

diff --git a/lib/methods/pluginnotificationtask.cpp b/lib/methods/pluginnotificationtask.cpp
index 730ae677093e361ae2a18c1f2097e13477f3e410..bfab41cc0745eb6854fc07155e44bd6f1719273a 100644 (file)
--- a/lib/methods/pluginnotificationtask.cpp
+++ b/lib/methods/pluginnotificationtask.cpp
@@ -39,8 +39,8 @@ void PluginNotificationTask::ScriptFunc(const Notification::Ptr& notification,
     const String& author, const String& comment, const Dictionary::Ptr& resolvedMacros,
     bool useResolvedMacros)
 {
-       RequireNotNull(notification);
-       RequireNotNull(user);
+       REQUIRE_NOT_NULL(notification);
+       REQUIRE_NOT_NULL(user);
 
        NotificationCommand::Ptr commandObj = notification->GetCommand();
 

diff --git a/lib/methods/randomchecktask.cpp b/lib/methods/randomchecktask.cpp
index 7afa0c7afa5e7948a19bb5a175c6107c4c8fb743..23ac841a79a378f11d47c660d01a1fbf1a7e0f73 100644 (file)
--- a/lib/methods/randomchecktask.cpp
+++ b/lib/methods/randomchecktask.cpp
@@ -35,8 +35,8 @@ REGISTER_SCRIPTFUNCTION_NS(Internal, RandomCheck, &RandomCheckTask::ScriptFunc,
 void RandomCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr,
     const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros)
 {
-       RequireNotNull(checkable);
-       RequireNotNull(cr);
+       REQUIRE_NOT_NULL(checkable);
+       REQUIRE_NOT_NULL(cr);
 
        if (resolvedMacros && !useResolvedMacros)
                return;

diff --git a/lib/methods/timeperiodtask.cpp b/lib/methods/timeperiodtask.cpp
index 92c57b3cf0003f9a4b32fcdf92f2bed397ecfed4..e76949f7ba680a7ff6d4b745f1714043ed4ba314 100644 (file)
--- a/lib/methods/timeperiodtask.cpp
+++ b/lib/methods/timeperiodtask.cpp
@@ -27,7 +27,7 @@ REGISTER_SCRIPTFUNCTION_NS(Internal, EvenMinutesTimePeriod, &TimePeriodTask::Eve
 
 Array::Ptr TimePeriodTask::EmptyTimePeriodUpdate(const TimePeriod::Ptr& tp, double, double)
 {
-       RequireNotNull(tp);
+       REQUIRE_NOT_NULL(tp);
 
        Array::Ptr segments = new Array();
        return segments;
@@ -36,7 +36,7 @@ Array::Ptr TimePeriodTask::EmptyTimePeriodUpdate(const TimePeriod::Ptr& tp, doub
 Array::Ptr TimePeriodTask::EvenMinutesTimePeriodUpdate(const TimePeriod::Ptr& tp, double begin, double end)
 {
        Array::Ptr segments = new Array();
-       RequireNotNull(tp);
+       REQUIRE_NOT_NULL(tp);
 
        for (long t = begin / 60 - 1; t * 60 < end; t++) {
                if ((t % 2) == 0) {