#14615: Move AccountMap definition from ManagerImpl Account

daemon/src/account.h

@@ -40,8 +40,12 @@
 #include "config/serializable.h"
 #include "registration_states.h"
 
+class Account;
 class VoIPLink;
 
+/** Define a type for a AccountMap container */
+typedef std::map<std::string, Account*> AccountMap;
+
 /**
  * @file account.h
  * @brief Interface to protocol account (SIPAccount, IAXAccount)

daemon/src/dbus/configurationmanager.cpp

@@ -34,19 +34,19 @@
 #include "config.h"
 #endif
 
-#include "configurationmanager.h"
-#include "account_schema.h"
 #include <cerrno>
 #include <sstream>
-#include "../manager.h"
+
+#include "configurationmanager.h"
+#include "account_schema.h"
+#include "manager.h"
 #include "sip/sipvoiplink.h"
 #include "sip/siptransport.h"
-#include "account.h"
 #include "logger.h"
 #include "fileutils.h"
 #include "sip/sipaccount.h"
-#include "../history/historynamecache.h"
-#include "../audio/audiolayer.h"
+#include "history/historynamecache.h"
+#include "audio/audiolayer.h"
 
 namespace {
     const char* SERVER_PATH = "/org/sflphone/SFLphone/ConfigurationManager";

daemon/src/managerimpl.cpp

@@ -40,7 +40,6 @@
 #include "managerimpl.h"
 #include "account_schema.h"
 
-#include "account.h"
 #include "dbus/callmanager.h"
 #include "global.h"
 #include "fileutils.h"

daemon/src/managerimpl.h

@@ -50,6 +50,8 @@
 
 #include "config/sfl_config.h"
 
+#include "account.h"
+
 #include "call.h"
 #include "conference.h"
 
@@ -82,8 +84,6 @@ class Account;
 class SIPAccount;
 class IAXAccount;
 
-/** Define a type for a AccountMap container */
-typedef std::map<std::string, Account*> AccountMap;
 
 /** Define a type for a std::string to std::string Map inside ManagerImpl */
 typedef std::map<std::string, std::string> CallAccountMap;

daemon/src/sip/sipvoiplink.h

@@ -164,6 +164,9 @@ class SIPVoIPLink : public VoIPLink {
          */
         virtual void offhold(const std::string& id);
 
+        /**
+         * Transfer method used for both type of transfer
+         */
         bool transferCommon(SIPCall *call, pj_str_t *dst);
 
         /**
@@ -212,6 +215,9 @@ class SIPVoIPLink : public VoIPLink {
          */
         void SIPCallClosed(SIPCall *call);
 
+        /**
+         * Get the memory pool factory since each calls has its own memory pool
+         */
         pj_caching_pool *getMemoryPoolFactory();
 
         /**
@@ -251,6 +257,9 @@ class SIPVoIPLink : public VoIPLink {
          */
         void createDefaultSipUdpTransport();
 
+        /**
+         * Instance that maintain and manage transport (UDP, TLS)
+         */
         SipTransport sipTransport;
 
 #ifdef SFL_VIDEO
@@ -263,6 +272,7 @@ class SIPVoIPLink : public VoIPLink {
 
         SIPVoIPLink();
         ~SIPVoIPLink();
+
         /**
          * Start a SIP Call
          * @param call  The current call
@@ -275,9 +285,10 @@ class SIPVoIPLink : public VoIPLink {
          */
         EventThread evThread_;
 
-        friend class SIPTest;
         static bool destroyed_;
         static SIPVoIPLink *instance_;
+
+        friend class SIPTest;
 };
 
 #endif // SIPVOIPLINK_H_