From e4b5fe74ffd42c4e9e0d56c8176c8566526c4d15 Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Mon, 11 Nov 2013 11:57:25 +0100
Subject: [PATCH] Fix LivestatusListener config object.

Fixes #5053
---
 components/livestatus/aggregator.cpp         |  2 +-
 components/livestatus/aggregator.h           |  2 +-
 components/livestatus/andfilter.cpp          |  1 -
 components/livestatus/andfilter.h            |  2 +-
 components/livestatus/attributefilter.cpp    |  1 -
 components/livestatus/attributefilter.h      |  2 +-
 components/livestatus/avgaggregator.cpp      |  2 +-
 components/livestatus/avgaggregator.h        |  2 +-
 components/livestatus/column.cpp             |  1 -
 components/livestatus/column.h               |  2 +-
 components/livestatus/combinerfilter.cpp     |  1 -
 components/livestatus/combinerfilter.h       |  2 +-
 components/livestatus/commandstable.cpp      |  1 -
 components/livestatus/commandstable.h        |  2 +-
 components/livestatus/commentstable.cpp      |  1 -
 components/livestatus/commentstable.h        |  2 +-
 components/livestatus/contactgroupstable.cpp |  1 -
 components/livestatus/contactgroupstable.h   |  2 +-
 components/livestatus/contactstable.cpp      |  1 -
 components/livestatus/contactstable.h        |  2 +-
 components/livestatus/countaggregator.cpp    |  2 +-
 components/livestatus/countaggregator.h      |  2 +-
 components/livestatus/downtimestable.cpp     |  1 -
 components/livestatus/downtimestable.h       |  2 +-
 components/livestatus/filter.cpp             |  2 +-
 components/livestatus/filter.h               |  2 +-
 components/livestatus/hostgroupstable.cpp    |  1 -
 components/livestatus/hostgroupstable.h      |  2 +-
 components/livestatus/hoststable.cpp         |  1 -
 components/livestatus/hoststable.h           |  2 +-
 components/livestatus/invavgaggregator.cpp   |  2 +-
 components/livestatus/invavgaggregator.h     |  2 +-
 components/livestatus/invsumaggregator.cpp   |  2 +-
 components/livestatus/invsumaggregator.h     |  2 +-
 components/livestatus/listener.cpp           |  1 -
 components/livestatus/listener.h             |  2 +-
 components/livestatus/listener.ti            | 11 +----------
 components/livestatus/logtable.cpp           |  1 -
 components/livestatus/logtable.h             |  2 +-
 components/livestatus/maxaggregator.cpp      |  2 +-
 components/livestatus/maxaggregator.h        |  2 +-
 components/livestatus/minaggregator.cpp      |  2 +-
 components/livestatus/minaggregator.h        |  2 +-
 components/livestatus/negatefilter.cpp       |  1 -
 components/livestatus/negatefilter.h         |  2 +-
 components/livestatus/orfilter.cpp           |  1 -
 components/livestatus/orfilter.h             |  2 +-
 components/livestatus/query.cpp              |  1 -
 components/livestatus/query.h                |  2 +-
 components/livestatus/servicegroupstable.cpp |  1 -
 components/livestatus/servicegroupstable.h   |  2 +-
 components/livestatus/servicestable.cpp      |  1 -
 components/livestatus/servicestable.h        |  2 +-
 components/livestatus/statehisttable.cpp     |  1 -
 components/livestatus/statehisttable.h       |  2 +-
 components/livestatus/statustable.cpp        |  1 -
 components/livestatus/statustable.h          |  2 +-
 components/livestatus/stdaggregator.cpp      |  2 +-
 components/livestatus/stdaggregator.h        |  2 +-
 components/livestatus/sumaggregator.cpp      |  2 +-
 components/livestatus/sumaggregator.h        |  2 +-
 components/livestatus/table.cpp              |  1 -
 components/livestatus/table.h                |  2 +-
 components/livestatus/timeperiodstable.cpp   |  1 -
 components/livestatus/timeperiodstable.h     |  2 +-
 65 files changed, 43 insertions(+), 74 deletions(-)

