Revert "Was trying to work on the crash on shutdown by making sure we explicitly delete items in tomahawkapp. Except where there are FIXMEs all are now explicitly deleted, in reverse order of instantiation. So far no help, but figured might as well keep the changes."

This reverts commit 6e19a85d73.

src/tomahawkapp.cpp

@@ -152,7 +152,6 @@ using namespace Tomahawk;
 TomahawkApp::TomahawkApp( int& argc, char *argv[] )
     : TOMAHAWK_APPLICATION( argc, argv )
     , m_database( 0 )
-    , m_databaseResolver( 0 )
     , m_scanManager( 0 )
     , m_audioEngine( 0 )
     , m_servent( 0 )
@@ -311,49 +310,25 @@ TomahawkApp::~TomahawkApp()
 {
     qDebug() << Q_FUNC_INFO;
 
-#ifdef LIBLASTFM_FOUND
-    delete m_scrobbler;
-#endif
-
-    //FIXME: m_session doesn't allow you to stop(), so is this safe?
-    delete m_session.staticContentService();
-    
     // stop script resolvers
     foreach( Tomahawk::ExternalResolver* r, m_scriptResolvers.values() )
     {
         delete r;
     }
     m_scriptResolvers.clear();
-    Pipeline::instance()->removeResolver( m_databaseResolver );
-    delete m_databaseResolver;
-
-    //FIXME: Delete stuff created in initLocalCollection ?
-    
-#ifndef TOMAHAWK_HEADLESS
-    delete m_mainwindow;
-#endif
-
-    delete m_infoSystem;
-
-    //FIXME: delete GeneratorFactory::registerFactory( "echonest", new EchonestFactory ); ?
-
-    delete m_database;
-
-    delete SipHandler::instance();
 
     delete m_servent;
-    
-    Pipeline::instance()->stop();
-    delete Pipeline::instance();    
-
     delete m_scanManager;
-    
 #ifndef TOMAHAWK_HEADLESS
+    delete m_mainwindow;
     delete m_audioEngine;
 #endif
 
-    delete TomahawkUtils::proxyFactory();
-    delete TomahawkUtils::nam();
+    delete SipHandler::instance();
+    Pipeline::instance()->stop();
+
+    delete m_database;
+    delete m_infoSystem;
 
     qDebug() << "Finished shutdown.";
 }
@@ -474,8 +449,7 @@ void
 TomahawkApp::setupPipeline()
 {
     // setup resolvers for local content, and (cached) remote collection content
-    m_databaseResolver = new DatabaseResolver( 100 );
-    Pipeline::instance()->addResolver( m_databaseResolver );
+    Pipeline::instance()->addResolver( new DatabaseResolver( 100 ) );
 
     // load script resolvers
     foreach( QString resolver, TomahawkSettings::instance()->enabledScriptResolvers() )
@@ -568,6 +542,7 @@ TomahawkApp::setupSIP()
 #endif
 
         qDebug() << "Connecting SIP classes";
+        //SipHandler::instance()->refreshProxy();
         SipHandler::instance()->loadFromConfig( true );
     }
 }

src/tomahawkapp.h

@@ -42,7 +42,6 @@
 #include "utils/tomahawkutils.h"
 #include "kdsingleapplicationguard/kdsingleapplicationguard.h"
 
-class DatabaseResolver;
 class AudioEngine;
 class Database;
 class ScanManager;
@@ -117,7 +116,6 @@ private:
     QHash<QString, Tomahawk::ExternalResolver*> m_scriptResolvers;
 
     Database* m_database;
-    DatabaseResolver* m_databaseResolver;
     ScanManager *m_scanManager;
     AudioEngine* m_audioEngine;
     Servent* m_servent;