[icinga-checkins] icinga.org: icinga2/master: Refactor the macro resolver

[git at icinga.org]

Module: icinga2
Branch: master
Commit: 6d69d6c63931b21816196df6d8b4c79173561303
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=6d69d6c63931b21816196df6d8b4c79173561303

Author: Gunnar Beutner <gunnar.beutner at netways.de>
Date:   Fri Mar 22 14:40:55 2013 +0100

Refactor the macro resolver

Fixes #3884

---

 lib/icinga/Makefile.am                |    2 +
 lib/icinga/host.cpp                   |   98 +++++++++++++++++---------
 lib/icinga/host.h                     |    7 +-
 lib/icinga/icinga-type.conf           |   16 ++++-
 lib/icinga/icinga.vcxproj             |    4 +-
 lib/icinga/icingaapplication.cpp      |   35 +++++++---
 lib/icinga/icingaapplication.h        |    5 +-
 lib/icinga/macroprocessor.cpp         |   67 ++++++++----------
 lib/icinga/macroprocessor.h           |   11 ++-
 lib/icinga/macroresolver.cpp          |   42 +++++++++++
 lib/icinga/macroresolver.h            |   62 +++++++++++++++++
 lib/icinga/notification.cpp           |   36 ++++++----
 lib/icinga/notification.h             |    9 ++-
 lib/icinga/perfdatawriter.cpp         |    9 ++-
 lib/icinga/pluginchecktask.cpp        |   33 +++++++--
 lib/icinga/pluginnotificationtask.cpp |   47 ++++++++++---
 lib/icinga/service-check.cpp          |    7 --
 lib/icinga/service-notification.cpp   |    1 +
 lib/icinga/service.cpp                |  122 ++++++++++++++++++---------------
 lib/icinga/service.h                  |   10 ++-
 lib/icinga/user.cpp                   |   26 +++++---
 lib/icinga/user.h                     |    6 +-
 22 files changed, 450 insertions(+), 205 deletions(-)

Diff:   https://git.icinga.org/?p=icinga2.git;a=commitdiff;h=6d69d6c63931b21816196df6d8b4c79173561303