AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[qt][download] Manager now supports requests from different threads

Browse source
This commit is contained in:
Alex Zolotarev 2011-05-19 03:46:41 +02:00 • committed by Alex Zolotarev
parent 000023aae3
commit 942ab03f92
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
platform/qt_download_manager.cpp
View file

@ -2,6 +2,13 @@
#include "qt_download.hpp"
#include "../base/assert.hpp"
#include "../base/logging.hpp"
void QtDownloadManager::CreateOnMainThreadSlot(HttpStartParams const & params)
{
// manager is responsible for auto deleting
new QtDownload(*this, params);
}
void QtDownloadManager::HttpRequest(HttpStartParams const & params)
{
@ -9,12 +16,13 @@ void QtDownloadManager::HttpRequest(HttpStartParams const & params)
QList<QtDownload *> downloads = findChildren<QtDownload *>(params.m_url.c_str());
if (downloads.empty())
{
// manager is responsible for auto deleting
new QtDownload(*this, params);
// small trick so all connections will be created on the main thread
qRegisterMetaType<HttpStartParams>("HttpStartParams");
QMetaObject::invokeMethod(this, "CreateOnMainThreadSlot", Q_ARG(HttpStartParams const & , params));
}
else
{
ASSERT(false, ("Download with the same url is already in progress!"));
LOG(LWARNING, ("Download with the same url is already in progress, ignored", params.m_url));
}
}

4
platform/qt_download_manager.hpp
View file

@ -8,6 +8,10 @@ class QtDownloadManager : public QObject, public DownloadManager
QNetworkAccessManager m_netAccessManager;
/// Should be called using inter-thread signal
private slots:
void CreateOnMainThreadSlot(HttpStartParams const & params);
public:
virtual void HttpRequest(HttpStartParams const & params);
virtual void CancelDownload(string const & url);