diff --git a/components/livestatus/aggregator.cpp b/components/livestatus/aggregator.cpp
index a2f25a20d..76e0a3d7e 100644
--- a/components/livestatus/aggregator.cpp
+++ b/components/livestatus/aggregator.cpp
@@ -19,7 +19,7 @@
 
 #include "livestatus/aggregator.h"
 
-using namespace livestatus;
+using namespace icinga;
 
 Aggregator::Aggregator(void)
 { }
diff --git a/components/livestatus/aggregator.h b/components/livestatus/aggregator.h
index 28e66ef5c..6ebae96c9 100644
--- a/components/livestatus/aggregator.h
+++ b/components/livestatus/aggregator.h
@@ -23,7 +23,7 @@
 #include "livestatus/table.h"
 #include "livestatus/filter.h"
 
-namespace livestatus
+namespace icinga
 {
 
 /**
diff --git a/components/livestatus/andfilter.cpp b/components/livestatus/andfilter.cpp
index 6e98641b9..b345b9c79 100644
--- a/components/livestatus/andfilter.cpp
+++ b/components/livestatus/andfilter.cpp
@@ -21,7 +21,6 @@
 #include <boost/foreach.hpp>
 
 using namespace icinga;
-using namespace livestatus;
 
 AndFilter::AndFilter(void)
 { }
diff --git a/components/livestatus/andfilter.h b/components/livestatus/andfilter.h
index 80f6d1950..52bc3fd49 100644
--- a/components/livestatus/andfilter.h
+++ b/components/livestatus/andfilter.h
@@ -24,7 +24,7 @@
 
 using namespace icinga;
 
-namespace livestatus
+namespace icinga
 {
 
 /**
diff --git a/components/livestatus/attributefilter.cpp b/components/livestatus/attributefilter.cpp
index bb325402d..53ea082ac 100644
--- a/components/livestatus/attributefilter.cpp
+++ b/components/livestatus/attributefilter.cpp
@@ -26,7 +26,6 @@
 #include <boost/regex.hpp>
 
 using namespace icinga;
-using namespace livestatus;
 
 AttributeFilter::AttributeFilter(const String& column, const String& op, const String& operand)
 	: m_Column(column), m_Operator(op), m_Operand(operand)
diff --git a/components/livestatus/attributefilter.h b/components/livestatus/attributefilter.h
index 4fdf4c8f0..b93732363 100644
--- a/components/livestatus/attributefilter.h
+++ b/components/livestatus/attributefilter.h
@@ -24,7 +24,7 @@
 
 using namespace icinga;
 
-namespace livestatus
+namespace icinga
 {
 
 /**
diff --git a/components/livestatus/avgaggregator.cpp b/components/livestatus/avgaggregator.cpp
index 3c9efd239..de5ecafd5 100644
--- a/components/livestatus/avgaggregator.cpp
+++ b/components/livestatus/avgaggregator.cpp
@@ -19,7 +19,7 @@
 
 #include "livestatus/avgaggregator.h"
 
-using namespace livestatus;
+using namespace icinga;
 
 AvgAggregator::AvgAggregator(const String& attr)
     : m_Avg(0), m_AvgCount(0)
diff --git a/components/livestatus/avgaggregator.h b/components/livestatus/avgaggregator.h
index f3ef5a750..cd379b5b3 100644
--- a/components/livestatus/avgaggregator.h
+++ b/components/livestatus/avgaggregator.h
@@ -23,7 +23,7 @@
 #include "livestatus/table.h"
 #include "livestatus/aggregator.h"
 
-namespace livestatus
+namespace icinga
 {
 
 /**
diff --git a/components/livestatus/column.cpp b/components/livestatus/column.cpp
index c22d5bbe6..218dfe990 100644
--- a/components/livestatus/column.cpp
+++ b/components/livestatus/column.cpp
@@ -20,7 +20,6 @@
 #include "livestatus/column.h"
 
 using namespace icinga;
-using namespace livestatus;
 
 Column::Column(const ValueAccessor& valueAccessor, const ObjectAccessor& objectAccessor)
 	: m_ValueAccessor(valueAccessor), m_ObjectAccessor(objectAccessor)
diff --git a/components/livestatus/column.h b/components/livestatus/column.h
index 89f08bcea..bf95d8867 100644
--- a/components/livestatus/column.h
+++ b/components/livestatus/column.h
@@ -25,7 +25,7 @@
 
 using namespace icinga;
 
-namespace livestatus
+namespace icinga
 {
 
 class Column
diff --git a/components/livestatus/combinerfilter.cpp b/components/livestatus/combinerfilter.cpp
index 2cc5e4e75..f1050f7f7 100644
--- a/components/livestatus/combinerfilter.cpp
+++ b/components/livestatus/combinerfilter.cpp
@@ -20,7 +20,6 @@
 #include "livestatus/combinerfilter.h"
 
 using namespace icinga;
-using namespace livestatus;
 
 CombinerFilter::CombinerFilter(void)
 { }
diff --git a/components/livestatus/combinerfilter.h b/components/livestatus/combinerfilter.h
index c7da06947..280b465f1 100644
--- a/components/livestatus/combinerfilter.h
+++ b/components/livestatus/combinerfilter.h
@@ -24,7 +24,7 @@
 
 using namespace icinga;
 
-namespace livestatus
+namespace icinga
 {
 
 /**
diff --git a/components/livestatus/commandstable.cpp b/components/livestatus/commandstable.cpp
index 59e5ae63d..22d1f8033 100644
--- a/components/livestatus/commandstable.cpp
+++ b/components/livestatus/commandstable.cpp
@@ -29,7 +29,6 @@
 #include <boost/algorithm/string/replace.hpp>
 
 using namespace icinga;
-using namespace livestatus;
 
 CommandsTable::CommandsTable(void)
 {
diff --git a/components/livestatus/commandstable.h b/components/livestatus/commandstable.h
index 5af87cdb2..4326fd97f 100644
--- a/components/livestatus/commandstable.h
+++ b/components/livestatus/commandstable.h
@@ -24,7 +24,7 @@
 
 using namespace icinga;
 
-namespace livestatus
+namespace icinga
 {
 
 /**
diff --git a/components/livestatus/commentstable.cpp b/components/livestatus/commentstable.cpp
index f58d55367..21250792b 100644
--- a/components/livestatus/commentstable.cpp
+++ b/components/livestatus/commentstable.cpp
@@ -26,7 +26,6 @@
 #include <boost/foreach.hpp>
 
 using namespace icinga;
-using namespace livestatus;
 
 CommentsTable::CommentsTable(void)
 {
diff --git a/components/livestatus/commentstable.h b/components/livestatus/commentstable.h
index e5fef61dc..6421d6948 100644
--- a/components/livestatus/commentstable.h
+++ b/components/livestatus/commentstable.h
@@ -24,7 +24,7 @@
 
 using namespace icinga;
 
-namespace livestatus
+namespace icinga
 {
 
 /**
diff --git a/components/livestatus/contactgroupstable.cpp b/components/livestatus/contactgroupstable.cpp
index edcd8ce6c..cc25583de 100644
--- a/components/livestatus/contactgroupstable.cpp
+++ b/components/livestatus/contactgroupstable.cpp
@@ -23,7 +23,6 @@
 #include <boost/foreach.hpp>
 
 using namespace icinga;
-using namespace livestatus;
 
 ContactGroupsTable::ContactGroupsTable(void)
 {
diff --git a/components/livestatus/contactgroupstable.h b/components/livestatus/contactgroupstable.h
index ebaef82ef..53e761087 100644
--- a/components/livestatus/contactgroupstable.h
+++ b/components/livestatus/contactgroupstable.h
@@ -24,7 +24,7 @@
 
 using namespace icinga;
 
-namespace livestatus
+namespace icinga
 {
 
 /**
diff --git a/components/livestatus/contactstable.cpp b/components/livestatus/contactstable.cpp
index b2c3bf2ba..4624811fb 100644
--- a/components/livestatus/contactstable.cpp
+++ b/components/livestatus/contactstable.cpp
@@ -27,7 +27,6 @@
 #include <boost/tuple/tuple.hpp>
 
 using namespace icinga;
-using namespace livestatus;
 
 ContactsTable::ContactsTable(void)
 {
diff --git a/components/livestatus/contactstable.h b/components/livestatus/contactstable.h
index 57081331e..06aec52e0 100644
--- a/components/livestatus/contactstable.h
+++ b/components/livestatus/contactstable.h
@@ -24,7 +24,7 @@
 
 using namespace icinga;
 
-namespace livestatus
+namespace icinga
 {
 
 /**
diff --git a/components/livestatus/countaggregator.cpp b/components/livestatus/countaggregator.cpp
index 38b007892..4335d2794 100644
--- a/components/livestatus/countaggregator.cpp
+++ b/components/livestatus/countaggregator.cpp
@@ -19,7 +19,7 @@
 
 #include "livestatus/countaggregator.h"
 
-using namespace livestatus;
+using namespace icinga;
 
 CountAggregator::CountAggregator(void)
     : m_Count(0)
diff --git a/components/livestatus/countaggregator.h b/components/livestatus/countaggregator.h
index 74690bc5d..9a503b200 100644
--- a/components/livestatus/countaggregator.h
+++ b/components/livestatus/countaggregator.h
@@ -23,7 +23,7 @@
 #include "livestatus/table.h"
 #include "livestatus/aggregator.h"
 
-namespace livestatus
+namespace icinga
 {
 
 /**
diff --git a/components/livestatus/downtimestable.cpp b/components/livestatus/downtimestable.cpp
index c046a8331..fa182b35e 100644
--- a/components/livestatus/downtimestable.cpp
+++ b/components/livestatus/downtimestable.cpp
@@ -26,7 +26,6 @@
 #include <boost/foreach.hpp>
 
 using namespace icinga;
-using namespace livestatus;
 
 DowntimesTable::DowntimesTable(void)
 {
diff --git a/components/livestatus/downtimestable.h b/components/livestatus/downtimestable.h
index 0297f133c..8a4a84355 100644
--- a/components/livestatus/downtimestable.h
+++ b/components/livestatus/downtimestable.h
@@ -24,7 +24,7 @@
 
 using namespace icinga;
 
-namespace livestatus
+namespace icinga
 {
 
 /**
diff --git a/components/livestatus/filter.cpp b/components/livestatus/filter.cpp
index e5aa028d6..79f8584b7 100644
--- a/components/livestatus/filter.cpp
+++ b/components/livestatus/filter.cpp
@@ -19,7 +19,7 @@
 
 #include "livestatus/filter.h"
 
-using namespace livestatus;
+using namespace icinga;
 
 Filter::Filter(void)
 { }
diff --git a/components/livestatus/filter.h b/components/livestatus/filter.h
index 431eef76d..b5e8ab36e 100644
--- a/components/livestatus/filter.h
+++ b/components/livestatus/filter.h
@@ -22,7 +22,7 @@
 
 #include "livestatus/table.h"
 
-namespace livestatus
+namespace icinga
 {
 
 /**
diff --git a/components/livestatus/hostgroupstable.cpp b/components/livestatus/hostgroupstable.cpp
index ece872772..fff3111d0 100644
--- a/components/livestatus/hostgroupstable.cpp
+++ b/components/livestatus/hostgroupstable.cpp
@@ -25,7 +25,6 @@
 #include <boost/foreach.hpp>
 
 using namespace icinga;
-using namespace livestatus;
 
 HostGroupsTable::HostGroupsTable(void)
 {
diff --git a/components/livestatus/hostgroupstable.h b/components/livestatus/hostgroupstable.h
index 55dcac140..d163910e4 100644
--- a/components/livestatus/hostgroupstable.h
+++ b/components/livestatus/hostgroupstable.h
@@ -24,7 +24,7 @@
 
 using namespace icinga;
 
-namespace livestatus
+namespace icinga
 {
 
 /**
diff --git a/components/livestatus/hoststable.cpp b/components/livestatus/hoststable.cpp
index f517c2d4f..d240afb8b 100644
--- a/components/livestatus/hoststable.cpp
+++ b/components/livestatus/hoststable.cpp
@@ -37,7 +37,6 @@
 #include <boost/algorithm/string/split.hpp>
 
 using namespace icinga;
-using namespace livestatus;
 
 HostsTable::HostsTable(void)
 {
diff --git a/components/livestatus/hoststable.h b/components/livestatus/hoststable.h
index fac11aad2..98ab394ff 100644
--- a/components/livestatus/hoststable.h
+++ b/components/livestatus/hoststable.h
@@ -24,7 +24,7 @@
 
 using namespace icinga;
 
-namespace livestatus
+namespace icinga
 {
 
 /**
diff --git a/components/livestatus/invavgaggregator.cpp b/components/livestatus/invavgaggregator.cpp
index af1678b1c..75d6906ce 100644
--- a/components/livestatus/invavgaggregator.cpp
+++ b/components/livestatus/invavgaggregator.cpp
@@ -19,7 +19,7 @@
 
 #include "livestatus/invavgaggregator.h"
 
-using namespace livestatus;
+using namespace icinga;
 
 InvAvgAggregator::InvAvgAggregator(const String& attr)
     : m_InvAvg(0), m_InvAvgCount(0)
diff --git a/components/livestatus/invavgaggregator.h b/components/livestatus/invavgaggregator.h
index 0396c8e7a..6378ab442 100644
--- a/components/livestatus/invavgaggregator.h
+++ b/components/livestatus/invavgaggregator.h
@@ -23,7 +23,7 @@
 #include "livestatus/table.h"
 #include "livestatus/aggregator.h"
 
-namespace livestatus
+namespace icinga
 {
 
 /**
diff --git a/components/livestatus/invsumaggregator.cpp b/components/livestatus/invsumaggregator.cpp
index 184868b59..f42a9ade3 100644
--- a/components/livestatus/invsumaggregator.cpp
+++ b/components/livestatus/invsumaggregator.cpp
@@ -19,7 +19,7 @@
 
 #include "livestatus/invsumaggregator.h"
 
-using namespace livestatus;
+using namespace icinga;
 
 InvSumAggregator::InvSumAggregator(const String& attr)
     : m_InvSum(0)
diff --git a/components/livestatus/invsumaggregator.h b/components/livestatus/invsumaggregator.h
index e04ea6c38..0f1911457 100644
--- a/components/livestatus/invsumaggregator.h
+++ b/components/livestatus/invsumaggregator.h
@@ -23,7 +23,7 @@
 #include "livestatus/table.h"
 #include "livestatus/aggregator.h"
 
-namespace livestatus
+namespace icinga
 {
 
 /**
diff --git a/components/livestatus/listener.cpp b/components/livestatus/listener.cpp
index b77fd0272..1d0bd444f 100644
--- a/components/livestatus/listener.cpp
+++ b/components/livestatus/listener.cpp
@@ -32,7 +32,6 @@
 #include <boost/exception/diagnostic_information.hpp>
 
 using namespace icinga;
-using namespace livestatus;
 
 REGISTER_TYPE(LivestatusListener);
 REGISTER_SCRIPTFUNCTION(ValidateSocketType, &LivestatusListener::ValidateSocketType);
diff --git a/components/livestatus/listener.h b/components/livestatus/listener.h
index a534bdeba..2a6ff36d5 100644
--- a/components/livestatus/listener.h
+++ b/components/livestatus/listener.h
@@ -27,7 +27,7 @@
 
 using namespace icinga;
 
-namespace livestatus
+namespace icinga
 {
 
 /**
diff --git a/components/livestatus/listener.ti b/components/livestatus/listener.ti
index b49752d92..c37981c2b 100644
--- a/components/livestatus/listener.ti
+++ b/components/livestatus/listener.ti
@@ -1,19 +1,10 @@
 #include "base/dynamicobject.h"
 #include "base/application.h"
 
-namespace livestatus
-{
-
-code {{{
-class LivestatusListener;
-}}}
-
-}
-
 namespace icinga
 {
 
-class livestatus::LivestatusListener : DynamicObject {
+class LivestatusListener : DynamicObject {
 	[config] String socket_type {
 		default {{{ return "unix"; }}}
 	};
diff --git a/components/livestatus/logtable.cpp b/components/livestatus/logtable.cpp
index 329bfc3cb..30f3e79c6 100644
--- a/components/livestatus/logtable.cpp
+++ b/components/livestatus/logtable.cpp
@@ -45,7 +45,6 @@
 #include <fstream>
 
 using namespace icinga;
-using namespace livestatus;
 
 LogTable::LogTable(const String& compat_log_path, const unsigned long& from, const unsigned long& until)
 {
diff --git a/components/livestatus/logtable.h b/components/livestatus/logtable.h
index 02cbcd1ea..7e6f30b15 100644
--- a/components/livestatus/logtable.h
+++ b/components/livestatus/logtable.h
@@ -25,7 +25,7 @@
 
 using namespace icinga;
 
-namespace livestatus
+namespace icinga
 {
 
 enum LogType {
diff --git a/components/livestatus/maxaggregator.cpp b/components/livestatus/maxaggregator.cpp
index 31810f6c8..66545b4ea 100644
--- a/components/livestatus/maxaggregator.cpp
+++ b/components/livestatus/maxaggregator.cpp
@@ -19,7 +19,7 @@
 
 #include "livestatus/maxaggregator.h"
 
-using namespace livestatus;
+using namespace icinga;
 
 MaxAggregator::MaxAggregator(const String& attr)
     : m_Max(0)
diff --git a/components/livestatus/maxaggregator.h b/components/livestatus/maxaggregator.h
index b6a16f88d..be41cb762 100644
--- a/components/livestatus/maxaggregator.h
+++ b/components/livestatus/maxaggregator.h
@@ -23,7 +23,7 @@
 #include "livestatus/table.h"
 #include "livestatus/aggregator.h"
 
-namespace livestatus
+namespace icinga
 {
 
 /**
diff --git a/components/livestatus/minaggregator.cpp b/components/livestatus/minaggregator.cpp
index 2dd47f3fd..dac50baa1 100644
--- a/components/livestatus/minaggregator.cpp
+++ b/components/livestatus/minaggregator.cpp
@@ -19,7 +19,7 @@
 
 #include "livestatus/minaggregator.h"
 
-using namespace livestatus;
+using namespace icinga;
 
 MinAggregator::MinAggregator(const String& attr)
     : m_Min(0)
diff --git a/components/livestatus/minaggregator.h b/components/livestatus/minaggregator.h
index 572a2d31e..e2d2de0f9 100644
--- a/components/livestatus/minaggregator.h
+++ b/components/livestatus/minaggregator.h
@@ -23,7 +23,7 @@
 #include "livestatus/table.h"
 #include "livestatus/aggregator.h"
 
-namespace livestatus
+namespace icinga
 {
 
 /**
diff --git a/components/livestatus/negatefilter.cpp b/components/livestatus/negatefilter.cpp
index 3a7d1dddd..450021775 100644
--- a/components/livestatus/negatefilter.cpp
+++ b/components/livestatus/negatefilter.cpp
@@ -20,7 +20,6 @@
 #include "livestatus/negatefilter.h"
 
 using namespace icinga;
-using namespace livestatus;
 
 NegateFilter::NegateFilter(const Filter::Ptr& inner)
 	: m_Inner(inner)
diff --git a/components/livestatus/negatefilter.h b/components/livestatus/negatefilter.h
index c5bb321fa..688653186 100644
--- a/components/livestatus/negatefilter.h
+++ b/components/livestatus/negatefilter.h
@@ -24,7 +24,7 @@
 
 using namespace icinga;
 
-namespace livestatus
+namespace icinga
 {
 
 /**
diff --git a/components/livestatus/orfilter.cpp b/components/livestatus/orfilter.cpp
index e90cadade..d07b78a7b 100644
--- a/components/livestatus/orfilter.cpp
+++ b/components/livestatus/orfilter.cpp
@@ -21,7 +21,6 @@
 #include <boost/foreach.hpp>
 
 using namespace icinga;
-using namespace livestatus;
 
 OrFilter::OrFilter(void)
 { }
diff --git a/components/livestatus/orfilter.h b/components/livestatus/orfilter.h
index ef9eb61c6..9b975cf92 100644
--- a/components/livestatus/orfilter.h
+++ b/components/livestatus/orfilter.h
@@ -24,7 +24,7 @@
 
 using namespace icinga;
 
-namespace livestatus
+namespace icinga
 {
 
 /**
diff --git a/components/livestatus/query.cpp b/components/livestatus/query.cpp
index 64136ad94..bb0c7b9cc 100644
--- a/components/livestatus/query.cpp
+++ b/components/livestatus/query.cpp
@@ -43,7 +43,6 @@
 #include <boost/algorithm/string/split.hpp>
 
 using namespace icinga;
-using namespace livestatus;
 
 static int l_ExternalCommands = 0;
 static boost::mutex l_QueryMutex;
diff --git a/components/livestatus/query.h b/components/livestatus/query.h
index d7cdbb02b..28d099def 100644
--- a/components/livestatus/query.h
+++ b/components/livestatus/query.h
@@ -29,7 +29,7 @@
 
 using namespace icinga;
 
-namespace livestatus
+namespace icinga
 {
 
 enum LivestatusError
diff --git a/components/livestatus/servicegroupstable.cpp b/components/livestatus/servicegroupstable.cpp
index 6b6204f57..e36ef41d8 100644
--- a/components/livestatus/servicegroupstable.cpp
+++ b/components/livestatus/servicegroupstable.cpp
@@ -23,7 +23,6 @@
 #include <boost/foreach.hpp>
 
 using namespace icinga;
-using namespace livestatus;
 
 ServiceGroupsTable::ServiceGroupsTable(void)
 {
diff --git a/components/livestatus/servicegroupstable.h b/components/livestatus/servicegroupstable.h
index f04e8354b..52a7b7651 100644
--- a/components/livestatus/servicegroupstable.h
+++ b/components/livestatus/servicegroupstable.h
@@ -24,7 +24,7 @@
 
 using namespace icinga;
 
-namespace livestatus
+namespace icinga
 {
 
 /**
diff --git a/components/livestatus/servicestable.cpp b/components/livestatus/servicestable.cpp
index 26e0868d8..a0fdfbb25 100644
--- a/components/livestatus/servicestable.cpp
+++ b/components/livestatus/servicestable.cpp
@@ -35,7 +35,6 @@
 #include <boost/algorithm/string/replace.hpp>
 
 using namespace icinga;
-using namespace livestatus;
 
 ServicesTable::ServicesTable(void)
 {
diff --git a/components/livestatus/servicestable.h b/components/livestatus/servicestable.h
index 9aa9198bb..0701ffe89 100644
--- a/components/livestatus/servicestable.h
+++ b/components/livestatus/servicestable.h
@@ -24,7 +24,7 @@
 
 using namespace icinga;
 
-namespace livestatus
+namespace icinga
 {
 
 /**
diff --git a/components/livestatus/statehisttable.cpp b/components/livestatus/statehisttable.cpp
index fca276a76..1d1fa3def 100644
--- a/components/livestatus/statehisttable.cpp
+++ b/components/livestatus/statehisttable.cpp
@@ -46,7 +46,6 @@
 #include <fstream>
 
 using namespace icinga;
-using namespace livestatus;
 
 StateHistTable::StateHistTable(const String& compat_log_path, const unsigned long& from, const unsigned long& until)
 {
diff --git a/components/livestatus/statehisttable.h b/components/livestatus/statehisttable.h
index 14714316f..5c8bf4987 100644
--- a/components/livestatus/statehisttable.h
+++ b/components/livestatus/statehisttable.h
@@ -26,7 +26,7 @@
 
 using namespace icinga;
 
-namespace livestatus
+namespace icinga
 {
 
 enum LogStateHistType {
diff --git a/components/livestatus/statustable.cpp b/components/livestatus/statustable.cpp
index eed18ec6b..bba91af9a 100644
--- a/components/livestatus/statustable.cpp
+++ b/components/livestatus/statustable.cpp
@@ -28,7 +28,6 @@
 #include "base/application.h"
 
 using namespace icinga;
-using namespace livestatus;
 
 StatusTable::StatusTable(void)
 {
diff --git a/components/livestatus/statustable.h b/components/livestatus/statustable.h
index 6d893d258..7e1d278d5 100644
--- a/components/livestatus/statustable.h
+++ b/components/livestatus/statustable.h
@@ -24,7 +24,7 @@
 
 using namespace icinga;
 
-namespace livestatus
+namespace icinga
 {
 
 /**
diff --git a/components/livestatus/stdaggregator.cpp b/components/livestatus/stdaggregator.cpp
index 606110554..1b8889144 100644
--- a/components/livestatus/stdaggregator.cpp
+++ b/components/livestatus/stdaggregator.cpp
@@ -20,7 +20,7 @@
 #include "livestatus/stdaggregator.h"
 #include <math.h>
 
-using namespace livestatus;
+using namespace icinga;
 
 StdAggregator::StdAggregator(const String& attr)
     : m_StdSum(0), m_StdQSum(0), m_StdCount(0)
diff --git a/components/livestatus/stdaggregator.h b/components/livestatus/stdaggregator.h
index aaab325ea..5e966585a 100644
--- a/components/livestatus/stdaggregator.h
+++ b/components/livestatus/stdaggregator.h
@@ -23,7 +23,7 @@
 #include "livestatus/table.h"
 #include "livestatus/aggregator.h"
 
-namespace livestatus
+namespace icinga
 {
 
 /**
diff --git a/components/livestatus/sumaggregator.cpp b/components/livestatus/sumaggregator.cpp
index f4fb52e65..a965c2ecc 100644
--- a/components/livestatus/sumaggregator.cpp
+++ b/components/livestatus/sumaggregator.cpp
@@ -19,7 +19,7 @@
 
 #include "livestatus/sumaggregator.h"
 
-using namespace livestatus;
+using namespace icinga;
 
 SumAggregator::SumAggregator(const String& attr)
     : m_Sum(0)
diff --git a/components/livestatus/sumaggregator.h b/components/livestatus/sumaggregator.h
index 3d864b705..fdafa4302 100644
--- a/components/livestatus/sumaggregator.h
+++ b/components/livestatus/sumaggregator.h
@@ -23,7 +23,7 @@
 #include "livestatus/table.h"
 #include "livestatus/aggregator.h"
 
-namespace livestatus
+namespace icinga
 {
 
 /**
diff --git a/components/livestatus/table.cpp b/components/livestatus/table.cpp
index ef0045961..bd476d3fc 100644
--- a/components/livestatus/table.cpp
+++ b/components/livestatus/table.cpp
@@ -39,7 +39,6 @@
 #include <boost/bind.hpp>
 
 using namespace icinga;
-using namespace livestatus;
 
 Table::Table(void)
 { }
diff --git a/components/livestatus/table.h b/components/livestatus/table.h
index 7d543c248..dd5a5abdb 100644
--- a/components/livestatus/table.h
+++ b/components/livestatus/table.h
@@ -25,7 +25,7 @@
 #include "base/dictionary.h"
 #include <vector>
 
-namespace livestatus
+namespace icinga
 {
 
 class Filter;
diff --git a/components/livestatus/timeperiodstable.cpp b/components/livestatus/timeperiodstable.cpp
index 813a4eb1a..a487738c2 100644
--- a/components/livestatus/timeperiodstable.cpp
+++ b/components/livestatus/timeperiodstable.cpp
@@ -28,7 +28,6 @@
 #include <boost/algorithm/string/replace.hpp>
 
 using namespace icinga;
-using namespace livestatus;
 
 TimePeriodsTable::TimePeriodsTable(void)
 {
diff --git a/components/livestatus/timeperiodstable.h b/components/livestatus/timeperiodstable.h
index 75c788af1..2f7ab1ed9 100644
--- a/components/livestatus/timeperiodstable.h
+++ b/components/livestatus/timeperiodstable.h
@@ -24,7 +24,7 @@
 
 using namespace icinga;
 
-namespace livestatus
+namespace icinga
 {
 
 /**