mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 22:26:32 +02:00
Code Issues Releases Wiki Activity

Switch around a couple of qnam slots

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libtomahawk/infosystem/infosystem.cpp
View File

@@ -67,7 +67,7 @@ InfoSystem::InfoSystem(QObject *parent)
QMetaObject::invokeMethod( m_worker, "init", Qt::QueuedConnection ); 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 ) ), 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 ); this, SLOT( infoSlot( QString, Tomahawk::InfoSystem::InfoType, QVariant, QVariant, Tomahawk::InfoSystem::InfoCustomData ) ), Qt::UniqueConnection );
@@ -126,6 +126,7 @@ InfoSystem::~InfoSystem()
void void
InfoSystem::newNam() const InfoSystem::newNam() const
{ {
qDebug() << Q_FUNC_INFO;
QMetaObject::invokeMethod( m_worker, "newNam", Qt::QueuedConnection ); QMetaObject::invokeMethod( m_worker, "newNam", Qt::QueuedConnection );
} }

3
src/libtomahawk/infosystem/infosystem.h
View File

@@ -145,7 +145,6 @@ public:
void pushInfo( const QString &caller, const InfoMap &input ); void pushInfo( const QString &caller, const InfoMap &input );
InfoSystemCache* getCache() const { return m_cache; } InfoSystemCache* getCache() const { return m_cache; }
void newNam() const;
signals: signals:
void info( QString caller, Tomahawk::InfoSystem::InfoType, QVariant input, QVariant output, Tomahawk::InfoSystem::InfoCustomData customData ); void info( QString caller, Tomahawk::InfoSystem::InfoType, QVariant input, QVariant output, Tomahawk::InfoSystem::InfoCustomData customData );
@@ -154,6 +153,8 @@ signals:
public slots: public slots:
void infoSlot( const QString target, const Tomahawk::InfoSystem::InfoType type, const QVariant input, const QVariant output, const Tomahawk::InfoSystem::InfoCustomData customData ); 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: private:
QHash< QString, QHash< InfoType, int > > m_dataTracker; QHash< QString, QHash< InfoType, int > > m_dataTracker;

2
src/tomahawkapp.cpp
View File

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