1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-07-31 11:20:22 +02:00

Remove qt-module from include path and add more distinctive name for callback

This commit is contained in:
Uwe L. Korn
2013-02-21 14:25:31 +01:00
parent 6759f6c72f
commit 0a0b3717aa
2 changed files with 6 additions and 6 deletions

View File

@@ -45,8 +45,8 @@
#include "utils/Logger.h" #include "utils/Logger.h"
#include <QtDBus/QDBusConnection> #include <QDBusConnection>
#include <QtGui/QImage> #include <QImage>
namespace Tomahawk namespace Tomahawk
{ {
@@ -167,14 +167,14 @@ FdoNotifyPlugin::nowPlaying( const QVariant &input )
message.setArguments( arguments ); message.setArguments( arguments );
// Handle reply in a callback, so that this a non-blocking call // Handle reply in a callback, so that this a non-blocking call
QDBusConnection::sessionBus().callWithCallback( message, this, SLOT( dbusReplyReceived( QDBusMessage ) ) ); QDBusConnection::sessionBus().callWithCallback( message, this, SLOT( dbusPlayingReplyReceived( QDBusMessage ) ) );
} }
/** /**
* Handle the DBus reply triggered by FdoNotifyPlugin::nowPlaying * Handle the DBus reply triggered by FdoNotifyPlugin::nowPlaying
*/ */
void void
FdoNotifyPlugin::dbusReplyReceived( const QDBusMessage &reply ) FdoNotifyPlugin::dbusPlayingReplyReceived( const QDBusMessage &reply )
{ {
const QVariantList &list = reply.arguments(); const QVariantList &list = reply.arguments();
if ( list.count() > 0 ) if ( list.count() > 0 )

View File

@@ -23,7 +23,7 @@
#include "infoplugins/InfoPluginDllMacro.h" #include "infoplugins/InfoPluginDllMacro.h"
#include "infosystem/InfoSystem.h" #include "infosystem/InfoSystem.h"
#include <QtDBus/QDBusMessage> #include <QDBusMessage>
namespace Tomahawk namespace Tomahawk
{ {
@@ -44,7 +44,7 @@ public:
protected slots: protected slots:
virtual void init() {} virtual void init() {}
virtual void dbusReplyReceived( const QDBusMessage &reply ); virtual void dbusPlayingReplyReceived( const QDBusMessage &reply );
virtual void getInfo( Tomahawk::InfoSystem::InfoRequestData requestData ) virtual void getInfo( Tomahawk::InfoSystem::InfoRequestData requestData )
{ {