From 9c3e39918853d16f8b583587f9df3ac904c4e01d Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Sun, 11 May 2014 17:14:35 +0200 Subject: [PATCH] Remove unnecessary includes. Fixes #6189 --- components/livestatus/statustable.cpp | 1 + lib/base/application.cpp | 26 ++++++++++++-------------- lib/base/application.h | 5 ----- lib/base/array.cpp | 1 - lib/base/dictionary.cpp | 1 - lib/base/dynamicobject.cpp | 13 ------------- lib/base/dynamicobject.h | 12 +----------- lib/base/dynamictype.h | 3 --- lib/base/exception.cpp | 1 + lib/base/exception.h | 1 - lib/base/fifo.cpp | 1 - lib/base/logger.cpp | 2 -- lib/base/logger.h | 1 - lib/base/netstring.cpp | 1 + lib/base/networkstream.cpp | 2 -- lib/base/process.cpp | 5 +---- lib/base/process.h | 6 ++---- lib/base/qstring.cpp | 5 +---- lib/base/qstring.h | 10 +++++++--- lib/base/scriptfunction.cpp | 2 -- lib/base/scriptfunction.h | 2 -- lib/base/scriptutils.cpp | 2 +- lib/base/scriptvariable.cpp | 2 +- lib/base/scriptvariable.h | 1 - lib/base/socket.cpp | 3 --- lib/base/stacktrace.cpp | 2 -- lib/base/stacktrace.h | 2 -- lib/base/statsfunction.h | 2 -- lib/base/stdiostream.cpp | 1 - lib/base/stdiostream.h | 2 +- lib/base/stream.cpp | 3 +-- lib/base/stream.h | 5 ++--- lib/base/streamlogger.cpp | 2 -- lib/base/tcpsocket.cpp | 1 - lib/base/threadpool.cpp | 4 ---- lib/base/threadpool.h | 2 +- lib/base/timer.cpp | 1 - lib/base/tlsstream.cpp | 3 --- lib/base/tlsstream.h | 2 +- lib/base/type.h | 2 +- lib/base/unixsocket.h | 3 +-- lib/base/utility.cpp | 1 - lib/base/value-operators.cpp | 5 ++--- lib/base/value.cpp | 1 - lib/base/workqueue.cpp | 1 - lib/config/aexpression.cpp | 1 - lib/config/applyrule.cpp | 2 ++ lib/config/applyrule.h | 2 +- lib/config/config_lexer.ll | 1 + lib/config/config_parser.yy | 2 ++ lib/config/configcompiler.cpp | 1 - lib/config/configcompilercontext.cpp | 2 -- lib/config/configcompilercontext.h | 5 +++-- lib/config/configitem.cpp | 1 + lib/config/configitembuilder.cpp | 1 - lib/config/configtype.cpp | 1 + lib/config/configtype.h | 3 +-- lib/config/objectrule.cpp | 3 ++- lib/config/typerule.cpp | 1 - lib/db_ido/dbevents.cpp | 1 + lib/db_ido/hostdbobject.cpp | 1 + lib/db_ido/servicedbobject.cpp | 13 +++++++------ lib/icinga/api.h | 3 +-- lib/icinga/apievents.cpp | 6 +++--- lib/icinga/apievents.h | 5 ----- lib/icinga/checkable-check.cpp | 7 ++----- lib/icinga/checkable-comment.cpp | 2 +- lib/icinga/checkable-dependency.cpp | 6 ------ lib/icinga/checkable-downtime.cpp | 1 - lib/icinga/checkable-event.cpp | 3 ++- lib/icinga/checkable-flapping.cpp | 7 +------ lib/icinga/checkable-notification.cpp | 6 +----- lib/icinga/checkable.cpp | 12 +----------- lib/icinga/checkable.h | 5 ----- lib/icinga/checkcommand.h | 2 +- lib/icinga/checkresult.cpp | 3 --- lib/icinga/command.cpp | 12 ------------ lib/icinga/command.h | 10 ++-------- lib/icinga/compatutility.cpp | 5 +---- lib/icinga/compatutility.h | 4 ++-- lib/icinga/dependency-apply.cpp | 2 +- lib/icinga/dependency.cpp | 3 --- lib/icinga/dependency.h | 4 ++-- lib/icinga/downtime.cpp | 1 - lib/icinga/eventcommand.cpp | 1 - lib/icinga/eventcommand.h | 2 +- lib/icinga/externalcommandprocessor.h | 2 -- lib/icinga/host.cpp | 7 ------- lib/icinga/host.h | 4 ---- lib/icinga/hostgroup.cpp | 3 +-- lib/icinga/hostgroup.h | 3 ++- lib/icinga/icingastatuswriter.cpp | 11 ----------- lib/icinga/icingastatuswriter.h | 8 -------- lib/icinga/legacytimeperiod.h | 2 +- lib/icinga/macroprocessor.cpp | 1 - lib/icinga/macroprocessor.h | 7 +++---- lib/icinga/notification-apply.cpp | 3 ++- lib/icinga/notification.cpp | 2 -- lib/icinga/notification.h | 3 ++- lib/icinga/notificationcommand.cpp | 1 - lib/icinga/pluginutility.cpp | 4 ---- lib/icinga/pluginutility.h | 7 +++---- lib/icinga/scheduleddowntime-apply.cpp | 3 ++- lib/icinga/scheduleddowntime.cpp | 1 + lib/icinga/scheduleddowntime.h | 5 +++-- lib/icinga/service-apply.cpp | 2 +- lib/icinga/service.cpp | 7 ------- lib/icinga/service.h | 8 -------- lib/icinga/servicegroup.cpp | 4 +--- lib/icinga/servicegroup.h | 3 ++- lib/icinga/timeperiod.cpp | 1 - lib/icinga/timeperiod.h | 1 - lib/icinga/user.cpp | 3 +-- lib/icinga/user.h | 2 -- lib/icinga/usergroup.cpp | 3 +-- lib/icinga/usergroup.h | 3 ++- lib/methods/clrchecktask.cpp | 1 + lib/methods/clusterchecktask.cpp | 1 + lib/remote/apiclient.cpp | 2 -- lib/remote/apiclient.h | 2 -- lib/remote/apifunction.cpp | 1 - lib/remote/apifunction.h | 2 -- lib/remote/apilistener.cpp | 2 -- lib/remote/apilistener.h | 5 +---- lib/remote/authority.cpp | 5 +---- lib/remote/endpoint.cpp | 5 +---- lib/remote/endpoint.h | 6 ++---- lib/remote/jsonrpc.cpp | 4 +--- lib/remote/zone.cpp | 7 +------ lib/remote/zone.h | 4 +--- test/base-netstring.cpp | 1 + test/base-stream.cpp | 1 + 132 files changed, 124 insertions(+), 346 deletions(-) diff --git a/components/livestatus/statustable.cpp b/components/livestatus/statustable.cpp index 2b27af730..383ae6fef 100644 --- a/components/livestatus/statustable.cpp +++ b/components/livestatus/statustable.cpp @@ -26,6 +26,7 @@ #include "base/dynamictype.h" #include "base/utility.h" #include "base/application.h" +#include using namespace icinga; diff --git a/lib/base/application.cpp b/lib/base/application.cpp index e7a41aaa1..754a9f77a 100644 --- a/lib/base/application.cpp +++ b/lib/base/application.cpp @@ -28,12 +28,10 @@ #include "base/type.h" #include "base/convert.h" #include "base/scriptvariable.h" +#include "base/process.h" #include "icinga-version.h" #include #include -#include -#include -#include #include #include #include @@ -48,7 +46,7 @@ REGISTER_TYPE(Application); Application *Application::m_Instance = NULL; bool Application::m_ShuttingDown = false; bool Application::m_RequestRestart = false; -bool Application::m_Restarting = false; +static bool l_Restarting = false; bool Application::m_Debugging = false; int Application::m_ArgC; char **Application::m_ArgV; @@ -252,10 +250,10 @@ mainloop: m_RequestRestart = false; // we are now handling the request, once is enough // are we already restarting? ignore request if we already are - if (m_Restarting) + if (l_Restarting) goto mainloop; - m_Restarting = true; + l_Restarting = true; StartReloadProcess(); goto mainloop; @@ -280,6 +278,13 @@ void Application::OnShutdown(void) /* Nothing to do here. */ } +static void ReloadProcessCallback(const ProcessResult& pr) +{ + if (pr.ExitStatus != 0) + Log(LogCritical, "base", "Found error in config: reloading aborted"); + l_Restarting = false; +} + void Application::StartReloadProcess(void) const { Log(LogInformation, "base", "Got reload command: Starting new instance."); @@ -299,14 +304,7 @@ void Application::StartReloadProcess(void) const Process::Ptr process = make_shared(Process::PrepareCommand(args)); process->SetTimeout(300); - process->Run(boost::bind(&Application::ReloadProcessCallback, _1)); -} - -void Application::ReloadProcessCallback(const ProcessResult& pr) -{ - if (pr.ExitStatus != 0) - Log(LogCritical, "base", "Found error in config: reloading aborted"); - m_Restarting=false; + process->Run(&ReloadProcessCallback); } /** diff --git a/lib/base/application.h b/lib/base/application.h index 1980afd24..4b053c10f 100644 --- a/lib/base/application.h +++ b/lib/base/application.h @@ -23,8 +23,6 @@ #include "base/i2-base.h" #include "base/application.th" #include "base/threadpool.h" -#include "base/dynamicobject.h" -#include "base/process.h" namespace icinga { @@ -124,7 +122,6 @@ private: static bool m_ShuttingDown; /**< Whether the application is in the process of shutting down. */ static bool m_RequestRestart; - static bool m_Restarting; static int m_ArgC; /**< The number of command-line arguments. */ static char **m_ArgV; /**< Command-line arguments. */ FILE *m_PidFile; /**< The PID file */ @@ -143,8 +140,6 @@ private: static void SigAbrtHandler(int signum); static void ExceptionHandler(void); - - static void ReloadProcessCallback(const ProcessResult& pr); }; } diff --git a/lib/base/array.cpp b/lib/base/array.cpp index d9e8ea06c..1240e0a1f 100644 --- a/lib/base/array.cpp +++ b/lib/base/array.cpp @@ -21,7 +21,6 @@ #include "base/objectlock.h" #include "base/debug.h" #include -#include #include using namespace icinga; diff --git a/lib/base/dictionary.cpp b/lib/base/dictionary.cpp index 0eeb76923..833480541 100644 --- a/lib/base/dictionary.cpp +++ b/lib/base/dictionary.cpp @@ -21,7 +21,6 @@ #include "base/objectlock.h" #include "base/debug.h" #include -#include #include using namespace icinga; diff --git a/lib/base/dynamicobject.cpp b/lib/base/dynamicobject.cpp index 9f8109054..deec32b38 100644 --- a/lib/base/dynamicobject.cpp +++ b/lib/base/dynamicobject.cpp @@ -21,7 +21,6 @@ #include "base/dynamictype.h" #include "base/serializer.h" #include "base/netstring.h" -#include "base/registry.h" #include "base/stdiostream.h" #include "base/debug.h" #include "base/objectlock.h" @@ -31,7 +30,6 @@ #include "base/initialize.h" #include "base/scriptvariable.h" #include -#include #include #include #include @@ -40,7 +38,6 @@ using namespace icinga; REGISTER_TYPE(DynamicObject); -INITIALIZE_ONCE(&DynamicObject::StaticInitialize); boost::signals2::signal DynamicObject::OnStarted; boost::signals2::signal DynamicObject::OnStopped; @@ -49,16 +46,6 @@ boost::signals2::signal DynamicObject::OnResum boost::signals2::signal DynamicObject::OnStateChanged; boost::signals2::signal DynamicObject::OnVarsChanged; -void DynamicObject::StaticInitialize(void) -{ - ScriptVariable::Set("DomainPrivRead", DomainPrivRead, true, true); - ScriptVariable::Set("DomainPrivCheckResult", DomainPrivCheckResult, true, true); - ScriptVariable::Set("DomainPrivCommand", DomainPrivCommand, true, true); - - ScriptVariable::Set("DomainPrivReadOnly", DomainPrivRead, true, true); - ScriptVariable::Set("DomainPrivReadWrite", DomainPrivRead | DomainPrivCheckResult | DomainPrivCommand, true, true); -} - DynamicObject::DynamicObject(void) { } diff --git a/lib/base/dynamicobject.h b/lib/base/dynamicobject.h index 52cf833f5..5b47a8dfb 100644 --- a/lib/base/dynamicobject.h +++ b/lib/base/dynamicobject.h @@ -23,24 +23,16 @@ #include "base/i2-base.h" #include "base/dynamicobject.th" #include "base/object.h" +#include "base/serializer.h" #include "base/dictionary.h" -#include "base/array.h" #include #include -#include namespace icinga { class DynamicType; -enum DomainPriv -{ - DomainPrivRead = (1<<0), - DomainPrivCheckResult = (1<<1), - DomainPrivCommand = (1<<2) -}; - enum ModifiedAttributeType { ModAttrNotificationsEnabled = 1, @@ -73,8 +65,6 @@ class I2_BASE_API DynamicObject : public ObjectImpl public: DECLARE_PTR_TYPEDEFS(DynamicObject); - static void StaticInitialize(void); - static boost::signals2::signal OnStarted; static boost::signals2::signal OnStopped; static boost::signals2::signal OnPaused; diff --git a/lib/base/dynamictype.h b/lib/base/dynamictype.h index 6a04b81da..9675bbdf3 100644 --- a/lib/base/dynamictype.h +++ b/lib/base/dynamictype.h @@ -21,13 +21,10 @@ #define DYNAMICTYPE_H #include "base/i2-base.h" -#include "base/registry.h" #include "base/dynamicobject.h" #include "base/debug.h" #include "base/objectlock.h" #include -#include -#include # include namespace icinga diff --git a/lib/base/exception.cpp b/lib/base/exception.cpp index bf8c11996..8c57a93af 100644 --- a/lib/base/exception.cpp +++ b/lib/base/exception.cpp @@ -18,6 +18,7 @@ ******************************************************************************/ #include "base/exception.h" +#include #ifndef _MSC_VER # include diff --git a/lib/base/exception.h b/lib/base/exception.h index 0cb79634f..22b031508 100644 --- a/lib/base/exception.h +++ b/lib/base/exception.h @@ -25,7 +25,6 @@ #include "base/stacktrace.h" #include "base/context.h" #include -#include #include #include #include diff --git a/lib/base/fifo.cpp b/lib/base/fifo.cpp index 78925c170..3365a6f87 100644 --- a/lib/base/fifo.cpp +++ b/lib/base/fifo.cpp @@ -18,7 +18,6 @@ ******************************************************************************/ #include "base/fifo.h" -#include "base/utility.h" using namespace icinga; diff --git a/lib/base/logger.cpp b/lib/base/logger.cpp index b841fbd08..d0f5e59f1 100644 --- a/lib/base/logger.cpp +++ b/lib/base/logger.cpp @@ -24,9 +24,7 @@ #include "base/utility.h" #include "base/objectlock.h" #include "base/context.h" -#include "base/convert.h" #include "base/scriptvariable.h" -#include #include #include diff --git a/lib/base/logger.h b/lib/base/logger.h index 4f146c37d..1a79e74f9 100644 --- a/lib/base/logger.h +++ b/lib/base/logger.h @@ -22,7 +22,6 @@ #include "base/i2-base.h" #include "base/logger.th" -#include "base/dynamicobject.h" #include "base/logger_fwd.h" #include diff --git a/lib/base/netstring.cpp b/lib/base/netstring.cpp index d41f167bb..7314a8ea1 100644 --- a/lib/base/netstring.cpp +++ b/lib/base/netstring.cpp @@ -18,6 +18,7 @@ ******************************************************************************/ #include "base/netstring.h" +#include "base/qstring.h" #include "base/debug.h" #include diff --git a/lib/base/networkstream.cpp b/lib/base/networkstream.cpp index d168444a1..c74ea4271 100644 --- a/lib/base/networkstream.cpp +++ b/lib/base/networkstream.cpp @@ -18,8 +18,6 @@ ******************************************************************************/ #include "base/networkstream.h" -#include "base/objectlock.h" -#include using namespace icinga; diff --git a/lib/base/process.cpp b/lib/base/process.cpp index 331cc314f..7d6ad90e8 100644 --- a/lib/base/process.cpp +++ b/lib/base/process.cpp @@ -17,7 +17,6 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * ******************************************************************************/ -#include "i2-base.h" #include "base/process.h" #include "base/exception.h" #include "base/convert.h" @@ -29,10 +28,8 @@ #include "base/utility.h" #include "base/scriptvariable.h" #include -#include -#include -#include #include +#include #ifndef _WIN32 # include diff --git a/lib/base/process.h b/lib/base/process.h index d3ea6f866..d367bfa7a 100644 --- a/lib/base/process.h +++ b/lib/base/process.h @@ -21,13 +21,11 @@ #define PROCESS_H #include "base/i2-base.h" -#include "base/timer.h" #include "base/dictionary.h" +#include #include #include -#include -#include -#include +#include namespace icinga { diff --git a/lib/base/qstring.cpp b/lib/base/qstring.cpp index 3328b24a5..3d9ad3768 100644 --- a/lib/base/qstring.cpp +++ b/lib/base/qstring.cpp @@ -20,10 +20,7 @@ #include "base/qstring.h" #include "base/value.h" #include -#include -#include -#include -#include +#include using namespace icinga; diff --git a/lib/base/qstring.h b/lib/base/qstring.h index 22b0a2780..a54945d2c 100644 --- a/lib/base/qstring.h +++ b/lib/base/qstring.h @@ -21,10 +21,10 @@ #define STRING_H #include "base/i2-base.h" -#include -#include +#include +#include +#include #include -#include namespace icinga { @@ -173,12 +173,16 @@ struct string_iless : std::binary_function namespace boost { +template struct range_mutable_iterator; + template<> struct range_mutable_iterator { typedef icinga::String::Iterator type; }; +template struct range_const_iterator; + template<> struct range_const_iterator { diff --git a/lib/base/scriptfunction.cpp b/lib/base/scriptfunction.cpp index 8f392a1f4..745969237 100644 --- a/lib/base/scriptfunction.cpp +++ b/lib/base/scriptfunction.cpp @@ -19,8 +19,6 @@ #include "base/scriptfunction.h" #include "base/scriptvariable.h" -#include "base/registry.h" -#include "base/singleton.h" using namespace icinga; diff --git a/lib/base/scriptfunction.h b/lib/base/scriptfunction.h index a9188c559..ef8861ba5 100644 --- a/lib/base/scriptfunction.h +++ b/lib/base/scriptfunction.h @@ -21,8 +21,6 @@ #define SCRIPTFUNCTION_H #include "base/i2-base.h" -#include "base/registry.h" -#include "base/singleton.h" #include "base/value.h" #include "base/scriptfunctionwrapper.h" #include diff --git a/lib/base/scriptutils.cpp b/lib/base/scriptutils.cpp index 0f7b97449..b7f7fc83f 100644 --- a/lib/base/scriptutils.cpp +++ b/lib/base/scriptutils.cpp @@ -25,7 +25,7 @@ #include "base/dictionary.h" #include "base/serializer.h" #include "base/logger_fwd.h" -#include "base/application.h" +#include #include #include #include diff --git a/lib/base/scriptvariable.cpp b/lib/base/scriptvariable.cpp index a4c552718..7cde7cf6d 100644 --- a/lib/base/scriptvariable.cpp +++ b/lib/base/scriptvariable.cpp @@ -18,7 +18,7 @@ ******************************************************************************/ #include "base/scriptvariable.h" -#include "base/logger_fwd.h" +#include "base/singleton.h" using namespace icinga; diff --git a/lib/base/scriptvariable.h b/lib/base/scriptvariable.h index 024f4bbc2..977e133cb 100644 --- a/lib/base/scriptvariable.h +++ b/lib/base/scriptvariable.h @@ -22,7 +22,6 @@ #include "base/i2-base.h" #include "base/registry.h" -#include "base/singleton.h" #include "base/value.h" namespace icinga diff --git a/lib/base/socket.cpp b/lib/base/socket.cpp index 1502df542..3ea9f8255 100644 --- a/lib/base/socket.cpp +++ b/lib/base/socket.cpp @@ -22,11 +22,8 @@ #include "base/utility.h" #include "base/exception.h" #include -#include -#include #include #include -#include #ifndef _WIN32 # include diff --git a/lib/base/stacktrace.cpp b/lib/base/stacktrace.cpp index dd7db0a5e..99dba39bc 100644 --- a/lib/base/stacktrace.cpp +++ b/lib/base/stacktrace.cpp @@ -20,8 +20,6 @@ #include "base/stacktrace.h" #include "base/qstring.h" #include "base/utility.h" -#include "base/convert.h" -#include "base/application.h" #include "base/initialize.h" #ifdef HAVE_BACKTRACE_SYMBOLS diff --git a/lib/base/stacktrace.h b/lib/base/stacktrace.h index 655dfc6ab..8a634ef76 100644 --- a/lib/base/stacktrace.h +++ b/lib/base/stacktrace.h @@ -21,9 +21,7 @@ #define STACKTRACE_H #include "base/i2-base.h" -#include "base/qstring.h" #include -#include namespace icinga { diff --git a/lib/base/statsfunction.h b/lib/base/statsfunction.h index 84ca26a30..2d0bfacaa 100644 --- a/lib/base/statsfunction.h +++ b/lib/base/statsfunction.h @@ -22,10 +22,8 @@ #include "base/i2-base.h" #include "base/registry.h" -#include "base/singleton.h" #include "base/value.h" #include "base/dictionary.h" -#include #include namespace icinga diff --git a/lib/base/stdiostream.cpp b/lib/base/stdiostream.cpp index 64304f7ae..7027dbfdb 100644 --- a/lib/base/stdiostream.cpp +++ b/lib/base/stdiostream.cpp @@ -19,7 +19,6 @@ #include "base/stdiostream.h" #include "base/objectlock.h" -#include using namespace icinga; diff --git a/lib/base/stdiostream.h b/lib/base/stdiostream.h index 81d21745a..fcff20987 100644 --- a/lib/base/stdiostream.h +++ b/lib/base/stdiostream.h @@ -21,7 +21,7 @@ #define STDIOSTREAM_H #include "base/i2-base.h" -#include "base/fifo.h" +#include "base/stream.h" #include namespace icinga { diff --git a/lib/base/stream.cpp b/lib/base/stream.cpp index f050e1b38..a8436838a 100644 --- a/lib/base/stream.cpp +++ b/lib/base/stream.cpp @@ -18,8 +18,7 @@ ******************************************************************************/ #include "base/stream.h" -#include "base/objectlock.h" -#include "base/utility.h" +#include "base/qstring.h" #include using namespace icinga; diff --git a/lib/base/stream.h b/lib/base/stream.h index cf96750ed..5b91c6459 100644 --- a/lib/base/stream.h +++ b/lib/base/stream.h @@ -22,13 +22,12 @@ #include "base/i2-base.h" #include "base/object.h" -#include "base/qstring.h" -#include -#include namespace icinga { +class String; + enum ConnectionRole { RoleClient, diff --git a/lib/base/streamlogger.cpp b/lib/base/streamlogger.cpp index 6a3b11669..5731d0602 100644 --- a/lib/base/streamlogger.cpp +++ b/lib/base/streamlogger.cpp @@ -20,8 +20,6 @@ #include "base/streamlogger.h" #include "base/utility.h" #include "base/objectlock.h" -#include -#include #include using namespace icinga; diff --git a/lib/base/tcpsocket.cpp b/lib/base/tcpsocket.cpp index 71500f5c4..3463ec195 100644 --- a/lib/base/tcpsocket.cpp +++ b/lib/base/tcpsocket.cpp @@ -21,7 +21,6 @@ #include "base/exception.h" #include #include -#include using namespace icinga; diff --git a/lib/base/threadpool.cpp b/lib/base/threadpool.cpp index ba2e5dc9e..790259acb 100644 --- a/lib/base/threadpool.cpp +++ b/lib/base/threadpool.cpp @@ -19,15 +19,11 @@ #include "base/threadpool.h" #include "base/logger_fwd.h" -#include "base/convert.h" #include "base/debug.h" #include "base/utility.h" -#include "base/application.h" #include "base/exception.h" -#include #include #include -#include using namespace icinga; diff --git a/lib/base/threadpool.h b/lib/base/threadpool.h index 3949e70b2..04b4fb857 100644 --- a/lib/base/threadpool.h +++ b/lib/base/threadpool.h @@ -21,11 +21,11 @@ #define THREADPOOL_H #include "base/i2-base.h" -#include #include #include #include #include +#include namespace icinga { diff --git a/lib/base/timer.cpp b/lib/base/timer.cpp index 323afc156..2d558ff05 100644 --- a/lib/base/timer.cpp +++ b/lib/base/timer.cpp @@ -18,7 +18,6 @@ ******************************************************************************/ #include "base/timer.h" -#include "base/application.h" #include "base/debug.h" #include "base/utility.h" #include diff --git a/lib/base/tlsstream.cpp b/lib/base/tlsstream.cpp index 4897a2b2e..0a68408e9 100644 --- a/lib/base/tlsstream.cpp +++ b/lib/base/tlsstream.cpp @@ -18,12 +18,9 @@ ******************************************************************************/ #include "base/tlsstream.h" -#include "base/objectlock.h" -#include "base/debug.h" #include "base/utility.h" #include "base/exception.h" #include -#include using namespace icinga; diff --git a/lib/base/tlsstream.h b/lib/base/tlsstream.h index 22e313fa2..fc8f5c325 100644 --- a/lib/base/tlsstream.h +++ b/lib/base/tlsstream.h @@ -22,7 +22,7 @@ #include "base/i2-base.h" #include "base/socket.h" -#include "base/fifo.h" +#include "base/stream.h" #include "base/tlsutility.h" namespace icinga diff --git a/lib/base/type.h b/lib/base/type.h index 92114edb9..8d5b4de95 100644 --- a/lib/base/type.h +++ b/lib/base/type.h @@ -22,7 +22,7 @@ #include "base/i2-base.h" #include "base/qstring.h" -#include "base/serializer.h" +#include "base/object.h" #include "base/initialize.h" #include diff --git a/lib/base/unixsocket.h b/lib/base/unixsocket.h index 4fb676223..3407ecfbc 100644 --- a/lib/base/unixsocket.h +++ b/lib/base/unixsocket.h @@ -20,14 +20,13 @@ #ifndef UNIXSOCKET_H #define UNIXSOCKET_H -#include "base/i2-base.h" #include "base/socket.h" #ifndef _WIN32 namespace icinga { -class UnixSocket : public Socket +class I2_BASE_API UnixSocket : public Socket { public: DECLARE_PTR_TYPEDEFS(UnixSocket); diff --git a/lib/base/utility.cpp b/lib/base/utility.cpp index 2818151cf..14eccb15d 100644 --- a/lib/base/utility.cpp +++ b/lib/base/utility.cpp @@ -24,7 +24,6 @@ #include "base/exception.h" #include #include -#include #include #include #include diff --git a/lib/base/value-operators.cpp b/lib/base/value-operators.cpp index 3cee31e1c..95852f301 100644 --- a/lib/base/value-operators.cpp +++ b/lib/base/value-operators.cpp @@ -17,12 +17,11 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * ******************************************************************************/ -#include "base/application.h" +#include "base/value.h" #include "base/array.h" -#include "base/logger_fwd.h" +#include "base/dictionary.h" #include "base/utility.h" #include "base/objectlock.h" -#include #include #include diff --git a/lib/base/value.cpp b/lib/base/value.cpp index fd804caeb..dfdc15a16 100644 --- a/lib/base/value.cpp +++ b/lib/base/value.cpp @@ -22,7 +22,6 @@ #include "base/dictionary.h" #include "base/type.h" #include -#include using namespace icinga; diff --git a/lib/base/workqueue.cpp b/lib/base/workqueue.cpp index e3352ee47..be27fa29d 100644 --- a/lib/base/workqueue.cpp +++ b/lib/base/workqueue.cpp @@ -19,7 +19,6 @@ #include "base/workqueue.h" #include "base/utility.h" -#include "base/debug.h" #include "base/logger_fwd.h" #include "base/convert.h" #include diff --git a/lib/config/aexpression.cpp b/lib/config/aexpression.cpp index 416dc2366..0fcfa8734 100644 --- a/lib/config/aexpression.cpp +++ b/lib/config/aexpression.cpp @@ -25,7 +25,6 @@ #include "config/objectrule.h" #include "base/array.h" #include "base/serializer.h" -#include "base/context.h" #include "base/scriptfunction.h" #include "base/scriptvariable.h" #include "base/utility.h" diff --git a/lib/config/applyrule.cpp b/lib/config/applyrule.cpp index cb73ba229..590a10bbc 100644 --- a/lib/config/applyrule.cpp +++ b/lib/config/applyrule.cpp @@ -19,6 +19,8 @@ #include "config/applyrule.h" #include "base/logger_fwd.h" +#include +#include using namespace icinga; diff --git a/lib/config/applyrule.h b/lib/config/applyrule.h index 8692f718b..2ad7388b7 100644 --- a/lib/config/applyrule.h +++ b/lib/config/applyrule.h @@ -23,7 +23,7 @@ #include "config/i2-config.h" #include "config/aexpression.h" #include "config/debuginfo.h" -#include "base/dynamictype.h" +#include namespace icinga { diff --git a/lib/config/config_lexer.ll b/lib/config/config_lexer.ll index d5d5eed85..7985d1833 100644 --- a/lib/config/config_lexer.ll +++ b/lib/config/config_lexer.ll @@ -21,6 +21,7 @@ #include "config/configcompiler.h" #include "config/typerule.h" #include "config/configcompilercontext.h" +#include "config/aexpression.h" using namespace icinga; diff --git a/lib/config/config_parser.yy b/lib/config/config_parser.yy index 2a8f603a7..bcbdfd392 100644 --- a/lib/config/config_parser.yy +++ b/lib/config/config_parser.yy @@ -22,6 +22,7 @@ #include "i2-config.h" #include "config/configitembuilder.h" +#include "config/configtype.h" #include "config/configcompiler.h" #include "config/configcompilercontext.h" #include "config/configerror.h" @@ -30,6 +31,7 @@ #include "config/aexpression.h" #include "config/applyrule.h" #include "config/objectrule.h" +#include "config/aexpression.h" #include "base/value.h" #include "base/utility.h" #include "base/array.h" diff --git a/lib/config/configcompiler.cpp b/lib/config/configcompiler.cpp index d684d617d..94ceaefc7 100644 --- a/lib/config/configcompiler.cpp +++ b/lib/config/configcompiler.cpp @@ -23,7 +23,6 @@ #include "base/utility.h" #include "base/context.h" #include "base/exception.h" -#include #include #include diff --git a/lib/config/configcompilercontext.cpp b/lib/config/configcompilercontext.cpp index 19909a548..5f09855c9 100644 --- a/lib/config/configcompilercontext.cpp +++ b/lib/config/configcompilercontext.cpp @@ -18,8 +18,6 @@ ******************************************************************************/ #include "config/configcompilercontext.h" -#include "base/utility.h" -#include "base/logger_fwd.h" #include "base/singleton.h" #include diff --git a/lib/config/configcompilercontext.h b/lib/config/configcompilercontext.h index 85c6a44df..096df0e80 100644 --- a/lib/config/configcompilercontext.h +++ b/lib/config/configcompilercontext.h @@ -21,8 +21,9 @@ #define CONFIGCOMPILERCONTEXT_H #include "config/i2-config.h" -#include "config/configitem.h" -#include "config/configtype.h" +#include "config/debuginfo.h" +#include +#include namespace icinga { diff --git a/lib/config/configitem.cpp b/lib/config/configitem.cpp index fa1372f92..d66aee262 100644 --- a/lib/config/configitem.cpp +++ b/lib/config/configitem.cpp @@ -21,6 +21,7 @@ #include "config/configcompilercontext.h" #include "config/applyrule.h" #include "config/objectrule.h" +#include "config/configtype.h" #include "base/application.h" #include "base/dynamictype.h" #include "base/objectlock.h" diff --git a/lib/config/configitembuilder.cpp b/lib/config/configitembuilder.cpp index e70b36dc2..f9713afde 100644 --- a/lib/config/configitembuilder.cpp +++ b/lib/config/configitembuilder.cpp @@ -18,7 +18,6 @@ ******************************************************************************/ #include "config/configitembuilder.h" -#include "config/configcompilercontext.h" #include "base/dynamictype.h" #include #include diff --git a/lib/config/configtype.cpp b/lib/config/configtype.cpp index 588b38497..1e3b065cc 100644 --- a/lib/config/configtype.cpp +++ b/lib/config/configtype.cpp @@ -21,6 +21,7 @@ #include "config/configcompilercontext.h" #include "base/objectlock.h" #include "base/convert.h" +#include "base/singleton.h" #include "base/scriptfunction.h" #include diff --git a/lib/config/configtype.h b/lib/config/configtype.h index 3ac77bf8c..020c3cda4 100644 --- a/lib/config/configtype.h +++ b/lib/config/configtype.h @@ -21,12 +21,11 @@ #define CONFIGTYPE_H #include "config/i2-config.h" -#include "config/typerule.h" #include "config/typerulelist.h" +#include "config/typerule.h" #include "config/configitem.h" #include "base/array.h" #include "base/registry.h" -#include "base/singleton.h" namespace icinga { diff --git a/lib/config/objectrule.cpp b/lib/config/objectrule.cpp index c0c7bc0a7..67a78153a 100644 --- a/lib/config/objectrule.cpp +++ b/lib/config/objectrule.cpp @@ -18,7 +18,8 @@ ******************************************************************************/ #include "config/objectrule.h" -#include "base/logger_fwd.h" +#include +#include using namespace icinga; diff --git a/lib/config/typerule.cpp b/lib/config/typerule.cpp index 27fb4a722..2cba290cc 100644 --- a/lib/config/typerule.cpp +++ b/lib/config/typerule.cpp @@ -19,7 +19,6 @@ #include "config/typerule.h" #include "config/configitem.h" -#include "config/configcompilercontext.h" #include "base/convert.h" #include "base/utility.h" #include "base/dictionary.h" diff --git a/lib/db_ido/dbevents.cpp b/lib/db_ido/dbevents.cpp index 2b41115c1..39d6ab210 100644 --- a/lib/db_ido/dbevents.cpp +++ b/lib/db_ido/dbevents.cpp @@ -25,6 +25,7 @@ #include "base/initialize.h" #include "base/dynamictype.h" #include "base/utility.h" +#include "base/logger_fwd.h" #include "remote/endpoint.h" #include "icinga/notification.h" #include "icinga/checkcommand.h" diff --git a/lib/db_ido/hostdbobject.cpp b/lib/db_ido/hostdbobject.cpp index 6fd0cfb67..abb9fcdcc 100644 --- a/lib/db_ido/hostdbobject.cpp +++ b/lib/db_ido/hostdbobject.cpp @@ -30,6 +30,7 @@ #include "icinga/compatutility.h" #include "base/convert.h" #include "base/objectlock.h" +#include "base/logger_fwd.h" #include using namespace icinga; diff --git a/lib/db_ido/servicedbobject.cpp b/lib/db_ido/servicedbobject.cpp index 68946b2a9..660006f02 100644 --- a/lib/db_ido/servicedbobject.cpp +++ b/lib/db_ido/servicedbobject.cpp @@ -21,12 +21,6 @@ #include "db_ido/dbtype.h" #include "db_ido/dbvalue.h" #include "db_ido/dbevents.h" -#include "base/convert.h" -#include "base/objectlock.h" -#include "base/initialize.h" -#include "base/dynamictype.h" -#include "base/utility.h" -#include "remote/endpoint.h" #include "icinga/notification.h" #include "icinga/dependency.h" #include "icinga/checkcommand.h" @@ -34,6 +28,13 @@ #include "icinga/externalcommandprocessor.h" #include "icinga/compatutility.h" #include "icinga/icingaapplication.h" +#include "remote/endpoint.h" +#include "base/convert.h" +#include "base/objectlock.h" +#include "base/initialize.h" +#include "base/dynamictype.h" +#include "base/utility.h" +#include "base/logger_fwd.h" #include #include diff --git a/lib/icinga/api.h b/lib/icinga/api.h index e5c79e28d..78f64ef06 100644 --- a/lib/icinga/api.h +++ b/lib/icinga/api.h @@ -21,9 +21,8 @@ #define API_H #include "icinga/i2-icinga.h" -#include "remote/apiclient.h" #include "base/value.h" -#include +#include "base/dictionary.h" namespace icinga { diff --git a/lib/icinga/apievents.cpp b/lib/icinga/apievents.cpp index 562546890..278bb5311 100644 --- a/lib/icinga/apievents.cpp +++ b/lib/icinga/apievents.cpp @@ -20,13 +20,13 @@ #include "icinga/apievents.h" #include "icinga/service.h" #include "remote/apilistener.h" -#include "remote/apiclient.h" +#include "remote/endpoint.h" +#include "remote/messageorigin.h" +#include "remote/zone.h" #include "remote/apifunction.h" #include "base/application.h" #include "base/dynamictype.h" -#include "base/objectlock.h" #include "base/utility.h" -#include "base/logger_fwd.h" #include "base/exception.h" #include "base/initialize.h" #include diff --git a/lib/icinga/apievents.h b/lib/icinga/apievents.h index cf19b7eb4..3413dc841 100644 --- a/lib/icinga/apievents.h +++ b/lib/icinga/apievents.h @@ -22,11 +22,6 @@ #include "icinga/checkable.h" #include "icinga/host.h" -#include "remote/apiclient.h" -#include "base/stream.h" -#include "base/timer.h" -#include "base/array.h" -#include namespace icinga { diff --git a/lib/icinga/checkable-check.cpp b/lib/icinga/checkable-check.cpp index 31e2ca177..db203fc6c 100644 --- a/lib/icinga/checkable-check.cpp +++ b/lib/icinga/checkable-check.cpp @@ -17,20 +17,17 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * ******************************************************************************/ -#include "icinga/service.h" +#include "icinga/checkable.h" #include "icinga/checkcommand.h" #include "icinga/icingaapplication.h" #include "icinga/cib.h" -#include "remote/apilistener.h" -#include "base/dynamictype.h" +#include "remote/messageorigin.h" #include "base/objectlock.h" #include "base/logger_fwd.h" #include "base/convert.h" #include "base/utility.h" -#include "base/exception.h" #include "base/context.h" #include -#include using namespace icinga; diff --git a/lib/icinga/checkable-comment.cpp b/lib/icinga/checkable-comment.cpp index 7d4bb4fe3..bdd80957f 100644 --- a/lib/icinga/checkable-comment.cpp +++ b/lib/icinga/checkable-comment.cpp @@ -20,9 +20,9 @@ #include "icinga/service.h" #include "base/dynamictype.h" #include "base/objectlock.h" -#include "base/logger_fwd.h" #include "base/timer.h" #include "base/utility.h" +#include "base/logger_fwd.h" #include using namespace icinga; diff --git a/lib/icinga/checkable-dependency.cpp b/lib/icinga/checkable-dependency.cpp index f22c34362..d55340ddb 100644 --- a/lib/icinga/checkable-dependency.cpp +++ b/lib/icinga/checkable-dependency.cpp @@ -19,13 +19,7 @@ #include "icinga/service.h" #include "icinga/dependency.h" -#include "config/configitembuilder.h" -#include "base/dynamictype.h" -#include "base/objectlock.h" #include "base/logger_fwd.h" -#include "base/timer.h" -#include "base/utility.h" -#include "base/convert.h" #include using namespace icinga; diff --git a/lib/icinga/checkable-downtime.cpp b/lib/icinga/checkable-downtime.cpp index bf0e6b4f8..78f75544f 100644 --- a/lib/icinga/checkable-downtime.cpp +++ b/lib/icinga/checkable-downtime.cpp @@ -18,7 +18,6 @@ ******************************************************************************/ #include "icinga/service.h" -#include "config/configitembuilder.h" #include "base/dynamictype.h" #include "base/objectlock.h" #include "base/logger_fwd.h" diff --git a/lib/icinga/checkable-event.cpp b/lib/icinga/checkable-event.cpp index aaae83c76..55183fc33 100644 --- a/lib/icinga/checkable-event.cpp +++ b/lib/icinga/checkable-event.cpp @@ -17,9 +17,10 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * ******************************************************************************/ -#include "icinga/service.h" +#include "icinga/checkable.h" #include "icinga/eventcommand.h" #include "icinga/icingaapplication.h" +#include "base/logger_fwd.h" #include "base/context.h" using namespace icinga; diff --git a/lib/icinga/checkable-flapping.cpp b/lib/icinga/checkable-flapping.cpp index 5bc71fb82..7bd6f47b4 100644 --- a/lib/icinga/checkable-flapping.cpp +++ b/lib/icinga/checkable-flapping.cpp @@ -17,14 +17,9 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * ******************************************************************************/ -#include "icinga/service.h" +#include "icinga/checkable.h" #include "icinga/icingaapplication.h" -#include "base/dynamictype.h" -#include "base/objectlock.h" -#include "base/logger_fwd.h" -#include "base/timer.h" #include "base/utility.h" -#include "base/convert.h" #include using namespace icinga; diff --git a/lib/icinga/checkable-notification.cpp b/lib/icinga/checkable-notification.cpp index ef3667bc3..f53d53ac7 100644 --- a/lib/icinga/checkable-notification.cpp +++ b/lib/icinga/checkable-notification.cpp @@ -17,17 +17,13 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * ******************************************************************************/ -#include "icinga/service.h" +#include "icinga/checkable.h" #include "icinga/icingaapplication.h" -#include "base/dynamictype.h" #include "base/objectlock.h" #include "base/logger_fwd.h" -#include "base/timer.h" -#include "base/utility.h" #include "base/exception.h" #include "base/context.h" #include "base/convert.h" -#include "config/configitembuilder.h" #include using namespace icinga; diff --git a/lib/icinga/checkable.cpp b/lib/icinga/checkable.cpp index 9fe9b81f4..5b1e5e94f 100644 --- a/lib/icinga/checkable.cpp +++ b/lib/icinga/checkable.cpp @@ -17,19 +17,9 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * ******************************************************************************/ -#include "icinga/service.h" -#include "icinga/servicegroup.h" -#include "icinga/checkcommand.h" -#include "icinga/icingaapplication.h" -#include "icinga/macroprocessor.h" -#include "icinga/pluginutility.h" -#include "icinga/dependency.h" -#include "config/configitembuilder.h" -#include "base/dynamictype.h" +#include "icinga/checkable.h" #include "base/objectlock.h" -#include "base/convert.h" #include "base/utility.h" -#include "base/initialize.h" #include #include diff --git a/lib/icinga/checkable.h b/lib/icinga/checkable.h index 71205d465..86b404659 100644 --- a/lib/icinga/checkable.h +++ b/lib/icinga/checkable.h @@ -22,16 +22,11 @@ #include "icinga/i2-icinga.h" #include "icinga/checkable.th" -#include "icinga/macroresolver.h" #include "icinga/timeperiod.h" #include "icinga/notification.h" #include "icinga/comment.h" #include "icinga/downtime.h" #include "remote/messageorigin.h" -#include "base/i2-base.h" -#include "base/array.h" -#include -#include namespace icinga { diff --git a/lib/icinga/checkcommand.h b/lib/icinga/checkcommand.h index 441f3c800..15cd69d6c 100644 --- a/lib/icinga/checkcommand.h +++ b/lib/icinga/checkcommand.h @@ -21,7 +21,7 @@ #define CHECKCOMMAND_H #include "icinga/checkcommand.th" -#include "icinga/service.h" +#include "icinga/checkable.h" namespace icinga { diff --git a/lib/icinga/checkresult.cpp b/lib/icinga/checkresult.cpp index 1d07b2cdc..098af8f2d 100644 --- a/lib/icinga/checkresult.cpp +++ b/lib/icinga/checkresult.cpp @@ -18,9 +18,6 @@ ******************************************************************************/ #include "icinga/checkresult.h" -#include "base/dynamictype.h" -#include "base/initialize.h" -#include "base/scriptvariable.h" using namespace icinga; diff --git a/lib/icinga/command.cpp b/lib/icinga/command.cpp index 5f990bc51..a9f92701a 100644 --- a/lib/icinga/command.cpp +++ b/lib/icinga/command.cpp @@ -23,18 +23,6 @@ using namespace icinga; REGISTER_TYPE(Command); -bool Command::ResolveMacro(const String& macro, const CheckResult::Ptr&, String *result) const -{ - Dictionary::Ptr vars = GetVars(); - - if (vars && vars->Contains(macro)) { - *result = vars->Get(macro); - return true; - } - - return false; -} - int Command::GetModifiedAttributes(void) const { int attrs = 0; diff --git a/lib/icinga/command.h b/lib/icinga/command.h index fdc19e9b4..3b691e91d 100644 --- a/lib/icinga/command.h +++ b/lib/icinga/command.h @@ -20,13 +20,9 @@ #ifndef COMMAND_H #define COMMAND_H +#include "icinga/i2-icinga.h" #include "icinga/command.th" -#include "icinga/macroresolver.h" -#include "base/i2-base.h" -#include "base/array.h" -#include "base/logger_fwd.h" #include "remote/messageorigin.h" -#include namespace icinga { @@ -36,15 +32,13 @@ namespace icinga * * @ingroup icinga */ -class I2_ICINGA_API Command : public ObjectImpl, public MacroResolver +class I2_ICINGA_API Command : public ObjectImpl { public: DECLARE_PTR_TYPEDEFS(Command); //virtual Dictionary::Ptr Execute(const Object::Ptr& context) = 0; - virtual bool ResolveMacro(const String& macro, const CheckResult::Ptr& cr, String *result) const; - int GetModifiedAttributes(void) const; void SetModifiedAttributes(int flags, const MessageOrigin& origin = MessageOrigin()); }; diff --git a/lib/icinga/compatutility.cpp b/lib/icinga/compatutility.cpp index 218a4fcbc..9d1d2b556 100644 --- a/lib/icinga/compatutility.cpp +++ b/lib/icinga/compatutility.cpp @@ -21,16 +21,13 @@ #include "icinga/checkcommand.h" #include "icinga/eventcommand.h" #include "icinga/pluginutility.h" +#include "icinga/service.h" #include "base/utility.h" #include "base/dynamictype.h" #include "base/objectlock.h" -#include "base/debug.h" #include "base/convert.h" -#include #include #include -#include -#include #include using namespace icinga; diff --git a/lib/icinga/compatutility.h b/lib/icinga/compatutility.h index f51e845cf..b25ebbff6 100644 --- a/lib/icinga/compatutility.h +++ b/lib/icinga/compatutility.h @@ -21,8 +21,8 @@ #define COMPATUTILITY_H #include "icinga/i2-icinga.h" -#include "icinga/service.h" -#include "icinga/checkcommand.h" +#include "icinga/host.h" +#include "icinga/command.h" #include "base/dictionary.h" #include "base/array.h" #include "base/dynamicobject.h" diff --git a/lib/icinga/dependency-apply.cpp b/lib/icinga/dependency-apply.cpp index 2ce1c4964..e91f4b19c 100644 --- a/lib/icinga/dependency-apply.cpp +++ b/lib/icinga/dependency-apply.cpp @@ -20,9 +20,9 @@ #include "icinga/dependency.h" #include "icinga/service.h" #include "config/configitembuilder.h" +#include "config/applyrule.h" #include "base/initialize.h" #include "base/dynamictype.h" -#include "base/convert.h" #include "base/logger_fwd.h" #include "base/context.h" #include diff --git a/lib/icinga/dependency.cpp b/lib/icinga/dependency.cpp index 485b1cb4c..0033e3dd6 100644 --- a/lib/icinga/dependency.cpp +++ b/lib/icinga/dependency.cpp @@ -20,10 +20,7 @@ #include "icinga/dependency.h" #include "icinga/service.h" #include "config/configcompilercontext.h" -#include "base/dynamictype.h" -#include "base/objectlock.h" #include "base/logger_fwd.h" -#include "base/convert.h" #include "base/scriptfunction.h" #include diff --git a/lib/icinga/dependency.h b/lib/icinga/dependency.h index 9a2cf3c4d..7cd2f159a 100644 --- a/lib/icinga/dependency.h +++ b/lib/icinga/dependency.h @@ -22,13 +22,13 @@ #include "icinga/i2-icinga.h" #include "icinga/dependency.th" -#include "config/applyrule.h" -#include "base/array.h" #include "base/dictionary.h" namespace icinga { +class ApplyRule; + /** * A service dependency.. * diff --git a/lib/icinga/downtime.cpp b/lib/icinga/downtime.cpp index 68e9bfe4b..f17af8f9f 100644 --- a/lib/icinga/downtime.cpp +++ b/lib/icinga/downtime.cpp @@ -19,7 +19,6 @@ #include "icinga/downtime.h" #include "base/utility.h" -#include "base/dynamictype.h" using namespace icinga; diff --git a/lib/icinga/eventcommand.cpp b/lib/icinga/eventcommand.cpp index 794e5e1d4..8fd262842 100644 --- a/lib/icinga/eventcommand.cpp +++ b/lib/icinga/eventcommand.cpp @@ -18,7 +18,6 @@ ******************************************************************************/ #include "icinga/eventcommand.h" -#include "base/dynamictype.h" using namespace icinga; diff --git a/lib/icinga/eventcommand.h b/lib/icinga/eventcommand.h index b4ab9a046..a1dedce80 100644 --- a/lib/icinga/eventcommand.h +++ b/lib/icinga/eventcommand.h @@ -21,7 +21,7 @@ #define EVENTCOMMAND_H #include "icinga/eventcommand.th" -#include "icinga/service.h" +#include "icinga/checkable.h" namespace icinga { diff --git a/lib/icinga/externalcommandprocessor.h b/lib/icinga/externalcommandprocessor.h index 256cf1be6..db995d518 100644 --- a/lib/icinga/externalcommandprocessor.h +++ b/lib/icinga/externalcommandprocessor.h @@ -23,8 +23,6 @@ #include "icinga/i2-icinga.h" #include "icinga/command.h" #include "base/qstring.h" -#include -#include #include #include #include diff --git a/lib/icinga/host.cpp b/lib/icinga/host.cpp index e7f76c332..fd7c9cd8e 100644 --- a/lib/icinga/host.cpp +++ b/lib/icinga/host.cpp @@ -20,19 +20,12 @@ #include "icinga/host.h" #include "icinga/service.h" #include "icinga/hostgroup.h" -#include "icinga/icingaapplication.h" #include "icinga/pluginutility.h" -#include "base/dynamictype.h" #include "base/objectlock.h" -#include "base/logger_fwd.h" -#include "base/timer.h" #include "base/convert.h" #include "base/utility.h" -#include "base/scriptfunction.h" #include "base/debug.h" #include "base/serializer.h" -#include "config/configitembuilder.h" -#include "config/configcompilercontext.h" #include using namespace icinga; diff --git a/lib/icinga/host.h b/lib/icinga/host.h index c920dfd1d..469bb8a7e 100644 --- a/lib/icinga/host.h +++ b/lib/icinga/host.h @@ -24,15 +24,11 @@ #include "icinga/host.th" #include "icinga/macroresolver.h" #include "icinga/checkresult.h" -#include "config/applyrule.h" -#include "base/array.h" -#include "base/dictionary.h" namespace icinga { class Service; -class Dependency; /** * An Icinga host. diff --git a/lib/icinga/hostgroup.cpp b/lib/icinga/hostgroup.cpp index d57de68cb..71faecb6c 100644 --- a/lib/icinga/hostgroup.cpp +++ b/lib/icinga/hostgroup.cpp @@ -18,11 +18,10 @@ ******************************************************************************/ #include "icinga/hostgroup.h" +#include "config/objectrule.h" #include "base/dynamictype.h" #include "base/logger_fwd.h" #include "base/objectlock.h" -#include "base/utility.h" -#include "base/timer.h" #include "base/context.h" #include diff --git a/lib/icinga/hostgroup.h b/lib/icinga/hostgroup.h index 0ce0cbeea..453150971 100644 --- a/lib/icinga/hostgroup.h +++ b/lib/icinga/hostgroup.h @@ -23,11 +23,12 @@ #include "icinga/i2-icinga.h" #include "icinga/hostgroup.th" #include "icinga/host.h" -#include "config/objectrule.h" namespace icinga { +class ObjectRule; + /** * An Icinga host group. * diff --git a/lib/icinga/icingastatuswriter.cpp b/lib/icinga/icingastatuswriter.cpp index a1e0b0cd9..7d59e91ca 100644 --- a/lib/icinga/icingastatuswriter.cpp +++ b/lib/icinga/icingastatuswriter.cpp @@ -18,22 +18,11 @@ ******************************************************************************/ #include "icinga/icingastatuswriter.h" -#include "icinga/icingaapplication.h" #include "icinga/cib.h" -#include "icinga/hostgroup.h" -#include "icinga/servicegroup.h" -#include "icinga/checkcommand.h" -#include "icinga/eventcommand.h" -#include "icinga/timeperiod.h" -#include "icinga/notificationcommand.h" -#include "icinga/compatutility.h" #include "base/dynamictype.h" -#include "base/objectlock.h" -#include "base/convert.h" #include "base/logger_fwd.h" #include "base/exception.h" #include "base/application.h" -#include "base/context.h" #include "base/statsfunction.h" #include #include diff --git a/lib/icinga/icingastatuswriter.h b/lib/icinga/icingastatuswriter.h index c3f687a7a..32ae31bc8 100644 --- a/lib/icinga/icingastatuswriter.h +++ b/lib/icinga/icingastatuswriter.h @@ -21,15 +21,7 @@ #define ICINGASTATUSWRITER_H #include "icinga/icingastatuswriter.th" -#include "icinga/host.h" -#include "icinga/service.h" -#include "icinga/command.h" -#include "icinga/compatutility.h" -#include "base/objectlock.h" #include "base/timer.h" -#include "base/utility.h" -#include -#include namespace icinga { diff --git a/lib/icinga/legacytimeperiod.h b/lib/icinga/legacytimeperiod.h index 3db444af3..d33c2bc53 100644 --- a/lib/icinga/legacytimeperiod.h +++ b/lib/icinga/legacytimeperiod.h @@ -21,7 +21,7 @@ #define LEGACYTIMEPERIOD_H #include "icinga/i2-icinga.h" -#include "icinga/service.h" +#include "icinga/timeperiod.h" #include "base/dictionary.h" namespace icinga diff --git a/lib/icinga/macroprocessor.cpp b/lib/icinga/macroprocessor.cpp index 896b24713..3bfbfb7c8 100644 --- a/lib/icinga/macroprocessor.cpp +++ b/lib/icinga/macroprocessor.cpp @@ -19,7 +19,6 @@ #include "icinga/macroprocessor.h" #include "icinga/macroresolver.h" -#include "base/utility.h" #include "base/array.h" #include "base/objectlock.h" #include "base/logger_fwd.h" diff --git a/lib/icinga/macroprocessor.h b/lib/icinga/macroprocessor.h index 8208a7998..19ebd960a 100644 --- a/lib/icinga/macroprocessor.h +++ b/lib/icinga/macroprocessor.h @@ -21,11 +21,10 @@ #define MACROPROCESSOR_H #include "icinga/i2-icinga.h" -#include "icinga/macroresolver.h" -#include "base/dictionary.h" -#include "base/array.h" +#include "icinga/checkable.h" +#include "base/value.h" #include -#include +#include namespace icinga { diff --git a/lib/icinga/notification-apply.cpp b/lib/icinga/notification-apply.cpp index 8db32796b..28b487851 100644 --- a/lib/icinga/notification-apply.cpp +++ b/lib/icinga/notification-apply.cpp @@ -17,11 +17,12 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * ******************************************************************************/ +#include "icinga/notification.h" #include "icinga/service.h" #include "config/configitembuilder.h" +#include "config/applyrule.h" #include "base/initialize.h" #include "base/dynamictype.h" -#include "base/convert.h" #include "base/logger_fwd.h" #include "base/context.h" #include diff --git a/lib/icinga/notification.cpp b/lib/icinga/notification.cpp index 1e5d38b08..a235f0bb4 100644 --- a/lib/icinga/notification.cpp +++ b/lib/icinga/notification.cpp @@ -19,10 +19,8 @@ #include "icinga/notification.h" #include "icinga/notificationcommand.h" -#include "icinga/macroprocessor.h" #include "icinga/service.h" #include "config/configcompilercontext.h" -#include "base/dynamictype.h" #include "base/objectlock.h" #include "base/logger_fwd.h" #include "base/utility.h" diff --git a/lib/icinga/notification.h b/lib/icinga/notification.h index b72e9954e..ead05ef67 100644 --- a/lib/icinga/notification.h +++ b/lib/icinga/notification.h @@ -25,8 +25,8 @@ #include "icinga/user.h" #include "icinga/usergroup.h" #include "icinga/timeperiod.h" +#include "icinga/checkresult.h" #include "remote/messageorigin.h" -#include "config/applyrule.h" #include "base/array.h" namespace icinga @@ -66,6 +66,7 @@ enum NotificationType class NotificationCommand; class Checkable; +class ApplyRule; /** * An Icinga notification specification. diff --git a/lib/icinga/notificationcommand.cpp b/lib/icinga/notificationcommand.cpp index 0a1fb8c45..2d39de252 100644 --- a/lib/icinga/notificationcommand.cpp +++ b/lib/icinga/notificationcommand.cpp @@ -18,7 +18,6 @@ ******************************************************************************/ #include "icinga/notificationcommand.h" -#include "base/dynamictype.h" using namespace icinga; diff --git a/lib/icinga/pluginutility.cpp b/lib/icinga/pluginutility.cpp index 6aafab903..df749b73d 100644 --- a/lib/icinga/pluginutility.cpp +++ b/lib/icinga/pluginutility.cpp @@ -18,13 +18,9 @@ ******************************************************************************/ #include "icinga/pluginutility.h" -#include "icinga/checkcommand.h" #include "icinga/macroprocessor.h" -#include "icinga/icingaapplication.h" #include "icinga/perfdatavalue.h" -#include "base/dynamictype.h" #include "base/logger_fwd.h" -#include "base/scriptfunction.h" #include "base/utility.h" #include "base/convert.h" #include "base/process.h" diff --git a/lib/icinga/pluginutility.h b/lib/icinga/pluginutility.h index f93315167..f772e1abc 100644 --- a/lib/icinga/pluginutility.h +++ b/lib/icinga/pluginutility.h @@ -21,17 +21,16 @@ #define PLUGINUTILITY_H #include "icinga/i2-icinga.h" -#include "icinga/service.h" +#include "icinga/checkable.h" #include "icinga/checkcommand.h" #include "icinga/macroprocessor.h" -#include "base/process.h" -#include "base/dictionary.h" -#include "base/dynamicobject.h" #include namespace icinga { +struct ProcessResult; + /** * Utility functions for plugin-based checks. * diff --git a/lib/icinga/scheduleddowntime-apply.cpp b/lib/icinga/scheduleddowntime-apply.cpp index 0d33ef539..1d05bf7a4 100644 --- a/lib/icinga/scheduleddowntime-apply.cpp +++ b/lib/icinga/scheduleddowntime-apply.cpp @@ -18,10 +18,11 @@ ******************************************************************************/ #include "icinga/scheduleddowntime.h" +#include "icinga/service.h" #include "config/configitembuilder.h" +#include "config/applyrule.h" #include "base/initialize.h" #include "base/dynamictype.h" -#include "base/convert.h" #include "base/logger_fwd.h" #include "base/context.h" #include diff --git a/lib/icinga/scheduleddowntime.cpp b/lib/icinga/scheduleddowntime.cpp index b1e9c81ae..2397846a8 100644 --- a/lib/icinga/scheduleddowntime.cpp +++ b/lib/icinga/scheduleddowntime.cpp @@ -20,6 +20,7 @@ #include "icinga/scheduleddowntime.h" #include "icinga/legacytimeperiod.h" #include "icinga/downtime.h" +#include "icinga/service.h" #include "base/timer.h" #include "base/dynamictype.h" #include "base/initialize.h" diff --git a/lib/icinga/scheduleddowntime.h b/lib/icinga/scheduleddowntime.h index 23741e10b..b24a3cd3c 100644 --- a/lib/icinga/scheduleddowntime.h +++ b/lib/icinga/scheduleddowntime.h @@ -22,13 +22,14 @@ #include "icinga/i2-icinga.h" #include "icinga/scheduleddowntime.th" -#include "icinga/service.h" -#include "config/applyrule.h" +#include "icinga/checkable.h" #include namespace icinga { +class ApplyRule; + /** * An Icinga scheduled downtime specification. * diff --git a/lib/icinga/service-apply.cpp b/lib/icinga/service-apply.cpp index 8ca91081f..1892a0929 100644 --- a/lib/icinga/service-apply.cpp +++ b/lib/icinga/service-apply.cpp @@ -19,9 +19,9 @@ #include "icinga/service.h" #include "config/configitembuilder.h" +#include "config/applyrule.h" #include "base/initialize.h" #include "base/dynamictype.h" -#include "base/convert.h" #include "base/logger_fwd.h" #include "base/context.h" #include diff --git a/lib/icinga/service.cpp b/lib/icinga/service.cpp index bb311d70a..fda39ae77 100644 --- a/lib/icinga/service.cpp +++ b/lib/icinga/service.cpp @@ -19,17 +19,10 @@ #include "icinga/service.h" #include "icinga/servicegroup.h" -#include "icinga/checkcommand.h" -#include "icinga/icingaapplication.h" -#include "icinga/macroprocessor.h" #include "icinga/pluginutility.h" -#include "icinga/dependency.h" -#include "config/configitembuilder.h" -#include "base/dynamictype.h" #include "base/objectlock.h" #include "base/convert.h" #include "base/utility.h" -#include "base/initialize.h" #include #include diff --git a/lib/icinga/service.h b/lib/icinga/service.h index 89903271d..f536de0b2 100644 --- a/lib/icinga/service.h +++ b/lib/icinga/service.h @@ -24,14 +24,6 @@ #include "icinga/service.th" #include "icinga/macroresolver.h" #include "icinga/host.h" -#include "icinga/timeperiod.h" -#include "icinga/notification.h" -#include "icinga/comment.h" -#include "icinga/downtime.h" -#include "base/i2-base.h" -#include "base/array.h" -#include -#include namespace icinga { diff --git a/lib/icinga/servicegroup.cpp b/lib/icinga/servicegroup.cpp index 9a2d0bcb5..68b1276da 100644 --- a/lib/icinga/servicegroup.cpp +++ b/lib/icinga/servicegroup.cpp @@ -17,13 +17,11 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * ******************************************************************************/ -#include "i2-icinga.h" #include "icinga/servicegroup.h" +#include "config/objectrule.h" #include "base/dynamictype.h" #include "base/objectlock.h" #include "base/logger_fwd.h" -#include "base/timer.h" -#include "base/utility.h" #include "base/context.h" #include diff --git a/lib/icinga/servicegroup.h b/lib/icinga/servicegroup.h index 580560623..190517c40 100644 --- a/lib/icinga/servicegroup.h +++ b/lib/icinga/servicegroup.h @@ -23,11 +23,12 @@ #include "icinga/i2-icinga.h" #include "icinga/servicegroup.th" #include "icinga/service.h" -#include "config/objectrule.h" namespace icinga { +class ObjectRule; + /** * An Icinga service group. * diff --git a/lib/icinga/timeperiod.cpp b/lib/icinga/timeperiod.cpp index ca069ea19..e0cb6586c 100644 --- a/lib/icinga/timeperiod.cpp +++ b/lib/icinga/timeperiod.cpp @@ -18,7 +18,6 @@ ******************************************************************************/ #include "icinga/timeperiod.h" -#include "config/configitem.h" #include "base/dynamictype.h" #include "base/objectlock.h" #include "base/logger_fwd.h" diff --git a/lib/icinga/timeperiod.h b/lib/icinga/timeperiod.h index d4ab5a277..9ea8a970e 100644 --- a/lib/icinga/timeperiod.h +++ b/lib/icinga/timeperiod.h @@ -22,7 +22,6 @@ #include "icinga/i2-icinga.h" #include "icinga/timeperiod.th" -#include "base/array.h" namespace icinga { diff --git a/lib/icinga/user.cpp b/lib/icinga/user.cpp index 9fa1c1eaf..adf19c277 100644 --- a/lib/icinga/user.cpp +++ b/lib/icinga/user.cpp @@ -21,10 +21,9 @@ #include "icinga/notification.h" #include "icinga/usergroup.h" #include "config/configcompilercontext.h" -#include "base/dynamictype.h" #include "base/scriptfunction.h" -#include "base/utility.h" #include "base/objectlock.h" +#include using namespace icinga; diff --git a/lib/icinga/user.h b/lib/icinga/user.h index 4dc8b1568..9a0a816f4 100644 --- a/lib/icinga/user.h +++ b/lib/icinga/user.h @@ -22,9 +22,7 @@ #include "icinga/i2-icinga.h" #include "icinga/user.th" -#include "icinga/macroresolver.h" #include "icinga/timeperiod.h" -#include "base/array.h" #include "remote/messageorigin.h" namespace icinga diff --git a/lib/icinga/usergroup.cpp b/lib/icinga/usergroup.cpp index 1735d24a6..c8780010f 100644 --- a/lib/icinga/usergroup.cpp +++ b/lib/icinga/usergroup.cpp @@ -18,11 +18,10 @@ ******************************************************************************/ #include "icinga/usergroup.h" +#include "config/objectrule.h" #include "base/dynamictype.h" #include "base/objectlock.h" #include "base/logger_fwd.h" -#include "base/timer.h" -#include "base/utility.h" #include "base/context.h" #include diff --git a/lib/icinga/usergroup.h b/lib/icinga/usergroup.h index 60870fd4c..ecb319cb9 100644 --- a/lib/icinga/usergroup.h +++ b/lib/icinga/usergroup.h @@ -23,11 +23,12 @@ #include "icinga/i2-icinga.h" #include "icinga/usergroup.th" #include "icinga/user.h" -#include "config/objectrule.h" namespace icinga { +class ObjectRule; + /** * An Icinga user group. * diff --git a/lib/methods/clrchecktask.cpp b/lib/methods/clrchecktask.cpp index e3312a90a..9d6178446 100644 --- a/lib/methods/clrchecktask.cpp +++ b/lib/methods/clrchecktask.cpp @@ -30,6 +30,7 @@ #include #include #include +#include #include #include diff --git a/lib/methods/clusterchecktask.cpp b/lib/methods/clusterchecktask.cpp index e5dd39128..199adce8a 100644 --- a/lib/methods/clusterchecktask.cpp +++ b/lib/methods/clusterchecktask.cpp @@ -30,6 +30,7 @@ #include "base/scriptfunction.h" #include "base/dynamictype.h" #include +#include using namespace icinga; diff --git a/lib/remote/apiclient.cpp b/lib/remote/apiclient.cpp index 48681d023..e86766839 100644 --- a/lib/remote/apiclient.cpp +++ b/lib/remote/apiclient.cpp @@ -21,14 +21,12 @@ #include "remote/apilistener.h" #include "remote/apifunction.h" #include "remote/jsonrpc.h" -#include "base/application.h" #include "base/dynamictype.h" #include "base/objectlock.h" #include "base/utility.h" #include "base/logger_fwd.h" #include "base/exception.h" #include "base/initialize.h" -#include "config/configitembuilder.h" using namespace icinga; diff --git a/lib/remote/apiclient.h b/lib/remote/apiclient.h index 41f014252..9180574dd 100644 --- a/lib/remote/apiclient.h +++ b/lib/remote/apiclient.h @@ -23,9 +23,7 @@ #include "remote/endpoint.h" #include "base/stream.h" #include "base/timer.h" -#include "base/array.h" #include "remote/i2-remote.h" -#include namespace icinga { diff --git a/lib/remote/apifunction.cpp b/lib/remote/apifunction.cpp index f14bde061..9e15f7eff 100644 --- a/lib/remote/apifunction.cpp +++ b/lib/remote/apifunction.cpp @@ -18,7 +18,6 @@ ******************************************************************************/ #include "remote/apifunction.h" -#include "base/registry.h" #include "base/singleton.h" using namespace icinga; diff --git a/lib/remote/apifunction.h b/lib/remote/apifunction.h index 41122925f..46ec2a5a6 100644 --- a/lib/remote/apifunction.h +++ b/lib/remote/apifunction.h @@ -21,10 +21,8 @@ #define APIFUNCTION_H #include "remote/i2-remote.h" -#include "remote/apiclient.h" #include "remote/messageorigin.h" #include "base/registry.h" -#include "base/singleton.h" #include "base/value.h" #include "base/dictionary.h" #include diff --git a/lib/remote/apilistener.cpp b/lib/remote/apilistener.cpp index 49a660dd1..095d94112 100644 --- a/lib/remote/apilistener.cpp +++ b/lib/remote/apilistener.cpp @@ -20,14 +20,12 @@ #include "remote/apilistener.h" #include "remote/apiclient.h" #include "remote/endpoint.h" -#include "remote/jsonrpc.h" #include "base/convert.h" #include "base/netstring.h" #include "base/dynamictype.h" #include "base/logger_fwd.h" #include "base/objectlock.h" #include "base/stdiostream.h" -#include "base/networkstream.h" #include "base/application.h" #include "base/context.h" #include "base/statsfunction.h" diff --git a/lib/remote/apilistener.h b/lib/remote/apilistener.h index 93cff7833..cf133a335 100644 --- a/lib/remote/apilistener.h +++ b/lib/remote/apilistener.h @@ -23,16 +23,13 @@ #include "remote/apilistener.th" #include "remote/apiclient.h" #include "remote/endpoint.h" -#include "remote/zone.h" #include "remote/messageorigin.h" #include "base/dynamicobject.h" #include "base/timer.h" -#include "base/array.h" #include "base/workqueue.h" #include "base/tcpsocket.h" #include "base/tlsstream.h" -#include "base/utility.h" -#include "base/tlsutility.h" +#include namespace icinga { diff --git a/lib/remote/authority.cpp b/lib/remote/authority.cpp index 3a3fa6574..8ea187527 100644 --- a/lib/remote/authority.cpp +++ b/lib/remote/authority.cpp @@ -19,14 +19,11 @@ #include "remote/zone.h" #include "remote/apilistener.h" -#include "base/application.h" #include "base/dynamictype.h" -#include "base/objectlock.h" #include "base/utility.h" #include "base/initialize.h" #include "base/timer.h" -#include "base/logger_fwd.h" -#include "base/exception.h" +#include using namespace icinga; diff --git a/lib/remote/endpoint.cpp b/lib/remote/endpoint.cpp index fb01cae88..535516b7c 100644 --- a/lib/remote/endpoint.cpp +++ b/lib/remote/endpoint.cpp @@ -20,14 +20,11 @@ #include "remote/endpoint.h" #include "remote/apilistener.h" #include "remote/apiclient.h" -#include "remote/jsonrpc.h" #include "remote/zone.h" -#include "base/application.h" #include "base/dynamictype.h" -#include "base/objectlock.h" #include "base/utility.h" -#include "base/logger_fwd.h" #include "base/exception.h" +#include using namespace icinga; diff --git a/lib/remote/endpoint.h b/lib/remote/endpoint.h index 9a8bec3c2..eecec73bf 100644 --- a/lib/remote/endpoint.h +++ b/lib/remote/endpoint.h @@ -20,11 +20,9 @@ #ifndef ENDPOINT_H #define ENDPOINT_H -#include "remote/endpoint.th" -#include "base/stream.h" -#include "base/array.h" #include "remote/i2-remote.h" -#include +#include "remote/endpoint.th" +#include namespace icinga { diff --git a/lib/remote/jsonrpc.cpp b/lib/remote/jsonrpc.cpp index 16f097b7c..55f844d4d 100644 --- a/lib/remote/jsonrpc.cpp +++ b/lib/remote/jsonrpc.cpp @@ -19,10 +19,8 @@ #include "remote/jsonrpc.h" #include "base/netstring.h" -#include "base/objectlock.h" -#include "base/logger_fwd.h" #include "base/serializer.h" -#include +//#include using namespace icinga; diff --git a/lib/remote/zone.cpp b/lib/remote/zone.cpp index adf140df8..7ec760751 100644 --- a/lib/remote/zone.cpp +++ b/lib/remote/zone.cpp @@ -18,12 +18,7 @@ ******************************************************************************/ #include "remote/zone.h" -#include "base/application.h" -#include "base/dynamictype.h" -#include "base/objectlock.h" -#include "base/utility.h" -#include "base/logger_fwd.h" -#include "base/exception.h" +#include using namespace icinga; diff --git a/lib/remote/zone.h b/lib/remote/zone.h index f17b4ac11..1490f0fb5 100644 --- a/lib/remote/zone.h +++ b/lib/remote/zone.h @@ -20,11 +20,9 @@ #ifndef ZONE_H #define ZONE_H +#include "remote/i2-remote.h" #include "remote/zone.th" #include "remote/endpoint.h" -#include "base/array.h" -#include "remote/i2-remote.h" -#include namespace icinga { diff --git a/test/base-netstring.cpp b/test/base-netstring.cpp index c63f1d62e..e5cd70ecc 100644 --- a/test/base-netstring.cpp +++ b/test/base-netstring.cpp @@ -19,6 +19,7 @@ #include "base/netstring.h" #include "base/fifo.h" +#include "base/qstring.h" #include using namespace icinga; diff --git a/test/base-stream.cpp b/test/base-stream.cpp index 341af2fa0..71fa6408f 100644 --- a/test/base-stream.cpp +++ b/test/base-stream.cpp @@ -18,6 +18,7 @@ ******************************************************************************/ #include "base/stdiostream.h" +#include "base/qstring.h" #include #include #include