From bcfea876070a8087594bcd4de054e7a390555029 Mon Sep 17 00:00:00 2001
From: Jeff Mitchell <tomahawk@jefferai.org>
Date: Tue, 3 May 2011 21:53:39 -0400
Subject: [PATCH] Remove more extra debugging, and fix a couple omissions

---
 src/libtomahawk/infosystem/infoplugins/lastfmplugin.cpp | 1 -
 src/libtomahawk/infosystem/infosystem.cpp               | 1 -
 src/libtomahawk/infosystem/infosystemworker.cpp         | 2 --
 src/libtomahawk/utils/tomahawkutils.cpp                 | 2 +-
 4 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/libtomahawk/infosystem/infoplugins/lastfmplugin.cpp b/src/libtomahawk/infosystem/infoplugins/lastfmplugin.cpp
index 12b44466b..d74f22ac6 100644
--- a/src/libtomahawk/infosystem/infoplugins/lastfmplugin.cpp
+++ b/src/libtomahawk/infosystem/infoplugins/lastfmplugin.cpp
@@ -186,7 +186,6 @@ void
 LastFmPlugin::scrobble()
 {
     qDebug() << Q_FUNC_INFO;
-    //Q_ASSERT( QThread::currentThread() == thread() );
 
     if ( !m_scrobbler || m_track.isNull() )
         return;
diff --git a/src/libtomahawk/infosystem/infosystem.cpp b/src/libtomahawk/infosystem/infosystem.cpp
index 48ed2bb26..848d02553 100644
--- a/src/libtomahawk/infosystem/infosystem.cpp
+++ b/src/libtomahawk/infosystem/infosystem.cpp
@@ -83,7 +83,6 @@ InfoSystem::InfoSystem(QObject *parent)
 InfoSystem::~InfoSystem()
 {
     qDebug() << Q_FUNC_INFO << " beginning";
-    qDebug() << "THREAD I'M RUNNING IN: " << QThread::currentThread();
     
     if ( !m_worker.isNull() )
     {
diff --git a/src/libtomahawk/infosystem/infosystemworker.cpp b/src/libtomahawk/infosystem/infosystemworker.cpp
index 45563871f..4a89ca29a 100644
--- a/src/libtomahawk/infosystem/infosystemworker.cpp
+++ b/src/libtomahawk/infosystem/infosystemworker.cpp
@@ -44,13 +44,11 @@ InfoSystemWorker::InfoSystemWorker()
 InfoSystemWorker::~InfoSystemWorker()
 {
     qDebug() << Q_FUNC_INFO << " beginning";
-    qDebug() << "THREAD I'M RUNNING IN: " << QThread::currentThread();
     Q_FOREACH( InfoPluginPtr plugin, m_plugins )
     {
         if( plugin )
             delete plugin.data();
     }
-    qDebug() << Q_FUNC_INFO << " is done deleting plugins";
 }
 
 
diff --git a/src/libtomahawk/utils/tomahawkutils.cpp b/src/libtomahawk/utils/tomahawkutils.cpp
index b2ae5afa4..7d456c72b 100644
--- a/src/libtomahawk/utils/tomahawkutils.cpp
+++ b/src/libtomahawk/utils/tomahawkutils.cpp
@@ -341,7 +341,7 @@ createDragPixmap( int itemCount )
 
 
 QWeakPointer< QNetworkAccessManager > s_nam;
-QNetworkProxy* s_proxy;
+QNetworkProxy* s_proxy = 0;
 
 QNetworkAccessManager*
 nam()