From d5c182c15129dfe70b58bdd665d4b008da36ac00 Mon Sep 17 00:00:00 2001
From: Jeff Mitchell <tomahawk@jefferai.org>
Date: Sun, 1 May 2011 10:29:31 -0400
Subject: [PATCH] Switch around a couple of qnam slots

---
 src/libtomahawk/infosystem/infosystem.cpp | 3 ++-
 src/libtomahawk/infosystem/infosystem.h   | 3 ++-
 src/tomahawkapp.cpp                       | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/libtomahawk/infosystem/infosystem.cpp b/src/libtomahawk/infosystem/infosystem.cpp
index c59c9ec45..e42edda5b 100644
--- a/src/libtomahawk/infosystem/infosystem.cpp
+++ b/src/libtomahawk/infosystem/infosystem.cpp
@@ -67,7 +67,7 @@ InfoSystem::InfoSystem(QObject *parent)
 
     QMetaObject::invokeMethod( m_worker, "init", Qt::QueuedConnection );
 
-    connect( TomahawkSettings::instance(), SIGNAL( changed() ), m_worker, SLOT( newNam() ) );
+    connect( TomahawkSettings::instance(), SIGNAL( changed() ), SLOT( newNam() ) );
 
     connect( m_cache, SIGNAL( info( QString, Tomahawk::InfoSystem::InfoType, QVariant, QVariant, Tomahawk::InfoSystem::InfoCustomData ) ),
             this,       SLOT( infoSlot( QString, Tomahawk::InfoSystem::InfoType, QVariant, QVariant, Tomahawk::InfoSystem::InfoCustomData ) ), Qt::UniqueConnection );
@@ -126,6 +126,7 @@ InfoSystem::~InfoSystem()
 void
 InfoSystem::newNam() const
 {
+    qDebug() << Q_FUNC_INFO;
     QMetaObject::invokeMethod( m_worker, "newNam", Qt::QueuedConnection );
 }
 
diff --git a/src/libtomahawk/infosystem/infosystem.h b/src/libtomahawk/infosystem/infosystem.h
index d8ee7104a..f4fe24871 100644
--- a/src/libtomahawk/infosystem/infosystem.h
+++ b/src/libtomahawk/infosystem/infosystem.h
@@ -145,7 +145,6 @@ public:
     void pushInfo( const QString &caller, const InfoMap &input );
 
     InfoSystemCache* getCache() const { return m_cache; }
-    void newNam() const;
 
 signals:
     void info( QString caller, Tomahawk::InfoSystem::InfoType, QVariant input, QVariant output, Tomahawk::InfoSystem::InfoCustomData customData );
@@ -154,6 +153,8 @@ signals:
 public slots:
     void infoSlot( const QString target, const Tomahawk::InfoSystem::InfoType type, const QVariant input, const QVariant output, const Tomahawk::InfoSystem::InfoCustomData customData );
 
+    void newNam() const;
+
 private:
     QHash< QString, QHash< InfoType, int > > m_dataTracker;
 
diff --git a/src/tomahawkapp.cpp b/src/tomahawkapp.cpp
index da56f7b6d..b826711c2 100644
--- a/src/tomahawkapp.cpp
+++ b/src/tomahawkapp.cpp
@@ -226,7 +226,7 @@ TomahawkApp::init()
 
     #else
     qDebug() << "Setting NAM.";
-    TomahawkUtils::setNam( new QNetworkAccessManager );
+    TomahawkUtils::setNam( new QNetworkAccessManager() );
     #endif
 
     // Set up proxy