From f79468484b2eb9d6d54d716881e8b1a5f2315f3c Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Wed, 14 Nov 2012 05:46:36 +0100 Subject: [PATCH] * DropJobNotifier now expects our own NetworkReply instead of a QNetworkReply. --- src/libtomahawk/utils/DropJobNotifier.cpp | 21 ++++++++++++--------- src/libtomahawk/utils/DropJobNotifier.h | 7 ++++--- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/libtomahawk/utils/DropJobNotifier.cpp b/src/libtomahawk/utils/DropJobNotifier.cpp index 085e42a991..20fb02bd70 100644 --- a/src/libtomahawk/utils/DropJobNotifier.cpp +++ b/src/libtomahawk/utils/DropJobNotifier.cpp @@ -3,7 +3,7 @@ * Copyright 2010-2011, Leo Franchi * Copyright 2010-2011, Hugo Lindström * Copyright 2010-2011, Jeff Mitchell - * + * * Tomahawk is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or @@ -20,22 +20,25 @@ #include "DropJobNotifier.h" -#include "utils/Logger.h" -#include "utils/TomahawkUtils.h" +#include +#include + +#include + #include "Query.h" #include "SourceList.h" -#include "jobview/JobStatusView.h" -#include "jobview/JobStatusModel.h" #include "DropJob.h" -#include #include "DropJobNotifier.h" -#include -#include +#include "jobview/JobStatusView.h" +#include "jobview/JobStatusModel.h" +#include "utils/NetworkReply.h" +#include "utils/TomahawkUtils.h" +#include "utils/Logger.h" using namespace Tomahawk; -DropJobNotifier::DropJobNotifier( QPixmap servicePixmap, QString service, DropJob::DropType type, QNetworkReply* job ) +DropJobNotifier::DropJobNotifier( QPixmap servicePixmap, QString service, DropJob::DropType type, NetworkReply* job ) : JobStatusItem() , m_type( "unknown" ) , m_job( 0 ) diff --git a/src/libtomahawk/utils/DropJobNotifier.h b/src/libtomahawk/utils/DropJobNotifier.h index 7be206bb6b..e03ee6c96c 100644 --- a/src/libtomahawk/utils/DropJobNotifier.h +++ b/src/libtomahawk/utils/DropJobNotifier.h @@ -30,7 +30,8 @@ #include #include -class QNetworkReply; +class NetworkReply; + namespace Tomahawk { @@ -38,7 +39,7 @@ class DLLEXPORT DropJobNotifier : public JobStatusItem { Q_OBJECT public: - DropJobNotifier( QPixmap pixmap, QString service, DropJob::DropType type, QNetworkReply* job ); + DropJobNotifier( QPixmap pixmap, QString service, DropJob::DropType type, NetworkReply* job ); // No QNetworkReply, needs manual finished call DropJobNotifier( QPixmap pixmap, DropJob::DropType type ); @@ -57,7 +58,7 @@ public slots: void init( DropJob::DropType type ); QString m_type; - QNetworkReply* m_job; + NetworkReply* m_job; QPixmap m_pixmap; QString m_service; };