Skip to content

Commit

Permalink
Fix compilation of MythDownloadManager.
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Kendall authored and stuartm committed Jan 29, 2011
1 parent 613079e commit 7612cde
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions mythtv/libs/libmythdb/mythdownloadmanager.cpp
Expand Up @@ -7,6 +7,7 @@
#include <QThreadPool>

// libmythdb
#include "stdlib.h"
#include "compat.h"
#include "mythcorecontext.h"
#include "mythcoreutil.h"
Expand Down Expand Up @@ -54,7 +55,7 @@ class MythDownloadInfo
{
m_url.detach();
m_outFile.detach();
}
}

QString m_url;
QUrl m_redirectedTo;
Expand Down Expand Up @@ -113,7 +114,7 @@ class RemoteFileDownloadThread : public QRunnable
/** \fn ShutdownMythDownloadManager(void)
* \brief Deletes the running MythDownloadManager at program exit.
*/
void ShutdownMythDownloadManager(void)
static void ShutdownMythDownloadManager(void)
{
if (downloadManager)
{
Expand Down Expand Up @@ -550,7 +551,7 @@ void MythDownloadManager::downloadQNetworkRequest(MythDownloadInfo *dlInfo)
static const char dateFormat[] = "ddd, dd MMM yyyy hh:mm:ss 'GMT'";
QUrl qurl(dlInfo->m_url);
QNetworkRequest request;

if (dlInfo->m_request)
{
request = *dlInfo->m_request;
Expand Down Expand Up @@ -607,7 +608,7 @@ void MythDownloadManager::downloadQNetworkRequest(MythDownloadInfo *dlInfo)
connect(dlInfo->m_reply, SIGNAL(error(QNetworkReply::NetworkError)), this,
SLOT(downloadError(QNetworkReply::NetworkError)));
connect(dlInfo->m_reply, SIGNAL(downloadProgress(qint64, qint64)),
this, SLOT(downloadProgress(qint64, qint64)));
this, SLOT(downloadProgress(qint64, qint64)));
}

/** \fn MythDownloadManager::downloadNow(MythDownloadInfo *dlInfo,
Expand Down Expand Up @@ -655,7 +656,7 @@ bool MythDownloadManager::downloadNow(MythDownloadInfo *dlInfo, bool deleteInfo)

return success;
}

/** \fn MythDownloadManager::removeListener(QObject *caller)
* \brief Disconnects the specify caller from any existing
* MythDownloadInfo instances.
Expand Down Expand Up @@ -795,7 +796,7 @@ void MythDownloadManager::downloadFinished(MythDownloadInfo *dlInfo)
connect(dlInfo->m_reply, SIGNAL(error(QNetworkReply::NetworkError)), this,
SLOT(downloadError(QNetworkReply::NetworkError)));
connect(dlInfo->m_reply, SIGNAL(downloadProgress(qint64, qint64)),
this, SLOT(downloadProgress(qint64, qint64)));
this, SLOT(downloadProgress(qint64, qint64)));

m_downloadReplies.remove(reply);
reply->deleteLater();
Expand Down

0 comments on commit 7612cde

Please sign in to comment.