1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-03-22 16:59:58 +01:00

Switch around a couple of qnam slots

This commit is contained in:
Jeff Mitchell 2011-05-01 10:29:31 -04:00
parent 7f7c55a293
commit d5c182c151
3 changed files with 5 additions and 3 deletions

View File

@ -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 );
}

View File

@ -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;

View File

@ -226,7 +226,7 @@ TomahawkApp::init()
#else
qDebug() << "Setting NAM.";
TomahawkUtils::setNam( new QNetworkAccessManager );
TomahawkUtils::setNam( new QNetworkAccessManager() );
#endif
// Set up proxy