github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-07-13 00:33:09 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fix lupdate errors

Browse source 
I suspect lupdate isn't smart enough to figure out what tr() is suppose
to do, so just make it a static function in class.
The error was: tr() cannot be called without context
This commit is contained in:
Chocobo1 2018-08-12 23:44:12 +08:00
parent d9461f348f
commit 6f2b1823ad
No known key found for this signature in database
GPG key ID: 210D9C873253A68C
2 changed files with 50 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/base/net/downloadhandler.cpp
View file

@ -34,7 +34,6 @@
#include <QNetworkAccessManager> #include <QNetworkAccessManager>
#include <QNetworkCookie> #include <QNetworkCookie>
#include <QNetworkProxy> #include <QNetworkProxy>
#include <QNetworkReply>
#include <QNetworkRequest> #include <QNetworkRequest>
#include <QTemporaryFile> #include <QTemporaryFile>
#include <QUrl> #include <QUrl>
@ -46,9 +45,6 @@
namespace namespace
{ {
QString tr(const char *message);
QString errorCodeToString(QNetworkReply::NetworkError status);
bool saveToFile(const QByteArray &replyData, QString &filePath) bool saveToFile(const QByteArray &replyData, QString &filePath)
{ {
QTemporaryFile tmpfile {Utils::Fs::tempPath() + "XXXXXX"}; QTemporaryFile tmpfile {Utils::Fs::tempPath() + "XXXXXX"};
@ -203,15 +199,8 @@ void Net::DownloadHandler::handleRedirection(QUrl newUrl)
} }
} }
namespace QString Net::DownloadHandler::errorCodeToString(const QNetworkReply::NetworkError status)
{ {
QString tr(const char *message)
{
return QCoreApplication::translate("DownloadHandler", message);
}
QString errorCodeToString(QNetworkReply::NetworkError status)
{
switch (status) { switch (status) {
case QNetworkReply::HostNotFoundError: case QNetworkReply::HostNotFoundError:
return tr("The remote host name was not found (invalid hostname)"); return tr("The remote host name was not found (invalid hostname)");
@ -258,5 +247,4 @@ namespace
default: default:
return tr("Unknown error"); return tr("Unknown error");
} }
}
} }

5
src/base/net/downloadhandler.h
View file

@ -30,10 +30,11 @@
#ifndef NET_DOWNLOADHANDLER_H #ifndef NET_DOWNLOADHANDLER_H
#define NET_DOWNLOADHANDLER_H #define NET_DOWNLOADHANDLER_H
#include <QNetworkReply>
#include <QObject> #include <QObject>
#include "downloadmanager.h" #include "downloadmanager.h"
class QNetworkReply;
class QUrl; class QUrl;
namespace Net namespace Net
@ -68,6 +69,8 @@ namespace Net
void assignNetworkReply(QNetworkReply *reply); void assignNetworkReply(QNetworkReply *reply);
void handleRedirection(QUrl newUrl); void handleRedirection(QUrl newUrl);
static QString errorCodeToString(QNetworkReply::NetworkError status);
QNetworkReply *m_reply; QNetworkReply *m_reply;
DownloadManager *m_manager; DownloadManager *m_manager;
const DownloadRequest m_downloadRequest; const DownloadRequest m_downloadRequest;