Permalink
Browse files

* DropJobNotifier now expects our own NetworkReply instead of a QNetw…

…orkReply.
  • Loading branch information...
1 parent 1e7c20a commit f79468484b2eb9d6d54d716881e8b1a5f2315f3c @muesli muesli committed Nov 14, 2012
Showing with 16 additions and 12 deletions.
  1. +12 −9 src/libtomahawk/utils/DropJobNotifier.cpp
  2. +4 −3 src/libtomahawk/utils/DropJobNotifier.h
View
21 src/libtomahawk/utils/DropJobNotifier.cpp
@@ -3,7 +3,7 @@
* Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
* Copyright 2010-2011, Hugo Lindström <hugolm84@gmail.com>
* Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.org>
- *
+ *
* 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 <QtNetwork/QNetworkAccessManager>
+#include <QtNetwork/QNetworkReply>
+
+#include <qjson/parser.h>
+
#include "Query.h"
#include "SourceList.h"
-#include "jobview/JobStatusView.h"
-#include "jobview/JobStatusModel.h"
#include "DropJob.h"
-#include <qjson/parser.h>
#include "DropJobNotifier.h"
-#include <QtNetwork/QNetworkAccessManager>
-#include <QtNetwork/QNetworkReply>
+#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 )
View
7 src/libtomahawk/utils/DropJobNotifier.h
@@ -30,15 +30,16 @@
#include <QStringList>
#include <QPixmap>
-class QNetworkReply;
+class NetworkReply;
+
namespace Tomahawk
{
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;
};

0 comments on commit f794684

Please sign in to comment.