From 0a0b3717aaf031168f85d06795f8897de8361786 Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn" <uwelk@xhochy.com>
Date: Thu, 21 Feb 2013 14:25:31 +0100
Subject: [PATCH] Remove qt-module from include path and add more distinctive
 name for callback

---
 src/infoplugins/linux/fdonotify/FdoNotifyPlugin.cpp | 8 ++++----
 src/infoplugins/linux/fdonotify/FdoNotifyPlugin.h   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/infoplugins/linux/fdonotify/FdoNotifyPlugin.cpp b/src/infoplugins/linux/fdonotify/FdoNotifyPlugin.cpp
index 02ba868b6..634d7bf2b 100644
--- a/src/infoplugins/linux/fdonotify/FdoNotifyPlugin.cpp
+++ b/src/infoplugins/linux/fdonotify/FdoNotifyPlugin.cpp
@@ -45,8 +45,8 @@
 
 #include "utils/Logger.h"
 
-#include <QtDBus/QDBusConnection>
-#include <QtGui/QImage>
+#include <QDBusConnection>
+#include <QImage>
 
 namespace Tomahawk
 {
@@ -167,14 +167,14 @@ FdoNotifyPlugin::nowPlaying( const QVariant &input )
     message.setArguments( arguments );
 
     // 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
  */
 void
-FdoNotifyPlugin::dbusReplyReceived( const QDBusMessage &reply )
+FdoNotifyPlugin::dbusPlayingReplyReceived( const QDBusMessage &reply )
 {
   const QVariantList &list = reply.arguments();
   if ( list.count() > 0 )
diff --git a/src/infoplugins/linux/fdonotify/FdoNotifyPlugin.h b/src/infoplugins/linux/fdonotify/FdoNotifyPlugin.h
index ef4603e93..b8ec796a7 100644
--- a/src/infoplugins/linux/fdonotify/FdoNotifyPlugin.h
+++ b/src/infoplugins/linux/fdonotify/FdoNotifyPlugin.h
@@ -23,7 +23,7 @@
 #include "infoplugins/InfoPluginDllMacro.h"
 #include "infosystem/InfoSystem.h"
 
-#include <QtDBus/QDBusMessage>
+#include <QDBusMessage>
 
 namespace Tomahawk
 {
@@ -44,7 +44,7 @@ public:
 protected slots:
     virtual void init() {}
 
-    virtual void dbusReplyReceived( const QDBusMessage &reply );
+    virtual void dbusPlayingReplyReceived( const QDBusMessage &reply );
 
     virtual void getInfo( Tomahawk::InfoSystem::InfoRequestData requestData )
     {