tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-27 07:34:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated functions

Browse Source 
fixes #12507
This commit is contained in:
Gunnar Beutner 2016-08-23 02:43:23 +02:00 committed by Michael Friedrich
parent 53e24964c8
commit 43a4acd5a2
15 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/config/configitem.cpp
View File

@ -46,7 +46,7 @@ ConfigItem::TypeMap ConfigItem::m_Items;
ConfigItem::ItemList ConfigItem::m_UnnamedItems; ConfigItem::ItemList ConfigItem::m_UnnamedItems;
ConfigItem::IgnoredItemList ConfigItem::m_IgnoredItems; ConfigItem::IgnoredItemList ConfigItem::m_IgnoredItems;
REGISTER_SCRIPTFUNCTION_NS_PREFIX(Internal, run_with_activation_context, &ConfigItem::RunWithActivationContext); REGISTER_SCRIPTFUNCTION_NS(Internal, run_with_activation_context, &ConfigItem::RunWithActivationContext);
/** /**
* Constructor for the ConfigItem class. * Constructor for the ConfigItem class.

2
lib/db_ido/idochecktask.cpp
View File

@ -33,7 +33,7 @@
using namespace icinga; using namespace icinga;
REGISTER_SCRIPTFUNCTION_NS_DEPRECATED(Internal, IdoCheck, &IdoCheckTask::ScriptFunc); REGISTER_SCRIPTFUNCTION_NS(Internal, IdoCheck, &IdoCheckTask::ScriptFunc);
void IdoCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr, void IdoCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr,
const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros) const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros)

2
lib/icinga/legacytimeperiod.cpp
View File

@ -31,7 +31,7 @@
using namespace icinga; using namespace icinga;
REGISTER_SCRIPTFUNCTION_NS_DEPRECATED(Internal, LegacyTimePeriod, &LegacyTimePeriod::ScriptFunc); REGISTER_SCRIPTFUNCTION_NS(Internal, LegacyTimePeriod, &LegacyTimePeriod::ScriptFunc);
bool LegacyTimePeriod::IsInTimeRange(tm *begin, tm *end, int stride, tm *reference) bool LegacyTimePeriod::IsInTimeRange(tm *begin, tm *end, int stride, tm *reference)
{ {

2
lib/methods/clrchecktask.cpp
View File

@ -39,7 +39,7 @@
using namespace icinga; using namespace icinga;
REGISTER_SCRIPTFUNCTION_NS_DEPRECATED(Internal, ClrCheck, &ClrCheckTask::ScriptFunc); REGISTER_SCRIPTFUNCTION_NS(Internal, ClrCheck, &ClrCheckTask::ScriptFunc);
static boost::once_flag l_OnceFlag = BOOST_ONCE_INIT; static boost::once_flag l_OnceFlag = BOOST_ONCE_INIT;

2
lib/methods/clusterchecktask.cpp
View File

@ -34,7 +34,7 @@
using namespace icinga; using namespace icinga;
REGISTER_SCRIPTFUNCTION_NS_DEPRECATED(Internal, ClusterCheck, &ClusterCheckTask::ScriptFunc); REGISTER_SCRIPTFUNCTION_NS(Internal, ClusterCheck, &ClusterCheckTask::ScriptFunc);
void ClusterCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr, void ClusterCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr,
const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros) const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros)

2
lib/methods/clusterzonechecktask.cpp
View File

@ -30,7 +30,7 @@
using namespace icinga; using namespace icinga;
REGISTER_SCRIPTFUNCTION_NS_DEPRECATED(Internal, ClusterZoneCheck, &ClusterZoneCheckTask::ScriptFunc); REGISTER_SCRIPTFUNCTION_NS(Internal, ClusterZoneCheck, &ClusterZoneCheckTask::ScriptFunc);
void ClusterZoneCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr, void ClusterZoneCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr,
const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros) const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros)

2
lib/methods/exceptionchecktask.cpp
View File

@ -29,7 +29,7 @@
using namespace icinga; using namespace icinga;
REGISTER_SCRIPTFUNCTION_NS_DEPRECATED(Internal, ExceptionCheck, &ExceptionCheckTask::ScriptFunc); REGISTER_SCRIPTFUNCTION_NS(Internal, ExceptionCheck, &ExceptionCheckTask::ScriptFunc);
void ExceptionCheckTask::ScriptFunc(const Checkable::Ptr& service, const CheckResult::Ptr& cr, void ExceptionCheckTask::ScriptFunc(const Checkable::Ptr& service, const CheckResult::Ptr& cr,
const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros) const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros)

2
lib/methods/icingachecktask.cpp
View File

@ -30,7 +30,7 @@
using namespace icinga; using namespace icinga;
REGISTER_SCRIPTFUNCTION_NS_DEPRECATED(Internal, IcingaCheck, &IcingaCheckTask::ScriptFunc); REGISTER_SCRIPTFUNCTION_NS(Internal, IcingaCheck, &IcingaCheckTask::ScriptFunc);
void IcingaCheckTask::ScriptFunc(const Checkable::Ptr& service, const CheckResult::Ptr& cr, void IcingaCheckTask::ScriptFunc(const Checkable::Ptr& service, const CheckResult::Ptr& cr,
const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros) const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros)

2
lib/methods/nullchecktask.cpp
View File

@ -30,7 +30,7 @@
using namespace icinga; using namespace icinga;
REGISTER_SCRIPTFUNCTION_NS_DEPRECATED(Internal, NullCheck, &NullCheckTask::ScriptFunc); REGISTER_SCRIPTFUNCTION_NS(Internal, NullCheck, &NullCheckTask::ScriptFunc);
void NullCheckTask::ScriptFunc(const Checkable::Ptr& service, const CheckResult::Ptr& cr, void NullCheckTask::ScriptFunc(const Checkable::Ptr& service, const CheckResult::Ptr& cr,
const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros) const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros)

2
lib/methods/nulleventtask.cpp
View File

@ -23,7 +23,7 @@
using namespace icinga; using namespace icinga;
REGISTER_SCRIPTFUNCTION_NS_DEPRECATED(Internal, NullEvent, &NullEventTask::ScriptFunc); REGISTER_SCRIPTFUNCTION_NS(Internal, NullEvent, &NullEventTask::ScriptFunc);
void NullEventTask::ScriptFunc(const Checkable::Ptr&, const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros) void NullEventTask::ScriptFunc(const Checkable::Ptr&, const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros)
{ } { }

2
lib/methods/pluginchecktask.cpp
View File

@ -34,7 +34,7 @@
using namespace icinga; using namespace icinga;
REGISTER_SCRIPTFUNCTION_NS_DEPRECATED(Internal, PluginCheck, &PluginCheckTask::ScriptFunc); REGISTER_SCRIPTFUNCTION_NS(Internal, PluginCheck, &PluginCheckTask::ScriptFunc);
void PluginCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr, void PluginCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr,
const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros) const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros)

2
lib/methods/plugineventtask.cpp
View File

@ -32,7 +32,7 @@
using namespace icinga; using namespace icinga;
REGISTER_SCRIPTFUNCTION_NS_DEPRECATED(Internal, PluginEvent, &PluginEventTask::ScriptFunc); REGISTER_SCRIPTFUNCTION_NS(Internal, PluginEvent, &PluginEventTask::ScriptFunc);
void PluginEventTask::ScriptFunc(const Checkable::Ptr& checkable, void PluginEventTask::ScriptFunc(const Checkable::Ptr& checkable,
const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros) const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros)

2
lib/methods/pluginnotificationtask.cpp
View File

@ -33,7 +33,7 @@
using namespace icinga; using namespace icinga;
REGISTER_SCRIPTFUNCTION_NS_DEPRECATED(Internal, PluginNotification, &PluginNotificationTask::ScriptFunc); REGISTER_SCRIPTFUNCTION_NS(Internal, PluginNotification, &PluginNotificationTask::ScriptFunc);
void PluginNotificationTask::ScriptFunc(const Notification::Ptr& notification, void PluginNotificationTask::ScriptFunc(const Notification::Ptr& notification,
const User::Ptr& user, const CheckResult::Ptr& cr, int itype, const User::Ptr& user, const CheckResult::Ptr& cr, int itype,

2
lib/methods/randomchecktask.cpp
View File

@ -30,7 +30,7 @@
using namespace icinga; using namespace icinga;
REGISTER_SCRIPTFUNCTION_NS_DEPRECATED(Internal, RandomCheck, &RandomCheckTask::ScriptFunc); REGISTER_SCRIPTFUNCTION_NS(Internal, RandomCheck, &RandomCheckTask::ScriptFunc);
void RandomCheckTask::ScriptFunc(const Checkable::Ptr& service, const CheckResult::Ptr& cr, void RandomCheckTask::ScriptFunc(const Checkable::Ptr& service, const CheckResult::Ptr& cr,
const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros) const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros)

4
lib/methods/timeperiodtask.cpp
View File

@ -22,8 +22,8 @@
using namespace icinga; using namespace icinga;
REGISTER_SCRIPTFUNCTION_NS_DEPRECATED(Internal, EmptyTimePeriod, &TimePeriodTask::EmptyTimePeriodUpdate); REGISTER_SCRIPTFUNCTION_NS(Internal, EmptyTimePeriod, &TimePeriodTask::EmptyTimePeriodUpdate);
REGISTER_SCRIPTFUNCTION_NS_DEPRECATED(Internal, EvenMinutesTimePeriod, &TimePeriodTask::EvenMinutesTimePeriodUpdate); REGISTER_SCRIPTFUNCTION_NS(Internal, EvenMinutesTimePeriod, &TimePeriodTask::EvenMinutesTimePeriodUpdate);
Array::Ptr TimePeriodTask::EmptyTimePeriodUpdate(const TimePeriod::Ptr&, double, double) Array::Ptr TimePeriodTask::EmptyTimePeriodUpdate(const TimePeriod::Ptr&, double, double)
{ {