* #6655: removed more dependencies from managerimpl

daemon/src/iax/iaxcall.cpp

@@ -30,6 +30,7 @@
  */
 
 #include "iaxcall.h"
+#include "iax2/frame.h"
 #include "account.h"
 #include "manager.h"
 
@@ -37,11 +38,6 @@ IAXCall::IAXCall (const std::string& id, Call::CallType type) : Call (id, type),
 {
 }
 
-IAXCall::~IAXCall()
-{
-    _session = NULL; // just to be sure to don't have unknown pointer, do not delete it!
-}
-
 void
 IAXCall::setFormat (int format)
 {

daemon/src/iax/iaxcall.h

@@ -50,11 +50,6 @@ class IAXCall : public Call
          */
         IAXCall (const std::string& id, Call::CallType type);
 
-        /**
-         * Destructor
-         */
-        ~IAXCall();
-
         /**
          * @return iax_session* The session pointer or NULL
          */

daemon/src/managerimpl.cpp

@@ -46,10 +46,13 @@
 #include "audio/alsa/alsalayer.h"
 #include "audio/pulseaudio/pulselayer.h"
 #include "audio/sound/tonelist.h"
+#include "audio/sound/audiofile.h"
+#include "audio/sound/dtmf.h"
 #include "history/historymanager.h"
 #include "sip/sipvoiplink.h"
 #include "iax/iaxvoiplink.h"
 #include "manager.h"
+
 #include "dbus/configurationmanager.h"
 
 #include "conference.h"

daemon/src/managerimpl.h

@@ -47,25 +47,27 @@
 #include "call.h"
 #include "conference.h"
 
-#include "audio/sound/tonelist.h"  // for Tone::TONEID declaration
-#include "audio/sound/audiofile.h"
-#include "audio/sound/dtmf.h" // DTMF class contained by value here
+#include "audio/sound/tone.h"  // for Tone::TONEID declaration
 #include "audio/codecs/audiocodecfactory.h" 
 
 #include "audio/mainbuffer.h"
-#include "yamlemitter.h"
-#include "yamlparser.h"
 #include "preferences.h"
 
-#include "im/InstantMessaging.h"
+namespace sfl {
+    class InstantMessaging;
+}
 
+namespace Conf {
+    class YamlParser;
+    class YamlEmitter;
+}
+
+class DTMF;
+class AudioFile;
 class AudioLayer;
-class GuiFramework;
 class TelephoneTone;
 class VoIPLink;
 
-// class Conference;
-
 #ifdef USE_ZEROCONF
 class DNSService;
 #endif
@@ -1160,7 +1162,6 @@ class ManagerImpl
             return _imModule;
         }
 
-
         /**
          * Tell if there is a current call processed
          * @return bool True if there is a current call
@@ -1261,10 +1262,6 @@ class ManagerImpl
         void checkCallConfiguration (const std::string& id, const std::string& to, Call::CallConfiguration *callConfig);
 
         Conf::YamlEmitter *emitter;
-
-        friend class SIPTest;
-        friend class ConfigurationTest;
-        friend class HistoryTest;
 };
 
 #endif // __MANAGER_H__

daemon/test/configurationtest.cpp

@@ -67,16 +67,6 @@ void ConfigurationTest::testDefaultValueSignalisation()
     CPPUNIT_ASSERT (Manager::instance().voipPreferences.getPulseLength() == 250);
 }
 
-void ConfigurationTest::testInitVolume()
-{
-    _debug ("-------------------- ConfigurationTest::testInitVolume --------------------\n");
-
-    Manager::instance().initVolume();
-
-    CPPUNIT_ASSERT (Manager::instance().audioPreference.getVolumespkr() == Manager::instance().getSpkrVolume());
-    CPPUNIT_ASSERT (Manager::instance().audioPreference.getVolumemic() == Manager::instance().getMicVolume());
-}
-
 void ConfigurationTest::testInitAudioDriver()
 {
     _debug ("-------------------- ConfigurationTest::testInitAudioDriver --------------------\n");

daemon/test/configurationtest.h

@@ -61,7 +61,6 @@ class ConfigurationTest: public CppUnit::TestFixture {
 	 * Use cppunit library macros to add unit test the factory
 	 */
 CPPUNIT_TEST_SUITE( ConfigurationTest );
-//      CPPUNIT_TEST( testInitVolume );
 //      CPPUNIT_TEST( testDefaultValueAudio );
 //	CPPUNIT_TEST( testDefaultValuePreferences );
 //	CPPUNIT_TEST( testDefaultValueSignalisation );
@@ -94,8 +93,6 @@ public:
 
 	void testUnloadSIPAccount();
 
-	void testInitVolume();
-
 	void testInitAudioDriver();
 
 	void testYamlParser();