From 5d03b3510153c745cd6c13d6358540cb21f92b88 Mon Sep 17 00:00:00 2001
From: muesli <muesli@tinktink.(none)>
Date: Sat, 28 May 2011 16:51:04 +0200
Subject: [PATCH] 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 6e19a85d733ceff74482a7c7c069b6c92a5aa598.
---
 src/tomahawkapp.cpp | 45 ++++++++++-----------------------------------
 src/tomahawkapp.h   |  2 --
 2 files changed, 10 insertions(+), 37 deletions(-)

diff --git a/src/tomahawkapp.cpp b/src/tomahawkapp.cpp
index 8cf364619..f76c191a1 100644
--- a/src/tomahawkapp.cpp
+++ b/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,50 +310,26 @@ 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 ?
-    
+    delete m_servent;
+    delete m_scanManager;
 #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_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 );
     }
 }
diff --git a/src/tomahawkapp.h b/src/tomahawkapp.h
index b9f13a824..ea51dfa12 100644
--- a/src/tomahawkapp.h
+++ b/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;