Remove unused attributes

diff --git a/lib/base/dynamicobject.ti b/lib/base/dynamicobject.ti
index b9163262e96cc0289aaf529073b5bfc7ed989757..c92870d70f29ef40eb94b8b7b880e43108b4a2ee 100644 (file)
--- a/lib/base/dynamicobject.ti
+++ b/lib/base/dynamicobject.ti
@@ -48,7 +48,6 @@ abstract class DynamicObject
        [config] String zone;
        [config, internal, get_protected] Array::Ptr templates;
        [config] Dictionary::Ptr methods;
-       [config] Dictionary::Ptr vars (VarsRaw);
        [get_protected] bool active;
        [get_protected] bool paused {
                default {{{ return true; }}}
@@ -58,11 +57,8 @@ abstract class DynamicObject
        [get_protected] bool pause_called;
        [get_protected] bool resume_called;
        [enum] HAMode ha_mode (HAMode);
-       Dictionary::Ptr authority_info;
        [protected] Dictionary::Ptr extensions;
 
-       [state] Value override_vars;
-
        [protected] bool state_loaded;
 };
 

diff --git a/lib/icinga/checkable.cpp b/lib/icinga/checkable.cpp
index ad44f05d571bee6146087117a7bc024065f62199..234d0582b99e4617a873145be66dbbff7c64abda 100644 (file)
--- a/lib/icinga/checkable.cpp
+++ b/lib/icinga/checkable.cpp
@@ -197,7 +197,7 @@ int Checkable::GetModifiedAttributes(void) const
        if (!GetOverrideCheckPeriod().IsEmpty())
                attrs |= ModAttrCheckTimeperiod;
 
-       if (!GetOverrideVars().IsEmpty())
+       if (GetOverrideVars())
                attrs |= ModAttrCustomVariable;
 
        // TODO: finish

diff --git a/lib/icinga/command.cpp b/lib/icinga/command.cpp
index d77a5e9f9f9650888f2328f049cff78c3dbe8388..b7d979da24b9ac1b5a39b3e776261b13e41cbc8f 100644 (file)
--- a/lib/icinga/command.cpp
+++ b/lib/icinga/command.cpp
@@ -30,7 +30,7 @@ int Command::GetModifiedAttributes(void) const
 {
        int attrs = 0;
 
-       if (!GetOverrideVars().IsEmpty())
+       if (GetOverrideVars())
                attrs |= ModAttrCustomVariable;
 
        return attrs;

diff --git a/lib/icinga/customvarobject.cpp b/lib/icinga/customvarobject.cpp
index 095055220b2ed939162686e76c10aeadad970655..8687af256f0a340c5cf5da01ec221779a06da526 100644 (file)
--- a/lib/icinga/customvarobject.cpp
+++ b/lib/icinga/customvarobject.cpp
@@ -28,7 +28,7 @@ boost::signals2::signal<void (const CustomVarObject::Ptr&, const Dictionary::Ptr
 
 Dictionary::Ptr CustomVarObject::GetVars(void) const
 {
-       if (!GetOverrideVars().IsEmpty())
+       if (GetOverrideVars())
                return GetOverrideVars();
        else
                return GetVarsRaw();

diff --git a/lib/icinga/customvarobject.ti b/lib/icinga/customvarobject.ti
index a4dd0c9fdec40be1f1724c7821a776f0521cbec6..af7838367eea7f53d2f600b314516bd36584b532 100644 (file)
--- a/lib/icinga/customvarobject.ti
+++ b/lib/icinga/customvarobject.ti
@@ -26,7 +26,7 @@ abstract class CustomVarObject : DynamicObject
 {
        [config] Dictionary::Ptr vars (VarsRaw);
 
-       [state] Value override_vars;
+       [state] Dictionary::Ptr override_vars;
 };
 
 }

diff --git a/lib/icinga/notification.ti b/lib/icinga/notification.ti
index 058f04d624029893bc35cedb29bda2e8b4715f9b..2db5f316c639b34eddf7e213757523483c0ff6ad 100644 (file)
--- a/lib/icinga/notification.ti
+++ b/lib/icinga/notification.ti
@@ -37,7 +37,6 @@ class Notification : CustomVarObject < NotificationNameComposer
                default {{{ return 1800; }}}
        };
        [config] String period (PeriodRaw);
-       [config] Dictionary::Ptr macros;
        [config, protected] Array::Ptr users (UsersRaw);
        [config, protected] Array::Ptr user_groups (UserGroupsRaw);
        [config] Dictionary::Ptr times;

diff --git a/lib/icinga/user.cpp b/lib/icinga/user.cpp
index 6649bef4813c558f7fbe76cd3eefa2d98d1b4acf..18342e6af05a1c1710cbfa859895afab6f7c0c1a 100644 (file)
--- a/lib/icinga/user.cpp
+++ b/lib/icinga/user.cpp
@@ -114,7 +114,7 @@ int User::GetModifiedAttributes(void) const
 {
        int attrs = 0;
 
-       if (!GetOverrideVars().IsEmpty())
+       if (GetOverrideVars())
                attrs |= ModAttrCustomVariable;
 
        return attrs;