From 3a798ed827c31ddbbf0fb56bf91feaf7d330c530 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Tue, 6 Jan 2015 15:39:55 -0500
Subject: [PATCH] daemon: various header cleanup

Refs #63196

Change-Id: Ie9aaf7c3ce06485d9959dd59ba486abc5edc5142
---
 daemon/src/ringdht/ringaccount.cpp |  7 +------
 daemon/src/ringdht/ringaccount.h   |  3 ---
 daemon/src/sip/sipaccountbase.cpp  |  5 +++--
 daemon/src/sip/sipaccountbase.h    |  2 --
 daemon/src/sip/sipcall.cpp         |  1 -
 daemon/src/sip/siptransport.cpp    |  1 -
 daemon/src/sip/sipvoiplink.cpp     | 19 ++++++++-----------
 7 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/daemon/src/ringdht/ringaccount.cpp b/daemon/src/ringdht/ringaccount.cpp
index cfc1e55e5b..c1c06217bf 100644
--- a/daemon/src/ringdht/ringaccount.cpp
+++ b/daemon/src/ringdht/ringaccount.cpp
@@ -38,7 +38,7 @@
 #include "sip/sdp.h"
 #include "sip/sipvoiplink.h"
 #include "sip/sipcall.h"
-#include "sip/sip_utils.h"
+#include "sip/siptransport.h"
 
 #include "sip_transport_ice.h"
 #include "ice_transport.h"
@@ -47,8 +47,6 @@
 
 #include "array_size.h"
 
-#include "call_factory.h"
-
 #include "client/configurationmanager.h"
 
 #include "account_schema.h"
@@ -63,9 +61,6 @@
 #include "config/yamlparser.h"
 #include <yaml-cpp/yaml.h>
 
-#include <unistd.h>
-#include <pwd.h>
-
 #include <algorithm>
 #include <array>
 #include <memory>
diff --git a/daemon/src/ringdht/ringaccount.h b/daemon/src/ringdht/ringaccount.h
index 855dc0fea9..da6f6c83f3 100644
--- a/daemon/src/ringdht/ringaccount.h
+++ b/daemon/src/ringdht/ringaccount.h
@@ -36,7 +36,6 @@
 #include "config.h"
 #endif
 
-#include "sip/siptransport.h"
 #include "sip/sipaccountbase.h"
 #include "noncopyable.h"
 #include "ip_utils.h"
@@ -44,9 +43,7 @@
 
 #include <opendht/dhtrunner.h>
 
-#include <pjsip/sip_transport_tls.h>
 #include <pjsip/sip_types.h>
-#include <pjsip-ua/sip_regc.h>
 
 #include <vector>
 #include <map>
diff --git a/daemon/src/sip/sipaccountbase.cpp b/daemon/src/sip/sipaccountbase.cpp
index 51bef98a93..07ec437186 100644
--- a/daemon/src/sip/sipaccountbase.cpp
+++ b/daemon/src/sip/sipaccountbase.cpp
@@ -37,11 +37,12 @@
 #endif
 
 #include "account_schema.h"
-#include <yaml-cpp/yaml.h>
-#include "config/yamlparser.h"
 #include "client/configurationmanager.h"
 #include "manager.h"
 
+#include "config/yamlparser.h"
+#include <yaml-cpp/yaml.h>
+
 bool SIPAccountBase::portsInUse_[HALF_MAX_PORT];
 
 SIPAccountBase::SIPAccountBase(const std::string& accountID)
diff --git a/daemon/src/sip/sipaccountbase.h b/daemon/src/sip/sipaccountbase.h
index d800ff1191..a1ff7a0155 100644
--- a/daemon/src/sip/sipaccountbase.h
+++ b/daemon/src/sip/sipaccountbase.h
@@ -40,9 +40,7 @@
 #include "account.h"
 #include "noncopyable.h"
 #include "ip_utils.h"
-//#include "sfl_types.h" // enable_if_base_of
 
-#include <pjsip/sip_transport_tls.h>
 #include <pjsip/sip_types.h>
 
 #include <vector>
diff --git a/daemon/src/sip/sipcall.cpp b/daemon/src/sip/sipcall.cpp
index 2a7c1f2418..c5083cdc68 100644
--- a/daemon/src/sip/sipcall.cpp
+++ b/daemon/src/sip/sipcall.cpp
@@ -42,7 +42,6 @@
 #include "sdp.h"
 #include "manager.h"
 #include "array_size.h"
-#include "audio/audiolayer.h"
 
 using namespace sfl;
 
diff --git a/daemon/src/sip/siptransport.cpp b/daemon/src/sip/siptransport.cpp
index 40f30404f0..5b657147cd 100644
--- a/daemon/src/sip/siptransport.cpp
+++ b/daemon/src/sip/siptransport.cpp
@@ -38,7 +38,6 @@
 
 #include "manager.h"
 #include "client/configurationmanager.h"
-#include "map_utils.h"
 #include "array_size.h"
 #include "intrin.h"
 
diff --git a/daemon/src/sip/sipvoiplink.cpp b/daemon/src/sip/sipvoiplink.cpp
index 8ab28ca1ce..1be1ea63d2 100644
--- a/daemon/src/sip/sipvoiplink.cpp
+++ b/daemon/src/sip/sipvoiplink.cpp
@@ -41,30 +41,20 @@
 #include "sdp.h"
 #include "sipcall.h"
 #include "sipaccount.h"
-#include "sip_utils.h"
-#include "string_utils.h"
 
 #if HAVE_DHT
 #include "ringdht/ringaccount.h"
 #endif
 
-#include "call_factory.h"
-
 #include "manager.h"
 #if HAVE_SDES
 #include "sdes_negotiator.h"
 #endif
 
-#include "logger.h"
-#include "array_size.h"
-#include "ip_utils.h"
-
 #if HAVE_INSTANT_MESSAGING
 #include "im/instant_messaging.h"
 #endif
 
-#include "audio/audiolayer.h"
-
 #ifndef USE_CCRTP
 #include "audio/audiortp/avformat_rtp_session.h"
 #endif
@@ -78,12 +68,19 @@
 #include "client/callmanager.h"
 #include "client/configurationmanager.h"
 
+#include "pres_sub_server.h"
+
+#include "array_size.h"
+#include "ip_utils.h"
+#include "sip_utils.h"
+#include "string_utils.h"
+#include "logger.h"
+
 #include <pjsip/sip_endpoint.h>
 #include <pjsip/sip_uri.h>
 
 #include <pjsip-simple/presence.h>
 #include <pjsip-simple/publish.h>
-#include "pres_sub_server.h"
 
 #include <istream>
 #include <algorithm>
-- 
GitLab